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 0001/1357] 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 d542cf7720b9c0651d8510a18a73916e3200a6ae Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 14 Aug 2024 16:20:47 +0200
Subject: [PATCH 0002/1357] s&d

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

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index c1649587d..1a96eadf1 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -126,7 +126,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

From 6c08741450589e3b3a82465b9c90f79358de1810 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Sep 2024 14:31:25 +0200
Subject: [PATCH 0003/1357] Fist Draft

---
 application/config/search.php                 |  664 +++++++++
 application/config/searchfunctions.php        |   31 +
 .../controllers/api/frontend/v1/Searchbar.php |   13 +-
 application/core/FHCAPI_Controller.php        |    9 +-
 application/helpers/hlp_common_helper.php     |   17 +
 application/libraries/SearchBarLib.php        | 1307 ++++++++++++-----
 public/css/components/searchbar.css           |   38 +
 public/js/api/search.js                       |    4 +-
 .../components/searchbar/result/employee.js   |   59 +
 .../searchbar/result/mergedperson.js          |  166 +++
 .../searchbar/result/mergedstudent.js         |   35 +
 .../searchbar/result/organisationunit.js      |   63 +
 .../js/components/searchbar/result/person.js  |   46 +
 .../components/searchbar/result/prestudent.js |   70 +
 public/js/components/searchbar/result/room.js |   74 +
 .../js/components/searchbar/result/student.js |   58 +
 .../searchbar/result/template/action.js       |   28 +
 .../searchbar/result/template/actions.js      |   26 +
 .../searchbar/result/template/frame.js        |   59 +
 public/js/components/searchbar/searchbar.js   |  438 ++++--
 public/js/plugin/FhcApi.js                    |    2 +
 system/dbupdate_3.4.php                       |    1 +
 system/dbupdate_3.4/40128_search.php          |  171 +++
 23 files changed, 2838 insertions(+), 541 deletions(-)
 create mode 100644 application/config/search.php
 create mode 100644 application/config/searchfunctions.php
 create mode 100644 public/js/components/searchbar/result/employee.js
 create mode 100644 public/js/components/searchbar/result/mergedperson.js
 create mode 100644 public/js/components/searchbar/result/mergedstudent.js
 create mode 100644 public/js/components/searchbar/result/organisationunit.js
 create mode 100644 public/js/components/searchbar/result/person.js
 create mode 100644 public/js/components/searchbar/result/prestudent.js
 create mode 100644 public/js/components/searchbar/result/room.js
 create mode 100644 public/js/components/searchbar/result/student.js
 create mode 100644 public/js/components/searchbar/result/template/action.js
 create mode 100644 public/js/components/searchbar/result/template/actions.js
 create mode 100644 public/js/components/searchbar/result/template/frame.js
 create mode 100644 system/dbupdate_3.4/40128_search.php

diff --git a/application/config/search.php b/application/config/search.php
new file mode 100644
index 000000000..ac6189527
--- /dev/null
+++ b/application/config/search.php
@@ -0,0 +1,664 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// TODO(chris): permissions
+// TODO(chris): foto
+
+
+$config['person'] = [
+	'primarykey' => 'person_id',
+	'table' => 'public.tbl_person',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'uid',
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'using' => "person_id"
+			],
+			'1-n' => true
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname'
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname'
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)"
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_person.person_id"
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
+			],
+			"1-n" => true
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id',
+			'join' => [
+				'table' => "public.tbl_prestudent",
+				'using' => "person_id"
+			],
+			'1-n' => true
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id'
+		]
+	],
+	'resultfields' => [
+		"b.uid",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_person p USING (person_id)
+		LEFT JOIN public.tbl_benutzer b USING (person_id)"
+];
+
+$config['student'] = [
+	'primarykey' => 'student_uid',
+	'table' => 'public.tbl_student',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'student_uid'
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_kontakt",
+					'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+				]
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_kontakt",
+					'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+				]
+			],
+			"1-n" => true
+		],
+		'stg' => [
+			'alias' => ['studiengang'],
+			'comparison' => 'equals',
+			'field' => "typ || kurzbz",
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_studiengang",
+					'on' => "tbl_studiengang.studiengang_kz = tbl_prestudent.studiengang_kz"
+				]
+			]
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id'
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id',
+			'join' => [
+				'table' => "public.tbl_prestudent",
+				'using' => "prestudent_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"s.student_uid AS uid",
+		"s.matrikelnr",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_student s USING (student_uid)
+		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+		JOIN public.tbl_person p USING(person_id)"
+];
+
+// TODO(chris): "ref"
+$config['prestudent'] = [
+	'primarykey' => 'prestudent_id',
+	'table' => 'public.tbl_prestudent',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'student_uid',
+			'join' => [
+				'table' => "public.tbl_student",
+				'using' => "prestudent_id"
+			]
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+			],
+			"1-n" => true
+		],
+		'stg' => [
+			'alias' => ['studiengang'],
+			'comparison' => 'equals',
+			'field' => "typ || kurzbz",
+			'join' => [
+				'table' => "public.tbl_studiengang",
+				'using' => "studiengang_kz"
+			]
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id'
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"ps.prestudent_id",
+		"ps.studiengang_kz",
+		"s.matrikelnr",
+		"p.person_id",
+		"b.uid",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto",
+		"UPPER(sg.typ || sg.kurzbz) AS stg_kuerzel",
+		"sg.bezeichnung",
+		"(
+			SELECT bezeichnung_mehrsprachig[(TABLE lang)]
+			FROM public.tbl_status
+			WHERE status_kurzbz = public.get_rolle_prestudent(ps.prestudent_id, NULL)
+			LIMIT 1
+		) as status"
+	],
+	'resultjoin' => "
+		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
+		LEFT JOIN public.tbl_student s ON (ps.prestudent_id = s.prestudent_id)
+		LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+		JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+		LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)"
+];
+
+$config['employee'] = [
+	'alias' => ['ma', 'mitarbeiter'],
+	'primarykey' => 'mitarbeiter_uid',
+	'table' => 'public.tbl_mitarbeiter',
+	'searchfields' => [
+		'uid' => [
+			'alias' => ['mitarbeiter_uid'],
+			'comparison' => 'equals',
+			'field' => "mitarbeiter_uid"
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => "vorname",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => "nachname",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => "COALESCE(alias, uid) || '" . '@' . DOMAIN . "'",
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'on' => "uid = mitarbeiter_uid"
+			]
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
+			],
+			"1-n" => true
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => "person_id"
+		],
+		'oe' => [
+			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzerfunktion",
+					'on' => "mitarbeiter_uid = uid
+						AND funktion_kurzbz = 'oezuordnung'
+						AND (datum_von IS NULL OR datum_von <= NOW())
+						AND (datum_bis IS NULL OR datum_bis >= NOW())"
+				],
+				[
+					'table' => "public.tbl_organisationseinheit",
+					'using' => "oe_kurzbz"
+				]
+			],
+			'1-n' => true
+		],
+		'kst' => [
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzerfunktion",
+					'on' => "mitarbeiter_uid = uid
+						AND funktion_kurzbz = 'kstzuordnung'
+						AND (datum_von IS NULL OR datum_von <= NOW())
+						AND (datum_bis IS NULL OR datum_bis >= NOW())"
+				],
+				[
+					'table' => "public.tbl_organisationseinheit",
+					'using' => "oe_kurzbz"
+				]
+			],
+			'1-n' => true
+		]
+	],
+	'resultfields' => [
+		"b.uid",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY(
+			SELECT
+				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+			WHERE bf.funktion_kurzbz = 'oezuordnung'
+				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				AND bf.uid = b.uid
+			GROUP BY o.bezeichnung, ot.bezeichnung
+		) AS organisationunit_name",
+		"COALESCE(b.alias, b.uid) || '" . '@' . DOMAIN . "' AS email",
+		"TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, '')) AS phone",
+		"'" . base_url("/cis/public/bild.php?src=person&person_id=") . "' || p.person_id AS photo_url",
+		"ARRAY(
+			SELECT
+				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+			WHERE bf.funktion_kurzbz = 'kstzuordnung'
+				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				AND bf.uid = b.uid
+			GROUP BY o.bezeichnung, ot.bezeichnung
+		) AS standardkostenstelle"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)"
+];
+
+$config['unassigned_employee'] = $config['employee'];
+$config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
+$config['unassigned_employee']['prepare'] = "unassigned_employee AS (
+	SELECT tbl_mitarbeiter.*
+	FROM public.tbl_mitarbeiter
+	LEFT JOIN public.tbl_benutzerfunktion ON (
+		uid = mitarbeiter_uid
+		AND funktion_kurzbz = 'kstzuordnung'
+		AND (datum_von IS NULL OR datum_von <= NOW())
+		AND (datum_bis IS NULL OR datum_bis >= NOW())
+	)
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	UNION
+	SELECT tbl_mitarbeiter.*
+	FROM public.tbl_mitarbeiter
+	LEFT JOIN public.tbl_benutzerfunktion ON (
+		uid = mitarbeiter_uid
+		AND funktion_kurzbz = 'oezuordnung'
+		AND (datum_von IS NULL OR datum_von <= NOW())
+		AND (datum_bis IS NULL OR datum_bis >= NOW())
+	)
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+)";
+$config['unassigned_employee']['table'] = "unassigned_employee";
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = unassigned_employee.standort_id";
+
+$config['organisationunit'] = [
+	'alias' => ['ou', 'organisationseinheit', 'oe'],
+	'primarykey' => 'oe_kurzbz',
+	'table' => 'public.tbl_organisationseinheit',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'uid',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'oe' => [
+			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung"
+		],
+		'kurzbz' => [
+			'alias' => ['oe_kurzbz'],
+			'comparison' => 'equals',
+			'field' => "oe_kurzbz"
+		]
+	],
+	'resultfields' => [
+		"oe.oe_kurzbz",
+		"('[' || type.bezeichnung || '] ' || oe.bezeichnung) AS name",
+		"oe_parent.oe_kurzbz AS parentoe_kurzbz",
+		"(CASE WHEN oe_parent.bezeichnung IS NOT NULL THEN '[' || type_parent.bezeichnung || '] ' || oe_parent.bezeichnung END) AS parentoe_name",
+		"ARRAY(
+			SELECT JSON_BUILD_OBJECT('uid', b.uid, 'vorname', p.vorname, 'nachname', p.nachname, 'name', (p.vorname || ' ' || p.nachname))
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_benutzer b USING (uid)
+			JOIN public.tbl_person p USING (person_id)
+			WHERE funktion_kurzbz = 'Leitung'
+			AND (datum_von IS NULL OR datum_von <= NOW())
+			AND (datum_bis IS NULL OR datum_bis >= NOW())
+			AND b.aktiv = TRUE
+			AND oe_kurzbz = oe.oe_kurzbz
+		) AS leaders",
+		"(
+			SELECT COUNT(*)
+			FROM public.tbl_benutzerfunktion
+			WHERE funktion_kurzbz = 'oezuordnung'
+			AND (datum_von IS NULL OR datum_von <= NOW())
+			AND (datum_bis IS NULL OR datum_bis >= NOW())
+			AND oe_kurzbz = oe.oe_kurzbz
+		) AS number_of_people",
+		"(CASE WHEN oe.mailverteiler THEN oe.oe_kurzbz || '" . '@' . DOMAIN . "' END) AS mailgroup"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_organisationseinheit oe
+			USING (oe_kurzbz)
+		JOIN public.tbl_organisationseinheittyp type
+			USING (organisationseinheittyp_kurzbz)
+		LEFT JOIN public.tbl_organisationseinheit oe_parent
+			ON (oe_parent.oe_kurzbz = oe.oe_parent_kurzbz)
+		LEFT JOIN public.tbl_organisationseinheittyp type_parent
+			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
+];
+
+$config['room'] = [
+	'alias' => ['raum'],
+	'primarykey' => 'ort_kurzbz',
+	'table' => 'public.tbl_ort',
+	'searchfields' => [
+		'name' => [
+			'comparison' => 'similar',
+			'field' => 'ort_kurzbz'
+		]
+	],
+	'resultfields' => [
+		"ort.ort_kurzbz",
+		"ort.gebteil AS building",
+		"ort.ausstattung AS equipment",
+		"ort.stockwerk AS floor",
+		"ort.dislozierung AS room_number",
+		"ort.content_id",
+		"address.ort AS city",
+		"address.plz AS zip",
+		"address.strasse AS street",
+		"ort.max_person",
+		"ort.arbeitsplaetze AS workplaces"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_ort ort
+			USING (ort_kurzbz)
+		LEFT JOIN public.tbl_standort
+			USING (standort_id)
+		LEFT JOIN public.tbl_adresse address
+			USING (adresse_id)"
+];
diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
new file mode 100644
index 000000000..c8244e9a3
--- /dev/null
+++ b/application/config/searchfunctions.php
@@ -0,0 +1,31 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$config['equal-int'] = [
+	'priority' => 4,
+	'rank' => "0",
+	'compare' => "{field} = {word}",
+	'force_integer' => true
+];
+
+$config['equals'] = [
+	'priority' => 3,
+	'rank' => "0",
+	'compare' => "LOWER({field}) = {word}"
+];
+
+$config['similar'] = [
+	'priority' => 2,
+	'rank' => "(COALESCE({field}, '') <->> {word})",
+	'compare' => "COALESCE({field}, '') %> {word}",
+	'compare_boolean' => "COALESCE({field}, '') ILIKE {like:word}"
+];
+
+$config['vector'] = [
+	'priority' => 1,
+	'rank' => "ts_rank_cd({field}, to_tsquery('simple', {word}))",
+	'compare' => "to_tsquery('simple', {word}) @@ {field}"
+];
+
diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 8b383e042..2d5b06063 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -50,6 +50,7 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
+		#$searchstrings = ['pid:71995', 'email:eder.iris', 'schnabl', 'schnabl thomas', 'schnabl thomas sarim', 'schnabl -thomas', 'nachname:schnabl -vorname:thomas', 'schnabl thomas -sarim', 'schnabl or hacker', '-ali', '-ali -baba', '-ali -baba -raub', '-ali -honig', '-ali -baba ali', 'hofer martin'];
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
@@ -57,13 +58,17 @@ class Searchbar extends FHCAPI_Controller
 		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
 
 		if (!$this->form_validation->run())
-			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// Convert to json the result from searchbarlib->search
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
-		if (property_exists($result, 'error'))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->addMeta('time', $result->meta['time']);
+		$this->addMeta('searchstring', $result->meta['searchstring']);
+		
+		$this->terminateWithSuccess($data);
 	}
 }
 
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 36388e271..197f4757f 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -106,10 +106,15 @@ class FHCAPI_Controller extends Auth_Controller
 		$error = [];
 		
 		if (is_array($data)) {
-			if ($type == self::ERROR_TYPE_VALIDATION)
+			if ($type == self::ERROR_TYPE_VALIDATION) {
 				$error['messages'] = $data;
-			else
+			} elseif (array_is_list($data)) {
+				foreach ($data as $d)
+					$this->addError($d, $type);
+				return;
+			} else {
 				$error = $data;
+			}
 		} elseif (is_object($data)) {
 			$error = (array)$data;
 		} else {
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 40aed007c..00c0a1b93 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -424,6 +424,23 @@ function isValidDate($dateString)
 }
 
 
+// ------------------------------------------------------------------------
+// PHP functions that don't exist in older versions
+// ------------------------------------------------------------------------
+
+/**
+ * Returns true if the given array is sequential
+ */
+if (!function_exists('array_is_list')) {
+    function array_is_list(array $arr)
+    {
+        if ($arr === []) {
+            return true;
+        }
+        return array_keys($arr) === range(0, count($arr) - 1);
+    }
+}
+
 // ------------------------------------------------------------------------
 // Collection of utility functions for form validation purposes
 // ------------------------------------------------------------------------
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index b725f6e90..6547cd107 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -39,6 +39,10 @@ class SearchBarLib
 
 	private $_ci; // Code igniter instance
 
+	private $_searchfunction_priorities = [];
+	private $_numeric_searchfunctions = [];
+	private $_allowed_searchfunctions = [];
+	
 	/**
 	 * Gets the CI instance and loads model
 	 */
@@ -46,8 +50,22 @@ class SearchBarLib
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		// It is loaded only to have the DB_Model available
+		// It is loaded only to have the DB functions available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// Load Config
+		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('searchfunctions', true);
+
+		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
+
+		// Precompute helper arrays
+		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
+			$this->_searchfunction_priorities[$key] = $arr['priority'];
+			if ($arr['force_integer'] ?? false)
+				$this->_numeric_searchfunctions[] = $key;
+			$this->_allowed_searchfunctions[] = $key;
+		}
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -55,384 +73,612 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
+	 * TODO(chris): permissions
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types (optional)
+	 *
+	 * @return stdClass		containing an array with the result on index 0
+	 * 						and the overall query time on index 1.
 	 */
-	public function search($searchstr, $types)
+	public function search($searchstring, $types = [])
 	{
-		// Checks if the given parameters are fine
-		$search = $this->_checkParameters($searchstr, $types);
+		if (!$types) {
+			$types = $this->_ci->config->item('search');
+		} else {
+			$tmp = [];
+			$missing = [];
+			foreach ($types as $type) {
+				$typeconfig = $this->_ci->config->item($type, 'search');
+				if (!$typeconfig) {
+					$missing[] = $type;
+				} else {
+					$tmp[$type] = $typeconfig;
+				}
+			}
+			if ($missing) {
+				$p = $this->_ci->search_phrases;
+				return error(array_map(function ($type) use ($p) {
+					return $p->t('search', 'error_missing_config', [
+						'type' => $type
+					]); // TODO(chris): phrase
+				}, $missing));
+			}
+			$types = $tmp;
+		}
 
-		// If the check was successful then perform the search
-		if (isSuccess($search)) $search = $this->_search($searchstr, $types);
 
-		return $search; // return the result
+		// Convert searchstring into array
+		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
+
+
+		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
+		if (isError($sql))
+			return $sql;
+		if (!hasData($sql)) {
+			$retval = success([]);
+			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
+			return $retval;
+		}
+
+		$msc = microtime(true);
+		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
+		$msc = microtime(true) - $msc;
+
+		if (isError($result))
+			return $result;
+
+		$retval = success($result->retval);
+		$retval->meta = [
+			'time' => $msc,
+			'searchstring' => $searchstring
+		];
+
+		return $retval;
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSql($searchArray, $table)
+	{
+		$res = $this->checkConfig($table);
+		if (isError($res))
+			return $res;
+		$table_config = getData($res);
+
+		$sql_with = [];
+		
+		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
+
+		if (!$sql_select)
+			return success("");
+
+		$lang = getUserLanguage();
+
+		$output = "
+			WITH lang (index) AS (
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=" . $this->_ci->db->escape($lang) . "
+				LIMIT 1
+			)";
+
+		if ($sql_with) {
+			$sql_with = array_unique($sql_with);
+			$output .= ", " . implode(", ", $sql_with);
+		}
+
+		$other_selects = "";
+		if (isset($table_config['resultfields']))
+			$other_selects = implode(", ", $table_config['resultfields']);
+		if ($other_selects)
+			$other_selects = ", " . $other_selects;
+
+		$output .= "
+			, q (" . $table_config['primarykey'] . ", rank) AS (
+				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+				FROM (" . implode(" UNION ", $sql_select) . ") q
+				GROUP BY " . $table_config['primarykey'] . "
+			)
+			SELECT
+				" . $this->_ci->db->escape($table) . " AS type,
+				q.rank
+				" . $other_selects . "
+			FROM q
+			" . ($table_config['resultjoin'] ?? "") . "
+			ORDER BY rank DESC
+		";
+
+		return success($output);
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search types.
+	 *
+	 * @param array								$searchArray
+	 * @param array								$types
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSqls($searchArray, $types)
+	{
+		$with = [];
+		$selects = [];
+		foreach ($types as $type) {
+			$res = $this->checkConfig($type);
+			if (isError($res))
+				return $res;
+			$table_config = getData($res);
+
+			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
+			if (!$select)
+				continue;
+
+			$with[] = "final_" . $type . " (" . $table_config['primarykey'] . ", rank) AS (
+				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+				FROM (" . implode(" UNION ", $select) . ") q
+				GROUP BY " . $table_config['primarykey'] . "
+			)";
+
+			$other_selects = 
+			$selects[] = "
+				SELECT
+					" . $this->_ci->db->escape($type) . " AS type,
+					rank,
+					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
+				FROM final_" . $type  . ($table_config['resultjoin'] ?? "");
+		}
+
+		if (!$selects)
+			return success("");
+
+		$with = array_unique($with);
+
+		$lang = getUserLanguage();
+		array_unshift($with, "lang (index) AS (
+			SELECT index
+			FROM public.tbl_sprache
+			WHERE sprache=" . $this->_ci->db->escape($lang) . "
+			LIMIT 1
+		)");
+
+		return success("
+			WITH " . implode(", ", $with) . "
+			SELECT *
+			FROM (" . implode(" UNION ", $selects) . ") q
+			ORDER BY rank DESC
+			LIMIT 100
+		");
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Check config
+	 *
+	 * @param string							$name
+	 *
+	 * @return stdClass
+	 */
+	protected function checkConfig($name)
+	{
+		$table_config = $this->_ci->config->item($name, 'search');
+
+		if (!$table_config)
+			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
+				'type' => $name
+			])); // TODO(chris): phrase
+
+		$errors = [];
+		if (!isset($table_config['table'])
+			|| !is_string($table_config['table'])
+			|| !$table_config['table']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'table'
+			]); // TODO(chris): phrase
+		}
+		if (!isset($table_config['primarykey'])
+			|| !is_string($table_config['primarykey'])
+			|| !$table_config['primarykey']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'primarykey'
+			]);
+		}
+		if (!isset($table_config['resultfields'])
+			|| !is_array($table_config['resultfields'])
+			|| !$table_config['resultfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'resultfields'
+			]);
+		}
+		if (!isset($table_config['searchfields'])
+			|| !is_array($table_config['searchfields'])
+			|| !$table_config['searchfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'searchfields'
+			]);
+		} else {
+			foreach ($table_config['searchfields'] as $searchfield => $config) {
+				if (!isset($config['field'])
+					|| !is_string($config['field'])
+					|| !$config['field']
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'field'
+					]); // TODO(chris): phrase
+				}
+				if (!isset($config['comparison'])
+					|| !is_string($config['comparison'])
+					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'comparison'
+					]);
+				}
+			}
+		}
+
+		if ($errors)
+			return error($errors);
+
+		return success($table_config);
+	}
+
+	/**
+	 * Generates the with statements for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return string	a query string or the name of the prepared select.
+	 */
+	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
+	{
+		$table_config = $this->_ci->config->item($table, 'search');
+
+		$id_offset = count($sqlWith);
+
+
+		$allowed_codes_w_order = ['' => 0, '!' => -1];
+		$max = max($this->_searchfunction_priorities);
+		foreach ($table_config['searchfields'] as $code => $config) {
+			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
+			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
+		}
+
+		$check_order = $this->_searchfunction_priorities;
+		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
+			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
+		});
+
+		$integer_functions = $this->_numeric_searchfunctions;
+		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
+				return in_array($a['comparison'], $integer_functions);
+		}));
+
+		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
+
+		$aliases = [];
+		foreach ($table_config['searchfields'] as $field => $config) {
+			if (isset($config['alias'])) {
+				foreach ($config['alias'] as $alias) {
+					$aliases[$alias] = $field;
+					$aliases['!' . $alias] = '!' . $field;
+				}
+			}
+		}
+
+		$sql_select = [];
+
+		if (isset($table_config['prepare'])) {
+			if (is_array($table_config['prepare']))
+				$sqlWith = $table_config['prepare'];
+			else
+				$sqlWith[] = $table_config['prepare'];
+		}
+
+		foreach ($searchArray as $or_search) {
+			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
+				continue;
+			unset($or_search['-filter']);
+			
+			foreach ($aliases as $alias => $field) {
+				if (isset($or_search[$alias])) {
+					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
+					unset($or_search[$alias]);
+				}
+			}
+
+			// NOTE(chris): early out if not allowed fields are in the search array
+			$used_codes = array_keys($or_search);
+			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
+				continue;
+
+			// NOTE(chris): expand general excludes to all fields
+			if (isset($or_search['!'])) {
+				$not = $or_search['!'];
+				unset($or_search['!']);
+				foreach ($table_config['searchfields'] as $code => $config) {
+					if (isset($or_search['!' . $code]))
+						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
+					else
+						$or_search['!' . $code] = $not;
+				}
+			}
+
+			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
+			if ($only_integer_fields
+				&& isset($or_search[""])
+				&& $this->_hasAtLeastOneNaN($or_search[""])
+			) {
+				continue;
+			}
+
+			$skip = false;
+			foreach ($integer_fields as $code) {
+				// NOTE(chris): filter non integer for integer fields
+				if (isset($or_search['!' . $code])) {
+					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
+						return is_numeric($a);
+					});
+					if (!$or_search['!' . $code])
+						unset($or_search['!' . $code]);
+				}
+				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
+				if (isset($or_search[$code])
+					&& $this->_hasAtLeastOneNaN($or_search[$code])
+				) {
+					$skip = true;
+					break;
+				}
+			}
+			if ($skip)
+				continue;
+
+			// NOTE(chris): sort for performance reasons
+			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
+				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
+			});
+
+			$or_with = [];
+			$or_select = [];
+			$or_prepare = [];
+
+			if (substr(key($or_search), 0, 1) == '!') {
+				// NOTE(chris): only negative searchwords
+				$sql = [];
+				foreach ($or_search as $code => $words) {
+					$code = substr($code, 1);
+					// NOTE(chris): sort for performance reasons
+					usort($words, function ($a, $b) {
+						return strlen($b) - strlen($a);
+					});
+					$field_config = $table_config['searchfields'][$code];
+
+					if (isset($field_config['prepare'])) {
+						if (is_array($field_config['prepare']))
+							$or_with = array_merge($or_with, $field_config['prepare']);
+						else
+							$or_with[] = $field_config['prepare'];
+						$or_prepare[$code] = $field_config['prepare'];
+						unset($table_config['searchfields'][$code]['prepare']);
+						unset($field_config['prepare']);
+					}
+					$field_sql = "
+						SELECT
+							" . $table_config['table'] . "." . $table_config['primarykey'] . "
+							FROM " . $table_config['table'] . "
+							" . $this->_makeJoin($field_config['join']) . "
+							WHERE ";
+					// TODO(chris): equals and equal-int could be IN () statement???
+					foreach ($words as $word) {
+						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
+					}
+				}
+
+				$or_select[] = "
+					SELECT 
+						" . $table_config['primarykey'] . ",
+						1.0 AS rank
+					FROM " . $table_config['table'] . "
+					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
+			} else {
+				$current_select = false;
+				$count = 0;
+				$skip = false;
+				foreach ($or_search as $code => $words) {
+					// NOTE(chris): sort for performance reasons
+					if ($code && substr($code, 0, 1) == '!') {
+						usort($words, function ($a, $b) {
+							return strlen($a) - strlen($b);
+						});
+					} else {
+						usort($words, function ($a, $b) {
+							return strlen($b) - strlen($a);
+						});
+					}
+					if ($code == '') {
+						foreach ($words as $i => $word) {
+							$field_sql = [];
+							foreach ($table_config['searchfields'] as $c => $field_config) {
+								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
+									continue;
+
+								$word_from = $table_config['table'];
+								$word_join = "";
+								$word_rank = "0";
+								if ($current_select) {
+									$word_from = $current_select;
+									if ($field_config['field'] != $table_config['primarykey']) {
+										$word_join .= " " . $this->_makeJoin($table_config);
+									}
+									$word_rank = "rank";
+								}
+								if (isset($field_config['prepare'])) {
+									if (is_array($field_config['prepare']))
+										$or_with = array_merge($or_with, $field_config['prepare']);
+									else
+										$or_with[] = $field_config['prepare'];
+									$or_prepare[$c] = $field_config['prepare'];
+									unset($table_config['searchfields'][$c]['prepare']);
+									unset($field_config['prepare']);
+								}
+								if (isset($field_config['join'])) {
+									$word_join .= " " . $this->_makeJoin($field_config['join']);
+								}
+								$field_sql[] = "
+									SELECT
+										" . $word_from . "." . $table_config['primarykey'] . ",
+										" . $word_rank . " AS w_rank,
+										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
+										FROM " . $word_from . "
+										" . $word_join . "
+										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+							}
+							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
+							if (!$field_sql) {
+								$or_with = [];
+								$or_select = [];
+								$count = 0;
+								$skip = true;
+								foreach ($or_prepare as $k => $v)
+									$table_config['searchfields'][$k]['prepare'] = $v;
+								break;
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								SELECT
+									" . $table_config['primarykey'] . ",
+									(w_rank + 1.0 - CASE " .
+										"WHEN MIN(rank) = 0 THEN 0 " .
+										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
+										"END))) END) AS rank
+									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
+									GROUP BY " . $table_config['primarykey'] . ", w_rank
+								)";
+							$current_select = $id;
+						}
+					} else {
+						foreach ($words as $i => $word) {
+							$where = "";
+							$rank = "";
+							$jointype = "";
+							if (substr($code, 0, 1) == '!') {
+								$c = substr($code, 1);
+								$field_config = $table_config['searchfields'][$c];
+								
+								$rank = "1";
+
+								$jointype = "LEFT";
+
+								$where = $field_config['field'] .
+									" IS NULL OR NOT (" .
+									$this->_makeCompareBool(
+										$field_config['comparison'],
+										$field_config['field'],
+										$word
+									) .
+									")";
+								if ($field_config['1-n'] ?? false) {
+									$where = "GROUP BY " .
+										$table_config['primarykey'] .
+										", rank HAVING MIN(CASE WHEN " .
+										$where .
+										" THEN 1 ELSE 0 END) = 1";
+								} else {
+									$where = "WHERE " . $where;
+								}
+							} else {
+								$field_config = $table_config['searchfields'][$code];
+
+								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
+
+								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+								$where = "WHERE " . $where;
+							}
+							$word_from = $table_config['table'];
+							$word_join = "";
+							$word_rank = "";
+							if ($current_select) {
+								$word_from = $current_select;
+								if ($field_config['field'] != $table_config['primarykey']) {
+									$word_join .= " " . $this->_makeJoin($table_config);
+								}
+								$word_rank = "rank + ";
+							}
+							if (isset($field_config['prepare'])) {
+								if (is_array($field_config['prepare']))
+									$or_with = array_merge($or_with, $field_config['prepare']);
+								else
+									$or_with[] = $field_config['prepare'];
+								$or_prepare[$code] = $field_config['prepare'];
+								unset($table_config['searchfields'][$code]['prepare']);
+								unset($field_config['prepare']);
+							}
+							if (isset($field_config['join'])) {
+								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								SELECT
+									" . $word_from . "." . $table_config['primarykey'] . ",
+									" . $word_rank . $rank . " AS rank
+									FROM " . $word_from . "
+									" . $word_join . "
+									" . $where . "
+								)";
+							$current_select = $id;
+						}
+					}
+					if ($skip)
+						break;
+					$count += count($words);
+				}
+
+				if (!$count || !$current_select)
+					continue;
+
+				$or_select[] = "
+					SELECT " . $table_config['primarykey'] . ", rank / " . $count . " AS rank FROM " . $current_select;
+			}
+
+			$sqlWith = array_merge($sqlWith, $or_with);
+			$sql_select = array_merge($sql_select, $or_select);
+		}
+
+		return $sql_select;
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	/**
-	 * Checks:
-	 * - The given searchstr is a not empty string
-	 * - The given types is a not empty array and contains allowed search types
-	 */
-	private function _checkParameters($searchstr, $types)
-	{
-		// If searchstr is empty
-		if (isEmptyString($searchstr)) return error(self::ERROR_WRONG_SEARCHSTR);
-
-		// If types is not an array or it is empty
-		if (isEmptyArray($types)) return error(self::ERROR_NO_TYPES);
-
-		// If all the elements in types are allowed search types
-		if (!isEmptyArray(array_diff($types, self::ALLOWED_TYPES))) return error(self::ERROR_WRONG_TYPES);
-
-		return success(); // The check is fine!
-	}
-
-	/**
-	 * Loops on types and perform the search of that type using searchstr
-	 * Then it collects all the returned data into an array as property of an object
-	 */
-	private function _search($searchstr, $types)
-	{
-		// Object to be returned
-		$result = new stdClass();
-		$result->data = array();
-
-		// For each search type
-		foreach ($types as $type)
-		{
-			// Perform the search and then add the result to data
-			$result->data = array_merge($result->data, $this->{'_'.$type}($searchstr, $type));
-		}
-
-		return $result;
-	}
-
-	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
-	{
-		$dbModel = new DB_Model();
-
-		$sql = '
-			SELECT
-				\''.$type.'\' AS type,
-				b.uid AS uid,
-				p.person_id AS person_id,
-				p.vorname || \' \' || p.nachname AS name,
-				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
-				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
-				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
-				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
-				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
-			  FROM public.tbl_mitarbeiter m
-			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) stdkst ON stdkst.uid = b.uid 
-			  JOIN public.tbl_person p USING(person_id)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) org ON org.uid = b.uid 
-		     LEFT JOIN (
-				SELECT kontakt, standort_id
-				  FROM public.tbl_kontakt
-				 WHERE kontakttyp = \'telefon\'
-			) k ON(k.standort_id = m.standort_id)
-			 WHERE 
-				(stdkst.bezeichnung IS NULL 
-				OR org.bezeichnung IS NULL) 
-				AND (
-			' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname'), 
-				$searchstr
-			) .
-			'
-				)
-		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
-		';
-
-		$employees = $dbModel->execReadOnlyQuery($sql);
-		
-		// If something has been found then return it
-		if (hasData($employees)) return getData($employees);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
-	{
-		$document			 = implode(' || \' \' || ', $columns);
-		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
-		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
-		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
-
-		$searchclause = <<<EOSC
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
-			OR
-			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
-			OR
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
-	
-EOSC;
-
-		return $searchclause;
-	}
-
-	/**
-	 * Search for employees
-	 */
-	private function _mitarbeiter($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$employees = $dbModel->execReadOnlyQuery('
-			SELECT
-				\''.$type.'\' AS type,
-				b.uid AS uid,
-				p.person_id AS person_id,
-				p.vorname || \' \' || p.nachname AS name,
-				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
-				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
-				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
-				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
-				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
-			  FROM public.tbl_mitarbeiter m
-			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
-			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) stdkst ON stdkst.uid = b.uid 
-			  JOIN public.tbl_person p USING(person_id)
-			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) org ON org.uid = b.uid 
-		     LEFT JOIN (
-				SELECT kontakt, standort_id
-				  FROM public.tbl_kontakt
-				 WHERE kontakttyp = \'telefon\'
-			) k ON(k.standort_id = m.standort_id)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
-				$searchstr
-			) .
-			'
-		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
-		');
-
-		// If something has been found then return it
-		if (hasData($employees)) return getData($employees);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Seach for organisation units
-	 */
-	private function _organisationunit($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$ous = $dbModel->execReadOnlyQuery('
-			SELECT
-				\''.$type.'\' AS type,
-				o.oe_kurzbz AS oe_kurzbz,
-				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
-				oParent.oe_kurzbz AS parentoe_kurzbz,
-				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
-				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
-				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
-				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
-				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
-			  FROM public.tbl_organisationseinheit o
-			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
-			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
-		     LEFT JOIN (
-				SELECT benutzerfunktion_id, oe_kurzbz
-				  FROM public.tbl_benutzerfunktion
-				 WHERE funktion_kurzbz = \'oezuordnung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
-		     LEFT JOIN (
-				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_benutzer b USING(uid)
-				  JOIN public.tbl_person p USING(person_id)
-				 WHERE funktion_kurzbz = \'Leitung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND b.aktiv = TRUE
-			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
-				$searchstr
-			) .
-			'
-		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
-		');
-
-		// If something has been found
-		if (hasData($ous))
-		{
-			// Loop through the returned dataset
-			foreach (getData($ous) as $ou)
-			{
-				// Create the new property leaders as an empty array
-				$ou->leaders = array();
-
-				// Loop through the found leaders for this organisation unit
-				for ($i = 0; $i < count($ou->leader_uid); $i++)
-				{
-					// If a leader exists for this organisationunit and has a name :D
-					if (!isEmptyString($ou->leader_uid[$i]) && !isEmptyString($ou->leader_name[$i]))
-					{
-						// Empty object that will contains the leader uid and name
-						$leader = new stdClass();
-						// Set the properties name and uid
-						$leader->uid = $ou->leader_uid[$i];
-						$leader->name = $ou->leader_name[$i];
-						// Add the leader object to the leaders array
-						$ou->leaders[] = $leader;
-					}
-				}
-
-				// Remove the not needed properties leader_uid and leader_name
-				unset($ou->leader_uid);
-				unset($ou->leader_name);
-			}
-
-			// Returns the changed dataset
-			return getData($ous);
-		}
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Search for persons
-	 */
-	private function _person($searchstr, $type)
-	{
-		return array();
-	}
-
-	/**
-	 * Search for students
-	 */
-	private function _student($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$students = $dbModel->execReadOnlyQuery('
-		SELECT
-			\''.$type.'\' AS type,
-			s.student_uid AS uid,
-			s.matrikelnr,
-			p.person_id AS person_id,
-			p.vorname || \' \' || p.nachname AS name,
-			k.kontakt as email ,
-			p.foto
-			FROM public.tbl_student s
-			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
-			JOIN public.tbl_person p USING(person_id)
-			LEFT JOIN (
-				SELECT kontakt, person_id
-				FROM public.tbl_kontakt
-					WHERE kontakttyp = \'email\'
-			) as k USING(person_id)
-				WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-					GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
-	');
-
-		// If something has been found then return it
-		if (hasData($students)) return getData($students);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Search for prestudents
-	 */
-	private function _prestudent($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$prestudent = $dbModel->execReadOnlyQuery('
-		SELECT
-			\''.$type.'\' AS type,
-			ps.prestudent_id,
-			ps.studiengang_kz,
-			p.person_id AS person_id,
-			b.uid,
-			p.vorname || \' \' || p.nachname AS name,
-			(
-				SELECT kontakt
-				FROM public.tbl_kontakt
-				WHERE kontakttyp = \'email\'
-				AND person_id = p.person_id
-				LIMIT 1
-			) as email,
-			p.foto,
-			sg.bezeichnung
-			FROM public.tbl_prestudent ps
-			LEFT JOIN public.tbl_student s USING (prestudent_id)
-			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
-			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
-			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
-			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
-			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
-			');
-
-		// If something has been found then return it
-		if (hasData($prestudent)) return getData($prestudent);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
 	/**
 	 * Search for documents
 	 */
@@ -456,5 +702,324 @@ EOSC;
 	{
 		return array();
 	}
-}
 
+	/**
+	 * Checks if an array has at least on non numeric value.
+	 *
+	 * @param array								$arr
+	 *
+	 * @return boolean
+	 */
+	private function _hasAtLeastOneNaN($arr)
+	{
+		foreach ($arr as $value)
+			if (!is_numeric($value))
+				return true;
+		return false;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param array								$join
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _makeJoin($join, $prefix = "")
+	{
+		if (!is_array($join))
+			return "";
+		if (!isset($join['table'])) {
+			$output = [];
+			foreach ($join as $j)
+				$output[] = trim($this->_makeJoin($j, $prefix));
+			return implode(" ", $output);
+		}
+		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
+			return "";
+		$output = $prefix . " JOIN " . $join['table'];
+
+		if (isset($join['using']))
+			return $output . " USING (" . $join['using'] . ")";
+
+		if (isset($join['primarykey']))
+			return $output . " USING (" . $join['primarykey'] . ")";
+
+		return $output . " ON (" . $join['on'] . ")";
+	}
+
+	/**
+	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
+	 *
+	 * @param string							$function
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeFunction($function, $mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$tpl = $searchfunction[$function] ?? "";
+		
+		if (strstr($tpl, '{field}'))
+			$tpl = str_replace('{field}', $field, $tpl);
+
+		if (strstr($tpl, '{word}'))
+			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
+		if (strstr($tpl, '{like:word}'))
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escapeLike($word) . "%'", $tpl);
+		
+		return $tpl;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeRank($mode, $field, $word)
+	{
+		return $this->_makeFunction('rank', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompare($mode, $field, $word)
+	{
+		return $this->_makeFunction('compare', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompareBool($mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
+		return $this->_makeFunction($function, $mode, $field, $word);
+	}
+
+	/**
+	 * Converts the search string to an array.
+	 * First level should be joined with an OR.
+	 * Second level should be joined with an AND or AND NOT.
+	 * It is an associative array where the key is a code for the field
+	 * which the words should be compared with and the value is the array
+	 * of words.
+	 * Use AND NOT if the first letter in the key is "!".
+	 * Use AND if the first letter in the key is not "!".
+	 * E.g:
+	 * If the key is:
+	 * "": the words should be compared to all fields with AND.
+	 * "!": the words should be compared to all fields with AND NOT.
+	 * "somefield": the words should be compared to the field somefield with
+	 * AND.
+	 * "!somefield": the words should be compared to the field somefield with
+	 * AND NOT.
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types
+	 *
+	 * @return array
+	 */
+	private function _convertQuery($searchstring, $types)
+	{
+		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
+		$allowedTypes = array_keys($types);
+
+		$currentArray = [];
+		$outputArray = [];
+		$cleanStrings = [];
+		$cleanSearchstring = '';
+		$filter = ['+' => [], '-' => []];
+		$typeAliases = [];
+
+		$tmp = explode(' ', strtolower($searchstring));
+		while ($tmp) {
+			$chunk = trim(array_shift($tmp));
+			if ($chunk == '')
+				continue;
+
+			if (strpos($chunk, '"') !== false) {
+				$test = explode('"', $chunk);
+				if (count($test) > 2) {
+					$rest = implode('"', array_slice($test, 2));
+					if ($rest) {
+						array_unshift($tmp, $rest);
+						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
+					}
+				}
+				if (count($test) == 2) {
+					while ($tmp && strpos($test[1], '"') === false) {
+						$test[1] .= ' ' . trim(array_shift($tmp));
+					}
+					if (strpos($test[1], '"') === false) {
+						$chunk = implode('"', $test) . '"';
+					} else {
+						$test2 = explode('"', $test[1], 2);
+						$chunk = $test[0] . '"' . $test2[0] . '"';
+						if ($test2[1]) {
+							array_unshift($tmp, $test2[1]);
+						}
+					}
+				}
+				if (strpos($chunk, ' ') === false) {
+					$chunk = str_replace('"', '', $chunk);
+				}
+			}
+
+			if ($chunk == 'or') {
+				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+				$filter = ['+' => [], '-' => []];
+				if ($currentArray) {
+					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+					$cleanStrings = [];
+					$outputArray[] = $currentArray;
+					$currentArray = [];
+				}
+				continue;
+			}
+
+			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
+				continue;
+
+			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
+				if (!$typeAliases) {
+					foreach ($types as $type => $config) {
+						$typeAliases[$type] = $type;
+						if (isset($config['alias'])) {
+							foreach ($config['alias'] as $alias) {
+								if (!isset($typeAliases[$alias]))
+									$typeAliases[$alias] = $type;
+							}
+						}
+					}
+				}
+
+				$test = explode(':', $chunk, 2);
+				if (isset($typeAliases[$test[1]]))
+					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
+				elseif ($test[0] == '-')
+					continue;
+			}
+
+			if (in_array($chunk, $cleanStrings))
+				continue;
+
+			$cleanStrings[] = $chunk;
+
+			$chunk = str_replace('"', '', $chunk);
+			$code = '';
+
+			if ($chunk[0] == '-') {
+				$code = '!';
+				$chunk = substr($chunk, 1);
+			}
+			if (strpos($chunk, ':') !== false) {
+				$chunk = explode(':', $chunk, 2);
+				if (!$chunk[0]) {
+					$filter[$code ? '-' : '+'][] = $chunk[1];
+					continue;
+				}
+				$code .= $chunk[0];
+				$chunk = $chunk[1];
+			}
+
+			if (!isset($currentArray[$code]))
+				$currentArray[$code] = [];
+			
+			$currentArray[$code][] = $chunk;
+		}
+
+		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+		if ($currentArray) {
+			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+			$outputArray[] = $currentArray;
+		}
+		return [$outputArray, $cleanSearchstring];
+	}
+
+	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	{
+		if ($filter['+'] && $filter['-']) {
+			$double = array_intersect($filter['+'], $filter['-']);
+			if ($double) {
+				foreach ($double as $type) {
+					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['+'] = array_diff($filter['+'], $double);
+				$filter['-'] = array_diff($filter['-'], $double);
+			}
+			if (!$filter['+'] && !$filter['-']) {
+				// All filters cancel each other out
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			if ($filter['+']) {
+				foreach ($filter['-'] as $type) {
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['-'] = [];
+			}
+		}
+		if ($filter['+']) {
+			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
+			if (!$cleanFilter) {
+				// All filters are forbidden
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
+			foreach ($forbiddenFilter as $type) {
+				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+			}
+			$filter['+'] = $cleanFilter;
+		} elseif ($filter['-']) {
+			$filter['+'] = array_diff($allowedTypes, $filter['-']);
+			if (!$searchAllTypes) {
+				foreach ($filter['+'] as $type)
+					$cleanStrings[] = ':' . $type;
+				foreach ($filter['-'] as $type)
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+			}
+		} else {
+			if (!$searchAllTypes) {
+				foreach ($allowedTypes as $type)
+					$cleanStrings[] = ':' . $type;
+			}
+		}
+
+		if ($filter['+']) {
+			$currentArray['-filter'] = $filter['+'];
+		}
+	}
+}
diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar.css
index 2bbaf9d67..61032d227 100644
--- a/public/css/components/searchbar.css
+++ b/public/css/components/searchbar.css
@@ -92,4 +92,42 @@
 
 .searchbar_inline_ul li {
     list-style: none;
+}
+
+/* new variant with template/frame */
+
+.searchbar-result {
+    border-bottom: 1px solid lightgrey;
+    margin-bottom: 1rem;
+    padding-bottom: 1rem;
+}
+
+.searchbar-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: .5rem;
+    padding: 0;
+    margin: 1rem 0 0;
+}
+
+.searchbar-square-image {
+    position: relative;
+    display: block;
+    height: 0;
+    padding-bottom: 100%;
+}
+
+.searchbar-square-image > * {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+}
+.searchbar-square-image img {
+    object-fit: cover;
+}
+
+.no-margin-paragraphs p {
+    margin: 0;
 }
\ No newline at end of file
diff --git a/public/js/api/search.js b/public/js/api/search.js
index 4655d8fa8..c6a5d77a5 100644
--- a/public/js/api/search.js
+++ b/public/js/api/search.js
@@ -16,9 +16,9 @@
  */
 
 export default {
-	search(searchsettings) {
+	search(searchsettings, config) {
 		const url = '/api/frontend/v1/searchbar/search';
-		return this.$fhcApi.post(url, searchsettings);
+		return this.$fhcApi.post(url, searchsettings, config);
 	},
 	searchdummy(searchsettings) {
 		const url = 'public/js/apps/api/dummyapi.php/Search';
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
new file mode 100644
index 000000000..1c4da075a
--- /dev/null
+++ b/public/js/components/searchbar/result/employee.js
@@ -0,0 +1,59 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="res.photo_url"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Standard-Kostenstelle</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
+						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
+					</ul>
+					<span v-else="">keine</span>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Organisations-Einheit</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
+						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
+					</ul>
+					<span v-else="">keine</span>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a :href="'mailto:' + res.email" class="d-block">
+						{{ res.email }}
+					</a>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Telefon</div>
+				<div class="searchbar_tablecell">
+					<a :href="'tel:' + res.phone" class="d-block">
+						{{ res.phone }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
new file mode 100644
index 000000000..f6b07f3d2
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -0,0 +1,166 @@
+import TemplateFrame from "./template/frame.js";
+import TemplateAction from "./template/action.js";
+
+export default {
+	components: {
+		TemplateFrame,
+		TemplateAction
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		telurl() {
+			return 'tel:' + this.employee?.phone;
+		},
+		person() {
+			const person = this.res.list.filter(item => item.type == 'person');
+			if (person.length)
+				return person.pop();
+
+			const { person_id, name, foto, photo_url, email } = this.res.list[0];
+			return { person_id, name, foto, photo_url, email };
+		},
+		employee() {
+			const ma = this.res.list.filter(item => [
+				'employee',
+				'unassigned_employee'
+			].includes(item.type));
+			return ma.length ? ma.pop() : null;
+		},
+		students() {
+			const students = this.res.list.filter(item => item.type == 'prestudent');
+			return students.length ? students : null;
+		},
+		foto() {
+			if (this.person.foto)
+				return 'data:image/jpeg;base64,' + this.person.foto;
+			return this.person.photo_url;
+		},
+		emails() {
+			if (Array.isArray(this.person.email))
+				return this.person.email;
+			return [this.person.email];
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-mergedperson"
+		:res="person"
+		:actions="actions"
+		:title="person.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ person.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+
+			<template v-if="employee">
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell">
+						<template-action
+							:res="employee"
+							:action="actions.defaultactionemployee || actions.defaultaction"
+							@actionexecuted="$emit('actionexecuted')"
+							>
+							Mitarbeiter
+						</template-action>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Standard-Kostenstelle</div>
+					<div class="searchbar_tablecell">
+						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
+							<li
+								v-for="(stdkst, idx) in employee.standardkostenstelle"
+								:key="idx"
+								>
+								{{ stdkst }}
+							</li>
+						</ul>
+						<span v-else="">keine</span>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Organisations-Einheit</div>
+					<div class="searchbar_tablecell">
+						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
+							<li
+								v-for="(oe, idx) in employee.organisationunit_name"
+								:key="idx"
+								>
+								{{ oe }}
+							</li>
+						</ul>
+						<span v-else="">keine</span>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Telefon</div>
+					<div class="searchbar_tablecell">
+						<a :href="telurl">
+							{{ employee.phone }}
+						</a>
+					</div>
+				</div>
+			</template>
+
+			<template v-if="students">
+				<template v-for="student in students">
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell">
+							<template-action
+								v-if="actions.defaultaction"
+								:res="student"
+								:action="actions.defaultactionstudent || actions.defaultaction"
+								@actionexecuted="$emit('actionexecuted')"
+								>
+								{{ student.status }} ({{ student.stg_kuerzel }})
+							</template-action>
+						</div>
+					</div>
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Studiengang</div>
+						<div class="searchbar_tablecell">
+							{{ student.bezeichnung }}
+						</div>
+					</div>
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Prestudent ID</div>
+						<div class="searchbar_tablecell">
+							{{ student.prestudent_id }}
+						</div>
+					</div>
+					<div v-if="student.uid" class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Student UID</div>
+						<div class="searchbar_tablecell">
+							{{ student.uid }}
+						</div>
+					</div>
+					<div v-if="student.matrikelnr" class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Matrikelnummer</div>
+						<div class="searchbar_tablecell">
+							{{ student.matrikelnr }}
+						</div>
+					</div>
+				</template>
+			</template>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
new file mode 100644
index 000000000..aa5d7739f
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -0,0 +1,35 @@
+import ResultPrestudent from "./prestudent.js";
+import ResultStudent from "./student.js";
+
+export default {
+	components: {
+		ResultPrestudent,
+		ResultStudent
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		prestudent() {
+			const prestudent = this.res.list.filter(item => item.type == 'prestudent');
+			return prestudent.pop();
+		}
+	},
+	template: `
+	<result-prestudent
+		v-if="prestudent"
+		:res="prestudent"
+		:actions="actions"
+		@actionexecuted="$emit('actionexecuted')"
+		class="searchbar-result-mergedstudent"
+	></result-prestudent>
+	<result-student
+		v-else
+		:res="res.list[0]"
+		:actions="actions"
+		@actionexecuted="$emit('actionexecuted')"
+		class="searchbar-result-mergedstudent"
+	></result-student>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
new file mode 100644
index 000000000..f9b6870e0
--- /dev/null
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -0,0 +1,63 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-organisationunit"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		image-fallback="fas fa-sitemap fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
+				<div class="searchbar_tablecell">
+					{{ res.parentoe_name }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Gruppen-EMail</div>
+				<div class="searchbar_tablecell">
+					<a :href="'mailto:' + res.mailgroup">
+						{{ res.mailgroup }}
+					</a>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Leiter</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
+						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
+					</ul>
+					<span v-else="">N.N.</span>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
+				<div class="searchbar_tablecell">
+					{{ res.number_of_people }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
new file mode 100644
index 000000000..f8adee56e
--- /dev/null
+++ b/public/js/components/searchbar/result/person.js
@@ -0,0 +1,46 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
new file mode 100644
index 000000000..8c174d3c0
--- /dev/null
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -0,0 +1,70 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-prestudent"
+		:res="res"
+		:actions="actions"
+		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+			<div v-if="res.uid" class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">
+					{{ res.uid }}
+				</div>
+			</div>
+			<div v-if="res.matrikelnr" class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">
+					{{ res.matrikelnr }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Prestudent ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.prestudent_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Studiengang</div>
+				<div class="searchbar_tablecell">
+					{{ res.bezeichnung }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
new file mode 100644
index 000000000..6da1e970a
--- /dev/null
+++ b/public/js/components/searchbar/result/room.js
@@ -0,0 +1,74 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		equipment() {
+			if (!this.res.equipment)
+				return "";
+			return this.res.equipment.replace(new RegExp('<br />', 'ig'), '');
+		},
+		address() {
+			let address = this.res.zip || '';
+			if (this.res.city)
+				address += (address ? ' ' : '') + this.res.city;
+			if (this.res.street)
+				address += (address ? ', ' : '') + this.res.street;
+			if (this.res.floor)
+				address += (address ? ' / ' : '') + this.res.floor + ' Stockwerk';
+
+			return address || 'N/A';
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-room"
+		:res="res"
+		:actions="actions"
+		:title="res.ort_kurzbz"
+		image-fallback="fas fa-door-open fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Standort</div>
+				<div class="searchbar_tablecell">
+					{{ address }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Sitzplätze</div>
+				<div class="searchbar_tablecell">
+					<template v-if="res.max_person !== null && res.workplaces !== null">
+						{{ res.max_person }}, davon {{ res.workplaces }} PC-Plätze
+					</template>
+					<template v-else>
+						N/A
+					</template>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Gebäude</div>
+				<div class="searchbar_tablecell">
+					{{ res.building }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Zusatz Informationen</div>
+				<div class="searchbar_tablecell">
+					<div class="no-margin-paragraphs" v-html="equipment"></div>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
new file mode 100644
index 000000000..8d8c4894b
--- /dev/null
+++ b/public/js/components/searchbar/result/student.js
@@ -0,0 +1,58 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">
+					{{ res.uid }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">
+					{{ res.matrikelnr }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
new file mode 100644
index 000000000..a7654df59
--- /dev/null
+++ b/public/js/components/searchbar/result/template/action.js
@@ -0,0 +1,28 @@
+export default {
+	emits: [ 'actionexecuted' ],
+	props: { 
+		res: Object,
+		action: Object
+	},
+	computed: {
+		actionHref() {
+			if (this.action.type !== 'link')
+				return 'javascript:void(0);';
+			return typeof this.action.action === 'function'
+				? this.action.action(this.res) 
+				: this.action.action;
+		}
+	},
+	methods: {
+		actionFunc() {
+			if (this.action.type !== 'function')
+				return;
+			this.action.action(this.res);
+			this.$emit('actionexecuted');
+		}
+	},
+	template: `
+	<a :href="actionHref" @click="actionFunc">
+		<slot>Action</slot>
+	</a>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
new file mode 100644
index 000000000..5849594ed
--- /dev/null
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -0,0 +1,26 @@
+import ResultAction from "./action.js";
+
+export default {
+	components: {
+		ResultAction
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Array
+	},
+	template: `
+	<div v-if="actions.length" class="searchbar-actions">
+		<result-action
+			v-for="(action, index) in actions"
+			:key="action.label"
+			:res="res"
+			:action="action"
+			class="btn btn-primary btn-sm"
+			@actionexecuted="$emit('actionexecuted')"
+			>
+			<i v-if="action.icon" :class="action.icon"></i>
+			<span class="p-2">{{ action.label }}</span>
+		</result-action>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
new file mode 100644
index 000000000..87078a166
--- /dev/null
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -0,0 +1,59 @@
+import ResultAction from "./action.js";
+import ResultActions from "./actions.js";
+
+export default {
+	components: {
+		ResultAction,
+		ResultActions
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object,
+		title: String,
+		image: String,
+		imageFallback: String
+	},
+	template: `
+	<div class="searchbar-result">
+		<div class="searchbar_grid">
+			<div class="searchbar_icon">
+				<result-action
+					:res="res"
+					:action="actions.defaultaction"
+					@actionexecuted="$emit('actionexecuted')"
+					class="searchbar-square-image"
+					>
+					<img
+						v-if="image"
+						:src="image"
+						class="rounded-circle"
+						/>
+					<div v-else class="d-flex justify-content-center align-items-center rounded-circle overflow-hidden">
+						<i :class="imageFallback"></i>
+					</div>
+				</result-action>
+			</div>
+
+			<div class="searchbar_data">
+				<result-action
+					:res="res"
+					:action="actions.defaultaction"
+					@actionexecuted="$emit('actionexecuted')"
+					class="mb-3"
+					>
+					<span class="fw-bold">{{ title }}</span>
+				</result-action>
+
+				<slot></slot>
+
+				<result-actions
+					:res="res"
+					:actions="actions.childactions"
+					@actionexecuted="$emit('actionexecuted')"
+					>
+				</result-actions>
+			</div>
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index d23ab2226..54049679e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,168 +1,282 @@
-import person from "./person.js";
-import raum from "./raum.js";
-import employee from "./employee.js";
-import organisationunit from "./organisationunit.js";
-import student from "./student.js";
-import prestudent from "./prestudent.js";
+import ResultPerson from "./result/person.js";
+import ResultStudent from "./result/student.js";
+import ResultPrestudent from "./result/prestudent.js";
+import ResultEmployee from "./result/employee.js";
+import ResultOrganisationunit from "./result/organisationunit.js";
+import ResultRoom from "./result/room.js";
+import ResultMergedperson from "./result/mergedperson.js";
+import ResultMergedstudent from "./result/mergedstudent.js";
+
+// TODO(chris): arrays in results
 
 export default {
-    props: [ "searchoptions", "searchfunction" ],
-    data: function() {
-      return {
-        searchtimer: null,
-        hidetimer: null,
-        showsettings: false,
-        searchsettings: {
-            searchstr: '',
-            types: []
-        },
-        showresult: false,        
-        searchresult: [],
-        searching: false,
-        error: null
-      };
-    },
-    components: {
-      person: person,
-      raum: raum,
-      employee: employee,
-      organisationunit: organisationunit,
-      student: student,
-      prestudent: prestudent
-    },
-    template: `
-          <form ref="searchform" class="d-flex me-3 position-relative" action="javascript:void(0);" 
-            @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-            <div class="input-group me-2 bg-white">
-                <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" placeholder="Suche..." aria-label="Search">
-                <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-light border-start" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
-            </div>            
-        
-            <div v-show="this.showresult" ref="result" 
-                 class="searchbar_results" tabindex="-1">
-              <div v-if="this.searching">
-                <i class="fas fa-spinner fa-spin fa-2x"></i>
-              </div>
-              <div v-else-if="this.error !== null">{{ this.error }}</div>
-              <div v-else-if="this.searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
-              <template v-else="" v-for="res in this.searchresult">
-                <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <employee v-else-if="res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
-                <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
-              </template>
-            </div>
-            <div v-show="this.showsettings" ref="settings" 
-                 class="searchbar_settings" tabindex="-1">
-              <div class="btn-group" v-if="this.searchoptions.types.length > 0">
-                <template v-for="(type, index) in this.searchoptions.types" :key="type">
-                  <input type="checkbox" class="btn-check" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="this.searchsettings.types"/>
-                  <label class="btn btn-outline-secondary" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
-                </template>
-              </div>
-              <div class="mb-2"></div>
-              <button ref="settingsrefreshsearch" @click="this.refreshsearch" class="btn btn-primary" type="button">Übernehmen</button>
-            </div>
-        
-          </form>
-    `,
-    beforeMount: function() {
-        this.updateSearchOptions();
-    },
-    methods: {
-        updateSearchOptions: function() {
-            this.searchsettings.types = [];
-            for( const idx in this.searchoptions.types ) {
-                this.searchsettings.types.push(this.searchoptions.types[idx]);
-            }
-        },
-        calcSearchResultExtent: function() {
-            var rect = this.$refs.searchbox.getBoundingClientRect();
+	components: {
+		ResultPerson,
+		ResultStudent,
+		ResultPrestudent,
+		ResultEmployee,
+		ResultOrganisationunit,
+		ResultRoom,
+		ResultMergedperson,
+		ResultMergedstudent
+	},
+	props: [ "searchoptions", "searchfunction" ],
+	data() {
+		return {
+			searchtimer: null,
+			hidetimer: null,
+			showsettings: false,
+			searchsettings: {
+				searchstr: '',
+				types: []
+			},
+			showresult: false,        
+			searchresult: [],
+			searching: false,
+			error: null,
+			abortController: null,
+			retry: 5
+		};
+	},
+	beforeMount() {
+		this.updateSearchOptions();
+	},
+	methods: {
+		updateSearchOptions() {
+			this.searchsettings.types = [];
+			for (const idx in this.searchoptions.types) {
+				this.searchsettings.types.push(this.searchoptions.types[idx]);
+			}
+		},
+		calcSearchResultExtent() {
+			var rect = this.$refs.searchbox.getBoundingClientRect();
             //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-             this.$refs.result.style.height = Math.floor(window.innerHeight * 0.80) + 'px';
-        },
-        search: function() {
-            if( this.searchtimer !== null ) {
-                clearTimeout(this.searchtimer);
-            }
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.calcSearchResultExtent();
-                this.searchtimer = setTimeout(
-                    this.callsearchapi,
-                    500
-                );
-            } else {                
-                this.showresult = false;
-            }
-        },
-        callsearchapi: function() {            
-            var that = this;
-            this.error = null;
-            this.searchresult = [];
-            this.searching = true;
-            this.showsearchresult();            
-            this.searchfunction(this.searchsettings)
-            .then(function(response) {
-                if( response.data?.error === 1 ) {
-                    that.error = 'Bei der Suche ist ein Fehler aufgetreten.';
-                } else {
-                    that.searchresult = response.data.data;
-                }
-            })
-            .catch(function(error) {
-                that.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
-                    + ' ' + error.message;
-            })
-            .finally(function() {
-                that.searching = false;
-            });
-        },
-        refreshsearch: function() {
-          this.search();
-          this.togglesettings();
-        },
-        calcSearchSettingsExtent: function() {
-            var rect = this.$refs.settingsbutton.getBoundingClientRect();
+			this.$refs.result.style.height = Math.floor(window.innerHeight * 0.80) + 'px';
+		},
+		search() {
+			if (this.searchtimer !== null) {
+				clearTimeout(this.searchtimer);
+			}
+			if (this.abortController) {
+				this.abortController.abort();
+				this.abortController = null;
+			}
+			if (this.searchsettings.searchstr.length >= 2) {
+				this.calcSearchResultExtent();
+				this.searchtimer = setTimeout(
+					this.callsearchapi,
+					500
+				);
+			} else {                
+				this.showresult = false;
+			}
+		},
+		callsearchapi() {
+			this.error = null;
+			this.searchresult = [];
+			this.searching = true;
+			this.showsearchresult();  
+			
+			if (this.abortController)
+				this.abortController.abort();
+			this.abortController = new AbortController();
+
+			this
+				.searchfunction(this.searchsettings, { signal: this.abortController.signal })
+				.then(response => {
+					if (!response.data) {
+						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+					} else {
+						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
+						if (this.searchoptions.mergeResults) {
+							let counter = 0;
+							let mergeTypes = [];
+							let mergedType = 'merged';
+							let mergeKey = '';
+
+							switch (this.searchoptions.mergeResults) {
+							case 'student':
+								mergeTypes = ['student', 'prestudent'];
+								mergedType += this.searchoptions.mergeResults;
+								mergeKey = 'uid';
+								break;
+							case 'person':
+								mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+								mergedType += this.searchoptions.mergeResults;
+								mergeKey = 'person_id';
+								break;
+							}
+
+							if (mergeTypes.length) {
+								res = Object.values(res.reduce((a, c) => {
+									if (!mergeTypes.includes(c.type)) {
+										a['nomerge' + counter++] = c;
+									} else if (c[mergeKey] === null) {
+										a['nomerge' + counter++] = c;
+									} else if (a[c[mergeKey]] === undefined) {
+										a[c[mergeKey]] = {
+											rank: c.rank,
+											type: mergedType,
+											list: [c]
+										};
+									} else {
+										a[c[mergeKey]].list.push(c);
+										if (c.rank > a[c[mergeKey]].rank)
+											a[c[mergeKey]].rank = c.rank;
+									}
+									return a;
+								}, {})).sort((a, b) => b.rank - a.rank);
+							}
+						}
+						this.searchresult = res;
+					}
+					this.searching = false;
+					this.retry = 5;
+				})
+				.catch(error => {
+					if (error.code == "ERR_CANCELED") {
+						return this.retry = 5;
+					}
+					if (error.code == "ECONNABORTED" && this.retry) {
+						this.retry--;
+						return this.callsearchapi();
+					}
+
+					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
+					this.searching = false;
+					this.retry = 5;
+				});
+		},
+		refreshsearch() {
+			this.search();
+			this.togglesettings();
+		},
+		calcSearchSettingsExtent() {
+			var rect = this.$refs.settingsbutton.getBoundingClientRect();
             //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-            this.$refs.settings.style.top = Math.floor(rect.bottom + 3) + 'px';
-            this.$refs.settings.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
-            this.$refs.settings.style.width = Math.floor(window.innerWidth * 0.5) + 'px';
+			this.$refs.settings.style.top = Math.floor(rect.bottom + 3) + 'px';
+			this.$refs.settings.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
+			this.$refs.settings.style.width = Math.floor(window.innerWidth * 0.5) + 'px';
             //this.$refs.settings.style.height = Math.floor(window.innerHeight * 0.5) + 'px';  
-        },
-        togglesettings: function() {
-            this.showsettings = !this.showsettings;
-            this.calcSearchSettingsExtent();
-        },
-        hideresult: function() {
-            this.showresult = false;
-            window.removeEventListener('resize', this.calcSearchResultExtent);
-        },
-        showsearchresult: function() {
-            if( this.searchsettings.searchstr.length >= 3 ) {
-                this.showresult = true;
-                window.addEventListener('resize', this.calcSearchResultExtent);
-            }
-        },
-        searchfocusin: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if( this.hidetimer !== null ) {
-                clearTimeout(this.hidetimer);
-            }
-        },
-        searchfocusout: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            this.hidetimer = setTimeout(
-                this.hideresult,
-                100
-            );
-        }
-    }
+		},
+		togglesettings() {
+			this.showsettings = !this.showsettings;
+			this.calcSearchSettingsExtent();
+		},
+		hideresult() {
+			this.showresult = false;
+			window.removeEventListener('resize', this.calcSearchResultExtent);
+		},
+		showsearchresult() {
+			if (this.searchsettings.searchstr.length >= 3) {
+				this.showresult = true;
+				window.addEventListener('resize', this.calcSearchResultExtent);
+			}
+		},
+		searchfocusin(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			if (this.hidetimer !== null) {
+				clearTimeout(this.hidetimer);
+			}
+		},
+		searchfocusout(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			this.hidetimer = setTimeout(
+				this.hideresult,
+				100
+			);
+		}
+	},
+	template: `
+	<form
+		ref="searchform"
+		class="d-flex me-3 position-relative"
+		action="javascript:void(0);"
+		@focusin="searchfocusin"
+		@focusout="searchfocusout"
+	>
+		<div class="input-group me-2 bg-white">
+			<input
+				ref="searchbox"
+				@input="search"
+				@focus="showsearchresult"
+				v-model="searchsettings.searchstr"
+				class="form-control"
+				type="search"
+				placeholder="Suche..."
+				aria-label="Search"
+			>
+			<button
+				ref="settingsbutton"
+				@click="togglesettings"
+				class="btn btn-light border-start"
+				type="button"
+				id="search-filter"
+				>
+				<i class="fas fa-cog"></i>
+			</button>
+		</div>
+
+		<div
+			v-show="showresult"
+			ref="result"
+			class="searchbar_results"
+			tabindex="-1"
+		>
+			<div v-if="searching">
+				<i class="fas fa-spinner fa-spin fa-2x"></i>
+			</div>
+			<div v-else-if="error !== null">{{ error }}</div>
+			<div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+			<template v-else>
+				<template v-for="res in searchresult">
+					<result-person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></result-person>
+					<result-student v-else-if="res.type === 'student'" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></result-student>
+					<result-prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></result-prestudent>
+					<result-employee v-else-if="res.type === 'employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
+					<result-employee v-else-if="res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
+					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
+					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
+					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
+					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
+					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+				</template>
+			</template>
+		</div>
+		<div
+			v-show="showsettings"
+			ref="settings"
+			class="searchbar_settings"
+			tabindex="-1"
+		>
+			<div class="btn-group" v-if="searchoptions.types.length > 0">
+				<template v-for="(type, index) in searchoptions.types" :key="type">
+					<input
+						type="checkbox"
+						class="btn-check"
+						:id="$.uid + 'search_type_' + index"
+						:value="type"
+						v-model="searchsettings.types"
+					/>
+					<label
+						class="btn btn-outline-secondary"
+						:for="$.uid + 'search_type_' + index"
+					>
+						{{ type }}
+					</label>
+				</template>
+			</div>
+			<div class="mb-2"></div>
+			<button
+				ref="settingsrefreshsearch"
+				@click="refreshsearch"
+				class="btn btn-primary"
+				type="button"
+			>
+				Übernehmen
+			</button>
+		</div>
+	</form>`
 };
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 7be1a5b9f..dbf5069b8 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -40,6 +40,8 @@ export default {
 		function _clean_return_value(response) {
 			const result = response.data;
 			delete response.data;
+			if (!result)
+				return {meta: {response}, data: null};
 			if (!result.meta)
 				result.meta = {response};
 			else
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 11880fd55..9bdccecf8 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -58,6 +58,7 @@ require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
+require_once('dbupdate_3.4/40128_search.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
new file mode 100644
index 000000000..2ef8f8b4a
--- /dev/null
+++ b/system/dbupdate_3.4/40128_search.php
@@ -0,0 +1,171 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Activate module pg_trgm
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_extension WHERE extname = 'pg_trgm' LIMIT 1;")))
+{
+	$qry = "CREATE extension pg_trgm;";
+
+	if (!$db->db_query($qry))
+		echo '<strong>Module pg_trgm ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'Module pg_trgm: activated<br>';
+}
+
+
+// Add additional computed columns
+// Add column fts_bezeichnung to public.tbl_organisationseinheit
+if (!@$db->db_query("SELECT fts_bezeichnung FROM public.tbl_organisationseinheit LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_organisationseinheit ADD COLUMN fts_bezeichnung tsvector;";
+	$qry .= "COMMENT ON COLUMN public.tbl_organisationseinheit.fts_bezeichnung IS 'used for search - auto generated w triggers';";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: new column "fts_bezeichnung" added<br>';
+}
+
+// Add function tr_update_tbl_organisationseinheit_fts_bezeichnung to public
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_update_tbl_organisationseinheit_fts_bezeichnung' LIMIT 1;")))
+{
+	$qry = "CREATE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung()
+		RETURNS TRIGGER 
+		LANGUAGE PLPGSQL
+		AS
+		$$
+		BEGIN
+			IF TG_TABLE_NAME = 'tbl_organisationseinheit' THEN
+				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((SELECT bezeichnung FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
+			ELSIF TG_TABLE_NAME = 'tbl_organisationseinheittyp' THEN
+				UPDATE public.tbl_organisationseinheit SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
+			END IF;
+			RETURN NEW;
+		END;
+		$$";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tr_update_tbl_organisationseinheit_fts_bezeichnung ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tr_update_tbl_organisationseinheit_fts_bezeichnung: function created<br>';
+}
+
+$update_column = false;
+// Add trigger tr_organisationseinheit_update_organisationseinheittyp_kurzbz to public.tbl_organisationseinheit
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheit' AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' LIMIT 1;")))
+{
+	$qry = "CREATE TRIGGER tr_organisationseinheit_update_organisationseinheittyp_kurzbz
+		BEFORE UPDATE OF organisationseinheittyp_kurzbz OR INSERT
+		ON public.tbl_organisationseinheit
+		FOR EACH ROW
+		EXECUTE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung();";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else {
+		echo 'public.tbl_organisationseinheit: trigger "tr_organisationseinheit_update_organisationseinheittyp_kurzbz" created<br>';
+		$update_column = true;
+	}
+}
+
+// Add trigger tr_organisationseinheittyp_update_bezeichnung to public.tbl_organisationseinheittyp
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheittyp' AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' LIMIT 1;")))
+{
+	$qry = "CREATE TRIGGER tr_organisationseinheittyp_update_bezeichnung
+		BEFORE UPDATE OF bezeichnung
+		ON public.tbl_organisationseinheittyp
+		FOR EACH ROW
+		EXECUTE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung();";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheittyp ' . $db->db_last_error() . '</strong><br>';
+	else {
+		echo 'public.tbl_organisationseinheittyp: trigger "tr_organisationseinheittyp_update_bezeichnung" created<br>';
+		$update_column = true;
+	}
+}
+
+// Update fts_bezeichnung on tbl_organisationseinheit with new triggers
+if ($update_column)
+{
+	$qry = "UPDATE public.tbl_organisationseinheittyp SET bezeichnung = bezeichnung;";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: column "fts_bezeichnung" updated<br>';
+}
+
+
+// Add Trigram Indexes
+// Add index for kontakt to public.tbl_kontakt
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_kontakt_kontakt_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_kontakt_kontakt_trgm ON public.tbl_kontakt USING GIN (COALESCE(kontakt, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_kontakt ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_kontakt: added index "idx_tbl_kontakt_kontakt_trgm"<br>';
+	}
+}
+// Add index for vorname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_vorname_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_vorname_trgm ON public.tbl_person USING GIN (COALESCE(vorname, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_vorname_trgm"<br>';
+	}
+}
+// Add index for nachname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_nachname_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_nachname_trgm ON public.tbl_person USING GIN (COALESCE(nachname, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_nachname_trgm"<br>';
+	}
+}
+// Add index for vorname || ' ' || nachname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_name_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_name_trgm ON public.tbl_person USING GIN (COALESCE((vorname || ' ' || nachname), '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_name_trgm"<br>';
+	}
+}
+
+
+// Add Vector Indexes
+// Add index for fts_bezeichnung to public.tbl_organisationseinheit
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_organisationseinheit_fts_bezeichnung_vector' LIMIT 1;")))
+{
+	$qry = "CREATE INDEX idx_tbl_organisationseinheit_fts_bezeichnung_vector ON public.tbl_organisationseinheit USING GIN (fts_bezeichnung);";
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: added index "idx_tbl_organisationseinheit_fts_bezeichnung_vector"<br>';
+}

From 7174f9cbe08950efb65cf2acd295b41f808f374f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Sep 2024 14:38:33 +0200
Subject: [PATCH 0004/1357] Use Merged Person

---
 public/js/components/Stv/Studentenverwaltung.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e2ca8e349..57dd82081 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -91,8 +91,20 @@ export default {
 						},
 						childactions: [
 						]
+					},
+					mergedperson: {
+						defaultaction: {
+							type: "link",
+							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
+						},
+						defaultactionstudent: {
+							type: "link",
+							action: data => this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id)
+						},
+						childactions: []
 					}
-				}
+				},
+				mergeResults: 'person'
 			},
 			studiengangKz: undefined,
 			studiensemesterKurzbz: this.defaultSemester,

From bf1bc8d1a97dbb52c2d1bd30a295a3909058da22 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sun, 13 Oct 2024 13:32:15 +0200
Subject: [PATCH 0005/1357] added new contact type email unverifiziert and
 adresse type meldeadresse (mainly for electronic onboarding)

---
 system/dbupdate_3.4.php                       |  1 +
 ...14_electronic_onboarding_anbindung_ida.php | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 11880fd55..d3b7b454d 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -58,6 +58,7 @@ require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
+require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php b/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php
new file mode 100644
index 000000000..ccc0a5827
--- /dev/null
+++ b/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php
@@ -0,0 +1,30 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// public.tbl_kontakttyp: add type email unverified
+if($result = $db->db_query("SELECT 1 FROM public.tbl_kontakttyp WHERE kontakttyp='email_unverifiziert'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+	$qry = "INSERT INTO public.tbl_kontakttyp(kontakttyp, beschreibung, bezeichnung_mehrsprachig) VALUES('email_unverifiziert', 'Unverifizierte E-Mail', '{\"Unverifizierte E-Mail\", \"Unverified email\"}');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Kontakttyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Neuen Kontakttyp E-Mail unverifiziert in public.tbl_kontakttyp hinzugefügt';
+	}
+}
+
+// public.tbl_adressentyp: add type Meldeadresse
+if($result = $db->db_query("SELECT 1 FROM public.tbl_adressentyp WHERE adressentyp_kurzbz='m'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+		$qry = "INSERT INTO public.tbl_adressentyp(adressentyp_kurzbz, bezeichnung, bezeichnung_mehrsprachig, sort) VALUES('m', 'Meldeadresse', '{\"Meldeadresse\", \"Registered adress\"}', 6);";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Adressentyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Neue Adressentyp Meldeadresse in public.tbl_adressentyp hinzugefügt';
+	}
+}

From 322544c7fb0746c85934e21d232845f7f38971e6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 14 Oct 2024 11:20:46 +0200
Subject: [PATCH 0006/1357] dynamic image url for searchresults

---
 application/config/search.php                     | 15 ++++++++++++---
 application/libraries/SearchBarLib.php            |  1 -
 .../components/searchbar/result/mergedperson.js   | 12 ++++--------
 public/js/components/searchbar/result/person.js   |  9 +--------
 .../js/components/searchbar/result/prestudent.js  |  9 +--------
 public/js/components/searchbar/result/student.js  |  9 +--------
 6 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index ac6189527..14b6e89d8 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -74,7 +74,10 @@ $config['person'] = [
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto"
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_person p USING (person_id)
@@ -200,7 +203,10 @@ $config['student'] = [
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto"
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_student s USING (student_uid)
@@ -298,7 +304,10 @@ $config['prestudent'] = [
 		"b.uid",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto",
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url",
 		"UPPER(sg.typ || sg.kurzbz) AS stg_kuerzel",
 		"sg.bezeichnung",
 		"(
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 6547cd107..c3528978d 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -228,7 +228,6 @@ class SearchBarLib
 				GROUP BY " . $table_config['primarykey'] . "
 			)";
 
-			$other_selects = 
 			$selects[] = "
 				SELECT
 					" . $this->_ci->db->escape($type) . " AS type,
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index f6b07f3d2..09b967b2f 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -20,8 +20,9 @@ export default {
 			if (person.length)
 				return person.pop();
 
-			const { person_id, name, foto, photo_url, email } = this.res.list[0];
-			return { person_id, name, foto, photo_url, email };
+			// TODO(chris): first one might have not one of these but a later one
+			const { person_id, name, photo_url, email } = this.res.list[0];
+			return { person_id, name, photo_url, email };
 		},
 		employee() {
 			const ma = this.res.list.filter(item => [
@@ -34,11 +35,6 @@ export default {
 			const students = this.res.list.filter(item => item.type == 'prestudent');
 			return students.length ? students : null;
 		},
-		foto() {
-			if (this.person.foto)
-				return 'data:image/jpeg;base64,' + this.person.foto;
-			return this.person.photo_url;
-		},
 		emails() {
 			if (Array.isArray(this.person.email))
 				return this.person.email;
@@ -51,7 +47,7 @@ export default {
 		:res="person"
 		:actions="actions"
 		:title="person.name"
-		:image="foto"
+		:image="this.person.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f8adee56e..65155a95f 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 8c174d3c0..662069b75 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-prestudent"
 		:res="res"
 		:actions="actions"
 		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 8d8c4894b..93033d08b 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>

From 123f29a75062d5008fbfdd8b55370f09404ba93e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 14 Oct 2024 11:22:20 +0200
Subject: [PATCH 0007/1357] CMS Search

---
 application/config/search.php                 | 94 +++++++++++++++++++
 application/config/searchfunctions.php        |  2 +-
 .../controllers/api/frontend/v1/Language.php  | 47 ++++++++++
 application/libraries/SearchBarLib.php        |  6 ++
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/language.js                     | 22 +++++
 public/js/components/searchbar/result/cms.js  | 81 ++++++++++++++++
 public/js/components/searchbar/searchbar.js   | 34 ++++++-
 system/dbupdate_3.4/40128_search.php          | 15 +++
 9 files changed, 298 insertions(+), 7 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Language.php
 create mode 100644 public/js/api/language.js
 create mode 100644 public/js/components/searchbar/result/cms.js

diff --git a/application/config/search.php b/application/config/search.php
index 14b6e89d8..f52d755dd 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -671,3 +671,97 @@ $config['room'] = [
 		LEFT JOIN public.tbl_adresse address
 			USING (adresse_id)"
 ];
+
+$config['cms'] = [
+	'primarykey' => 'contentsprache_id',
+	'table' => 'cms',
+	'prepare' => "
+		cms_auth (content_id) AS (
+			SELECT content_id
+			FROM campus.tbl_content c
+			WHERE NOT EXISTS (SELECT 1 FROM campus.tbl_contentgruppe g WHERE g.content_id=c.content_id)
+			UNION
+			SELECT content_id
+			FROM public.vw_gruppen g
+			JOIN campus.tbl_contentgruppe c USING (gruppe_kurzbz)
+			WHERE uid = (TABLE auth)
+		),
+		cms_active (content_id, template_kurzbz) AS (
+			SELECT content_id, template_kurzbz
+			FROM cms_auth
+			JOIN campus.tbl_content USING (content_id)
+			WHERE aktiv = TRUE
+		),
+		cms_active_redirect (content_id) AS (
+			SELECT content_id
+			FROM cms_active
+			WHERE template_kurzbz = 'redirect'
+		),
+		cms_active_redirect_linked (content_id) AS (
+			SELECT content_id
+			FROM cms_active_redirect
+			JOIN campus.tbl_contentsprache USING (content_id)
+			WHERE LEFT((xpath('string(/content/url)', content))[1]::text, 1) <> '#'
+		),
+		cms_active_others (content_id) AS (
+			SELECT content_id
+			FROM cms_active
+			WHERE template_kurzbz IN ('contentmittitel', 'contentohnetitel', 'contentmittitel_filterwidget')
+		),
+		cms (contentsprache_id) AS (
+			SELECT contentsprache_id
+			FROM campus.tbl_contentsprache
+			WHERE content_id IN (
+				SELECT content_id 
+				FROM cms_active_redirect_linked 
+				UNION 
+				SELECT content_id 
+				FROM cms_active_others
+			)
+			AND version = campus.get_highest_content_version(content_id)
+		)
+	",
+	'searchfields' => [
+		'content' => [
+			'alias' => ['inhalt'],
+			'comparison' => "vector",
+			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		],
+		'content_id' => [
+			'alias' => ['id'],
+			'comparison' => "equal-int",
+			'field' => "content_id",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		],
+		'lang' => [
+			'alias' => ['language', 'sprache'],
+			'comparison' => "equals",
+			'field' => "sprache",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"contentsprache.content_id",
+		"content.template_kurzbz",
+		"contentsprache.version",
+		"contentsprache.sprache AS language",
+		"contentsprache.titel AS title",
+		"contentsprache.content",
+		"(xpath('string(/content/url)', contentsprache.content))[1] AS content_url"
+	],
+	'resultjoin' => "
+		JOIN campus.tbl_contentsprache contentsprache
+			USING (contentsprache_id)
+		JOIN campus.tbl_content content
+			USING (content_id)"
+];
diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
index c8244e9a3..898069aed 100644
--- a/application/config/searchfunctions.php
+++ b/application/config/searchfunctions.php
@@ -25,7 +25,7 @@ $config['similar'] = [
 
 $config['vector'] = [
 	'priority' => 1,
-	'rank' => "ts_rank_cd({field}, to_tsquery('simple', {word}))",
+	'rank' => "ts_rank({field}, to_tsquery('simple', {word}))",
 	'compare' => "to_tsquery('simple', {word}) @@ {field}"
 ];
 
diff --git a/application/controllers/api/frontend/v1/Language.php b/application/controllers/api/frontend/v1/Language.php
new file mode 100644
index 000000000..797af4804
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Language.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about languages
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Language extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+	}
+
+	public function get()
+	{
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index c3528978d..782e30843 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -168,6 +168,9 @@ class SearchBarLib
 				FROM public.tbl_sprache
 				WHERE sprache=" . $this->_ci->db->escape($lang) . "
 				LIMIT 1
+			),
+			auth (uid) AS (
+				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
 			)";
 
 		if ($sql_with) {
@@ -248,6 +251,9 @@ class SearchBarLib
 			WHERE sprache=" . $this->_ci->db->escape($lang) . "
 			LIMIT 1
 		)");
+		array_unshift($with, "auth (uid) AS (
+			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+		)");
 
 		return success("
 			WITH " . implode(", ", $with) . "
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 655bfa409..26ed8847b 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -23,6 +23,7 @@ import studstatus from "./studstatus.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
+import language from "./language.js";
 
 export default {
     search,
@@ -32,5 +33,6 @@ export default {
     studstatus,
     stv,
     notiz,
-    betriebsmittel
+    betriebsmittel,
+    language
 };
diff --git a/public/js/api/language.js b/public/js/api/language.js
new file mode 100644
index 000000000..6a11d193b
--- /dev/null
+++ b/public/js/api/language.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAll() {
+		return this.$fhcApi.get('/api/frontend/v1/language/get');
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
new file mode 100644
index 000000000..af2d6b0bb
--- /dev/null
+++ b/public/js/components/searchbar/result/cms.js
@@ -0,0 +1,81 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	inject: [
+		'languages',
+		'query'
+	],
+	computed: {
+		preview() {
+			if (this.res.template_kurzbz != 'redirect') {
+				let text = this.res.content.replace(/<!\[CDATA\[|\]\]>/ig, '').replace(/<[^>]+>/ig, '').replace(/^\s+|\s+$/g, '');
+
+				if (text.length > 1000) {
+					// NOTE(chris): focus on searched text!
+					let lower = text.toLowerCase();
+					let firstOccurence = Math.min(this.query.split(' ').reduce((a, c) => {
+						// NOTE(chris): filter query for words that affects the content field and get the lowest index of them
+						if (c == 'or')
+							return a;
+						let i = c.indexOf(':');
+						if (i < 0 || (i > 0 && ['content', 'inhalt'].includes(c.split(':')[0]))) {
+							let posInText = lower.indexOf(c);
+							if (posInText >= 0)
+								a.push(posInText);
+						}
+						return a;
+					}, []));
+
+					if (firstOccurence) {
+						if (firstOccurence + 997 >= text.length) {
+							firstOccurence = text.length - 997;
+							if (firstOccurence > 0)
+								return '...' + text.substr(firstOccurence, 997);
+						} else {
+							return '...' + text.substr(firstOccurence, 994) + '...';
+						}
+					}
+
+					text = text.substr(0, 997) + '...';
+				}
+				
+				return text;
+			}
+			
+			let url = this.res.content_url;
+			if (url.substr(0, 16) == '../index.ci.php/')
+				url = this.$fhcApi.getUri(url.substr(16));
+			else if (url.substr(0, 3) == '../')
+				url = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/\/+$/, '') + url.substr(2);
+			return '<a href="' + url + '">' + url + '</a>';
+		},
+		flag() {
+			if (!this.languages || !this.languages[this.res.language])
+				return "";
+			return "data:image/jpeg;base64," + this.languages[this.res.language].flagge;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-cms"
+		:res="res"
+		:actions="actions"
+		:title="res.title"
+		image-fallback="fas fa-newspaper fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<img v-if="flag" :src="flag" class="ms-2">
+		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
+		<div v-else class="searchbar_table text-muted">
+			No Content
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 54049679e..8ac64e856 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import ResultPrestudent from "./result/prestudent.js";
 import ResultEmployee from "./result/employee.js";
 import ResultOrganisationunit from "./result/organisationunit.js";
 import ResultRoom from "./result/room.js";
+import ResultCms from "./result/cms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
@@ -17,10 +18,17 @@ export default {
 		ResultEmployee,
 		ResultOrganisationunit,
 		ResultRoom,
+		ResultCms,
 		ResultMergedperson,
 		ResultMergedstudent
 	},
 	props: [ "searchoptions", "searchfunction" ],
+	provide() {
+		return {
+			languages: Vue.computed(() => this.languages),
+			query: Vue.computed(() => this.lastQuery)
+		};
+	},
 	data() {
 		return {
 			searchtimer: null,
@@ -35,9 +43,22 @@ export default {
 			searching: false,
 			error: null,
 			abortController: null,
-			retry: 5
+			retry: 0,
+			languages: null,
+			lastQuery: ''
 		};
 	},
+	created() {
+		this.$fhcApi.factory
+			.language.getAll()
+			.then(result => {
+				this.languages = result.data.reduce((a, c) => {
+					a[c.sprache] = c;
+					return a;
+				}, {});
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
 	beforeMount() {
 		this.updateSearchOptions();
 	},
@@ -82,12 +103,14 @@ export default {
 			this.abortController = new AbortController();
 
 			this
-				.searchfunction(this.searchsettings, { signal: this.abortController.signal })
+				.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
 				.then(response => {
 					if (!response.data) {
 						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
 					} else {
 						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
+						this.lastQuery = response.meta.searchstring;
+
 						if (this.searchoptions.mergeResults) {
 							let counter = 0;
 							let mergeTypes = [];
@@ -131,11 +154,11 @@ export default {
 						this.searchresult = res;
 					}
 					this.searching = false;
-					this.retry = 5;
+					this.retry = 0;
 				})
 				.catch(error => {
 					if (error.code == "ERR_CANCELED") {
-						return this.retry = 5;
+						return this.retry = 0;
 					}
 					if (error.code == "ECONNABORTED" && this.retry) {
 						this.retry--;
@@ -144,7 +167,7 @@ export default {
 
 					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
 					this.searching = false;
-					this.retry = 5;
+					this.retry = 0;
 				});
 		},
 		refreshsearch() {
@@ -239,6 +262,7 @@ export default {
 					<result-employee v-else-if="res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
 					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
 					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
+					<result-cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></result-cms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
 					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 2ef8f8b4a..92e1a10fd 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -169,3 +169,18 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_organisationseinheit_fts_bezeichnung_
 	else
 		echo 'public.tbl_organisationseinheit: added index "idx_tbl_organisationseinheit_fts_bezeichnung_vector"<br>';
 }
+// Add index for titel || ' ' || content to campus.tbl_contentsprache
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vector' LIMIT 1;")))
+{
+	$qry = "
+		CREATE INDEX idx_tbl_contentsprache_fts_titel_content_vector 
+		ON campus.tbl_contentsprache 
+		USING GIN ((setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')));
+	";
+
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_contentsprache ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'campus.tbl_contentsprache: added index "idx_tbl_contentsprache_fts_titel_content_vector"<br>';
+}

From b8ff37eb8edfd28c897119d032c517533663574f Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sat, 19 Oct 2024 17:25:09 +0200
Subject: [PATCH 0008/1357] added kontakt verifikation table for saving of
 kontakt verifikation data, added model for the table

---
 .../person/Kontaktverifikation_model.php      | 42 ++++++++++++++++
 ...14_electronic_onboarding_anbindung_ida.php | 48 +++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 application/models/person/Kontaktverifikation_model.php

diff --git a/application/models/person/Kontaktverifikation_model.php b/application/models/person/Kontaktverifikation_model.php
new file mode 100644
index 000000000..b15439edb
--- /dev/null
+++ b/application/models/person/Kontaktverifikation_model.php
@@ -0,0 +1,42 @@
+<?php
+class Kontaktverifikation_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_kontakt_verifikation';
+		$this->pk = 'kontakt_verifikation_id';
+	}
+
+	/**
+	 * Gets contact verification for a person and a verification code
+	 * @param person_id
+	 * @param kontakttyp
+	 * @param verifikation_code
+	 * @param expiration_days number of days after which verifikation code expires
+	 * @return object success or error
+	 */
+	public function getKontaktVerifikation($person_id, $kontakttyp, $verifikation_code, $expiration_days = 1)
+	{
+		$qry = "
+			SELECT
+				kt.kontakt_id,
+				kv.verifikation_code
+			FROM
+				public.tbl_kontakt_verifikation kv
+				JOIN public.tbl_kontakt kt USING(kontakt_id)
+				WHERE kt.person_id = ?
+				AND kt.kontakttyp = ?
+				AND kv.verifikation_code = ?
+				AND kv.erstelldatum >= NOW() - INTERVAL '".$this->escape($expiration_days)." days'
+			ORDER BY
+				kt.kontakt_id DESC
+			LIMIT 1";
+
+		return $this->execQuery($qry, array($person_id, $kontakttyp, $verifikation_code));
+	}
+}
diff --git a/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php b/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php
index ccc0a5827..b204d45aa 100644
--- a/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php
+++ b/system/dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php
@@ -28,3 +28,51 @@ if($result = $db->db_query("SELECT 1 FROM public.tbl_adressentyp WHERE adressent
 			echo '<br>Neue Adressentyp Meldeadresse in public.tbl_adressentyp hinzugefügt';
 	}
 }
+
+if (!$result = @$db->db_query('SELECT 1 FROM public.tbl_kontakt_verifikation LIMIT 1'))
+{
+	$qry = "CREATE SEQUENCE public.tbl_kontakt_verifikation_kontakt_verifikation_id_seq
+				INCREMENT BY 1
+				NO MAXVALUE
+				NO MINVALUE
+				START WITH 1
+				CACHE 1
+				NO CYCLE;
+
+			CREATE TABLE public.tbl_kontakt_verifikation
+			(
+				kontakt_verifikation_id integer DEFAULT nextval('public.tbl_kontakt_verifikation_kontakt_verifikation_id_seq'::regclass),
+				kontakt_id integer UNIQUE NOT NULL,
+				verifikation_code varchar(32) UNIQUE NOT NULL,
+				erstelldatum timestamp without time zone,
+				verifikation_datum timestamp without time zone,
+				app varchar(32),
+				CONSTRAINT pk_tbl_kontakt_verifikation_id PRIMARY KEY (kontakt_verifikation_id)
+			);
+
+			ALTER TABLE public.tbl_kontakt_verifikation ADD CONSTRAINT fk_tbl_kontakt_verifikation_kontakt_id FOREIGN KEY (kontakt_id)
+			REFERENCES public.tbl_kontakt (kontakt_id)
+			ON DELETE CASCADE ON UPDATE CASCADE;
+
+			ALTER TABLE public.tbl_kontakt_verifikation ADD CONSTRAINT fk_tbl_kontakt_verifikation_app FOREIGN KEY (app)
+			REFERENCES system.tbl_app (app)
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			COMMENT ON TABLE public.tbl_kontakt_verifikation IS 'Contact verification';
+			COMMENT ON COLUMN public.tbl_kontakt_verifikation.kontakt_id IS 'Contact to verify';
+			COMMENT ON COLUMN public.tbl_kontakt_verifikation.verifikation_code IS 'Code generated for verification';
+			COMMENT ON COLUMN public.tbl_kontakt_verifikation.erstelldatum IS 'Time when verification code was generated';
+			COMMENT ON COLUMN public.tbl_kontakt_verifikation.verifikation_datum IS 'Time when contact was verified';
+			COMMENT ON COLUMN public.tbl_kontakt_verifikation.app IS 'App where contact was verified';
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON public.tbl_kontakt_verifikation TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON public.tbl_kontakt_verifikation TO vilesci;
+			GRANT SELECT, UPDATE ON public.tbl_kontakt_verifikation_kontakt_verifikation_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON public.tbl_kontakt_verifikation_kontakt_verifikation_id_seq TO web;
+		";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_kontakt_verifikation: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' public.tbl_kontakt_verifikation: Tabelle hinzugefuegt<br>';
+}

From a9a18d1cd43f2ba49b041117f03f6f67aa972df5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:16:02 +0100
Subject: [PATCH 0009/1357] Remove deprecated components

---
 public/js/components/searchbar/action.js      | 31 -------
 public/js/components/searchbar/actions.js     | 28 ------
 public/js/components/searchbar/employee.js    | 89 -------------------
 .../components/searchbar/organisationunit.js  | 82 -----------------
 public/js/components/searchbar/person.js      | 55 ------------
 public/js/components/searchbar/prestudent.js  | 88 ------------------
 public/js/components/searchbar/raum.js        | 51 -----------
 public/js/components/searchbar/student.js     | 80 -----------------
 8 files changed, 504 deletions(-)
 delete mode 100644 public/js/components/searchbar/action.js
 delete mode 100644 public/js/components/searchbar/actions.js
 delete mode 100644 public/js/components/searchbar/employee.js
 delete mode 100644 public/js/components/searchbar/organisationunit.js
 delete mode 100644 public/js/components/searchbar/person.js
 delete mode 100644 public/js/components/searchbar/prestudent.js
 delete mode 100644 public/js/components/searchbar/raum.js
 delete mode 100644 public/js/components/searchbar/student.js

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
deleted file mode 100644
index 699d5f8c7..000000000
--- a/public/js/components/searchbar/action.js
+++ /dev/null
@@ -1,31 +0,0 @@
-export default {
-    props: { 
-        res: {
-            type: Object
-        }, 
-        action: {
-            type: Object
-        }, 
-        cssclass: {
-            type: String,
-            default: ''
-        }
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-            <a :class="this.cssclass" :href="this.getactionhref()" 
-               @click="(this.action.type === 'function') ? this.execaction() : null">
-              <slot>Action</slot>
-            </a>
-    `,
-    methods: {
-        getactionhref: function() {
-            return (this.action.type === 'link') ? this.action.action(this.res) 
-                : 'javascript:void(0);';
-        },
-        execaction: function() { 
-            this.action.action(this.res);
-            this.$emit('actionexecuted');
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
deleted file mode 100644
index ff9e25e12..000000000
--- a/public/js/components/searchbar/actions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import action from "./action.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <ul class="searchbar_actions" v-if="this.actions.length > 0">
-          <li v-for="(action, index) in this.actions" :key="action.label">            
-            <action :res="this.res" :action="action" :cssclass="'btn btn-primary btn-sm'" @actionexecuted="$emit('actionexecuted')">
-                <i v-if="this.hasicon(index)" :class="this.geticonclass(index)"></i>
-                <span class="p-2">{{ action.label }}</span>
-            </action>
-          </li>
-        </ul>
-        <div class="mb-3" v-else=""></div>
-    `,
-    methods: {
-        hasicon: function(index) {
-            return (typeof this.actions[index].icon !== "undefined");
-        },
-        geticonclass: function(index) {            
-            return this.actions[index].icon;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
deleted file mode 100644
index afb947874..000000000
--- a/public/js/components/searchbar/employee.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_employee">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Standard-Kostenstelle</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
-                          <li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
-                        </ul>
-                        <span v-else="">keine</span>
-                    </div>
-                  </div>
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Organisations-Einheit</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
-                          <li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
-                        </ul>
-                        <span v-else="">keine</span> 
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.email }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Telefon</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.telurl">
-                          {{ res.phone }}
-                        </a>
-                    </div>
-                  </div>        
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
deleted file mode 100644
index e7b5861e8..000000000
--- a/public/js/components/searchbar/organisationunit.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_organisationunit">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
-                    <div class="searchbar_tablecell">
-                          {{ res.parentoe_name }}
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Gruppen-EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.mailgroup }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Leiter</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
-                          <li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
-                        </ul>
-                        <span v-else="">N.N.</span>                                
-                    </div>
-                  </div>        
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
-                    <div class="searchbar_tablecell">
-                        {{ res.number_of_people }}
-                    </div>
-                  </div>
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>        
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mailgroup;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
deleted file mode 100644
index 4f267cbd4..000000000
--- a/public/js/components/searchbar/person.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_person">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.gn }} {{ res.sn }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.mail }}
-                        </a>
-                    </div>
-                  </div>
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mail;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
deleted file mode 100644
index 0f7429075..000000000
--- a/public/js/components/searchbar/prestudent.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-	props: [ "res", "actions" ],
-	components: {
-		action: action,
-		actions: actions
-	},
-	emits: [ 'actionexecuted' ],
-	template: `
-		<div class="searchbar_result searchbar_prestudent">
-		
-			<div class="searchbar_grid">
-				<div class="searchbar_icon">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-							 :src="'data:image/jpeg;base64,' + res.foto"
-							 class="rounded-circle" height="100"/>
-						<i v-else class="fas fa-user-circle fa-5x"></i>
-					</action>
-				</div>
-		
-				<div class="searchbar_data">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<span class="fw-bold">{{ res.name }}</span>
-					</action>
-		
-					<div class="mb-3"></div>
-		
-					<div class="searchbar_table">
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Prestudent_id</div>
-							<div class="searchbar_tablecell">
-								{{ res.prestudent_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Student_uid</div>
-							<div class="searchbar_tablecell">
-								{{ res.uid }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Person_id</div>
-							<div class="searchbar_tablecell">
-								{{ res.person_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Studiengang</div>
-							<div class="searchbar_tablecell">
-								{{ res.bezeichnung }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">EMail</div>
-							<div class="searchbar_tablecell">
-								<a :href="this.mailtourl">
-									{{ res.email }}
-								</a>
-							</div>
-						</div>
-		
-		
-					</div>
-		
-					<actions :res="this.res" :actions="this.actions.childactions"
-							 @actionexecuted="$emit('actionexecuted')"></actions>
-		
-				</div>
-			</div>
-		
-		</div>
-    `,
-	methods: {
-	},
-	computed: {
-		mailtourl: function() {
-			return 'mailto:' + this.res.email;
-		}
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
deleted file mode 100644
index 887820d6c..000000000
--- a/public/js/components/searchbar/raum.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action, 
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_raum">
-        
-          <div class="searchbar_grid">
-            <div class="searchbar_icon">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
-              </action>
-            </div>
-            <div class="searchbar_data">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <span class="fw-bold">{{ res.r }}</span>
-              </action>
-        
-              <div class="mb-3"></div>
-        
-              <div class="searchbar_table">
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Gebäude</div>
-                  <div class="searchbar_tablecell">{{ res.g }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Stockwerk</div>
-                  <div class="searchbar_tablecell">{{ res.s }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Raumnummer</div>
-                  <div class="searchbar_tablecell">{{ res.rn }}</div>
-                </div>
-              </div>
-        
-              <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-            </div>
-          </div>
-        
-        </div>
-    `,
-    methods: {
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
deleted file mode 100644
index 73253237c..000000000
--- a/public/js/components/searchbar/student.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_student">
-        
-            <div class="searchbar_grid">
-                <div class="searchbar_icon">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-                             :src="'data:image/jpeg;base64,' + res.foto"
-                             class="rounded-circle" height="100"/>
-                        <i v-else class="fas fa-user-circle fa-5x"></i>
-                    </action>
-                </div>
-        
-                <div class="searchbar_data">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <span class="fw-bold">{{ res.name }}</span>
-                    </action>
-        
-                    <div class="mb-3"></div>
-                
-                    <div class="searchbar_table">
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Student_uid</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.uid }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Person_id</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.person_id }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Matrikelnummer</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.matrikelnr }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">EMail</div>
-                            <div class="searchbar_tablecell">
-                                <a :href="this.mailtourl">
-                                    {{ res.email }}
-                                </a>
-                            </div>
-                        </div>
-        
-                    </div>
-        
-                    <actions :res="this.res" :actions="this.actions.childactions"
-                             @actionexecuted="$emit('actionexecuted')"></actions>
-        
-                </div>
-            </div>
-        
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        }
-    }
-};
\ No newline at end of file

From 084a13316d128ad9a0330473d7cddf301ac10532 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:17:03 +0100
Subject: [PATCH 0010/1357] Remove duplicate emails

---
 public/js/components/searchbar/result/mergedperson.js | 2 +-
 public/js/components/searchbar/result/person.js       | 7 ++++++-
 public/js/components/searchbar/result/prestudent.js   | 7 ++++++-
 public/js/components/searchbar/result/student.js      | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 09b967b2f..8f12540be 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -37,7 +37,7 @@ export default {
 		},
 		emails() {
 			if (Array.isArray(this.person.email))
-				return this.person.email;
+				return new Set(this.person.email);
 			return [this.person.email];
 		}
 	},
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index 65155a95f..daa968e72 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
@@ -29,7 +34,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 662069b75..4a11ac941 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-prestudent"
@@ -29,7 +34,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 93033d08b..3eb401d97 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
@@ -41,7 +46,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>

From b1f4e5487d0fdd1977000bb91fc0b82fe5eacb3d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:18:25 +0100
Subject: [PATCH 0011/1357] Bug: wrong function name

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

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 782e30843..6d817c20f 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -778,7 +778,7 @@ class SearchBarLib
 		if (strstr($tpl, '{word}'))
 			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
 		if (strstr($tpl, '{like:word}'))
-			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escapeLike($word) . "%'", $tpl);
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
 		
 		return $tpl;
 	}

From 963391ec99a061dd96de350afe80da7cb12f9ce2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:20:51 +0100
Subject: [PATCH 0012/1357] Bug: counting "with" statements + allowing multi
 primarykey + allowing "recursive" statement in prepare config

---
 application/libraries/SearchBarLib.php | 142 +++++++++++++++++--------
 1 file changed, 96 insertions(+), 46 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 6d817c20f..54591b11f 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -162,8 +162,14 @@ class SearchBarLib
 
 		$lang = getUserLanguage();
 
-		$output = "
-			WITH lang (index) AS (
+		$output = "WITH";
+		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
+			$output .= " RECURSIVE";
+			array_shift($sql_with);
+		}
+
+		$output .= "
+			lang (index) AS (
 				SELECT index
 				FROM public.tbl_sprache
 				WHERE sprache=" . $this->_ci->db->escape($lang) . "
@@ -185,10 +191,10 @@ class SearchBarLib
 			$other_selects = ", " . $other_selects;
 
 		$output .= "
-			, q (" . $table_config['primarykey'] . ", rank) AS (
-				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
 				FROM (" . implode(" UNION ", $sql_select) . ") q
-				GROUP BY " . $table_config['primarykey'] . "
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)
 			SELECT
 				" . $this->_ci->db->escape($table) . " AS type,
@@ -225,10 +231,10 @@ class SearchBarLib
 			if (!$select)
 				continue;
 
-			$with[] = "final_" . $type . " (" . $table_config['primarykey'] . ", rank) AS (
-				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
 				FROM (" . implode(" UNION ", $select) . ") q
-				GROUP BY " . $table_config['primarykey'] . "
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)";
 
 			$selects[] = "
@@ -242,6 +248,12 @@ class SearchBarLib
 		if (!$selects)
 			return success("");
 
+		$recursive = "";
+		if ($with && $with[0] === "RECURSIVE") {
+			$recursive = "RECURSIVE ";
+			array_shift($with);
+		}
+
 		$with = array_unique($with);
 
 		$lang = getUserLanguage();
@@ -256,7 +268,7 @@ class SearchBarLib
 		)");
 
 		return success("
-			WITH " . implode(", ", $with) . "
+			WITH " . $recursive . implode(", ", $with) . "
 			SELECT *
 			FROM (" . implode(" UNION ", $selects) . ") q
 			ORDER BY rank DESC
@@ -399,10 +411,7 @@ class SearchBarLib
 		$sql_select = [];
 
 		if (isset($table_config['prepare'])) {
-			if (is_array($table_config['prepare']))
-				$sqlWith = $table_config['prepare'];
-			else
-				$sqlWith[] = $table_config['prepare'];
+			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
 		}
 
 		foreach ($searchArray as $or_search) {
@@ -484,17 +493,14 @@ class SearchBarLib
 					$field_config = $table_config['searchfields'][$code];
 
 					if (isset($field_config['prepare'])) {
-						if (is_array($field_config['prepare']))
-							$or_with = array_merge($or_with, $field_config['prepare']);
-						else
-							$or_with[] = $field_config['prepare'];
+						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 						$or_prepare[$code] = $field_config['prepare'];
 						unset($table_config['searchfields'][$code]['prepare']);
 						unset($field_config['prepare']);
 					}
 					$field_sql = "
 						SELECT
-							" . $table_config['table'] . "." . $table_config['primarykey'] . "
+							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
 							FROM " . $table_config['table'] . "
 							" . $this->_makeJoin($field_config['join']) . "
 							WHERE ";
@@ -506,7 +512,7 @@ class SearchBarLib
 
 				$or_select[] = "
 					SELECT 
-						" . $table_config['primarykey'] . ",
+						" . $table_config['table']($table_config['primarykey']) . ",
 						1.0 AS rank
 					FROM " . $table_config['table'] . "
 					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
@@ -537,16 +543,13 @@ class SearchBarLib
 								$word_rank = "0";
 								if ($current_select) {
 									$word_from = $current_select;
-									if ($field_config['field'] != $table_config['primarykey']) {
+									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
 										$word_join .= " " . $this->_makeJoin($table_config);
 									}
 									$word_rank = "rank";
 								}
 								if (isset($field_config['prepare'])) {
-									if (is_array($field_config['prepare']))
-										$or_with = array_merge($or_with, $field_config['prepare']);
-									else
-										$or_with[] = $field_config['prepare'];
+									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 									$or_prepare[$c] = $field_config['prepare'];
 									unset($table_config['searchfields'][$c]['prepare']);
 									unset($field_config['prepare']);
@@ -556,7 +559,7 @@ class SearchBarLib
 								}
 								$field_sql[] = "
 									SELECT
-										" . $word_from . "." . $table_config['primarykey'] . ",
+										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
 										" . $word_rank . " AS w_rank,
 										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
 										FROM " . $word_from . "
@@ -576,15 +579,15 @@ class SearchBarLib
 
 							$id = "w" . ($id_offset + count($or_with));
 							$or_with[] = "
-								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
 								SELECT
-									" . $table_config['primarykey'] . ",
+									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
 									(w_rank + 1.0 - CASE " .
 										"WHEN MIN(rank) = 0 THEN 0 " .
 										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
 										"END))) END) AS rank
 									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
-									GROUP BY " . $table_config['primarykey'] . ", w_rank
+									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
 								)";
 							$current_select = $id;
 						}
@@ -611,7 +614,7 @@ class SearchBarLib
 									")";
 								if ($field_config['1-n'] ?? false) {
 									$where = "GROUP BY " .
-										$table_config['primarykey'] .
+										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
 										", rank HAVING MIN(CASE WHEN " .
 										$where .
 										" THEN 1 ELSE 0 END) = 1";
@@ -631,16 +634,13 @@ class SearchBarLib
 							$word_rank = "";
 							if ($current_select) {
 								$word_from = $current_select;
-								if ($field_config['field'] != $table_config['primarykey']) {
+								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
 									$word_join .= " " . $this->_makeJoin($table_config);
 								}
 								$word_rank = "rank + ";
 							}
 							if (isset($field_config['prepare'])) {
-								if (is_array($field_config['prepare']))
-									$or_with = array_merge($or_with, $field_config['prepare']);
-								else
-									$or_with[] = $field_config['prepare'];
+								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 								$or_prepare[$code] = $field_config['prepare'];
 								unset($table_config['searchfields'][$code]['prepare']);
 								unset($field_config['prepare']);
@@ -651,9 +651,9 @@ class SearchBarLib
 
 							$id = "w" . ($id_offset + count($or_with));
 							$or_with[] = "
-								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
 								SELECT
-									" . $word_from . "." . $table_config['primarykey'] . ",
+									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
 									" . $word_rank . $rank . " AS rank
 									FROM " . $word_from . "
 									" . $word_join . "
@@ -671,11 +671,12 @@ class SearchBarLib
 					continue;
 
 				$or_select[] = "
-					SELECT " . $table_config['primarykey'] . ", rank / " . $count . " AS rank FROM " . $current_select;
+					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
 			$sqlWith = array_merge($sqlWith, $or_with);
 			$sql_select = array_merge($sql_select, $or_select);
+			$id_offset += count($or_with);
 		}
 
 		return $sql_select;
@@ -685,27 +686,76 @@ class SearchBarLib
 	// Private methods
 
 	/**
-	 * Search for documents
+	 * Checks if the field is not one of the primarykeys.
+	 *
+	 * @param string							$field
+	 * @param array|string						$primarykeys
+	 *
+	 * @return boolean
 	 */
-	private function _document($searchstr, $type)
+	private function _needBasicTableJoin($field, $primarykeys)
 	{
-		return array();
+		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
+			return $field != $primarykeys;
+		}
+		if (!is_array($primarykeys))
+			$primarykeys = explode(",", $primarykeys);
+
+		foreach ($primarykeys as $key) {
+			if ($field == trim($key))
+				return false;
+		}
+		return true;
 	}
 
 	/**
-	 * Search for CMSs
+	 * Returns comma separated primarykeys. Optionally with table prefix
+	 *
+	 * @param array|string						$primarykeys
+	 * @param string							$prefix
+	 *
+	 * @return string
 	 */
-	private function _cms($searchstr, $type)
+	private function _formatPrimarykeys($primarykeys, $prefix = "")
 	{
-		return array();
+		if (is_array($primarykeys)) {
+			if ($prefix)
+				$prefix .= ".";
+			return $prefix . implode(", " . $prefix, $primarykeys);
+		}
+		if (!$prefix)
+			return $primarykeys;
+
+		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
 	}
 
 	/**
-	 * Search for rooms
+	 * Adds the prepare statement to the sqlWith stack and handles the
+	 * "RECURSIVE" modifier
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$prepares
+	 *
+	 * @return void
 	 */
-	private function _raum($searchstr, $type)
+	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
 	{
-		return array();
+		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
+		if (!is_array($prepares))
+			$prepares = [$prepares];
+		
+		foreach ($prepares as $prep) {
+			$prep = trim($prep);
+			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
+				$recursive = true;
+				$sqlWith[] = substr($prep, 10);
+			} else {
+				$sqlWith[] = $prep;
+			}
+		}
+		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
+			array_unshift($sqlWith, "RECURSIVE");
+		}
 	}
 
 	/**

From 8d00a9b4c9b5fa160bbbd7db391a2c45b6399b02 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Oct 2024 14:22:31 +0100
Subject: [PATCH 0013/1357] Bugfix

---
 application/config/search.php          | 6 +++++-
 application/libraries/SearchBarLib.php | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index f52d755dd..aa99c17e0 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -400,7 +400,11 @@ $config['employee'] = [
 		'pid' => [
 			'alias' => ['person_id'],
 			'comparison' => 'equal-int',
-			'field' => "person_id"
+			'field' => "person_id",
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'on' => "uid = mitarbeiter_uid"
+			]
 		],
 		'oe' => [
 			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 54591b11f..91abeaebb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -242,7 +242,8 @@ class SearchBarLib
 					" . $this->_ci->db->escape($type) . " AS type,
 					rank,
 					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
-				FROM final_" . $type  . ($table_config['resultjoin'] ?? "");
+				FROM final_" . $type  . "
+				" . ($table_config['resultjoin'] ?? "");
 		}
 
 		if (!$selects)

From 0916d3476744fb3504c20a6c92081ed82cb46b77 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Oct 2024 14:25:27 +0100
Subject: [PATCH 0014/1357] DMS Search

---
 application/config/search.php               | 135 +++++++++++++++-----
 public/js/components/searchbar/searchbar.js |   3 +
 system/dbupdate_3.4/40128_search.php        |  15 +++
 3 files changed, 119 insertions(+), 34 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index aa99c17e0..488a1ab3b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -3,10 +3,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
-// TODO(chris): permissions
-// TODO(chris): foto
-
-
 $config['person'] = [
 	'primarykey' => 'person_id',
 	'table' => 'public.tbl_person',
@@ -70,7 +66,7 @@ $config['person'] = [
 		]
 	],
 	'resultfields' => [
-		"b.uid",
+		"b.uid", // TODO(chris): multiple?
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
@@ -678,7 +674,7 @@ $config['room'] = [
 
 $config['cms'] = [
 	'primarykey' => 'contentsprache_id',
-	'table' => 'cms',
+	'table' => 'campus.tbl_contentsprache',
 	'prepare' => "
 		cms_auth (content_id) AS (
 			SELECT content_id
@@ -711,47 +707,23 @@ $config['cms'] = [
 			SELECT content_id
 			FROM cms_active
 			WHERE template_kurzbz IN ('contentmittitel', 'contentohnetitel', 'contentmittitel_filterwidget')
-		),
-		cms (contentsprache_id) AS (
-			SELECT contentsprache_id
-			FROM campus.tbl_contentsprache
-			WHERE content_id IN (
-				SELECT content_id 
-				FROM cms_active_redirect_linked 
-				UNION 
-				SELECT content_id 
-				FROM cms_active_others
-			)
-			AND version = campus.get_highest_content_version(content_id)
 		)
 	",
 	'searchfields' => [
 		'content' => [
 			'alias' => ['inhalt'],
 			'comparison' => "vector",
-			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))"
 		],
 		'content_id' => [
 			'alias' => ['id'],
 			'comparison' => "equal-int",
-			'field' => "content_id",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "content_id"
 		],
 		'lang' => [
 			'alias' => ['language', 'sprache'],
 			'comparison' => "equals",
-			'field' => "sprache",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "sprache"
 		]
 	],
 	'resultfields' => [
@@ -767,5 +739,100 @@ $config['cms'] = [
 		JOIN campus.tbl_contentsprache contentsprache
 			USING (contentsprache_id)
 		JOIN campus.tbl_content content
-			USING (content_id)"
+			USING (content_id)
+		WHERE content_id IN (
+			SELECT content_id 
+			FROM cms_active_redirect_linked 
+			UNION 
+			SELECT content_id 
+			FROM cms_active_others
+		)
+		AND version = campus.get_highest_content_version(content_id)"
+];
+
+$config['dms'] = [
+	// TODO(chris): IMPLEMENT
+	// TODO(chris): TEST
+	// TODO(chris): project?
+	'primarykey' => 'dms_id, version',
+	'table' => 'campus.tbl_dms_version',
+	'searchfields' => [
+		'keywords' => [
+			'alias' => ['keyword', 'keywords', 'schlagwort', 'schlagworte'],
+			'comparison' => "vector",
+			'field' => "(to_tsvector('simple', COALESCE(schlagworte, '')))"
+		]
+	],
+	'resultfields' => [
+		"v.dms_id",
+		"v.version",
+		"v.filename",
+		"v.mimetype",
+		"v.name",
+		"v.beschreibung AS description",
+		"v.schlagworte AS keywords"
+	],
+	'resultjoin' => "
+		JOIN campus.tbl_dms_version v
+			USING (dms_id, version)
+		WHERE cis_suche = TRUE
+			AND version=(SELECT MAX(version) FROM campus.tbl_dms_version WHERE dms_id=v.dms_id)
+			AND NOT EXISTS (
+				SELECT
+					1
+				FROM
+					fue.tbl_projekt_dokument p
+				WHERE p.dms_id = v.dms_id
+			) AND (
+				NOT EXISTS (
+					WITH RECURSIVE categories (kategorie_kurzbz) AS (
+						SELECT
+							kategorie_kurzbz
+						FROM
+							campus.tbl_dms c
+						WHERE c.dms_id = v.dms_id
+						UNION ALL
+						SELECT
+							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
+						FROM
+							categories
+							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
+					)
+					SELECT
+						1
+					FROM
+						categories
+					JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
+					UNION
+					SELECT
+						1
+					FROM
+						categories
+						JOIN campus.tbl_dms_kategorie USING (kategorie_kurzbz)
+					WHERE
+						berechtigung_kurzbz IS NOT NULL
+				) OR EXISTS (
+					WITH RECURSIVE categories (kategorie_kurzbz) AS (
+						SELECT
+							kategorie_kurzbz
+						FROM
+							campus.tbl_dms c
+						WHERE c.dms_id = v.dms_id
+						UNION ALL
+						SELECT
+							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
+						FROM
+							categories
+							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
+					)
+					SELECT
+						1
+					FROM
+						categories
+						JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
+						JOIN public.tbl_benutzergruppe USING(gruppe_kurzbz)
+					WHERE
+						uid = (TABLE auth)
+				)
+			)"
 ];
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8ac64e856..7589cfbef 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,6 +5,7 @@ import ResultEmployee from "./result/employee.js";
 import ResultOrganisationunit from "./result/organisationunit.js";
 import ResultRoom from "./result/room.js";
 import ResultCms from "./result/cms.js";
+import ResultDms from "./result/dms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
@@ -19,6 +20,7 @@ export default {
 		ResultOrganisationunit,
 		ResultRoom,
 		ResultCms,
+		ResultDms,
 		ResultMergedperson,
 		ResultMergedstudent
 	},
@@ -263,6 +265,7 @@ export default {
 					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
 					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
 					<result-cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></result-cms>
+					<result-dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></result-dms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
 					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 92e1a10fd..8ca0fd246 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -184,3 +184,18 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vect
 	else
 		echo 'campus.tbl_contentsprache: added index "idx_tbl_contentsprache_fts_titel_content_vector"<br>';
 }
+// Add index for schlagworte to campus.tbl_dms_version
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_dms_version_fts_schlagworte_vector' LIMIT 1;")))
+{
+	$qry = "
+		CREATE INDEX idx_tbl_dms_version_fts_schlagworte_vector 
+		ON campus.tbl_dms_version 
+		USING GIN ((to_tsvector('simple', COALESCE(schlagworte, ''))));
+	";
+
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_dms_version ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'campus.tbl_contentsprache: added index "idx_tbl_dms_version_fts_schlagworte_vector"<br>';
+}

From b1452698f842aefb7030d9c529a4415a023b616a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 4 Nov 2024 12:54:34 +0100
Subject: [PATCH 0015/1357] Start View Karteireiter, Components Unassigned,
 Details and Stati

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 224 ++++++++++
 .../models/accounting/Vertrag_model.php       | 159 +++++++
 .../models/accounting/Vertragstyp_model.php   |   1 +
 .../Vertragvertragsstatus_model.php           |   2 +
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/vertraege.js                    |   5 +
 public/js/api/vertraege/person.js             |  36 ++
 .../Stv/Studentenverwaltung/Details.js        |   1 +
 .../Details/Prestudent/MultiStatus.js         |   5 +
 .../js/components/Vertraege/List/Details.js   | 113 +++++
 public/js/components/Vertraege/List/Status.js |  75 ++++
 .../components/Vertraege/List/Unassigned.js   | 113 +++++
 public/js/components/Vertraege/Vertraege.js   | 389 ++++++++++++++++++
 13 files changed, 1126 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/vertraege/Vertraege.php
 create mode 100644 public/js/api/vertraege.js
 create mode 100644 public/js/api/vertraege/person.js
 create mode 100644 public/js/components/Vertraege/List/Details.js
 create mode 100644 public/js/components/Vertraege/List/Status.js
 create mode 100644 public/js/components/Vertraege/List/Unassigned.js
 create mode 100644 public/js/components/Vertraege/Vertraege.js

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
new file mode 100644
index 000000000..eaf3062f5
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -0,0 +1,224 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+use \DateTime as DateTime;
+
+class Vertraege extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllVertraege' => ['admin:r', 'assistenz:r'],
+			'getAllContractsNotAssigned' => ['admin:r', 'assistenz:r'],
+			'getAllContractsAssigned' => ['admin:r', 'assistenz:r'],
+			'getAllContractTypes' =>  self::PERM_LOGGED,
+			'getStatiOfContract' =>  self::PERM_LOGGED,
+			'loadContract' => ['admin:r', 'assistenz:r'],
+			'updateContract' => ['admin:r', 'assistenz:r'],
+			'addNewContract' => ['admin:r', 'assistenz:r'],
+			'deleteContract' => ['admin:r', 'assistenz:r'],
+
+		]);
+
+		//Load Models
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('accounting/Vertragsstatus_model', 'VertragsstatusModel');
+		$this->load->model('accounting/Vertragstyp_model', 'VertragstypModel');
+		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
+	}
+
+	public function getAllVertraege($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPerson($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsNotAssigned($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonNotAssigned($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsAssigned($person_id, $vertrag_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonAssigned($person_id, $vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getStatiOfContract($vertrag_id)
+	{
+		$result = $this->VertragModel->getStatiOfContract($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractTypes()
+	{
+		$result = $this->VertragstypModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function addNewContract($person_id)
+	{
+		//$this->validateNewOrUpdate();
+		//TODO(Manu) check validations
+
+		//$person_id = $this->input->post('person_id');
+		$vertragsdatum = $this->input->post('vertragsdatum');
+		$bezeichnung = $this->input->post('bezeichnung');
+		$vertragstyp_kurzbz = $this->input->post('vertragstyp_kurzbz');
+		$betrag = $this->input->post('betrag');
+		$vertragsstunden = $this->input->post('vertragsstunden');
+		$vertragsstunden_studiensemester_kurzbz = $this->input->post('vertragsstunden_studiensemester_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->insert( [
+			'person_id' => $person_id,
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		//add entry with status neu in lehre.tbl_vertrag_vertragsstatus
+		//TODO(Manu) validation, dass status nicht schon bereits vorhanden
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $result->retval,
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => 'neu',
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => date('c')
+		]);
+
+		if (!$status_result) {
+			$this->db->trans_rollback();
+			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
+		}
+
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function loadContract($vertrag_id)
+	{
+		$result = $this->VertragModel->load($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateContract($vertrag_id)
+	{
+		//$this->validateNewOrUpdate();
+		//TODO(Manu)validations
+
+
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+		$vertragsdatum = $this->input->post('vertragsdatum');
+		$bezeichnung = $this->input->post('bezeichnung');
+		$vertragstyp_kurzbz = $this->input->post('vertragstyp_kurzbz');
+		$betrag = $this->input->post('betrag');
+		$vertragsstunden = $this->input->post('vertragsstunden');
+		$vertragsstunden_studiensemester_kurzbz = $this->input->post('vertragsstunden_studiensemester_kurzbz');
+		$anmerkung = $this->input->post('anmerkung');
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->update($vertrag_id, [
+			'person_id' => $person_id,
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
+			'vertragsstunden' => $vertragsstunden,
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function deleteContract($vertrag_id)
+	{
+		//TODO(Manu) validations,
+		$result = $this->VertragvertragsstatusModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($result)){
+			$data = getData($result);
+			foreach ($data as $item) {
+				//delete all entries in lehre.tbl_vertrag_vertragsstatus
+				$result = $this->VertragvertragsstatusModel->delete([
+					'vertrag_id' => $vertrag_id,
+					'vertragsstatus_kurzbz' => $item->vertragsstatus_kurzbz,
+					'uid' => $item->uid
+				]);
+				if(isError($result))
+					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//delete Contract
+		$result = $this->VertragModel->delete(
+			array('vertrag_id' => $vertrag_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' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
+}
\ No newline at end of file
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 8725cd98d..62b109922 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -330,4 +330,163 @@ class Vertrag_model extends DB_Model
 
         return $bezeichnung;
     }
+
+	/**
+	 * Loads all Contracts of a Person
+	 * @param $person_id
+	 * @return array of objects
+	 */
+	public function loadContractsOfPerson($person_id)
+	{
+		$query = "
+			SELECT
+					*,
+					tbl_vertrag.bezeichnung as bezeichnung,
+					tbl_vertragstyp.bezeichnung as vertragstyp_bezeichnung,
+					TO_CHAR(tbl_vertrag.vertragsdatum::timestamp, 'DD.MM.YYYY') AS format_vertragsdatum,
+					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
+					    JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
+						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung
+				FROM
+					lehre.tbl_vertrag
+					LEFT JOIN lehre.tbl_vertragstyp USING(vertragstyp_kurzbz)
+				WHERE person_id= ?";
+
+
+		return $this->execQuery($query, array($person_id));
+	}
+
+	/**
+	 * Loads all Contracts of a Person that are not assigned yet
+	 * @param $person_id
+	 * @return array of objects
+	 */
+	public function loadContractsOfPersonNotAssigned($person_id)
+	{
+		$query = "
+SELECT
+			'Lehrauftrag' as type,
+			lehreinheit_id,
+			mitarbeiter_uid,
+			null as pruefung_id,
+			null as projektarbeit_id,
+			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
+			tbl_lehreinheit.studiensemester_kurzbz,
+			null as betreuerart_kurzbz,
+			(	SELECT
+					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
+				FROM
+					lehre.tbl_lehrveranstaltung
+					JOIN public.tbl_studiengang USING(studiengang_kz)
+				WHERE
+					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
+			as bezeichnung
+		FROM
+			lehre.tbl_lehreinheitmitarbeiter
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		WHERE
+			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
+			AND vertrag_id IS NULL
+		UNION
+		SELECT
+			'Betreuung' as type,
+			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
+			null as mitarbeiter_uid,
+			null::integer as pruefung_id,
+			projektarbeit_id,
+			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
+			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektbetreuer.betreuerart_kurzbz,
+			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
+			as bezeichnung
+		FROM
+			lehre.tbl_projektbetreuer
+			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		WHERE
+			tbl_projektbetreuer.person_id=?
+			AND vertrag_id IS NULL
+				";
+
+		return $this->execQuery($query, array($person_id, $person_id));
+	}
+
+	/**
+	 * Loads all Contracts of a Person that are assigned yet
+	 * @param $person_id, $vertrag_id
+	 * @return array of objects
+	 */
+	//TODO(Manu) vereinfachen!
+	public function loadContractsOfPersonAssigned($person_id, $vertrag_id)
+	{
+		$query = "
+		SELECT
+			'Lehrauftrag' as type,
+			lehreinheit_id,
+			mitarbeiter_uid,
+			null as pruefung_id,
+			null as projektarbeit_id,
+			(tbl_lehreinheitmitarbeiter.semesterstunden * tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
+			tbl_lehreinheit.studiensemester_kurzbz,
+			null as betreuerart_kurzbz,
+			(	SELECT
+					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
+				FROM
+					lehre.tbl_lehrveranstaltung
+					JOIN public.tbl_studiengang USING(studiengang_kz)
+				WHERE
+					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
+			as bezeichnung
+		FROM
+			lehre.tbl_lehreinheitmitarbeiter
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		WHERE
+			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
+			AND vertrag_id = ?
+		UNION
+		SELECT
+			'Betreuung' as type,
+			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
+			null as mitarbeiter_uid,
+			null::integer as pruefung_id,
+			projektarbeit_id,
+			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
+			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektbetreuer.betreuerart_kurzbz,
+			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
+			as bezeichnung
+		FROM
+			lehre.tbl_projektbetreuer
+			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		WHERE
+			tbl_projektbetreuer.person_id=?
+			AND vertrag_id = ?
+				";
+
+		return $this->execQuery($query, array($person_id, $vertrag_id, $person_id, $vertrag_id));
+	}
+
+	/**
+	 * Returns all stati of a contract
+	 *
+	 * @param $vertrag_id
+	 * @return array
+	 */
+	public function getStatiOfContract($vertrag_id)
+	{
+		$query = " 
+			SELECT
+					*
+			FROM
+				lehre.tbl_vertrag_vertragsstatus
+				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
+			WHERE
+				tbl_vertrag_vertragsstatus.vertrag_id = ?
+			ORDER BY datum DESC";
+
+		return $this->execQuery($query, array($vertrag_id));
+	}
+
+
 }
diff --git a/application/models/accounting/Vertragstyp_model.php b/application/models/accounting/Vertragstyp_model.php
index 42d248217..a3275af6e 100644
--- a/application/models/accounting/Vertragstyp_model.php
+++ b/application/models/accounting/Vertragstyp_model.php
@@ -11,4 +11,5 @@ class Vertragstyp_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_vertragstyp';
 		$this->pk = 'vertragstyp_kurzbz';
 	}
+
 }
diff --git a/application/models/accounting/Vertragvertragsstatus_model.php b/application/models/accounting/Vertragvertragsstatus_model.php
index 78a065540..75b0794cc 100644
--- a/application/models/accounting/Vertragvertragsstatus_model.php
+++ b/application/models/accounting/Vertragvertragsstatus_model.php
@@ -190,4 +190,6 @@ class Vertragvertragsstatus_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
+
+
 }
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index e30772ca7..45a172302 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -24,6 +24,7 @@ import stv from "./stv.js";
 import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
 import checkperson from "./checkperson.js";
+import vertraege from "./vertraege.js";
 
 export default {
     search,
@@ -34,5 +35,6 @@ export default {
     stv,
     notiz,
     betriebsmittel,
-    checkperson
+    checkperson,
+    vertraege
 };
\ No newline at end of file
diff --git a/public/js/api/vertraege.js b/public/js/api/vertraege.js
new file mode 100644
index 000000000..1c23316ef
--- /dev/null
+++ b/public/js/api/vertraege.js
@@ -0,0 +1,5 @@
+import person from "./vertraege/person.js";
+
+export default {
+	person
+}
\ No newline at end of file
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
new file mode 100644
index 000000000..cff6ea87d
--- /dev/null
+++ b/public/js/api/vertraege/person.js
@@ -0,0 +1,36 @@
+export default {
+	getAllVertraege(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + params.person_id);
+	},
+	getAllContractsNotAssigned(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + params.person_id);
+	},
+	getAllContractsAssigned(url, config, params){
+		console.log(params.person_id, params.vertrag_id);
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + params.person_id + '/' + params.vertrag_id);
+	},
+	getAllContractsNotAssigned2(person_id){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + person_id);
+	},
+	getStatiOfContract(url, config, params){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + params.vertrag_id);
+	},
+	getAllContractTypes(){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractTypes/');
+	},
+	addNewContract(person_id, formData) {
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' +
+			person_id, formData
+		);
+	},
+	loadContract(vertrag_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id);
+	},
+	updateContract(vertrag_id, formData) {
+		return this.$fhcApi.post( 'api/frontend/v1/vertraege/vertraege/updateContract/' + vertrag_id,
+			formData);
+	},
+	deleteContract(vertrag_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 4df148063..dfa7e92ed 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -43,6 +43,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
+
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
 			Bitte StudentIn auswählen!
 		</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index ac4a2dd9e..4cf826bb3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -318,6 +318,9 @@ export default{
 			@saved="reload"
 			>
 		</status-modal>
+		TEST1: Anzahl Students: 
+		{{modelValue.length}}
+		
 			
 		<core-filter-cmpt
 			v-if="!this.modelValue.length"
@@ -332,6 +335,8 @@ export default{
 			@click:new="actionNewStatus"
 			>
 			
+			TEST 2
+			
 			<template #actions="{updateData2}">
 				<!-- SingleSelectButton-->
 				<status-dropdown 
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
new file mode 100644
index 000000000..ef0710970
--- /dev/null
+++ b/public/js/components/Vertraege/List/Details.js
@@ -0,0 +1,113 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+
+import BsModal from "../../Bootstrap/Modal.js";
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput
+	},
+	props: {
+		person_id: {
+			type: [Number],
+			required: true
+		},
+		vertrag_id: {
+			type: [Number],
+			required: true
+		},
+	},
+	data() {
+		return {
+			//tableData: [],
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllContractsAssigned,
+				ajaxParams: () => {
+					return {
+						person_id: this.person_id,
+						vertrag_id: this.vertrag_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				//Version with saving Data in tableData Object
+/*				ajaxResponse: (url, params, response) => {
+					this.tableData = response.data;
+					return response.data;
+				},*/
+				columns: [
+					{title: "Typ", field: "type"},
+					{title: "Betrag", field: "betrag"},
+					{title: "Bezeichnung", field: "bezeichnung"},
+					{title: "Studiensemester", field: "studiensemester_kurzbz"},
+					{title: "PruefungId", field: "betrag", visible: false},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{
+						title: "VertragsstundenStudiensemester",
+						field: "vertragsstunden_studiensemester_kurzbz",
+						visible: false
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '200',
+				selectableRangeMode: 'click',
+				selectable: true,
+			},
+			clickedRows: [],
+/*			table: null,
+			tableData: []*/
+		}
+	},
+	watch: {
+		person_id: 'updateTableData',
+		vertrag_id: 'updateTableData'
+/*		person_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
+		},
+		vertrag_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
+		},*/
+	},
+	methods: {
+		updateTableData() {
+			this.$refs.table.tabulator.setData(`api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/ ' ${this.person_id}/${this.vertrag_id}`);
+		}
+	},
+	template: `
+	<!--TODO(Manu) check css, design -->
+	<div class="core-vertraege h-50 d-flex flex-column w-100">
+		person_id: {{person_id}}
+		<br>
+		vertrag_id: {{vertrag_id}}
+		
+		  <div>
+			<!-- Tabulator-Container -->
+			<div ref="table"></div>
+		
+			<!-- Ausgabe der Daten -->
+			<div v-for="row in tableData" :key="row.id">
+			  <p>{{ row.name }} - {{ row.value }}</p>
+			</div>
+		  </div>
+		
+		<h4>Vertragdetails</h4>
+	
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"	
+			>
+		</core-filter-cmpt>		
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
new file mode 100644
index 000000000..13423267f
--- /dev/null
+++ b/public/js/components/Vertraege/List/Status.js
@@ -0,0 +1,75 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+
+import BsModal from "../../Bootstrap/Modal.js";
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput
+	},
+	props: {
+		vertrag_id: {
+			type: [Number],
+			required: true
+		},
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getStatiOfContract,
+				ajaxParams: () => {
+					return {
+						vertrag_id: this.vertrag_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Status", field: "status", width: 125},
+					{title: "Datum", field: "datum", width: 150},
+					{title: "vertrag_id", field: "vertrag_id", visible: false},
+					{title: "User", field: "bezeichnung", width: 150},
+					{title: "Vertragsstatus_kurzbz", field: "studiensemester_kurzbz"},
+					{title: "insertvon", field: "insertvon", visible: false},
+					{title: "insertamum", field: "insertamum", visible: false},
+					{title: "updatevon", field: "updatevon", visible: false},
+					{title: "updateamum", field: "updateamum", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '200',
+				selectableRangeMode: 'click',
+				selectable: true,
+			},
+			clickedRows: []
+		}
+	},
+	watch: {
+		vertrag_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + this.vertrag_id);
+		}
+	},
+	methods: {	},
+	template: `
+	<!--TODO(Manu) check filter (akzeptiert, neu, erteilt?), design -->
+	<div class="core-vertraege h-50 d-flex flex-column w-100">
+<!--		person_id: {{person_id}}-->
+		<br>
+		vertrag_id: {{vertrag_id}} !
+		<h4>Vertragstatus</h4>
+	
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"	
+			>
+		</core-filter-cmpt>		
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
new file mode 100644
index 000000000..b84635fc4
--- /dev/null
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -0,0 +1,113 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+
+import BsModal from "../../Bootstrap/Modal.js";
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import {BismeldestichtagHelper} from "../../../apps/Bismeldestichtag/BismeldestichtagHelper";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput
+	},
+	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
+		person_id: {
+			type: [Number],
+			required: true
+		},
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllContractsNotAssigned,
+				ajaxParams: () => {
+					return {
+						person_id: this.person_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Typ", field: "type", width: 125},
+					{title: "Betrag", field: "betrag", width: 150},
+					{title: "Bezeichnung", field: "bezeichnung", width: 150},
+					{title: "Studiensemester", field: "studiensemester_kurzbz"},
+					{title: "PruefungId", field: "betrag", visible: false},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{
+						title: "VertragsstundenStudiensemester",
+						field: "vertragsstunden_studiensemester_kurzbz",
+						visible: false
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '200',
+				selectableRangeMode: 'click',
+				selectable: true,
+			},
+			clickedRows: []
+		}
+	},
+	methods: {
+		toggleRowClick(rowData){
+			//id already existing?
+			//const index = this.clickedRows.findIndex(row => row.id === id);
+
+
+			//id alleine reicht nicht: Betreuerart ebenfalls
+/*			if (this.clickedRows.indexOf(id) == -1) {
+				console.log("Die Zahl " + id + " ist NICHT Array enthalten.");
+				this.clickedRows.push(id);
+
+			} else {
+				console.log("Die Zahl " + id + " ist im Array enthalten.");
+				const index = this.clickedRows.indexOf(id);
+				this.clickedRows.splice(index, 1);
+			}*/
+
+			// check row
+			const exists = this.clickedRows.some(row => JSON.stringify(row) === JSON.stringify(rowData));
+
+			if (exists) {
+				this.clickedRows = this.clickedRows.filter(row => JSON.stringify(row) !== JSON.stringify(rowData));
+			} else {
+				this.clickedRows.push(rowData);
+			}
+
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$refs.table.tabulator.on("rowClick", (e, row) => {
+				const data = row.getData();
+				this.toggleRowClick(data);
+			});
+		});
+	},
+	template: `
+	<!--TODO(Manu) check css, design .. mybe list.js-->
+	<div class="core-vertraege h-50 d-flex flex-column w-100">
+	
+	{{clickedRows}}
+	
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"	
+			>
+		</core-filter-cmpt>		
+	</div>`
+}
\ No newline at end of file
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
new file mode 100644
index 000000000..63c79166b
--- /dev/null
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -0,0 +1,389 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+
+import BsModal from "../Bootstrap/Modal.js";
+import CoreForm from '../Form/Form.js';
+import FormInput from '../Form/Input.js';
+import ListUnassigned from './List/Unassigned.js';
+import ContractDetails from './List/Details.js';
+import ContractStati from './List/Status.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput,
+		ListUnassigned,
+		ContractDetails,
+		ContractStati
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
+		person_id: {
+			type: [Number],
+			required: true
+		},
+	},
+	data() {
+		return {
+			//TODO(Manu) check if filter bei Status: Abgerechnet wird zum Beispiel nicht angezeigt
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllVertraege,
+				ajaxParams: () => {
+					return {
+						person_id: this.person_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Bezeichnung", field: "bezeichnung", width: 150},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
+					{title: "Betrag", field: "betrag", width: 150},
+					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
+					{title: "Status", field: "status"},
+					{title: "Vertragsdatum", field: "format_vertragsdatum", width: 128},
+					{title: "VertragstypKurzbz", field: "vertragstyp_kurzbz", visible: false},
+					{title: "VertragId", field: "vertrag_id", visible: false},
+					{title: "Vertragsdatum_iso", field: "vertragsdatum", visible: false},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
+					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						maxWidth: 150,
+						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 = 'Vertrag bearbeiten';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditContract(cell.getData().vertrag_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 = 'Vertrag löschen';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteContract(cell.getData().vertrag_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '250',
+				selectableRangeMode: 'click',
+				selectable: true,
+				persistenceID: 'core-contracts'
+			},
+			tabulatorEvents: [
+				{
+/*					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['wawi', 'global', 'infocenter']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('nummer').component.updateDefinition({
+							title: this.$p.t('wawi', 'nummer')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('format_retour').component.updateDefinition({
+							title: this.$p.t('wawi', 'retourdatum')
+						});
+						cm.getColumnByField('kaution').component.updateDefinition({
+							title: this.$p.t('infocenter', 'kaution')
+						});
+						cm.getColumnByField('format_ausgabe').component.updateDefinition({
+							title: this.$p.t('wawi', 'ausgabedatum')
+						});
+
+					}*/
+				}
+			],
+			statusNew: true,
+			formData: {},
+			listContractsUnassigned: [],
+			listContractTypes: [],
+			contractSelected: []
+		}
+	},
+
+	methods: {
+		actionNewContract() {
+			console.log("actionNewContract");
+			this.resetModal();
+			//this.loadContractsNotAssigned(this.person_id);
+			this.$refs.contractModal.show();
+		},
+		actionEditContract(vertrag_id) {
+			console.log("actionEditContract " + vertrag_id);
+			this.statusNew = false;
+			this
+				.loadContract(vertrag_id)
+				.then(this.$refs.contractModal.show);
+		},
+		actionDeleteContract(vertrag_id) {
+			console.log("actionDeleteContract" + vertrag_id);
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? vertrag_id
+					: Promise.reject({handled: true}))
+				.then(this.endpoint.deleteContract)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					window.scrollTo(0, 0);
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewContract() {
+			return this.endpoint
+				.addNewContract(this.person_id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.contractModal.hide();
+					this.resetModal();
+					window.scrollTo(0, 0);
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateContract(vertrag_id) {
+			return this.endpoint
+				.updateContract(vertrag_id, this.formData)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.contractModal.hide();
+					this.resetModal();
+					window.scrollTo(0, 0);
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadContract(vertrag_id) {
+			this.resetModal();
+			this.statusNew = false;
+			return this.endpoint
+				.loadContract(vertrag_id)
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetModal(){
+			this.formData = {};
+			this.formData.vertragsdatum  = new Date();
+			this.formData.vertragstyp_kurzbz = null;
+			this.statusNew = true;
+		}
+	},
+	created() {
+		Promise.all([
+			this.endpoint.getAllContractTypes(),
+			this.endpoint.getAllContractsNotAssigned2(this.person_id)
+		])
+			.then(([result1, result2]) => {
+				this.listContractTypes = result1.data;
+				this.listContractsUnassigned = result2.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$refs.table.tabulator.on("rowClick", (e, row) => {
+				this.contractSelected = row.getData();
+				console.log("vertrag_id: ", this.contractSelected.vertrag_id);
+			});
+		});
+	},
+	template: `
+
+	<div class="core-vertraege h-100 d-flex flex-column">
+	
+	{{formData}}
+	
+	{{contractSelected}}
+	
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Vertrag"
+			@click:new="actionNewContract"
+			>
+		</core-filter-cmpt>		
+		Vertrag: {{contractSelected.vertrag_id}}
+		
+		<div class = "row">
+		
+			<div class="col-sm-6">
+				<!-- ContractDetails -->
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
+					<ContractDetails :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></ContractDetails>
+				</div>
+			</div>
+			
+			<div class="col-sm-6">
+				<!-- ContractStati -->
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
+					<ContractStati :vertrag_id="contractSelected.vertrag_id"></ContractStati>
+				</div>
+			</div>
+				
+		</div>
+		
+<!--		<hr>
+		<div>
+			&lt;!&ndash; ContractDetails &ndash;&gt;
+			 <div class="row md-4" v-if="contractSelected.vertrag_id !=null">      
+				<ContractDetails :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></ContractDetails>
+			</div>
+		</div>
+		
+		<div>
+			&lt;!&ndash; ContractStati &ndash;&gt;
+			 <div class="row md-4" v-if="contractSelected.vertrag_id !=null">      
+				<ContractStati :vertrag_id="contractSelected.vertrag_id"></ContractStati>
+			</div>
+		</div>-->
+				
+		
+		<!--Modal: contractModal-->
+		<bs-modal ref="contractModal" dialog-class="modal-xl">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_contract')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_contract')}}</p>
+			</template>
+			
+			<core-form class="row g-3" ref="unassignedData">
+		
+				<ListUnassigned :endpoint="$fhcApi.factory.vertraege.person" :person_id="person_id"></ListUnassigned>
+			
+				<div class="row mb-3">
+					<form-input
+						type="DatePicker"
+						:label="$p.t('ui/vertragsdatum')"
+						name="vertragsdatum"
+						v-model="formData.vertragsdatum"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						preview-format="dd.MM.yyyy"
+						:teleport="true"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">		
+					<form-input
+						type="text"
+						:label="$p.t('ui/bezeichnung')"
+						name="bezeichnung"
+						v-model="formData.bezeichnung"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						type="select"
+						:label="$p.t('global/typ')"
+						v-model="formData.vertragstyp_kurzbz"
+						name="vertragstyp_kurzbz"
+						>
+						<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+						<option
+							v-for="entry in listContractTypes"
+							:key="entry.vertragstyp_kurzbz"
+							:value="entry.vertragstyp_kurzbz"
+							>
+							{{entry.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">		
+					<form-input
+						:label="$p.t('ui/betrag')"
+						name="betrag"
+						v-model="formData.betrag"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3" v-if="!statusNew">		
+					<form-input
+						type="text"
+						:label="$p.t('ui/Stunden (Vertrags-Urfassung')"
+						name="vertragsstunden"
+						v-model="formData.vertragsstunden"
+						disabled
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3" v-if="!statusNew">		
+					<form-input
+						type="text"
+						:label="$p.t('ui/Studiensemester (Vertrags-Urfassung')"
+						name="vertragsstunden_studiensemester_kurzbz"
+						v-model="formData.vertragsstunden_studiensemester_kurzbz"
+						disabled
+						>
+					</form-input>
+				</div>
+						
+				<div class="row mb-3">
+					<form-input
+						type="textarea"
+						:label="$p.t('global/anmerkung')"
+						name="anmerkung"
+						v-model="formData.anmerkung"
+						>
+					</form-input>
+				</div>
+				
+			</core-form>
+			
+			<template #footer>
+				<button type="button" class="btn btn-primary" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('ui', 'speichern')}}</button>
+			</template>
+			
+		</bs-modal>
+	</div>`
+}
+

From b27564ea0f22d6cf414bfa334e154e13ff325560 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 09:01:18 +0100
Subject: [PATCH 0016/1357] Multiple uids in person search

---
 application/config/search.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 488a1ab3b..8c601e046 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -66,7 +66,7 @@ $config['person'] = [
 		]
 	],
 	'resultfields' => [
-		"b.uid", // TODO(chris): multiple?
+		"ARRAY( SELECT uid FROM public.tbl_benutzer WHERE person_id = p.person_id ) AS uids",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
@@ -76,8 +76,7 @@ $config['person'] = [
 			AS photo_url"
 	],
 	'resultjoin' => "
-		JOIN public.tbl_person p USING (person_id)
-		LEFT JOIN public.tbl_benutzer b USING (person_id)"
+		JOIN public.tbl_person p USING (person_id)"
 ];
 
 $config['student'] = [
@@ -210,7 +209,6 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
-// TODO(chris): "ref"
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -751,9 +749,6 @@ $config['cms'] = [
 ];
 
 $config['dms'] = [
-	// TODO(chris): IMPLEMENT
-	// TODO(chris): TEST
-	// TODO(chris): project?
 	'primarykey' => 'dms_id, version',
 	'table' => 'campus.tbl_dms_version',
 	'searchfields' => [

From 2ff7c9f5823484b6ae929e1fdc6e8ba778ff8862 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 09:02:09 +0100
Subject: [PATCH 0017/1357] Dms search result component

---
 public/js/components/searchbar/result/dms.js | 77 ++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 public/js/components/searchbar/result/dms.js

diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
new file mode 100644
index 000000000..74fc9440b
--- /dev/null
+++ b/public/js/components/searchbar/result/dms.js
@@ -0,0 +1,77 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	inject: [
+		'query'
+	],
+	computed: {
+		icon() {
+			switch (this.res.mimetype) {
+				case 'application/pdf':
+					return 'file-pdf';
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+				case 'application/msword':
+					return 'file-word';
+				case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+				case 'application/mspowerpoint':
+					return 'file-powerpoint';
+				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+				case 'application/vnd.ms-excel':
+					return 'file-excel';
+				case 'application/x-zip':
+				case 'application/zip':
+					return 'file-zipper';
+				case 'image/jpeg':
+				case 'image/gif':
+				case 'image/png':
+					return 'file-image';
+				default:
+					return 'file';
+			}
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-dms"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image-fallback="'fas fa-' + icon + ' fa-4x p-5 text-white bg-primary'"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">DMS ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.dms_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Version</div>
+				<div class="searchbar_tablecell">
+					{{ res.version }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Keywords</div>
+				<div class="searchbar_tablecell">
+					{{ res.keywords }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Description</div>
+				<div class="searchbar_tablecell">
+					{{ res.description }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file

From 3a13226298323f8bf5bd60e4e903755ad40cf0f9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 11:08:07 +0100
Subject: [PATCH 0018/1357] Bug: merge "RECURSIVE"-keyword

---
 application/libraries/SearchBarLib.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 91abeaebb..d563a9c79 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -675,6 +675,12 @@ class SearchBarLib
 					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
+			if ($or_with[0] === "RECURSIVE") {
+				if ($sqlWith[0] !== "RECURSIVE")
+					array_unshift($sqlWith, "RECURSIVE");
+				array_shift($or_with);
+			}
+
 			$sqlWith = array_merge($sqlWith, $or_with);
 			$sql_select = array_merge($sql_select, $or_select);
 			$id_offset += count($or_with);

From d0cf86585a174ef777accb102d71f0fcb6668169 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 11:42:18 +0100
Subject: [PATCH 0019/1357] Visual update for search icons

---
 public/css/components/searchbar.css           | 74 +++++++++++++------
 public/js/components/searchbar/result/cms.js  |  2 +-
 public/js/components/searchbar/result/dms.js  |  2 +-
 .../components/searchbar/result/employee.js   |  2 +-
 .../searchbar/result/mergedperson.js          |  2 +-
 .../searchbar/result/organisationunit.js      |  2 +-
 .../js/components/searchbar/result/person.js  |  2 +-
 .../components/searchbar/result/prestudent.js |  2 +-
 public/js/components/searchbar/result/room.js |  2 +-
 .../js/components/searchbar/result/student.js |  2 +-
 .../searchbar/result/template/frame.js        |  5 +-
 11 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar.css
index 61032d227..37eeaef83 100644
--- a/public/css/components/searchbar.css
+++ b/public/css/components/searchbar.css
@@ -97,37 +97,69 @@
 /* new variant with template/frame */
 
 .searchbar-result {
-    border-bottom: 1px solid lightgrey;
-    margin-bottom: 1rem;
-    padding-bottom: 1rem;
+	border-bottom: 1px solid lightgrey;
+	margin-bottom: 1rem;
+	padding-bottom: 1rem;
 }
 
 .searchbar-actions {
-    display: flex;
-    flex-wrap: wrap;
-    gap: .5rem;
-    padding: 0;
-    margin: 1rem 0 0;
+	display: flex;
+	flex-wrap: wrap;
+	gap: .5rem;
+	padding: 0;
+	margin: 1rem 0 0;
 }
 
 .searchbar-square-image {
-    position: relative;
-    display: block;
-    height: 0;
-    padding-bottom: 100%;
+	position: relative;
+	display: block;
+	height: 0;
+	padding-bottom: 100%;
+}
+.searchbar-square-image > * {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+}
+.searchbar-square-image > img {
+	object-fit: cover;
+}
+.searchbar-square-image > div {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	color: rgba(var(--bs-white-rgb),1);
+	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+}
+.searchbar-square-image.rounded-circle > img,
+.searchbar-square-image.rounded-circle > div {
+	border-radius: 50%;
 }
 
-.searchbar-square-image > * {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
+.searchbar-rounded-image {
+	display: block;
+	width: 100%;
 }
-.searchbar-square-image img {
-    object-fit: cover;
+.searchbar-rounded-image > img {
+	width: 100%;
+}
+.searchbar-rounded-image > div {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	color: rgba(var(--bs-white-rgb),1);
+	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	height: calc((100px - .75em) * 1.3);
+}
+.searchbar-rounded-image > img,
+.searchbar-rounded-image > div {
+	border-radius: .25rem;
 }
 
 .no-margin-paragraphs p {
-    margin: 0;
+	margin: 0;
 }
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index af2d6b0bb..5befdb413 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -69,7 +69,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.title"
-		image-fallback="fas fa-newspaper fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-newspaper fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<img v-if="flag" :src="flag" class="ms-2">
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 74fc9440b..ad770f1c6 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -44,7 +44,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image-fallback="'fas fa-' + icon + ' fa-4x p-5 text-white bg-primary'"
+		:image-fallback="'fas fa-' + icon + ' fa-4x'"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index 1c4da075a..2fa07bf5a 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -16,7 +16,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 8f12540be..cfb7fe5a6 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -48,7 +48,7 @@ export default {
 		:actions="actions"
 		:title="person.name"
 		:image="this.person.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index f9b6870e0..129479277 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -22,7 +22,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		image-fallback="fas fa-sitemap fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-sitemap fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index daa968e72..bc4e75ee8 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 4a11ac941..f3df3e8ca 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 6da1e970a..23ce6b463 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -33,7 +33,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.ort_kurzbz"
-		image-fallback="fas fa-door-open fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-door-open fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 3eb401d97..bb3512e3a 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
index 87078a166..336c2d9f9 100644
--- a/public/js/components/searchbar/result/template/frame.js
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -22,14 +22,13 @@ export default {
 					:res="res"
 					:action="actions.defaultaction"
 					@actionexecuted="$emit('actionexecuted')"
-					class="searchbar-square-image"
+					class="searchbar-rounded-image"
 					>
 					<img
 						v-if="image"
 						:src="image"
-						class="rounded-circle"
 						/>
-					<div v-else class="d-flex justify-content-center align-items-center rounded-circle overflow-hidden">
+					<div v-else>
 						<i :class="imageFallback"></i>
 					</div>
 				</result-action>

From e3119ee48ce91d3a6e2785d234582d8c0e9479d5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 15:35:00 +0100
Subject: [PATCH 0020/1357] cleanup

---
 application/controllers/api/frontend/v1/Searchbar.php | 1 -
 application/libraries/SearchBarLib.php                | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 2d5b06063..d630d3afd 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -50,7 +50,6 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
-		#$searchstrings = ['pid:71995', 'email:eder.iris', 'schnabl', 'schnabl thomas', 'schnabl thomas sarim', 'schnabl -thomas', 'nachname:schnabl -vorname:thomas', 'schnabl thomas -sarim', 'schnabl or hacker', '-ali', '-ali -baba', '-ali -baba -raub', '-ali -honig', '-ali -baba ali', 'hofer martin'];
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index d563a9c79..630f31ecf 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -32,11 +32,6 @@ class SearchBarLib
 	const ERROR_WRONG_TYPES = 'ERR004';
 	const ERROR_NOT_AUTH = 'ERR005';
 
-	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
-
-	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
-
 	private $_ci; // Code igniter instance
 
 	private $_searchfunction_priorities = [];

From 40baa7e08c8bd46878169820f3c6817d00d47874 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Nov 2024 16:06:14 +0100
Subject: [PATCH 0021/1357] update childcomponent vertragstati

---
 .../api/frontend/v1/vertraege/Vertraege.php   |  62 +++++++-
 .../models/accounting/Vertrag_model.php       |   4 +-
 public/js/api/vertraege/person.js             |  10 ++
 public/js/components/Vertraege/List/Status.js | 136 ++++++++++++++++--
 .../components/Vertraege/List/Unassigned.js   |   1 -
 public/js/components/Vertraege/Vertraege.js   |  83 +++++++----
 6 files changed, 248 insertions(+), 48 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index eaf3062f5..2efe82614 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -13,12 +13,14 @@ class Vertraege extends FHCAPI_Controller
 			'getAllContractsNotAssigned' => ['admin:r', 'assistenz:r'],
 			'getAllContractsAssigned' => ['admin:r', 'assistenz:r'],
 			'getAllContractTypes' =>  self::PERM_LOGGED,
+			'getAllContractStati' =>  self::PERM_LOGGED,
 			'getStatiOfContract' =>  self::PERM_LOGGED,
 			'loadContract' => ['admin:r', 'assistenz:r'],
 			'updateContract' => ['admin:r', 'assistenz:r'],
 			'addNewContract' => ['admin:r', 'assistenz:r'],
 			'deleteContract' => ['admin:r', 'assistenz:r'],
-
+			'insertContractStatus' => ['admin:r', 'assistenz:r'],
+			'deleteContractStatus' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -82,6 +84,17 @@ class Vertraege extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result) ?: []);
 	}
 
+	public function getAllContractStati()
+	{
+		//TODO(MANUU)
+		$result = $this->VertragsstatusModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
 	public function addNewContract($person_id)
 	{
 		//$this->validateNewOrUpdate();
@@ -221,4 +234,51 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->outputJsonSuccess(current(getData($result)));
 	}
+
+	public function insertContractStatus ($vertrag_id, $datum, $status){
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+            array(
+                'vertrag_id' => $vertrag_id,
+                'vertragsstatus_kurzbz' => $status
+            )
+        );
+
+        if (hasData($result)) {
+			$this->terminateWithError("status bereits vorhanden", self::ERROR_TYPE_GENERAL);
+           // $this->terminateWithError($this->p->t('ui', 'error_status_existing', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+        }
+
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $vertrag_id,
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => $status,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => $datum
+		]);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
+		}
+
+		return $this->outputJsonSuccess(current(getData($status_result)));
+	}
+
+	public function deleteContractStatus($vertrag_id, $status){
+		//return $this->terminateWithError($vertrag_id . " - " . $status, self::ERROR_TYPE_GENERAL);
+		$result = $this->VertragvertragsstatusModel->delete(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'vertragsstatus_kurzb']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->outputJsonSuccess(current(getData($result)));
+	}
 }
\ No newline at end of file
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 62b109922..a179dbc81 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -477,7 +477,9 @@ SELECT
 	{
 		$query = " 
 			SELECT
-					*
+				*,
+                TO_CHAR(tbl_vertrag_vertragsstatus.datum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_datum,
+                TO_CHAR(tbl_vertrag_vertragsstatus.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
 			FROM
 				lehre.tbl_vertrag_vertragsstatus
 				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index cff6ea87d..b9529a6bb 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -18,6 +18,9 @@ export default {
 	getAllContractTypes(){
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractTypes/');
 	},
+	getAllContractStati(){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractStati/');
+	},
 	addNewContract(person_id, formData) {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' +
 			person_id, formData
@@ -33,4 +36,11 @@ export default {
 	deleteContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
 	},
+	insertContractStatus(params) {
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
+	},
+	deleteContractStatus(params) {
+		console.log("API", params.vertrag_id, params.status);
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.status).join('/'));
+	}
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 13423267f..495d5ed97 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -16,6 +16,10 @@ export default {
 			type: [Number],
 			required: true
 		},
+		listContractStati: {
+			type: Array,
+			required: true
+		},
 	},
 	data() {
 		return {
@@ -29,17 +33,40 @@ export default {
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Status", field: "status", width: 125},
-					{title: "Datum", field: "datum", width: 150},
+					{title: "Status", field: "vertragsstatus_kurzbz"},
+					{title: "Datum", field: "format_datum"},
 					{title: "vertrag_id", field: "vertrag_id", visible: false},
-					{title: "User", field: "bezeichnung", width: 150},
-					{title: "Vertragsstatus_kurzbz", field: "studiensemester_kurzbz"},
+					// {title: "User", field: "bezeichnung", visible: false},
+					// {title: "Vertragsstatus_kurzbz", field: "Vertragsstatus_kurzbz", visible: false},
 					{title: "insertvon", field: "insertvon", visible: false},
-					{title: "insertamum", field: "insertamum", visible: false},
-					{title: "updatevon", field: "updatevon", visible: false},
-					{title: "updateamum", field: "updateamum", visible: true},
+					// {title: "insertamum", field: "insertamum", visible: false},
+					{title: "insertamum", field: "format_insertamum", visible: false},
 					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
 					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							const 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-xmark"></i>';
+							button.title = 'Status löschen';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteStatus(cell.getData().vertrag_id, cell.getData().vertragsstatus_kurzbz)
+							);
+
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
@@ -47,7 +74,11 @@ export default {
 				selectableRangeMode: 'click',
 				selectable: true,
 			},
-			clickedRows: []
+			clickedRows: [],
+			formContractData: {
+				vertragsstatus_kurzbz: null,
+				datum: new Date()
+			},
 		}
 	},
 	watch: {
@@ -55,21 +86,98 @@ export default {
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + this.vertrag_id);
 		}
 	},
-	methods: {	},
+	methods: {
+		actionNewStatus() {
+			console.log("actionNewStatus");
+			this.$refs.contractStatus.show();
+		},
+		actionDeleteStatus(vertrag_id, status) {
+			console.log("action: deleteStatus " + status + " from Vertrag" + vertrag_id);
+			this.$emit('deleteContractStatus', {
+				status: status,
+				vertrag_id: vertrag_id
+			  });
+		},
+		handleSubmit(){
+			this.$emit('setContractStatus', {
+				status: this.formContractData.vertragsstatus_kurzbz,
+				datum: this.formContractData.datum
+			  });
+		},
+		closeModal(){
+			this.$refs.contractStatus.hide();
+			this.$emit('close-modal');
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+			this.$emit('reload');
+		},
+	},
 	template: `
 	<!--TODO(Manu) check filter (akzeptiert, neu, erteilt?), design -->
 	<div class="core-vertraege h-50 d-flex flex-column w-100">
-<!--		person_id: {{person_id}}-->
 		<br>
-		vertrag_id: {{vertrag_id}} !
-		<h4>Vertragstatus</h4>
+		<h4>Vertragsstatus</h4>
 	
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
 			table-only
-			:side-menu="false"	
+			:side-menu="false"
+			reload
+			new-btn-show
+			new-btn-label="Status"
+			@click:new="actionNewStatus"
 			>
-		</core-filter-cmpt>		
+		</core-filter-cmpt>
+
+		<div >
+			<bs-modal ref="contractStatus">
+				<template #title>
+					<p class="fw-bold mt-3">{{$p.t('ui', 'add_Status')}}</p>
+
+				</template>
+
+				<core-form>
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							:label="$p.t('global/datum')"
+							name="datum"
+							v-model="formContractData.datum"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							:label="$p.t('global/typ')"
+							v-model="formContractData.vertragsstatus_kurzbz"
+							name="vertragsstatus_kurzbz"
+							>
+							<option :value="null">{{$p.t('ui', 'bitteWaehlen')}}</option>
+							<option
+								v-for="entry in listContractStati"
+								:key="entry.vertragsstatus_kurzbz"
+								:value="entry.vertragsstatus_kurzbz"
+								>
+								{{entry.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
+				</core-form>
+
+				<template #footer>
+					<button type="button" class="btn btn-primary" @click="handleSubmit()">{{$p.t('ui', 'speichern')}}</button>
+				</template>
+
+			</bs-modal>
+		</div>
+
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index b84635fc4..8549b1a1a 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -3,7 +3,6 @@ import {CoreFilterCmpt} from "../../filter/Filter.js";
 import BsModal from "../../Bootstrap/Modal.js";
 import CoreForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
-import {BismeldestichtagHelper} from "../../../apps/Bismeldestichtag/BismeldestichtagHelper";
 
 export default {
 	components: {
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 63c79166b..fd617c3fc 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -130,22 +130,20 @@ export default {
 			formData: {},
 			listContractsUnassigned: [],
 			listContractTypes: [],
-			contractSelected: []
+			contractSelected: [],
+			listContractStati: [],
+		//	isContractModalVisible: true,
 		}
 	},
 
 	methods: {
 		actionNewContract() {
-			console.log("actionNewContract");
 			this.resetModal();
-			//this.loadContractsNotAssigned(this.person_id);
 			this.$refs.contractModal.show();
 		},
 		actionEditContract(vertrag_id) {
-			console.log("actionEditContract " + vertrag_id);
 			this.statusNew = false;
-			this
-				.loadContract(vertrag_id)
+			this.loadContract(vertrag_id)
 				.then(this.$refs.contractModal.show);
 		},
 		actionDeleteContract(vertrag_id) {
@@ -175,6 +173,43 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		addNewContractStatus({status, datum}) {
+			const date = new Date();
+
+			//TODO(Manu) refactor this
+			const formattedDate = datum.toLocaleDateString('en-CA');
+			let params = {
+				vertrag_id : this.contractSelected.vertrag_id,
+				status: {status},
+				datum: formattedDate
+			}
+
+			return this.endpoint
+				.insertContractStatus(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+
+					this.$refs.contractstati.closeModal();
+					window.scrollTo(0, 0);
+					this.$refs.contractstati.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteContractStatus({status, vertrag_id}){
+			let params = {
+				vertrag_id : {vertrag_id},
+				status: {status}
+			}
+			return this.endpoint
+				.deleteContractStatus(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
+					window.scrollTo(0, 0);
+					this.$refs.contractstati.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		updateContract(vertrag_id) {
 			return this.endpoint
 				.updateContract(vertrag_id, this.formData)
@@ -210,11 +245,13 @@ export default {
 	created() {
 		Promise.all([
 			this.endpoint.getAllContractTypes(),
-			this.endpoint.getAllContractsNotAssigned2(this.person_id)
+			this.endpoint.getAllContractsNotAssigned2(this.person_id),
+			this.endpoint.getAllContractStati(),
 		])
-			.then(([result1, result2]) => {
+			.then(([result1, result2, result3]) => {
 				this.listContractTypes = result1.data;
 				this.listContractsUnassigned = result2.data;
+				this.listContractStati = result3.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -230,10 +267,6 @@ export default {
 
 	<div class="core-vertraege h-100 d-flex flex-column">
 	
-	{{formData}}
-	
-	{{contractSelected}}
-	
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -253,35 +286,23 @@ export default {
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<ContractDetails :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></ContractDetails>
+					<contract-details :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></contract-details>
 				</div>
 			</div>
 			
 			<div class="col-sm-6">
 				<!-- ContractStati -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<ContractStati :vertrag_id="contractSelected.vertrag_id"></ContractStati>
+					<contract-stati :vertrag_id="contractSelected.vertrag_id" :listContractStati="listContractStati"
+					@setContractStatus="addNewContractStatus"
+					@deleteContractStatus="deleteContractStatus"
+					ref="contractstati"
+					></contract-stati>
 				</div>
 			</div>
 				
 		</div>
-		
-<!--		<hr>
-		<div>
-			&lt;!&ndash; ContractDetails &ndash;&gt;
-			 <div class="row md-4" v-if="contractSelected.vertrag_id !=null">      
-				<ContractDetails :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></ContractDetails>
-			</div>
-		</div>
-		
-		<div>
-			&lt;!&ndash; ContractStati &ndash;&gt;
-			 <div class="row md-4" v-if="contractSelected.vertrag_id !=null">      
-				<ContractStati :vertrag_id="contractSelected.vertrag_id"></ContractStati>
-			</div>
-		</div>-->
 				
-		
 		<!--Modal: contractModal-->
 		<bs-modal ref="contractModal" dialog-class="modal-xl">
 			<template #title>
@@ -291,7 +312,7 @@ export default {
 			
 			<core-form class="row g-3" ref="unassignedData">
 		
-				<ListUnassigned :endpoint="$fhcApi.factory.vertraege.person" :person_id="person_id"></ListUnassigned>
+				<list-unassigned :endpoint="$fhcApi.factory.vertraege.person" :person_id="person_id"></list-unassigned>
 			
 				<div class="row mb-3">
 					<form-input

From 9fd9c4e94db4350d9574c3526625ed8bb5c5dc6a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 6 Nov 2024 11:43:59 +0100
Subject: [PATCH 0022/1357] edit Status Contracts

---
 .../api/frontend/v1/vertraege/Vertraege.php   |  61 +++++++--
 public/js/api/vertraege/person.js             |   8 +-
 public/js/components/Vertraege/List/Status.js |  69 ++++++++--
 public/js/components/Vertraege/Vertraege.js   | 124 +++++++++++-------
 4 files changed, 196 insertions(+), 66 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 2efe82614..9d38ed27f 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -20,7 +20,9 @@ class Vertraege extends FHCAPI_Controller
 			'addNewContract' => ['admin:r', 'assistenz:r'],
 			'deleteContract' => ['admin:r', 'assistenz:r'],
 			'insertContractStatus' => ['admin:r', 'assistenz:r'],
+			'loadContractStatus' => ['admin:r', 'assistenz:r'],
 			'deleteContractStatus' => ['admin:r', 'assistenz:r'],
+			'updateContractStatus' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -30,6 +32,7 @@ class Vertraege extends FHCAPI_Controller
 		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
 	}
 
+	//TODO(Manu) validations, phrases
 	public function getAllVertraege($person_id)
 	{
 		$result = $this->VertragModel->loadContractsOfPerson($person_id);
@@ -37,7 +40,6 @@ class Vertraege extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -48,7 +50,6 @@ class Vertraege extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -59,7 +60,6 @@ class Vertraege extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -70,7 +70,6 @@ class Vertraege extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
@@ -86,7 +85,6 @@ class Vertraege extends FHCAPI_Controller
 
 	public function getAllContractStati()
 	{
-		//TODO(MANUU)
 		$result = $this->VertragsstatusModel->load();
 		if (isError($result))
 		{
@@ -124,7 +122,6 @@ class Vertraege extends FHCAPI_Controller
 			'insertvon' => getAuthUID()
 		]);
 
-		//add entry with status neu in lehre.tbl_vertrag_vertragsstatus
 		//TODO(Manu) validation, dass status nicht schon bereits vorhanden
 		$status_result = $this->VertragvertragsstatusModel->insert([
 			'vertrag_id' => $result->retval,
@@ -232,7 +229,7 @@ class Vertraege extends FHCAPI_Controller
 		if (!hasData($result)) {
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->outputJsonSuccess(current(getData($result)));
+		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
 	public function insertContractStatus ($vertrag_id, $datum, $status){
@@ -261,11 +258,11 @@ class Vertraege extends FHCAPI_Controller
 			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
 		}
 
-		return $this->outputJsonSuccess(current(getData($status_result)));
+		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 
 	public function deleteContractStatus($vertrag_id, $status){
-		//return $this->terminateWithError($vertrag_id . " - " . $status, self::ERROR_TYPE_GENERAL);
+
 		$result = $this->VertragvertragsstatusModel->delete(
 			array(
 				'vertrag_id' => $vertrag_id,
@@ -279,6 +276,50 @@ class Vertraege extends FHCAPI_Controller
 		if (!hasData($result)) {
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'vertragsstatus_kurzb']), self::ERROR_TYPE_GENERAL);
 		}
-		return $this->outputJsonSuccess(current(getData($result)));
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function loadContractStatus ($vertrag_id, $status){
+
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+		if (!$result) {
+			$this->terminateWithError('Status not existing');
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateContractStatus ($vertrag_id, $datum, $status){
+/*		$result = $this->VertragvertragsstatusModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+
+		if (hasData($result)) {
+			$this->terminateWithError("status bereits vorhanden", self::ERROR_TYPE_GENERAL);
+			// $this->terminateWithError($this->p->t('ui', 'error_status_existing', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}*/
+
+		$status_result = $this->VertragvertragsstatusModel->update([
+			'vertrag_id' => $vertrag_id,
+			'vertragsstatus_kurzbz' => $status],
+			[
+			'uid' => getAuthUID(),
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID(),
+			'datum' => $datum
+		]);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Updaten des Vertragsstatus.');
+		}
+
+		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 }
\ No newline at end of file
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index b9529a6bb..c682342df 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -36,11 +36,17 @@ export default {
 	deleteContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
 	},
+	loadContractStatus(params){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' + Object.values(params.status).join('/'));
+	},
 	insertContractStatus(params) {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
 	},
+	updateContractStatus(params) {
+		console.log("API", params.vertrag_id, params.status, params.datum);
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/updateContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
+	},
 	deleteContractStatus(params) {
-		console.log("API", params.vertrag_id, params.status);
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.status).join('/'));
 	}
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 495d5ed97..24aac571f 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -20,6 +20,10 @@ export default {
 			type: Array,
 			required: true
 		},
+		formDataParent: {
+			type: Object,
+			required: true
+		}
 	},
 	data() {
 		return {
@@ -53,6 +57,17 @@ export default {
 
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = 'Status bearbeiten';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditStatus(cell.getData().vertrag_id, cell.getData().vertragsstatus_kurzbz)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = 'Status löschen';
 							button.addEventListener(
@@ -75,7 +90,8 @@ export default {
 				selectable: true,
 			},
 			clickedRows: [],
-			formContractData: {
+			statusNew: true,
+			formData: {
 				vertragsstatus_kurzbz: null,
 				datum: new Date()
 			},
@@ -84,34 +100,64 @@ export default {
 	watch: {
 		vertrag_id() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + this.vertrag_id);
+		},
+		formDataParent: {
+			handler(newVal, oldVal) {
+				this.formData = this.formDataParent;
+			},
+			deep: true
 		}
 	},
 	methods: {
 		actionNewStatus() {
-			console.log("actionNewStatus");
+			this.resetModal();
 			this.$refs.contractStatus.show();
 		},
+		actionEditStatus(vertrag_id, status) {
+			this.statusNew = false;
+			this.$emit('loadContractStatus', {
+				status: status,
+				vertrag_id: vertrag_id
+			});
+		},
 		actionDeleteStatus(vertrag_id, status) {
-			console.log("action: deleteStatus " + status + " from Vertrag" + vertrag_id);
 			this.$emit('deleteContractStatus', {
 				status: status,
 				vertrag_id: vertrag_id
 			  });
 		},
-		handleSubmit(){
-			this.$emit('setContractStatus', {
-				status: this.formContractData.vertragsstatus_kurzbz,
-				datum: this.formContractData.datum
-			  });
+		handleSubmit(action){
+			if (action == 'new') {
+				this.$emit('setContractStatus', {
+				status: this.formData.vertragsstatus_kurzbz,
+				datum: this.formData.datum
+				});
+			}
+			if (action == 'edit') {
+				this.$emit('updateContractStatus', {
+					status: this.formData.vertragsstatus_kurzbz,
+					datum: this.formData.datum
+				});
+			}
 		},
 		closeModal(){
 			this.$refs.contractStatus.hide();
 			this.$emit('close-modal');
 		},
+		openModal(){
+			this.$refs.contractStatus.show();
+			this.$emit('open-modal');
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 			this.$emit('reload');
 		},
+		resetModal(){
+			this.formData = {};
+			this.formData.vertragsstatus_kurzbz = null;
+			this.formData.datum = new Date();
+			this.statusNew = true;
+		}
 	},
 	template: `
 	<!--TODO(Manu) check filter (akzeptiert, neu, erteilt?), design -->
@@ -144,7 +190,7 @@ export default {
 							type="DatePicker"
 							:label="$p.t('global/datum')"
 							name="datum"
-							v-model="formContractData.datum"
+							v-model="formData.datum"
 							auto-apply
 							:enable-time-picker="false"
 							format="dd.MM.yyyy"
@@ -157,8 +203,9 @@ export default {
 						<form-input
 							type="select"
 							:label="$p.t('global/typ')"
-							v-model="formContractData.vertragsstatus_kurzbz"
+							v-model="formData.vertragsstatus_kurzbz"
 							name="vertragsstatus_kurzbz"
+							:disabled="!statusNew"
 							>
 							<option :value="null">{{$p.t('ui', 'bitteWaehlen')}}</option>
 							<option
@@ -173,7 +220,7 @@ export default {
 				</core-form>
 
 				<template #footer>
-					<button type="button" class="btn btn-primary" @click="handleSubmit()">{{$p.t('ui', 'speichern')}}</button>
+					<button type="button" class="btn btn-primary" @click="statusNew ? handleSubmit('new') : handleSubmit('edit')">{{$p.t('ui', 'speichern')}}</button>
 				</template>
 
 			</bs-modal>
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index fd617c3fc..a3277d6f7 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -132,6 +132,10 @@ export default {
 			listContractTypes: [],
 			contractSelected: [],
 			listContractStati: [],
+			contractFormData: {
+				vertragsstatus_kurzbz: 'test',
+				datum: new Date()
+			}
 		//	isContractModalVisible: true,
 		}
 	},
@@ -147,7 +151,6 @@ export default {
 				.then(this.$refs.contractModal.show);
 		},
 		actionDeleteContract(vertrag_id) {
-			console.log("actionDeleteContract" + vertrag_id);
 			this.$fhcAlert
 				.confirmDelete()
 				.then(result => result
@@ -156,7 +159,7 @@ export default {
 				.then(this.endpoint.deleteContract)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					window.scrollTo(0, 0);
+					//window.scrollTo(0, 0);
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -168,48 +171,11 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					window.scrollTo(0, 0);
+					//window.scrollTo(0, 0);
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		addNewContractStatus({status, datum}) {
-			const date = new Date();
-
-			//TODO(Manu) refactor this
-			const formattedDate = datum.toLocaleDateString('en-CA');
-			let params = {
-				vertrag_id : this.contractSelected.vertrag_id,
-				status: {status},
-				datum: formattedDate
-			}
-
-			return this.endpoint
-				.insertContractStatus(params)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-
-					this.$refs.contractstati.closeModal();
-					window.scrollTo(0, 0);
-					this.$refs.contractstati.reload();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		deleteContractStatus({status, vertrag_id}){
-			let params = {
-				vertrag_id : {vertrag_id},
-				status: {status}
-			}
-			return this.endpoint
-				.deleteContractStatus(params)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-
-					window.scrollTo(0, 0);
-					this.$refs.contractstati.reload();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		updateContract(vertrag_id) {
 			return this.endpoint
 				.updateContract(vertrag_id, this.formData)
@@ -217,7 +183,6 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					window.scrollTo(0, 0);
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -232,6 +197,74 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		addNewContractStatus({status, datum}) {
+			const date = new Date();
+			//TODO(Manu) refactor this
+			const formattedDate = datum.toLocaleDateString('en-CA');
+			let params = {
+				vertrag_id : this.contractSelected.vertrag_id,
+				status: {status},
+				datum: formattedDate
+			};
+
+			return this.endpoint
+				.insertContractStatus(params)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+
+					this.$refs.contractstati.closeModal();
+					//window.scrollTo(0, 0);
+					this.$refs.contractstati.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteContractStatus({status, vertrag_id}){
+			let params = {
+				vertrag_id : {vertrag_id},
+				status: {status}
+			};
+			return this.endpoint
+				.deleteContractStatus(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
+					//window.scrollTo(0, 0);
+					this.$refs.contractstati.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateContractStatus({datum, status}){
+			//TODO(Manu) refactor this
+			const formattedDate = datum.toLocaleDateString('en-CA');
+			let params = {
+				vertrag_id : this.contractSelected.vertrag_id,
+				datum : formattedDate,
+				status: {status}
+			};
+			return this.endpoint
+				.updateContractStatus(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+
+					//window.scrollTo(0, 0);
+					this.$refs.contractstati.closeModal();
+					this.$refs.contractstati.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadContractStatus({vertrag_id, status}){
+			let params = {
+				vertrag_id : {vertrag_id},
+				status: {status}
+			};
+			return this.endpoint
+				.loadContractStatus(params)
+				.then(response => {
+					this.contractFormData = response.data;
+					this.$refs.contractstati.openModal();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
@@ -259,7 +292,6 @@ export default {
 		this.$nextTick(() => {
 			this.$refs.table.tabulator.on("rowClick", (e, row) => {
 				this.contractSelected = row.getData();
-				console.log("vertrag_id: ", this.contractSelected.vertrag_id);
 			});
 		});
 	},
@@ -279,7 +311,6 @@ export default {
 			@click:new="actionNewContract"
 			>
 		</core-filter-cmpt>		
-		Vertrag: {{contractSelected.vertrag_id}}
 		
 		<div class = "row">
 		
@@ -293,9 +324,14 @@ export default {
 			<div class="col-sm-6">
 				<!-- ContractStati -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<contract-stati :vertrag_id="contractSelected.vertrag_id" :listContractStati="listContractStati"
+					<contract-stati 
+					:vertrag_id="contractSelected.vertrag_id" 
+					:listContractStati="listContractStati"
+					:formDataParent="contractFormData"
 					@setContractStatus="addNewContractStatus"
 					@deleteContractStatus="deleteContractStatus"
+					@updateContractStatus="updateContractStatus"
+					@loadContractStatus="loadContractStatus"
 					ref="contractstati"
 					></contract-stati>
 				</div>

From 8c689418f7fffe9c54d77aeb5406c1fe55576570 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 09:57:26 +0100
Subject: [PATCH 0023/1357] Bugfixes

---
 application/libraries/SearchBarLib.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 630f31ecf..b9c71b16b 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -68,7 +68,6 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
-	 * TODO(chris): permissions
 	 *
 	 * @param string							$searchstring
 	 * @param array								$types (optional)
@@ -498,9 +497,8 @@ class SearchBarLib
 						SELECT
 							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
 							FROM " . $table_config['table'] . "
-							" . $this->_makeJoin($field_config['join']) . "
+							" . $this->_makeJoin($field_config['join'] ?? '') . "
 							WHERE ";
-					// TODO(chris): equals and equal-int could be IN () statement???
 					foreach ($words as $word) {
 						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
 					}
@@ -508,10 +506,10 @@ class SearchBarLib
 
 				$or_select[] = "
 					SELECT 
-						" . $table_config['table']($table_config['primarykey']) . ",
+						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
 						1.0 AS rank
 					FROM " . $table_config['table'] . "
-					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
+					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
 			} else {
 				$current_select = false;
 				$count = 0;

From f82ed6928aaae0a6d1a648a4ea5d572b2ee6f11b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 11:47:35 +0100
Subject: [PATCH 0024/1357] Phrasen

---
 application/libraries/SearchBarLib.php        |   8 +-
 public/js/components/searchbar/result/cms.js  |   2 +-
 public/js/components/searchbar/result/dms.js  |  11 +-
 .../components/searchbar/result/employee.js   |  12 +-
 .../searchbar/result/mergedperson.js          |  26 +-
 .../searchbar/result/organisationunit.js      |  17 +-
 .../js/components/searchbar/result/person.js  |   4 +-
 .../components/searchbar/result/prestudent.js |  12 +-
 public/js/components/searchbar/result/room.js |  16 +-
 .../js/components/searchbar/result/student.js |   8 +-
 .../searchbar/result/template/action.js       |   2 +-
 public/js/components/searchbar/searchbar.js   |  18 +-
 system/phrasesupdate.php                      | 682 +++++++++++++++++-
 13 files changed, 744 insertions(+), 74 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index b9c71b16b..a14319bba 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -95,7 +95,7 @@ class SearchBarLib
 				return error(array_map(function ($type) use ($p) {
 					return $p->t('search', 'error_missing_config', [
 						'type' => $type
-					]); // TODO(chris): phrase
+					]);
 				}, $missing));
 			}
 			$types = $tmp;
@@ -288,7 +288,7 @@ class SearchBarLib
 		if (!$table_config)
 			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
 				'type' => $name
-			])); // TODO(chris): phrase
+			]));
 
 		$errors = [];
 		if (!isset($table_config['table'])
@@ -298,7 +298,7 @@ class SearchBarLib
 			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
 				'type' => $name,
 				'field' => 'table'
-			]); // TODO(chris): phrase
+			]);
 		}
 		if (!isset($table_config['primarykey'])
 			|| !is_string($table_config['primarykey'])
@@ -336,7 +336,7 @@ class SearchBarLib
 						'type' => $name,
 						'searchfield' => $searchfield,
 						'field' => 'field'
-					]); // TODO(chris): phrase
+					]);
 				}
 				if (!isset($config['comparison'])
 					|| !is_string($config['comparison'])
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 5befdb413..591c7e79c 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -75,7 +75,7 @@ export default {
 		<img v-if="flag" :src="flag" class="ms-2">
 		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
 		<div v-else class="searchbar_table text-muted">
-			No Content
+			{{ $p.t('search/result_content_none') }}
 		</div>
 	</template-frame>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index ad770f1c6..75b281541 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -9,9 +9,6 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	inject: [
-		'query'
-	],
 	computed: {
 		icon() {
 			switch (this.res.mimetype) {
@@ -49,25 +46,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">DMS ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_dms_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.dms_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Version</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_version') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.version }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Keywords</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_keywords') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.keywords }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Description</div>
+				<div class="searchbar_tablecell">{{ $p.t('global/beschreibung') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.description }}
 				</div>
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index 2fa07bf5a..a86fc6cbf 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -21,25 +21,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Standard-Kostenstelle</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_stdkst') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
 						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
 					</ul>
-					<span v-else="">keine</span>
+					<span v-else="">{{ $p.t('search/result_stdkst_none') }}</span>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Organisations-Einheit</div>
+				<div class="searchbar_tablecell">{{ $p.t('lehre/organisationseinheit') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
 						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
 					</ul>
-					<span v-else="">keine</span>
+					<span v-else="">{{ $p.t('search/result_oe_none') }}</span>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'mailto:' + res.email" class="d-block">
 						{{ res.email }}
@@ -47,7 +47,7 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Telefon</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/telefon') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'tel:' + res.phone" class="d-block">
 						{{ res.phone }}
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index cfb7fe5a6..c0349c2e3 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -47,19 +47,19 @@ export default {
 		:res="person"
 		:actions="actions"
 		:title="person.name"
-		:image="this.person.photo_url"
+		:image="person.photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ person.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
@@ -75,12 +75,12 @@ export default {
 							:action="actions.defaultactionemployee || actions.defaultaction"
 							@actionexecuted="$emit('actionexecuted')"
 							>
-							Mitarbeiter
+							{{ $p.t('search/result_employee') }}
 						</template-action>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Standard-Kostenstelle</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_stdkst') }}</div>
 					<div class="searchbar_tablecell">
 						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
 							<li
@@ -90,11 +90,11 @@ export default {
 								{{ stdkst }}
 							</li>
 						</ul>
-						<span v-else="">keine</span>
+						<span v-else="">{{ $p.t('search/result_stdkst_none') }}</span>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Organisations-Einheit</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
 					<div class="searchbar_tablecell">
 						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
 							<li
@@ -104,11 +104,11 @@ export default {
 								{{ oe }}
 							</li>
 						</ul>
-						<span v-else="">keine</span>
+						<span v-else="">{{ $p.t('search/result_oe_none') }}</span>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Telefon</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('person/telefon') }}</div>
 					<div class="searchbar_tablecell">
 						<a :href="telurl">
 							{{ employee.phone }}
@@ -132,25 +132,25 @@ export default {
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Studiengang</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.bezeichnung }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Prestudent ID</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.prestudent_id }}
 						</div>
 					</div>
 					<div v-if="student.uid" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Student UID</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_student_uid') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.uid }}
 						</div>
 					</div>
 					<div v-if="student.matrikelnr" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Matrikelnummer</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('person/matrikelnummer') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.matrikelnr }}
 						</div>
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 129479277..fe5d6512a 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -9,13 +9,6 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-organisationunit"
@@ -27,14 +20,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_parent_oe') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.parentoe_name }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Gruppen-EMail</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
@@ -43,17 +36,17 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Leiter</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_leader') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
 						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
 					</ul>
-					<span v-else="">N.N.</span>
+					<span v-else="">{{ $p.t('search/result_leader_none') }}</span>
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_number_of_employees') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.number_of_people }}
 				</div>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index bc4e75ee8..f6ce0a5f0 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -26,13 +26,13 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index f3df3e8ca..51b4ccd9b 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -26,13 +26,13 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
@@ -40,25 +40,25 @@ export default {
 				</div>
 			</div>
 			<div v-if="res.uid" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div v-if="res.matrikelnr" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Prestudent ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_prestudent_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.prestudent_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Studiengang</div>
+				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.bezeichnung }}
 				</div>
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 23ce6b463..46fce1c71 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -22,9 +22,9 @@ export default {
 			if (this.res.street)
 				address += (address ? ', ' : '') + this.res.street;
 			if (this.res.floor)
-				address += (address ? ' / ' : '') + this.res.floor + ' Stockwerk';
+				address += (address ? ' / ' : '') + this.$p.t('search/result_address_floor', this.res);
 
-			return address || 'N/A';
+			return address || this.$p.t('search/result_address_none');
 		}
 	},
 	template: `
@@ -38,33 +38,33 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Standort</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_room_address') }}</div>
 				<div class="searchbar_tablecell">
 					{{ address }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Sitzplätze</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
 				<div class="searchbar_tablecell">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
-						{{ res.max_person }}, davon {{ res.workplaces }} PC-Plätze
+						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
 					<template v-else>
-						N/A
+						{{ $p.t('search/result_workplaces_none') }}
 					</template>
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Gebäude</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_building') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.building }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Zusatz Informationen</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
 				<div class="searchbar_tablecell">
 					<div class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index bb3512e3a..e85716a94 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -26,25 +26,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index a7654df59..f41d9925f 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -23,6 +23,6 @@ export default {
 	},
 	template: `
 	<a :href="actionHref" @click="actionFunc">
-		<slot>Action</slot>
+		<slot>{{ $p.t('search/action_default_label') }}</slot>
 	</a>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7589cfbef..034cf842a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -9,8 +9,6 @@ import ResultDms from "./result/dms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
-// TODO(chris): arrays in results
-
 export default {
 	components: {
 		ResultPerson,
@@ -108,7 +106,7 @@ export default {
 				.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
 				.then(response => {
 					if (!response.data) {
-						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+						this.error = this.$p.t('search/error_general');
 					} else {
 						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
 						this.lastQuery = response.meta.searchstring;
@@ -167,7 +165,7 @@ export default {
 						return this.callsearchapi();
 					}
 
-					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
+					this.error = this.$p.t('search/error_general', error);
 					this.searching = false;
 					this.retry = 0;
 				});
@@ -230,8 +228,8 @@ export default {
 				v-model="searchsettings.searchstr"
 				class="form-control"
 				type="search"
-				placeholder="Suche..."
-				aria-label="Search"
+				:placeholder="$p.t('search/input_search_label')"
+				:aria-label="$p.t('search/input_search_label')"
 			>
 			<button
 				ref="settingsbutton"
@@ -239,6 +237,8 @@ export default {
 				class="btn btn-light border-start"
 				type="button"
 				id="search-filter"
+				:title="$p.t('search/button_filter_label')"
+				:aria-label="$p.t('search/button_filter_label')"
 				>
 				<i class="fas fa-cog"></i>
 			</button>
@@ -254,7 +254,7 @@ export default {
 				<i class="fas fa-spinner fa-spin fa-2x"></i>
 			</div>
 			<div v-else-if="error !== null">{{ error }}</div>
-			<div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+			<div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
 			<template v-else>
 				<template v-for="res in searchresult">
 					<result-person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></result-person>
@@ -268,7 +268,7 @@ export default {
 					<result-dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></result-dms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
-					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+					<div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
 				</template>
 			</template>
 		</div>
@@ -302,7 +302,7 @@ export default {
 				class="btn btn-primary"
 				type="button"
 			>
-				Übernehmen
+				{{ $p.t('search/button_applyfilter_label') }}
 			</button>
 		</div>
 	</form>`
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d9a72eaac..76059451d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31165,8 +31165,688 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'input_search_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Suche...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_filter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_applyfilter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Apply',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'action_default_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard Aktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Default Action',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_student_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_prestudent_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_group_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MitarbeiterIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard-Kostenstelle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Standard cost center',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_parent_oe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übergeordnete OE',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parent OU',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_oe_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_room_address',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Site',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_floor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{floor} Stockwerk',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{floor} floor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sitzplätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Seats',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_pc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{max_person}, davon {workplaces} PC-Plätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{max_person}, of which {workplaces} PC-Workstations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_building',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gebäude',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Building',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_equipment',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zusatz Informationen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Additional information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Leader',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N.N.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_number_of_employees',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter-Anzahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Number of employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_version',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_keywords',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Schlagwörter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Keywords',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_content_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Inhalt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Content',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_no_results',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden keine Ergebnisse gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No results were found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_unknown_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unbekannter Ergebnistyp: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unknown resulttype: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei der Suche ist ein Fehler aufgetreten. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An error occurred while searching. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"] nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"] not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration für $config["{type}"] ist ungültig: Feld "{field}" fehlt, ist leer oder hat einen ungültigen Typ.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config for $config["{type}"] is invalid: field {field} is missing, empty or has an invalid type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config_searchfield',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"]["searchfields"]["{searchfield}"] is invalid: field {field} is missing or invalid.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
-
 );
 
 

From 72c992569c5c79a49f7b1c8325db494533f612d4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 13:33:51 +0100
Subject: [PATCH 0025/1357] Improvements Mergedperson Component

---
 .../searchbar/result/mergedperson.js          | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index c0349c2e3..e6fc5833b 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -12,33 +12,38 @@ export default {
 		actions: Object
 	},
 	computed: {
-		telurl() {
-			return 'tel:' + this.employee?.phone;
-		},
 		person() {
-			const person = this.res.list.filter(item => item.type == 'person');
-			if (person.length)
-				return person.pop();
+			 // Cummulate all emails
+			const email = this.res.list.reduce((a, c) => [...a, ...(Array.isArray(c.email) ? c.email : [c.email])], []);
+
+			// Use person entry if available (with cummulated emails)
+			const person = this.res.list.find(item => item.type == 'person');
+			if (person)
+				return {...person, email};
+
+			 // Those properties should be the same in all entries
+			const { person_id, name } = this.res.list[0];
+			 // Get first photo (prefer student photo if available)
+			const photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
 
-			// TODO(chris): first one might have not one of these but a later one
-			const { person_id, name, photo_url, email } = this.res.list[0];
 			return { person_id, name, photo_url, email };
 		},
 		employee() {
-			const ma = this.res.list.filter(item => [
+			return this.res.list.find(item => [
 				'employee',
 				'unassigned_employee'
-			].includes(item.type));
-			return ma.length ? ma.pop() : null;
+			].includes(item.type)) || null;
 		},
 		students() {
 			const students = this.res.list.filter(item => item.type == 'prestudent');
 			return students.length ? students : null;
 		},
 		emails() {
-			if (Array.isArray(this.person.email))
-				return new Set(this.person.email);
-			return [this.person.email];
+			// Remove duplicates
+			return new Set(this.person.email);
+		},
+		telurl() {
+			return 'tel:' + this.employee?.phone;
 		}
 	},
 	template: `

From 2ed5df8c1c18f644bac7de3ff0aad41c9103f7dc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 17:01:51 +0100
Subject: [PATCH 0026/1357] Orgform of Stg in searchresults

---
 application/config/search.php                       | 13 ++++++++++++-
 .../js/components/searchbar/result/mergedperson.js  |  2 +-
 public/js/components/searchbar/result/prestudent.js |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 8c601e046..3a2c27a18 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -309,7 +309,18 @@ $config['prestudent'] = [
 			FROM public.tbl_status
 			WHERE status_kurzbz = public.get_rolle_prestudent(ps.prestudent_id, NULL)
 			LIMIT 1
-		) as status"
+		) AS status",
+		"COALESCE(
+			(
+				SELECT COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz)
+				FROM public.tbl_prestudentstatus pss
+				LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+				WHERE pss.prestudent_id=ps.prestudent_id
+				ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
+				LIMIT 1
+			),
+			sg.orgform_kurzbz
+		) AS orgform"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index e6fc5833b..be9d1e735 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -139,7 +139,7 @@ export default {
 					<div class="searchbar_tablerow">
 						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell">
-							{{ student.bezeichnung }}
+							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 51b4ccd9b..c33877bf0 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -60,7 +60,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
 				<div class="searchbar_tablecell">
-					{{ res.bezeichnung }}
+					{{ res.bezeichnung }} {{ res.orgform ? '(' + res.orgform + ')' : '' }}
 				</div>
 			</div>
 		</div>

From 2d0285e31d900f16626225d27f0b7b44658ab327 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 8 Nov 2024 13:29:19 +0100
Subject: [PATCH 0027/1357] =?UTF-8?q?add=20and=20update=20Lehrauftraege,?=
 =?UTF-8?q?=20logic=20sumup=20betr=C3=A4ge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 260 ++++++++++++++----
 .../models/accounting/Vertrag_model.php       |  11 +-
 public/js/api/vertraege/person.js             |  33 ++-
 .../js/components/Vertraege/List/Details.js   |  85 +++++-
 public/js/components/Vertraege/List/Status.js |   6 +-
 .../components/Vertraege/List/Unassigned.js   |  91 +++++-
 public/js/components/Vertraege/Vertraege.js   | 161 +++++++++--
 system/phrasesupdate.php                      |  83 +++++-
 8 files changed, 618 insertions(+), 112 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 9d38ed27f..a6480740b 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -23,6 +23,8 @@ class Vertraege extends FHCAPI_Controller
 			'loadContractStatus' => ['admin:r', 'assistenz:r'],
 			'deleteContractStatus' => ['admin:r', 'assistenz:r'],
 			'updateContractStatus' => ['admin:r', 'assistenz:r'],
+			'deleteLehrauftrag' => ['admin:r', 'assistenz:r'],
+			'deleteBetreuung' => ['admin:r', 'assistenz:r']
 		]);
 
 		//Load Models
@@ -93,23 +95,31 @@ class Vertraege extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result) ?: []);
 	}
 
-	public function addNewContract($person_id)
+	public function addNewContract()
 	{
 		//$this->validateNewOrUpdate();
 		//TODO(Manu) check validations
+		//$bezeichnung = $formData->bezeichnung;
 
-		//$person_id = $this->input->post('person_id');
-		$vertragsdatum = $this->input->post('vertragsdatum');
-		$bezeichnung = $this->input->post('bezeichnung');
-		$vertragstyp_kurzbz = $this->input->post('vertragstyp_kurzbz');
-		$betrag = $this->input->post('betrag');
-		$vertragsstunden = $this->input->post('vertragsstunden');
-		$vertragsstunden_studiensemester_kurzbz = $this->input->post('vertragsstunden_studiensemester_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
+		$person_id = $this->input->post('person_id');
+		$formData = $this->input->post('formData');
+
+		$vertragsdatum = $formData['vertragsdatum'];
+		$bezeichnung = $formData['bezeichnung'];
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'];
+		$betrag = isset($formData['betrag']) ? $formData['betrag'] : null;
+		$vertragsstunden = isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
+		$vertragsstunden_studiensemester_kurzbz = isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
+		$anmerkung = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+
+		$lehrauftraege = $this->input->post('clickedRows');
+
+
+		//$this->terminateWithError("in function" . $lehrauftraege[0]['lehreinheit_id'], self::ERROR_TYPE_GENERAL);
 
 		$this->db->trans_start();
 
-		$result = $this->VertragModel->insert( [
+		$result = $this->VertragModel->insert([
 			'person_id' => $person_id,
 			'vertragsdatum' => $vertragsdatum,
 			'bezeichnung' => $bezeichnung,
@@ -122,9 +132,13 @@ class Vertraege extends FHCAPI_Controller
 			'insertvon' => getAuthUID()
 		]);
 
+		$vertrag_id = $result->retval;
+
+		//$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
+
 		//TODO(Manu) validation, dass status nicht schon bereits vorhanden
 		$status_result = $this->VertragvertragsstatusModel->insert([
-			'vertrag_id' => $result->retval,
+			'vertrag_id' => $vertrag_id,
 			'uid' => getAuthUID(),
 			'vertragsstatus_kurzbz' => 'neu',
 			'insertamum' => date('c'),
@@ -134,7 +148,140 @@ class Vertraege extends FHCAPI_Controller
 
 		if (!$status_result) {
 			$this->db->trans_rollback();
-			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
+			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.', self::ERROR_TYPE_GENERAL);
+		}
+
+		//Hinzufügen der Lehraufträge
+		foreach ($lehrauftraege as $row) {
+
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Vertrag', self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Betreuung', self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+		}
+
+		$this->db->trans_complete();
+		$this->terminateWithSuccess(true);
+	}
+
+	public function updateContract()
+	{
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+		$formData = $this->input->post('formData');
+
+		$vertragsdatum = $formData['vertragsdatum'];
+		$bezeichnung = $formData['bezeichnung'];
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'];
+		$betrag = isset($formData['betrag']) ? $formData['betrag'] : null;
+		$vertragsstunden = isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
+		$vertragsstunden_studiensemester_kurzbz = isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
+		$anmerkung = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+
+		$lehrauftraege = $this->input->post('clickedRows');
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->update(
+			$vertrag_id, [
+			'person_id' => $person_id,
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
+			'vertragsstunden' => $vertragsstunden,
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		//TODO(MANU) Transaction: splitting of in error und rollback sonst weiter
+
+		//Adding of Lehraufträge
+		foreach ($lehrauftraege as $row) {
+
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Vertrag', self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Betreuung', self::ERROR_TYPE_GENERAL);
+				}
+			}
+
 		}
 
 		$this->db->trans_complete();
@@ -157,45 +304,6 @@ class Vertraege extends FHCAPI_Controller
 		$this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function updateContract($vertrag_id)
-	{
-		//$this->validateNewOrUpdate();
-		//TODO(Manu)validations
-
-
-		$vertrag_id = $this->input->post('vertrag_id');
-		$person_id = $this->input->post('person_id');
-		$vertragsdatum = $this->input->post('vertragsdatum');
-		$bezeichnung = $this->input->post('bezeichnung');
-		$vertragstyp_kurzbz = $this->input->post('vertragstyp_kurzbz');
-		$betrag = $this->input->post('betrag');
-		$vertragsstunden = $this->input->post('vertragsstunden');
-		$vertragsstunden_studiensemester_kurzbz = $this->input->post('vertragsstunden_studiensemester_kurzbz');
-		$anmerkung = $this->input->post('anmerkung');
-
-		$this->db->trans_start();
-
-		$result = $this->VertragModel->update($vertrag_id, [
-			'person_id' => $person_id,
-			'vertragsdatum' => $vertragsdatum,
-			'bezeichnung' => $bezeichnung,
-			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
-			'betrag' => $betrag,
-			'vertragsstunden' => $vertragsstunden,
-			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
-			'anmerkung' => $anmerkung,
-			'vertragsstunden' => $vertragsstunden,
-			'updateamum' => date('c'),
-			'updatevon' => getAuthUID()
-		]);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_complete();
-
-		$this->terminateWithSuccess(true);
-	}
-
 	public function deleteContract($vertrag_id)
 	{
 		//TODO(Manu) validations,
@@ -322,4 +430,54 @@ class Vertraege extends FHCAPI_Controller
 
 		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
+
+	public function deleteLehrauftrag($vertrag_id, $lehreinheit_id, $mitarbeiter_uid)
+	{
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//kein delete: ein update, bei dem die vertrag_id auf null gesetzt wird
+		$result = $this->LehreinheitmitarbeiterModel->update(
+			[
+				'lehreinheit_id' => $lehreinheit_id,
+				'mitarbeiter_uid' => $mitarbeiter_uid,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null
+			]);
+
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetreuung($vertrag_id, $person_id, $projektarbeit_id, $betreuerart_kurzbz)
+	{
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		$result = $this->Projektbetreuermodel->update(
+			[
+				'person_id' => $person_id,
+				'projektarbeit_id' => $projektarbeit_id,
+				'betreuerart_kurzbz' => $betreuerart_kurzbz,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null
+			]);
+
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+
 }
\ No newline at end of file
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index a179dbc81..a9f514666 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -370,7 +370,7 @@ SELECT
 			mitarbeiter_uid,
 			null as pruefung_id,
 			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
+			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag1,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			null as betreuerart_kurzbz,
 			(	SELECT
@@ -394,7 +394,7 @@ SELECT
 			null as mitarbeiter_uid,
 			null::integer as pruefung_id,
 			projektarbeit_id,
-			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag,
+			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
 			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
@@ -436,7 +436,7 @@ SELECT
 					JOIN public.tbl_studiengang USING(studiengang_kz)
 				WHERE
 					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung
+			as bezeichnung, vertrag_id
 		FROM
 			lehre.tbl_lehreinheitmitarbeiter
 			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
@@ -454,7 +454,7 @@ SELECT
 			tbl_lehreinheit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung
+			as bezeichnung, vertrag_id
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
@@ -479,7 +479,8 @@ SELECT
 			SELECT
 				*,
                 TO_CHAR(tbl_vertrag_vertragsstatus.datum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_datum,
-                TO_CHAR(tbl_vertrag_vertragsstatus.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
+                TO_CHAR(tbl_vertrag_vertragsstatus.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum,
+                TO_CHAR(tbl_vertrag_vertragsstatus.updateamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_updateamum
 			FROM
 				lehre.tbl_vertrag_vertragsstatus
 				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index c682342df..5befc16c1 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -6,7 +6,6 @@ export default {
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + params.person_id);
 	},
 	getAllContractsAssigned(url, config, params){
-		console.log(params.person_id, params.vertrag_id);
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + params.person_id + '/' + params.vertrag_id);
 	},
 	getAllContractsNotAssigned2(person_id){
@@ -21,17 +20,35 @@ export default {
 	getAllContractStati(){
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractStati/');
 	},
-	addNewContract(person_id, formData) {
+/*	addNewContract(person_id, formData) {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' +
 			person_id, formData
 		);
+	},*/
+	addNewContract(data) {
+		//TODO(Manu) Refactor
+		const { person_id, formData, clickedRows } = data;
+		console.log("Person ID:", person_id);
+		console.log("Form Data:", formData);
+		console.log("Clicked Rows:", clickedRows);
+		//return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' + Object.values(params.person_id).join('/') + '/' +  Object.values(params.formData).join('/') + '/' + Object.values(params.clickedRows).join('/'));
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/', data);
 	},
 	loadContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id);
 	},
-	updateContract(vertrag_id, formData) {
+/*	updateContract(vertrag_id, formData) {
 		return this.$fhcApi.post( 'api/frontend/v1/vertraege/vertraege/updateContract/' + vertrag_id,
 			formData);
+	},*/
+	updateContract(data) {
+		//TODO(Manu) Refactor
+		const { vertrag_id, person_id, formData, clickedRows } = data;
+		console.log("Person ID:", person_id);
+		console.log("Vertrag ID:", vertrag_id);
+		console.log("Form Data:", formData);
+		console.log("Clicked Rows:", clickedRows);
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/updateContract/', data);
 	},
 	deleteContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
@@ -43,10 +60,18 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
 	},
 	updateContractStatus(params) {
-		console.log("API", params.vertrag_id, params.status, params.datum);
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/updateContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
 	},
 	deleteContractStatus(params) {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.status).join('/'));
+	},
+	deleteLehrauftrag(params) {
+		//TODO Manu (Refactor!)
+		console.log(params.vertrag_id, params.lehreinheit_id, params.mitarbeiter_uid);
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.lehreinheit_id).join('/') + '/' + Object.values(params.mitarbeiter_uid).join('/'));
+	},
+	deleteBetreuung(params) {
+		console.log(params.vertrag_id, params.person_id, params.projektarbeit_id, params.betreuerart_kurzbz);
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteBetreuung/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.person_id).join('/') + '/' + Object.values(params.projektarbeit_id).join('/') + '/' + Object.values(params.betreuerart_kurzbz).join('/'));
 	}
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index ef0710970..b858d84b9 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -56,6 +56,45 @@ export default {
 						field: "vertragsstunden_studiensemester_kurzbz",
 						visible: false
 					},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 50,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							const 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-xmark"></i>';
+							button.title = 'Lehrauftrag löschen';
+
+							let type = cell.getData().type;
+							console.log(type);
+							if (type == 'Lehrauftrag')
+							{
+								button.addEventListener(
+									'click',
+									() =>
+										this.actionDeleteLehrauftrag(cell.getData().vertrag_id, cell.getData().lehreinheit_id, cell.getData().mitarbeiter_uid)
+								);
+							}
+
+							if (type == 'Betreuung')
+							{
+								button.addEventListener(
+									'click',
+									() =>
+										this.actionDeleteBetreuung(cell.getData().vertrag_id, cell.getData().projektarbeit_id,  cell.getData().betreuerart_kurzbz)
+								);
+							}
+
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
@@ -69,27 +108,48 @@ export default {
 		}
 	},
 	watch: {
-		person_id: 'updateTableData',
-		vertrag_id: 'updateTableData'
-/*		person_id() {
+/*		person_id: 'updateTableData',
+		vertrag_id: 'updateTableData'*/
+		person_id() {
+			console.log("person geändert");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
 		},
 		vertrag_id() {
+			console.log("vertrag geändert");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
-		},*/
+		},
 	},
 	methods: {
-		updateTableData() {
+/*		updateTableData() {
 			this.$refs.table.tabulator.setData(`api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/ ' ${this.person_id}/${this.vertrag_id}`);
-		}
+		},*/
+		//TODO(Manu) delete vertrag_id: not necessary
+		actionDeleteLehrauftrag(vertrag_id, lehreinheit_id, mitarbeiter_uid) {
+			console.log("child", vertrag_id);
+			this.$emit('deleteLehrauftrag', {
+				lehreinheit_id: lehreinheit_id,
+				vertrag_id: vertrag_id,
+				mitarbeiter_uid: mitarbeiter_uid
+			});
+		},
+		actionDeleteBetreuung(vertrag_id, projektarbeit_id, betreuerart_kurzbz) {
+			this.$emit('deleteBetreuung', {
+				person_id: this.person_id,
+				vertrag_id: vertrag_id,
+				projektarbeit_id: projektarbeit_id,
+				betreuerart_kurzbz: betreuerart_kurzbz
+			});
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+			this.$emit('reload');
+		},
 	},
 	template: `
-	<!--TODO(Manu) check css, design -->
+	<!--TODO(Manu) nicht anzeigen, wenn keine vorhanden ? check css, design -->
+	
 	<div class="core-vertraege h-50 d-flex flex-column w-100">
-		person_id: {{person_id}}
-		<br>
-		vertrag_id: {{vertrag_id}}
-		
+
 		  <div>
 			<!-- Tabulator-Container -->
 			<div ref="table"></div>
@@ -106,7 +166,8 @@ export default {
 			ref="table"
 			:tabulator-options="tabulatorOptions"
 			table-only
-			:side-menu="false"	
+			:side-menu="false"
+			reload
 			>
 		</core-filter-cmpt>		
 	</div>`
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 24aac571f..07efe6c90 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -37,14 +37,14 @@ export default {
 				},
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Status", field: "vertragsstatus_kurzbz"},
+					{title: "Status", field: "bezeichnung"},
 					{title: "Datum", field: "format_datum"},
 					{title: "vertrag_id", field: "vertrag_id", visible: false},
 					// {title: "User", field: "bezeichnung", visible: false},
-					// {title: "Vertragsstatus_kurzbz", field: "Vertragsstatus_kurzbz", visible: false},
 					{title: "insertvon", field: "insertvon", visible: false},
-					// {title: "insertamum", field: "insertamum", visible: false},
 					{title: "insertamum", field: "format_insertamum", visible: false},
+					{title: "updatevon", field: "updatevon", visible: false},
+					{title: "updateamum", field: "format_updateamum", visible: false},
 					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
 					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
 					{
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 8549b1a1a..0f61d6adf 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -31,10 +31,37 @@ export default {
 						person_id: this.person_id
 					};
 				},
+				//TODO(Manu) auch beträge von NULL anzeigen als 0.00
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 125},
-					{title: "Betrag", field: "betrag", width: 150},
+					{title: "Typ", field: "type"},
+/*					{
+						title: "Betrag",
+						field: "betrag",
+						formatter: function(cell) {
+							// Hole den Wert der Zelle
+							let value = cell.getValue();
+
+							// Falls der Wert null oder undefined ist, setze ihn auf "0,00"
+							if (value == null) {
+								return "0,00";
+							}
+
+							// Andernfalls formatiere ihn auf zwei Dezimalstellen
+							return parseFloat(value).toFixed(2).replace(".", ",");
+						}
+					},*/
+					{title: "Betrag",
+						field: "betrag1",
+						formatter: function(cell) {
+							let value = cell.getValue();
+
+							if (value == null) {
+								return "0.00";
+							}
+
+							return parseFloat(value).toFixed(2);
+						}},
 					{title: "Bezeichnung", field: "bezeichnung", width: 150},
 					{title: "Studiensemester", field: "studiensemester_kurzbz"},
 					{title: "PruefungId", field: "betrag", visible: false},
@@ -56,16 +83,24 @@ export default {
 				selectableRangeMode: 'click',
 				selectable: true,
 			},
-			clickedRows: []
+			clickedRows: [],
+			sumBetragLehrauftraege: 0
 		}
 	},
+	//TODO(Manu) auch auf fhcapi umbauen?
+	watch: {
+		person_id() {
+			console.log("data changed");
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
+		},
+	},
 	methods: {
 		toggleRowClick(rowData){
 			//id already existing?
 			//const index = this.clickedRows.findIndex(row => row.id === id);
 
 
-			//id alleine reicht nicht: Betreuerart ebenfalls
+			//id alleine reicht nicht: Betreuerart ebenfalls, am besten gleich ganze Row!
 /*			if (this.clickedRows.indexOf(id) == -1) {
 				console.log("Die Zahl " + id + " ist NICHT Array enthalten.");
 				this.clickedRows.push(id);
@@ -81,11 +116,30 @@ export default {
 
 			if (exists) {
 				this.clickedRows = this.clickedRows.filter(row => JSON.stringify(row) !== JSON.stringify(rowData));
+				this.sumBetragLehrauftraege -= Number(rowData.betrag1);
+				this.handleSumUp();
 			} else {
 				this.clickedRows.push(rowData);
+				//hier soll der variable sumBetragLehrauftraege der Wert von this.clickedRows.betrag1 hinzugefügt werden
+				this.sumBetragLehrauftraege += Number(rowData.betrag1);
+				console.log(rowData.betrag1);
+				this.handleSumUp();
 			}
 
-		}
+		},
+		emitSaveEvent() {
+			// Emit ein Event und übergebe clickedRows an die Parent-Komponente
+			this.$emit('saveClickedRows', this.clickedRows);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+			this.$emit('reload');
+			this.clickedRows = {};
+		},
+		handleSumUp() {
+			//this.localValue += 1; // Increment the local value
+			this.$emit("sum-updated", this.sumBetragLehrauftraege); // Emit the updated value to the parent
+		},
 	},
 	mounted() {
 		this.$nextTick(() => {
@@ -99,14 +153,35 @@ export default {
 	<!--TODO(Manu) check css, design .. mybe list.js-->
 	<div class="core-vertraege h-50 d-flex flex-column w-100">
 	
-	{{clickedRows}}
+<!--	{{clickedRows}} <hr> sum:  {{sumBetragLehrauftraege}}-->
+	<!--TODO(Manu) nicht anzeigen wenn keine vertraege vorhanden, "KEINE DATEN vorhanden"-->
 	
+	
+		<p>Die folgenden Lehraufträge sind noch keinem Vertrag zugeordnet. Markieren Sie die Lehraufträge um diese dem Vertrag zuzuordnen:</p>
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
 			table-only
-			:side-menu="false"	
+			:side-menu="false"
 			>
-		</core-filter-cmpt>		
+		</core-filter-cmpt>
+		
+		
+		<p v-if="clickedRows.length > 0" >Folgende Lehraufträge werden hinzugefügt:</p>
+		  
+		<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
+			<div class="col-md-6">
+			  <input
+				class="form-control"
+				type="text"
+				:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
+				aria-label="readonly input example"
+				readonly
+			  >
+			</div>
+
+		</div>
+
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index a3277d6f7..8cc9b9bc3 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -34,7 +34,7 @@ export default {
 	},
 	data() {
 		return {
-			//TODO(Manu) check if filter bei Status: Abgerechnet wird zum Beispiel nicht angezeigt
+			//TODO(Manu) filter: alle vs offene Verträge
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllVertraege,
@@ -59,7 +59,7 @@ export default {
 					{title: "Anmerkung", field: "anmerkung", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
-						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						minWidth: 150,
 						maxWidth: 150,
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
@@ -127,19 +127,23 @@ export default {
 				}
 			],
 			statusNew: true,
-			formData: {},
+			formData: {	},
 			listContractsUnassigned: [],
 			listContractTypes: [],
 			contractSelected: [],
 			listContractStati: [],
 			contractFormData: {
 				vertragsstatus_kurzbz: 'test',
-				datum: new Date()
-			}
-		//	isContractModalVisible: true,
+				datum: new Date(),
+			},
+			childData: {}
 		}
 	},
-
+	watch: {
+		person_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + this.person_id);
+		},
+	},
 	methods: {
 		actionNewContract() {
 			this.resetModal();
@@ -165,24 +169,43 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		addNewContract() {
+			this.$refs.unassignedLehrauftraege.emitSaveEvent();
+
+			const dataToSend = {
+				person_id: this.person_id,
+				formData: this.formData,
+				clickedRows: this.childData, //do I need all Data, maybe smaller array?
+			};
+
 			return this.endpoint
-				.addNewContract(this.person_id, this.formData)
+				.addNewContract(dataToSend)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					//window.scrollTo(0, 0);
+					//this.$refs.contractdetails.reload(); //TOOD(Manu) check why error
+					this.$refs.unassignedLehrauftraege.reload();
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		updateContract(vertrag_id) {
+			this.$refs.unassignedLehrauftraege.emitSaveEvent();
+
+			const dataToSend = {
+				vertrag_id: vertrag_id,
+				person_id: this.person_id,
+				formData: this.formData,
+				clickedRows: this.childData, //do I need all Data, maybe smaller array?
+			};
+
 			return this.endpoint
-				.updateContract(vertrag_id, this.formData)
+				.updateContract(dataToSend)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
+					this.$refs.unassignedLehrauftraege.reload();
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -197,6 +220,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		//Methods Contract Stati
 		addNewContractStatus({status, datum}) {
 			const date = new Date();
 			//TODO(Manu) refactor this
@@ -233,6 +257,43 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		deleteLehrauftrag({lehreinheit_id, vertrag_id, mitarbeiter_uid}){
+
+			let params = {
+				vertrag_id : {vertrag_id},
+				lehreinheit_id: {lehreinheit_id},
+				mitarbeiter_uid: {mitarbeiter_uid},
+			};
+			return this.endpoint
+				.deleteLehrauftrag(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
+					//window.scrollTo(0, 0);
+					this.resetModal();
+					this.$refs.contractdetails.reload();
+					this.$refs.unassignedLehrauftraege.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteBetreuung({person_id, vertrag_id, projektarbeit_id, betreuerart_kurzbz}){
+			let params = {
+				vertrag_id : {vertrag_id},
+				person_id: {person_id},
+				projektarbeit_id: {projektarbeit_id},
+				betreuerart_kurzbz: {betreuerart_kurzbz},
+			};
+			return this.endpoint
+				.deleteBetreuung(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+
+					//window.scrollTo(0, 0);
+					this.$refs.contractdetails.reload();
+					this.$refs.unassignedLehrauftraege.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		updateContractStatus({datum, status}){
 			//TODO(Manu) refactor this
 			const formattedDate = datum.toLocaleDateString('en-CA');
@@ -265,15 +326,36 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		//Methods Unassigned List
+		saveClickedRows(clickedRows) {
+			this.childData = clickedRows;
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
 		resetModal(){
 			this.formData = {};
 			this.formData.vertragsdatum  = new Date();
+			this.formData.betrag = 0;
+			this.formData.bezeichnung = this.getFormattedDate();
 			this.formData.vertragstyp_kurzbz = null;
 			this.statusNew = true;
-		}
+
+			//this.childData = {};
+			//gefährlich, immer null??
+			//TODO(Manu) check if this.childData = {},
+		},
+		updateBetrag(sumBetrag){
+			this.formData.betrag = sumBetrag;
+		},
+		getFormattedDate() {
+			const today = new Date();
+			const year = today.getFullYear();
+			const month = String(today.getMonth() + 1).padStart(2, "0");
+			const day = String(today.getDate()).padStart(2, "0");
+
+			return `${year}${month}${day}`; // Format: YYYYMMDD
+		},
 	},
 	created() {
 		Promise.all([
@@ -294,11 +376,16 @@ export default {
 				this.contractSelected = row.getData();
 			});
 		});
+		this.getFormattedDate();
+
 	},
 	template: `
 
 	<div class="core-vertraege h-100 d-flex flex-column">
 	
+				parent:
+			{{childData}}
+	
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -317,22 +404,28 @@ export default {
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<contract-details :person_id="person_id" :vertrag_id="contractSelected.vertrag_id"></contract-details>
+					<contract-details 
+						:person_id="person_id" 
+						:vertrag_id="contractSelected.vertrag_id"
+						@deleteLehrauftrag="deleteLehrauftrag"
+						@deleteBetreuung="deleteBetreuung"
+						ref="contractdetails"
+					></contract-details>
 				</div>
 			</div>
-			
+
 			<div class="col-sm-6">
 				<!-- ContractStati -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
 					<contract-stati 
-					:vertrag_id="contractSelected.vertrag_id" 
-					:listContractStati="listContractStati"
-					:formDataParent="contractFormData"
-					@setContractStatus="addNewContractStatus"
-					@deleteContractStatus="deleteContractStatus"
-					@updateContractStatus="updateContractStatus"
-					@loadContractStatus="loadContractStatus"
-					ref="contractstati"
+						:vertrag_id="contractSelected.vertrag_id" 
+						:listContractStati="listContractStati"
+						:formDataParent="contractFormData"
+						@setContractStatus="addNewContractStatus"
+						@deleteContractStatus="deleteContractStatus"
+						@updateContractStatus="updateContractStatus"
+						@loadContractStatus="loadContractStatus"
+						ref="contractstati"
 					></contract-stati>
 				</div>
 			</div>
@@ -342,18 +435,30 @@ export default {
 		<!--Modal: contractModal-->
 		<bs-modal ref="contractModal" dialog-class="modal-xl">
 			<template #title>
-				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('ui', 'add_contract')}}</p>
-				<p v-else class="fw-bold mt-3">{{$p.t('ui', 'edit_contract')}}</p>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('vertrag', 'addVertrag')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('vertrag', 'editVertrag')}}</p>
 			</template>
 			
 			<core-form class="row g-3" ref="unassignedData">
 		
-				<list-unassigned :endpoint="$fhcApi.factory.vertraege.person" :person_id="person_id"></list-unassigned>
-			
+		{{formData}}
+	
+		<!--TODO(Manu) wenn einer gelöscht wird, wird er auch nicht sofort angezeigt
+		Auswirkung von Vertragdetails of UnassignedList-->
+				<list-unassigned 
+					:endpoint="$fhcApi.factory.vertraege.person" 
+					:person_id="person_id"
+					ref="unassignedLehrauftraege"
+					@saveClickedRows="saveClickedRows"
+					@sum-updated="updateBetrag"
+					></list-unassigned>
+
+				<hr>
+				
 				<div class="row mb-3">
 					<form-input
 						type="DatePicker"
-						:label="$p.t('ui/vertragsdatum')"
+						:label="$p.t('vertrag/datum_vertrag')"
 						name="vertragsdatum"
 						v-model="formData.vertragsdatum"
 						auto-apply
@@ -405,7 +510,7 @@ export default {
 				<div class="row mb-3" v-if="!statusNew">		
 					<form-input
 						type="text"
-						:label="$p.t('ui/Stunden (Vertrags-Urfassung')"
+						:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
 						name="vertragsstunden"
 						v-model="formData.vertragsstunden"
 						disabled
@@ -416,7 +521,7 @@ export default {
 				<div class="row mb-3" v-if="!statusNew">		
 					<form-input
 						type="text"
-						:label="$p.t('ui/Studiensemester (Vertrags-Urfassung')"
+						:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
 						name="vertragsstunden_studiensemester_kurzbz"
 						v-model="formData.vertragsstunden_studiensemester_kurzbz"
 						disabled
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d9a72eaac..335cd80a4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31165,7 +31165,88 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	// Contract
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'addVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuen Vertrag erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add new contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'editVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'datum_vertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'contract date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertrag_urfassung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrags-Urfassung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'original version of the contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 023fafde2c963953eb6a9f347141b49fd340f076 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 11 Nov 2024 10:37:51 +0100
Subject: [PATCH 0028/1357] update reload functions, adapt delete contract, add
 watcher in unassignedList

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 61 ++++++++++++++++++-
 .../Details/Prestudent/MultiStatus.js         | 10 +--
 .../js/components/Vertraege/List/Details.js   | 11 ++--
 public/js/components/Vertraege/List/Status.js |  2 +-
 .../components/Vertraege/List/Unassigned.js   | 11 +++-
 public/js/components/Vertraege/Vertraege.js   | 12 ++--
 6 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index a6480740b..52224fba1 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -306,7 +306,66 @@ class Vertraege extends FHCAPI_Controller
 
 	public function deleteContract($vertrag_id)
 	{
-		//TODO(Manu) validations,
+		//TODO(Manu) validations
+
+		//TODO(manu) use private function
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//check if attached Lehrauftrag
+		$resultLehrauftrag = $this->LehreinheitmitarbeiterModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultLehrauftrag))
+		{
+			$resultLehrauftrag = getData($resultLehrauftrag);
+			foreach($resultLehrauftrag as $lehrauftrag)
+			{
+				$result = $this->LehreinheitmitarbeiterModel->update(
+				[
+					'lehreinheit_id' => $lehrauftrag->lehreinheit_id,
+					'mitarbeiter_uid' => $lehrauftrag->mitarbeiter_uid,
+					'vertrag_id' => $vertrag_id
+				],
+				[
+					'vertrag_id' => null
+				]);
+
+				$this->getDataOrTerminateWithError($result);
+
+			}
+		}
+
+		//if attached Betreuung
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		//if attached Betreuung
+		$resultBetreuung = $this->Projektbetreuermodel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultBetreuung))
+		{
+			$resultBetreuung = getData($resultBetreuung);
+			foreach($resultBetreuung as $betreuung)
+			{
+				$result = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $betreuung->person_id,
+						'projektarbeit_id' => $betreuung->projektarbeit_id,
+						'betreuerart_kurzbz' => $betreuung->betreuerart_kurzbz,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null
+					]);
+
+				$this->getDataOrTerminateWithError($result);
+
+			}
+
+		}
+
 		$result = $this->VertragvertragsstatusModel->load([
 			'vertrag_id' => $vertrag_id
 		]);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 4cf826bb3..725dfa83a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -318,10 +318,7 @@ export default{
 			@saved="reload"
 			>
 		</status-modal>
-		TEST1: Anzahl Students: 
-		{{modelValue.length}}
-		
-			
+	
 		<core-filter-cmpt
 			v-if="!this.modelValue.length"
 			ref="table"
@@ -333,10 +330,7 @@ export default{
 			new-btn-show
 			new-btn-label="Status"
 			@click:new="actionNewStatus"
-			>
-			
-			TEST 2
-			
+			>			
 			<template #actions="{updateData2}">
 				<!-- SingleSelectButton-->
 				<status-dropdown 
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index b858d84b9..67c8de397 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -148,17 +148,18 @@ export default {
 	template: `
 	<!--TODO(Manu) nicht anzeigen, wenn keine vorhanden ? check css, design -->
 	
-	<div class="core-vertraege h-50 d-flex flex-column w-100">
+	<div class="core-vertraege-details h-50 d-flex flex-column w-100">
+	<br>
 
-		  <div>
-			<!-- Tabulator-Container -->
+<!--		  <div>
+			&lt;!&ndash; Tabulator-Container &ndash;&gt;
 			<div ref="table"></div>
 		
-			<!-- Ausgabe der Daten -->
+			&lt;!&ndash; Ausgabe der Daten &ndash;&gt;
 			<div v-for="row in tableData" :key="row.id">
 			  <p>{{ row.name }} - {{ row.value }}</p>
 			</div>
-		  </div>
+		  </div>-->
 		
 		<h4>Vertragdetails</h4>
 	
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 07efe6c90..1c9ef7e21 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -161,7 +161,7 @@ export default {
 	},
 	template: `
 	<!--TODO(Manu) check filter (akzeptiert, neu, erteilt?), design -->
-	<div class="core-vertraege h-50 d-flex flex-column w-100">
+	<div class="core-vertraege-status h-50 d-flex flex-column w-100">
 		<br>
 		<h4>Vertragsstatus</h4>
 	
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 0f61d6adf..0b3223989 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -93,6 +93,10 @@ export default {
 			console.log("data changed");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
+		clickedRows() {
+			console.log("clicked rows changed");
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
+		},
 	},
 	methods: {
 		toggleRowClick(rowData){
@@ -131,10 +135,11 @@ export default {
 			// Emit ein Event und übergebe clickedRows an die Parent-Komponente
 			this.$emit('saveClickedRows', this.clickedRows);
 		},
-		reload() {
+		reloadUnassigned() {
 			this.$refs.table.reloadTable();
-			this.$emit('reload');
-			this.clickedRows = {};
+			this.$emit('reloadUnassigned');
+			this.clickedRows = [];
+		//	console.log("clickedRows", this.clickedRows);
 		},
 		handleSumUp() {
 			//this.localValue += 1; // Increment the local value
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 8cc9b9bc3..0448cd169 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -147,10 +147,12 @@ export default {
 	methods: {
 		actionNewContract() {
 			this.resetModal();
+			this.$refs.unassignedLehrauftraege.reloadUnassigned();
 			this.$refs.contractModal.show();
 		},
 		actionEditContract(vertrag_id) {
 			this.statusNew = false;
+			this.$refs.unassignedLehrauftraege.reloadUnassigned();
 			this.loadContract(vertrag_id)
 				.then(this.$refs.contractModal.show);
 		},
@@ -184,7 +186,7 @@ export default {
 					this.$refs.contractModal.hide();
 					this.resetModal();
 					//this.$refs.contractdetails.reload(); //TOOD(Manu) check why error
-					this.$refs.unassignedLehrauftraege.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -205,7 +207,7 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					this.$refs.unassignedLehrauftraege.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -272,7 +274,7 @@ export default {
 					//window.scrollTo(0, 0);
 					this.resetModal();
 					this.$refs.contractdetails.reload();
-					this.$refs.unassignedLehrauftraege.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -290,7 +292,7 @@ export default {
 
 					//window.scrollTo(0, 0);
 					this.$refs.contractdetails.reload();
-					this.$refs.unassignedLehrauftraege.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -441,7 +443,7 @@ export default {
 			
 			<core-form class="row g-3" ref="unassignedData">
 		
-		{{formData}}
+<!--		{{formData}}-->
 	
 		<!--TODO(Manu) wenn einer gelöscht wird, wird er auch nicht sofort angezeigt
 		Auswirkung von Vertragdetails of UnassignedList-->

From add9263d35ff2a1883c5336a5329144714118882 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 11 Nov 2024 17:17:33 +0100
Subject: [PATCH 0029/1357] added Electronic Onboarding phrases

---
 system/phrasesupdate.php | 366 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 364 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7ef0269c9..29d5d6132 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31025,8 +31025,370 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
-
+	),
+	//****************************	 FHC-Core-ElectronicOnboarding
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email fehlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Email is missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailUngueltig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email ist ungültig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The email is not valid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailRegistriert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Email ist bereits registriert. Bitte verwenden sie eine andere Email oder loggen sie sich mit einer anderen Methode ein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The email is already registered. Please choose a different email or use a different login method.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungZugangEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugang zu Ihrer Bewerbung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access to your application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungZugangEmailAnredeWeiblich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sehr geehrte Frau',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dear Ms',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungZugangEmailAnredeMaennlich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sehr geehrter Herr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dear Mr',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungZugangEmailAnredeNeutral',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sehr geehrte/r',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dear',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'registrierungVerifzierenFuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Registrierung verifizieren für',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Verify registration for',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'registrierungVerifzieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Registrierung verifizieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Verify registration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'vorname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'nachname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Last name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'geburtsdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geburtsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Birth date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailAdresse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail Adresse',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'E-mail address',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailGesendet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die E-Mail mit dem Link zu Ihrer Bewerbung wurde erfolgreich an {0} verschickt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The email with the link to your application has been successfully sent to {0}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'emailGesendetHinweis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'In der Regel erhalten Sie das Mail in wenigen Minuten. Wenn Sie nach <b>24 Stunden</b> noch kein Mail erhalten haben,
+					kontaktieren Sie bitte unsere {0}Studienberatung{1}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You should receive an e-mail within a few minutes. If you receive no e-mail within <b>24 hours</b> please contact
+					our {0}student counselling team{1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'fehlerBeiRegistrierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler bei der Registrierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when registering',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'fehlerBeiRegistrierungText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Da ist etwas schief gelaufen. Wir bitten um Entschuldigung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sorry, something went wrong.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'fehlerBeiRegistrierungNochmalVersuchen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nochmals versuchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Try again',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 575144142475199796140eab21ff6b9f4c51f98d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 12 Nov 2024 07:57:46 +0100
Subject: [PATCH 0030/1357] filter offene Vertraege, validations insert, update
 Contract

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 161 +++++++++++-------
 .../models/accounting/Vertrag_model.php       |  11 +-
 .../js/components/Vertraege/List/Details.js   |  30 +---
 .../components/Vertraege/List/Unassigned.js   |   7 +-
 public/js/components/Vertraege/Vertraege.js   |  32 +++-
 system/phrasesupdate.php                      |  60 +++++++
 6 files changed, 203 insertions(+), 98 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 52224fba1..21fb310fc 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -27,11 +27,19 @@ class Vertraege extends FHCAPI_Controller
 			'deleteBetreuung' => ['admin:r', 'assistenz:r']
 		]);
 
-		//Load Models
+		//Load Models and Libraries
 		$this->load->model('accounting/Vertrag_model', 'VertragModel');
 		$this->load->model('accounting/Vertragsstatus_model', 'VertragsstatusModel');
 		$this->load->model('accounting/Vertragstyp_model', 'VertragstypModel');
 		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
+
+		//TODO(Manu) additional permission checks
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'vertrag'
+		]);
 	}
 
 	//TODO(Manu) validations, phrases
@@ -97,46 +105,66 @@ class Vertraege extends FHCAPI_Controller
 
 	public function addNewContract()
 	{
-		//$this->validateNewOrUpdate();
-		//TODO(Manu) check validations
-		//$bezeichnung = $formData->bezeichnung;
+		$this->load->library('form_validation');
 
 		$person_id = $this->input->post('person_id');
+
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
+		}
+
 		$formData = $this->input->post('formData');
 
-		$vertragsdatum = $formData['vertragsdatum'];
-		$bezeichnung = $formData['bezeichnung'];
-		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'];
-		$betrag = isset($formData['betrag']) ? $formData['betrag'] : null;
-		$vertragsstunden = isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
-		$vertragsstunden_studiensemester_kurzbz = isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
-		$anmerkung = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+		//Manually rewrite to postparameter for form validation
+		$_POST['vertragstyp_kurzbz'] = $formData['vertragstyp_kurzbz'];
+		$_POST['vertragsdatum']= $formData['vertragsdatum'];
+		$_POST['bezeichnung']= $formData['bezeichnung'];
+		$_POST['betrag'] = $formData['betrag'];
+		$_POST['vertragsstunden']= isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
+		$_POST['vertragsstunden_studiensemester_kurzbz']= isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
+		$_POST['anmerkung']= isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
 
 		$lehrauftraege = $this->input->post('clickedRows');
 
-
-		//$this->terminateWithError("in function" . $lehrauftraege[0]['lehreinheit_id'], self::ERROR_TYPE_GENERAL);
-
 		$this->db->trans_start();
 
 		$result = $this->VertragModel->insert([
 			'person_id' => $person_id,
-			'vertragsdatum' => $vertragsdatum,
-			'bezeichnung' => $bezeichnung,
-			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
-			'betrag' => $betrag,
-			'vertragsstunden' => $vertragsstunden,
-			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
-			'anmerkung' => $anmerkung,
+			'vertragsdatum' => $_POST['vertragsdatum'],
+			'bezeichnung' => $_POST['bezeichnung'],
+			'vertragstyp_kurzbz' => $_POST['vertragstyp_kurzbz'],
+			'betrag' => $_POST['betrag'],
+			'vertragsstunden' => $_POST['vertragsstunden'],
+			'vertragsstunden_studiensemester_kurzbz' => $_POST['vertragsstunden_studiensemester_kurzbz'],
+			'anmerkung' => $_POST['anmerkung'],
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 		]);
 
+		$this->getDataOrTerminateWithError($result);
 		$vertrag_id = $result->retval;
 
-		//$this->terminateWithError($result->retval, self::ERROR_TYPE_GENERAL);
-
-		//TODO(Manu) validation, dass status nicht schon bereits vorhanden
 		$status_result = $this->VertragvertragsstatusModel->insert([
 			'vertrag_id' => $vertrag_id,
 			'uid' => getAuthUID(),
@@ -148,7 +176,7 @@ class Vertraege extends FHCAPI_Controller
 
 		if (!$status_result) {
 			$this->db->trans_rollback();
-			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.', self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('vertrag', 'error_insertOrUpdateStatusVertrag'), self::ERROR_TYPE_GENERAL);
 		}
 
 		//Hinzufügen der Lehraufträge
@@ -169,13 +197,12 @@ class Vertraege extends FHCAPI_Controller
 
 				if (!$result_lehrauftrag) {
 					$this->db->trans_rollback();
-					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Vertrag', self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
 				}
 			}
 
 			if ($row['type'] == 'Betreuung')
 			{
-
 				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
 
 				$result_projektbetreuer = $this->Projektbetreuermodel->update(
@@ -191,10 +218,9 @@ class Vertraege extends FHCAPI_Controller
 				if (!$result_projektbetreuer)
 				{
 					$this->db->trans_rollback();
-					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Betreuung', self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
 				}
 			}
-
 		}
 
 		$this->db->trans_complete();
@@ -203,41 +229,62 @@ class Vertraege extends FHCAPI_Controller
 
 	public function updateContract()
 	{
+		$this->load->library('form_validation');
+
 		$vertrag_id = $this->input->post('vertrag_id');
 		$person_id = $this->input->post('person_id');
 		$formData = $this->input->post('formData');
-
-		$vertragsdatum = $formData['vertragsdatum'];
-		$bezeichnung = $formData['bezeichnung'];
-		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'];
-		$betrag = isset($formData['betrag']) ? $formData['betrag'] : null;
-		$vertragsstunden = isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
-		$vertragsstunden_studiensemester_kurzbz = isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
-		$anmerkung = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
-
 		$lehrauftraege = $this->input->post('clickedRows');
 
+		//Manually rewrite to postparameter for form validation
+		$_POST['vertragstyp_kurzbz'] = $formData['vertragstyp_kurzbz'];
+		$_POST['vertragsdatum']= $formData['vertragsdatum'];
+		$_POST['bezeichnung']= $formData['bezeichnung'];
+		$_POST['betrag'] = $formData['betrag'];
+		$_POST['vertragsstunden']= isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
+		$_POST['vertragsstunden_studiensemester_kurzbz']= isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
+		$_POST['anmerkung']= isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
 		$this->db->trans_start();
 
 		$result = $this->VertragModel->update(
-			$vertrag_id, [
-			'person_id' => $person_id,
-			'vertragsdatum' => $vertragsdatum,
-			'bezeichnung' => $bezeichnung,
-			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
-			'betrag' => $betrag,
-			'vertragsstunden' => $vertragsstunden,
-			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
-			'anmerkung' => $anmerkung,
-			'vertragsstunden' => $vertragsstunden,
-			'updateamum' => date('c'),
-			'updatevon' => getAuthUID()
+			$vertrag_id,
+			[
+				'person_id' => $person_id,
+				'vertragsdatum' => $_POST['vertragsdatum'],
+				'bezeichnung' => $_POST['bezeichnung'],
+				'vertragstyp_kurzbz' => $_POST['vertragstyp_kurzbz'],
+				'betrag' => $_POST['betrag'],
+				'vertragsstunden' => $_POST['vertragsstunden'],
+				'vertragsstunden_studiensemester_kurzbz' => $_POST['vertragsstunden_studiensemester_kurzbz'],
+				'anmerkung' => $_POST['anmerkung'],
+				'vertragsstunden' => $_POST['vertragsstunden'],
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
 		]);
 
 		$this->getDataOrTerminateWithError($result);
 
-		//TODO(MANU) Transaction: splitting of in error und rollback sonst weiter
-
 		//Adding of Lehraufträge
 		foreach ($lehrauftraege as $row) {
 
@@ -256,13 +303,12 @@ class Vertraege extends FHCAPI_Controller
 
 				if (!$result_lehrauftrag) {
 					$this->db->trans_rollback();
-					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Vertrag', self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
 				}
 			}
 
 			if ($row['type'] == 'Betreuung')
 			{
-
 				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
 
 				$result_projektbetreuer = $this->Projektbetreuermodel->update(
@@ -278,12 +324,10 @@ class Vertraege extends FHCAPI_Controller
 				if (!$result_projektbetreuer)
 				{
 					$this->db->trans_rollback();
-					$this->terminateWithError('Fehler beim Verknüpfen Lehrauftrag mit Betreuung', self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
 				}
 			}
-
 		}
-
 		$this->db->trans_complete();
 
 		$this->terminateWithSuccess(true);
@@ -361,15 +405,14 @@ class Vertraege extends FHCAPI_Controller
 					]);
 
 				$this->getDataOrTerminateWithError($result);
-
 			}
-
 		}
 
 		$result = $this->VertragvertragsstatusModel->load([
 			'vertrag_id' => $vertrag_id
 		]);
 
+		//TODO(Manu) check if there are exceptions for deletions (status abgerechnet?)
 		if(hasData($result)){
 			$data = getData($result);
 			foreach ($data as $item) {
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index a9f514666..048dbb085 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -346,7 +346,16 @@ class Vertrag_model extends DB_Model
 					TO_CHAR(tbl_vertrag.vertragsdatum::timestamp, 'DD.MM.YYYY') AS format_vertragsdatum,
 					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
 					    JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
-						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung
+						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung,
+			    CASE
+					WHEN EXISTS (
+						SELECT 1
+						FROM lehre.tbl_vertrag_vertragsstatus
+						WHERE vertrag_id = tbl_vertrag.vertrag_id
+						AND vertragsstatus_kurzbz = 'abgerechnet'
+					) THEN true 
+					ELSE false
+				END AS isAbgerechnet
 				FROM
 					lehre.tbl_vertrag
 					LEFT JOIN lehre.tbl_vertragstyp USING(vertragstyp_kurzbz)
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index 67c8de397..f11a50d12 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -34,11 +34,6 @@ export default {
 					};
 				},
 				ajaxResponse: (url, params, response) => response.data,
-				//Version with saving Data in tableData Object
-/*				ajaxResponse: (url, params, response) => {
-					this.tableData = response.data;
-					return response.data;
-				},*/
 				columns: [
 					{title: "Typ", field: "type"},
 					{title: "Betrag", field: "betrag"},
@@ -103,29 +98,19 @@ export default {
 				selectable: true,
 			},
 			clickedRows: [],
-/*			table: null,
-			tableData: []*/
 		}
 	},
 	watch: {
-/*		person_id: 'updateTableData',
-		vertrag_id: 'updateTableData'*/
+
 		person_id() {
-			console.log("person geändert");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
 		},
 		vertrag_id() {
-			console.log("vertrag geändert");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
 		},
 	},
 	methods: {
-/*		updateTableData() {
-			this.$refs.table.tabulator.setData(`api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/ ' ${this.person_id}/${this.vertrag_id}`);
-		},*/
-		//TODO(Manu) delete vertrag_id: not necessary
 		actionDeleteLehrauftrag(vertrag_id, lehreinheit_id, mitarbeiter_uid) {
-			console.log("child", vertrag_id);
 			this.$emit('deleteLehrauftrag', {
 				lehreinheit_id: lehreinheit_id,
 				vertrag_id: vertrag_id,
@@ -149,18 +134,7 @@ export default {
 	<!--TODO(Manu) nicht anzeigen, wenn keine vorhanden ? check css, design -->
 	
 	<div class="core-vertraege-details h-50 d-flex flex-column w-100">
-	<br>
-
-<!--		  <div>
-			&lt;!&ndash; Tabulator-Container &ndash;&gt;
-			<div ref="table"></div>
-		
-			&lt;!&ndash; Ausgabe der Daten &ndash;&gt;
-			<div v-for="row in tableData" :key="row.id">
-			  <p>{{ row.name }} - {{ row.value }}</p>
-			</div>
-		  </div>-->
-		
+	<br>		
 		<h4>Vertragdetails</h4>
 	
 		<core-filter-cmpt
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 0b3223989..321d596c8 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -90,11 +90,9 @@ export default {
 	//TODO(Manu) auch auf fhcapi umbauen?
 	watch: {
 		person_id() {
-			console.log("data changed");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
 		clickedRows() {
-			console.log("clicked rows changed");
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
 	},
@@ -132,18 +130,15 @@ export default {
 
 		},
 		emitSaveEvent() {
-			// Emit ein Event und übergebe clickedRows an die Parent-Komponente
 			this.$emit('saveClickedRows', this.clickedRows);
 		},
 		reloadUnassigned() {
 			this.$refs.table.reloadTable();
 			this.$emit('reloadUnassigned');
 			this.clickedRows = [];
-		//	console.log("clickedRows", this.clickedRows);
 		},
 		handleSumUp() {
-			//this.localValue += 1; // Increment the local value
-			this.$emit("sum-updated", this.sumBetragLehrauftraege); // Emit the updated value to the parent
+			this.$emit("sum-updated", this.sumBetragLehrauftraege);
 		},
 	},
 	mounted() {
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 0448cd169..e03085faa 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -57,6 +57,7 @@ export default {
 					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
 					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
 					{title: "Anmerkung", field: "anmerkung", visible: false},
+					{title: "isAbgerechnet", field: "isabgerechnet", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -136,7 +137,8 @@ export default {
 				vertragsstatus_kurzbz: 'test',
 				datum: new Date(),
 			},
-			childData: {}
+			childData: {},
+			isFilterSet: false
 		}
 	},
 	watch: {
@@ -151,7 +153,9 @@ export default {
 			this.$refs.contractModal.show();
 		},
 		actionEditContract(vertrag_id) {
+			this.resetModal();
 			this.statusNew = false;
+			//TODO(Manu) reload Assigned!!
 			this.$refs.unassignedLehrauftraege.reloadUnassigned();
 			this.loadContract(vertrag_id)
 				.then(this.$refs.contractModal.show);
@@ -186,6 +190,7 @@ export default {
 					this.$refs.contractModal.hide();
 					this.resetModal();
 					//this.$refs.contractdetails.reload(); //TOOD(Manu) check why error
+					//this.$refs.contractdetails.reload();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.reload();
 				})
@@ -208,6 +213,7 @@ export default {
 					this.$refs.contractModal.hide();
 					this.resetModal();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
+					this.$refs.contractdetails.reload();
 					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -312,6 +318,7 @@ export default {
 					//window.scrollTo(0, 0);
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
+					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -358,6 +365,14 @@ export default {
 
 			return `${year}${month}${day}`; // Format: YYYYMMDD
 		},
+		onSwitchChange() {
+			if (this.isFilterSet) {
+				this.$refs.table.tabulator.setFilter("isabgerechnet", "!=", true);
+			}
+			else {
+				this.$refs.table.tabulator.clearFilter("status");
+			}
+		},
 	},
 	created() {
 		Promise.all([
@@ -385,9 +400,18 @@ export default {
 
 	<div class="core-vertraege h-100 d-flex flex-column">
 	
-				parent:
-			{{childData}}
-	
+<!--	filter: open means no status abgerechnet yet-->
+		<div class="justify-content-end pb-3">
+			<form-input
+				container-class="form-switch"
+				type="checkbox"
+				:label="$p.t('vertrag/filter_offeneVertraege')"
+				v-model="isFilterSet"
+				@change="onSwitchChange"
+				>
+			</form-input>
+		</div>
+		
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 335cd80a4..ddd774ac4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31247,6 +31247,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'filter_offeneVertraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur offene Verträge anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show only open contracts',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_addOrUpdateLehrauftraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Hinzufügen bzw. Aktualisieren von Lehraufträgen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error while adding or updating teaching assignments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_insertOrUpdateStatusVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Hinzufügen bzw. Aktualisieren des Vertragsstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error while adding or updating the contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 07e6146e50964f3f52309f9a7f47787636a7004c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 19 Nov 2024 14:34:50 +0100
Subject: [PATCH 0031/1357] Validations, Phrases, cleanup

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 260 ++++++----
 public/js/api/vertraege/person.js             |  48 +-
 .../js/components/Vertraege/List/Details.js   |  76 ++-
 public/js/components/Vertraege/List/Status.js |  67 ++-
 .../components/Vertraege/List/Unassigned.js   | 139 +++---
 public/js/components/Vertraege/Vertraege.js   | 423 ++++++++--------
 system/phrasesupdate.php                      | 460 ++++++++++++++++++
 7 files changed, 1046 insertions(+), 427 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 21fb310fc..d9564da70 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -1,6 +1,5 @@
 <?php
 
-
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 use \DateTime as DateTime;
 
@@ -12,20 +11,20 @@ class Vertraege extends FHCAPI_Controller
 			'getAllVertraege' => ['admin:r', 'assistenz:r'],
 			'getAllContractsNotAssigned' => ['admin:r', 'assistenz:r'],
 			'getAllContractsAssigned' => ['admin:r', 'assistenz:r'],
-			'getAllContractTypes' =>  self::PERM_LOGGED,
-			'getAllContractStati' =>  self::PERM_LOGGED,
-			'getStatiOfContract' =>  self::PERM_LOGGED,
+			'getAllContractTypes' =>  ['admin:r', 'assistenz:r'],
+			'getAllContractStati' =>  ['admin:r', 'assistenz:r'],
+			'getStatiOfContract' =>  ['admin:r', 'assistenz:r'],
 			'loadContract' => ['admin:r', 'assistenz:r'],
-			'updateContract' => ['admin:r', 'assistenz:r'],
-			'addNewContract' => ['admin:r', 'assistenz:r'],
-			'deleteContract' => ['admin:r', 'assistenz:r'],
-			'insertContractStatus' => ['admin:r', 'assistenz:r'],
 			'loadContractStatus' => ['admin:r', 'assistenz:r'],
-			'deleteContractStatus' => ['admin:r', 'assistenz:r'],
-			'updateContractStatus' => ['admin:r', 'assistenz:r'],
-			'deleteLehrauftrag' => ['admin:r', 'assistenz:r'],
-			'deleteBetreuung' => ['admin:r', 'assistenz:r']
-		]);
+			'updateContract' => self::PERM_LOGGED,
+			'addNewContract' => self::PERM_LOGGED,
+			'deleteContract' => self::PERM_LOGGED,
+			'insertContractStatus' => self::PERM_LOGGED,
+			'deleteContractStatus' => self::PERM_LOGGED,
+			'updateContractStatus' => self::PERM_LOGGED,
+			'deleteLehrauftrag' => self::PERM_LOGGED,
+			'deleteBetreuung' => self::PERM_LOGGED
+			]);
 
 		//Load Models and Libraries
 		$this->load->model('accounting/Vertrag_model', 'VertragModel');
@@ -33,8 +32,6 @@ class Vertraege extends FHCAPI_Controller
 		$this->load->model('accounting/Vertragstyp_model', 'VertragstypModel');
 		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
 
-		//TODO(Manu) additional permission checks
-
 		// Load language phrases
 		$this->loadPhrases([
 			'ui',
@@ -42,7 +39,6 @@ class Vertraege extends FHCAPI_Controller
 		]);
 	}
 
-	//TODO(Manu) validations, phrases
 	public function getAllVertraege($person_id)
 	{
 		$result = $this->VertragModel->loadContractsOfPerson($person_id);
@@ -121,15 +117,25 @@ class Vertraege extends FHCAPI_Controller
 		$_POST['vertragsdatum']= $formData['vertragsdatum'];
 		$_POST['bezeichnung']= $formData['bezeichnung'];
 		$_POST['betrag'] = $formData['betrag'];
-		$_POST['vertragsstunden']= isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
-		$_POST['vertragsstunden_studiensemester_kurzbz']= isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
-		$_POST['anmerkung']= isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+		$_POST['vertragsstunden'] =
+			isset($formData['vertragsstunden'])
+			? $formData['vertragsstunden']
+			: null;
+		$_POST['vertragsstunden_studiensemester_kurzbz'] =
+			isset($formData['vertragsstunden_studiensemester_kurzbz'])
+				? $formData['vertragsstunden_studiensemester_kurzbz']
+				: null;
+		$_POST['anmerkung'] = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
 
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
 
 		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
 		]);
-		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required', [
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
 		]);
 		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
@@ -151,13 +157,13 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->VertragModel->insert([
 			'person_id' => $person_id,
-			'vertragsdatum' => $_POST['vertragsdatum'],
-			'bezeichnung' => $_POST['bezeichnung'],
-			'vertragstyp_kurzbz' => $_POST['vertragstyp_kurzbz'],
-			'betrag' => $_POST['betrag'],
-			'vertragsstunden' => $_POST['vertragsstunden'],
-			'vertragsstunden_studiensemester_kurzbz' => $_POST['vertragsstunden_studiensemester_kurzbz'],
-			'anmerkung' => $_POST['anmerkung'],
+			'vertragsdatum' => $this->input->post('vertragsdatum'),
+			'bezeichnung' => $this->input->post('bezeichnung'),
+			'vertragstyp_kurzbz' => $this->input->post('vertragstyp_kurzbz'),
+			'betrag' => $this->input->post('betrag'),
+			'vertragsstunden' => $this->input->post('vertragsstunden'),
+			'vertragsstunden_studiensemester_kurzbz' => $this->input->post('vertragsstunden_studiensemester_kurzbz'),
+			'anmerkung' => $this->input->post('anmerkung'),
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 		]);
@@ -180,8 +186,8 @@ class Vertraege extends FHCAPI_Controller
 		}
 
 		//Hinzufügen der Lehraufträge
-		foreach ($lehrauftraege as $row) {
-
+		foreach ($lehrauftraege as $row)
+		{
 			if ($row['type'] == 'Lehrauftrag')
 			{
 				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
@@ -193,7 +199,8 @@ class Vertraege extends FHCAPI_Controller
 					],
 					[
 						'vertrag_id' => $vertrag_id
-					]);
+					]
+				);
 
 				if (!$result_lehrauftrag) {
 					$this->db->trans_rollback();
@@ -213,7 +220,8 @@ class Vertraege extends FHCAPI_Controller
 					],
 					[
 						'vertrag_id' => $vertrag_id
-					]);
+					]
+				);
 
 				if (!$result_projektbetreuer)
 				{
@@ -241,15 +249,25 @@ class Vertraege extends FHCAPI_Controller
 		$_POST['vertragsdatum']= $formData['vertragsdatum'];
 		$_POST['bezeichnung']= $formData['bezeichnung'];
 		$_POST['betrag'] = $formData['betrag'];
-		$_POST['vertragsstunden']= isset($formData['vertragsstunden']) ? $formData['vertragsstunden'] : null;
-		$_POST['vertragsstunden_studiensemester_kurzbz']= isset($formData['vertragsstunden_studiensemester_kurzbz']) ? $formData['vertragsstunden_studiensemester_kurzbz'] : null;
+		$_POST['vertragsstunden'] =
+			isset($formData['vertragsstunden'])
+				? $formData['vertragsstunden']
+				: null;
+		$_POST['vertragsstunden_studiensemester_kurzbz']=
+			isset($formData['vertragsstunden_studiensemester_kurzbz'])
+				? $formData['vertragsstunden_studiensemester_kurzbz']
+				: null;
 		$_POST['anmerkung']= isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
 
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
 
 		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
 		]);
-		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required', [
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
 		]);
 		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
@@ -271,23 +289,23 @@ class Vertraege extends FHCAPI_Controller
 			$vertrag_id,
 			[
 				'person_id' => $person_id,
-				'vertragsdatum' => $_POST['vertragsdatum'],
-				'bezeichnung' => $_POST['bezeichnung'],
-				'vertragstyp_kurzbz' => $_POST['vertragstyp_kurzbz'],
-				'betrag' => $_POST['betrag'],
-				'vertragsstunden' => $_POST['vertragsstunden'],
-				'vertragsstunden_studiensemester_kurzbz' => $_POST['vertragsstunden_studiensemester_kurzbz'],
-				'anmerkung' => $_POST['anmerkung'],
-				'vertragsstunden' => $_POST['vertragsstunden'],
+				'vertragsdatum' => $this->input->post('vertragsdatum'),
+				'bezeichnung' => $this->input->post('bezeichnung'),
+				'vertragstyp_kurzbz' => $this->input->post('vertragstyp_kurzbz'),
+				'betrag' => $this->input->post('betrag'),
+				'vertragsstunden' => $this->input->post('vertragsstunden'),
+				'vertragsstunden_studiensemester_kurzbz' => $this->input->post('vertragsstunden_studiensemester_kurzbz'),
+				'anmerkung' => $this->input->post('anmerkung'),
 				'updateamum' => date('c'),
 				'updatevon' => getAuthUID()
-		]);
+			]
+		);
 
 		$this->getDataOrTerminateWithError($result);
 
 		//Adding of Lehraufträge
-		foreach ($lehrauftraege as $row) {
-
+		foreach ($lehrauftraege as $row)
+		{
 			if ($row['type'] == 'Lehrauftrag')
 			{
 				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
@@ -299,7 +317,8 @@ class Vertraege extends FHCAPI_Controller
 					],
 					[
 						'vertrag_id' => $vertrag_id
-					]);
+					]
+				);
 
 				if (!$result_lehrauftrag) {
 					$this->db->trans_rollback();
@@ -319,7 +338,8 @@ class Vertraege extends FHCAPI_Controller
 					],
 					[
 						'vertrag_id' => $vertrag_id
-					]);
+					]
+				);
 
 				if (!$result_projektbetreuer)
 				{
@@ -350,9 +370,6 @@ class Vertraege extends FHCAPI_Controller
 
 	public function deleteContract($vertrag_id)
 	{
-		//TODO(Manu) validations
-
-		//TODO(manu) use private function
 		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
 
 		//check if attached Lehrauftrag
@@ -366,17 +383,17 @@ class Vertraege extends FHCAPI_Controller
 			foreach($resultLehrauftrag as $lehrauftrag)
 			{
 				$result = $this->LehreinheitmitarbeiterModel->update(
-				[
-					'lehreinheit_id' => $lehrauftrag->lehreinheit_id,
-					'mitarbeiter_uid' => $lehrauftrag->mitarbeiter_uid,
-					'vertrag_id' => $vertrag_id
-				],
-				[
-					'vertrag_id' => null
-				]);
+					[
+						'lehreinheit_id' => $lehrauftrag->lehreinheit_id,
+						'mitarbeiter_uid' => $lehrauftrag->mitarbeiter_uid,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null
+					]
+				);
 
 				$this->getDataOrTerminateWithError($result);
-
 			}
 		}
 
@@ -402,7 +419,8 @@ class Vertraege extends FHCAPI_Controller
 					],
 					[
 						'vertrag_id' => null
-					]);
+					]
+				);
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -412,10 +430,11 @@ class Vertraege extends FHCAPI_Controller
 			'vertrag_id' => $vertrag_id
 		]);
 
-		//TODO(Manu) check if there are exceptions for deletions (status abgerechnet?)
-		if(hasData($result)){
+		if(hasData($result))
+		{
 			$data = getData($result);
-			foreach ($data as $item) {
+			foreach ($data as $item)
+			{
 				//delete all entries in lehre.tbl_vertrag_vertragsstatus
 				$result = $this->VertragvertragsstatusModel->delete([
 					'vertrag_id' => $vertrag_id,
@@ -442,26 +461,42 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function insertContractStatus ($vertrag_id, $datum, $status){
+	public function insertContractStatus($vertrag_id)
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
 		$result = $this->VertragvertragsstatusModel->loadWhere(
             array(
                 'vertrag_id' => $vertrag_id,
-                'vertragsstatus_kurzbz' => $status
+                'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
             )
         );
 
-        if (hasData($result)) {
-			$this->terminateWithError("status bereits vorhanden", self::ERROR_TYPE_GENERAL);
-           // $this->terminateWithError($this->p->t('ui', 'error_status_existing', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+        if (hasData($result))
+		{
+			$this->terminateWithError($this->p->t('vertrag', 'error_statusVorhanden'), self::ERROR_TYPE_GENERAL);
         }
 
 		$status_result = $this->VertragvertragsstatusModel->insert([
 			'vertrag_id' => $vertrag_id,
 			'uid' => getAuthUID(),
-			'vertragsstatus_kurzbz' => $status,
+			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz'),
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'datum' => $datum
+			'datum' => $this->input->post('datum')
 		]);
 
 		if (!$status_result) {
@@ -471,7 +506,9 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 
-	public function deleteContractStatus($vertrag_id, $status){
+	public function deleteContractStatus($vertrag_id)
+	{
+		$status = $this->input->post('vertragsstatus_kurzbz');
 
 		$result = $this->VertragvertragsstatusModel->delete(
 			array(
@@ -480,16 +517,20 @@ class Vertraege extends FHCAPI_Controller
 			)
 		);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		if (!hasData($result)) {
+		if (!hasData($result))
+		{
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'vertragsstatus_kurzb']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function loadContractStatus ($vertrag_id, $status){
+	public function loadContractStatus($vertrag_id)
+	{
+		$status = $this->input->post('vertragsstatus_kurzbz');
 
 		$result = $this->VertragvertragsstatusModel->loadWhere(
 			array(
@@ -503,28 +544,34 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function updateContractStatus ($vertrag_id, $datum, $status){
-/*		$result = $this->VertragvertragsstatusModel->loadWhere(
-			array(
-				'vertrag_id' => $vertrag_id,
-				'vertragsstatus_kurzbz' => $status
-			)
-		);
+	public function updateContractStatus($vertrag_id)
+	{
+		$this->load->library('form_validation');
 
-		if (hasData($result)) {
-			$this->terminateWithError("status bereits vorhanden", self::ERROR_TYPE_GENERAL);
-			// $this->terminateWithError($this->p->t('ui', 'error_status_existing', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
-		}*/
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
 
-		$status_result = $this->VertragvertragsstatusModel->update([
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_result = $this->VertragvertragsstatusModel->update(
+			[
 			'vertrag_id' => $vertrag_id,
-			'vertragsstatus_kurzbz' => $status],
+			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')],
 			[
 			'uid' => getAuthUID(),
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID(),
-			'datum' => $datum
-		]);
+			'datum' => $this->input->post('datum')
+			]
+		);
 
 		if (!$status_result) {
 			$this->terminateWithError('Fehler beim Updaten des Vertragsstatus.');
@@ -533,8 +580,11 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 
-	public function deleteLehrauftrag($vertrag_id, $lehreinheit_id, $mitarbeiter_uid)
+	public function deleteLehrauftrag($vertrag_id)
 	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
 		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
 
 		//kein delete: ein update, bei dem die vertrag_id auf null gesetzt wird
@@ -546,19 +596,26 @@ class Vertraege extends FHCAPI_Controller
 			],
 			[
 				'vertrag_id' => null
-			]);
+			]
+		);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		if (!hasData($result)) {
+		if (!hasData($result))
+		{
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function deleteBetreuung($vertrag_id, $person_id, $projektarbeit_id, $betreuerart_kurzbz)
+	public function deleteBetreuung($vertrag_id)
 	{
+		$person_id= $this->input->post('person_id');
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+
 		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
 
 		$result = $this->Projektbetreuermodel->update(
@@ -570,16 +627,17 @@ class Vertraege extends FHCAPI_Controller
 			],
 			[
 				'vertrag_id' => null
-			]);
+			]
+		);
 
-		if (isError($result)) {
+		if (isError($result))
+		{
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		if (!hasData($result)) {
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Projektbetreuung']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
-
-
-}
\ No newline at end of file
+}
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index 5befc16c1..5c562a273 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -20,58 +20,34 @@ export default {
 	getAllContractStati(){
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractStati/');
 	},
-/*	addNewContract(person_id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' +
-			person_id, formData
-		);
-	},*/
-	addNewContract(data) {
-		//TODO(Manu) Refactor
-		const { person_id, formData, clickedRows } = data;
-		console.log("Person ID:", person_id);
-		console.log("Form Data:", formData);
-		console.log("Clicked Rows:", clickedRows);
-		//return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/' + Object.values(params.person_id).join('/') + '/' +  Object.values(params.formData).join('/') + '/' + Object.values(params.clickedRows).join('/'));
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/addNewContract/', data);
+	addNewContract(form, data) {
+		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/addNewContract/', data);
 	},
 	loadContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id);
 	},
-/*	updateContract(vertrag_id, formData) {
-		return this.$fhcApi.post( 'api/frontend/v1/vertraege/vertraege/updateContract/' + vertrag_id,
-			formData);
-	},*/
-	updateContract(data) {
-		//TODO(Manu) Refactor
-		const { vertrag_id, person_id, formData, clickedRows } = data;
-		console.log("Person ID:", person_id);
-		console.log("Vertrag ID:", vertrag_id);
-		console.log("Form Data:", formData);
-		console.log("Clicked Rows:", clickedRows);
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/updateContract/', data);
+	updateContract(form, data) {
+		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/updateContract/', data);
 	},
 	deleteContract(vertrag_id){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
 	},
 	loadContractStatus(params){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' + Object.values(params.status).join('/'));
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContractStatus/' + params.vertrag_id, params);
 	},
-	insertContractStatus(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
+	insertContractStatus(form, params) {
+		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id, params);
 	},
-	updateContractStatus(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/updateContractStatus/' + params.vertrag_id + '/' + params.datum + '/' + Object.values(params.status).join('/'));
+	updateContractStatus(form, params) {
+		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/updateContractStatus/' + params.vertrag_id, params);
 	},
 	deleteContractStatus(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.status).join('/'));
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + params.vertrag_id, params);
 	},
 	deleteLehrauftrag(params) {
-		//TODO Manu (Refactor!)
-		console.log(params.vertrag_id, params.lehreinheit_id, params.mitarbeiter_uid);
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.lehreinheit_id).join('/') + '/' + Object.values(params.mitarbeiter_uid).join('/'));
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/' + params.vertrag_id, params);
 	},
 	deleteBetreuung(params) {
-		console.log(params.vertrag_id, params.person_id, params.projektarbeit_id, params.betreuerart_kurzbz);
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteBetreuung/' + Object.values(params.vertrag_id).join('/') + '/' +  Object.values(params.person_id).join('/') + '/' + Object.values(params.projektarbeit_id).join('/') + '/' + Object.values(params.betreuerart_kurzbz).join('/'));
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteBetreuung/' + params.vertrag_id, params);
 	}
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index f11a50d12..2de19a06b 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -36,21 +36,23 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Typ", field: "type"},
-					{title: "Betrag", field: "betrag"},
+					{title: "Betrag", field: "betrag",
+						formatter: function(cell) {
+							let value = cell.getValue();
+							if (value == null) {
+								return "0.00";
+							}
+							return parseFloat(value).toFixed(2);
+						}
+					},
 					{title: "Bezeichnung", field: "bezeichnung"},
 					{title: "Studiensemester", field: "studiensemester_kurzbz"},
-					{title: "PruefungId", field: "betrag", visible: false},
+					{title: "Pruefung_id", field: "pruefung_id", visible: false},
 					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
 					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
 					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
 					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
 					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
-					{
-						title: "VertragsstundenStudiensemester",
-						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false
-					},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -62,10 +64,9 @@ export default {
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = 'Lehrauftrag löschen';
+							button.title = this.$p.t('vertrag', 'deleteLehrauftrag');
 
 							let type = cell.getData().type;
-							console.log(type);
 							if (type == 'Lehrauftrag')
 							{
 								button.addEventListener(
@@ -96,12 +97,57 @@ export default {
 				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
+				persistenceID: 'core-contracts-details'
 			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['ui', 'global', 'vertrag', 'projektarbeitsbeurteilung', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('type').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung')
+						});
+						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
+							title: this.$p.t('ui', 'lehreinheit_id')
+						});
+						cm.getColumnByField('betrag').component.updateDefinition({
+							title: this.$p.t('ui', 'betrag')
+						});
+						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});
+						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
+							title: this.$p.t('ui', 'mitarbeiter_uid')
+						});
+						cm.getColumnByField('projektarbeit_id').component.updateDefinition({
+							title: this.$p.t('ui', 'projektarbeit_id')
+						});
+						cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
+							title: this.$p.t('projektarbeitsbeurteilung', 'betreuerart')
+						});
+						cm.getColumnByField('pruefung_id').component.updateDefinition({
+							title: this.$p.t('ui', 'pruefung_id')
+						});
+						cm.getColumnByField('vertrag_id').component.updateDefinition({
+							title: this.$p.t('ui', 'vertrag_id')
+						});
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
+					}
+				}
+			],
 			clickedRows: [],
 		}
 	},
 	watch: {
-
 		person_id() {
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + this.person_id + '/' + this.vertrag_id);
 		},
@@ -131,15 +177,15 @@ export default {
 		},
 	},
 	template: `
-	<!--TODO(Manu) nicht anzeigen, wenn keine vorhanden ? check css, design -->
-	
-	<div class="core-vertraege-details h-50 d-flex flex-column w-100">
+
+	<div class="ore-contracts-details h-50 d-flex flex-column w-100">
 	<br>		
-		<h4>Vertragdetails</h4>
+		<h4>{{$p.t('vertrag', 'vertragDetails')}}</h4>
 	
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
 			table-only
 			:side-menu="false"
 			reload
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 1c9ef7e21..f912cc11b 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -40,13 +40,12 @@ export default {
 					{title: "Status", field: "bezeichnung"},
 					{title: "Datum", field: "format_datum"},
 					{title: "vertrag_id", field: "vertrag_id", visible: false},
-					// {title: "User", field: "bezeichnung", visible: false},
+					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
+					{title: "User", field: "mitarbeiter_uid", visible: false},
 					{title: "insertvon", field: "insertvon", visible: false},
 					{title: "insertamum", field: "format_insertamum", visible: false},
 					{title: "updatevon", field: "updatevon", visible: false},
 					{title: "updateamum", field: "format_updateamum", visible: false},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -58,7 +57,7 @@ export default {
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = 'Status bearbeiten';
+							button.title = this.$p.t('vertrag', 'editStatus');
 							button.addEventListener(
 								'click',
 								(event) =>
@@ -69,7 +68,7 @@ export default {
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = 'Status löschen';
+							button.title = this.$p.t('vertrag', 'deleteStatus');
 							button.addEventListener(
 								'click',
 								() =>
@@ -88,7 +87,50 @@ export default {
 				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
+				persistenceID: 'core-contracts-status'
 			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('global', 'status')
+						});
+						cm.getColumnByField('format_datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
+							title: this.$p.t('person', 'uid')
+						});
+						cm.getColumnByField('vertrag_id').component.updateDefinition({
+							title: this.$p.t('ui', 'vertrag_id')
+						});
+						cm.getColumnByField('vertragsstatus_kurzbz').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragStatus')
+						});
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
+						cm.getColumnByField('updatevon').component.updateDefinition({
+							title: this.$p.t('global', 'updatevon')
+						});
+						cm.getColumnByField('format_updateamum').component.updateDefinition({
+							title: this.$p.t('global', 'updateamum')
+						});
+						cm.getColumnByField('insertvon').component.updateDefinition({
+							title: this.$p.t('global', 'insertvon')
+						});
+						cm.getColumnByField('format_insertamum').component.updateDefinition({
+							title: this.$p.t('global', 'insertamum')
+						});
+					}
+				}
+			],
 			clickedRows: [],
 			statusNew: true,
 			formData: {
@@ -99,6 +141,7 @@ export default {
 	},
 	watch: {
 		vertrag_id() {
+			//this.reloadTable();
 			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + this.vertrag_id);
 		},
 		formDataParent: {
@@ -160,19 +203,19 @@ export default {
 		}
 	},
 	template: `
-	<!--TODO(Manu) check filter (akzeptiert, neu, erteilt?), design -->
-	<div class="core-vertraege-status h-50 d-flex flex-column w-100">
+	<div class="core-contracts-status h-50 d-flex flex-column w-100">
 		<br>
-		<h4>Vertragsstatus</h4>
+		<h4>{{$p.t('vertrag', 'vertragStatus')}}</h4>
 	
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
 			table-only
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Status"
+			:new-btn-label="this.$p.t('global', 'status')"
 			@click:new="actionNewStatus"
 			>
 		</core-filter-cmpt>
@@ -180,11 +223,11 @@ export default {
 		<div >
 			<bs-modal ref="contractStatus">
 				<template #title>
-					<p class="fw-bold mt-3">{{$p.t('ui', 'add_Status')}}</p>
+					<p class="fw-bold mt-3">{{$p.t('vertrag', 'addStatus')}}</p>
 
 				</template>
 
-				<core-form>
+				<core-form ref="statusData">
 					<div class="row mb-3">
 						<form-input
 							type="DatePicker"
@@ -192,7 +235,7 @@ export default {
 							name="datum"
 							v-model="formData.datum"
 							auto-apply
-							:enable-time-picker="false"
+							:enable-time-picker="true"
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 321d596c8..a693a04fe 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -31,40 +31,21 @@ export default {
 						person_id: this.person_id
 					};
 				},
-				//TODO(Manu) auch beträge von NULL anzeigen als 0.00
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type"},
-/*					{
+					{title: "Typ", field: "type", width: 100},
+					{
 						title: "Betrag",
-						field: "betrag",
-						formatter: function(cell) {
-							// Hole den Wert der Zelle
-							let value = cell.getValue();
-
-							// Falls der Wert null oder undefined ist, setze ihn auf "0,00"
-							if (value == null) {
-								return "0,00";
-							}
-
-							// Andernfalls formatiere ihn auf zwei Dezimalstellen
-							return parseFloat(value).toFixed(2).replace(".", ",");
-						}
-					},*/
-					{title: "Betrag",
 						field: "betrag1",
 						formatter: function(cell) {
 							let value = cell.getValue();
-
 							if (value == null) {
 								return "0.00";
 							}
-
 							return parseFloat(value).toFixed(2);
 						}},
 					{title: "Bezeichnung", field: "bezeichnung", width: 150},
-					{title: "Studiensemester", field: "studiensemester_kurzbz"},
-					{title: "PruefungId", field: "betrag", visible: false},
+					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160},
 					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
 					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
 					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
@@ -82,37 +63,83 @@ export default {
 				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
+				persistenceID: 'core-contracts-unassigned'
 			},
+			tabulatorEvents: [
+				{
+					event: 'rowClick',
+					handler: (e, row) => {
+						const data = row.getData();
+						this.toggleRowClick(data);
+					}
+				},
+				{
+					event: 'dataLoaded',
+					handler: (data) => {
+						this.totalRows = data.length;
+					}
+				},
+				{
+					event: 'tableBuilt',
+					handler: () => {
+						this.$p.loadCategory(['ui', 'global', 'vertrag', 'projektarbeitsbeurteilung', 'lehre']).then(() => {
+							let cm = this.$refs.table.tabulator.columnManager;
+
+							cm.getColumnByField('type').component.updateDefinition({
+								title: this.$p.t('global', 'typ')
+							});
+							cm.getColumnByField('bezeichnung').component.updateDefinition({
+								title: this.$p.t('ui', 'bezeichnung')
+							});
+							cm.getColumnByField('lehreinheit_id').component.updateDefinition({
+								title: this.$p.t('ui', 'lehreinheit_id')
+							});
+							cm.getColumnByField('betrag1').component.updateDefinition({
+								title: this.$p.t('ui', 'betrag')
+							});
+							cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+								title: this.$p.t('lehre', 'studiensemester')
+							});
+							cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
+								title: this.$p.t('ui', 'mitarbeiter_uid')
+							});
+							cm.getColumnByField('projektarbeit_id').component.updateDefinition({
+								title: this.$p.t('ui', 'projektarbeit_id')
+							});
+							cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
+								title: this.$p.t('projektarbeitsbeurteilung', 'betreuerart')
+							});
+							cm.getColumnByField('vertragsstunden').component.updateDefinition({
+								title: this.$p.t('vertrag', 'vertragsstunden')
+							});
+							cm.getColumnByField('vertrag_id').component.updateDefinition({
+								title: this.$p.t('ui', 'vertrag_id')
+							});
+							cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
+								title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
+							});
+						});
+					}
+				}
+			],
 			clickedRows: [],
-			sumBetragLehrauftraege: 0
+			sumBetragLehrauftraege: 0,
+			totalRows: 0
 		}
 	},
-	//TODO(Manu) auch auf fhcapi umbauen?
 	watch: {
+		//TODO(Manu) check if still working
 		person_id() {
-			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
+			this.$refs.table.reloadTable();
+			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
 		clickedRows() {
-			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
+			this.$refs.table.reloadTable();
+			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
 	},
 	methods: {
 		toggleRowClick(rowData){
-			//id already existing?
-			//const index = this.clickedRows.findIndex(row => row.id === id);
-
-
-			//id alleine reicht nicht: Betreuerart ebenfalls, am besten gleich ganze Row!
-/*			if (this.clickedRows.indexOf(id) == -1) {
-				console.log("Die Zahl " + id + " ist NICHT Array enthalten.");
-				this.clickedRows.push(id);
-
-			} else {
-				console.log("Die Zahl " + id + " ist im Array enthalten.");
-				const index = this.clickedRows.indexOf(id);
-				this.clickedRows.splice(index, 1);
-			}*/
-
 			// check row
 			const exists = this.clickedRows.some(row => JSON.stringify(row) === JSON.stringify(rowData));
 
@@ -122,7 +149,6 @@ export default {
 				this.handleSumUp();
 			} else {
 				this.clickedRows.push(rowData);
-				//hier soll der variable sumBetragLehrauftraege der Wert von this.clickedRows.betrag1 hinzugefügt werden
 				this.sumBetragLehrauftraege += Number(rowData.betrag1);
 				console.log(rowData.betrag1);
 				this.handleSumUp();
@@ -133,42 +159,27 @@ export default {
 			this.$emit('saveClickedRows', this.clickedRows);
 		},
 		reloadUnassigned() {
-			this.$refs.table.reloadTable();
-			this.$emit('reloadUnassigned');
 			this.clickedRows = [];
+			//this.$refs.table.reloadTable();
+			this.$emit('reloadUnassigned');
 		},
 		handleSumUp() {
 			this.$emit("sum-updated", this.sumBetragLehrauftraege);
 		},
 	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$refs.table.tabulator.on("rowClick", (e, row) => {
-				const data = row.getData();
-				this.toggleRowClick(data);
-			});
-		});
-	},
 	template: `
-	<!--TODO(Manu) check css, design .. mybe list.js-->
-	<div class="core-vertraege h-50 d-flex flex-column w-100">
-	
-<!--	{{clickedRows}} <hr> sum:  {{sumBetragLehrauftraege}}-->
-	<!--TODO(Manu) nicht anzeigen wenn keine vertraege vorhanden, "KEINE DATEN vorhanden"-->
-	
-	
-		<p>Die folgenden Lehraufträge sind noch keinem Vertrag zugeordnet. Markieren Sie die Lehraufträge um diese dem Vertrag zuzuordnen:</p>
-
+	<div class="core-contracts-unassigned h-50 d-flex flex-column w-100">
+		<p v-if="totalRows > 0">{{$p.t('vertrag', 'text_explainLehrauftrag')}}</p>
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
 			table-only
 			:side-menu="false"
 			>
 		</core-filter-cmpt>
 		
-		
-		<p v-if="clickedRows.length > 0" >Folgende Lehraufträge werden hinzugefügt:</p>
+		<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
 		  
 		<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
 			<div class="col-md-6">
@@ -180,8 +191,6 @@ export default {
 				readonly
 			  >
 			</div>
-
 		</div>
-
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index e03085faa..a525f859e 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -34,7 +34,6 @@ export default {
 	},
 	data() {
 		return {
-			//TODO(Manu) filter: alle vs offene Verträge
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllVertraege,
@@ -47,11 +46,21 @@ export default {
 				columns: [
 					{title: "Bezeichnung", field: "bezeichnung", width: 150},
 					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
-					{title: "Betrag", field: "betrag", width: 150},
+					{
+						title: "Betrag", field: "betrag", width: 150,
+						formatter: function (cell) {
+							let value = cell.getValue();
+
+							if (value == null) {
+								return "0.00";
+							}
+
+							return parseFloat(value).toFixed(2);
+						}
+					},
 					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
 					{title: "Status", field: "status"},
 					{title: "Vertragsdatum", field: "format_vertragsdatum", width: 128},
-					{title: "VertragstypKurzbz", field: "vertragstyp_kurzbz", visible: false},
 					{title: "VertragId", field: "vertrag_id", visible: false},
 					{title: "Vertragsdatum_iso", field: "vertragsdatum", visible: false},
 					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
@@ -69,7 +78,7 @@ export default {
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = 'Vertrag bearbeiten';
+							button.title = this.$p.t('vertrag', 'editVertrag');
 							button.addEventListener(
 								'click',
 								(event) =>
@@ -80,7 +89,7 @@ export default {
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
-							button.title = 'Vertrag löschen';
+							button.title = this.$p.t('vertrag', 'deleteVertrag');
 							button.addEventListener(
 								'click',
 								() =>
@@ -101,30 +110,53 @@ export default {
 			},
 			tabulatorEvents: [
 				{
-/*					event: 'tableBuilt',
+					event: 'tableBuilt',
 					handler: async() => {
 
-						await this.$p.loadCategory(['wawi', 'global', 'infocenter']);
+						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('nummer').component.updateDefinition({
-							title: this.$p.t('wawi', 'nummer')
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung')
+						});
+						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
+							title: this.$p.t('ui', 'lehreinheit_id')
+						});
+						cm.getColumnByField('betrag').component.updateDefinition({
+							title: this.$p.t('ui', 'betrag')
+						});
+						cm.getColumnByField('status').component.updateDefinition({
+							title: this.$p.t('global', 'status')
+						});
+						cm.getColumnByField('vertragstyp_bezeichnung').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragstyp')
+						});
+						cm.getColumnByField('format_vertragsdatum').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsdatum')
+						});
+						cm.getColumnByField('vertragsdatum').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsdatum_iso')
+						});
+						cm.getColumnByField('vertragsstunden').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsstunden')
+						});
+						cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
+						});
+						cm.getColumnByField('vertrag_id').component.updateDefinition({
+							title: this.$p.t('ui', 'vertrag_id')
 						});
 						cm.getColumnByField('anmerkung').component.updateDefinition({
 							title: this.$p.t('global', 'anmerkung')
 						});
-						cm.getColumnByField('format_retour').component.updateDefinition({
-							title: this.$p.t('wawi', 'retourdatum')
+						cm.getColumnByField('isabgerechnet').component.updateDefinition({
+							title: this.$p.t('vertrag', 'abgerechnet')
 						});
-						cm.getColumnByField('kaution').component.updateDefinition({
-							title: this.$p.t('infocenter', 'kaution')
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
 						});
-						cm.getColumnByField('format_ausgabe').component.updateDefinition({
-							title: this.$p.t('wawi', 'ausgabedatum')
-						});
-
-					}*/
+					}
 				}
 			],
 			statusNew: true,
@@ -143,7 +175,8 @@ export default {
 	},
 	watch: {
 		person_id() {
-			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + this.person_id);
+			this.$refs.table.reloadTable();
+			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + this.person_id);
 		},
 	},
 	methods: {
@@ -184,12 +217,11 @@ export default {
 			};
 
 			return this.endpoint
-				.addNewContract(dataToSend)
+				.addNewContract(this.$refs.contractData, dataToSend)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					//this.$refs.contractdetails.reload(); //TOOD(Manu) check why error
 					//this.$refs.contractdetails.reload();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.reload();
@@ -207,7 +239,7 @@ export default {
 			};
 
 			return this.endpoint
-				.updateContract(dataToSend)
+				.updateContract(this.$refs.contractData, dataToSend)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
@@ -231,91 +263,68 @@ export default {
 		//Methods Contract Stati
 		addNewContractStatus({status, datum}) {
 			const date = new Date();
-			//TODO(Manu) refactor this
-			const formattedDate = datum.toLocaleDateString('en-CA');
+			const formattedDate = datum != null ? datum.toLocaleDateString('en-CA',
+				{
+					year: 'numeric',
+					month: '2-digit',
+					day: '2-digit',
+					hour: '2-digit',
+					minute: '2-digit',
+					hour12: false, // Use 24-hour format
+				}
+				) : null;
 			let params = {
 				vertrag_id : this.contractSelected.vertrag_id,
-				status: {status},
+				vertragsstatus_kurzbz: status,
 				datum: formattedDate
 			};
 
 			return this.endpoint
-				.insertContractStatus(params)
+				.insertContractStatus(this.$refs.contractstati.$refs.statusData, params)
 				.then(response => {
 					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					this.$refs.contractstati.closeModal();
-					//window.scrollTo(0, 0);
 					this.$refs.contractstati.reload();
+					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteContractStatus({status, vertrag_id}){
 			let params = {
-				vertrag_id : {vertrag_id},
-				status: {status}
+				vertrag_id : vertrag_id,
+				vertragsstatus_kurzbz: status
 			};
 			return this.endpoint
 				.deleteContractStatus(params)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
-					//window.scrollTo(0, 0);
 					this.$refs.contractstati.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		deleteLehrauftrag({lehreinheit_id, vertrag_id, mitarbeiter_uid}){
-
-			let params = {
-				vertrag_id : {vertrag_id},
-				lehreinheit_id: {lehreinheit_id},
-				mitarbeiter_uid: {mitarbeiter_uid},
-			};
-			return this.endpoint
-				.deleteLehrauftrag(params)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-
-					//window.scrollTo(0, 0);
-					this.resetModal();
-					this.$refs.contractdetails.reload();
-					this.$refs.unassignedLehrauftraege.reloadUnassigned();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		deleteBetreuung({person_id, vertrag_id, projektarbeit_id, betreuerart_kurzbz}){
-			let params = {
-				vertrag_id : {vertrag_id},
-				person_id: {person_id},
-				projektarbeit_id: {projektarbeit_id},
-				betreuerart_kurzbz: {betreuerart_kurzbz},
-			};
-			return this.endpoint
-				.deleteBetreuung(params)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-
-					//window.scrollTo(0, 0);
-					this.$refs.contractdetails.reload();
-					this.$refs.unassignedLehrauftraege.reloadUnassigned();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		updateContractStatus({datum, status}){
-			//TODO(Manu) refactor this
-			const formattedDate = datum.toLocaleDateString('en-CA');
+			const date = new Date();
+			const formattedDate = datum != null ? datum.toLocaleDateString('en-CA',
+				{
+					year: 'numeric',
+					month: '2-digit',
+					day: '2-digit',
+					hour: '2-digit',
+					minute: '2-digit',
+					hour12: false, // Use 24-hour format
+				}
+			) : null;
 			let params = {
 				vertrag_id : this.contractSelected.vertrag_id,
 				datum : formattedDate,
-				status: {status}
+				vertragsstatus_kurzbz: status
 			};
 			return this.endpoint
-				.updateContractStatus(params)
+				.updateContractStatus(this.$refs.contractstati.$refs.statusData, params)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-
-					//window.scrollTo(0, 0);
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
 					this.reload();
@@ -324,8 +333,8 @@ export default {
 		},
 		loadContractStatus({vertrag_id, status}){
 			let params = {
-				vertrag_id : {vertrag_id},
-				status: {status}
+				vertrag_id : vertrag_id,
+				vertragsstatus_kurzbz: status
 			};
 			return this.endpoint
 				.loadContractStatus(params)
@@ -335,6 +344,40 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		deleteLehrauftrag({lehreinheit_id, vertrag_id, mitarbeiter_uid}){
+
+			let params = {
+				vertrag_id : vertrag_id,
+				lehreinheit_id: lehreinheit_id,
+				mitarbeiter_uid: mitarbeiter_uid
+			};
+			return this.endpoint
+				.deleteLehrauftrag(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.resetModal();
+					this.$refs.contractdetails.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteBetreuung({person_id, vertrag_id, projektarbeit_id, betreuerart_kurzbz}){
+			let params = {
+				vertrag_id : vertrag_id,
+				person_id: person_id,
+				projektarbeit_id: projektarbeit_id,
+				betreuerart_kurzbz: betreuerart_kurzbz
+			};
+			return this.endpoint
+				.deleteBetreuung(params)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.$refs.contractdetails.reload();
+					this.$refs.unassignedLehrauftraege.reloadUnassigned();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+
 		//Methods Unassigned List
 		saveClickedRows(clickedRows) {
 			this.childData = clickedRows;
@@ -397,8 +440,7 @@ export default {
 
 	},
 	template: `
-
-	<div class="core-vertraege h-100 d-flex flex-column">
+	<div class="core-contracts h-100 d-flex flex-column">
 	
 <!--	filter: open means no status abgerechnet yet-->
 		<div class="justify-content-end pb-3">
@@ -420,18 +462,17 @@ export default {
 			:side-menu="false"
 			reload
 			new-btn-show
-			new-btn-label="Vertrag"
+			:new-btn-label="this.$p.t('ui', 'vertrag')"
 			@click:new="actionNewContract"
 			>
-		</core-filter-cmpt>		
+		</core-filter-cmpt>
 		
 		<div class = "row">
-		
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
-				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<contract-details 
-						:person_id="person_id" 
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">
+					<contract-details
+						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"
 						@deleteLehrauftrag="deleteLehrauftrag"
 						@deleteBetreuung="deleteBetreuung"
@@ -439,12 +480,11 @@ export default {
 					></contract-details>
 				</div>
 			</div>
-
 			<div class="col-sm-6">
 				<!-- ContractStati -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
-					<contract-stati 
-						:vertrag_id="contractSelected.vertrag_id" 
+					<contract-stati
+						:vertrag_id="contractSelected.vertrag_id"
 						:listContractStati="listContractStati"
 						:formDataParent="contractFormData"
 						@setContractStatus="addNewContractStatus"
@@ -455,123 +495,110 @@ export default {
 					></contract-stati>
 				</div>
 			</div>
-				
 		</div>
-				
-		<!--Modal: contractModal-->
-		<bs-modal ref="contractModal" dialog-class="modal-xl">
-			<template #title>
-				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('vertrag', 'addVertrag')}}</p>
-				<p v-else class="fw-bold mt-3">{{$p.t('vertrag', 'editVertrag')}}</p>
-			</template>
-			
-			<core-form class="row g-3" ref="unassignedData">
 		
-<!--		{{formData}}-->
-	
-		<!--TODO(Manu) wenn einer gelöscht wird, wird er auch nicht sofort angezeigt
-		Auswirkung von Vertragdetails of UnassignedList-->
-				<list-unassigned 
-					:endpoint="$fhcApi.factory.vertraege.person" 
-					:person_id="person_id"
-					ref="unassignedLehrauftraege"
-					@saveClickedRows="saveClickedRows"
-					@sum-updated="updateBetrag"
-					></list-unassigned>
-
-				<hr>
+		<!--Modal: contractModal-->
+			<bs-modal ref="contractModal" dialog-class="modal-xl">
+				<template #title>
+					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('vertrag', 'addVertrag')}}</p>
+					<p v-else class="fw-bold mt-3">{{$p.t('vertrag', 'editVertrag')}}</p>
+				</template>
 				
-				<div class="row mb-3">
-					<form-input
-						type="DatePicker"
-						:label="$p.t('vertrag/datum_vertrag')"
-						name="vertragsdatum"
-						v-model="formData.vertragsdatum"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						preview-format="dd.MM.yyyy"
-						:teleport="true"
-						>
-					</form-input>
-				</div>
-				
-				<div class="row mb-3">		
-					<form-input
-						type="text"
-						:label="$p.t('ui/bezeichnung')"
-						name="bezeichnung"
-						v-model="formData.bezeichnung"
-						>
-					</form-input>
-				</div>
-				
-				<div class="row mb-3">
-					<form-input
-						type="select"
-						:label="$p.t('global/typ')"
-						v-model="formData.vertragstyp_kurzbz"
-						name="vertragstyp_kurzbz"
-						>
-						<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-						<option
-							v-for="entry in listContractTypes"
-							:key="entry.vertragstyp_kurzbz"
-							:value="entry.vertragstyp_kurzbz"
-							>
-							{{entry.bezeichnung}}
-						</option>
-					</form-input>
-				</div>
-				
-				<div class="row mb-3">		
-					<form-input
-						:label="$p.t('ui/betrag')"
-						name="betrag"
-						v-model="formData.betrag"
-						>
-					</form-input>
-				</div>
-				
-				<div class="row mb-3" v-if="!statusNew">		
-					<form-input
-						type="text"
-						:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-						name="vertragsstunden"
-						v-model="formData.vertragsstunden"
-						disabled
-						>
-					</form-input>
-				</div>
-				
-				<div class="row mb-3" v-if="!statusNew">		
-					<form-input
-						type="text"
-						:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-						name="vertragsstunden_studiensemester_kurzbz"
-						v-model="formData.vertragsstunden_studiensemester_kurzbz"
-						disabled
-						>
-					</form-input>
-				</div>
+					<list-unassigned
+						:endpoint="$fhcApi.factory.vertraege.person"
+						:person_id="person_id"
+						ref="unassignedLehrauftraege"
+						@saveClickedRows="saveClickedRows"
+						@sum-updated="updateBetrag"
+						></list-unassigned>
+					<hr>
+					<core-form ref="contractData">
+						<div class="row mb-3">
+							<form-input
+								type="DatePicker"
+								:label="$p.t('vertrag/datum_vertrag')"
+								name="vertragsdatum"
+								v-model="formData.vertragsdatum"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+						</div>
 						
-				<div class="row mb-3">
-					<form-input
-						type="textarea"
-						:label="$p.t('global/anmerkung')"
-						name="anmerkung"
-						v-model="formData.anmerkung"
-						>
-					</form-input>
-				</div>
+						<div class="row mb-3">
+							<form-input
+								type="text"
+								:label="$p.t('ui/bezeichnung')"
+								name="bezeichnung"
+								v-model="formData.bezeichnung"
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								type="select"
+								:label="$p.t('global/typ')"
+								v-model="formData.vertragstyp_kurzbz"
+								name="vertragstyp_kurzbz"
+								>
+								<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+								<option
+									v-for="entry in listContractTypes"
+									:key="entry.vertragstyp_kurzbz"
+									:value="entry.vertragstyp_kurzbz"
+									>
+									{{entry.bezeichnung}}
+								</option>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								:label="$p.t('ui/betrag')"
+								name="betrag"
+								v-model="formData.betrag"
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3" v-if="!statusNew">
+							<form-input
+								type="text"
+								:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+								name="vertragsstunden"
+								v-model="formData.vertragsstunden"
+								disabled
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3" v-if="!statusNew">
+							<form-input
+								type="text"
+								:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+								name="vertragsstunden_studiensemester_kurzbz"
+								v-model="formData.vertragsstunden_studiensemester_kurzbz"
+								disabled
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								type="textarea"
+								:label="$p.t('global/anmerkung')"
+								name="anmerkung"
+								v-model="formData.anmerkung"
+								>
+							</form-input>
+						</div>
+				</core-form>
 				
-			</core-form>
-			
-			<template #footer>
-				<button type="button" class="btn btn-primary" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('ui', 'speichern')}}</button>
-			</template>
-			
-		</bs-modal>
+				<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
+					<button type="button" class="btn btn-primary" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('vertrag', 'vertragErstellen')}}</button>
+				</template>
+			</bs-modal>
+		</core-form>
 	</div>`
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ddd774ac4..252baa03e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31207,6 +31207,106 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'addStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),	
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'editStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftrag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete teaching assignment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'vertrag',
@@ -31307,6 +31407,366 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_statusVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status bereits vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status already existing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragstyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),	
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsdatum_iso',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum Iso',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Date Iso',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'vertrag_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsstunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsstunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsstunden_studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'vertragsstunden Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract hours study semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'abgerechnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abgerechnetr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'billed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'mitarbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'projektarbeit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Projekt work ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'pruefung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfung UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exam ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragErstellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragDetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragdetails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNotValidDate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} hat kein gültiges Datumsformat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The input field {field} does not have a valid date format',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'text_explainLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die folgenden Lehraufträge sind noch keinem Vertrag zugeordnet. Markieren Sie die Lehraufträge um diese dem Vertrag zuzuordnen:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The following teaching assignments have not yet been assigned to a contract. Mark the teaching assignments to assign them to the contract:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'text_addLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Folgende Lehraufträge werden hinzugefügt:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The following teaching assignments will be added:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From b63146a8d89cdc4f08213350170346b1956cd560 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 20 Nov 2024 15:03:59 +0100
Subject: [PATCH 0032/1357] added MeldezettelJob for accepting Meldezettel of
 students with Meldeadresse

---
 .../controllers/jobs/MeldezettelJob.php       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 application/controllers/jobs/MeldezettelJob.php

diff --git a/application/controllers/jobs/MeldezettelJob.php b/application/controllers/jobs/MeldezettelJob.php
new file mode 100644
index 000000000..329597985
--- /dev/null
+++ b/application/controllers/jobs/MeldezettelJob.php
@@ -0,0 +1,86 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class MeldezettelJob extends JOB_Controller
+{
+	const INSERT_VON = 'meldezetteljob';
+	const DOKUMENT_KURZBZ = 'Meldezet';
+
+	private $_ci; // Code igniter instance
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+	}
+
+	/**
+	 * Sets Meldezettel to "accepted" for all students with Meldeadresse.
+	 */
+	public function acceptMeldezettel()
+	{
+		$this->logInfo('Start Meldezettel Job');
+
+		$params = array(self::DOKUMENT_KURZBZ);
+
+		$qry = "
+			-- get all prestudents with meldeadresse, but no accepted Meldezettel
+			SELECT
+				DISTINCT prestudent_id
+			FROM
+				public.tbl_adresse
+				JOIN public.tbl_person USING (person_id)
+				JOIN public.tbl_prestudent ps USING (person_id)
+			WHERE
+				typ = 'm'
+				AND NOT EXISTS (
+					SELECT
+						1
+					FROM
+						public.tbl_dokumentprestudent
+					WHERE
+						prestudent_id = ps.prestudent_id
+						AND dokument_kurzbz = ?
+				)";
+
+		// get all prestudents with Meldeadresse and no accpeted Meldezettel
+		$result = $this->_ci->DokumentprestudentModel->execReadOnlyQuery($qry, $params);
+
+		if (isError($result))
+		{
+			$this->logError(getError($result));
+		}
+
+		$count = 0;
+
+		if (hasData($result))
+		{
+			$prestudents = getData($result);
+
+			foreach ($prestudents as $prestudent)
+			{
+				// set Meldezettel to accepted
+				$result = $this->_ci->DokumentprestudentModel->insert(
+					array(
+						'prestudent_id' => $prestudent->prestudent_id,
+						'dokument_kurzbz' => self::DOKUMENT_KURZBZ,
+						'datum' => date('Y-m-d'),
+						'insertamum' => strftime('%Y-%m-%d %H:%M'),
+						'insertvon' => self::INSERT_VON
+					)
+				);
+
+				if (isError($result))
+					$this->logError(getError($result));
+				else
+					$count++;
+			}
+		}
+
+		$this->logInfo('End Meldezettel Job', array('Number of changes ' => $count));
+	}
+}

From 0a97b39efbb877ff3f7a07ca0d531434b54cb3ca Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 24 Dec 2024 19:14:04 +0100
Subject: [PATCH 0033/1357] added phrases for electronic onboarding
 verification page

---
 .../person/Kontaktverifikation_model.php      |   2 +-
 system/phrasesupdate.php                      | 137 +++++++++++++++++-
 2 files changed, 132 insertions(+), 7 deletions(-)

diff --git a/application/models/person/Kontaktverifikation_model.php b/application/models/person/Kontaktverifikation_model.php
index b15439edb..17bcb1c35 100644
--- a/application/models/person/Kontaktverifikation_model.php
+++ b/application/models/person/Kontaktverifikation_model.php
@@ -29,7 +29,7 @@ class Kontaktverifikation_model extends DB_Model
 			FROM
 				public.tbl_kontakt_verifikation kv
 				JOIN public.tbl_kontakt kt USING(kontakt_id)
-				WHERE kt.person_id = ?
+			WHERE kt.person_id = ?
 				AND kt.kontakttyp = ?
 				AND kv.verifikation_code = ?
 				AND kv.erstelldatum >= NOW() - INTERVAL '".$this->escape($expiration_days)." days'
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8d7bdd939..843a055a1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31310,18 +31310,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'onboarding',
-		'phrase' => 'registrierungVerifzierenFuer',
+		'phrase' => 'bewerbungVerifizierung',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Registrierung verifizieren für',
+				'text' => 'Verifizierung Ihrer Bewerbung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Verify registration for',
+				'text' => 'Application verification',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -31330,18 +31330,143 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'onboarding',
-		'phrase' => 'registrierungVerifzieren',
+		'phrase' => 'bewerbungVerifzieren',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Registrierung verifizieren',
+				'text' => 'Bewerbung verifizieren',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Verify registration',
+				'text' => 'Verify application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungEinleitung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wenn Ihre Daten stimmen, geben Sie bitte Ihre E-Mail Adresse ein und drücken Sie auf "Bewerbung verfifizieren".
+Danach erhalten Sie eine E-Mail mit dem Link zu Ihrer Bewerbung an die angegebene Adresse.
+Dort können Sie Studienrichtungen hinzufügen, Ihre Daten vervollständigen, und sich unverbindlich bewerben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If your data is correct, please enter your email and click "Verify application".
+We will then send you a link via e-mail to the address specified. There, you can add personal information or degree programs and submit non-binding applications.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungKontakthinweis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wenn Sie mehr Informationen benötigen, steht Ihnen unsere <a href="{0}" target="_blank">Studienberatung</a> gerne persönlich, telefonisch, per E-Mail oder WhatsApp zur Verfügung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Should you require any additional information, please do not hesitate to contact our <a href="{0}" target="_blank">student counselling team</a> in person, by phone, or via e-mail or WhatsApp.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungDatenschutzhinweis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datenschutz-Hinweis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Privacy information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungDatenschutzhinweisText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die uns von Ihnen zum Zwecke der Bewerbung bekanntgegebenen Daten werden von uns ausschließlich zur Abwicklung der Bewerbung auf der Grundlage von vor- bzw vertraglichen Zwecken verarbeitet und mit der unten beschriebenen Ausnahme bei Unklarheiten betreffend die Zugangsvoraussetzungen nicht an Dritte weitergegeben.
+Kommt es zu keinem weiteren Kontakt bzw zu keiner Aufnahme, löschen wir Ihre Daten nach drei Jahren.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The data communicated to us by you for the purpose of the application will be used by us exclusively for the processing of the application on the basis of pre-contractual or contractual purposes and will not be passed on to third parties with the exception described below in case of uncertainties regarding the entry requirements.
+If there is no further contact or enrolment, your data will be deleted after three years.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungInformationenDatenschutzGrundverordnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Informationen zu Ihren Betroffenenrechten finden Sie hier:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Information on your data subject rights can be found here:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bewerbungVerifizierungDatenschutzFragen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei Fragen stehen wir Ihnen jederzeit unter folgender Mail zur Verfügung: ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If you have any questions, please contact us at ',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 115b35ad7b40f3b27a161c5a8859ca019f1924e5 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 8 Jan 2025 14:52:32 +0100
Subject: [PATCH 0034/1357] electronic onboarding: changed phrase for error
 display

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 843a055a1..4de9cbb03 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31622,13 +31622,13 @@ If there is no further contact or enrolment, your data will be deleted after thr
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Da ist etwas schief gelaufen. Wir bitten um Entschuldigung.',
+				'text' => 'Es ist ein Fehler bei der Registrierung aufgetreten.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Sorry, something went wrong.',
+				'text' => 'An error occured during registration.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 35d8f0524d771957727a2b65b33d43f2bbebedcc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 15 Jan 2025 13:56:00 +0100
Subject: [PATCH 0035/1357] new page vertragsverwaltung with employee header
 and details components

---
 .../controllers/Vertragsverwaltung.php        |  31 +++
 .../api/frontend/v1/vertraege/Vertraege.php   |  87 ++++++-
 .../models/ressource/Mitarbeiter_model.php    | 237 ++++++++++++++++++
 application/views/Vertragsverwaltung.php      |  42 ++++
 public/js/api/vertraege/person.js             |  13 +
 public/js/apps/Vertragsverwaltung.js          |  27 ++
 .../Vertraege/MitarbeiterDetails.js           | 105 ++++++++
 .../components/Vertraege/MitarbeiterHeader.js | 175 +++++++++++++
 public/js/components/Vertraege/Vertraege.js   |  21 +-
 .../Vertraege/Vertragsverwaltung.js           |  53 ++++
 10 files changed, 788 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/Vertragsverwaltung.php
 create mode 100644 application/views/Vertragsverwaltung.php
 create mode 100644 public/js/apps/Vertragsverwaltung.js
 create mode 100644 public/js/components/Vertraege/MitarbeiterDetails.js
 create mode 100644 public/js/components/Vertraege/MitarbeiterHeader.js
 create mode 100644 public/js/components/Vertraege/Vertragsverwaltung.js

diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php
new file mode 100644
index 000000000..f1219335e
--- /dev/null
+++ b/application/controllers/Vertragsverwaltung.php
@@ -0,0 +1,31 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Vertragsverwaltung extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+		$this->load->view('Vertragsverwaltung', [
+			'permissions' => [
+				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
+				'admin' => $this->permissionlib->isBerechtigt('admin'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
+			]
+		]);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index d9564da70..72f49f945 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -23,7 +23,12 @@ class Vertraege extends FHCAPI_Controller
 			'deleteContractStatus' => self::PERM_LOGGED,
 			'updateContractStatus' => self::PERM_LOGGED,
 			'deleteLehrauftrag' => self::PERM_LOGGED,
-			'deleteBetreuung' => self::PERM_LOGGED
+			'deleteBetreuung' => self::PERM_LOGGED,
+			//TODO(Manu) Berechtigung
+			'getMitarbeiter' => self::PERM_LOGGED,
+			'getHeader' => self::PERM_LOGGED,
+			'getPersonAbteilung' => self::PERM_LOGGED,
+			'getLeitungOrg' => self::PERM_LOGGED,
 			]);
 
 		//Load Models and Libraries
@@ -640,4 +645,84 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
+
+	public function getMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonenWithContractDetails();
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getPersonAbteilung($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($person_id);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			//TODO(Manu) rewrite better
+			return $this->terminateWithSuccess("no benutzerdata", self::ERROR_TYPE_GENERAL);
+
+		//	return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			//TODO(Manu) rewrite better
+			return $this->terminateWithSuccess("no benutzerdata", self::ERROR_TYPE_GENERAL);
+
+		//	return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_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' => 'personID']), self::ERROR_TYPE_GENERAL);
+		}
+
+/*		$result = current(getData($result));
+		$header = $result->name;*/
+
+		//return $this->terminateWithSuccess($header);
+		return $this->terminateWithSuccess(getData($result));
+	}
+
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index c38fcf054..b616f3fbb 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -98,6 +98,243 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
+	/**
+	 * gibt Personen mit Übersicht von Vertragsdaten aus
+	 *
+	 * @return array
+	 */
+	public function getPersonenWithContractDetails($person_id=null)
+	{
+		/*		$qry = "SELECT DISTINCT ON(mitarbeiter_uid) mitarbeiter_uid, person_id, titelpost, titelpre,
+											nachname, vorname, vornamen,
+							TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum
+							FROM ((public.tbl_mitarbeiter JOIN public.tbl_benutzer ON(mitarbeiter_uid=uid))
+							JOIN public.tbl_person USING(person_id))
+							   LEFT JOIN public.tbl_benutzerfunktion USING(uid)
+							   LEFT JOIN public.tbl_benutzerfunktion akt_funk ON tbl_mitarbeiter.mitarbeiter_uid = akt_funk.uid AND akt_funk.funktion_kurzbz = 'fachzuordnung'
+																		   AND (akt_funk.datum_von IS NULL OR akt_funk.datum_von <= now()) AND (akt_funk.datum_bis IS NULL OR akt_funk.datum_bis >= now())
+						   WHERE true";
+
+				if ($fix === true)
+			$qry .= " AND fixangestellt=true";
+		elseif ($fix === false)
+			$qry .= " AND fixangestellt=false";
+
+		if ($aktiv === true)
+			$qry .= " AND tbl_benutzer.aktiv=true";
+		elseif ($aktiv === false)
+			$qry .= " AND tbl_benutzer.aktiv=false";
+
+		if ($verwendung === true)
+		{
+			$qry.=" AND EXISTS(SELECT * FROM bis.tbl_bisverwendung WHERE (ende>now() or ende is null) AND tbl_bisverwendung.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid)";
+		}
+		elseif ($verwendung === false)
+		{
+			$qry.=" AND NOT EXISTS(SELECT * FROM bis.tbl_bisverwendung WHERE (ende>now() or ende is null) AND tbl_bisverwendung.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid)";
+		}
+
+		if ($personaccount === true)
+			$qry .= " AND tbl_mitarbeiter.personalnummer >= 0";
+		elseif ($personaccount === false)
+			$qry .= " AND tbl_mitarbeiter.personalnummer < 0";
+
+		$params = array();
+		if (!isEmptyArray($uids))
+		{
+			$qry .= " AND tbl_mitarbeiter.mitarbeiter_uid IN ?";
+			$params[] = $uids;
+		}
+
+		return $this->execQuery($qry, $params);
+		*/
+
+		//TODO(Manu) filter nach DV-Art? was, wenn mehrere? oder einfach wenn extern ODER fix?
+		//TODO(Manu) email: plus dieses @domainzeugs:  mohamed.aburaia@c3p0.ma0068.technikum-wien.at
+		//Standardkostenstelle...
+		//was wenn 2 echte DV? schmarrn
+
+		$qry = "
+		SELECT
+			 b.uid , p.person_id,
+			p.vorname, p.nachname,
+			TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum,
+			COALESCE(b.alias, b.uid) AS email, 
+			--COALESCE(b.alias, b.uid) AS EMail, 
+			--u.bezeichnung AS Unternehmen,
+			STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
+			STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
+			STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
+			b.aktiv
+--			CASE WHEN b.aktiv=true THEN 'aktiv'
+--			 	 ELSE 'nicht aktiv'
+--				 END as status //not working in header filter	*/	  
+		    FROM 
+			    hr.tbl_dienstverhaeltnis d 
+		    JOIN 
+			    public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid 
+		    JOIN 
+			    public.tbl_person p ON p.person_id = b.person_id 
+		    JOIN
+			    public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+		    JOIN
+			    hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz ";
+
+/*		if ($aktiv === true)
+			$qry .= " WHERE b.aktiv = true";
+		elseif ($aktiv === false)
+			$qry .= " WHERE b.aktiv = false";
+
+		if($fix)
+		{
+			$filterVertragsart = "echterdv";
+
+			$filterVertragsart = addslashes($filterVertragsart); // Escaping von Sonderzeichen
+			$qry .= " AND d.vertragsart_kurzbz = '" . $filterVertragsart . "'";
+		}
+
+		if($extern)
+		{
+			$filterVertragsart2 = "externerlehrender";
+
+			$filterVertragsart2 = addslashes($filterVertragsart2); // Escaping von Sonderzeichen
+			$qry .= " AND d.vertragsart_kurzbz = '" . $filterVertragsart2 . "'";
+		}*/
+
+		if($person_id)
+		{
+			$qry .= " WHERE p.person_id = ?";
+		}
+
+
+		$qry.= " 
+		GROUP BY 
+    		b.uid, p.person_id, p.vorname, p.nachname, b.alias
+		 ORDER BY
+			    p.nachname, p.vorname; ";
+
+
+
+		$params = array($person_id);
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * get current disciplinary Abteilung of person
+	 *
+	 * @param $person_id
+	 *
+	 * @return Array benutzerfunktionsdata
+	 */
+	function getPersonAbteilung($person_id)
+	{
+/*
+		$qry = "
+        SELECT tbl_benutzer.uid
+        FROM tbl_mitarbeiter
+            JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
+            JOIN tbl_person USING (person_id)
+        WHERE tbl_person.person_id=?
+        ";
+
+
+		$result = $this->execQuery($qry, array($person_id));
+
+		$uid = current(getData($result));
+		$uid = $uid->uid;
+
+
+		$qry2 ="
+            SELECT
+                bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
+                oe.oe_kurzbz,oe.oe_parent_kurzbz,oe.bezeichnung,oe.organisationseinheittyp_kurzbz,oe.aktiv,oe.mailverteiler,oe.freigabegrenze,oe.kurzzeichen,oe.lehre,oe.standort,oe.warn_semesterstunden_frei,oe.warn_semesterstunden_fix,oe.standort_id
+            FROM tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+            WHERE uid = ? AND funktion_kurzbz='oezuordnung'
+                AND datum_von<=now() AND (datum_bis is null OR datum_bis>=now())
+        ";
+
+		$result2 = $this->execQuery($qry2, array($uid));
+
+
+		return $result2;*/
+
+		// First Query
+		$qry = "
+        SELECT tbl_benutzer.uid
+        FROM tbl_mitarbeiter
+            JOIN tbl_benutzer ON CAST(tbl_mitarbeiter.mitarbeiter_uid AS TEXT) = CAST(tbl_benutzer.uid AS TEXT)
+            JOIN tbl_person USING (person_id)
+        WHERE tbl_person.person_id = ?
+    ";
+		$result = $this->execQuery($qry, [$person_id]);
+
+		// Validate and extract UID
+		$data = getData($result);
+		if (empty($data)) {
+			return null; // No UID found
+		}
+
+		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
+	//	$uid = isset($data[0]['uid']) ? $data[0]['uid'] : null;
+
+		if (!$uid) {
+			return null; // UID extraction failed
+		}
+
+		// Second Query
+		$qry2 = "
+        SELECT
+            bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
+            bf.updatevon, bf.insertamum, bf.insertvon, bf.ext_id, bf.semester, bf.oe_kurzbz, 
+            bf.datum_von, bf.datum_bis, bf.bezeichnung, bf.wochenstunden,
+            oe.oe_kurzbz, oe.oe_parent_kurzbz, oe.bezeichnung, 
+            oe.organisationseinheittyp_kurzbz, oe.aktiv, oe.mailverteiler, 
+            oe.freigabegrenze, oe.kurzzeichen, oe.lehre, oe.standort, 
+            oe.warn_semesterstunden_frei, oe.warn_semesterstunden_fix, oe.standort_id
+        FROM tbl_benutzerfunktion bf
+        JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+        WHERE uid = ? 
+            AND funktion_kurzbz = 'oezuordnung'
+            AND datum_von <= NOW() 
+            AND (datum_bis IS NULL OR datum_bis >= NOW())
+    ";
+		$result2 = $this->execQuery($qry2, [$uid]);
+
+		return $result2;
+	}
+
+	function getLeitungOrg($oe_kurzbz)
+	{
+		$qry = "
+            SELECT bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
+                p.person_id, p.vorname,p.nachname,p.titelpre,p.titelpost
+            FROM public.tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+            JOIN public.tbl_benutzer b USING (uid) JOIN public.tbl_mitarbeiter ma ON(b.uid=ma.mitarbeiter_uid)
+            JOIN public.tbl_person p  USING(person_id)
+            WHERE funktion_kurzbz='Leitung' AND oe.oe_kurzbz = ?
+                AND datum_von<=now() AND (datum_bis is null OR datum_bis>=now());
+        ";
+
+		return $this->execQuery($qry, array($oe_kurzbz));
+	}
+
+	function getHeader($person_id)
+	{
+		$qry = "
+			SELECT
+			  *
+			FROM
+			  public.tbl_person
+			  JOIN public.tbl_benutzer b USING(person_id)
+			  JOIN public.tbl_mitarbeiter ma ON (ma.mitarbeiter_uid = b.uid)
+			WHERE
+			  person_id = ?
+        ";
+
+		return $this->execQuery($qry, array($person_id));
+	}
+
 	/**
 	 * Gibt ein Array mit den UIDs der Vorgesetzten zurück
 	 * @return object
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
new file mode 100644
index 000000000..c56da0362
--- /dev/null
+++ b/application/views/Vertragsverwaltung.php
@@ -0,0 +1,42 @@
+<?php
+$includesArray = array(
+	'title' => 'Vertragsverwaltung',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'primevue3' => true,
+	#'filtercomponent' => true,
+	'tabulator5' => true,
+	'tinymce5' => true,
+	'phrases' => array(
+		'global',
+		'ui',
+	),
+	'customCSSs' => [
+		'public/css/components/vue-datepicker.css',
+		'public/css/components/primevue.css',
+/*		'public/css/Vertragsverwaltung.css'*/
+	],
+	'customJSs' => [
+		#'vendor/npm-asset/primevue/tree/tree.min.js',
+		#'vendor/npm-asset/primevue/toast/toast.min.js'
+	],
+	'customJSModules' => [
+		'public/js/apps/Vertragsverwaltung.js'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+	<router-view
+		stv-root="<?= site_url('Vertragsverwaltung'); ?>"
+		cis-root="<?= CIS_ROOT; ?>"
+	>
+	</router-view>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index 5c562a273..7e0aee6bd 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -49,5 +49,18 @@ export default {
 	},
 	deleteBetreuung(params) {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteBetreuung/' + params.vertrag_id, params);
+	},
+	getMitarbeiter(params){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getMitarbeiter/');
+	},
+	getHeader(person_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getHeader/' + person_id);
+	},
+	getPersonAbteilung(person_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id);
+	},
+	getLeitungOrg(oekurzbz){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
 	}
+
 }
\ No newline at end of file
diff --git a/public/js/apps/Vertragsverwaltung.js b/public/js/apps/Vertragsverwaltung.js
new file mode 100644
index 000000000..1918345c0
--- /dev/null
+++ b/public/js/apps/Vertragsverwaltung.js
@@ -0,0 +1,27 @@
+import Vertragsverwaltung from "../components/Vertraege/Vertragsverwaltung.js";
+import fhcapifactory from "./api/fhcapifactory.js";
+
+import Phrasen from "../plugin/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/vertragsverwaltung`, component: Vertragsverwaltung },
+	]
+});
+
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	//.use(fhcapifactory)  //nicht nötig
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
diff --git a/public/js/components/Vertraege/MitarbeiterDetails.js b/public/js/components/Vertraege/MitarbeiterDetails.js
new file mode 100644
index 000000000..1dbe05402
--- /dev/null
+++ b/public/js/components/Vertraege/MitarbeiterDetails.js
@@ -0,0 +1,105 @@
+export default {
+	data() {
+		return {
+			headerData: {},
+			departmentData: {},
+			leitungData: {},
+			//TODO(Manu) get from config
+			domain: 'c3p0.ma0068.technikum-wien.at',
+		};
+	},
+	props: {
+		person_id: Number
+	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		},
+	},
+	created(){
+		this.getHeader(this.person_id);
+
+		// Ensure loadDepartmentData is awaited
+		this.loadDepartmentData(this.person_id)
+			.then(() => {
+				// Call getLeitungOrg only after departmentData is loaded
+				this.getLeitungOrg(this.departmentData.oe_kurzbz);
+			})
+			.catch((error) => {
+				console.error("Error loading department data:", error);
+			});
+	},
+	watch: {
+		person_id: {
+			handler(newVal) {
+				if (newVal) {
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.person_id).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
+				}
+			},
+			deep: true,
+		},
+	},
+	methods: {
+		getHeader(person_id) {
+			return this.$fhcApi.factory.vertraege.person
+				.getHeader(person_id)
+				.then(result => {
+					this.headerData = result.data[0];
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadDepartmentData(person_id) {
+			return this.$fhcApi.factory.vertraege.person
+				.getPersonAbteilung(person_id)
+				.then(result => {
+					this.departmentData = result.data[0];
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLeitungOrg(oekurzbz){
+			return this.$fhcApi.factory.vertraege.person
+				.getLeitungOrg(oekurzbz)
+				.then(result => {
+					this.leitungData = result.data[0];
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	template: `
+		<div class="core-mitarbeiter-details">
+			<!--show Picture-->
+			<div class="row">
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3" 
+						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+					<img 
+						class="d-block h-100 rounded" 
+						alt="profilepicture" 
+						style="object-fit: cover; max-width: 100%;" 
+						:src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person_id">
+				</div>
+			
+				<!--show Ma-Details-->
+				<div class="col-md-8">
+					<h5>{{headerData.titelpre}} {{headerData.vorname}} {{headerData.nachname}} {{headerData.titelpost}} </h5>
+					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong> {{departmentData.bezeichnung}} <span v-if="leitungData.uid"> | </span><strong v-if="leitungData.uid" class="text-muted">Vorgesetzte/e </strong>{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}} {{leitungData.titelpost}}  
+					<p>
+						<strong class="text-muted">Email </strong>
+						 <span v-if="!headerData?.alias">
+							<a :href="'mailto:'+headerData?.uid+'@'+domain">{{  headerData.uid }}@{{ domain }}</a>
+						</span>
+						<span v-if="headerData?.alias">
+							<a :href="'mailto:'+headerData?.alias+'@'+domain">{{  headerData.alias }}@{{ domain }}</a>
+						</span>
+						<span v-if="headerData?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW</strong> {{  headerData?.telefonklappe }}</span>
+					</p>
+		
+				</div>
+			</div>
+		</div>
+
+`
+};
\ No newline at end of file
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
new file mode 100644
index 000000000..5c6c3330b
--- /dev/null
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -0,0 +1,175 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import FormInput from '../Form/Input.js';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		FormInput
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	emits: [
+		"selectedPerson"
+	],
+	props: {
+		// maybe later nur fixe oder alle Mitarbeiter: gleich funktionsaufruf
+		//oder Mitarbeiter mit Verträgen
+/*		filterMa: {
+			type: Object,
+			required: true,
+			default: function () {
+				return {
+					active: true,
+					hasVertraege: false
+				};
+			},
+		},*/
+/*		vertragsarten: {
+			type: Array,
+			required: false,
+			default: function (){
+				return {
+					['echterdv']
+				}
+			}
+		}*/
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getMitarbeiter,
+				ajaxParams: () => {
+					return {
+						fix: this.filterMa
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "UID", field: "uid", headerFilter:"input"},
+					{title: "personID", field: "person_id", visible: false, headerFilter:"input"},
+					{title: "Nachname", field: "nachname", headerFilter:"input"},
+					{title: "Vorname", field: "vorname", headerFilter:"input"},
+					{
+						title: "Aktiv", field: "aktiv", headerFilter: "input",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title: "Geburtsdatum", field: "format_gebdatum", headerFilter:"input"},
+					{title: "Unternehmen", field: "unternehmen", headerFilter:"input"},
+					{title: "Vertragsarten", field: "vertragsarten", headerFilter:"input"},
+					{title: "Ids Dienstverträge", field: "ids", headerFilter:"input"},
+				],
+				layout: 'fitColumns',
+				persistenceID: 'core-mitarbeiter',
+				selectableRangeMode: 'click',
+				selectable: true,
+			},
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged
+				},
+		{
+/*					event: 'tableBuilt',
+					handler: async() => {
+
+						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung')
+						});
+						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
+							title: this.$p.t('ui', 'lehreinheit_id')
+						});
+						cm.getColumnByField('betrag').component.updateDefinition({
+							title: this.$p.t('ui', 'betrag')
+						});
+						cm.getColumnByField('status').component.updateDefinition({
+							title: this.$p.t('global', 'status')
+						});
+						cm.getColumnByField('vertragstyp_bezeichnung').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragstyp')
+						});
+						cm.getColumnByField('format_vertragsdatum').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsdatum')
+						});
+						cm.getColumnByField('vertragsdatum').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsdatum_iso')
+						});
+						cm.getColumnByField('vertragsstunden').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsstunden')
+						});
+						cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
+						});
+						cm.getColumnByField('vertrag_id').component.updateDefinition({
+							title: this.$p.t('ui', 'vertrag_id')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('isabgerechnet').component.updateDefinition({
+							title: this.$p.t('vertrag', 'abgerechnet')
+						});
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
+					} */
+				}
+			],
+			selectedPerson: null,
+			isFilterSet: false,
+		}
+	},
+	methods: {
+		rowSelectionChanged(data) {
+			this.selectedPerson = data[0].person_id;
+			this.$emit('selectedPerson', this.selectedPerson);
+		},
+		onSwitchChange() {
+			if (this.isFilterSet) {
+				this.$refs.table.tabulator.setFilter("aktiv", "=", true);
+			}
+			else {
+				this.$refs.table.tabulator.clearFilter("aktiv");
+			}
+		},
+	},
+	template: `
+	<div class="core-mitarbeiter h-100 d-flex flex-column">
+		<h4>Vertragsverwaltung</h4>
+		
+<!--	filter: show only active employees-->
+		<div class="justify-content-end py-3">
+			<form-input
+				container-class="form-switch"
+				type="checkbox"
+				label="nur aktive Mitarbeiter:innen anzeigen"
+				v-model="isFilterSet"
+				@change="onSwitchChange"
+				>
+			</form-input>
+		</div>
+		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			>
+		</core-filter-cmpt>
+
+	</div>`
+}
+
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index a525f859e..468e73bf8 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -32,6 +32,11 @@ export default {
 			required: true
 		},
 	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		}
+	},
 	data() {
 		return {
 			tabulatorOptions: {
@@ -170,7 +175,7 @@ export default {
 				datum: new Date(),
 			},
 			childData: {},
-			isFilterSet: false
+			isFilterSet: false,
 		}
 	},
 	watch: {
@@ -434,6 +439,7 @@ export default {
 		this.$nextTick(() => {
 			this.$refs.table.tabulator.on("rowClick", (e, row) => {
 				this.contractSelected = row.getData();
+				console.log("selected Row ", this.contractSelected);
 			});
 		});
 		this.getFormattedDate();
@@ -442,6 +448,17 @@ export default {
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 	
+	
+	
+
+<!--	<div 
+		class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" 
+		style="max-height: 8rem; overflow: hidden;">
+	<img class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person_id">
+&lt;!&ndash;		<img class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
+			<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>&ndash;&gt;
+	</div>-->
+	
 <!--	filter: open means no status abgerechnet yet-->
 		<div class="justify-content-end pb-3">
 			<form-input
@@ -467,7 +484,7 @@ export default {
 			>
 		</core-filter-cmpt>
 		
-		<div class = "row">
+		<div class="row">
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
new file mode 100644
index 000000000..5c92f75ad
--- /dev/null
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -0,0 +1,53 @@
+import MitarbeiterHeader from "./MitarbeiterHeader.js";
+import MitarbeiterDetails from "./MitarbeiterDetails.js";
+import Vertraege from "./Vertraege.js";
+import VerticalSplit from "../verticalsplit/verticalsplit.js";
+
+export default {
+	components: {
+		VerticalSplit,
+		MitarbeiterHeader,
+		MitarbeiterDetails,
+		Vertraege
+	},
+	data() {
+		//TODO(Manu) props for filter: actually not necessary
+		return {
+			person_id: null,
+/*			filterMa: {
+				active: true,
+				hasVertraege: true
+			},*/
+/*			vertragsarten:
+				[ 'echterdv', 'externerlehrender', 'gastlektor']*/
+		}
+	},
+	methods: {
+		selectPerson(selected){
+			this.person_id = selected;
+		}
+	},
+	template: `
+<div>
+	<div class="container-fluid overflow-hidden">
+		<div class="row h-100">
+			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+			<!--<div class="col-md-12">-->
+				<vertical-split>
+					<template #top>	
+						<MitarbeiterHeader :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
+					</template>
+					<template #bottom>
+						<div class="col" v-if="person_id!=null">
+							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
+							<h5>Verträge</h5>
+							<Vertraege :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id" />
+						</div>
+					<template>
+				</vertical-split>
+			</main>	
+			</div>
+		</div>
+	</div>
+	`
+}
\ No newline at end of file

From 08cb3d3809b34b43eb87558a02a5ae702e4c8681 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 16 Jan 2025 21:02:01 +0100
Subject: [PATCH 0036/1357] electronic onboarding phrase typo fix

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4de9cbb03..7f030e62b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31355,7 +31355,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Wenn Ihre Daten stimmen, geben Sie bitte Ihre E-Mail Adresse ein und drücken Sie auf "Bewerbung verfifizieren".
+				'text' => 'Wenn Ihre Daten stimmen, geben Sie bitte Ihre E-Mail Adresse ein und drücken Sie auf "Bewerbung verifizieren".
 Danach erhalten Sie eine E-Mail mit dem Link zu Ihrer Bewerbung an die angegebene Adresse.
 Dort können Sie Studienrichtungen hinzufügen, Ihre Daten vervollständigen, und sich unverbindlich bewerben.',
 				'description' => '',

From ffc99379ae76607f89386e5d80deb3314cc2dd17 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 20 Jan 2025 15:25:06 +0100
Subject: [PATCH 0037/1357] Injection ADDON KU for Multiselect and Print
 Honorarvertrag

---
 .../controllers/Vertragsverwaltung.php        |   1 +
 .../controllers/api/frontend/v1/LvMenu.php    |   0
 .../api/frontend/v1/vertraege/Config.php      |  60 ++++++++
 .../api/frontend/v1/vertraege/Vertraege.php   |  31 +++-
 application/core/CI3_Events.php               |  15 +-
 .../models/ressource/Mitarbeiter_model.php    | 133 ++++--------------
 application/views/Vertragsverwaltung.php      |  10 ++
 public/js/api/vertraege.js                    |   5 +-
 public/js/api/vertraege/person.js             |   5 +-
 .../components/Vertraege/List/Unassigned.js   |   2 +-
 .../Vertraege/MitarbeiterDetails.js           |  10 +-
 public/js/components/Vertraege/Vertraege.js   | 120 +++++++++++++---
 .../Vertraege/Vertragsverwaltung.js           |  16 +++
 13 files changed, 272 insertions(+), 136 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/LvMenu.php
 create mode 100644 application/controllers/api/frontend/v1/vertraege/Config.php

diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php
index f1219335e..243f57118 100644
--- a/application/controllers/Vertragsverwaltung.php
+++ b/application/controllers/Vertragsverwaltung.php
@@ -4,6 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Vertragsverwaltung extends Auth_Controller
 {
+	//TODO(Manu) Permissions
 	public function __construct()
 	{
 		$permissions = [];
diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/application/controllers/api/frontend/v1/vertraege/Config.php b/application/controllers/api/frontend/v1/vertraege/Config.php
new file mode 100644
index 000000000..1da49cd78
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vertraege/Config.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the VV Config
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Config extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(Manu): permissions
+		parent::__construct([
+			'printDocument' => ['admin:r', 'assistenz:r'],
+		]);
+
+
+		// Load Phrases
+		$this->loadPhrases([
+			'global',
+			'person',
+		]);
+	}
+
+	public function printDocument() {
+
+		$params = [];
+
+		Events::trigger('multiActionPrintHonorarvertrag',
+			// passing $menu per reference
+			function & () use (&$menu) {
+				return $menu;
+			},
+			$params
+		);
+
+		$this->terminateWithSuccess($menu[0]);
+	}
+
+}
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 72f49f945..b17d8b4e6 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -1,6 +1,7 @@
 <?php
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
+
 use \DateTime as DateTime;
 
 class Vertraege extends FHCAPI_Controller
@@ -24,11 +25,12 @@ class Vertraege extends FHCAPI_Controller
 			'updateContractStatus' => self::PERM_LOGGED,
 			'deleteLehrauftrag' => self::PERM_LOGGED,
 			'deleteBetreuung' => self::PERM_LOGGED,
-			//TODO(Manu) Berechtigung
+			//TODO(Manu) Berechtigungen
 			'getMitarbeiter' => self::PERM_LOGGED,
 			'getHeader' => self::PERM_LOGGED,
 			'getPersonAbteilung' => self::PERM_LOGGED,
 			'getLeitungOrg' => self::PERM_LOGGED,
+			'getMitarbeiter_uid' => self::PERM_LOGGED,
 			]);
 
 		//Load Models and Libraries
@@ -678,7 +680,6 @@ class Vertraege extends FHCAPI_Controller
 			//TODO(Manu) rewrite better
 			return $this->terminateWithSuccess("no benutzerdata", self::ERROR_TYPE_GENERAL);
 
-		//	return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
@@ -718,11 +719,29 @@ class Vertraege extends FHCAPI_Controller
 				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
 		}
 
-/*		$result = current(getData($result));
-		$header = $result->name;*/
-
-		//return $this->terminateWithSuccess($header);
 		return $this->terminateWithSuccess(getData($result));
 	}
 
+
+	public function getMitarbeiter_uid($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getMitarbeiter_uid($person_id);
+
+		if (isError($result))
+		{
+			//TODO(Manu) check ErrorLogic
+			return $this->terminateWithSuccess($result);
+			//return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		return $this->terminateWithSuccess($result);
+	}
+
+
 }
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 33a96b89e..07dd6a2db 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -35,7 +35,7 @@ class CI3_Events
 			});
 			self::$eventsSorted[$event] = true;
 		}
-		
+
 		foreach (self::$events[$event] as $conf) {
 			$conf[1](...$args);
 		}
@@ -46,6 +46,19 @@ class CI3_Events
  * NOTE(chris): Autoload Events config
  */
 require_once(APPPATH.'config/Events.php');
+
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
+
+$active_addons_array = explode(";", ACTIVE_ADDONS);
+foreach (scandir(FHCPATH.'addons') as $dir)
+	if ($dir[0] != '.' && file_exists(FHCPATH.'addons/'.$dir.'/Events.php'))
+	{
+		// only includes the Events of the addon if the addon is one of the active addons in the cis config
+		if(in_array($dir,$active_addons_array))
+		{
+			require_once FHCPATH . 'addons/' . $dir . '/Events.php';
+		}
+	}
+
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index b616f3fbb..1b3c8834a 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -105,63 +105,12 @@ class Mitarbeiter_model extends DB_Model
 	 */
 	public function getPersonenWithContractDetails($person_id=null)
 	{
-		/*		$qry = "SELECT DISTINCT ON(mitarbeiter_uid) mitarbeiter_uid, person_id, titelpost, titelpre,
-											nachname, vorname, vornamen,
-							TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum
-							FROM ((public.tbl_mitarbeiter JOIN public.tbl_benutzer ON(mitarbeiter_uid=uid))
-							JOIN public.tbl_person USING(person_id))
-							   LEFT JOIN public.tbl_benutzerfunktion USING(uid)
-							   LEFT JOIN public.tbl_benutzerfunktion akt_funk ON tbl_mitarbeiter.mitarbeiter_uid = akt_funk.uid AND akt_funk.funktion_kurzbz = 'fachzuordnung'
-																		   AND (akt_funk.datum_von IS NULL OR akt_funk.datum_von <= now()) AND (akt_funk.datum_bis IS NULL OR akt_funk.datum_bis >= now())
-						   WHERE true";
-
-				if ($fix === true)
-			$qry .= " AND fixangestellt=true";
-		elseif ($fix === false)
-			$qry .= " AND fixangestellt=false";
-
-		if ($aktiv === true)
-			$qry .= " AND tbl_benutzer.aktiv=true";
-		elseif ($aktiv === false)
-			$qry .= " AND tbl_benutzer.aktiv=false";
-
-		if ($verwendung === true)
-		{
-			$qry.=" AND EXISTS(SELECT * FROM bis.tbl_bisverwendung WHERE (ende>now() or ende is null) AND tbl_bisverwendung.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid)";
-		}
-		elseif ($verwendung === false)
-		{
-			$qry.=" AND NOT EXISTS(SELECT * FROM bis.tbl_bisverwendung WHERE (ende>now() or ende is null) AND tbl_bisverwendung.mitarbeiter_uid=tbl_mitarbeiter.mitarbeiter_uid)";
-		}
-
-		if ($personaccount === true)
-			$qry .= " AND tbl_mitarbeiter.personalnummer >= 0";
-		elseif ($personaccount === false)
-			$qry .= " AND tbl_mitarbeiter.personalnummer < 0";
-
-		$params = array();
-		if (!isEmptyArray($uids))
-		{
-			$qry .= " AND tbl_mitarbeiter.mitarbeiter_uid IN ?";
-			$params[] = $uids;
-		}
-
-		return $this->execQuery($qry, $params);
-		*/
-
-		//TODO(Manu) filter nach DV-Art? was, wenn mehrere? oder einfach wenn extern ODER fix?
-		//TODO(Manu) email: plus dieses @domainzeugs:  mohamed.aburaia@c3p0.ma0068.technikum-wien.at
-		//Standardkostenstelle...
-		//was wenn 2 echte DV? schmarrn
-
 		$qry = "
 		SELECT
 			 b.uid , p.person_id,
 			p.vorname, p.nachname,
 			TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum,
 			COALESCE(b.alias, b.uid) AS email, 
-			--COALESCE(b.alias, b.uid) AS EMail, 
-			--u.bezeichnung AS Unternehmen,
 			STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
 			STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
 			STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
@@ -180,33 +129,11 @@ class Mitarbeiter_model extends DB_Model
 		    JOIN
 			    hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz ";
 
-/*		if ($aktiv === true)
-			$qry .= " WHERE b.aktiv = true";
-		elseif ($aktiv === false)
-			$qry .= " WHERE b.aktiv = false";
-
-		if($fix)
-		{
-			$filterVertragsart = "echterdv";
-
-			$filterVertragsart = addslashes($filterVertragsart); // Escaping von Sonderzeichen
-			$qry .= " AND d.vertragsart_kurzbz = '" . $filterVertragsart . "'";
-		}
-
-		if($extern)
-		{
-			$filterVertragsart2 = "externerlehrender";
-
-			$filterVertragsart2 = addslashes($filterVertragsart2); // Escaping von Sonderzeichen
-			$qry .= " AND d.vertragsart_kurzbz = '" . $filterVertragsart2 . "'";
-		}*/
-
 		if($person_id)
 		{
 			$qry .= " WHERE p.person_id = ?";
 		}
 
-
 		$qry.= " 
 		GROUP BY 
     		b.uid, p.person_id, p.vorname, p.nachname, b.alias
@@ -229,37 +156,7 @@ class Mitarbeiter_model extends DB_Model
 	 */
 	function getPersonAbteilung($person_id)
 	{
-/*
-		$qry = "
-        SELECT tbl_benutzer.uid
-        FROM tbl_mitarbeiter
-            JOIN tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
-            JOIN tbl_person USING (person_id)
-        WHERE tbl_person.person_id=?
-        ";
-
-
-		$result = $this->execQuery($qry, array($person_id));
-
-		$uid = current(getData($result));
-		$uid = $uid->uid;
-
-
-		$qry2 ="
-            SELECT
-                bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
-                oe.oe_kurzbz,oe.oe_parent_kurzbz,oe.bezeichnung,oe.organisationseinheittyp_kurzbz,oe.aktiv,oe.mailverteiler,oe.freigabegrenze,oe.kurzzeichen,oe.lehre,oe.standort,oe.warn_semesterstunden_frei,oe.warn_semesterstunden_fix,oe.standort_id
-            FROM tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
-            WHERE uid = ? AND funktion_kurzbz='oezuordnung'
-                AND datum_von<=now() AND (datum_bis is null OR datum_bis>=now())
-        ";
-
-		$result2 = $this->execQuery($qry2, array($uid));
-
-
-		return $result2;*/
-
-		// First Query
+		//TODO(Manu) use function getMitarbeiter_uid
 		$qry = "
         SELECT tbl_benutzer.uid
         FROM tbl_mitarbeiter
@@ -269,14 +166,12 @@ class Mitarbeiter_model extends DB_Model
     ";
 		$result = $this->execQuery($qry, [$person_id]);
 
-		// Validate and extract UID
 		$data = getData($result);
 		if (empty($data)) {
 			return null; // No UID found
 		}
 
 		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
-	//	$uid = isset($data[0]['uid']) ? $data[0]['uid'] : null;
 
 		if (!$uid) {
 			return null; // UID extraction failed
@@ -475,4 +370,30 @@ class Mitarbeiter_model extends DB_Model
 
 		return $this->execQuery($qry);
 	}
+
+	public function getMitarbeiter_uid($person_id){
+		//TODO(Manu) refactor function
+		//and use in function getPersonAbteilung
+		//check function in Vertraege.php
+		$qry = "
+        SELECT tbl_benutzer.uid
+        FROM tbl_mitarbeiter
+            JOIN tbl_benutzer ON CAST(tbl_mitarbeiter.mitarbeiter_uid AS TEXT) = CAST(tbl_benutzer.uid AS TEXT)
+            JOIN tbl_person USING (person_id)
+        WHERE tbl_person.person_id = ?
+    ";
+		$result = $this->execQuery($qry, [$person_id]);
+
+		$data = getData($result);
+		if (empty($data)) {
+			return null; // No UID found
+		}
+		//else
+		//	$data = current($data);
+
+	//	$uid = $data->uid;
+
+		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
+		return $uid;
+	}
 }
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index c56da0362..0a663761f 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -30,10 +30,20 @@ $includesArray = array(
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
+<?php
+$configArray = [
+	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? 'notDefined' : GENERATE_ALIAS_STUDENT,
+	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
+	'chooseLayout' => !defined('CHOOSE_LAYOUT') ? 'notDefined' : CHOOSE_LAYOUT,
+];
+?>
+
 <div id="main">
 	<router-view
 		stv-root="<?= site_url('Vertragsverwaltung'); ?>"
 		cis-root="<?= CIS_ROOT; ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 	>
 	</router-view>
 </div>
diff --git a/public/js/api/vertraege.js b/public/js/api/vertraege.js
index 1c23316ef..a29fdf3b0 100644
--- a/public/js/api/vertraege.js
+++ b/public/js/api/vertraege.js
@@ -1,5 +1,8 @@
 import person from "./vertraege/person.js";
 
 export default {
-	person
+	person,
+	configPrintDocument() {
+		return this.$fhcApi.get('api/frontend/v1/vertraege/config/printDocument');
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index 7e0aee6bd..b4c03b696 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -61,6 +61,9 @@ export default {
 	},
 	getLeitungOrg(oekurzbz){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
-	}
+	},
+	getMitarbeiter_uid(person_id){
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiter_uid/' + person_id);
+	},
 
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index a693a04fe..9ffb1c3c8 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -150,7 +150,7 @@ export default {
 			} else {
 				this.clickedRows.push(rowData);
 				this.sumBetragLehrauftraege += Number(rowData.betrag1);
-				console.log(rowData.betrag1);
+				//console.log(rowData.betrag1);
 				this.handleSumUp();
 			}
 
diff --git a/public/js/components/Vertraege/MitarbeiterDetails.js b/public/js/components/Vertraege/MitarbeiterDetails.js
index 1dbe05402..53f00afa8 100644
--- a/public/js/components/Vertraege/MitarbeiterDetails.js
+++ b/public/js/components/Vertraege/MitarbeiterDetails.js
@@ -4,10 +4,14 @@ export default {
 			headerData: {},
 			departmentData: {},
 			leitungData: {},
-			//TODO(Manu) get from config
-			domain: 'c3p0.ma0068.technikum-wien.at',
 		};
 	},
+	inject: {
+		domain: {
+			from: 'configDomain',
+			default: 'technikum-wien.at'
+		},
+	},
 	props: {
 		person_id: Number
 	},
@@ -83,7 +87,7 @@ export default {
 				</div>
 			
 				<!--show Ma-Details-->
-				<div class="col-md-8">
+				<div class="col-md-10">
 					<h5>{{headerData.titelpre}} {{headerData.vorname}} {{headerData.nachname}} {{headerData.titelpost}} </h5>
 					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong> {{departmentData.bezeichnung}} <span v-if="leitungData.uid"> | </span><strong v-if="leitungData.uid" class="text-muted">Vorgesetzte/e </strong>{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}} {{leitungData.titelpost}}  
 					<p>
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 468e73bf8..60705d20a 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -59,7 +59,6 @@ export default {
 							if (value == null) {
 								return "0.00";
 							}
-
 							return parseFloat(value).toFixed(2);
 						}
 					},
@@ -162,7 +161,21 @@ export default {
 							title: this.$p.t('global', 'aktionen')
 						});
 					}
-				}
+				},
+				{
+					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
+					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
+					event: 'rowClick',
+					handler: (e, row) => {
+						if (this.dataPrintHonorar.multiselect) {
+							const selectedContract = row.getData().vertrag_id;
+							const status = row.getData().status;
+							const bezeichnung =	row.getData().bezeichnung;
+
+							this.toggleRowClick(selectedContract, status, bezeichnung);
+						}
+					}
+				},
 			],
 			statusNew: true,
 			formData: {	},
@@ -174,13 +187,19 @@ export default {
 				vertragsstatus_kurzbz: 'test',
 				datum: new Date(),
 			},
+			dataPrintHonorar: [],
+			triggeredData: [],
 			childData: {},
 			isFilterSet: false,
+			ma_uid: null,
+			clickedRows: [],
+			arraySelectedContracts: [],
 		}
 	},
 	watch: {
 		person_id() {
 			this.$refs.table.reloadTable();
+			this.arraySelectedContracts = [];
 			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + this.person_id);
 		},
 	},
@@ -218,7 +237,7 @@ export default {
 			const dataToSend = {
 				person_id: this.person_id,
 				formData: this.formData,
-				clickedRows: this.childData, //do I need all Data, maybe smaller array?
+				clickedRows: this.childData, //all data needed, maybe smaller array?
 			};
 
 			return this.endpoint
@@ -240,7 +259,7 @@ export default {
 				vertrag_id: vertrag_id,
 				person_id: this.person_id,
 				formData: this.formData,
-				clickedRows: this.childData, //do I need all Data, maybe smaller array?
+				clickedRows: this.childData,
 			};
 
 			return this.endpoint
@@ -421,44 +440,111 @@ export default {
 				this.$refs.table.tabulator.clearFilter("status");
 			}
 		},
+		//methods for functionality ADDON KU
+		printContract(){
+			this.getMitarbeiter_uid().then(()=> {
+
+				//check if at least 2 contracts chosen
+				if(this.arraySelectedContracts.length < 2) {
+					this.$fhcAlert.alertError('Bitte mindestens 2 Verträge auswählen');
+					return;
+				}
+
+				//check if status=="Genehmigt"
+				const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
+				if(statusNotGenehmigtExists) {
+					this.$fhcAlert.alertError('Alle Verträge müssen genehmigt sein');
+					return;
+				}
+
+				//build String to Print PDF
+				let vertragString = '';
+
+				this.arraySelectedContracts.forEach(element => {
+					vertragString += '&vertrag_id[]=' + element[0].toString();
+				});
+
+				let linkToPdf = this.dataPrintHonorar.link +
+						'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.ma_uid + vertragString + '&output=pdf&uid=' + this.ma_uid;
+				window.open(linkToPdf, '_blank');
+				});
+		},
+		getMitarbeiter_uid(){
+			return this.endpoint
+				.getMitarbeiter_uid(this.person_id)
+				.then(response => {
+					this.ma_uid = response.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		toggleRowClick(contractId, status, bezeichnung) {
+			const index = this.arraySelectedContracts.findIndex(
+				([id]) => id === contractId
+			);
+			if (index !== -1) {
+				this.arraySelectedContracts.splice(index, 1);
+			} else {
+				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
+			}
+		},
+		clearSelection(){
+			this.arraySelectedContracts = [];
+		}
 	},
 	created() {
 		Promise.all([
 			this.endpoint.getAllContractTypes(),
 			this.endpoint.getAllContractsNotAssigned2(this.person_id),
 			this.endpoint.getAllContractStati(),
+			this.$fhcApi.factory.vertraege.configPrintDocument()
 		])
-			.then(([result1, result2, result3]) => {
+			.then(([result1, result2, result3, result4]) => {
 				this.listContractTypes = result1.data;
 				this.listContractsUnassigned = result2.data;
 				this.listContractStati = result3.data;
+				this.dataPrintHonorar = result4.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
-		this.$nextTick(() => {
+		//TODO(Manu) check if necessary
+/*		this.$nextTick(() => {
 			this.$refs.table.tabulator.on("rowClick", (e, row) => {
 				this.contractSelected = row.getData();
 				console.log("selected Row ", this.contractSelected);
 			});
-		});
+		});*/
 		this.getFormattedDate();
 
 	},
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 	
+	<!--	injected print functionality for KU Linz (printHonorarvertrag)  -->
+	   <div v-if="arraySelectedContracts.length >= 2" class="container mt-2">
+		 
+		   <div v-for="item in arraySelectedContracts" :key="item[0]" class="row">
+				<div class="col-md-6">
+				  <input
+					class="form-control"
+					type="text"
+					:value="item[2] + ' | ' + item[1] + ' (ID: ' + item[0] + ')'"
+					aria-label="readonly input example"
+					readonly
+				  >
+				</div>
+			</div>
+			
+		<div class="d-flex">
+			<div class="ms-auto">
+				<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
+				<button type="button" class="btn btn-primary o" @click="printContract()">Honorarvertrag drucken</button>
+			</div>
+		</div>
+    </div>
 	
-	
-
-<!--	<div 
-		class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" 
-		style="max-height: 8rem; overflow: hidden;">
-	<img class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person_id">
-&lt;!&ndash;		<img class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
-			<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>&ndash;&gt;
-	</div>-->
-	
+	<hr> 
+		
 <!--	filter: open means no status abgerechnet yet-->
 		<div class="justify-content-end pb-3">
 			<form-input
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 5c92f75ad..f5a1c6f00 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -10,6 +10,21 @@ export default {
 		MitarbeiterDetails,
 		Vertraege
 	},
+	props: {
+		config: Object,
+		permissions: Object, //TODO(Manu)
+	},
+	provide() {
+		return {
+		//	activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'),
+		//	configGenerateAlias: this.config.generateAlias,
+		//	configChooseLayout: this.config.chooseLayout,
+			configDomain: this.config.domain,
+			//TODO(Manu) check permissions
+			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
+			hasAdminPermission: this.permissions['admin'],
+		}
+	},
 	data() {
 		//TODO(Manu) props for filter: actually not necessary
 		return {
@@ -30,6 +45,7 @@ export default {
 	template: `
 <div>
 	<div class="container-fluid overflow-hidden">
+<!--	DOM: {{configDomain}} alias {{configAlias}} layout {{configChooseLayout}}-->
 		<div class="row h-100">
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 			<!--<div class="col-md-12">-->

From 9c0baeacf2ba5d325239c83be080342015f21e1f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 21 Jan 2025 15:34:43 +0100
Subject: [PATCH 0038/1357] Add Logic Permission and Phrases

---
 .../controllers/Vertragsverwaltung.php        |   7 +-
 .../api/frontend/v1/vertraege/Config.php      |  10 +-
 .../api/frontend/v1/vertraege/Vertraege.php   |  43 +++---
 application/views/Vertragsverwaltung.php      |   2 -
 .../js/components/Vertraege/List/Details.js   |  36 +++--
 public/js/components/Vertraege/List/Status.js |  23 ++-
 .../Vertraege/MitarbeiterDetails.js           |   6 +-
 .../components/Vertraege/MitarbeiterHeader.js |  58 +++-----
 public/js/components/Vertraege/Vertraege.js   |  71 ++++-----
 .../Vertraege/Vertragsverwaltung.js           |  11 +-
 system/phrasesupdate.php                      | 140 ++++++++++++++++++
 11 files changed, 273 insertions(+), 134 deletions(-)

diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php
index 243f57118..6dd3ad797 100644
--- a/application/controllers/Vertragsverwaltung.php
+++ b/application/controllers/Vertragsverwaltung.php
@@ -4,12 +4,13 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Vertragsverwaltung extends Auth_Controller
 {
+
 	//TODO(Manu) Permissions
 	public function __construct()
 	{
 		$permissions = [];
 		$router = load_class('Router');
-		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
 		parent::__construct($permissions);
 
 		// Load Libraries
@@ -23,9 +24,7 @@ class Vertragsverwaltung extends Auth_Controller
 	{
 		$this->load->view('Vertragsverwaltung', [
 			'permissions' => [
-				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
-				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
+				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter','suid')
 			]
 		]);
 	}
diff --git a/application/controllers/api/frontend/v1/vertraege/Config.php b/application/controllers/api/frontend/v1/vertraege/Config.php
index 1da49cd78..25414e04f 100644
--- a/application/controllers/api/frontend/v1/vertraege/Config.php
+++ b/application/controllers/api/frontend/v1/vertraege/Config.php
@@ -29,16 +29,8 @@ class Config extends FHCAPI_Controller
 {
 	public function __construct()
 	{
-		// TODO(Manu): permissions
 		parent::__construct([
-			'printDocument' => ['admin:r', 'assistenz:r'],
-		]);
-
-
-		// Load Phrases
-		$this->loadPhrases([
-			'global',
-			'person',
+			'printDocument' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index b17d8b4e6..276a75de8 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -9,28 +9,27 @@ class Vertraege extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getAllVertraege' => ['admin:r', 'assistenz:r'],
-			'getAllContractsNotAssigned' => ['admin:r', 'assistenz:r'],
-			'getAllContractsAssigned' => ['admin:r', 'assistenz:r'],
-			'getAllContractTypes' =>  ['admin:r', 'assistenz:r'],
-			'getAllContractStati' =>  ['admin:r', 'assistenz:r'],
-			'getStatiOfContract' =>  ['admin:r', 'assistenz:r'],
-			'loadContract' => ['admin:r', 'assistenz:r'],
-			'loadContractStatus' => ['admin:r', 'assistenz:r'],
-			'updateContract' => self::PERM_LOGGED,
-			'addNewContract' => self::PERM_LOGGED,
-			'deleteContract' => self::PERM_LOGGED,
-			'insertContractStatus' => self::PERM_LOGGED,
-			'deleteContractStatus' => self::PERM_LOGGED,
-			'updateContractStatus' => self::PERM_LOGGED,
-			'deleteLehrauftrag' => self::PERM_LOGGED,
-			'deleteBetreuung' => self::PERM_LOGGED,
-			//TODO(Manu) Berechtigungen
-			'getMitarbeiter' => self::PERM_LOGGED,
-			'getHeader' => self::PERM_LOGGED,
-			'getPersonAbteilung' => self::PERM_LOGGED,
-			'getLeitungOrg' => self::PERM_LOGGED,
-			'getMitarbeiter_uid' => self::PERM_LOGGED,
+			'getAllVertraege' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsNotAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractTypes' =>  ['vertrag/mitarbeiter:r'],
+			'getAllContractStati' =>  ['vertrag/mitarbeiter:r'],
+			'getStatiOfContract' =>  ['vertrag/mitarbeiter:r'],
+			'loadContract' => ['vertrag/mitarbeiter:r'],
+			'loadContractStatus' => ['vertrag/mitarbeiter:r'],
+			'updateContract' =>['vertrag/mitarbeiter:w'],
+			'addNewContract' =>['vertrag/mitarbeiter:w'],
+			'deleteContract' =>['vertrag/mitarbeiter:w'],
+			'insertContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteContractStatus' =>['vertrag/mitarbeiter:w'],
+			'updateContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
+			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
+			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
+			'getMitarbeiter_uid' => ['vertrag/mitarbeiter:r'],
 			]);
 
 		//Load Models and Libraries
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index 0a663761f..988d5cdb8 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -32,9 +32,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 
 <?php
 $configArray = [
-	'generateAlias' => !defined('GENERATE_ALIAS_STUDENT') ? 'notDefined' : GENERATE_ALIAS_STUDENT,
 	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
-	'chooseLayout' => !defined('CHOOSE_LAYOUT') ? 'notDefined' : CHOOSE_LAYOUT,
 ];
 ?>
 
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index 2de19a06b..c11d178e7 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -11,6 +11,12 @@ export default {
 		CoreForm,
 		FormInput
 	},
+	inject: {
+		hasSchreibrechte: {
+			from: 'hasSchreibrechte',
+			default: false
+		},
+	},
 	props: {
 		person_id: {
 			type: [Number],
@@ -69,20 +75,30 @@ export default {
 							let type = cell.getData().type;
 							if (type == 'Lehrauftrag')
 							{
-								button.addEventListener(
-									'click',
-									() =>
-										this.actionDeleteLehrauftrag(cell.getData().vertrag_id, cell.getData().lehreinheit_id, cell.getData().mitarbeiter_uid)
-								);
+								if (!this.hasSchreibrechte) {
+									button.disabled = true;
+									button.classList.add('disabled');
+								} else {
+									button.addEventListener(
+										'click',
+										() =>
+											this.actionDeleteLehrauftrag(cell.getData().vertrag_id, cell.getData().lehreinheit_id, cell.getData().mitarbeiter_uid)
+									);
+								}
 							}
 
 							if (type == 'Betreuung')
 							{
-								button.addEventListener(
-									'click',
-									() =>
-										this.actionDeleteBetreuung(cell.getData().vertrag_id, cell.getData().projektarbeit_id,  cell.getData().betreuerart_kurzbz)
-								);
+								if (!this.hasSchreibrechte) {
+									button.disabled = true;
+									button.classList.add('disabled');
+								} else {
+									button.addEventListener(
+										'click',
+										() =>
+											this.actionDeleteBetreuung(cell.getData().vertrag_id, cell.getData().projektarbeit_id, cell.getData().betreuerart_kurzbz)
+									);
+								}
 							}
 
 							container.append(button);
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index f912cc11b..02ba09d1a 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -11,6 +11,12 @@ export default {
 		CoreForm,
 		FormInput
 	},
+	inject: {
+		hasSchreibrechte: {
+			from: 'hasSchreibrechte',
+			default: false
+		},
+	},
 	props: {
 		vertrag_id: {
 			type: [Number],
@@ -69,11 +75,16 @@ export default {
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('vertrag', 'deleteStatus');
-							button.addEventListener(
-								'click',
-								() =>
-									this.actionDeleteStatus(cell.getData().vertrag_id, cell.getData().vertragsstatus_kurzbz)
-							);
+							if (!this.hasSchreibrechte) {
+								button.disabled = true;
+								button.classList.add('disabled');
+							} else {
+								button.addEventListener(
+									'click',
+									() =>
+										this.actionDeleteStatus(cell.getData().vertrag_id, cell.getData().vertragsstatus_kurzbz)
+								);
+							}
 
 							container.append(button);
 
@@ -263,7 +274,7 @@ export default {
 				</core-form>
 
 				<template #footer>
-					<button type="button" class="btn btn-primary" @click="statusNew ? handleSubmit('new') : handleSubmit('edit')">{{$p.t('ui', 'speichern')}}</button>
+					<button type="button" class="btn btn-primary" :disabled="!this.hasSchreibrechte" @click="statusNew ? handleSubmit('new') : handleSubmit('edit')">{{$p.t('ui', 'speichern')}}</button>
 				</template>
 
 			</bs-modal>
diff --git a/public/js/components/Vertraege/MitarbeiterDetails.js b/public/js/components/Vertraege/MitarbeiterDetails.js
index 53f00afa8..1d09d160c 100644
--- a/public/js/components/Vertraege/MitarbeiterDetails.js
+++ b/public/js/components/Vertraege/MitarbeiterDetails.js
@@ -93,12 +93,12 @@ export default {
 					<p>
 						<strong class="text-muted">Email </strong>
 						 <span v-if="!headerData?.alias">
-							<a :href="'mailto:'+headerData?.uid+'@'+domain">{{  headerData.uid }}@{{ domain }}</a>
+							<a :href="'mailto:'+headerData?.uid+'@'+domain">{{headerData.uid}}@{{domain}}</a>
 						</span>
 						<span v-if="headerData?.alias">
-							<a :href="'mailto:'+headerData?.alias+'@'+domain">{{  headerData.alias }}@{{ domain }}</a>
+							<a :href="'mailto:'+headerData?.alias+'@'+domain">{{headerData.alias}}@{{domain}}</a>
 						</span>
-						<span v-if="headerData?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW</strong> {{  headerData?.telefonklappe }}</span>
+						<span v-if="headerData?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerData?.telefonklappe}}</span>
 					</p>
 		
 				</div>
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 5c6c3330b..76f3337f9 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -78,53 +78,39 @@ export default {
 					handler: this.rowSelectionChanged
 				},
 		{
-/*					event: 'tableBuilt',
+					event: 'tableBuilt',
 					handler: async() => {
 
-						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
+						await this.$p.loadCategory(['person', 'global', 'vertrag']);
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('ui', 'bezeichnung')
+						cm.getColumnByField('person_id').component.updateDefinition({
+							title: this.$p.t('person', 'person_id')
 						});
-						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'lehreinheit_id')
+
+						cm.getColumnByField('nachname').component.updateDefinition({
+							title: this.$p.t('person', 'nachname')
 						});
-						cm.getColumnByField('betrag').component.updateDefinition({
-							title: this.$p.t('ui', 'betrag')
+						cm.getColumnByField('vorname').component.updateDefinition({
+							title: this.$p.t('person', 'vorname')
 						});
-						cm.getColumnByField('status').component.updateDefinition({
-							title: this.$p.t('global', 'status')
+						cm.getColumnByField('aktiv').component.updateDefinition({
+							title: this.$p.t('global', 'aktiv')
 						});
-						cm.getColumnByField('vertragstyp_bezeichnung').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragstyp')
+						cm.getColumnByField('format_gebdatum').component.updateDefinition({
+							title: this.$p.t('person', 'geburtsdatum')
 						});
-						cm.getColumnByField('format_vertragsdatum').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsdatum')
+						cm.getColumnByField('unternehmen').component.updateDefinition({
+							title: this.$p.t('person', 'firma')
 						});
-						cm.getColumnByField('vertragsdatum').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsdatum_iso')
+						cm.getColumnByField('vertragsarten').component.updateDefinition({
+							title: this.$p.t('vertrag', 'vertragsarten')
 						});
-						cm.getColumnByField('vertragsstunden').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsstunden')
+						cm.getColumnByField('ids').component.updateDefinition({
+							title: this.$p.t('vertrag', 'idsDienstverhaeltnisse')
 						});
-						cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
-						});
-						cm.getColumnByField('vertrag_id').component.updateDefinition({
-							title: this.$p.t('ui', 'vertrag_id')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('isabgerechnet').component.updateDefinition({
-							title: this.$p.t('vertrag', 'abgerechnet')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
-					} */
+					}
 				}
 			],
 			selectedPerson: null,
@@ -147,14 +133,14 @@ export default {
 	},
 	template: `
 	<div class="core-mitarbeiter h-100 d-flex flex-column">
-		<h4>Vertragsverwaltung</h4>
+		<h4>{{$p.t('vertrag', 'vertragsverwaltung')}}</h4>
 		
 <!--	filter: show only active employees-->
 		<div class="justify-content-end py-3">
 			<form-input
 				container-class="form-switch"
 				type="checkbox"
-				label="nur aktive Mitarbeiter:innen anzeigen"
+				:label="$p.t('vertrag/nurAktiveMaAnzeigen')"
 				v-model="isFilterSet"
 				@change="onSwitchChange"
 				>
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 60705d20a..d4f2f783b 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -21,6 +21,10 @@ export default {
 		cisRoot: {
 			from: 'cisRoot'
 		},
+		hasSchreibrechte: {
+			from: 'hasSchreibrechte',
+			default: false
+		},
 	},
 	props: {
 		endpoint: {
@@ -94,11 +98,17 @@ export default {
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('vertrag', 'deleteVertrag');
-							button.addEventListener(
-								'click',
-								() =>
-									this.actionDeleteContract(cell.getData().vertrag_id)
-							);
+
+							if (!this.hasSchreibrechte) {
+								button.disabled = true;
+								button.classList.add('disabled');
+							} else {
+								button.addEventListener(
+									'click',
+									() =>
+										this.actionDeleteContract(cell.getData().vertrag_id)
+								);
+							}
 							container.append(button);
 
 							return container;
@@ -443,17 +453,16 @@ export default {
 		//methods for functionality ADDON KU
 		printContract(){
 			this.getMitarbeiter_uid().then(()=> {
-
 				//check if at least 2 contracts chosen
 				if(this.arraySelectedContracts.length < 2) {
-					this.$fhcAlert.alertError('Bitte mindestens 2 Verträge auswählen');
+					this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertMindestensZweiVertraege'));
 					return;
 				}
 
 				//check if status=="Genehmigt"
 				const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
 				if(statusNotGenehmigtExists) {
-					this.$fhcAlert.alertError('Alle Verträge müssen genehmigt sein');
+					this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertOnlyApprovedContracts'));
 					return;
 				}
 
@@ -507,42 +516,38 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
-		//TODO(Manu) check if necessary
-/*		this.$nextTick(() => {
+		//necessary for reloading components Status and Details
+		this.$nextTick(() => {
 			this.$refs.table.tabulator.on("rowClick", (e, row) => {
 				this.contractSelected = row.getData();
-				console.log("selected Row ", this.contractSelected);
 			});
-		});*/
+		});
 		this.getFormattedDate();
-
 	},
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 	
-	<!--	injected print functionality for KU Linz (printHonorarvertrag)  -->
-	   <div v-if="arraySelectedContracts.length >= 2" class="container mt-2">
+		<!--	injected print functionality for KU Linz (printHonorarvertrag)  -->
+	   <template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
 		 
-		   <div v-for="item in arraySelectedContracts" :key="item[0]" class="row">
-				<div class="col-md-6">
-				  <input
-					class="form-control"
-					type="text"
-					:value="item[2] + ' | ' + item[1] + ' (ID: ' + item[0] + ')'"
-					aria-label="readonly input example"
-					readonly
-				  >
-				</div>
+		   <div v-for="item in arraySelectedContracts" :key="item[0]">
+			  <input
+				class="form-control"
+				type="text"
+				:value="item[2] + ' | ' + item[1] + ' (ID: ' + item[0] + ')'"
+				aria-label="readonly input example"
+				readonly
+			  >
 			</div>
-			
-		<div class="d-flex">
-			<div class="ms-auto">
+		</template>
+		
+		<template v-if="arraySelectedContracts.length >= 2" class="d-flex">
+			<div class="ms-auto mt-2">
 				<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
-				<button type="button" class="btn btn-primary o" @click="printContract()">Honorarvertrag drucken</button>
+				<button :disabled="!this.hasSchreibrechte" type="button" class="btn btn-primary" @click="printContract()">{{$p.t('vertrag', 'printHonorarvertrag')}}</button>
 			</div>
-		</div>
-    </div>
-	
+		</template>
+
 	<hr> 
 		
 <!--	filter: open means no status abgerechnet yet-->
@@ -698,7 +703,7 @@ export default {
 				
 				<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
-					<button type="button" class="btn btn-primary" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('vertrag', 'vertragErstellen')}}</button>
+					<button type="button" class="btn btn-primary" :disabled="!this.hasSchreibrechte" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('vertrag', 'vertragErstellen')}}</button>
 				</template>
 			</bs-modal>
 		</core-form>
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index f5a1c6f00..33e276f3c 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -16,13 +16,8 @@ export default {
 	},
 	provide() {
 		return {
-		//	activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung'),
-		//	configGenerateAlias: this.config.generateAlias,
-		//	configChooseLayout: this.config.chooseLayout,
 			configDomain: this.config.domain,
-			//TODO(Manu) check permissions
-			hasSchreibrechtAss: this.permissions['assistenz_schreibrechte'],
-			hasAdminPermission: this.permissions['admin'],
+			hasSchreibrechte: this.permissions['vertragsverwaltung_schreibrechte'],
 		}
 	},
 	data() {
@@ -45,10 +40,8 @@ export default {
 	template: `
 <div>
 	<div class="container-fluid overflow-hidden">
-<!--	DOM: {{configDomain}} alias {{configAlias}} layout {{configChooseLayout}}-->
 		<div class="row h-100">
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
-			<!--<div class="col-md-12">-->
 				<vertical-split>
 					<template #top>	
 						<MitarbeiterHeader :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
@@ -57,7 +50,7 @@ export default {
 						<div class="col" v-if="person_id!=null">
 							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
 							<h5>Verträge</h5>
-							<Vertraege :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id" />
+							<Vertraege :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
 						</div>
 					<template>
 				</vertical-split>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 252baa03e..f5eb6bc05 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31767,6 +31767,146 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'nurAktiveMaAnzeigen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur aktive Mitarbeiter:innen anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show only active employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'printHonorarvertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Honorarvertrag drucken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Print fee agreement',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'alertMindestensZweiVertraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte mindestens 2 Verträge auswählen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select at least 2 contracts!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'alertOnlyApprovedContracts',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Verträge müssen genehmigt sein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All contracts must be approved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsarten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsarten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Types of Contracts',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'idsDienstverhaeltnisse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'IDs Dienstverhältnis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'IDs employment relationship',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 0d0071e8bf3e295c7e888801971de3c075fa250b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Jan 2025 07:57:39 +0100
Subject: [PATCH 0039/1357] refactoring and codesniff

---
 .../controllers/Vertragsverwaltung.php        |   4 +-
 .../api/frontend/v1/vertraege/Config.php      |   8 +-
 .../api/frontend/v1/vertraege/Vertraege.php   |  53 ++----
 .../models/ressource/Mitarbeiter_model.php    | 152 +++++++++---------
 public/js/api/vertraege/person.js             |   2 +-
 .../Vertraege/MitarbeiterDetails.js           |   7 +-
 public/js/components/Vertraege/Vertraege.js   |   6 +-
 7 files changed, 94 insertions(+), 138 deletions(-)

diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php
index 6dd3ad797..bcd00abb1 100644
--- a/application/controllers/Vertragsverwaltung.php
+++ b/application/controllers/Vertragsverwaltung.php
@@ -4,8 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Vertragsverwaltung extends Auth_Controller
 {
-
-	//TODO(Manu) Permissions
 	public function __construct()
 	{
 		$permissions = [];
@@ -24,7 +22,7 @@ class Vertragsverwaltung extends Auth_Controller
 	{
 		$this->load->view('Vertragsverwaltung', [
 			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter','suid')
+				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
 			]
 		]);
 	}
diff --git a/application/controllers/api/frontend/v1/vertraege/Config.php b/application/controllers/api/frontend/v1/vertraege/Config.php
index 25414e04f..8ff241914 100644
--- a/application/controllers/api/frontend/v1/vertraege/Config.php
+++ b/application/controllers/api/frontend/v1/vertraege/Config.php
@@ -34,11 +34,12 @@ class Config extends FHCAPI_Controller
 		]);
 	}
 
-	public function printDocument() {
-
+	public function printDocument()
+	{
 		$params = [];
 
-		Events::trigger('multiActionPrintHonorarvertrag',
+		Events::trigger(
+			'multiActionPrintHonorarvertrag',
 			// passing $menu per reference
 			function & () use (&$menu) {
 				return $menu;
@@ -48,5 +49,4 @@ class Config extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($menu[0]);
 	}
-
 }
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 276a75de8..b593a1f3e 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -670,17 +670,9 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->Mitarbeitermodel->getPersonAbteilung($person_id);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result))
-		{
-			//TODO(Manu) rewrite better
-			return $this->terminateWithSuccess("no benutzerdata", self::ERROR_TYPE_GENERAL);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		}
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(current($data));
 	}
 
 	public function getLeitungOrg($oekurzbz)
@@ -689,18 +681,9 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
 
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result))
-		{
-			//TODO(Manu) rewrite better
-			return $this->terminateWithSuccess("no benutzerdata", self::ERROR_TYPE_GENERAL);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		//	return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(current($data));
 	}
 
 	public function getHeader($person_id)
@@ -709,38 +692,20 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->Mitarbeitermodel->getHeader($person_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' => 'personID']), self::ERROR_TYPE_GENERAL);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		return $this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess(current($data));
 	}
 
 
-	public function getMitarbeiter_uid($person_id)
+	public function getMitarbeiterUid($person_id)
 	{
 		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
 
 		$result = $this->Mitarbeitermodel->getMitarbeiter_uid($person_id);
 
-		if (isError($result))
-		{
-			//TODO(Manu) check ErrorLogic
-			return $this->terminateWithSuccess($result);
-			//return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		if (!hasData($result))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'personID']), self::ERROR_TYPE_GENERAL);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		return $this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($data);
 	}
-
-
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 1b3c8834a..f7951083c 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -103,31 +103,32 @@ class Mitarbeiter_model extends DB_Model
 	 *
 	 * @return array
 	 */
-	public function getPersonenWithContractDetails($person_id=null)
+	public function getPersonenWithContractDetails($person_id = null)
 	{
 		$qry = "
-		SELECT
-			 b.uid , p.person_id,
-			p.vorname, p.nachname,
-			TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum,
-			COALESCE(b.alias, b.uid) AS email, 
-			STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
-			STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
-			STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
-			b.aktiv
---			CASE WHEN b.aktiv=true THEN 'aktiv'
---			 	 ELSE 'nicht aktiv'
---				 END as status //not working in header filter	*/	  
-		    FROM 
-			    hr.tbl_dienstverhaeltnis d 
-		    JOIN 
-			    public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid 
-		    JOIN 
-			    public.tbl_person p ON p.person_id = b.person_id 
-		    JOIN
-			    public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-		    JOIN
-			    hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz ";
+			SELECT
+				 b.uid , p.person_id,
+				p.vorname, p.nachname,
+				TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum,
+				COALESCE(b.alias, b.uid) AS email,
+				STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
+				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
+				STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
+				b.aktiv
+	--			CASE WHEN b.aktiv=true THEN 'aktiv'
+	--			 	 ELSE 'nicht aktiv'
+	--				 END as status //not working in header filter	*/  
+				FROM
+					hr.tbl_dienstverhaeltnis d
+				JOIN
+					public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+				JOIN
+					public.tbl_person p ON p.person_id = b.person_id
+				JOIN
+					public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+				JOIN
+					hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			    ";
 
 		if($person_id)
 		{
@@ -135,12 +136,11 @@ class Mitarbeiter_model extends DB_Model
 		}
 
 		$qry.= " 
-		GROUP BY 
-    		b.uid, p.person_id, p.vorname, p.nachname, b.alias
-		 ORDER BY
-			    p.nachname, p.vorname; ";
-
-
+			GROUP BY
+				b.uid, p.person_id, p.vorname, p.nachname, b.alias
+			 ORDER BY
+					p.nachname, p.vorname;
+			    ";
 
 		$params = array($person_id);
 
@@ -154,56 +154,47 @@ class Mitarbeiter_model extends DB_Model
 	 *
 	 * @return Array benutzerfunktionsdata
 	 */
-	function getPersonAbteilung($person_id)
+	public function getPersonAbteilung($person_id)
 	{
-		//TODO(Manu) use function getMitarbeiter_uid
-		$qry = "
-        SELECT tbl_benutzer.uid
-        FROM tbl_mitarbeiter
-            JOIN tbl_benutzer ON CAST(tbl_mitarbeiter.mitarbeiter_uid AS TEXT) = CAST(tbl_benutzer.uid AS TEXT)
-            JOIN tbl_person USING (person_id)
-        WHERE tbl_person.person_id = ?
-    ";
-		$result = $this->execQuery($qry, [$person_id]);
-
-		$data = getData($result);
-		if (empty($data)) {
-			return null; // No UID found
-		}
-
-		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
-
+		$uid = $this->getMitarbeiterUid($person_id);
 		if (!$uid) {
-			return null; // UID extraction failed
+			return null;
 		}
+		$qry = "
+			SELECT
+				bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
+				bf.updatevon, bf.insertamum, bf.insertvon, bf.ext_id, bf.semester, bf.oe_kurzbz,
+				bf.datum_von, bf.datum_bis, bf.bezeichnung, bf.wochenstunden,
+				oe.oe_kurzbz, oe.oe_parent_kurzbz, oe.bezeichnung,
+				oe.organisationseinheittyp_kurzbz, oe.aktiv, oe.mailverteiler,
+				oe.freigabegrenze, oe.kurzzeichen, oe.lehre, oe.standort,
+				oe.warn_semesterstunden_frei, oe.warn_semesterstunden_fix, oe.standort_id
+			FROM tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+			WHERE uid = ?
+				AND funktion_kurzbz = 'oezuordnung'
+				AND datum_von <= NOW()
+				AND (datum_bis IS NULL OR datum_bis >= NOW())
+		";
+		$result = $this->execQuery($qry, [$uid]);
 
-		// Second Query
-		$qry2 = "
-        SELECT
-            bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
-            bf.updatevon, bf.insertamum, bf.insertvon, bf.ext_id, bf.semester, bf.oe_kurzbz, 
-            bf.datum_von, bf.datum_bis, bf.bezeichnung, bf.wochenstunden,
-            oe.oe_kurzbz, oe.oe_parent_kurzbz, oe.bezeichnung, 
-            oe.organisationseinheittyp_kurzbz, oe.aktiv, oe.mailverteiler, 
-            oe.freigabegrenze, oe.kurzzeichen, oe.lehre, oe.standort, 
-            oe.warn_semesterstunden_frei, oe.warn_semesterstunden_fix, oe.standort_id
-        FROM tbl_benutzerfunktion bf
-        JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
-        WHERE uid = ? 
-            AND funktion_kurzbz = 'oezuordnung'
-            AND datum_von <= NOW() 
-            AND (datum_bis IS NULL OR datum_bis >= NOW())
-    ";
-		$result2 = $this->execQuery($qry2, [$uid]);
-
-		return $result2;
+		return $result;
 	}
 
-	function getLeitungOrg($oe_kurzbz)
+	/**
+	 * get Leitung / Vorgesetzten of current OE
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata / benutzerfunktionsdata
+	 */
+	public function getLeitungOrg($oe_kurzbz)
 	{
 		$qry = "
-            SELECT bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
-                p.person_id, p.vorname,p.nachname,p.titelpre,p.titelpost
+            SELECT bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,
+                   bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,
+                   bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
+                   p.person_id, p.vorname,p.nachname,p.titelpre,p.titelpost
             FROM public.tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
             JOIN public.tbl_benutzer b USING (uid) JOIN public.tbl_mitarbeiter ma ON(b.uid=ma.mitarbeiter_uid)
             JOIN public.tbl_person p  USING(person_id)
@@ -214,7 +205,14 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry, array($oe_kurzbz));
 	}
 
-	function getHeader($person_id)
+	/**
+	 * get persondata for person_id
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata
+	 */
+	public function getHeader($person_id)
 	{
 		$qry = "
 			SELECT
@@ -371,10 +369,8 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry);
 	}
 
-	public function getMitarbeiter_uid($person_id){
-		//TODO(Manu) refactor function
-		//and use in function getPersonAbteilung
-		//check function in Vertraege.php
+	public function getMitarbeiterUid($person_id)
+	{
 		$qry = "
         SELECT tbl_benutzer.uid
         FROM tbl_mitarbeiter
@@ -388,10 +384,6 @@ class Mitarbeiter_model extends DB_Model
 		if (empty($data)) {
 			return null; // No UID found
 		}
-		//else
-		//	$data = current($data);
-
-	//	$uid = $data->uid;
 
 		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
 		return $uid;
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index b4c03b696..01ba309f0 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -62,7 +62,7 @@ export default {
 	getLeitungOrg(oekurzbz){
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
 	},
-	getMitarbeiter_uid(person_id){
+	getMitarbeiterUid(person_id){
 		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiter_uid/' + person_id);
 	},
 
diff --git a/public/js/components/Vertraege/MitarbeiterDetails.js b/public/js/components/Vertraege/MitarbeiterDetails.js
index 1d09d160c..26f95d2bf 100644
--- a/public/js/components/Vertraege/MitarbeiterDetails.js
+++ b/public/js/components/Vertraege/MitarbeiterDetails.js
@@ -52,7 +52,8 @@ export default {
 			return this.$fhcApi.factory.vertraege.person
 				.getHeader(person_id)
 				.then(result => {
-					this.headerData = result.data[0];
+					this.headerData = result.data;
+
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -60,7 +61,7 @@ export default {
 			return this.$fhcApi.factory.vertraege.person
 				.getPersonAbteilung(person_id)
 				.then(result => {
-					this.departmentData = result.data[0];
+					this.departmentData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -68,7 +69,7 @@ export default {
 			return this.$fhcApi.factory.vertraege.person
 				.getLeitungOrg(oekurzbz)
 				.then(result => {
-					this.leitungData = result.data[0];
+					this.leitungData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index d4f2f783b..67a779638 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -452,7 +452,7 @@ export default {
 		},
 		//methods for functionality ADDON KU
 		printContract(){
-			this.getMitarbeiter_uid().then(()=> {
+			this.getMitarbeiterUid().then(()=> {
 				//check if at least 2 contracts chosen
 				if(this.arraySelectedContracts.length < 2) {
 					this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertMindestensZweiVertraege'));
@@ -478,9 +478,9 @@ export default {
 				window.open(linkToPdf, '_blank');
 				});
 		},
-		getMitarbeiter_uid(){
+		getMitarbeiterUid(){
 			return this.endpoint
-				.getMitarbeiter_uid(this.person_id)
+				.getMitarbeiterUid(this.person_id)
 				.then(response => {
 					this.ma_uid = response.data;
 				})

From 295e2aa3e54cc33e9eb05b5a717a5d7b78c5ed91 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Jan 2025 11:17:09 +0100
Subject: [PATCH 0040/1357] adaptions styling

---
 application/views/Vertragsverwaltung.php      |  2 +-
 public/css/Vertragsverwaltung.css             | 16 ++++++++++++++++
 .../js/components/Vertraege/List/Details.js   |  5 +++--
 public/js/components/Vertraege/List/Status.js |  4 ++--
 .../components/Vertraege/MitarbeiterHeader.js |  2 +-
 .../Vertraege/Vertragsverwaltung.js           | 19 +++++++++----------
 6 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 public/css/Vertragsverwaltung.css

diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index 988d5cdb8..d4802398e 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -16,7 +16,7 @@ $includesArray = array(
 	'customCSSs' => [
 		'public/css/components/vue-datepicker.css',
 		'public/css/components/primevue.css',
-/*		'public/css/Vertragsverwaltung.css'*/
+		'public/css/Vertragsverwaltung.css'
 	],
 	'customJSs' => [
 		#'vendor/npm-asset/primevue/tree/tree.min.js',
diff --git a/public/css/Vertragsverwaltung.css b/public/css/Vertragsverwaltung.css
new file mode 100644
index 000000000..7f28d7335
--- /dev/null
+++ b/public/css/Vertragsverwaltung.css
@@ -0,0 +1,16 @@
+@import './components/verticalsplit.css';
+
+html {
+  font-size: .875em;
+}
+.vv{
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+}
+.vv> header {
+	flex: 0 0 auto;
+}
+.vv> div {
+	flex: 1 1 auto;
+}
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index c11d178e7..60ec5110e 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -194,9 +194,10 @@ export default {
 	},
 	template: `
 
-	<div class="ore-contracts-details h-50 d-flex flex-column w-100">
+	<div class="ore-contracts-details h-50 d-flex flex-column w-100 mt-2">
+<!--	<div class="core-contracts-details vv">-->
 	<br>		
-		<h4>{{$p.t('vertrag', 'vertragDetails')}}</h4>
+		<h5>{{$p.t('vertrag', 'vertragDetails')}}</h5>
 	
 		<core-filter-cmpt
 			ref="table"
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 02ba09d1a..3c05daa66 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -214,9 +214,9 @@ export default {
 		}
 	},
 	template: `
-	<div class="core-contracts-status h-50 d-flex flex-column w-100">
+	<div class="core-contracts-status h-50 d-flex flex-column w-100 mt-2">
 		<br>
-		<h4>{{$p.t('vertrag', 'vertragStatus')}}</h4>
+		<h5>{{$p.t('vertrag', 'vertragStatus')}}</h5>
 	
 		<core-filter-cmpt
 			ref="table"
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 76f3337f9..84d8e03b8 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -132,7 +132,7 @@ export default {
 		},
 	},
 	template: `
-	<div class="core-mitarbeiter h-100 d-flex flex-column">
+	<div class="core-mitarbeiter-header">
 		<h4>{{$p.t('vertrag', 'vertragsverwaltung')}}</h4>
 		
 <!--	filter: show only active employees-->
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 33e276f3c..85f183584 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -1,6 +1,6 @@
 import MitarbeiterHeader from "./MitarbeiterHeader.js";
 import MitarbeiterDetails from "./MitarbeiterDetails.js";
-import Vertraege from "./Vertraege.js";
+import VertraegeMitarbeiter from "./Vertraege.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
 
 export default {
@@ -8,11 +8,11 @@ export default {
 		VerticalSplit,
 		MitarbeiterHeader,
 		MitarbeiterDetails,
-		Vertraege
+		VertraegeMitarbeiter
 	},
 	props: {
 		config: Object,
-		permissions: Object, //TODO(Manu)
+		permissions: Object,
 	},
 	provide() {
 		return {
@@ -38,24 +38,23 @@ export default {
 		}
 	},
 	template: `
-<div>
+<div class="vv">
 	<div class="container-fluid overflow-hidden">
-		<div class="row h-100">
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
-				<vertical-split>
+				<vertical-split ref="vsplit">
 					<template #top>	
-						<MitarbeiterHeader :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
+	<!--					<div class="d-flex flex-column" style="height: 100%;">-->
+							<MitarbeiterHeader :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
+<!--						</div>-->
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">
 							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
-							<h5>Verträge</h5>
-							<Vertraege :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
+							<VertraegeMitarbeiter :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
 						</div>
 					<template>
 				</vertical-split>
 			</main>	
-			</div>
 		</div>
 	</div>
 	`

From 39ada202774fbb77811a2cd54bd96f2a046917aa Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 22 Jan 2025 15:26:25 +0100
Subject: [PATCH 0041/1357] Electronic Onboarding: added phrases

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7f030e62b..e177274ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31307,26 +31307,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'onboarding',
-		'phrase' => 'bewerbungVerifizierung',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Verifizierung Ihrer Bewerbung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Application verification',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'onboarding',
@@ -31654,6 +31634,88 @@ If there is no further contact or enrolment, your data will be deleted after thr
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'zustimmungDatenuebermittlung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Können in Ausnahmefällen die Zugangsvoraussetzungen von der FH Technikum Wien nicht abschließend abgeklärt werden, erteile ich die Zustimmung, dass die FH Technikum Wien die Dokumente zur Überprüfung an die zuständigen Behörden weiterleiten kann.<br>
+Ich wurde darüber informiert, dass ich nicht verpflichtet bin, der Übermittlung meiner Daten zuzustimmen. Diese Zustimmung ist allerdings notwendig, um die Bewerbung berücksichtigen zu können.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If in exceptional cases the admission requirements can not be finally clarified by the UAS Technikum Wien, I give my consent that the UAS Technikum Wien can forward the documents to the competent authorities for verification.<br>
+I have been informed that I am under no obligation to consent to the transmission of my data. However, this consent is necessary in order for the application to be considered.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'zustimmungDatenschutzerklaerung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich habe die Datenschutzerklärung zu Kenntnis genommen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I have taken note of the privacy policy.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bitteDatenuebermittlungZustimmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie müssen der Datenübermittlung zustimmen, um Ihre Bewerbung abschicken zu können.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You have to consent the transmission of your data to send the application.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'onboarding',
+		'phrase' => 'bitteDatenschutzerklaerungZustimmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie müssen der Datenschutzerklärung zustimmen, um Ihre Bewerbung abschicken zu können.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You have to consent to the privacy statement to send the application.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From 7fbff20dd97d66a15cd0242214c96616530fe924 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Feb 2025 14:49:41 +0100
Subject: [PATCH 0042/1357] new Tab Gruppen

---
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Favorites.php         |   2 +-
 .../api/frontend/v1/stv/Gruppen.php           |  81 ++++++++
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/group.js                    |   8 +
 .../js/components/Stv/Studentenverwaltung.js  |   1 +
 .../Studentenverwaltung/Details/Gruppen.js    |  19 ++
 .../Details/Gruppen/Gruppen.js                | 182 ++++++++++++++++++
 system/phrasesupdate.php                      |  83 ++++++++
 9 files changed, 381 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Gruppen.php
 create mode 100644 public/js/api/stv/group.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c28c49485..12cd77048 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,10 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		$result['groups'] = [
+			'title' => $this->p->t('stv', 'tab_groups'),
+			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
+		];
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index 8d7a6cd14..b8fe6f3d7 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -48,7 +48,7 @@ class Favorites extends FHCAPI_Controller
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data['stv_favorites']);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
 	public function set()
diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
new file mode 100644
index 000000000..39c5efe21
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -0,0 +1,81 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Gruppen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getGruppen' => ['admin:r', 'assistenz:r'],
+			'deleteGruppe' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'gruppenmanagement'
+		]);
+
+		// Load models
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+	}
+
+	public function getGruppen($student_uid)
+	{
+		$this->BenutzergruppeModel ->addSelect('gruppe_kurzbz');
+		$this->BenutzergruppeModel ->addSelect('bezeichnung');
+		$this->BenutzergruppeModel ->addSelect('generiert');
+		$this->BenutzergruppeModel ->addSelect('uid');
+		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
+		$this->BenutzergruppeModel ->addSelect('public.tbl_benutzergruppe.insertvon');
+		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
+
+		$result = $this->BenutzergruppeModel->loadWhere(
+			array(
+				'uid' => $student_uid
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteGruppe()
+	{
+		$student_uid = $this->input->post('id');
+		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
+
+		//Validate if automatic group generation
+		$result = $this->GruppeModel-> loadWhere(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz
+			)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+		$generation = current($data);
+
+		if($generation->generiert)
+		{
+			$this->terminateWithError($this->p->t('gruppenmanagement', 'error_deleteGeneratedGroups'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BenutzergruppeModel->delete(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz,
+				'uid' => $student_uid
+				)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($data);
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 14fcc6661..8b14beb14 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -2,12 +2,14 @@ import verband from './stv/verband.js';
 import students from './stv/students.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
+import group from './stv/group.js';
 
 export default {
 	verband,
 	students,
 	filter,
 	konto,
+	group,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/group.js b/public/js/api/stv/group.js
new file mode 100644
index 000000000..af6e6e122
--- /dev/null
+++ b/public/js/api/stv/group.js
@@ -0,0 +1,8 @@
+export default {
+	getGruppen(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/Gruppen/getGruppen/' + params.id);
+	},
+	deleteGroup(params) {
+		return this.$fhcApi.post('api/frontend/v1/stv/Gruppen/deleteGruppe/', params);
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 8779e4bf1..eaa253c2c 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -57,6 +57,7 @@ export default {
 			hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'],
 			hasPermissionRtAufsicht: this.permissions['lehre/reihungstestAufsicht'],
 			lists: this.lists,
+			currentSemester: Vue.computed(() => this.studiensemesterKurzbz),
 			defaultSemester: this.defaultSemester,
 			$reloadList: () => {
 				this.$refs.stvList.reload();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
new file mode 100644
index 000000000..1c7c47d6b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
@@ -0,0 +1,19 @@
+import GruppenList from './Gruppen/Gruppen.js';
+
+export default {
+	components: {
+		GruppenList
+	},
+	props: {
+		modelValue: Object
+	},
+	methods: {
+		reload() {
+			this.$refs.gruppen.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-gruppen h-100 d-flex flex-column">
+		<gruppen-list ref="gruppen" :student="modelValue"></gruppen-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
new file mode 100644
index 000000000..6a657a793
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -0,0 +1,182 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.group.getGruppen,
+				ajaxParams: () => {
+					return {
+						id: this.student.uid
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				initialFilter: [
+					{field: "uid", type: "=", value: this.student.uid},
+					[
+						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
+						{field: "insertvon", type: "=", value: "mlists_generate"}
+					]
+				],
+				columns: [
+					{title: "Gruppe", field: "gruppe_kurzbz"},
+					{title: "Bezeichnung", field: "bezeichnung"},
+					{title: "Semester", field: "studiensemester_kurzbz"},
+					{
+						title: "automatisch generiert",
+						field: "generiert",
+						formatter: "tickCross",
+						hozAlign: "center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title: "UID", field: "uid"},
+					{title: "InsertVon", field: "insertvon", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							const container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							const data = cell.getData();
+
+							const button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeleteGroup(data.gruppe_kurzbz)
+							);
+							if (data.generiert)
+								button.disabled = true;
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				height: 'auto',
+				selectable: true,
+				index: 'group_id',
+				persistenceID: 'stv-details-gruppe'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'gruppenmanagement']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('gruppe_kurzbz').component.updateDefinition({
+							title: this.$p.t('gruppenmanagement', 'gruppe')
+						});
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung')
+						});
+
+						cm.getColumnByField('generiert').component.updateDefinition({
+							title: this.$p.t('gruppenmanagement', 'automatisch_generiert')
+						});
+
+						cm.getColumnByField('uid').component.updateDefinition({
+							title: this.$p.t('ui', 'student_uid')
+						});
+
+						//Interference with Filter if not commented out
+						/*
+						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});*/
+
+					}
+				}
+			],
+		}
+	},
+	methods: {
+		actionDeleteGroup(gruppe_kurzbz) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? gruppe_kurzbz
+					: Promise.reject({handled: true}))
+				.then(this.deleteGroup)
+				.catch(this.$fhcAlert.handleSystemError);
+
+		},
+		deleteGroup(gruppe_kurzbz) {
+			const group_id = {
+				id: this.student.uid,
+				gruppe_kurzbz: gruppe_kurzbz
+			};
+
+			return this.$fhcApi.factory.stv.group.deleteGroup(group_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+	},
+	watch: {
+		currentSemester(newVal) {
+			if (newVal) {
+
+				this.$refs.table.tabulator.clearFilter(); // Clear old filters
+
+				this.$refs.table.tabulator.setFilter([
+					{field: "uid", type: "=", value: this.student.uid},
+					[
+						{field: "studiensemester_kurzbz", type: "=", value: newVal},
+						{field: "insertvon", type: "=", value: "mlists_generate"}
+					]
+				]);
+
+
+			}
+		},
+		student() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	template: `
+				<div class="stv-details-gruppen h-100 pb-3">
+					<h5>{{$p.t('stv', 'tab_groups')}}</h5>
+
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+					>
+					</core-filter-cmpt>
+				</div>
+			`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 746c24da3..160db2853 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37297,7 +37297,90 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	//////////// FHC4 Phrases Gruppen Start ////////////
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_groups',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'gruppe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'automatisch_generiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'automatisch generiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'automatically generated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'error_deleteGeneratedGroups',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Automatisch generierte Gruppenzuordnungen können nicht gelöscht werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Automatically generated group assignments cannot be deleted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
+	//////////// FHC4 Phrases Gruppen End ////////////
+
 );
 
 

From 6eb9c2ac223e34fe6bd5e89310615e3822e58bf2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Feb 2025 14:57:35 +0100
Subject: [PATCH 0043/1357] update filtering

---
 application/controllers/api/frontend/v1/stv/Gruppen.php      | 1 -
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
index 39c5efe21..c30816f2a 100644
--- a/application/controllers/api/frontend/v1/stv/Gruppen.php
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -33,7 +33,6 @@ class Gruppen extends FHCAPI_Controller
 		$this->BenutzergruppeModel ->addSelect('generiert');
 		$this->BenutzergruppeModel ->addSelect('uid');
 		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
-		$this->BenutzergruppeModel ->addSelect('public.tbl_benutzergruppe.insertvon');
 		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
 		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 6a657a793..63a9b24e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -27,7 +27,7 @@ export default {
 					{field: "uid", type: "=", value: this.student.uid},
 					[
 						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
-						{field: "insertvon", type: "=", value: "mlists_generate"}
+						{field: "studiensemester_kurzbz", type: "=", value: null}
 					]
 				],
 				columns: [
@@ -45,7 +45,6 @@ export default {
 						}
 					},
 					{title: "UID", field: "uid"},
-					{title: "InsertVon", field: "insertvon", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -153,7 +152,7 @@ export default {
 					{field: "uid", type: "=", value: this.student.uid},
 					[
 						{field: "studiensemester_kurzbz", type: "=", value: newVal},
-						{field: "insertvon", type: "=", value: "mlists_generate"}
+						{field: "studiensemester_kurzbz", type: "=", value: null}
 					]
 				]);
 

From 018220594a82590cffbcbc612f0f767a314387d7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Feb 2025 08:34:34 +0100
Subject: [PATCH 0044/1357] prepare basic framework

---
 .../api/frontend/v1/messages/Messages.php     |  45 +++++++
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Favorites.php         |   2 +-
 application/models/system/Message_model.php   |   9 +-
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/messages.js                     |   5 +
 public/js/api/messages/person.js              |   6 +
 .../components/Messages/Details/NewMessage.js |  13 ++
 .../Messages/Details/TableMessages.js         | 117 ++++++++++++++++++
 public/js/components/Messages/Messages.js     |  48 +++++++
 .../Studentenverwaltung/Details/Messages.js   |  25 ++++
 system/phrasesupdate.php                      |  25 +++-
 12 files changed, 297 insertions(+), 6 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/messages/Messages.php
 create mode 100644 public/js/api/messages.js
 create mode 100644 public/js/api/messages/person.js
 create mode 100644 public/js/components/Messages/Details/NewMessage.js
 create mode 100644 public/js/components/Messages/Details/TableMessages.js
 create mode 100644 public/js/components/Messages/Messages.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Messages.js

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
new file mode 100644
index 000000000..f81e85e9a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -0,0 +1,45 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Messages extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getMessages' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('system/Message_model', 'MessageModel');
+
+		// Additional Permission Checks
+		//TODO(manu) check permissions
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getMessages($id, $type_id)
+	{
+		//$this->terminateWithError("in backend " . $type_id . ": " . $id, self::ERROR_TYPE_GENERAL);
+
+		if ($type_id != "person_id")
+		{
+			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->getMessagesOfPerson($id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c28c49485..9dec3015f 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,10 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		$result['messages'] = [
+			'title' => $this->p->t('stv', 'tab_messages'),
+			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
+		];
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index 8d7a6cd14..b8fe6f3d7 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -48,7 +48,7 @@ class Favorites extends FHCAPI_Controller
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data['stv_favorites']);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
 	public function set()
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index d9f8585ed..6288f54f3 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -85,7 +85,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesOfPerson($person_id, $status = null)
 	{
-		$sql = 'SELECT m.message_id,
+		$sql = "SELECT m.message_id,
 						m.person_id,
 						m.subject,
 						m.body,
@@ -109,7 +109,10 @@ class Message_model extends DB_Model
 						re.vornamen AS revornamen,
 						s.status,
 						s.statusinfo,
-						s.insertamum AS statusamum
+						s.insertamum AS statusamum,
+						CONCAT(se.titelpre, ' ', se.vorname, ' ', se.nachname, ' ', se.titelpost) as sender,
+						CONCAT(re.titelpre, ' ', re.vorname, ' ', re.nachname, ' ', re.titelpost ) as recipient,
+						TO_CHAR(s.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
 				  FROM public.tbl_msg_message m
 						JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
 						JOIN public.tbl_person se ON (m.person_id = se.person_id)
@@ -122,7 +125,7 @@ class Message_model extends DB_Model
 						  ) s ON (m.message_id = s.message_id AND re.person_id = s.person_id)
 				 WHERE se.person_id = ?
 				 OR re.person_id = ?
-				 ';
+				 ";
 
 		if (is_numeric($status))
 		{
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index c4106c3f6..7bc510b6e 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -33,6 +33,7 @@ import ort from "./ort.js";
 import cms from "./cms.js";
 import lehre from "./lehre.js";
 import addons from "./addons.js";
+import messages from "./messages.js";
 
 export default {
     search,
@@ -52,5 +53,6 @@ export default {
     ort,
     cms,
     lehre,
-    addons
+    addons,
+    messages
 };
diff --git a/public/js/api/messages.js b/public/js/api/messages.js
new file mode 100644
index 000000000..f1378c69d
--- /dev/null
+++ b/public/js/api/messages.js
@@ -0,0 +1,5 @@
+import person from "./messages/person.js";
+
+export default {
+	person
+}
\ No newline at end of file
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
new file mode 100644
index 000000000..bfbdaf123
--- /dev/null
+++ b/public/js/api/messages/person.js
@@ -0,0 +1,6 @@
+export default {
+	getMessages(url, config, params){
+		console.log("in api", params);
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
new file mode 100644
index 000000000..bf60842d2
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -0,0 +1,13 @@
+export default {
+	data(){
+		return {
+
+		}
+	},
+	template: `
+	<div class="messages-detail-newmessage">
+		<h4>New Message</h4>
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
new file mode 100644
index 000000000..bc7e6a02a
--- /dev/null
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -0,0 +1,117 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+	},
+	//TODO(Manu) endpoint macht Probleme
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
+				ajaxParams: () => {
+					return {
+						id: this.id,
+						type: this.typeId
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "subject", field: "subject"},
+					{title: "body", field: "body", visible: false},
+					{title: "message_id", field: "message_id", visible: false},
+					{title: "datum", field: "format_insertamum"},
+					{title: "sender", field: "sender"},
+					{title: "recipient", field: "recipient"},
+					{title: "sepersonid", field: "sepersonid"},
+					{title: "repersonid", field: "repersonid"},
+					{title: "status", field: "status"},
+					{
+						title: 'Aktionen', field: 'actions',
+						width: 100,
+						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.title = this.$p.t('ui', 'notiz_edit');
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.title = this.$p.t('notiz', 'notiz_delete');
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '250',
+				selectableRangeMode: 'click',
+				selectable: true,
+				index: 'message_id',
+				persistenceID: 'core-message'
+			},
+		}
+	},
+/*	computed: {
+		statusText(){
+			0: this.$p.t('messsages', 'unread'),
+			1: this.$p.t('messsages', 'read'),
+			2: this.$p.t('messsages', 'archived'),
+			0: this.$p.t('messsages', 'unread'),
+			3: this.$p.t('person', 'deleted'),
+		}
+	},*/
+	template: `
+	<div class="messages-detail-table">
+		<h4>Table Messages</h4>
+		<p>type_id: {{typeId}}</p>
+		<p>id: {{id}}</p>
+		<p>endpoint: {{endpoint}}</p>
+		
+<!--		{{statusText}}-->
+		
+		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('global', 'nachricht')"
+			@click:new="actionNewNotiz"
+			>
+		</core-filter-cmpt>
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
new file mode 100644
index 000000000..6811a3aed
--- /dev/null
+++ b/public/js/components/Messages/Messages.js
@@ -0,0 +1,48 @@
+import TableMessages from "./Details/TableMessages.js";
+import NewMessage from "./Details/NewMessage.js";
+
+export default {
+	components: {
+		TableMessages,
+		NewMessage
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		showNew: Boolean,
+		showTable: Boolean
+	},
+	data() {
+		return {}
+	},
+	template: `
+	<div class="core-messages h-100 pb-3">
+	<p>endpoint: {{endpoint}}</p>
+		<div v-if="showNew">
+			<NewMessage
+				
+			>
+			</NewMessage>
+		</div>
+		
+		<div v-if="showTable">
+			<TableMessages
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
+			>
+			
+			</TableMessages>
+		</div>
+		
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
new file mode 100644
index 000000000..7bd6d4b4d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -0,0 +1,25 @@
+import CoreMessages from "../../../Messages/Messages.js";
+
+export default {
+	components: {
+		CoreMessages
+	},
+	props: {
+		modelValue: Object
+	},
+	template: `
+	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="person_id"
+			:id="modelValue.person_id"
+			show-table
+			>
+		</core-messages>
+
+
+		
+	</div>
+	`
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cfaf85ec7..f25cc72ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37297,7 +37297,30 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	/////////// FHC4 Phrases Messages START ///////////
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_messages',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachrichten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Messages',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	/////////// FHC4 Phrases Messages END ///////////
+
 );
 
 

From bc484453041935f163a2b029a556aa7bffd98693 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 10 Feb 2025 13:05:44 +0100
Subject: [PATCH 0045/1357] - infocenter filter fuer electronic onboarding
 hinzugefuegt

---
 .../system/infocenter/InfoCenter.php          |  44 +++++++
 .../views/system/infocenter/onboarding.php    |  47 +++++++
 .../system/infocenter/onboardingData.php      | 116 ++++++++++++++++++
 system/filtersupdate.php                      |  23 ++++
 4 files changed, 230 insertions(+)
 create mode 100644 application/views/system/infocenter/onboarding.php
 create mode 100644 application/views/system/infocenter/onboardingData.php

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index f6e41d2e6..9024088f8 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -22,6 +22,7 @@ class InfoCenter extends Auth_Controller
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const ABGEWIESEN_PAGE = 'abgewiesen';
 	const AUFGENOMMEN_PAGE = 'aufgenommen';
+	const ONBOARDING_PAGE = 'onboarding';
 	const SHOW_DETAILS_PAGE = 'showDetails';
 	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
 	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';
@@ -116,6 +117,7 @@ class InfoCenter extends Auth_Controller
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
 				'abgewiesen' => 'infocenter:r',
+				'onboarding' => 'infocenter:r',
 				'aufgenommen' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
@@ -230,6 +232,13 @@ class InfoCenter extends Auth_Controller
 
 		$this->load->view('system/infocenter/infocenterAbgewiesen.php');
 	}
+
+	public function onboarding()
+	{
+		$this->_setNavigationMenu(self::ONBOARDING_PAGE); // define the navigation menu for this page
+
+		$this->load->view('system/infocenter/onboarding.php');
+	}
 	
 	/**
 	 * Aufgenommene page of the InfoCenter tool
@@ -1552,6 +1561,7 @@ class InfoCenter extends Auth_Controller
 		$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
 		$aufgenommenLink = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
+		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 
 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -1560,6 +1570,7 @@ class InfoCenter extends Auth_Controller
 			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$abgewiesenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$aufgenommenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
+			$onboardingLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1623,6 +1634,18 @@ class InfoCenter extends Auth_Controller
 					'', 				// target
 					40   				// sort
 				),
+				'ohnePrestudent' => $this->navigationlib->oneLevel(
+					'Electronic Onboarding',		// description
+					$onboardingLink,	// link
+					null,				// children
+					'users',		// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					50   				// sort
+				),
 			)
 		);
 	}
@@ -1649,6 +1672,8 @@ class InfoCenter extends Auth_Controller
 			$link = site_url(self::ZGV_UEBERPRUEFUNG_URI);
 		if ($origin_page === self::ABGEWIESEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		if ($origin_page === self::ONBOARDING_PAGE)
+			$link = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 
 		if ($origin_page === self::AUFGENOMMEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
@@ -1690,6 +1715,7 @@ class InfoCenter extends Auth_Controller
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$absolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
@@ -1766,6 +1792,24 @@ class InfoCenter extends Auth_Controller
 				)
 			);
 		}
+		if($page == self::ONBOARDING_PAGE)
+		{
+			$this->navigationlib->setSessionElementMenu(
+				'onboarding',
+				$this->navigationlib->oneLevel(
+					'Electronic Onboarding',		// description
+					$onboardingLink,	// link
+					null,				// children
+					'users',			// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					50   				// sort
+				)
+			);
+		}
 	}
 
 	/**
diff --git a/application/views/system/infocenter/onboarding.php b/application/views/system/infocenter/onboarding.php
new file mode 100644
index 000000000..a600364d9
--- /dev/null
+++ b/application/views/system/infocenter/onboarding.php
@@ -0,0 +1,47 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Info Center',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
+			'ajaxlib' => true,
+			'filterwidget' => true,
+			'navigationwidget' => true,
+			'dialoglib' => true,
+			'phrases' => array(
+				'person' => array('vorname', 'nachname'),
+				'ui' => array('bitteEintragWaehlen')
+			),
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
+		)
+	);
+?>
+
+	<div id="wrapper">
+
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+							Electronic Onboarding
+						</h3>
+					</div>
+				</div>
+				<div>
+					<?php $this->load->view('system/infocenter/onboardingData.php'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/onboardingData.php b/application/views/system/infocenter/onboardingData.php
new file mode 100644
index 000000000..5ee66fdde
--- /dev/null
+++ b/application/views/system/infocenter/onboardingData.php
@@ -0,0 +1,116 @@
+<?php
+
+	$APP = '\'infocenter\'';
+	$KENNZEICHEN = '\'eobRegistrierungsId\'';
+
+$query = '
+		SELECT
+			p.person_id AS "PersonId",
+			p.vorname AS "Vorname",
+			p.nachname AS "Nachname",
+			pl.zeitpunkt AS "LockDate",
+			pl.lockuser AS "LockUser",
+			rueck.datum_bis AS "HoldDate",
+			rueck.bezeichnung AS "Rueckstellgrund"
+		FROM public.tbl_person p
+			JOIN tbl_kennzeichen ON p.person_id = tbl_kennzeichen.person_id AND kennzeichentyp_kurzbz = '. $KENNZEICHEN .'
+			LEFT JOIN (
+					SELECT tpl.person_id,
+						   tpl.zeitpunkt,
+						   sp.nachname AS lockuser
+					  FROM system.tbl_person_lock tpl
+					  JOIN public.tbl_benutzer sb USING (uid)
+					  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
+					 WHERE tpl.app = '.$APP.'
+				 ) pl ON p.person_id = pl.person_id
+			LEFT JOIN (
+				SELECT
+					tbl_rueckstellung.person_id,
+					tbl_rueckstellung.datum_bis,
+					tbl_rueckstellung.status_kurzbz,
+					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
+				FROM public.tbl_rueckstellung
+					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
+				WHERE tbl_rueckstellung.rueckstellung_id =
+				(
+					SELECT srueck.rueckstellung_id
+					FROM public.tbl_rueckstellung srueck
+					WHERE srueck.person_id = tbl_rueckstellung.person_id
+						AND datum_bis >= NOW()
+					ORDER BY srueck.datum_bis DESC LIMIT 1
+				)
+			) rueck ON rueck.person_id = p.person_id
+		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
+
+	$filterWidgetArray = array(
+		'query' => $query,
+		'app' => InfoCenter::APP,
+		'datasetName' => 'onboarding',
+		'filter_id' => $this->input->get('filter_id'),
+		'requiredPermissions' => 'infocenter',
+		'datasetRepresentation' => 'tablesorter',
+		'checkboxes' => 'PersonId',
+		'additionalColumns' => array('Details'),
+		'columnsAliases' => array(
+			'PersonId',
+			ucfirst($this->p->t('person', 'vorname')) ,
+			ucfirst($this->p->t('person', 'nachname')),
+			ucfirst($this->p->t('global', 'sperrdatum')),
+			ucfirst($this->p->t('global', 'gesperrtVon')),
+			ucfirst($this->p->t('infocenter', 'rueckstelldatum')),
+			ucfirst($this->p->t('infocenter', 'rueckstellgrund')),
+		),
+
+		'formatRow' => function($datasetRaw) {
+			/* NOTE: Dont use $this here for PHP Version compatibility */
+			$datasetRaw->{'Details'} = sprintf(
+				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+				site_url('system/infocenter/InfoCenter/showDetails'),
+				$datasetRaw->{'PersonId'},
+				'onboarding',
+				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+			);
+
+			if ($datasetRaw->{'LockDate'} == null)
+			{
+				$datasetRaw->{'LockDate'} = '-';
+			}
+
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
+			}
+
+			if ($datasetRaw->{'HoldDate'} == null)
+			{
+				$datasetRaw->{'HoldDate'} = '-';
+			}
+			else
+			{
+				$datasetRaw->{'HoldDate'} = date_format(date_create($datasetRaw->{'HoldDate'}), 'Y-m-d H:i');
+			}
+
+			if ($datasetRaw->{'Rueckstellgrund'} === null)
+			{
+				$datasetRaw->{'Rueckstellgrund'} = '-';
+			}
+
+			return $datasetRaw;
+		},
+
+		'markRow' => function($datasetRaw) {
+
+			if ($datasetRaw->LockDate != null)
+			{
+				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+			}
+		}
+
+
+
+	);
+
+	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+?>
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 51dd86314..cfcceb0f6 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -529,6 +529,29 @@ $filters = array(
 		',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'infocenter',
+		'dataset_name' => 'onboarding',
+		'filter_kurzbz' => 'InfoCenterOnboarding',
+		'description' => '{Alle}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Electronic Onboarding - Alle",
+				"columns": [
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "LockUser"},
+					{"name": "HoldDate"},
+					{"name": "Rueckstellgrund"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
+	),
 	array(
 		'app' => 'infocenter',
 		'dataset_name' => 'aufgenommen',

From ae3072be924940441968f5d65a352245af043afc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Feb 2025 09:02:56 +0100
Subject: [PATCH 0046/1357] listTables with preview in two layouts

---
 .../api/frontend/v1/messages/Messages.php     |   2 +-
 application/models/system/Message_model.php   |  57 +++-
 public/css/Studentenverwaltung.css            |   1 +
 public/css/components/Messages.css            |   4 +
 public/js/api/messages/person.js              |   1 -
 .../Messages/Details/TableMessages.js         | 272 +++++++++++++++---
 public/js/components/Messages/Messages.js     |  15 +-
 .../Studentenverwaltung/Details/Messages.js   |   3 +-
 system/phrasesupdate.php                      | 200 +++++++++++++
 9 files changed, 508 insertions(+), 47 deletions(-)
 create mode 100644 public/css/components/Messages.css

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index f81e85e9a..adf1d52e9 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -36,7 +36,7 @@ class Messages extends FHCAPI_Controller
 			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->MessageModel->getMessagesOfPerson($id);
+		$result = $this->MessageModel->getMessagesForTable($id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 6288f54f3..1b201fc1b 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -109,10 +109,7 @@ class Message_model extends DB_Model
 						re.vornamen AS revornamen,
 						s.status,
 						s.statusinfo,
-						s.insertamum AS statusamum,
-						CONCAT(se.titelpre, ' ', se.vorname, ' ', se.nachname, ' ', se.titelpost) as sender,
-						CONCAT(re.titelpre, ' ', re.vorname, ' ', re.nachname, ' ', re.titelpost ) as recipient,
-						TO_CHAR(s.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
+						s.insertamum AS statusamum
 				  FROM public.tbl_msg_message m
 						JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
 						JOIN public.tbl_person se ON (m.person_id = se.person_id)
@@ -233,4 +230,56 @@ class Message_model extends DB_Model
 		
 		return $this->execQuery($query, $params);
 	}
+
+	/**
+	 * Gets messages for a person for tableMessages.
+	 * @param $person_id
+	 * @param null $status message status. by default, latest status is returned
+	 * @return array|null
+	 */
+	public function getMessagesForTable($person_id, $status = null)
+	{
+		$sql = "
+			SELECT
+				m.message_id AS message_id,
+				m.subject AS subject,
+				m.body AS body,
+				m.insertamum AS insertamum,
+				m.relationmessage_id AS relationmessage_id,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_message m
+				 JOIN public.tbl_msg_recipient r USING(message_id)
+				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
+			WHERE m.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+			UNION ALL
+			SELECT
+				m.message_id AS message_id,
+				m.subject AS subject,
+				m.body AS body,
+				m.insertamum AS insertamum,
+				m.relationmessage_id AS relationmessage_id,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_recipient r
+				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
+				 JOIN public.tbl_msg_message m USING(message_id)
+			WHERE r.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+			ORDER BY insertamum
+				 ";
+
+		$parametersArray = array($person_id, $person_id);
+
+		return $this->execQuery($sql, $parametersArray);
+	}
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index f179c3667..cc2eff51d 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -4,6 +4,7 @@
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';
+@import './components/Messages.css';
 
 html {
   font-size: .875em;
diff --git a/public/css/components/Messages.css b/public/css/components/Messages.css
new file mode 100644
index 000000000..1c004f6b0
--- /dev/null
+++ b/public/css/components/Messages.css
@@ -0,0 +1,4 @@
+.twoColumns {
+    height: 400px;
+    overflow-y: auto;
+}
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index bfbdaf123..baf8bd39f 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,6 +1,5 @@
 export default {
 	getMessages(url, config, params){
-		console.log("in api", params);
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
 	},
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index bc7e6a02a..c4fd4d4d7 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,8 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
+import FormForm from '../../Form/Form.js';
+//import FormInput from '../../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
+		FormForm,
+	//	FormInput
 	},
 	props: {
 		endpoint: {
@@ -14,6 +18,7 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		messageLayout: String,
 	},
 	//TODO(Manu) endpoint macht Probleme
 	data(){
@@ -32,12 +37,65 @@ export default {
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
 					{title: "message_id", field: "message_id", visible: false},
-					{title: "datum", field: "format_insertamum"},
+					{
+						title: "Datum",
+						field: "insertamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr); // Convert to Date object
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{title: "sender", field: "sender"},
 					{title: "recipient", field: "recipient"},
-					{title: "sepersonid", field: "sepersonid"},
-					{title: "repersonid", field: "repersonid"},
-					{title: "status", field: "status"},
+					{title: "senderId", field: "sender_id"},
+					{title: "recipientId", field: "recipient_id"},
+					{
+						title: "status",
+						field: "status",
+						formatter: function (cell) {
+							//TODO(Manu) get phrases in this context to work?
+
+							/*							const statusMap = {
+															0: this.$p.t('messsages', 'unread'),
+															1: this.$p.t('messsages', 'read'),
+															2: this.$p.t('messsages', 'archived'),
+															3: this.$p.t('messsages', 'deleted')
+														};*/
+							const statusMap = {
+								0: 'unread',
+								1: 'read',
+								2: 'archived',
+								3: 'deleted'
+							};
+							return statusMap[cell.getValue()];
+							// return this.$p.t('messsages', 'deleted');
+						}
+
+					},
+					{
+						title: "letzte Änderung",
+						field: "statusdatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr); // Convert to Date object
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{
 						title: 'Aktionen', field: 'actions',
 						width: 100,
@@ -47,23 +105,23 @@ export default {
 
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
-							button.title = this.$p.t('ui', 'notiz_edit');
-							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('global', 'reply');
+							button.innerHTML = '<i class="fa fa-reply"></i>';
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.actionEditNotiz(cell.getData().notiz_id)
+									this.reply(cell.getData().message_id)
 							);
 							container.append(button);
 
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
-							button.title = this.$p.t('notiz', 'notiz_delete');
+							button.title = this.$p.t('ui', 'loeschen');
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.addEventListener(
 								'click',
 								() =>
-									this.actionDeleteNotiz(cell.getData().notiz_id)
+									this.deleteMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -71,46 +129,186 @@ export default {
 						},
 						frozen: true
 					}],
-				layout: 'fitColumns',
-				layoutColumnsOnNewData: false,
-				height: '250',
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+			//	height:	'auto',
+				height: '400',
+				selectable:	true,
+				selectableRangeMode: 'click',
+/*				layoutColumnsOnNewData: false,
+
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'message_id',
-				persistenceID: 'core-message'
+				persistenceID: 'core-message'*/
 			},
+			tabulatorEvents: [
+				{
+					event: 'dataLoaded',
+					handler: data => this.tabulatorData = data.map(item => {
+						return item;
+					}),
+				},
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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('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;
+							console.log(selectedMessage);
+					}
+				},
+			],
+			tabulatorData: [],
+			previewBody: ""
 		}
 	},
-/*	computed: {
+	methods: {
+		reply(message_id){
+			console.log("in reply " + message_id);
+		},
+		deleteMessage(message_id){
+			console.log("deleteMessage " + message_id);
+		},
+		actionNewMessage(){
+			console.log("action new message");
+		},
+	},
+	computed: {
 		statusText(){
-			0: this.$p.t('messsages', 'unread'),
-			1: this.$p.t('messsages', 'read'),
-			2: this.$p.t('messsages', 'archived'),
-			0: this.$p.t('messsages', 'unread'),
-			3: this.$p.t('person', 'deleted'),
+			return {
+				0: this.$p.t('messsages', 'unread'),
+				1: this.$p.t('messsages', 'read'),
+				2: this.$p.t('messsages', 'archived'),
+				3: this.$p.t('messsages', 'deleted')
+			}
 		}
-	},*/
+	},
+	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
+			});
+		});*/
+	},
 	template: `
 	<div class="messages-detail-table">
-		<h4>Table Messages</h4>
-		<p>type_id: {{typeId}}</p>
-		<p>id: {{id}}</p>
 		<p>endpoint: {{endpoint}}</p>
+		<p>{{messageLayout}}</p>
+
+		<!-- {{statusText[0] }}
+		<hr>
+		{{$p.t('messages', 'unread')}} -->
+		<!-- {{statusText.0}} -->
+		<!-- <p v-for="(bezeichnung, key) in statusText" :key="key" :value="key">{{bezeichnung}}</p> -->
+
+		<!--View Studierendenverwaltung-->
+		<div v-if="messageLayout=='twoColumnsTableLeft'">
 		
-<!--		{{statusText}}-->
-		
-		
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			:new-btn-label="this.$p.t('global', 'nachricht')"
-			@click:new="actionNewNotiz"
-			>
-		</core-filter-cmpt>
+			<div class="row">
+				<!--table-->
+				<div class="col-sm-6 pt-6">
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						:new-btn-label="this.$p.t('global', 'nachricht')"
+						@click:new="actionNewMessage"
+						>
+					</core-filter-cmpt>
+				</div>
+
+				<!--preview wysiwyg-window-->
+				<div class="col-sm-6 pt-6">
+				<br><br><br><br>
+
+					<div ref="preview">
+						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+					</div>
+
+				</div>
+
+			</div>
+		</div>
+
+		<!--View Infocenter-->
+		<div v-if="messageLayout=='listTableTop'">
+
+				<!--table-->
+				<div class="col-sm-12 pt-6">
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						:new-btn-label="this.$p.t('global', 'nachricht')"
+						@click:new="actionNewMessage"
+						>
+					</core-filter-cmpt>
+				</div>
+
+				<!--preview wysiwyg-window-->
+				<div class="col-sm-12">
+
+					<div ref="preview">
+						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+					</div>
+
+				</div>
+		</div>
+
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 6811a3aed..3fd6e2a02 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -17,14 +17,24 @@ export default {
 			required: true
 		},
 		showNew: Boolean,
-		showTable: Boolean
+		showTable: Boolean,
+		messageLayout: {
+			type: String,
+			default: 'twoColumnsTableLeft',
+			validator(value) {
+				return [
+					'twoColumnsTableLeft',
+					'listTableTop'
+				].includes(value)
+			}
+		},
 	},
 	data() {
 		return {}
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
-	<p>endpoint: {{endpoint}}</p>
+	<p>endpoint Messages.js: {{endpoint}}</p>
 		<div v-if="showNew">
 			<NewMessage
 				
@@ -37,6 +47,7 @@ export default {
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
+				:messageLayout="messageLayout"
 			>
 			
 			</TableMessages>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 7bd6d4b4d..e9f542945 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -14,12 +14,11 @@ export default {
 			endpoint="$fhcApi.factory.messages.person"
 			type-id="person_id"
 			:id="modelValue.person_id"
+			messageLayout="listTableTop"
 			show-table
 			>
 		</core-messages>
 
-
-		
 	</div>
 	`
 };
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f25cc72ec..95a505a23 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37319,6 +37319,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'unread',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ungelesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unread',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'read',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gelesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'read',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'archived',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'archiviert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'archived',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'deleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'body',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachrichtentext',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Body',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'message_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Message ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Message ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'sender',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'SenderIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sender',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'recipient',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EmpfängerIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Recipient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'senderId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'SenderIn ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sender ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'recipientId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EmpfängerIn ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Recipient ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From 24682fb559553e89a0398e6d6f6b02925262da74 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 12 Feb 2025 17:05:18 +0100
Subject: [PATCH 0047/1357] changeFormat Dates, use different select for
 MitarbeiterHeader before PV21, adapt condition for multiselect addon

---
 .../api/frontend/v1/vertraege/Vertraege.php   |  7 ++-
 .../models/accounting/Vertrag_model.php       | 12 ++--
 .../models/ressource/Mitarbeiter_model.php    |  2 +-
 public/js/components/Vertraege/List/Status.js | 59 +++++++++++++++++--
 .../components/Vertraege/MitarbeiterHeader.js | 17 +++++-
 public/js/components/Vertraege/Vertraege.js   | 23 +++++---
 .../Vertraege/Vertragsverwaltung.js           |  4 +-
 7 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index b593a1f3e..f8d535d2d 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -659,7 +659,12 @@ class Vertraege extends FHCAPI_Controller
 		}
 		if (!hasData($result))
 		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+			//return data before PV21 (with filter fix angestellt, active and with bisverwendung)
+			$result = $this->Mitarbeitermodel->getPersonal(true, true, true);
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 048dbb085..f89c6c185 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -343,9 +343,9 @@ class Vertrag_model extends DB_Model
 					*,
 					tbl_vertrag.bezeichnung as bezeichnung,
 					tbl_vertragstyp.bezeichnung as vertragstyp_bezeichnung,
-					TO_CHAR(tbl_vertrag.vertragsdatum::timestamp, 'DD.MM.YYYY') AS format_vertragsdatum,
+					tbl_vertrag.vertragsdatum,
 					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
-					    JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
+					JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
 						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung,
 			    CASE
 					WHEN EXISTS (
@@ -487,15 +487,15 @@ SELECT
 		$query = " 
 			SELECT
 				*,
-                TO_CHAR(tbl_vertrag_vertragsstatus.datum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_datum,
-                TO_CHAR(tbl_vertrag_vertragsstatus.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum,
-                TO_CHAR(tbl_vertrag_vertragsstatus.updateamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_updateamum
+                tbl_vertrag_vertragsstatus.datum,
+                tbl_vertrag_vertragsstatus.insertamum,
+                tbl_vertrag_vertragsstatus.updateamum
 			FROM
 				lehre.tbl_vertrag_vertragsstatus
 				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
 			WHERE
 				tbl_vertrag_vertragsstatus.vertrag_id = ?
-			ORDER BY datum DESC";
+			ORDER BY tbl_vertrag_vertragsstatus.datum DESC";
 
 		return $this->execQuery($query, array($vertrag_id));
 	}
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index f7951083c..e1493e1e8 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -109,7 +109,7 @@ class Mitarbeiter_model extends DB_Model
 			SELECT
 				 b.uid , p.person_id,
 				p.vorname, p.nachname,
-				TO_CHAR(gebdatum::timestamp, 'DD.MM.YYYY') AS format_gebdatum,
+				gebdatum,
 				COALESCE(b.alias, b.uid) AS email,
 				STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
 				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 3c05daa66..60475d3e2 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -44,14 +44,61 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Status", field: "bezeichnung"},
-					{title: "Datum", field: "format_datum"},
+					{
+						title: "Datum",
+						field: "datum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr); // Convert to Date object
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{title: "vertrag_id", field: "vertrag_id", visible: false},
 					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
 					{title: "User", field: "mitarbeiter_uid", visible: false},
 					{title: "insertvon", field: "insertvon", visible: false},
-					{title: "insertamum", field: "format_insertamum", visible: false},
+					{
+						title: "insertamum",
+						field: "insertamum",
+						visible: false,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{title: "updatevon", field: "updatevon", visible: false},
-					{title: "updateamum", field: "format_updateamum", visible: false},
+					{
+						title: "updateamum",
+						field: "updateamum",
+						visible: false,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -112,7 +159,7 @@ export default {
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('global', 'status')
 						});
-						cm.getColumnByField('format_datum').component.updateDefinition({
+						cm.getColumnByField('datum').component.updateDefinition({
 							title: this.$p.t('global', 'datum')
 						});
 						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
@@ -130,13 +177,13 @@ export default {
 						cm.getColumnByField('updatevon').component.updateDefinition({
 							title: this.$p.t('global', 'updatevon')
 						});
-						cm.getColumnByField('format_updateamum').component.updateDefinition({
+						cm.getColumnByField('updateamum').component.updateDefinition({
 							title: this.$p.t('global', 'updateamum')
 						});
 						cm.getColumnByField('insertvon').component.updateDefinition({
 							title: this.$p.t('global', 'insertvon')
 						});
-						cm.getColumnByField('format_insertamum').component.updateDefinition({
+						cm.getColumnByField('insertamum').component.updateDefinition({
 							title: this.$p.t('global', 'insertamum')
 						});
 					}
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 84d8e03b8..ff361eaea 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -62,7 +62,20 @@ export default {
 							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
 					},
-					{title: "Geburtsdatum", field: "format_gebdatum", headerFilter:"input"},
+					{
+						title: "Geburtsdatum",
+						field: "gebdatum",
+						headerFilter:"input",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						}
+					},
 					{title: "Unternehmen", field: "unternehmen", headerFilter:"input"},
 					{title: "Vertragsarten", field: "vertragsarten", headerFilter:"input"},
 					{title: "Ids Dienstverträge", field: "ids", headerFilter:"input"},
@@ -98,7 +111,7 @@ export default {
 						cm.getColumnByField('aktiv').component.updateDefinition({
 							title: this.$p.t('global', 'aktiv')
 						});
-						cm.getColumnByField('format_gebdatum').component.updateDefinition({
+						cm.getColumnByField('gebdatum').component.updateDefinition({
 							title: this.$p.t('person', 'geburtsdatum')
 						});
 						cm.getColumnByField('unternehmen').component.updateDefinition({
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 67a779638..eb40c2499 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -68,9 +68,21 @@ export default {
 					},
 					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
 					{title: "Status", field: "status"},
-					{title: "Vertragsdatum", field: "format_vertragsdatum", width: 128},
+					{
+						title: "Vertragsdatum",
+						field: "vertragsdatum",
+						width: 128,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						}
+					},
 					{title: "VertragId", field: "vertrag_id", visible: false},
-					{title: "Vertragsdatum_iso", field: "vertragsdatum", visible: false},
 					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
 					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
 					{title: "Anmerkung", field: "anmerkung", visible: false},
@@ -146,11 +158,8 @@ export default {
 						cm.getColumnByField('vertragstyp_bezeichnung').component.updateDefinition({
 							title: this.$p.t('vertrag', 'vertragstyp')
 						});
-						cm.getColumnByField('format_vertragsdatum').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsdatum')
-						});
 						cm.getColumnByField('vertragsdatum').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsdatum_iso')
+							title: this.$p.t('vertrag', 'vertragsdatum')
 						});
 						cm.getColumnByField('vertragsstunden').component.updateDefinition({
 							title: this.$p.t('vertrag', 'vertragsstunden')
@@ -177,7 +186,7 @@ export default {
 					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
 					event: 'rowClick',
 					handler: (e, row) => {
-						if (this.dataPrintHonorar.multiselect) {
+						if (this.dataPrintHonorar != null && this.dataPrintHonorar.multiselect != null) {
 							const selectedContract = row.getData().vertrag_id;
 							const status = row.getData().status;
 							const bezeichnung =	row.getData().bezeichnung;
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 85f183584..cc96c1f79 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -44,13 +44,13 @@ export default {
 				<vertical-split ref="vsplit">
 					<template #top>	
 	<!--					<div class="d-flex flex-column" style="height: 100%;">-->
-							<MitarbeiterHeader :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
+							<mitarbeiter-header :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
 <!--						</div>-->
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">
 							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
-							<VertraegeMitarbeiter :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
+							<vertraege-mitarbeiter :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
 						</div>
 					<template>
 				</vertical-split>

From 660f9076ce32c1f99aa2df8d9df0dc7a85bd1023 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 14 Feb 2025 09:38:33 +0100
Subject: [PATCH 0048/1357] delete commented out sections

---
 application/models/ressource/Mitarbeiter_model.php   | 11 ++++-------
 public/js/components/Vertraege/Vertragsverwaltung.js | 11 ++---------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index e1493e1e8..f240a9d9a 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -107,7 +107,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-				 b.uid , p.person_id,
+				b.uid , p.person_id,
 				p.vorname, p.nachname,
 				gebdatum,
 				COALESCE(b.alias, b.uid) AS email,
@@ -115,9 +115,6 @@ class Mitarbeiter_model extends DB_Model
 				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
 				STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
 				b.aktiv
-	--			CASE WHEN b.aktiv=true THEN 'aktiv'
-	--			 	 ELSE 'nicht aktiv'
-	--				 END as status //not working in header filter	*/  
 				FROM
 					hr.tbl_dienstverhaeltnis d
 				JOIN
@@ -128,7 +125,7 @@ class Mitarbeiter_model extends DB_Model
 					public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
 				JOIN
 					hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			    ";
+			";
 
 		if($person_id)
 		{
@@ -138,9 +135,9 @@ class Mitarbeiter_model extends DB_Model
 		$qry.= " 
 			GROUP BY
 				b.uid, p.person_id, p.vorname, p.nachname, b.alias
-			 ORDER BY
+			ORDER BY
 					p.nachname, p.vorname;
-			    ";
+			";
 
 		$params = array($person_id);
 
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index cc96c1f79..1a6100913 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -21,15 +21,8 @@ export default {
 		}
 	},
 	data() {
-		//TODO(Manu) props for filter: actually not necessary
 		return {
 			person_id: null,
-/*			filterMa: {
-				active: true,
-				hasVertraege: true
-			},*/
-/*			vertragsarten:
-				[ 'echterdv', 'externerlehrender', 'gastlektor']*/
 		}
 	},
 	methods: {
@@ -43,9 +36,9 @@ export default {
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 				<vertical-split ref="vsplit">
 					<template #top>	
-	<!--					<div class="d-flex flex-column" style="height: 100%;">-->
+						<div class="d-flex flex-column" style="height: 100%;">
 							<mitarbeiter-header :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
-<!--						</div>-->
+						</div>
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">

From c960b4832d110794842de25d9c8caa5274dfff0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 17 Feb 2025 14:40:24 +0100
Subject: [PATCH 0049/1357] test

---
 public/js/api/stundenplan.js                     | 11 +++++++++++
 public/js/apps/Dashboard/Fhc.js                  | 16 ++++++++--------
 public/js/components/Calendar/Week/Page.js       |  4 +++-
 public/js/components/Cis/Cms/Content.js          |  2 +-
 public/js/components/Cis/Cms/News.js             |  2 +-
 .../StudiengangInformation.js                    |  4 ++--
 public/js/components/Cis/Mylv/LvUebersicht.js    |  4 ++--
 .../js/components/Cis/Stundenplan/Stundenplan.js |  5 +++++
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 9ddbeff54..0f5de934e 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -42,4 +42,15 @@ export default {
 			{}
 		);
 	},
+	getMoodleEventsByUserid(username, timestart, timeend) {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			`addons/moodle/cis/get_events_by_userid.php`,
+			{
+				username: username,
+				timestart: timestart,
+				timeend: timeend,
+			}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 9f77d4b9b..19f6b3a2b 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -2,14 +2,14 @@ import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 import contrast from '../../directives/contrast.js';
-import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
-import Stundenplan from "../../components/Cis/Stundenplan/Stundenplan";
-import MylvStudent from "../../components/Cis/Mylv/Student";
-import Profil from "../../components/Cis/Profil/Profil";
-import CmsNews from "../../components/Cis/Cms/News";
-import CmsContent from "../../components/Cis/Cms/Content";
-import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info";
-import RoomInformation from "../../components/Cis/Mylv/RoomInformation";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
+import Stundenplan from "../../components/Cis/Stundenplan/Stundenplan.js";
+import MylvStudent from "../../components/Cis/Mylv/Student.js";
+import Profil from "../../components/Cis/Profil/Profil.js";
+import CmsNews from "../../components/Cis/Cms/News.js";
+import CmsContent from "../../components/Cis/Cms/Content.js";
+import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 10ff6c495..b029b854a 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -197,7 +197,9 @@ export default {
 				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
-			
+			console.log(this.smallestTimeFrame,"this is the smallest timeframe")
+			console.log(this.hours.length,"this is the length of the hours")
+			console.log(this.hours.length/60, "this is the length of the hours multiplied by 60 resulting in minutes")
 			if(day.isPast) {
 				styleObj['background-color'] = '#F5E9D7'
 				styleObj['border-color'] = '#E8E8E8';
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index ed87e1aae..d657322ba 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,6 +1,6 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
-import BsConfirm from "../../Bootstrap/Confirm";
+import BsConfirm from "../../Bootstrap/Confirm.js";
 
 export default {
 	name: "ContentComponent",
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 89bed18d7..1567cbef4 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -1,6 +1,6 @@
 import Pagination from "../../Pagination/Pagination.js";
 import StudiengangInformation from "./StudiengangInformation/StudiengangInformation.js";
-import BsConfirm from "../../Bootstrap/Confirm";
+import BsConfirm from "../../Bootstrap/Confirm.js";
 
 export default {
 	name: "NewsComponent",
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 06743ae5d..92e303801 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -1,5 +1,5 @@
-import StudiengangPerson from "./StudiengangPerson";
-import StudiengangVertretung from "./StudiengangVertretung";
+import StudiengangPerson from "./StudiengangPerson.js";
+import StudiengangVertretung from "./StudiengangVertretung.js";
 
 export default {
 data(){
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 6670a0c76..13972af5e 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -1,5 +1,5 @@
-import BsModal from "../../Bootstrap/Modal";
-import LvMenu from "./LvMenu";
+import BsModal from "../../Bootstrap/Modal.js";
+import LvMenu from "./LvMenu.js";
 export default  {
   
     props:{
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index d35c9c536..ba3a3c649 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -150,6 +150,11 @@ export const Stundenplan = {
 	},
 	created()
 	{
+		let time_start = Math.floor(this.eventCalendarDate.firstDayOfCalendarMonth.getTime() / 1000);
+		let time_end = Math.floor(this.eventCalendarDate.lastDayOfCalendarMonth.getTime() / 1000);
+		this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', time_start, time_end).then((response) => {
+			console.log(response);
+		})
 		this.$fhcApi.factory.authinfo.getAuthUID().then((res) => res.data)
 		.then(data=>{
 			this.uid = data.uid;

From e086da2274ce66bc477d8ba5b6c8308b38eba720 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 18 Feb 2025 14:23:56 +0100
Subject: [PATCH 0050/1357] feature(Calendar Moodle Events): displays moodle
 events as allDayEvents in the Calendar

---
 public/js/components/Calendar/Week/Page.js    | 75 ++++++++++++++-----
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js | 74 +++++++++++++-----
 3 files changed, 116 insertions(+), 37 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b029b854a..504293d07 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -10,7 +10,7 @@ export default {
 			hourPosition:null,
 			hourPositionTime:null,
 			resizeObserver: null,
-			width: 0
+			width: 0,
 		}
 	},
 	inject: [
@@ -36,6 +36,16 @@ export default {
 		'input',
 	],
 	computed: {
+		allDayEvents(){
+			let allDayEvents = {};
+			for(let day in this.events){
+				const filteredAllDayEvents = this.events[day].filter(event=>event.allDayEvent);
+				if (filteredAllDayEvents.length > 0){
+					allDayEvents[day]=filteredAllDayEvents;
+				}
+			};
+			return allDayEvents;
+		},
 		getGridStyle() {
 			return {
 				'min-height': '100px',
@@ -126,6 +136,7 @@ export default {
 				d.isToday = nextDay.getFullYear() === this.todayDate.getFullYear() && nextDay.getMonth() === this.todayDate.getMonth() && nextDay.getDate() === this.todayDate.getDate()
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
+						if (evt.allDayEvent) return;
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
 							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
 							doneItems.push(this);
@@ -197,31 +208,44 @@ export default {
 				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
-			console.log(this.smallestTimeFrame,"this is the smallest timeframe")
-			console.log(this.hours.length,"this is the length of the hours")
-			console.log(this.hours.length/60, "this is the length of the hours multiplied by 60 resulting in minutes")
 			if(day.isPast) {
 				styleObj['background-color'] = '#F5E9D7'
 				styleObj['border-color'] = '#E8E8E8';
 				styleObj.opacity = 0.5;
 			} else if (day.isToday) {
 				
-				// styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				// styleObj['border-color'] = '#E8E8E8';
-				// styleObj.opacity = 0.5;
+				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
+				styleObj['border-color'] = '#E8E8E8';
+				styleObj.opacity = 0.5;
 			}
 			
 			return styleObj
 		},
 		eventGridStyle(day, event) {
-			return {
-				'z-index': 1,
-				'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-				'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-				'grid-row-start': this.dateToMinutesOfDay(event.start),
-				'grid-row-end': this.dateToMinutesOfDay(event.end),
-				'background-color': event.orig.color,
-				'max-height': '75px'				
+			if (event.orig.allDayEvent)
+			{
+				return;
+				return {
+					'z-index': '2',
+					'grid-column': '1 / -1',
+					'background-color': 'rgb(204, 204, 204)',
+					'max-height': '75px',
+					color: 'black',
+					position: 'sticky',
+					top: '44px',
+				};
+			}
+			else
+			{
+				return {
+					'z-index': 1,
+					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
+					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
+					'grid-row-start': this.dateToMinutesOfDay(event.start),
+					'grid-row-end': this.dateToMinutesOfDay(event.end),
+					'background-color': event.orig.color,
+					'max-height': '75px'
+				};
 			}
 		},
 		calcHourPosition(event) {
@@ -333,12 +357,27 @@ export default {
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
 				</Transition>
-				
+
 				<div class="events" :ref="'eventsRef'+week">
+
 					<div class="hours">
 						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
+						<div class="position-absolute w-100" style="top:0; bottom:0;">
+							<div class="position-sticky d-grid gap-1" style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
+								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+									:selected="event == selectedEvent"
+									:style="{'background-color': event?.color, 'z-index':2}"
+									class="small rounded overflow-hidden fhc-entry "
+									v-contrast
+									>
+									<slot class="p-1" name="weekPage" :event="event" :day="day">
+										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+									</slot>
+								</div>
+							</div>
+						</div>
 						<Transition>
 							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
 								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
@@ -350,7 +389,7 @@ export default {
 						:style="eventGridStyle(day,event)"
 						class="mx-2 small rounded overflow-hidden fhc-entry "
 						v-contrast >
-							<slot name="weekPage" :event="event" :day="day">
+							<slot name="weekPage" :event="event.orig" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>		
 						</div>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index e873dd5f8..acb2a7693 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -35,7 +35,7 @@ export default {
 	},
 	data() {
 		return {
-			menu: [],
+			menu: null,
 			result: false,
 			info: null,
 		};
@@ -76,7 +76,7 @@ export default {
 		<template v-slot:default>
 			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<lv-info :event="event"></lv-info>
-			<template v-if="showMenu">
+			<template v-if="showMenu && this.menu">
 				<h3 >Lehrveranstaltungs Menu</h3>
 				<lv-menu :menu="menu"></lv-menu>
 			</template>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index ba3a3c649..4a751a637 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -118,7 +118,8 @@ export const Stundenplan = {
 		loadEvents: function(){
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.viewData.lv_id),
-				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
+				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -147,14 +148,49 @@ export const Stundenplan = {
 				this.events = promise_events;
 			});
 		},
+		loadMoodleEvents: function(start_date, end_date){
+			
+			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
+			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+				let data =events.map(event =>{
+					const start_date = new Date(event.timestart * 1000);
+					const formatted_year = Intl.DateTimeFormat(this.$p.user_locale, { year: 'numeric' }).format(start_date);
+					const formatted_month = Intl.DateTimeFormat(this.$p.user_locale, { month: '2-digit' }).format(start_date);
+					const formatted_day = Intl.DateTimeFormat(this.$p.user_locale, { year: '2-digit' }).format(start_date);
+					const formatted_date = `${formatted_year}-${formatted_month}-${formatted_day}`;
+					return {
+						type:'moodle',
+						beginn: "14:00:00",
+						ende: "15:00:00",
+						allDayEvent: true,
+						datum: formatted_date,
+						topic: event.activityname,
+						lektor:[],
+						gruppe:[],
+						ort_kurzbz: event.location,
+						lehreinheit_id:0,
+						titel: event.activitystr,
+						lehrfach:'',
+						lehrform:'',
+						lehrfach_bez:'',
+						organisationseinheit:'',
+						farbe:'00689E',
+						lehrveranstaltung_id:0,
+						ort_content_id:0,
+					}
+				});
+				return {
+					data: data,
+					meta: { status: 'success' }
+				};
+			})
+			
+		},
 	},
 	created()
 	{
-		let time_start = Math.floor(this.eventCalendarDate.firstDayOfCalendarMonth.getTime() / 1000);
-		let time_end = Math.floor(this.eventCalendarDate.lastDayOfCalendarMonth.getTime() / 1000);
-		this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', time_start, time_end).then((response) => {
-			console.log(response);
-		})
+		
 		this.$fhcApi.factory.authinfo.getAuthUID().then((res) => res.data)
 		.then(data=>{
 			this.uid = data.uid;
@@ -185,20 +221,24 @@ export const Stundenplan = {
 			</span>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event?.orig); " type="button"
-			class=" position-relative border border-secondary border d-flex flex-col align-items-center
-			justify-content-evenly h-100" style="overflow: auto;">
-
-				<div v-if="event?.orig?.beginn && event?.orig?.ende" class="d-none d-xl-block" >
+			<div @click="showModal(event); " type="button"
+			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+			:class="{'p-1':event.allDayEvent}"
+			style="overflow: auto;">
+				<div v-if="!event.allDayEvent && event?.beginn && event?.ende" class="d-none d-xl-block" >
 					<div class="d-flex flex-column p-4 p-xl-2 border-end border-secondary">
-						<span class="small">{{convertTime(event.orig.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.orig.ende.split(":"))}}</span>
+						<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+						<span class="small">{{convertTime(event.ende.split(":"))}}</span>
 					</div>
 				</div>
-				<div class="d-flex flex-column flex-grow-1 align-items-center" style="font-size: 0.75rem">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
+					<span >moodle:</span>
+					<span class="flex-grow-1 text-center">{{event.titel}}</span>
+				</div>
+				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
+					<span>{{event.topic}}</span>
+					<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event.ort_kurzbz}}</span>
 				</div>
 			</div>
 		</template>

From f89c194d3288d83aec44082fd1f8db4b7010618c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Feb 2025 11:36:00 +0100
Subject: [PATCH 0051/1357] add Vorlagendropdown Component and Listboxes for
 Messaging Variables

---
 .../api/frontend/v1/messages/Messages.php     | 246 +++++++++-
 .../api/frontend/v1/vorlagen/Vorlagen.php     |  63 +++
 application/models/system/Message_model.php   |  42 ++
 application/models/system/Vorlage_model.php   | 116 +++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/messages/person.js              |  29 ++
 public/js/api/vorlagen.js                     |   8 +
 .../components/Messages/Details/NewMessage.js | 440 +++++++++++++++++-
 .../Messages/Details/TableMessages.js         |  53 ++-
 public/js/components/Messages/Messages.js     |   6 +-
 .../Studentenverwaltung/Details/Messages.js   |   7 +-
 .../VorlagenDropdown/VorlagenDropdown.js      | 109 +++++
 system/phrasesupdate.php                      |  20 +
 13 files changed, 1123 insertions(+), 20 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
 create mode 100644 public/js/api/vorlagen.js
 create mode 100644 public/js/components/VorlagenDropdown/VorlagenDropdown.js

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index adf1d52e9..ac107f687 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -9,6 +9,14 @@ class Messages extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getMessages' => ['admin:r', 'assistenz:r'],
+			'getVorlagen' => ['admin:r', 'assistenz:r'],
+			'getMessageVarsPerson' => ['admin:r', 'assistenz:r'],
+			'getMsgVarsPrestudent' => ['admin:r', 'assistenz:r'],
+			'getMsgVarsLoggedInUser' => ['admin:r', 'assistenz:r'],
+			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
+			'sendMessage' => ['admin:r', 'assistenz:r'],
+			'deleteMessage' => ['admin:r', 'assistenz:r'],
+			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -20,6 +28,7 @@ class Messages extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
+		$this->load->library('MessageLib');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -29,11 +38,17 @@ class Messages extends FHCAPI_Controller
 
 	public function getMessages($id, $type_id)
 	{
-		//$this->terminateWithError("in backend " . $type_id . ": " . $id, self::ERROR_TYPE_GENERAL);
-
-		if ($type_id != "person_id")
+		switch($type_id)
 		{
-			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+			case 'uid':
+				$id = $this->_getPersonIdFromUid($id);
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getMessages logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
 		}
 
 		$result = $this->MessageModel->getMessagesForTable($id);
@@ -42,4 +57,227 @@ class Messages extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
+
+	public function getVorlagen()
+	{
+		//get oe of user
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
+
+	//	$this->terminateWithError("oe: ". $oe_kurzbz->oe_kurzbz, self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		//39 Stück Variante OE
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+
+		//IF ADMIN 167
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+		//only HTML-vorlagen -> for admin
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getVorlagentext($vorlage_kurzbz)
+	{
+		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
+		//$studiengang_kz = 227; //TODO(Manu) check dynamisieren NULL
+		$studiengang_kz = 0;
+		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
+
+		$result = $this->VorlagestudiengangModel->loadWhere(
+			[
+				'vorlage_kurzbz' =>$vorlage_kurzbz,
+				'studiengang_kz' => $studiengang_kz
+			]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//not correct with Vorlage
+		$vorlage = current($data);
+
+		//$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($vorlage->text);
+	}
+
+	public function getMessageVarsPerson()
+	{
+		$result = $this->MessageModel->getMessageVarsPerson();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getMsgVarsPrestudent($uid)
+	{
+
+		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
+
+	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
+
+		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getMsgVarsLoggedInUser()
+	{
+		$uid = getAuthUID();
+
+		$result = $this->MessageModel->getMsgVarsLoggedInUser();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getNameOfDefaultRecipient($id, $type_id)
+	{
+		switch($type_id)
+		{
+			case 'uid':
+				$id = $this->_getPersonIdFromUid($id);
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getNameOfDefaultRecipient logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
+		}
+
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$result = $this->PersonModel->load($id);
+		//$this->terminateWithSuccess($result);
+		$data = $this->getDataOrTerminateWithError($result);
+		$name = current($data);
+
+		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
+	}
+
+	public function sendMessage($recipient_id)
+	{
+		//TODO(manu) Problems with Vorlagen...
+		//TODO(Manu) Problems with VARS
+		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
+
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$subject = $this->input->post('subject');
+
+		$body = $this->input->post('body');
+
+	//	$this->terminateWithError("rp_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+
+/*		$subject = $this->input->post('subject');
+
+		$formData = $this->input->post('data');*/
+
+		//$_POST['subject'] = $formData['subject'];
+	//	$subject = $formData['subject'];
+	//	$body = $formData['body'];
+
+	//	$subject = isset($_POST['subject']) ? $_POST['subject'] : null;
+	//	$body = isset($_POST['body']) ? $_POST['body'] : null;
+
+	//	$this->terminateWithError("person_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+
+	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
+	//	$this->terminateWithError("body " . $body, self::ERROR_TYPE_GENERAL);
+
+	//	$this->terminateWithError("person_id " . $benutzer->person_id, self::ERROR_TYPE_GENERAL);
+	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $body, $benutzer->person_id);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deleteMessage($messageId)
+	{
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->MessageModel->deleteMessageRecipient($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->deleteMessageStatus($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->deleteMessage($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+
+		$this->terminateWithSuccess($result);
+	}
+
+	private function _getPersonIdFromUid($uid)
+	{
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		return $benutzer->person_id;
+	}
+
+	private function _getPrestudentIdFromUid($uid)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['student_uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+		return $student->prestudent_id;
+	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
new file mode 100644
index 000000000..01edb33d1
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
@@ -0,0 +1,63 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Vorlagen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getVorlagen' => ['admin:r', 'assistenz:r'],
+			'getVorlagenByLoggedInUser' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		// Additional Permission Checks
+		//TODO(manu) check permissions
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+		$this->load->library('VorlageLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getVorlagen()
+	{
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getVorlagenByLoggedInUser()
+	{
+		//get oe of user
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
+
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+}
\ No newline at end of file
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 1b201fc1b..7ecb54a9e 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -282,4 +282,46 @@ class Message_model extends DB_Model
 
 		return $this->execQuery($sql, $parametersArray);
 	}
+
+	/**
+	 * Deletes a messages from tableMessages and tbl_msg_recipient
+	 * TODO(MANU) CHECK IF NECESSARY
+	 * dependency with other tables
+	 * in case of reply... more messages
+	 * maybe anonimize it
+	 * @param $message_id
+	 * @return boolean success
+	 */
+	public function deleteMessageRecipient($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_recipient
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+
+
+	public function deleteMessageStatus($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_status
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+
+	public function deleteMessage($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_message
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+	
+	
 }
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
index 8022e71fc..69aa0aa3f 100644
--- a/application/models/system/Vorlage_model.php
+++ b/application/models/system/Vorlage_model.php
@@ -21,4 +21,120 @@ class Vorlage_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Returns all Vorlagen
+	 * that belongs to the organisation units of the user
+	 * and the parents of those organisation units until the root of the
+	 * @param Array Array of $oe_kurzbz
+	 * @return object Array of Vorlagen
+	 */
+	public function getAllVorlagenByOe($oe_kurzbz)
+	{
+		// Loads library OrganisationseinheitLib
+		$this->load->library('OrganisationseinheitLib');
+
+		$vorlage = success(array()); // Default value
+
+		$table = '(
+					SELECT v.vorlage_kurzbz,
+							v.bezeichnung,
+							vs.version,
+							vs.oe_kurzbz,
+							vs.aktiv,
+							vs.subject,
+							vs.text,
+							v.mimetype
+					FROM tbl_vorlagestudiengang vs
+					JOIN tbl_vorlage v USING(vorlage_kurzbz)
+				) templates';
+
+		$alias = 'templates';
+
+		$fields = array(
+			'templates.vorlage_kurzbz AS id',
+			'templates.bezeichnung || \' (\' || UPPER(templates.oe_kurzbz) || \')\' AS description'
+		);
+
+		$where = 'templates.aktiv = TRUE
+					AND templates.subject IS NOT NULL
+					AND templates.text IS NOT NULL
+					AND templates.mimetype = \'text/html\'
+			   GROUP BY 1, 2, 3';
+
+		$order_by = 'description ASC';
+
+		if (!is_array($oe_kurzbz))
+		{
+			$vorlage = $this->organisationseinheitlib->treeSearchEntire(
+				$table,
+				$alias,
+				$fields,
+				$where,
+				$order_by,
+				$oe_kurzbz
+			);
+		}
+		else // is an array
+		{
+			// Get the vorlage for each organisation unit
+			foreach($oe_kurzbz as $val)
+			{
+				$tmpVorlage = $this->organisationseinheitlib->treeSearchEntire(
+					$table,
+					$alias,
+					$fields,
+					$where,
+					$order_by,
+					$val
+				);
+
+				// Everything is ok and data are inside
+				if (hasData($tmpVorlage))
+				{
+					// If it's the first vorlage copy it
+					if (!hasData($vorlage))
+					{
+						for ($j = 0; $j < count(getData($tmpVorlage)); $j++)
+						{
+							if (getData($tmpVorlage)[$j]->id != '')
+							{
+								array_push($vorlage->retval, getData($tmpVorlage)[$j]);
+							}
+						}
+					}
+					else // checks for duplicates, if it's not already present push it into the array getData($vorlage)
+					{
+						for ($j = 0; $j < count(getData($tmpVorlage)); $j++)
+						{
+							$found = false;
+							$currentTmpVorlageData = null;
+
+							for ($i = 0; $i < count(getData($vorlage)); $i++)
+							{
+								$currentTmpVorlageData = getData($tmpVorlage)[$j];
+
+								if (getData($vorlage)[$i]->id == getData($tmpVorlage)[$j]->id
+									&& getData($vorlage)[$i]->_pk == getData($tmpVorlage)[$j]->_pk
+									&& getData($vorlage)[$i]->_ppk == getData($tmpVorlage)[$j]->_ppk
+									&& getData($vorlage)[$i]->_jtpk == getData($tmpVorlage)[$j]->_jtpk)
+								{
+									$found = true;
+									break;
+								}
+							}
+
+							if (!$found && $currentTmpVorlageData->id != '')
+							{
+								array_push($vorlage->retval, $currentTmpVorlageData);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $vorlage;
+	}
+
 }
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 7bc510b6e..8a4a2132a 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -34,6 +34,7 @@ import cms from "./cms.js";
 import lehre from "./lehre.js";
 import addons from "./addons.js";
 import messages from "./messages.js";
+import vorlagen from "./vorlagen.js";
 
 export default {
     search,
@@ -54,5 +55,6 @@ export default {
     cms,
     lehre,
     addons,
-    messages
+    messages,
+    vorlagen
 };
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index baf8bd39f..6a0ac8c7c 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -2,4 +2,33 @@ export default {
 	getMessages(url, config, params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
 	},
+	getVorlagen(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
+	},
+	getMsgVarsLoggedInUser(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
+	},
+	getMessageVarsPerson(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
+	},
+	getMsgVarsPrestudent(uid){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
+	},
+	getVorlagentext(vorlage_kurzbz){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
+	},
+	getNameOfDefaultRecipient(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
+	},
+	sendMessage(form, id, data) {
+	console.log("factory " + id);
+		console.log(JSON.stringify(data));
+
+		return this.$fhcApi.post(form, 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			data
+		);
+	},
+	deleteMessage(messageId){
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/vorlagen.js b/public/js/api/vorlagen.js
new file mode 100644
index 000000000..2933ccf97
--- /dev/null
+++ b/public/js/api/vorlagen.js
@@ -0,0 +1,8 @@
+export default {
+	getVorlagen() {
+		return this.$fhcApi.get('api/frontend/v1/vorlagen/vorlagen/getVorlagen/');
+	},
+	getVorlagenByLoggedInUser() {
+		return this.$fhcApi.get('api/frontend/v1/vorlagen/vorlagen/getVorlagenByLoggedInUser/');
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index bf60842d2..2d85c8e00 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -1,12 +1,448 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
+
+
 export default {
+	components: {
+		FormForm,
+		FormInput,
+		ListBox,
+		DropdownComponent
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+	},
 	data(){
 		return {
-
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			isVisible: true,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			selectedFieldStudent: null,
+			itemsStudent: [
+				{ label: "Variable 1", value: "var1" },
+				{ label: "Variable 2", value: "var2" },
+				{ label: "Variable 3", value: "var3" }
+			]
 		}
 	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage(){
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData));
+			return this.$fhcApi.factory.messages.person.sendMessage(this.$refs.formVorlage, this.id, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			//console.log(typeof vorlage_kurzbz);
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		//TODO(Manu) refactor
+/*		insertVariablePrestudent() {
+				if (this.editor) {
+					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+					const lastVariable = this.selectedFieldPrestudent.value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				} else {
+				console.error("Editor instance is not available.");
+			}
+		},*/
+/*		insertVariablePrestudentByClick(selectedItem) {
+
+			if (selectedItem) {
+				this.editor.insertContent(selectedItem.value + " ");
+				console.log("Eingefügte Variable:", selectedItem);
+			} else {
+				console.warn("Keine Variable ausgewählt!");
+			}
+		},
+
+		insertVariablePerson() {
+				if (this.editor) {
+					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+					const lastVariable = this.selectedFieldPerson.value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		insertVariableUser() {
+			if (this.editor) {
+				console.log(this.selectedFieldUser.value);
+				const lastVariable = this.selectedFieldUser.value;
+
+				//Multiple
+				//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				this.selectedFieldUser = null;
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		insertVariableStudent(selectedItem) {
+			if (selectedItem) {
+				console.log("Eingefügte Variable:", selectedItem);
+				this.editor.insertContent(selectedItem.value + " ");
+			} else {
+				console.warn("Keine Variable ausgewählt!");
+			}
+		},*/
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+		},
+		toggleDivNewMessage(){
+			this.isVisible = !this.isVisible;
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+			//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+				//TODO(Manu) own function or retval to getVorlagentext
+				//component VorlagenComponent
+
+			}
+		}
+	},
+	created(){
+
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key,
+						value: value
+					}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key,
+						value: '{' + key + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
 	template: `
 	<div class="messages-detail-newmessage">
-		<h4>New Message</h4>
+	
+		<div v-show="isVisible">
+			<h4>New Message</h4>
+			
+				{{typeId}} {{id}}
+			
+				{{formData.subject}}
+				{{formData.vorlage_kurzbz}}
+	
+			<p v-if="formData.body">
+				formData.body befüllt
+			</p>
+
+			<div class="row">
+			
+				<div class="col-sm-8">
+		
+					<form-form class="row g-3 mt-2" ref="formMessage">
+					
+						<div class="row mb-3">
+						
+							<form-input
+								type="text"
+								name="recipient"
+								:label="$p.t('messages/recipient')"
+								v-model="defaultRecipient"
+								disabled
+							>
+							</form-input>					
+						</div>
+						
+						<div class="row mb-3">
+							<form-input
+								type="text"
+								name="subject"
+								:label="$p.t('global/betreff') + ' *'"
+								v-model="formData.subject"
+							>
+							</form-input>					
+						</div>
+				
+						<!--Tiny MCE-->
+						<div class="row mb-3">
+							<form-input
+								ref="editor"
+								:label="$p.t('global','nachricht')  + ' *'"
+								type="textarea"
+								v-model="formData.body"
+								name="text"
+								rows="15"
+								cols="75"
+								>
+							</form-input>
+						</div>
+								
+						<div class="row">				
+							<DropdownComponent
+								ref="dropdownComp"
+								:label="$p.t('global/vorlage')"
+								@change="handleSelectedVorlage"
+								useLoggedInUserOe
+							>
+							</DropdownComponent>
+						</div>
+											
+					</form-form>
+				</div>
+		
+				<div class="col-sm-4">
+				
+					<div v-if="this.fieldsPrestudent.length > 0">
+						<strong>Felder Prestudent</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						
+						<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+						<p>{{selectedFieldPrestudent}}</p>
+
+					</div>
+					
+					<div v-if="this.fieldsPerson.length > 0">
+						<strong>Felder Person</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+						<p>{{selectedFieldPerson}}</p>
+					</div>
+							
+					<div>
+						<strong>Meine Felder</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+					</div>
+					
+					
+					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					
+						<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+						
+						<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+						<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+					</div>
+					
+				</div>
+				
+			</div>
+		</div>
+		
+		<hr>
+		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
+		<hr>
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index c4fd4d4d7..0025d7b47 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,15 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-//import FormInput from '../../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-	//	FormInput
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
 	},
 	props: {
 		endpoint: {
@@ -121,7 +124,7 @@ export default {
 							button.addEventListener(
 								'click',
 								() =>
-									this.deleteMessage(cell.getData().message_id)
+									this.actionDeleteMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -197,7 +200,6 @@ export default {
 							const selectedMessage = row.getData().message_id;
 							const body = row.getData().body;
 							this.previewBody = body;
-							console.log(selectedMessage);
 					}
 				},
 			],
@@ -209,11 +211,45 @@ export default {
 		reply(message_id){
 			console.log("in reply " + message_id);
 		},
+		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){
-			console.log("deleteMessage " + message_id);
+		//	console.log("deleteMessage " + message_id);
+			return this.$fhcApi.factory.messages.person.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(){
-			console.log("action new message");
+			//console.log("action new message");
+			if (this.openMode == "window") {
+				console.log("openInNewWindow")
+				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
+				window.open(linkWindowNewMessage, '_blank');
+			}
+			else if (this.openmode == "modal"){
+				console.log("open with bootstrap Modal");
+			}
+			else if (this.openmode == "showDiv"){
+				console.log("open div in NewMessage.js");
+				//emit to NewMessage.js
+			}
+			else
+				console.log("no valid openmode: yet to be developed");
+		},
+		reload() {
+			this.$refs.table.reloadTable();
 		},
 	},
 	computed: {
@@ -238,8 +274,9 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-		<p>endpoint: {{endpoint}}</p>
-		<p>{{messageLayout}}</p>
+<!--		<p>endpoint: {{endpoint}}</p>-->
+<!--				{{cisRoot}}-->
+<!--		<p>{{messageLayout}}</p>-->
 
 		<!-- {{statusText[0] }}
 		<hr>
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 3fd6e2a02..a7cccb8cb 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -34,10 +34,12 @@ export default {
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
-	<p>endpoint Messages.js: {{endpoint}}</p>
+<!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
 			<NewMessage
-				
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
 			>
 			</NewMessage>
 		</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index e9f542945..14d74e56c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -12,10 +12,11 @@ export default {
 		<core-messages
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
-			type-id="person_id"
-			:id="modelValue.person_id"
-			messageLayout="listTableTop"
+			type-id="uid"
+			:id="modelValue.uid"
+			messageLayout="twoColumnsTableLeft"
 			show-table
+			show-new
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
new file mode 100644
index 000000000..e4c48501a
--- /dev/null
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -0,0 +1,109 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import FormForm from '../Form/Form';
+import FormInput from '../Form/Input.js';
+
+export default {
+	components: {
+		FormForm,
+		FormInput,
+		CoreFilterCmpt
+	},
+	props: {
+		label: {
+			type: String,
+			required: true
+		},
+		modelValue: {
+			type: String,
+			required: true
+		},
+/*		oe: {
+			type: Array,
+			required: false
+		}, */
+		isAdmin: {
+			type: Boolean,
+			required: true
+		},
+		useLoggedInUserOe: {
+			type: Boolean,
+			required: true
+		}
+	},
+	data() {
+		return {
+			vorlagen: [],
+			selectedValue: null,
+			vorlagenOe: []
+		}
+	},
+	methods: {
+		updateValue() {
+		//	console.log("in COMPO: update: " + this.selectedValue + ' jetzt ' + 'InfocenterMailErgaenzungsprfEng');
+			this.$emit('change', this.selectedValue);
+			//this.$emit('change', this.selectedValue); // Emit-Event beim Ändern des Wertes
+		},
+		setValue(value) {
+			this.selectedValue = value;
+		},
+	},
+	 created() {
+
+		if(this.isAdmin) {
+			this.$fhcApi.factory.vorlagen.getVorlagen()
+				.then(result => {
+					this.vorlagen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		if(this.useLoggedInUserOe){
+			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
+				.then(result => {
+					console.log(this.vorlagenOe);
+					this.vorlagenOe = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+template: `
+	<div class="core-vorlagen-dropdown">
+		<div v-if="isAdmin" class="col-sm-8 pt-3">
+			<form-input
+				ref="dropdown"
+				type="select"
+				:label="label"
+				@change="updateValue"
+				v-model="selectedValue"
+				>
+				<option 
+					v-for="vorlage in vorlagen" 
+					:key="vorlage.vorlage_kurzbz" 
+					:value="vorlage.vorlage_kurzbz" 
+					>
+					{{vorlage.bezeichnung}}
+				</option>
+			</form-input>
+		</div>
+		
+		<div v-if="useLoggedInUserOe" class="col-sm-8 pt-3">
+			<form-input
+				ref="dropdown"
+				type="select"
+				:label="label"
+				@change="updateValue"
+				v-model="selectedValue"
+				>
+				<option 
+					v-for="vorlage in vorlagenOe" 
+					:key="vorlage.id" 
+					:value="vorlage.id" 
+					>
+					{{vorlage.description}}
+				</option>
+			</form-input>
+		</div>
+		
+	</div>
+	`,
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 95a505a23..63cf34038 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37519,6 +37519,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successSent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachricht erfolgreich versandt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Message sent successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From 5cb09c8e7b060179c659f897c8724df6079c3165 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 19 Feb 2025 14:50:19 +0100
Subject: [PATCH 0052/1357] fix(LvMenu): fixes the highlighting styles for the
 lvMenu, instead of using fhc-entry it uses its own class

---
 public/css/Cis4/Cis.css                 | 6 +++++-
 public/js/components/Cis/Mylv/LvMenu.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 2fbfb0cd7..ab8f30260 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -53,7 +53,11 @@ html {
   }
 }
 
-
+/* lvMenu entry style */
+#cis-menu .menu-entry:hover{
+	background-color: var(--fhc-cis-primary);
+	color:white;
+}
 
 /* buttons */
 #cis-header .btn-level-1,
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index e64dbd667..d6a84527a 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -57,13 +57,13 @@ export default {
 	},
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
-	<div v-else>
+	<div id="cis-menu" v-else>
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
 							<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
 					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }"  role="button" :href="c4_link(menuItem)"
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
-					class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>

From 40f64cc9796d960ef3a8ba5398bf30e5b25487eb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 19 Feb 2025 14:52:51 +0100
Subject: [PATCH 0053/1357] feature(Calendar Moodle): adds and modifies the
 week and day view for moodle events

---
 public/js/components/Calendar/Calendar.js     |   4 +-
 public/js/components/Calendar/Day.js          |   4 +-
 public/js/components/Calendar/Day/Page.js     |  37 ++++-
 public/js/components/Calendar/Week/Page.js    |   6 +-
 public/js/components/Cis/Mylv/LvInfo.js       | 127 +++++++++++-------
 public/js/components/Cis/Mylv/LvModal.js      |  12 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  83 +++++++-----
 system/phrasesupdate.php                      |  20 +++
 8 files changed, 195 insertions(+), 98 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 8d4c56cfe..cdef23aa9 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -247,8 +247,8 @@ export default {
 			<template #dayPage="{event,day,mobile}">
 				<slot name="dayPage" :event="event" :day="day" :mobile="mobile"></slot>
 			</template>
-			<template #pageMobilContent="{lvMenu}">
-				<slot name="pageMobilContent" :lvMenu="lvMenu"></slot>
+			<template #pageMobilContent="{lvMenu, event}">
+				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
 			</template>
 			<template #pageMobilContentEmpty>
 				<slot name="pageMobilContentEmpty" ></slot>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index 2f07efef3..a83ea6818 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -50,8 +50,8 @@ export default {
 				<template #dayPage="{event,day,mobile}">
 					<slot name="dayPage" :event="event" :day="day" :mobile="mobile" ></slot>
 				</template>
-				<template #pageMobilContent="{lvMenu}">
-					<slot name="pageMobilContent" :lvMenu="lvMenu" ></slot>
+				<template #pageMobilContent="{lvMenu, event}">
+					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
 				</template>
 				<template #pageMobilContentEmpty>
 					<slot name="pageMobilContentEmpty" ></slot>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 3d5cc5f02..4f83f7c36 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -93,6 +93,16 @@ export default {
 		}
 	},
 	computed: {
+		allDayEvents() {
+			let allDayEvents = {};
+			for (let day in this.events) {
+				const filteredAllDayEvents = this.events[day].filter(event => event.allDayEvent);
+				if (filteredAllDayEvents.length > 0) {
+					allDayEvents[day] = filteredAllDayEvents;
+				}
+			};
+			return allDayEvents;
+		},
 		overlayStyle() {
 			return {
 				'background-color': '#F5E9D7',
@@ -183,6 +193,7 @@ export default {
 			let d = {events: [], lanes: 1};
 			if (this.events[key]) {
 				this.events[key].forEach(evt => {
+					if (evt.allDayEvent) return;
 					let event = {
 						orig: evt,
 						lane: 1,
@@ -282,7 +293,7 @@ export default {
 			}
 		},
 		eventClick(evt) {
-			let event = evt.orig;
+			let event = evt.orig || evt;
 			this.setSelectedEvent(event);
 			this.$emit('input', event);
 		},
@@ -374,18 +385,32 @@ export default {
 									<div class="hours">
 										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
-									<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+										<div class="position-absolute w-100" style="top:0; bottom:0;">
+											<div class="position-sticky d-grid " style="top:0;" v-for="(events,_day) in allDayEvents" :key="day">
+												<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="eventClick(event)"
+													:selected="event == selectedEvent"
+													:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+													class="small rounded overflow-hidden fhc-entry"
+													v-contrast
+													>
+													<slot class="p-1" name="dayPage" :event="event" :day="day">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+											</div>
+										</div>
 										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast :selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden " >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
 											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event" :day="day" :mobile="false">
+												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
 											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
 											<div class="d-block d-xl-none h-100" @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event" :day="day" :mobile="true">
+												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
@@ -401,8 +426,8 @@ export default {
 			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
 				<div style="z-index:0; max-height: 100%" class="sticky-top d-flex justify-content-center align-items-center flex-column">
 					<div style="max-height: 100%; overflow-y:auto;" class="w-100">
-						<template v-if="selectedEvent && lvMenu">
-							<slot name="pageMobilContent" :lvMenu="lvMenu" >
+						<template v-if="selectedEvent ">
+							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
 								<p>this is a slot placeholder</p>
 							</slot>
 						</template>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 504293d07..37cd47be8 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -365,11 +365,11 @@ export default {
 					</div>
 					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<div class="position-absolute w-100" style="top:0; bottom:0;">
-							<div class="position-sticky d-grid gap-1" style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
+							<div class="position-sticky d-grid " style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
 								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'z-index':2}"
-									class="small rounded overflow-hidden fhc-entry "
+									:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+									class="small rounded overflow-hidden fhc-entry"
 									v-contrast
 									>
 									<slot class="p-1" name="weekPage" :event="event" :day="day">
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index df82f5cca..cfddc2c6a 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -1,6 +1,5 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
 
-
 export default {
 	props: {
 		event: Object,
@@ -11,17 +10,23 @@ export default {
 		}
 	},
 	computed: {
-		lektorenLinks: function(){
+		LV_TYPES: function () {
+			return {
+				lehreinheit: "lehreinheit",
+				reservierung: "reservierung",
+				moodle: "moodle",
+			};
+		},
+		lektorenLinks: function () {
 			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
 
-			let lektorenLinks ={};
-			this.event.lektor.forEach((lektor)=>{
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
 				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
 			})
 			return lektorenLinks;
 		},
-		getOrtContentLink: function()
-		{
+		getOrtContentLink: function () {
 			if (!this.event || !this.event.ort_content_id) return "a";
 
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
@@ -61,52 +66,74 @@ export default {
 					<td>{{methodFormatDate(event.datum)}}</td>
 				</tr>
 				<tr>
-					<th>{{
-						$p.t('global','raum')?
-						$p.t('global','raum')+':'
-						:''
-					}}</th>
-					<td>
-						<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-						{{event.ort_kurzbz}}
-					</td>
+					<template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('global','aktivitaet')}}:</th>
+						<td>{{event?.assignment}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</template>
+				</tr>
+				<template v-if="event.type != LV_TYPES.moodle">
+					<tr>
+						<th>{{
+							$p.t('lehre','lehrveranstaltung')?
+							$p.t('lehre','lehrveranstaltung')+':'
+							:''
+						}}</th>
+						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+					</tr>
+				</template>
+				<template v-if="event.type != LV_TYPES.moodle">
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+				</template>
+				<tr>
+					<template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('global','typ')}}:</th>
+						<td>{{event?.purpose}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('ui','zeitraum')?
+							$p.t('ui','zeitraum')+':'
+							:''
+						}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</template>
 				</tr>
 				<tr>
-					<th>{{
-						$p.t('lehre','lehrveranstaltung')?
-						$p.t('lehre','lehrveranstaltung')+':'
-						:''
-					}}</th>
-					<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('lehre','lektor')?
-						$p.t('lehre','lektor')+':'
-						:''
-					}}</th>
-					<td>
-						<div v-for="lektor in event.lektor" class="d-block">
-							<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-							{{lektor.kurzbz}}
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('ui','zeitraum')?
-						$p.t('ui','zeitraum')+':'
-						:''
-					}}</th>
-					<td>{{start_time + ' - ' + end_time}}</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('lehre','organisationseinheit')?
-						$p.t('lehre','organisationseinheit')+':'
-						:''
-					}}</th>
-					<td>{{event.organisationseinheit}}</td>
+				    <template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('fristenmanagement','frist')}}:</th>
+						<td>{{start_time}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('lehre','organisationseinheit')?
+							$p.t('lehre','organisationseinheit')+':'
+							:''
+						}}</th>
+						<td>{{event.organisationseinheit}}</td>
+					</template>
 				</tr>
 			</tbody>
 		</table>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index acb2a7693..4be4e5c79 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -70,11 +70,19 @@ export default {
 	template: /*html*/ `
 	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
+			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
+			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+			<h3>
+				<template v-if="event?.type =='moodle'">
+					{{$p.t('lvinfo','Moodleinformationen')}}
+				</template>
+				<template v-else>
+					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+				</template>
+			</h3>
 			<lv-info :event="event"></lv-info>
 			<template v-if="showMenu && this.menu">
 				<h3 >Lehrveranstaltungs Menu</h3>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4a751a637..af19e218b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -154,23 +154,28 @@ export const Stundenplan = {
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
 			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
 				let data =events.map(event =>{
-					const start_date = new Date(event.timestart * 1000);
-					const formatted_year = Intl.DateTimeFormat(this.$p.user_locale, { year: 'numeric' }).format(start_date);
-					const formatted_month = Intl.DateTimeFormat(this.$p.user_locale, { month: '2-digit' }).format(start_date);
-					const formatted_day = Intl.DateTimeFormat(this.$p.user_locale, { year: '2-digit' }).format(start_date);
-					const formatted_date = `${formatted_year}-${formatted_month}-${formatted_day}`;
+					const event_start_date = new Date(Number(event.timestart) * 1000);
+					const event_end_date = new Date(((Number(event.timestart) + Number(event.timeduration)) * 1000));
+					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
+					// to get the same date and time as in moodle, we use the default UTC time zone 
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false, timeZone:'UTC'});
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false, timeZone: 'UTC' });
+					
 					return {
 						type:'moodle',
-						beginn: "14:00:00",
-						ende: "15:00:00",
+						beginn: formatted_start_time,
+						ende: formatted_end_time,
 						allDayEvent: true,
 						datum: formatted_date,
-						topic: event.activityname,
+						purpose: event.purpose,
+						assignment: event.activityname,
+						topic: event.activitystr,
 						lektor:[],
 						gruppe:[],
 						ort_kurzbz: event.location,
-						lehreinheit_id:0,
-						titel: event.activitystr,
+						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
+						lehreinheit_id:event.lehreinheitsNummber??null,
+						titel: event.course.fullname,
 						lehrfach:'',
 						lehrform:'',
 						lehrfach_bez:'',
@@ -233,7 +238,7 @@ export const Stundenplan = {
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
 					<span >moodle:</span>
-					<span class="flex-grow-1 text-center">{{event.titel}}</span>
+					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
 					<span>{{event.topic}}</span>
@@ -243,34 +248,46 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row m-0 h-100 justify-content-center align-items-center text-center">
-				<div class="col-auto" v-if="event?.orig?.beginn && event?.orig?.ende" >
-					<div class="d-flex flex-column p-4 border-end border-secondary">
-						<span class="small">{{convertTime(event.orig.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.orig.ende.split(":"))}}</span>
+			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
+				<template v-if="event.type=='moodle'">
+					<div class="d-flex align-items-center w-100" >
+						<span class="p-2">moodle:</span>
+						<span class="flex-grow-1 text-center">{{event.topic}}</span>
 					</div>
-				</div>
-				<div class="col ">
-					<p>Lehrveranstaltung:</p>
-					<p class="m-0">{{event?.orig.topic}}</p>
-				</div>
-				<div class="col ">
-					<p>Lektor:</p>
-					<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
-				</div>
-				<div class="col ">
-					<p>Ort: </p>
-					<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
-				</div>
+				</template>
+				<template v-else>
+					<div class="row justify-content-center align-items-center">
+						<div class="col-auto" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+							<div class="d-flex flex-column p-4 border-end border-secondary">
+								<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+								<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+							</div>
+						</div>
+						<div class="col ">
+							<p>Lehrveranstaltung:</p>
+							<p class="m-0">{{event?.topic}}</p>
+						</div>
+						<div class="col ">
+							<p>Lektor:</p>
+							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
+						</div>
+						<div class="col ">
+							<p>Ort: </p>
+							<p class="m-0">{{event?.ort_kurzbz}}</p>
+						</div>
+					</div>
+				</template>
 			</div>
 		</template>
-		<template #pageMobilContent="{lvMenu}">
+		<template #pageMobilContent="{lvMenu, event}">
 			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<div class="w-100">
-				<lv-info  :event="currentlySelectedEvent" />
+				<lv-info  :event="event" />
 			</div>
-			<h3 >Lehrveranstaltungs Menu</h3>
-			<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
+			<template v-if="event.type != 'moodle'">
+				<h3 >Lehrveranstaltungs Menu</h3>
+				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
+			</template>
 		</template>
 		<template #pageMobilContentEmpty >
 			<h3>Keine Lehrveranstaltungen</h3>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d841acc85..f55698ec3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20164,6 +20164,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'Moodleinformationen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Moodle Informationen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Moodle Information",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From f3527dc8fff3ff167a76f882e7da658de9ab8ea1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Feb 2025 16:37:30 +0100
Subject: [PATCH 0054/1357] bugfix function getMitarbeiterUid

---
 .../controllers/api/frontend/v1/vertraege/Vertraege.php  | 9 ++++-----
 application/models/ressource/Mitarbeiter_model.php       | 1 +
 public/js/api/vertraege/person.js                        | 2 +-
 public/js/components/Vertraege/Vertraege.js              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index b593a1f3e..02d0ab5f9 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -29,7 +29,7 @@ class Vertraege extends FHCAPI_Controller
 			'getHeader' => ['vertrag/mitarbeiter:r'],
 			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
 			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
-			'getMitarbeiter_uid' => ['vertrag/mitarbeiter:r'],
+			'getMitarbeiterUid' => ['vertrag/mitarbeiter:r'],
 			]);
 
 		//Load Models and Libraries
@@ -702,10 +702,9 @@ class Vertraege extends FHCAPI_Controller
 	{
 		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
 
-		$result = $this->Mitarbeitermodel->getMitarbeiter_uid($person_id);
+		$result = $this->Mitarbeitermodel->getMitarbeiterUid($person_id);
 
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		//no error here: ma_uid | null as result
+		$this->terminateWithSuccess($result);
 	}
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index f7951083c..e67635538 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -387,5 +387,6 @@ class Mitarbeiter_model extends DB_Model
 
 		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
 		return $uid;
+
 	}
 }
diff --git a/public/js/api/vertraege/person.js b/public/js/api/vertraege/person.js
index 01ba309f0..c2f82b9e7 100644
--- a/public/js/api/vertraege/person.js
+++ b/public/js/api/vertraege/person.js
@@ -63,7 +63,7 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
 	},
 	getMitarbeiterUid(person_id){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiter_uid/' + person_id);
+		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id);
 	},
 
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 67a779638..94104e3c5 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -194,7 +194,7 @@ export default {
 			contractSelected: [],
 			listContractStati: [],
 			contractFormData: {
-				vertragsstatus_kurzbz: 'test',
+				vertragsstatus_kurzbz: '',
 				datum: new Date(),
 			},
 			dataPrintHonorar: [],

From 400ba2d7f9f901c3d12f267dd6ff34632e2025a8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 20 Feb 2025 12:10:48 +0100
Subject: [PATCH 0055/1357] fix(Calendar All Day Events): positions the all day
 Events in its own container above the events

---
 public/css/components/calendar.css            | 21 ++++++++-
 public/js/components/Calendar/Calendar.js     |  3 --
 public/js/components/Calendar/Day.js          |  3 --
 public/js/components/Calendar/Day/Page.js     | 22 ++++++----
 public/js/components/Calendar/Week/Page.js    | 43 ++++++++++---------
 .../components/Cis/Stundenplan/Stundenplan.js |  7 ++-
 6 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9be771adf..3e6eeb3e2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -69,8 +69,27 @@
   display: grid;
 }
 
+.all-day-event-border{
+	box-shadow: 1px 1px 0 #dee2e6;
+}
+
+.all-day-event{
+	max-height: 75px;
+	overflow:scroll;
+}
+
+.all-day-event-container{
+	position: sticky;
+	top: 44px;
+	display:grid;
+	grid-template-columns:repeat(7,1fr);
+	width:100%;
+	box-shadow: 0px 1px 0px #dee2e6;
+	z-index:3;
+}
+
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
-.box-shadow-border-top{
+.box-shadow-border{
 	box-shadow: 0 0 0 1px #dee2e6 !important;
 }
 
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cdef23aa9..c3515df45 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -250,9 +250,6 @@ export default {
 			<template #pageMobilContent="{lvMenu, event}">
 				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
 			</template>
-			<template #pageMobilContentEmpty>
-				<slot name="pageMobilContentEmpty" ></slot>
-			</template>
 			<template #minimizedPage="{event,day}">
 				<slot name="minimizedPage" :event="event" :day="day"></slot>
 			</template>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index a83ea6818..b85615f3e 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -53,9 +53,6 @@ export default {
 				<template #pageMobilContent="{lvMenu, event}">
 					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
 				</template>
-				<template #pageMobilContentEmpty>
-					<slot name="pageMobilContentEmpty" ></slot>
-				</template>
 			</calendar-day-page>
 		</calendar-pane>
 	</div>`
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 4f83f7c36..679086885 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -366,7 +366,7 @@ export default {
 					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
 
 						<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" :style="hourGridStyle(hour)"></div>
+							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 
 							<Transition>
 								<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
@@ -381,7 +381,6 @@ export default {
 							<div>
 								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
 								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
-
 									<div class="hours">
 										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
@@ -394,9 +393,16 @@ export default {
 													class="small rounded overflow-hidden fhc-entry"
 													v-contrast
 													>
-													<slot class="p-1" name="dayPage" :event="event" :day="day">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
+													<div class="d-none d-xl-block">
+														<slot name="dayPage" :event="event" :day="day" :mobile="false">
+															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+														</slot>
+													</div>
+													<div class="d-block d-xl-none">
+														<slot name="dayPage" :event="event" :day="day" :mobile="true">
+															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+														</slot>
+													</div>
 												</div>
 											</div>
 										</div>
@@ -414,7 +420,7 @@ export default {
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
-		
+
 										</div>
 									</div>
 								</div>
@@ -432,9 +438,7 @@ export default {
 							</slot>
 						</template>
 						<template v-else-if="noEventsCondition">
-							<slot name="pageMobilContentEmpty" >
-								<h3>This is an slot placeholder</h3>
-							</slot>
+							<h3>Keine Lehrveranstaltungen</h3>
 						</template>
 						<template v-else>
 							<div class="p-4 d-flex w-100 justify-content-center align-items-center">
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 37cd47be8..b4ee7626c 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -249,8 +249,8 @@ export default {
 			}
 		},
 		calcHourPosition(event) {
-			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
-			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;
+			let top = this.$refs['eventsRef' + this.week].getBoundingClientRect().top;
 			let position = event.clientY - top;
 			// position percentage of total height
 			let timePercentage = (position / height) * 100;
@@ -350,34 +350,35 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-				<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" :style="hourGridStyle(hour)"></div>
-				<Transition>
-					<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
-						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
-					</div>
-				</Transition>
-
-				<div class="events" :ref="'eventsRef'+week">
-
-					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
-						<div class="position-absolute w-100" style="top:0; bottom:0;">
-							<div class="position-sticky d-grid " style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
-								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+			<div ref="eventcontainer" class="position-relative flex-grow-1" >
+				<div class="all-day-event-container" >
+					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+						<div class="position-sticky d-grid mx-1" style="top:0;" v-for="(events,_day) in allDayEvents" :key="_day">
+						
+						<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 									class="small rounded overflow-hidden fhc-entry"
 									v-contrast
-									>
+									>		
 									<slot class="p-1" name="weekPage" :event="event" :day="day">
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
 								</div>
 							</div>
+					</div>
+				</div>
+				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
+					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+					<Transition>
+						<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
+							<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 						</div>
+					</Transition>
+					<div class="hours">
+						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+					</div>
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
 							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
 								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index af19e218b..b5ade9542 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -237,7 +237,9 @@ export const Stundenplan = {
 					</div>
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<span >moodle:</span>
+					<span >
+						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40"/><stop offset=".043" stop-color="#F9A538"/><stop offset=".112" stop-color="#F89D31"/><stop offset=".227" stop-color="#F89A2F"/><stop offset=".528" stop-color="#F7922D"/><stop offset="1" stop-color="#F37B28"/></radialGradient><path fill="url(#moodle-original-a)" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z"/><path fill="#58595B" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951"/><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-b)" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574"/><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20"/><stop offset="1" stop-color="#231F20" stop-opacity="0"/></linearGradient><path fill="url(#moodle-original-c)" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166"/><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-d)" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25"/><path stroke="#4A4A4C" stroke-width=".5" fill="none" d="M83.812 22.246L51.667 45.545"/><path opacity=".23" fill="#231F20" d="M45.545 34.66c.34 3.744-.511-3.572 0 0"/><path stroke="#A8ABAD" stroke-width=".5" fill="none" d="M2.178 47.08l49.489-1.535"/><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none"/><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596"/><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z"/></svg>
+					</span>
 					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
@@ -289,9 +291,6 @@ export const Stundenplan = {
 				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
 			</template>
 		</template>
-		<template #pageMobilContentEmpty >
-			<h3>Keine Lehrveranstaltungen</h3>
-		</template>
 	</fhc-calendar>
 	`
 }

From b989eae461b52e2b7f89d6b4d5794f64fae4722f Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 20 Feb 2025 20:07:07 +0100
Subject: [PATCH 0056/1357] added archive tab to Studierendenverwaltung,
 possibility to archive documents

---
 application/config/javascript.php             |   4 +-
 .../controllers/api/frontend/v1/Documents.php |  83 +++++-
 .../api/frontend/v1/stv/Archiv.php            | 202 +++++++++++++++
 .../api/frontend/v1/stv/Config.php            |  17 +-
 application/models/crm/Akte_model.php         |  10 +-
 application/models/system/Vorlage_model.php   |  12 +-
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/archiv.js                   |  30 +++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 241 ++++++++++++++++++
 system/phrasesupdate.php                      |  40 +++
 10 files changed, 625 insertions(+), 16 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Archiv.php
 create mode 100644 public/js/api/stv/archiv.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Archiv.js

diff --git a/application/config/javascript.php b/application/config/javascript.php
index 5e9aa270a..bfcf8d540 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -2,6 +2,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 // use vuejs dev version
-$config['use_vuejs_dev_version'] = false;
+$config['use_vuejs_dev_version'] = true;
 // use bundled javascript
-$config['use_bundled_javascript'] = false;
\ No newline at end of file
+$config['use_bundled_javascript'] = false;
diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 60010e14d..42a2d3433 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -43,7 +43,8 @@ class Documents extends FHCAPI_Controller
 		parent::__construct([
 			'permissionAlternativeFormat' => self::PERM_LOGGED,
 			'archive' => ['admin:rw', 'assistenz:rw'],
-			'archiveSigned' => ['admin:rw', 'assistenz:rw']
+			'archiveSigned' => ['admin:rw', 'assistenz:rw'],
+			'download' => ['admin:rw', 'assistenz:rw']
 		]);
 
 		// Load Phrases
@@ -66,7 +67,7 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
-	 * Download a not signed document.
+	 * Archive a not signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -79,7 +80,7 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
-	 * Download a signed document.
+	 * Archive a signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -91,6 +92,42 @@ class Documents extends FHCAPI_Controller
 		return $this->_archive($xml, $xsl, getAuthUID());
 	}
 
+	/**
+	 *
+	 * @return void
+	 */
+	public function download($xml, $xsl, $sign_user = null)
+	{
+		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
+
+		$akteData = $akteData['akteData'];
+		$exportData = $akteData['exportData'];
+
+		/**
+		 *				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		 */
+
+		// Output
+		$result = $this->documentexportlib->showContent(
+			$akteData['akteData']['inhalt'],
+			$exportData['vorlage'],
+			$exportData['xml_data'],
+			$exportData['oe_kurzbz'],
+			$exportData['version'],
+			$exportData['outputformat'],
+			$exportData['sign_user']
+		);
+
+		$this->terminateWithSuccess(true);
+	}
+
 	/**
 	 * Helper function for archive() and archiveSigned()
 	 *
@@ -100,16 +137,34 @@ class Documents extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function _archive($xml, $xsl, $sign_user = null)
+	private function _archive($xml, $xsl, $sign_user = null)
+	{
+		$akteData = $this->_getAkteExportData($xml, $xsl, $sign_user);
+
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->insert($akteData['akteData']);
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(true);
+	}
+
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	private function _getAkteExportData($xml, $xsl, $sign_user = null)
 	{
 		if (!$xml || !$xsl) {
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
+				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
+				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}
 
@@ -151,6 +206,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -171,6 +227,7 @@ class Documents extends FHCAPI_Controller
 		$studiengang_kz = null;
 		if ($akteData['uid']) {
 			$this->load->model('crm/Student_model', 'StudentModel');
+			$this->StudentModel->addSelect('tbl_student.*, UPPER(typ || kurzbz) AS kuerzel');
 			$this->StudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 			$result = $this->StudentModel->load([$akteData['uid']]);
 			$student = current($this->getDataOrTerminateWithError($result));
@@ -318,6 +375,7 @@ class Documents extends FHCAPI_Controller
 
 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			$access_rights = current($this->getDataOrTerminateWithError($result));
+			// TODO: was bedeutet wenn keine berechtigung?
 			if (!$access_rights || !$access_rights->berechtigung)
 				return show_404();
 			
@@ -413,10 +471,17 @@ class Documents extends FHCAPI_Controller
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);
 
-		$this->load->model('crm/Akte_model', 'AkteModel');
-		$result = $this->AkteModel->insert($akteData);
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
+		return [
+			'akteData' => $akteData,
+			'exportData' =>
+				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		];
 	}
 }
diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
new file mode 100644
index 000000000..dc93c2c4c
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about archive documents
+ * Listens to ajax post calls to change the archive documents
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Archiv extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
+			'archive' => ['admin:w', 'assistenz:w'],
+			'download' => ['admin:w', 'assistenz:w'],
+			//'update' => ['admin:w', 'assistenz:w'],
+			'delete' => ['admin:w', 'assistenz:w']
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'archiv'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get archive documents for a person
+	 
+	 * @return void
+	 */
+	public function get()
+	{
+		$person_id = $this->input->post('person_id');
+
+		$this->load->library('form_validation');
+
+		if (!$person_id || !is_array($person_id))
+		{
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AkteModel->getArchiv($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Get Vorlagen for archiving documents
+	 * @return void
+	 */
+	public function getArchivVorlagen()
+	{
+		$result = $this->VorlageModel->getArchivVorlagen();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$data = getData($result)[0];
+		//$this->addMeta("daa", $data->inhalt);
+
+		$fileObj = new stdClass();
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			// Define handle to output stream
+			$tmpFilePointer   = fopen("php://output", 'w');
+			$meta_data = stream_get_meta_data($tmpFilePointer);
+			$filename = $meta_data["uri"];
+			fwrite($tmpFilePointer, $data->inhalt);
+
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			//header('Content-Length: ' . filesize($fileObj->file));
+			//header("Content-type: $data->mimetype");
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			readfile($filename);
+			//echo base64_decode($data->inhalt);
+			die();
+			//~ $fileObj->file = $data->inhalt;
+			//~ $fileObj->name = $data->titel;
+			//~ $fileObj->mimetype = $data->mimetype;
+			//~ $fileObj->disposition = 'attachment';
+		}
+		else
+		{
+			$this->load->library('AkteLib');
+
+			$result = $this->aktelib->get($akte_id);
+		}
+
+		/*	 * 	$fileObj->filename
+	 * 	$fileObj->file
+	 * 	$fileObj->name
+	 * 	$fileObj->mimetype
+	 * 	$fileObj->disposition*/
+	}
+
+
+	/**
+	 * Delete archived Akte
+	 *
+	 * @return void
+	 */
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('akte_id', 'Akte ID', 'required');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'has_permissions_for_stg[admin:rw,assistenz:rw]');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$akte_id = $this->input->post('akte_id');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('archiv', 'error_missing', [
+				'akte_id' => $akte_id
+			]));
+		}
+
+		$result = getData($result)[0];
+
+		if ($result->dokument_kurzbz == 'Ausbvert'
+				&& isset($result->akzeptiertamum)
+				&& !isEmptyString($result->akzeptiertamum)
+				&& !has_permissions_for_stg($this->input->post('studiengang_kz'), 'admin:rw')
+		)
+		{
+			$this->terminateWithError($this->p->t('archiv', 'nur_admins_loschen_ausbildungsvertraege', [
+				'akte_id' => $akte_id
+			]));
+		}
+		
+		$result = $this->AkteModel->delete($akte_id);
+		if (isError($result)) $this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess();
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c77ebc07b..2cc2228c9 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,7 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
@@ -103,7 +104,14 @@ class Config extends FHCAPI_Controller
 				'documentslist' => $this->gradesDocumentsList()
 			]
 		];
-		
+		*/
+		$result['archive'] = [
+			'title' => $this->p->t('stv', 'tab_archive'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
+			//~ 'config' => [
+				//~ //'columns' => $this->kontoColumns()
+			//~ ]
+		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
@@ -138,6 +146,13 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
+		$result['archive'] = [
+			'title' => $this->p->t('stv', 'tab_archive'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
+			//~ 'config' => [
+				//~ //'columns' => $this->kontoColumns()
+			//~ ]
+		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 57b6e0665..2fa69d5b0 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -195,9 +195,9 @@ class Akte_model extends DB_Model
 	}
 
 	/**
-	 * Liefert die Archivdokumente einer Person
+	 * Liefert die Archivdokumente einer Person/mehrerer Personen
 	 *
-	 * @param integer				$person_id
+	 * @param integer/array				$person_id
 	 * @param boolean|null			$signiert			Wenn true werden nur Dokumente geliefert die digital signiert wurden.
 	 * @param boolean|null			$stud_selfservice	Wenn true werden nur Dokumente geliefert die Studierende selbst herunterladen duerfen.
 	 *
@@ -237,10 +237,14 @@ class Akte_model extends DB_Model
 		if ($stud_selfservice !== null)
 			$this->db->where('stud_selfservice', (boolean)$stud_selfservice);
 
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+
 		$this->addOrder('erstelltam', 'DESC');
 
 		return $this->loadWhere([
-			'person_id' => $person_id,
 			'archiv' => true
 		]);
 	}
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
index 8022e71fc..d36eedba3 100644
--- a/application/models/system/Vorlage_model.php
+++ b/application/models/system/Vorlage_model.php
@@ -13,7 +13,7 @@ class Vorlage_model extends DB_Model
 	}
 
 	/**
-	 * Returns mume types
+	 * Returns mime types
 	 */
 	public function getMimeTypes()
 	{
@@ -21,4 +21,14 @@ class Vorlage_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Returns all Vorlagen for archive
+	 */
+	public function getArchivVorlagen()
+	{
+		$query ="SELECT * FROM public.tbl_vorlage WHERE archivierbar=true ORDER BY bezeichnung";
+
+		return $this->execQuery($query);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 9a2f08f1d..b0f96415b 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -3,6 +3,7 @@ import students from './stv/students.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
 import grades from './stv/grades.js';
+import archiv from './stv/archiv.js';
 
 export default {
 	verband,
@@ -10,6 +11,7 @@ export default {
 	filter,
 	konto,
 	grades,
+	archiv,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
new file mode 100644
index 000000000..0f303684b
--- /dev/null
+++ b/public/js/api/stv/archiv.js
@@ -0,0 +1,30 @@
+export default {
+	tabulatorConfig(config, self) {
+		config.ajaxURL = 'api/frontend/v1/stv/archiv/get';
+		config.ajaxParams = () => {
+			const params = {
+				person_id: self.modelValue.person_id || self.modelValue.map(e => e.person_id)
+			};
+			return params;
+		};
+		config.ajaxRequestFunc = (url, config, params) => this.$fhcApi.post(url, params, config);
+		config.ajaxResponse = (url, params, response) => response.data;
+
+		return config;
+	},
+	getArchivVorlagen() {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/getArchivVorlagen');
+	},
+	archive(data) {
+		return this.$fhcApi.post(
+			'api/frontend/v1/documents/archiveSigned',
+			data
+		);
+	},
+	//~ edit(data) {
+		//~ return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
+	//~ },
+	delete({akte_id, studiengang_kz}) {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/delete', {akte_id, studiengang_kz});
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
new file mode 100644
index 000000000..7858dbd5e
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -0,0 +1,241 @@
+import {CoreFilterCmpt} from "../../../filter/Filter.js";
+import FormInput from "../../../Form/Input.js";
+//~ import KontoNew from "./Konto/New.js";
+//~ import KontoEdit from "./Konto/Edit.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		FormInput
+		//~ KontoNew,
+		//~ KontoEdit
+	},
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester'
+		}
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			vorlage_kurzbz: '',
+			vorlagenArchiv: [],
+			vorlageXmlXslMappings: {
+				'zeugnis.rdf.php': [
+						'Zeugnis',
+						'ZeugnisEng'
+				],
+				'abschlusspruefung.rdf.php': [
+						'PrProtokollBakk',
+						'PrProtBakkEng',
+						'PrProtBA',
+						'PrProtBAEng',
+						'PrProtokollDipl',
+						'PrProtDiplEng',
+						'PrProtMA',
+						'PrProtMAEng',
+						'Bescheid',
+						'BescheidEng',
+						'Bakkurkunde',
+						'BakkurkundeEng',
+						'Diplomurkunde',
+						'DiplomurkundeEng',
+				],
+				'diplomasupplement.xml.php': [
+						'DiplSupplement',
+						'SZeugnis'
+				],
+				'studienblatt.xml.php': [
+						'Studienblatt',
+						'StudienblattEng'
+				],
+				'ausbildungsvertrag.xml.php': [
+						'Ausbildungsver',
+						'AusbVerEng'
+				],
+				'abschlussdokument_lehrgaenge.xml.php': [
+						'AbschlussdokumentLehrgaenge'
+				]
+			}
+			//studiengang_kz: false
+		};
+	},
+	computed: {
+		//~ personIds() {
+			//~ if (this.modelValue.person_id)
+				//~ return [this.modelValue.person_id];
+			//~ return this.modelValue.map(e => e.person_id);
+		//~ },
+		tabulatorColumns() {
+			const columns = [
+				{title: "Akte Id", field: "akte_id", visible: false},
+				{title: "Titel", field: "titel"},
+				{title: "Bezeichnung", field: "bezeichnung"},
+				{title: "Erstelldatum", field: "erstelltam"},
+				{title: "Signiert", field: "erstelltam"},
+				{title: "Selfservice", field: "signiert"},
+				{title: "AkzeptiertAmUm", field: "akzeptiertamum"},
+				{title: "Gedruckt", field: "gedruckt", visible: false},
+				{
+					title: 'Aktionen', field: 'actions',
+					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';
+						//~ button.innerHTML = '<i class="fa fa-edit"></i>';
+						//~ button.addEventListener('click', () =>
+							//~ this.$refs.edit.open(cell.getData())
+						//~ );
+						//~ container.append(button);
+
+						let button = document.createElement('button');
+						button.className = 'btn btn-outline-secondary';
+						button.innerHTML = '<i class="fa fa-trash"></i>';
+						button.addEventListener('click', evt => {
+							evt.stopPropagation();
+							this.$fhcAlert
+								.confirmDelete()
+								.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+								.then(this.$fhcApi.factory.stv.archiv.delete)
+								.then(() => {
+									//cell.getRow().delete();
+									this.reload();
+								})
+								.catch(this.$fhcAlert.handleSystemError);
+						});
+						container.append(button);
+
+						return container;
+					},
+					minWidth: 150, // Ensures Action-buttons will be always fully displayed
+					maxWidth: 150,
+					frozen: true
+				}
+			];
+			return Object.values(columns);
+		},
+		tabulatorOptions() {
+			return this.$fhcApi.factory.stv.archiv.tabulatorConfig({
+				layout:"fitDataTable",
+				columns: this.tabulatorColumns,
+				//selectable: true,
+				//selectableRangeMode: 'click',
+				index: 'akte_id',
+				persistenceID: 'stv-details-archiv'
+			}, this);
+		},
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownload(row.getData().akte_id);
+					}
+				}
+			];
+
+			return events;
+		}
+	},
+	watch: {
+		modelValue() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	methods: {
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		updateData(data) {
+			if (!data)
+				return this.reload();
+			// TODO(chris): check children (!delete?, multiple children)
+			//this.$refs.table.tabulator.updateOrAddData(data.map(row => row.buchungsnr_verweis ? {buchungsnr:row.buchungsnr_verweis, _children:row} : row));
+			this.$refs.table.tabulator.updateOrAddData(data);
+		},
+		actionArchive() {
+			this.loading = true;
+			this.$fhcApi
+				.factory.stv.archiv.archive({
+					xml: this.getXmlByXsl(this.vorlage_kurzbz),
+					xsl: this.vorlage_kurzbz,
+					ss: this.defaultSemester,
+					uid: this.modelValue.uid,
+					prestudent_id: this.modelValue.prestudent_id
+				})
+				.then(result => result.data)
+				.then(() => {
+					this.reload();
+					this.loading = false;
+				})
+				.then(() => this.$p.t('ui/gespeichert'))
+				.then(this.$fhcAlert.alertSuccess)
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		actionDownload(akte_id) {
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/archiv/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		getXmlByXsl(xsl) {
+			for (let xml in this.vorlageXmlXslMappings) {
+				let xslArr = this.vorlageXmlXslMappings[xml];
+
+				if (xslArr.includes(xsl)) return xml;
+			}
+			return null;
+		}
+	},
+	created() {
+		this.$fhcApi
+			.factory.stv.archiv.getArchivVorlagen()
+			.then(result => {this.vorlagenArchiv = result.data; this.vorlage_kurzbz = result.data.length > 0 ? result.data[0].vorlage_kurzbz : '';})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+	<div class="stv-details-konto h-100 d-flex flex-column">
+		<core-filter-cmpt
+			ref="table"
+			table-only
+			:side-menu="false"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			reload
+			>
+			<template #actions>
+				<div class="input-group w-auto">
+					<select class="form-select" v-model="vorlage_kurzbz">
+						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage.vorlage_kurzbz">
+							{{ vorlage.bezeichnung }}
+						</option>
+					</select>
+					<button
+						class="btn btn-primary"
+						@click="actionArchive()"
+						:disabled="loading"
+						>
+						<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+						{{ $p.t('stv/archiv_dokument_archivieren') }}
+					</button>
+				</div>
+			</template>
+		</core-filter-cmpt>
+	</div>`
+};
+		//~ <konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
+		//~ <konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72572b317..846b07f10 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38181,6 +38181,46 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_dokument_archivieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument archivieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Archive document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_archive',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Archiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Archive',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From ebbec03de40f8daa1a3f8a11424b415e57dd70c6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Feb 2025 14:21:38 +0100
Subject: [PATCH 0057/1357] feature(Calendar Moodle): adds moodle svg and
 adopts month page view for moodle events

---
 public/css/components/calendar.css            | 41 ++++++++--
 public/js/components/Calendar/Day/Page.js     | 76 ++++++++++---------
 public/js/components/Calendar/Month/Page.js   | 10 +--
 public/js/components/Calendar/Week.js         |  2 +-
 public/js/components/Calendar/Week/Page.js    | 37 +++++++--
 .../components/Cis/Stundenplan/Stundenplan.js | 25 +++---
 public/js/helpers/moodleSVG.js                |  5 ++
 7 files changed, 131 insertions(+), 65 deletions(-)
 create mode 100644 public/js/helpers/moodleSVG.js

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 3e6eeb3e2..0cc0b8533 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -69,25 +69,43 @@
   display: grid;
 }
 
-.all-day-event-border{
+.fhc-calendar-week-page .all-day-event-border{
 	box-shadow: 1px 1px 0 #dee2e6;
 }
 
-.all-day-event{
+.fhc-calendar-week-page .all-day-event{
 	max-height: 75px;
 	overflow:scroll;
 }
 
-.all-day-event-container{
+.fhc-calendar-week-page .all-day-event-container{
 	position: sticky;
 	top: 44px;
 	display:grid;
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
-	box-shadow: 0px 1px 0px #dee2e6;
 	z-index:3;
 }
 
+.fhc-calendar-day-page .all-day-event-border {
+	box-shadow: 1px 1px 0 #dee2e6;
+}
+
+.fhc-calendar-day-page .all-day-event {
+	grid-column:2;
+	max-height: 75px;
+	overflow: scroll;
+}
+
+.fhc-calendar-day-page .all-day-event-container {
+	position: sticky;
+	top:0;
+	display: grid;
+	grid-template-columns: 3em 1fr;
+	width: 100%;
+	z-index: 3;
+}
+
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
 	box-shadow: 0 0 0 1px #dee2e6 !important;
@@ -113,8 +131,6 @@
   min-height: 0;
 }
 .fhc-calendar-day-page > div {
-  /*transform: translate(-0.75em, -0.75em);*/
-  /*width: calc(100% + 1.5em);*/
   height: calc(100% + 1.5em);
 }
 .fhc-calendar-day-page .flex-column > .flex-grow-1 {
@@ -126,7 +142,6 @@
 .fhc-calendar-day-page .events {
   display: grid;
   grid-template-columns: 3em 1fr;
-  /*min-height: 266.6666666667%;*/
 }
 .fhc-calendar-day-page .events .day {
   gap: 1px;
@@ -222,7 +237,19 @@
 }
 
 .fhc-highlight-day {
+	position:relative;
+}
+
+.fhc-highlight-day::before {
+	content:'';
+	position:absolute;
+	top:0;
+	bottom:0;
+	left:0;
+	right:0;
 	box-shadow: inset 0 0 0 2px black !important;
+	pointer-events: none;
+	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 679086885..01cbd8ba9 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -61,13 +61,13 @@ export default {
 			},
 			immediate: true,
 		},
-		eventsPerDayAndHour: {
+		events: {
 			handler(newEvents) {
 				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.events.length > 0) {
-					let events = newEvents[this.day.toDateString()]?.events;
+				if (this.selectedEvent == null && newEvents[this.day.toDateString()].length > 0) {
+					let events = newEvents[this.day.toDateString()];
 					if (Array.isArray(events) && events.length > 0) {
-						this.setSelectedEvent(events[0].orig);
+						this.setSelectedEvent(events[0]);
 					}
 				}
 			},
@@ -298,8 +298,8 @@ export default {
 			this.$emit('input', event);
 		},
 		calcHourPosition(event) {
-			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
-			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let height = this.$refs.events.getBoundingClientRect().height;
+			let top = this.$refs.events.getBoundingClientRect().top;
 			let position = event.clientY - top;
 			// position percentage of total height
 			let timePercentage = (position / height) * 100;
@@ -365,35 +365,18 @@ export default {
 					</div>
 					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
 
-						<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
+							<div class="all-day-event-container" >
+								<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+									<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-							<Transition>
-								<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-									<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
-								</div>
-							</Transition>
-							<Transition>
-								<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
-									<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
-								</div>
-							</Transition>
-							<div>
-								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
-								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
-									<div class="hours">
-										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-									</div>
-									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-										<div class="position-absolute w-100" style="top:0; bottom:0;">
-											<div class="position-sticky d-grid " style="top:0;" v-for="(events,_day) in allDayEvents" :key="day">
-												<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="eventClick(event)"
-													:selected="event == selectedEvent"
-													:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
-													class="small rounded overflow-hidden fhc-entry"
-													v-contrast
-													>
-													<div class="d-none d-xl-block">
+									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
+												:selected="event == selectedEvent"
+												:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+												class="small rounded overflow-hidden fhc-entry"
+												v-contrast
+												>
+												<div class="d-none d-xl-block">
 														<slot name="dayPage" :event="event" :day="day" :mobile="false">
 															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 														</slot>
@@ -403,9 +386,32 @@ export default {
 															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 														</slot>
 													</div>
-												</div>
 											</div>
+										</template>
+								</div>
+							</div>
+
+
+
+							<div >
+								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
+								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
+									<Transition>
+										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
+											<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 										</div>
+									</Transition>
+									<Transition>
+										<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
+											<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+										</div>
+									</Transition>
+									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+									<div class="hours">
+										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+									</div>
+									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+										
 										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast :selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden " >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 04e3a8e64..896be61bc 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -138,15 +138,15 @@ export default {
 		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
 			{{dayText[day]}}
 		</div>
-		<template v-for="week in weeks" 
+		<template v-for="week in weeks"
 		:key="week.no">
 			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25"
 			@click.prevent="changeToWeek(week)">{{week.no}}</a>
-			<a href="#" 
-			@click.prevent="clickEvent(day,week)" 
-			@mouseover="highlight(week,day)" 
+			<a href="#"
+			@click.prevent="clickEvent(day,week)"
+			@mouseover="highlight(week,day)"
 			@mouseleave="highlightedWeek = null; highlightedDay = null"
-			v-for="day in week.days" 
+			v-for="day in week.days"
 			:key="day"
 			:class="getDayClass(week, day)" 
 			>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 9a42f9659..858af0733 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -46,7 +46,7 @@ export default {
 			</template>
 		</calendar-header>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+			<calendar-week-page :active="slot.active" :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
 				<template #weekPage="{event,day}">
 					<slot name="weekPage" :event="event" :day="day" ></slot>
 				</template>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b4ee7626c..86db5947e 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -11,6 +11,7 @@ export default {
 			hourPositionTime:null,
 			resizeObserver: null,
 			width: 0,
+			scrollContainer: null,
 		}
 	},
 	inject: [
@@ -27,7 +28,8 @@ export default {
 	],
 	props: {
 		year: Number,
-		week: Number
+		week: Number,
+		active: Boolean
 	},
 	emits: [
 		'updateMode',
@@ -35,6 +37,23 @@ export default {
 		'page:forward',
 		'input',
 	],
+	watch: {
+		active: {
+			handler(value) {
+				const activeContainer = document.querySelector("#calendarContainer")
+				if(value){
+					Vue.nextTick(() => {
+						this.scrollContainer = activeContainer;
+						activeContainer.addEventListener('wheel', this.scrollFunction);
+					})
+				}else{
+					this.scrollContainer=null;
+					activeContainer?.removeEventListener('wheel', this.scrollFunction);
+				}
+			},
+			immediate: true,
+		}
+	},
 	computed: {
 		allDayEvents(){
 			let allDayEvents = {};
@@ -190,6 +209,10 @@ export default {
 		}
 	}, 
 	methods: {
+		scrollFunction(event){
+				event.preventDefault();
+				this.scrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		hourGridIdentifier(hour) {
 			// this is the id attribute that is responsible to scroll the calender to the first event
 			return 'scroll' + hour + this.focusDate.d + this.week;
@@ -335,7 +358,7 @@ export default {
 			container.style['overflow-y'] = 'scroll'
 			container.style['overflow-x'] = 'auto'
 		}
-
+		
 		this.initResizeObserver();
 	},
 	beforeUnmount() {
@@ -350,12 +373,12 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" >
+			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 				<div class="all-day-event-container" >
 					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-						<div class="position-sticky d-grid mx-1" style="top:0;" v-for="(events,_day) in allDayEvents" :key="_day">
-						
-						<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+						<template v-for="(events,_day) in allDayEvents" :key="_day">
+
+						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
 									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 									class="small rounded overflow-hidden fhc-entry"
@@ -365,7 +388,7 @@ export default {
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
 								</div>
-							</div>
+							</template>
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index b5ade9542..4b4879e29 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -3,6 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
+import moodleSvg from "../../../helpers/moodleSVG.js"
 
 export const Stundenplan = {
 	name: 'Stundenplan',
@@ -36,7 +37,7 @@ export const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo
+		FhcCalendar, LvModal, LvMenu, LvInfo, moodleSvg
 	},
 	computed:{
 		downloadLinks: function(){
@@ -221,9 +222,15 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<span class="fhc-entry" >
-				{{event.topic}}
-			</span>
+			<div class="p-1" v-if="event.type=='moodle'">
+				<div class="d-flex small w-100" >
+					<moodle-svg></moodle-svg>
+					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+				</div>
+			</div>
+			<div class="p-1" v-else>
+				<span>{{event.topic}}</span>
+			</div>
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event); " type="button"
@@ -237,9 +244,7 @@ export const Stundenplan = {
 					</div>
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<span >
-						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40"/><stop offset=".043" stop-color="#F9A538"/><stop offset=".112" stop-color="#F89D31"/><stop offset=".227" stop-color="#F89A2F"/><stop offset=".528" stop-color="#F7922D"/><stop offset="1" stop-color="#F37B28"/></radialGradient><path fill="url(#moodle-original-a)" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z"/><path fill="#58595B" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951"/><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-b)" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574"/><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20"/><stop offset="1" stop-color="#231F20" stop-opacity="0"/></linearGradient><path fill="url(#moodle-original-c)" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166"/><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-d)" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25"/><path stroke="#4A4A4C" stroke-width=".5" fill="none" d="M83.812 22.246L51.667 45.545"/><path opacity=".23" fill="#231F20" d="M45.545 34.66c.34 3.744-.511-3.572 0 0"/><path stroke="#A8ABAD" stroke-width=".5" fill="none" d="M2.178 47.08l49.489-1.535"/><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none"/><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596"/><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z"/></svg>
-					</span>
+					<moodle-svg></moodle-svg>
 					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
@@ -252,8 +257,8 @@ export const Stundenplan = {
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
 				<template v-if="event.type=='moodle'">
-					<div class="d-flex align-items-center w-100" >
-						<span class="p-2">moodle:</span>
+					<div class="d-flex small align-items-center w-100 p-1" >
+						<moodle-svg></moodle-svg>
 						<span class="flex-grow-1 text-center">{{event.topic}}</span>
 					</div>
 				</template>
@@ -282,7 +287,7 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
-			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+			<h3 >{{event.type=='moodle'?$p.t('lvinfo','Moodleinformationen'):$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<div class="w-100">
 				<lv-info  :event="event" />
 			</div>
diff --git a/public/js/helpers/moodleSVG.js b/public/js/helpers/moodleSVG.js
new file mode 100644
index 000000000..679c9b1a6
--- /dev/null
+++ b/public/js/helpers/moodleSVG.js
@@ -0,0 +1,5 @@
+export default {
+	template:`
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 20 130 90" style="height:1.5em" ><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40" /><stop offset=".043" stop-color="#F9A538" /><stop offset=".112" stop-color="#F89D31" /><stop offset=".227" stop-color="#F89A2F" /><stop offset=".528" stop-color="#F7922D" /><stop offset="1" stop-color="#F37B28" /></radialGradient><path fill="white" stroke="black" stroke-width="1" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z" /><path fill="black" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951" /><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574" /><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20" /><stop offset="1" stop-color="#231F20" stop-opacity="0" /></linearGradient><path fill="none" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166" /><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M83.812 22.246L51.667 45.545" /><path opacity=".23" fill="black" d="M45.545 34.66c.34 3.744-.511-3.572 0 0" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M2.178 47.08l49.489-1.535" /><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none" /><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596" /><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z" /></svg> 
+	`
+}

From 3c34b17d2d37dcc87489cdf26d478e44a01fbe33 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 21 Feb 2025 14:58:59 +0100
Subject: [PATCH 0058/1357] add Preview-logic, update function sendMessage

---
 .../api/frontend/v1/messages/Messages.php     |  96 +++-
 application/models/system/Message_model.php   |   1 -
 public/js/api/messages/person.js              |  12 +-
 .../components/Messages/Details/NewMessage.js | 411 +++++++++++-------
 .../Messages/Details/TableMessages.js         |  10 +-
 public/js/components/Messages/Messages.js     |  33 +-
 .../Studentenverwaltung/Details/Messages.js   |   2 +
 .../VorlagenDropdown/VorlagenDropdown.js      |   8 +-
 8 files changed, 368 insertions(+), 205 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index ac107f687..788c8861e 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -17,10 +17,12 @@ class Messages extends FHCAPI_Controller
 			'sendMessage' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
+			'getPreviewText' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
 		$this->load->model('system/Message_model', 'MessageModel');
+		$this->load->model('CL/Messages_model', 'MessagesModel');
 
 		// Additional Permission Checks
 		//TODO(manu) check permissions
@@ -179,8 +181,7 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
-		//TODO(manu) Problems with Vorlagen...
-		//TODO(Manu) Problems with VARS
+		//default setting
 		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
 
 		$uid = getAuthUID();
@@ -201,35 +202,94 @@ class Messages extends FHCAPI_Controller
 			}
 		}
 
-		$subject = $this->input->post('subject');
+		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules('subject', 'Betreff', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betreff'])
+		]);
+
+		$this->form_validation->set_rules('body', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
 
-	//	$this->terminateWithError("rp_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
 
-/*		$subject = $this->input->post('subject');
 
-		$formData = $this->input->post('data');*/
+		$typeId = $this->input->post('type_id');
+		$id = $this->input->post('id');
 
-		//$_POST['subject'] = $formData['subject'];
-	//	$subject = $formData['subject'];
-	//	$body = $formData['body'];
+		if($typeId == 'uid')
+		{
+			//$this->terminateWithError("uid ", self::ERROR_TYPE_GENERAL);
+			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-	//	$subject = isset($_POST['subject']) ? $_POST['subject'] : null;
-	//	$body = isset($_POST['body']) ? $_POST['body'] : null;
+			//parseMessagetext for variables Prestudent
+			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		elseif($typeId == 'person_id')
+		{
+			$this->terminateWithError("person_id ", self::ERROR_TYPE_GENERAL);
 
-	//	$this->terminateWithError("person_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
 
-	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
-	//	$this->terminateWithError("body " . $body, self::ERROR_TYPE_GENERAL);
+			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		else
+		{
+			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+		}
 
-	//	$this->terminateWithError("person_id " . $benutzer->person_id, self::ERROR_TYPE_GENERAL);
-	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $body, $benutzer->person_id);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id);
 
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getPreviewText($id, $type_id)
+	{
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+
+		}
+		else
+			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
+
+		switch($type_id)
+		{
+			case 'uid':
+				$prestudent_id = $this->_getPrestudentIdFromUid($id);
+				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
+
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
+		}
+
+		//$this->terminateWithSuccess($result);
+		$bodyParsed = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($bodyParsed);
+	}
+
 	public function deleteMessage($messageId)
 	{
 		// Start DB transaction
@@ -238,6 +298,7 @@ class Messages extends FHCAPI_Controller
 		$result = $this->MessageModel->deleteMessageRecipient($messageId);
 		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		$result = $this->MessageModel->deleteMessageStatus($messageId);
@@ -265,6 +326,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
+		//return $data->person_id;
 		return $benutzer->person_id;
 	}
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 7ecb54a9e..0fdb39736 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -323,5 +323,4 @@ class Message_model extends DB_Model
 		return $this->execQuery($sql, array($message_id));
 	}
 	
-	
 }
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 6a0ac8c7c..5cbb49550 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -20,13 +20,13 @@ export default {
 	getNameOfDefaultRecipient(params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
 	},
+	getPreviewText(params, data){
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
+			data);
+	},
 	sendMessage(form, id, data) {
-	console.log("factory " + id);
-		console.log(JSON.stringify(data));
-
-		return this.$fhcApi.post(form, 'api/frontend/v1/messages/messages/sendMessage/' + id,
-			data
-		);
+		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
+			data);
 	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index 2d85c8e00..c8aae2124 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -3,7 +3,6 @@ import FormInput from '../../Form/Input.js';
 import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
 
-
 export default {
 	components: {
 		FormForm,
@@ -21,6 +20,7 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		openMode: String,
 	},
 	data(){
 		return {
@@ -45,12 +45,14 @@ export default {
 			itemsPrestudent: [],
 			itemsPerson: [],
 			itemsUser: [],
-			selectedFieldStudent: null,
+/*			selectedFieldStudent: null,
 			itemsStudent: [
 				{ label: "Variable 1", value: "var1" },
 				{ label: "Variable 2", value: "var2" },
 				{ label: "Variable 3", value: "var3" }
-			]
+			]*/
+			previewText: null,
+			previewBody: ""
 		}
 	},
 	methods: {
@@ -86,22 +88,35 @@ export default {
 		updateText(value) {
 			this.formData.body = value;
 		},
-		sendMessage(){
+		sendMessage() {
 			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
+			const params = {
+					id: this.id,
+					type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
 
-			data.append('data', JSON.stringify(this.formData));
-			return this.$fhcApi.factory.messages.person.sendMessage(this.$refs.formVorlage, this.id, data)
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					//this.hideModal('messageModal');
+					this.hideTemplate();
 					this.resetForm();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				}
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
@@ -120,9 +135,37 @@ export default {
 					//closewindwo
 				});
 		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+/*				this.editor.focus();
+				this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
 			} else {
 				console.error("Editor instance is not available.");
 			}
@@ -207,6 +250,19 @@ export default {
 				this.formData.subject = vorlage_kurzbz;
 			}
 		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -227,14 +283,10 @@ export default {
 					this.formData.subject = newVal;
 					return this.getVorlagentext(newVal);
 				}
-				//TODO(Manu) own function or retval to getVorlagentext
-				//component VorlagenComponent
-
 			}
 		}
 	},
 	created(){
-
 		if(this.typeId == 'person_id'){
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
 				.then(result => {
@@ -246,7 +298,6 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-
 		if(this.typeId == 'uid') {
 			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
 				.then(result => {
@@ -258,8 +309,8 @@ export default {
 						value: value
 					}));*/
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key,
-						value: '{' + key + '}'
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
 					}));
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -292,157 +343,185 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-newmessage">
-	
-		<div v-show="isVisible">
-			<h4>New Message</h4>
-			
-				{{typeId}} {{id}}
-			
-				{{formData.subject}}
-				{{formData.vorlage_kurzbz}}
-	
-			<p v-if="formData.body">
-				formData.body befüllt
-			</p>
-
-			<div class="row">
-			
-				<div class="col-sm-8">
-		
-					<form-form class="row g-3 mt-2" ref="formMessage">
-					
-						<div class="row mb-3">
-						
-							<form-input
-								type="text"
-								name="recipient"
-								:label="$p.t('messages/recipient')"
-								v-model="defaultRecipient"
-								disabled
-							>
-							</form-input>					
-						</div>
-						
-						<div class="row mb-3">
-							<form-input
-								type="text"
-								name="subject"
-								:label="$p.t('global/betreff') + ' *'"
-								v-model="formData.subject"
-							>
-							</form-input>					
-						</div>
-				
-						<!--Tiny MCE-->
-						<div class="row mb-3">
-							<form-input
-								ref="editor"
-								:label="$p.t('global','nachricht')  + ' *'"
-								type="textarea"
-								v-model="formData.body"
-								name="text"
-								rows="15"
-								cols="75"
-								>
-							</form-input>
-						</div>
-								
-						<div class="row">				
-							<DropdownComponent
-								ref="dropdownComp"
-								:label="$p.t('global/vorlage')"
-								@change="handleSelectedVorlage"
-								useLoggedInUserOe
-							>
-							</DropdownComponent>
-						</div>
-											
-					</form-form>
-				</div>
-		
-				<div class="col-sm-4">
-				
-					<div v-if="this.fieldsPrestudent.length > 0">
-						<strong>Felder Prestudent</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldPrestudent"
-								:options="itemsPrestudent"
-								optionLabel="label"
-							>
-							  <template #option="slotProps">
-								<div @dblclick="insertVariable(slotProps.option)">
-								  {{ slotProps.option.label }}
-								</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						
-						<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-						<p>{{selectedFieldPrestudent}}</p>
-
-					</div>
-					
-					<div v-if="this.fieldsPerson.length > 0">
-						<strong>Felder Person</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldPerson"
-								:options="itemsPerson"
-								optionLabel="label"
-							>
-								<template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-						<p>{{selectedFieldPerson}}</p>
-					</div>
-							
-					<div>
-						<strong>Meine Felder</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldUser"
-								:options="itemsUser"
-								optionLabel="label"
-							>
-								<template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						<button class="m-3" @click="insertVariableUser">Insert Variable</button>
-					</div>
-					
-					
-					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
-					
-						<button class="btn btn-secondary" @click="resetForm">Reset All</button>
-						
-						<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
-						<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
-					</div>
-					
-				</div>
-				
-			</div>
-		</div>
-		
-		<hr>
+			<hr>
 		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
 		<hr>
+
+		<div v-show="isVisible">
+			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
+
+				<h4>New Message</h4>
+	<!--			{{formData.body}}
+				||
+				{{previewText}}-->
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+							
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+							<p>{{selectedFieldPrestudent}}</p>
+
+						</div>
+
+						<div v-if="this.fieldsPerson.length > 0">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+							<p>{{selectedFieldPerson}}</p>
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+						</div>
+
+						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+	
+			</div>
+
+		</div>
+
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 0025d7b47..10210ece4 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -22,6 +22,7 @@ export default {
 			required: true
 		},
 		messageLayout: String,
+		openMode: String
 	},
 	//TODO(Manu) endpoint macht Probleme
 	data(){
@@ -238,15 +239,14 @@ export default {
 				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
 				window.open(linkWindowNewMessage, '_blank');
 			}
-			else if (this.openmode == "modal"){
+			else if (this.openMode == "modal"){
 				console.log("open with bootstrap Modal");
 			}
-			else if (this.openmode == "showDiv"){
-				console.log("open div in NewMessage.js");
-				//emit to NewMessage.js
+			else if (this.openMode == "showDiv"){
+				this.$emit('showNewMessageTemplate');
 			}
 			else
-				console.log("no valid openmode: yet to be developed");
+				console.log("no valid openMode");
 		},
 		reload() {
 			this.$refs.table.reloadTable();
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index a7cccb8cb..f862ebc46 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -28,31 +28,56 @@ export default {
 				].includes(value)
 			}
 		},
+		openMode: {
+			type: String,
+			default: 'window',
+			validator(value) {
+				return [
+					'window',
+					'modal',
+					'showDiv'
+				].includes(value)
+			}
+		}
 	},
 	data() {
 		return {}
 	},
+	methods: {
+		showNewMessageTemplate(){
+			this.$refs.templateNewMessage.showTemplate();
+		},
+		reloadTable(){
+			this.$refs.templateTableMessage.reload();
+		}
+	},
 	template: `
 	<div class="core-messages h-100 pb-3">
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
-			<NewMessage
+			<new-message
+				ref="templateNewMessage"
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
+				:openMode="openMode"
+				@reloadTable="reloadTable"
 			>
-			</NewMessage>
+			</new-message>
 		</div>
 		
 		<div v-if="showTable">
-			<TableMessages
+			<table-messages
+				ref="templateTableMessage"
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
+				:openMode="openMode"
+				@showNewMessageTemplate="showNewMessageTemplate"
 			>
 			
-			</TableMessages>
+			</table-messages>
 		</div>
 		
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 14d74e56c..bc07401e6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,4 +1,5 @@
 import CoreMessages from "../../../Messages/Messages.js";
+//import CoreMessages from "@/Messages/Messages.js";
 
 export default {
 	components: {
@@ -17,6 +18,7 @@ export default {
 			messageLayout="twoColumnsTableLeft"
 			show-table
 			show-new
+			open-mode="showDiv"
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index e4c48501a..b074711f4 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -1,5 +1,5 @@
 import {CoreFilterCmpt} from "../filter/Filter.js";
-import FormForm from '../Form/Form';
+import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
 export default {
@@ -39,16 +39,13 @@ export default {
 	},
 	methods: {
 		updateValue() {
-		//	console.log("in COMPO: update: " + this.selectedValue + ' jetzt ' + 'InfocenterMailErgaenzungsprfEng');
 			this.$emit('change', this.selectedValue);
-			//this.$emit('change', this.selectedValue); // Emit-Event beim Ändern des Wertes
 		},
 		setValue(value) {
 			this.selectedValue = value;
 		},
 	},
-	 created() {
-
+	created() {
 		if(this.isAdmin) {
 			this.$fhcApi.factory.vorlagen.getVorlagen()
 				.then(result => {
@@ -103,7 +100,6 @@ template: `
 				</option>
 			</form-input>
 		</div>
-		
 	</div>
 	`,
 }
\ No newline at end of file

From 881b7fb7897ec633ae7d848e5d2e46a48b72cc03 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Feb 2025 17:53:56 +0100
Subject: [PATCH 0059/1357] fix loadEvents race condition; normalize route
 pushes; WIP getting route.replace to work;

---
 .../education/Lehrveranstaltung_model.php     | 22 ++++------
 public/js/components/Calendar/Day.js          |  6 +--
 public/js/components/Calendar/Month.js        | 16 ++++----
 public/js/components/Calendar/Month/Page.js   |  7 +++-
 public/js/components/Calendar/Week.js         |  8 ++--
 public/js/components/Cis/Mylv/Semester.js     |  3 +-
 .../Cis/Mylv/Semester/Studiengang.js          |  5 ++-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  9 +++--
 .../components/Cis/Stundenplan/Stundenplan.js | 40 +++++++++----------
 9 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 8044fa9de..44f9834d8 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -556,16 +556,6 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null, $lvid=null)
 	{
-		if ($sprache) {
-			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
-			$bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
-			$sgbezeichnung = $sprache == 'English' ? 'COALESCE(sg.english, sg.bezeichnung)' : 'sg.bezeichnung';
-			$lvbezeichnung = $sprache == 'English' ? 'COALESCE(v.bezeichnung_english, v.bezeichnung)' : 'v.bezeichnung';
-		} else {
-			$bezeichnung = 'bezeichnung';
-			$sgbezeichnung = 'sg.bezeichnung';
-			$lvbezeichnung = 'v.bezeichnung';
-		}
 
 		$this->addDistinct();
 		// TODO(chris): selects
@@ -605,16 +595,20 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addSelect('znn.positiv');
 
 		#$this->addSelect('splv.module');
-		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
-		$this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
+		$this->addSelect('v.bezeichnung AS bezeichnung');
+		$this->addSelect('v.bezeichnung_english AS bezeichnung_eng');
+		$this->addSelect('sg.bezeichnung AS sg_bezeichnung');
+		$this->addSelect('sg.english AS sg_bezeichnung_eng');
 		$this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
 		
 		//also adds returns the index of the grade
 		//TODO: ist zeugnissnote immer gleich wie die lvgesamtnote
 		$this->addSelect('COALESCE(zn.note::numeric,gn.note::numeric) as note_index');
 		$this->addSelect('COALESCE(znn.positiv,gnn.positiv) as positiv');
-		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
-		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
+		$this->addSelect('gnn.bezeichnung_mehrsprachig AS lvnotebez');
+		$this->addSelect('gnn.note AS lvnote');
+		$this->addSelect('znn.bezeichnung_mehrsprachig AS znotebez');
+		$this->addSelect('znn.note AS znote');
 
 		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index c0f1040f5..9eafe0120 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -22,7 +22,7 @@ export default {
 			this.focusDate.d += dir;
 			this.emitRangeChanged(previousDate);
 		},
-		emitRangeChanged(previousDate) {
+		emitRangeChanged(previousDate, mounted) {
 			this.$emit('change:range', { start: previousDate, end:this.focusDate });
 		},
 		prev() {
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event', event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(new CalendarDate(this.focusDate.y, this.focusDate.m, this.focusDate.d -1), true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-day">
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 513ed1c8c..d427304b8 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -28,9 +28,14 @@ export default {
 			} else {
 				this.focusDate.moveMonthInDirection(dir)
 			}
+			this.emitRangeChanged()
+		},
+		emitRangeChanged(mounted = false) {
+
 			this.$emit('change:range', {
-				start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-				end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
+				start: new Date(this.focusDate.y, this.focusDate.m, 1),
+				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
+				mounted
 			});
 		},
 		prev() {
@@ -55,11 +60,8 @@ export default {
 			this.$emit('input', ['select:day',day])
 		}
 	},
-	created() {
-		this.$emit('change:range', {
-			start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-			end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
-		});
+	mounted() {
+		this.emitRangeChanged(true)
 	},
 	template: `
 	<div class="fhc-calendar-month">
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 8ec700ce7..f5354fc7b 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,6 +63,10 @@ export default {
 		
 	},
 	methods: {
+		handleEventClick(e, day) {
+			this.selectDay(day)
+			e.stopPropagation()
+		},
 		getDayClass(week, day) {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
@@ -153,7 +157,8 @@ export default {
 				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
-					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent" v-contrast >
+					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
+					v-contrast @click="handleEventClick($event, day)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 350f0130d..6e94c6b92 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -20,10 +20,10 @@ export default {
 			this.focusDate.d += dir * 7;
 			this.emitRangeChanged();
 		},
-		emitRangeChanged() {
+		emitRangeChanged(mounted = false) {
 			let start = this.focusDate.firstDayOfWeek;
 			let end = this.focusDate.lastDayOfWeek;
-			this.$emit('change:range', { start, end });
+			this.$emit('change:range', { start, end, mounted });
 		},
 		prev() {
 			this.$refs.pane.prev();
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event',event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-week">
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index b6ac3563a..994a7c9ff 100644
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -22,7 +22,8 @@ export default {
 					lv.studiengang_kz + '#' + lv.semester, 
 					{
 						studiengang_kz: lv.studiengang_kz, 
-						bezeichnung: lv.sg_bezeichnung, 
+						bezeichnung: lv.sg_bezeichnung,
+						sg_bezeichnung_eng: lv.sg_bezeichnung_eng,
 						kuerzel: lv.studiengang_kuerzel, 
 						semester: lv.semester
 					}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 9629ba307..15d210796 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -12,7 +12,8 @@ export default {
 		bezeichnung: String,
 		kuerzel: String,
 		semester: [String,Number],
-		lvs: Array
+		lvs: Array,
+		sg_bezeichnung_eng: String
 	},
 	computed: {
 		lehrveranstaltungen() {
@@ -32,7 +33,7 @@ export default {
 	},
 	template: `<div class="card mb-3">
 		<div class="card-body">
-			<h4 class="card-title mb-3">{{bezeichnung}} - {{kuerzel}}
+			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>
 			</h4>
 			<div class="row">
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index ea19652c6..d0dd99f68 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -29,7 +29,7 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String,
+		note_index: String
 	},
 	data: () => {
 		return {
@@ -66,8 +66,8 @@ export default {
 			return bodyStyle;
 		},
 		grade() {
-			// TODO: noten phrasen
-			return this.benotung ? this.znote || this.lvnote || null : null;
+			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
+			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
@@ -123,6 +123,7 @@ export default {
 				LvInfo.popup({
 					lehrveranstaltung_id: this.lehrveranstaltung_id, 
 					bezeichnung: this.bezeichnung,
+					bezeichnung_eng: this.bezeichnung_eng,
 					studiengang_kuerzel: this.studiengang_kuerzel,
 					semester: this.semester,
 					studien_semester: this.studien_semester,
@@ -161,7 +162,7 @@ export default {
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
-			<h6 class="mb-0">{{bezeichnung}}</h6>
+			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
 		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
 			<template v-if="menu">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 3fee43058..ba26e25db 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -118,16 +118,17 @@ const Stundenplan = {
 			const date = day.getFullYear() + "-" +
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "Stundenplan",
-				params: {
-					mode: this.calendarMode,
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
+			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 			
+			this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+
 			this.currentDay = day;
 		},
 		handleOffset: function(offset)  {
@@ -144,14 +145,14 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: this.calendarMode,
+					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 		},
 		handleChangeMode(mode) {
-			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+			let m = mode[0].toUpperCase() + mode.slice(1)
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
@@ -159,30 +160,29 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: modeCapitalized,
+					mode: m,
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			})
-		
-			this.calendarMode = mode
+			this.calendarMode = m
 		},
 		showModal: function(e, event){
-			e.stopPropagation()
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
 				this.$refs.lvmodal.show();
 			});
 		},
-		updateRange: function ({start,end}) {
-			
+		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
 				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
 			}
 			this.calendarDate = new CalendarDate(end);
 
 			// only load month data if the month or year has changed
-			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))){
+			// or we receive a reload flag from the mounted routine of the components
+			// or this handler is being called from the mounted lifecycle of a component
+			if (mounted || (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end)))){
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
@@ -238,7 +238,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-		this.loadEvents();
+
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +275,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div @click="showModal($event, event); ">
+			<div>
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>

From bad19ccde7ac4266f5bd2a0c51fda0e594125d2b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 09:40:42 +0100
Subject: [PATCH 0060/1357] feature(Calendar Scroll Behavior): only scrolls an
 entire hour at the time when scrolling with the mouse wheel

---
 public/js/components/Calendar/Day/Page.js  | 12 +++++++----
 public/js/components/Calendar/Pane.js      |  5 ++++-
 public/js/components/Calendar/Week/Page.js | 24 +---------------------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 01cbd8ba9..44aadb837 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -53,6 +53,7 @@ export default {
 		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
 		active: {
 			handler(value) {
+				// handles fetching the lvMenu
 				if (value) {
 					if (!this.lvMenu) {
 						this.fetchLvMenu(this.selectedEvent);
@@ -64,7 +65,7 @@ export default {
 		events: {
 			handler(newEvents) {
 				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()].length > 0) {
+				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.length > 0) {
 					let events = newEvents[this.day.toDateString()];
 					if (Array.isArray(events) && events.length > 0) {
 						this.setSelectedEvent(events[0]);
@@ -239,6 +240,9 @@ export default {
 		}
 	},
 	methods: {
+		dayScrollBehavior(event){
+			this.$refs.dayScrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		dayGridStyle(day) {
 			const styleObj = {
 				'grid-template-columns': '1 1fr',
@@ -355,7 +359,7 @@ export default {
 	template: /*html*/`
 	<div class="fhc-calendar-day-page h-100">
 		<div class="row m-0 h-100">
-			<div class="col-12 col-xl-6 p-0 h-100">
+			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
 				<div class="d-flex flex-column h-100">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
@@ -363,11 +367,11 @@ export default {
 							<a href="#" class="small text-secondary text-decoration-none" >{{dayText.datum}}</a>
 						</div>
 					</div>
-					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
+					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
 
 						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 							<div class="all-day-event-container" >
-								<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 									<template v-for="(events,_day) in allDayEvents" :key="_day">
 
 									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index 5a3a43aa9..abcf03744 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -39,6 +39,9 @@ export default {
 		
 	},
 	methods: {
+		scrollBehavior(event){
+			this.$refs.calendarContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		scrollCalendar(event){
 			this.scrollTop = this.$refs.calendarContainer.scrollTop;
 			this.clientHeight = this.$refs.calendarContainer.clientHeight;
@@ -82,7 +85,7 @@ export default {
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
+		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
 			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item" style="height:var(--fhc-calendar-pane-height);">
 				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
 			</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 86db5947e..a6bc221fe 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -11,7 +11,6 @@ export default {
 			hourPositionTime:null,
 			resizeObserver: null,
 			width: 0,
-			scrollContainer: null,
 		}
 	},
 	inject: [
@@ -37,23 +36,6 @@ export default {
 		'page:forward',
 		'input',
 	],
-	watch: {
-		active: {
-			handler(value) {
-				const activeContainer = document.querySelector("#calendarContainer")
-				if(value){
-					Vue.nextTick(() => {
-						this.scrollContainer = activeContainer;
-						activeContainer.addEventListener('wheel', this.scrollFunction);
-					})
-				}else{
-					this.scrollContainer=null;
-					activeContainer?.removeEventListener('wheel', this.scrollFunction);
-				}
-			},
-			immediate: true,
-		}
-	},
 	computed: {
 		allDayEvents(){
 			let allDayEvents = {};
@@ -209,10 +191,6 @@ export default {
 		}
 	}, 
 	methods: {
-		scrollFunction(event){
-				event.preventDefault();
-				this.scrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
 		hourGridIdentifier(hour) {
 			// this is the id attribute that is responsible to scroll the calender to the first event
 			return 'scroll' + hour + this.focusDate.d + this.week;
@@ -375,7 +353,7 @@ export default {
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 				<div class="all-day-event-container" >
-					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
 						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"

From ecd5e95f2d341b7dc1dcac89bf7f9e0f46914f62 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 11:42:32 +0100
Subject: [PATCH 0061/1357] access computed grade phrase defensive; avoid
 pushing redundant mode changes; replace current state with new params when a
 different day is selected in the current month -> beforeEnter guard creates
 redundant navigation history entry which is currently being blocked but
 produces the possibility to infinitely "rego forward";

---
 public/js/apps/Dashboard/Fhc.js               | 10 +++++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  8 +++++-
 .../components/Cis/Stundenplan/Stundenplan.js | 27 ++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index e3ba786f1..b4d410344 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -198,6 +198,16 @@ const router = VueRouter.createRouter({
 	]
 })
 
+router.beforeEach((to, from) => {
+	// this avoids redundant routing navigation in place due to router.replace on a route with param function and
+	// beforeEnter navigation guard
+	
+	// TODO: manage the infinite forward navigation issue somehow
+	if (to.fullPath === from.fullPath) {
+		return false
+	}
+})
+
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index d0dd99f68..0543d8fae 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -21,7 +21,9 @@ export default {
 		lvinfo: Boolean,
 		benotung: Boolean,
 		lvnote: String,
+		lvnotebez: Array,
 		znote: String,
+		znotebez: Array,
 		studiengang_kuerzel: String,
 		semester: [String, Number],
 		orgform_kurzbz: String,
@@ -67,7 +69,11 @@ export default {
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
-			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
+			if(this.benotung && this.znotebez?.length) {
+				return this.znotebez[languageIndex]
+			} else if(this.benotung && this.lvnotebez?.length) {
+				return this.lvnotebez[languageIndex]
+			} else return null
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index ba26e25db..b24cb1037 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -11,7 +11,7 @@ const Stundenplan = {
 	data() {
 		return {
 			events: null,
-			calendarMode: DEFAULT_MODE_STUNDENPLAN,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_STUNDENPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -60,6 +60,7 @@ const Stundenplan = {
 			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
 		},
 		'propsViewData.focus_date'(newVal) {
+			// todo: navigate around with date in current mode
 			this.currentDate = new Date(newVal)
 		}
 	},
@@ -119,8 +120,11 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const isMonthMode = capitalizedMode === 'Month'
+			const isInCurrentMonth = day.getMonth() == this.currentDay.getMonth()
 			
-			this.$router.push({
+			if(isMonthMode && isInCurrentMonth) {
+				this.$router.replace({
 					name: "Stundenplan",
 					params: {
 						mode: capitalizedMode,
@@ -128,6 +132,16 @@ const Stundenplan = {
 						lv_id: this.propsViewData?.lv_id || null
 					}
 				})
+			} else {
+				this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+			}
 
 			this.currentDay = day;
 		},
@@ -141,7 +155,7 @@ const Stundenplan = {
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -153,10 +167,11 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
+			if(m === this.calendarMode) return
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -238,7 +253,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-
+		
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +290,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div>
+			<div @click="showModal($event, event)">
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>

From fe1971a1d3fd3e0c32c0978b1120a2239d09580b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 13:05:17 +0100
Subject: [PATCH 0062/1357] update(Calendar Moodle): adds background color to
 full day events, adds the link to the moodle activity, sorts the events based
 on type

---
 public/css/components/calendar.css            | 16 ++++++++++++++-
 public/js/components/Cis/Mylv/LvInfo.js       |  4 ++++
 .../components/Cis/Stundenplan/Stundenplan.js | 20 +++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 0cc0b8533..f1005f516 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -85,10 +85,22 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
+	background-color:white;
+}
+
+.fhc-calendar-week-page .all-day-event-container::before {
+	position: absolute;
+	content:'';
+	top: 0;
+	bottom: 0;
+	left: -3em;
+	right: 100%;
+	background-color: white;
+	box-shadow: 1px 1px 0 #dee2e6;
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 1px 1px 0 #dee2e6;
+	box-shadow: 0 0 0 1px #dee2e6;
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -104,6 +116,8 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
+	background-color:white;
+	box-shadow: 1px 1px 0 #dee2e6;
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index cfddc2c6a..18b318b4b 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -135,6 +135,10 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</template>
 				</tr>
+				<tr v-if="event.type == LV_TYPES.moodle">
+				    <th>Link:</th>
+					<td><a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a></td>
+				</tr>
 			</tbody>
 		</table>
 	`
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4b4879e29..9e7cd528f 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -146,6 +146,17 @@ export const Stundenplan = {
 						promise_events = promise_events.concat(data);
 					}
 				})
+				promise_events.sort((a, b) => {
+					if(a.type=='moodle'){
+						return -1;
+					}
+					else if(b.type=='moodle'){
+						return 1;
+					}
+					else{
+						return 0;
+					}
+				});
 				this.events = promise_events;
 			});
 		},
@@ -155,12 +166,12 @@ export const Stundenplan = {
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
 			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
 				let data =events.map(event =>{
-					const event_start_date = new Date(Number(event.timestart) * 1000);
-					const event_end_date = new Date(((Number(event.timestart) + Number(event.timeduration)) * 1000));
+					const event_start_date = new Date(event.timestart);
+					const event_end_date = new Date(event.timeend);
 					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
 					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false, timeZone:'UTC'});
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false, timeZone: 'UTC' });
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false});
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
 					
 					return {
 						type:'moodle',
@@ -184,6 +195,7 @@ export const Stundenplan = {
 						farbe:'00689E',
 						lehrveranstaltung_id:0,
 						ort_content_id:0,
+						url:event?.url,
 					}
 				});
 				return {

From e635d5e0e174fb489a56de59bf3e1f16c08b8b0e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 13:43:28 +0100
Subject: [PATCH 0063/1357] update(Dashboard Calendar Moodle): adds the moodle
 Calendar Events in the Dashboard Stundenplan both for the minimized view and
 the month view

---
 public/js/api/stundenplan.js                  |  1 +
 public/js/components/Cis/Cms/ContentModal.js  |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  2 +-
 public/js/components/DashboardWidget/Ampel.js |  4 +-
 public/js/components/DashboardWidget/News.js  |  4 +-
 .../components/DashboardWidget/Stundenplan.js | 91 +++++++++++++++++--
 public/js/components/DashboardWidget/Url.js   |  2 +-
 7 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 0f5de934e..94dad7ffe 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -53,4 +53,5 @@ export default {
 			}
 		);
 	},
+	
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 87aaf98f9..b7533305f 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -1,5 +1,5 @@
-import BsModal from "../../Bootstrap/Modal";
-import RaumContent from "./Content_types/Raum_contentmittitel";
+import BsModal from "../../Bootstrap/Modal.js";
+import RaumContent from "./Content_types/Raum_contentmittitel.js";
 
 
 export default {
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 9e7cd528f..cdc5d3e06 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -240,7 +240,7 @@ export const Stundenplan = {
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
 				</div>
 			</div>
-			<div class="p-1" v-else>
+			<div v-else class="p-1">
 				<span>{{event.topic}}</span>
 			</div>
 		</template>
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 4cb49ce94..925942079 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -1,5 +1,5 @@
-import AbstractWidget from './Abstract';
-import BaseOffcanvas from '../Base/Offcanvas';
+import AbstractWidget from './Abstract.js';
+import BaseOffcanvas from '../Base/Offcanvas.js';
 
 let _idcounter = 0;
 
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f6b94e6f1..98c5244e1 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -1,5 +1,5 @@
-import AbstractWidget from './Abstract';
-import BsModal from '../Bootstrap/Modal';
+import AbstractWidget from './Abstract.js';
+import BsModal from '../Bootstrap/Modal.js';
 
 const MAX_LOADED_NEWS = 30;
 
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index bf4324f4a..18f609260 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -4,6 +4,7 @@ import FhcCalendar from '../Calendar/Calendar.js';
 import LvModal from '../Cis/Mylv/LvModal.js';
 import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
+import moodleSvg from "../../helpers/moodleSVG.js"
 
 export default {
 	mixins: [
@@ -14,6 +15,7 @@ export default {
 		FhcCalendar,
 		LvModal,
 		ContentModal,
+		moodleSvg
 	},
 	
 	data() {
@@ -123,7 +125,8 @@ export default {
 		loadEvents: function () {
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
-				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
+				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -149,10 +152,65 @@ export default {
 						promise_events = promise_events.concat(data);
 					}
 				})
+				promise_events.sort((a, b) => {
+					if (a.type == 'moodle') {
+						return -1;
+					}
+					else if (b.type == 'moodle') {
+						return 1;
+					}
+					else {
+						return 0;
+					}
+				});
 				this.events = promise_events;
 			});
 		},
+		loadMoodleEvents: function (start_date, end_date) {
 
+			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
+			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+				let data = events.map(event => {
+					const event_start_date = new Date(event.timestart);
+					const event_end_date = new Date(event.timeend);
+					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth() + 1}-${event_start_date.getDate()}`;
+					// to get the same date and time as in moodle, we use the default UTC time zone 
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
+
+					return {
+						type: 'moodle',
+						beginn: formatted_start_time,
+						ende: formatted_end_time,
+						allDayEvent: true,
+						datum: formatted_date,
+						purpose: event.purpose,
+						assignment: event.activityname,
+						topic: event.activitystr,
+						lektor: [],
+						gruppe: [],
+						ort_kurzbz: event.location,
+						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
+						lehreinheit_id: event.lehreinheitsNummber ?? null,
+						titel: event.course.fullname,
+						lehrfach: '',
+						lehrform: '',
+						lehrfach_bez: '',
+						organisationseinheit: '',
+						farbe: '00689E',
+						lehrveranstaltung_id: 0,
+						ort_content_id: 0,
+						url: event?.url,
+					}
+				});
+				return {
+					data: data,
+					meta: { status: 'success' }
+				};
+			})
+
+		},
 		setCalendarMaximized() {
 			this.minimized = false
 		}
@@ -169,7 +227,13 @@ export default {
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #monthPage="{event,day}">
-				<span  >
+				<div  v-if="event.type=='moodle'">
+					<div class="d-flex small w-100" >
+						<moodle-svg></moodle-svg>
+						<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+					</div>
+				</div>
+				<span v-else class="small" >
 					{{event.topic}}
 				</span>
 			</template>
@@ -183,13 +247,22 @@ export default {
 							<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<b>{{evt.topic}}</b>
-							<br>
-							<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
-								<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-								<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-								<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-							</small>
+							<template v-if="evt.type=='moodle'">
+								<div class="d-flex align-items-center ">
+									<moodle-svg></moodle-svg>
+									<b class="flex-grow-1 text-center">{{evt.topic}}</b>
+								</div>
+							</template>
+							<template v-else>
+								<b>{{evt.topic}}</b>
+								<br>
+								<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
+									<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
+									<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
+									<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
+								</small>
+							</template>
+							
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">
 							{{ p.t('lehre/noLvFound') }}
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index eaf42ab2d..d3b3e8b2d 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -1,7 +1,7 @@
 import CoreForm from "../Form/Form.js";
 import FormInput from "../Form/Input.js";
 import BsModal from "../Bootstrap/Modal.js";
-import AbstractWidget from './Abstract';
+import AbstractWidget from './Abstract.js';
 
 export default {
 	name: "WidgetsUrl",

From c833b40527fc4f7d62ccf4693e77baa6d395a56d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 15:11:05 +0100
Subject: [PATCH 0064/1357] merge fix

---
 public/js/apps/Dashboard/Fhc.js                     | 1 +
 public/js/components/Calendar/Month/Page.js         | 6 +-----
 public/js/components/Cis/Stundenplan/Stundenplan.js | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index d49195399..9df11e491 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -203,6 +203,7 @@ router.beforeEach((to, from) => {
 	// beforeEnter navigation guard
 	
 	// TODO: manage the infinite forward navigation issue somehow
+	// https://stackoverflow.com/questions/28028297/how-can-i-delete-a-window-history-state?rq=3
 	if (to.fullPath === from.fullPath) {
 		return false
 	}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 27c649f1b..6d6b27d21 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,10 +63,6 @@ export default {
 		
 	},
 	methods: {
-		handleEventClick(e, day) {
-			this.selectDay(day)
-			e.stopPropagation()
-		},
 		getDayClass(week, day) {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
@@ -158,7 +154,7 @@ export default {
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
 					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click="handleEventClick($event, day)">
+					v-contrast @click.stop="selectDay(day)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index c27a3bc30..e11845e8b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -399,15 +399,15 @@ const Stundenplan = {
 						</div>
 						<div class="col">
 							<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-							<p class="m-0">{{event?.orig.topic}}</p>
+							<p class="m-0">{{event?.topic}}</p>
 						</div>
 						<div class="col" :style="'max-height: ' + eventMaxHeight + '; overflow: auto;'">
 							<p>{{ $p.t('lehre/lektor') }}:</p>
-							<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 						</div>
 						<div class="col">
 							<p>{{ $p.t('profil/Ort') }}: </p>
-							<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+							<p class="m-0">{{event?.ort_kurzbz}}</p>
 						</div>
 					</div>
 				</template>

From 8e697515bc33513062fe46a85e16b8f30ae3be5b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 17:04:59 +0100
Subject: [PATCH 0065/1357] added vue datepicker11 option; month page header
 click show months in modal instead of switching page & mode;

---
 .../views/CisRouterView/CisRouterView.php     |  1 +
 application/views/templates/FHC-Common.php    |  1 +
 application/views/templates/FHC-Footer.php    |  6 +++-
 application/views/templates/FHC-Header.php    |  7 ++++-
 composer.json                                 | 26 ++++++++++++++++-
 public/js/components/Calendar/Month.js        | 28 ++++++++++++++++---
 public/js/components/Calendar/Months.js       |  6 ++--
 .../components/Cis/Stundenplan/Stundenplan.js |  4 +--
 8 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 4590b210e..1c81f3570 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -8,6 +8,7 @@ $includesArray = array(
 	'tabulator5' => true,
 	'vue3' => true,
 	'primevue3' => true,
+	'vuedatepicker11' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 245432f46..024bcb40d 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -28,6 +28,7 @@
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
 	$primevue3 = isset($primevue3) ? $primevue3 : false;
+	$vuedatepicker11 = isset($vuedatepicker11) ? $vuedatepicker11 : false;
 
 	// Hooks
 	$addons = isset($addons) ? $addons : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index d78e0e9c3..76d581c4c 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -152,6 +152,8 @@
 		generateJSsInclude('vendor/npm-asset/primevue/confirmationservice/confirmationservice.min.js');
 	}
 
+	if($vuedatepicker11) generateJSsInclude('vendor/vuejs/vuedatepicker_js11/vue-datepicker.iife.js');
+	
 	// --------------------------------------------------------------------------------------------------------
 	// From public folder
 
@@ -181,11 +183,13 @@
 
 	// User Defined Fields
 	if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
-
+	
 	// Load addon hooks JS
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
+	
+	
 	// Eventually required JS
 	// NOTE: keep it as the latest
 	generateJSsInclude($customJSs);
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index bca75512f..8e813916e 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -92,7 +92,12 @@
 				generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
 			}
 
-			// --------------------------------------------------------------------------------------------------------
+			if ($vuedatepicker11 === true)
+			{
+				generateCSSsInclude('vendor/vuejs/vuedatepicker_css11/main.css');
+			}
+			
+		// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
 			// AjaxLib CSS
diff --git a/composer.json b/composer.json
index 15d61f3d1..6aa94c0f7 100644
--- a/composer.json
+++ b/composer.json
@@ -370,6 +370,28 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuejs/vuedatepicker_js11",
+				"version": "11.0.1",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/vue-datepicker.iife.js",
+					"type": "file"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuejs/vuedatepicker_css11",
+				"version": "11.0.1",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/main.css",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -456,7 +478,9 @@
 		"vuejs/vuejs3": "3.3.8",
 		"vuejs/vuerouter4": "4.1.3",
 		"vuejs/vuedatepicker_js": "7.2.0",
-		"vuejs/vuedatepicker_css": "7.2.0"
+		"vuejs/vuedatepicker_css": "7.2.0",
+		"vuejs/vuedatepicker_js11": "11.0.1",
+		"vuejs/vuedatepicker_css11": "11.0.1"
 
 	},
 	"config": {
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index d427304b8..9d35707a0 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -1,14 +1,17 @@
 import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarMonthPage from './Month/Page.js';
-
+import BsModal from "../Bootstrap/Modal.js";
+import Months from "./Months";
 export default {
 	mixins: [
 		CalendarAbstract
 	],
 	components: {
 		CalendarMonthPage,
-		CalendarPane
+		CalendarPane,
+		BsModal,
+		Months
 	},
 	data() {
 		return {
@@ -21,6 +24,16 @@ export default {
 		}
 	},
 	methods: {
+		handleMonthChanged(month) {
+			this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		hideMonthsModal() {
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		handleHeaderClickMonth() {
+			this.$refs.modalDatepickerContainer.show()
+		},
 		paneChanged(dir) {
 			if (this.syncOnNextChange) {
 				this.syncOnNextChange = false;
@@ -65,7 +78,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-month">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'months')" >
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickMonth">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads"></slot>
 			</template>
@@ -77,5 +90,12 @@ export default {
 				</template>
 			</calendar-month-page>
 		</calendar-pane>
-	</div>`
+	</div>
+
+	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
+		<template v-slot:default>
+			<months @change="handleMonthChanged"></months>
+		</template>
+	</bs-modal>
+`
 }
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
index 6ef9b1bb1..1647f6f6a 100644
--- a/public/js/components/Calendar/Months.js
+++ b/public/js/components/Calendar/Months.js
@@ -4,6 +4,9 @@ export default {
 	mixins: [
 		CalendarAbstract
 	],
+	emits: [
+		'change'
+	],
 	inject: [
 		'size'
 	],
@@ -22,10 +25,9 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-months">
-		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
-				<button @click="focusDate.m = key; $emit('updateMode', 'month')" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
+				<button @click=" $emit('change', key); focusDate.m = key;" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
 					{{month}}
 				</button>
 			</div>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index e11845e8b..2ee684c32 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -355,12 +355,12 @@ const Stundenplan = {
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
 				</div>
 			</div>
-			<div v-else @click="showModal($event, event)" class="p-1">
+			<div v-else @click="showModal(event)" class="p-1">
 				<span>{{event.topic}}</span>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event); " type="button"
+			<div @click="showModal(event)" type="button"
 			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
 			:class="{'p-1':event.allDayEvent}"
 			style="overflow: auto;">

From 00b77d726cf5201ce8bec4fcfd50ceb75f7b53c4 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Feb 2025 18:11:07 +0100
Subject: [PATCH 0066/1357] Studverwaltung Archiv: update of archived documents
 is possible, enabled archiving via multi-select

---
 .../api/frontend/v1/stv/Archiv.php            |  74 +++++++++-
 .../api/frontend/v1/stv/Config.php            |  26 ++--
 public/js/api/stv/archiv.js                   |   6 +-
 .../Stv/Studentenverwaltung/Details/Archiv.js | 129 +++++++++++-------
 .../Details/Archiv/Edit.js                    | 116 ++++++++++++++++
 5 files changed, 281 insertions(+), 70 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index dc93c2c4c..91fc9643d 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -38,7 +38,7 @@ class Archiv extends FHCAPI_Controller
 			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
-			//'update' => ['admin:w', 'assistenz:w'],
+			'update' => ['admin:w'],
 			'delete' => ['admin:w', 'assistenz:w']
 		]);
 
@@ -147,13 +147,83 @@ class Archiv extends FHCAPI_Controller
 			$result = $this->aktelib->get($akte_id);
 		}
 
-		/*	 * 	$fileObj->filename
+	/*	$fileObj->filename
 	 * 	$fileObj->file
 	 * 	$fileObj->name
 	 * 	$fileObj->mimetype
 	 * 	$fileObj->disposition*/
 	}
 
+	/**
+	 * Updating an Akte
+	 * @return void
+	 */
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('akte_id', 'Akte Id', 'required');
+		$this->form_validation->set_rules('signiert', 'Signiert', 'is_bool');
+		$this->form_validation->set_rules('stud_selfservice', 'Self-Service', 'is_bool');
+
+		//Events::trigger('konto_update_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$id = $this->input->post('akte_id');
+
+		// get the akte
+		$result = $this->AkteModel->load($id);
+
+		if (!hasData($result)) $this->terminateWithError("Akte not found!");
+
+		$akte = getData($result)[0];
+
+		$allowed = [
+			'signiert',
+			'stud_selfservice'
+		];
+
+		$data = [
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		];
+
+		// if Akte has Inhalt directly in Akte table
+		if (isset($_FILES['datei']['tmp_name']))
+		{
+		$this->addMeta('read', "read");
+			// update inhalt directly
+
+			// get tmp file
+			$filename = $_FILES['datei']['tmp_name'];
+			// open it
+			$fp = fopen($filename,'r');
+			// read it
+			$content = fread($fp, filesize($filename));
+			fclose($fp);
+			// encode it
+			$data['inhalt'] = base64_encode($content);
+			$this->addMeta('content', base64_encode($content));
+		}
+
+		
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		$this->addMeta("data", $data);
+
+		$result = $this->AkteModel->update($id, $data);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$result = null;
+
+		$this->terminateWithSuccess($result);
+	}
+
 
 	/**
 	 * Delete archived Akte
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 2cc2228c9..3415c8e41 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -94,23 +94,15 @@ class Config extends FHCAPI_Controller
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
-			'showOnlyWithUid' => true,
-			'config' => [
-				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
-				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'both', // Possible values: both|header|inline
-				'documents' => 'both', // Possible values: both|header|inline
-				'documentslist' => $this->gradesDocumentsList()
-			]
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
 		*/
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
-			//~ 'config' => [
-				//~ //'columns' => $this->kontoColumns()
-			//~ ]
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'config' => [
+				'showEdit' => $this->permissionlib->isBerechtigt('admin')
+			]
 		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -148,10 +140,10 @@ class Config extends FHCAPI_Controller
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
-			//~ 'config' => [
-				//~ //'columns' => $this->kontoColumns()
-			//~ ]
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'config' => [
+				'showEdit' => $this->permissionlib->isBerechtigt('admin')
+			]
 		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
index 0f303684b..76dbecec8 100644
--- a/public/js/api/stv/archiv.js
+++ b/public/js/api/stv/archiv.js
@@ -21,9 +21,9 @@ export default {
 			data
 		);
 	},
-	//~ edit(data) {
-		//~ return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
-	//~ },
+	update(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/update', data);
+	},
 	delete({akte_id, studiengang_kz}) {
 		return this.$fhcApi.post('api/frontend/v1/stv/archiv/delete', {akte_id, studiengang_kz});
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 7858dbd5e..f69e89838 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -1,14 +1,12 @@
 import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import FormInput from "../../../Form/Input.js";
-//~ import KontoNew from "./Konto/New.js";
-//~ import KontoEdit from "./Konto/Edit.js";
+import AkteEdit from "./Archiv/Edit.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
-		FormInput
-		//~ KontoNew,
-		//~ KontoEdit
+		FormInput,
+		AkteEdit
 	},
 	inject: {
 		defaultSemester: {
@@ -76,31 +74,62 @@ export default {
 		tabulatorColumns() {
 			const columns = [
 				{title: "Akte Id", field: "akte_id", visible: false},
-				{title: "Titel", field: "titel"},
-				{title: "Bezeichnung", field: "bezeichnung"},
-				{title: "Erstelldatum", field: "erstelltam"},
-				{title: "Signiert", field: "erstelltam"},
-				{title: "Selfservice", field: "signiert"},
-				{title: "AkzeptiertAmUm", field: "akzeptiertamum"},
-				{title: "Gedruckt", field: "gedruckt", visible: false},
+				{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
+				{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
+				{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
+				{
+					title: this.$p.t('stv', 'archiv_signiert'),
+					field: "signiert",
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					}
+				},
+				{
+					title: "Selfservice",
+					field: "stud_selfservice",
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					},
+				},
+				{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
+				{
+					title: this.$p.t('stv', 'archiv_gedruckt'),
+					field: "gedruckt",
+					visible: false,
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					}
+				},
 				{
 					title: 'Aktionen', field: 'actions',
 					formatter: (cell, formatterParams, onRendered) => {
 						let container = document.createElement('div');
 						container.className = "d-flex gap-2";
 
-						//~ let button = document.createElement('button');
-						//~ button.className = 'btn btn-outline-secondary';
-						//~ button.innerHTML = '<i class="fa fa-edit"></i>';
-						//~ button.addEventListener('click', () =>
-							//~ this.$refs.edit.open(cell.getData())
-						//~ );
-						//~ container.append(button);
+						if (this.config.showEdit)
+						{
+							let editButton = document.createElement('button');
+							editButton.className = 'btn btn-outline-secondary';
+							editButton.innerHTML = '<i class="fa fa-edit"></i>';
+							editButton.addEventListener('click', () =>
+								this.$refs.edit.open(cell.getData())
+							);
+							container.append(editButton);
+						}
 
-						let button = document.createElement('button');
-						button.className = 'btn btn-outline-secondary';
-						button.innerHTML = '<i class="fa fa-trash"></i>';
-						button.addEventListener('click', evt => {
+						let deleteButton = document.createElement('button');
+						deleteButton.className = 'btn btn-outline-secondary';
+						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+						deleteButton.addEventListener('click', evt => {
 							evt.stopPropagation();
 							this.$fhcAlert
 								.confirmDelete()
@@ -112,7 +141,7 @@ export default {
 								})
 								.catch(this.$fhcAlert.handleSystemError);
 						});
-						container.append(button);
+						container.append(deleteButton);
 
 						return container;
 					},
@@ -158,31 +187,36 @@ export default {
 		updateData(data) {
 			if (!data)
 				return this.reload();
-			// TODO(chris): check children (!delete?, multiple children)
-			//this.$refs.table.tabulator.updateOrAddData(data.map(row => row.buchungsnr_verweis ? {buchungsnr:row.buchungsnr_verweis, _children:row} : row));
 			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionArchive() {
-			this.loading = true;
-			this.$fhcApi
-				.factory.stv.archiv.archive({
-					xml: this.getXmlByXsl(this.vorlage_kurzbz),
-					xsl: this.vorlage_kurzbz,
-					ss: this.defaultSemester,
-					uid: this.modelValue.uid,
-					prestudent_id: this.modelValue.prestudent_id
-				})
-				.then(result => result.data)
-				.then(() => {
-					this.reload();
-					this.loading = false;
-				})
-				.then(() => this.$p.t('ui/gespeichert'))
-				.then(this.$fhcAlert.alertSuccess)
-				.catch(error => {
-					this.$fhcAlert.handleSystemError(error);
-					this.loading = false;
-				});
+			console.log(this.modelValue);
+			let archiveDataArr = Array.isArray(this.modelValue) ? this.modelValue : [this.modelValue];
+
+			for (let archiveData of archiveDataArr)
+			{
+				this.loading = true;
+				this.$fhcApi
+					.factory.stv.archiv.archive({
+						xml: this.getXmlByXsl(this.vorlage_kurzbz),
+						xsl: this.vorlage_kurzbz,
+						ss: this.defaultSemester,
+						uid: archiveData.uid,
+						prestudent_id: archiveData.prestudent_id
+					})
+					.then(result => result.data)
+					.then(() => {
+						this.reload();
+						this.loading = false;
+					})
+					.then(() => this.$p.t('ui/gespeichert'))
+					.then(this.$fhcAlert.alertSuccess)
+					.catch(error => {
+						this.$fhcAlert.handleSystemError(error);
+						this.loading = false;
+					});
+				
+			}
 		},
 		actionDownload(akte_id) {
 			window.open(
@@ -235,7 +269,6 @@ export default {
 				</div>
 			</template>
 		</core-filter-cmpt>
+		<akte-edit ref="edit" :config="config" @saved="updateData"></akte-edit>
 	</div>`
 };
-		//~ <konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
-		//~ <konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
new file mode 100644
index 000000000..35777b6ac
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -0,0 +1,116 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from "../../../../Form/Form.js";
+import FormValidation from "../../../../Form/Validation.js";
+import FormInput from "../../../../Form/Input.js";
+import FormUploadDms from '../../../../Form/Upload/Dms.js';
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput,
+		FormUploadDms
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		}
+	},
+	props: {
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			//file: [],
+			data: {
+				datei: []
+			}
+		};
+	},
+	methods: {
+		save() {
+			this.$refs.form.clearValidation();
+			this.loading = true;
+
+			//~ const formData = new FormData();
+			//~ formData.append('data', JSON.stringify(this.data));
+			//Object.entries(this.data.anhang).forEach(([k, v]) => formData.append(k, v));
+
+			this.$refs.form
+				.factory.stv.archiv.update(this.data)
+				.then(result => {
+					this.$emit('saved', result.data);
+					this.loading = false;
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'));
+				})
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		open(data) {
+			this.data.datei = [];
+			this.data = {...this.data, ...data};
+			this.$refs.modal.show();
+		},
+		preventCloseOnLoading(ev) {
+			if (this.loading)
+				ev.returnValue = false;
+		}
+	},
+	template: `
+	<core-form ref="form" class="stv-details-archiv-edit" @submit.prevent="save">
+		<bs-modal ref="modal" @hide-bs-modal="preventCloseOnLoading">
+			<form-validation></form-validation>
+			<fieldset :disabled="loading">
+				<div class="mb-3">
+					{{ data.titel }} ({{ data.bezeichnung }})
+				</div>
+				<form-input
+					v-model="data.akte_id"
+					name="akte_id"
+					:label="$p.t('stv/archiv_akte_id')"
+					disabled
+					>
+				</form-input>
+				<div class="position-relative">
+					<label for="text" class="form-label col-sm-2">{{ $p.t('stv/archiv_new_file') }}</label>
+					<!--Upload Component-->
+					<FormUploadDms ref="upload" id="inhalt" v-model="data.datei"></FormUploadDms>
+				</div>
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					name="signiert"
+					:label="$p.t('stv/archiv_signiert')"
+					v-model="data.signiert"
+				>
+				</form-input>
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					name="stud_selfservice"
+					:label="'Selfservice'"
+					v-model="data.stud_selfservice"
+				>
+				</form-input>
+			</fieldset>
+
+			<template #title>
+				{{ $p.t('stv/archiv_title_edit', data) }}
+			</template>
+			<template #footer>
+				<button type="submit" class="btn btn-primary" :disabled="loading">
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					{{ $p.t('ui/speichern') }}
+				</button>
+			</template>
+		</bs-modal>
+	</core-form>`
+};
\ No newline at end of file

From 9bd5f6dcb62573ce62c33a7007d47a109f62abfa Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Feb 2025 19:38:09 +0100
Subject: [PATCH 0067/1357] Studierendenverwaltung Archiv: enabled download of
 documents

---
 .../controllers/api/frontend/v1/stv/Akte.php  | 70 +++++++++++++++++++
 .../Stv/Studentenverwaltung/Details/Archiv.js |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Akte.php

diff --git a/application/controllers/api/frontend/v1/stv/Akte.php b/application/controllers/api/frontend/v1/stv/Akte.php
new file mode 100644
index 000000000..1d38c96d4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Akte.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Controller for downloading Akte
+ */
+class Akte extends Auth_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'download' => ['admin:w', 'assistenz:w'],
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 *
+	 * Downloads an Akte
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			echo base64_decode($data->inhalt);
+			die();
+		}
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index f69e89838..1856815a1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -221,7 +221,7 @@ export default {
 		actionDownload(akte_id) {
 			window.open(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/archiv/download?akte_id=' + encodeURIComponent(akte_id),
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/akte/download?akte_id=' + encodeURIComponent(akte_id),
 				'_blank'
 			);
 		},

From 9acc2a8a9db5ccb0116bf2047549e09a5622e8d1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 27 Feb 2025 11:16:35 +0100
Subject: [PATCH 0068/1357] revert router.replace strategy in month page; added
 weeks component without header into modal when week page header is clicked to
 enable week selection but without leaving the week carousel page

---
 public/js/apps/Dashboard/Fhc.js               | 11 -------
 public/js/components/Calendar/Month.js        |  1 -
 public/js/components/Calendar/Month/Page.js   |  4 ++-
 public/js/components/Calendar/Months.js       |  1 +
 public/js/components/Calendar/Week.js         | 27 ++++++++++++++--
 public/js/components/Calendar/Weeks.js        | 13 ++++++--
 .../components/Cis/Stundenplan/Stundenplan.js | 31 ++++++-------------
 7 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 9df11e491..b8ec122e0 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -198,17 +198,6 @@ const router = VueRouter.createRouter({
 	]
 })
 
-router.beforeEach((to, from) => {
-	// this avoids redundant routing navigation in place due to router.replace on a route with param function and
-	// beforeEnter navigation guard
-	
-	// TODO: manage the infinite forward navigation issue somehow
-	// https://stackoverflow.com/questions/28028297/how-can-i-delete-a-window-history-state?rq=3
-	if (to.fullPath === from.fullPath) {
-		return false
-	}
-})
-
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 9d35707a0..520c4d0d9 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -44,7 +44,6 @@ export default {
 			this.emitRangeChanged()
 		},
 		emitRangeChanged(mounted = false) {
-
 			this.$emit('change:range', {
 				start: new Date(this.focusDate.y, this.focusDate.m, 1),
 				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 6d6b27d21..3aa6d41c9 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -67,10 +67,12 @@ export default {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
 			const isHighlightedDay = this.isHighlightedDay(day)
-			const isThisDate = this.date.compare(day)
+			const isThisDate = this.focusDate.compare(day)
+
 			const isNotThisMonth = day.getMonth() != this.month
 			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
 			
+			if(isThisDate) classstring += ' border-8'
 			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
 			if(isHighlightedDay) classstring += ' fhc-highlight-day'
 			
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
index 1647f6f6a..6263e1b01 100644
--- a/public/js/components/Calendar/Months.js
+++ b/public/js/components/Calendar/Months.js
@@ -12,6 +12,7 @@ export default {
 	],
 	data() {
 		return {
+			// TODO: 36, 24, 16 (2+ 12 + 2) months to enable year switch?
 			monthIndices: [...Array(12).keys()]
 		}
 	},
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 132660d78..9e5baac76 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -1,6 +1,8 @@
 import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarWeekPage from './Week/Page.js';
+import BsModal from "../Bootstrap/Modal.js";
+import Weeks from "./Weeks";
 
 export default {
 	mixins: [
@@ -8,7 +10,9 @@ export default {
 	],
 	components: {
 		CalendarWeekPage,
-		CalendarPane
+		CalendarPane,
+		BsModal,
+		Weeks
 	},
 	computed: {
 		title() {
@@ -16,6 +20,16 @@ export default {
 		}
 	},
 	methods: {
+		handleWeekChanged(week) {
+			// this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		hideMonthsModal() {
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		handleHeaderClickWeek() {
+			this.$refs.modalDatepickerContainer.show()
+		},
 		paneChanged(dir) {
 			this.focusDate.d += dir * 7;
 			this.emitRangeChanged();
@@ -42,7 +56,7 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-week">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'weeks')">
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickWeek">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads"></slot>
 			</template>
@@ -54,5 +68,12 @@ export default {
 				</template>
 			</calendar-week-page>
 		</calendar-pane>
-	</div>`
+	</div>
+
+	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
+		<template v-slot:default>
+			<weeks :header="false" @change="handleWeekChanged"></weeks>
+		</template>
+	</bs-modal>
+`
 }
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 76243c67b..b8300b4b5 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -4,10 +4,19 @@ export default {
 	mixins: [
 		CalendarAbstract
 	],
+	emits: [
+		'change'
+	],
 	inject: [
 		'size',
 		'focusDate'
 	],
+	props: {
+		header: {
+			type: Boolean,
+			default: true
+		}
+	},
 	computed: {
 		weeks(){
 			return [...Array(this.focusDate.numWeeks).keys()].map(i => i + 1);
@@ -20,7 +29,7 @@ export default {
 		setWeek(week) {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
-			this.$emit('updateMode', 'week');
+			this.$emit('change', week);
 		},
 		prev(){
 			this.focusDate.y--;
@@ -33,7 +42,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-weeks h-100">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
+		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
 				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 2ee684c32..053b1c3b9 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -121,28 +121,15 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
-			const isMonthMode = capitalizedMode === 'Month'
-			const isInCurrentMonth = day.getMonth() == this.currentDay.getMonth()
-			
-			if(isMonthMode && isInCurrentMonth) {
-				this.$router.replace({
-					name: "Stundenplan",
-					params: {
-						mode: capitalizedMode,
-						focus_date: date,
-						lv_id: this.propsViewData?.lv_id || null
-					}
-				})
-			} else {
-				this.$router.push({
-					name: "Stundenplan",
-					params: {
-						mode: capitalizedMode,
-						focus_date: date,
-						lv_id: this.propsViewData?.lv_id || null
-					}
-				})
-			}
+
+			this.$router.push({
+				name: "Stundenplan",
+				params: {
+					mode: capitalizedMode,
+					focus_date: date,
+					lv_id: this.propsViewData?.lv_id || null
+				}
+			})
 
 			this.currentDay = day;
 		},

From 9b68bfd336bd4c7dc15ff90afc14f266b51d2bbd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 27 Feb 2025 11:49:57 +0100
Subject: [PATCH 0069/1357] focus day highlight css animation

---
 public/css/components/calendar.css          | 23 +++++++++++++++++----
 public/js/components/Calendar/Month/Page.js |  2 +-
 public/js/components/Calendar/Week/Page.js  | 22 ++++++++++----------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index f1005f516..9edc1c0f2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -242,10 +242,25 @@
 	opacity: 0.5;
 }
 
-.fhc-calendar-month-page-day-highlight {
-	 /*background-color: #f5f5f5;*/
-	 /*background-color: red;*/
- }
+.fhc-calendar-month-page-day-focusday {
+	border-color: black !important;
+	background-color: white;
+	position: relative;
+	animation: dash-animation 2.5s linear infinite;
+}
+
+@keyframes dash-animation {
+	0% {
+		border-style: dashed;
+	}
+	50% {
+		border-style: solid;
+	}
+	100% {
+		border-style: dashed;
+	}
+}
+
 .fhc-highlight-week {
 	/*border-color: black !important;*/
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 3aa6d41c9..47630f47f 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -72,7 +72,7 @@ export default {
 			const isNotThisMonth = day.getMonth() != this.month
 			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
 			
-			if(isThisDate) classstring += ' border-8'
+			if(isThisDate) classstring += ' fhc-calendar-month-page-day-focusday'
 			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
 			if(isHighlightedDay) classstring += ' fhc-highlight-day'
 			
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 999369313..dccca6630 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -363,17 +363,17 @@ export default {
 					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
-									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-									class="small rounded overflow-hidden fhc-entry"
-									v-contrast
-									>		
-									<slot class="p-1" name="weekPage" :event="event" :day="day">
-										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-									</slot>
-								</div>
-							</template>
+							<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
+								:selected="event == selectedEvent"
+								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+								class="small rounded overflow-hidden fhc-entry"
+								v-contrast
+								>		
+								<slot class="p-1" name="weekPage" :event="event" :day="day">
+									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+								</slot>
+							</div>
+						</template>
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">

From e2b1dad7761ebb74942be32d36d47bad90b8fe29 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Feb 2025 12:06:43 +0100
Subject: [PATCH 0070/1357] fix(Plugin Moodle Event.php) adds the moodle
 calendar events integration through the Events instead of having a fixed
 dependency

---
 .../api/frontend/v1/Stundenplan.php            | 18 ++++++++++++++++++
 public/js/api/stundenplan.js                   |  6 ++----
 .../components/Cis/Stundenplan/Stundenplan.js  |  2 +-
 .../components/DashboardWidget/Stundenplan.js  |  6 +++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 2ec02fea9..4abff559c 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use CI3_Events as Events;
+
 class Stundenplan extends FHCAPI_Controller
 {
 
@@ -28,6 +30,7 @@ class Stundenplan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
+			'fetchMoodleEvents' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
@@ -57,6 +60,21 @@ class Stundenplan extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	public function fetchMoodleEvents(){
+		$this->load->library('form_validation');
+        $this->form_validation->set_data($_GET);
+        $this->form_validation->set_rules('timestart',"timestart","required");
+        $this->form_validation->set_rules('timeend',"timeend","required");
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+        $timestart = intval($this->input->get('timestart', TRUE));
+        $timeend = intval($this->input->get('timeend', TRUE));
+		Events::trigger('moodleCalendarEvents',
+						['timestart'=>$timestart,'timeend'=>$timeend, 'username'=>getAuthUID()]
+		);
+		$this->terminateWithSuccess(json_decode(ob_get_contents()));
+	}
+
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
 	public function studiensemesterDateInterval($date){
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 94dad7ffe..388db5454 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -42,12 +42,10 @@ export default {
 			{}
 		);
 	},
-	getMoodleEventsByUserid(username, timestart, timeend) {
+	getMoodleEventsByUserid(timestart, timeend) {
 		return this.$fhcApi.get(
-			FHC_JS_DATA_STORAGE_OBJECT.app_root +
-			`addons/moodle/cis/get_events_by_userid.php`,
+			`/api/frontend/v1/Stundenplan/fetchMoodleEvents`,
 			{
-				username: username,
 				timestart: timestart,
 				timeend: timeend,
 			}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 053b1c3b9..889a3f8bf 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -250,7 +250,7 @@ const Stundenplan = {
 			
 			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
 				let data =events.map(event =>{
 					const event_start_date = new Date(event.timestart);
 					const event_end_date = new Date(event.timeend);
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 3bffb478e..006acd306 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -170,7 +170,7 @@ export default {
 
 			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
 				let data = events.map(event => {
 					const event_start_date = new Date(event.timestart);
 					const event_end_date = new Date(event.timeend);
@@ -230,7 +230,7 @@ export default {
 				<div  v-if="event.type=='moodle'">
 					<div class="d-flex small w-100" >
 						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+						<span v-contrast class="flex-grow-1 text-center ">{{event.topic}}</span>
 					</div>
 				</div>
 				<span v-else class="small" >
@@ -250,7 +250,7 @@ export default {
 							<template v-if="evt.type=='moodle'">
 								<div class="d-flex align-items-center ">
 									<moodle-svg></moodle-svg>
-									<b class="flex-grow-1 text-center">{{evt.topic}}</b>
+									<b v-contrast class="flex-grow-1 text-center">{{evt.topic}}</b>
 								</div>
 							</template>
 							<template v-else>

From 7b74c369525196b250f53ba583b8c4b88468f1f0 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 27 Feb 2025 12:09:30 +0100
Subject: [PATCH 0071/1357] - Removed public method isValidDate from controller
 api/frontend/v1/studstatus/Unterbrechung - Replaced callback_isValidDate with
 is_valid_date - Removed global function isValidDate from
 helpers/hlp_common_helper

---
 .../frontend/v1/studstatus/Unterbrechung.php  | 15 +++------------
 .../api/frontend/v1/stv/Student.php           |  4 ++--
 application/helpers/hlp_common_helper.php     | 19 ++-----------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php b/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
index abf58cf4f..72d5dbccc 100644
--- a/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
+++ b/application/controllers/api/frontend/v1/studstatus/Unterbrechung.php
@@ -127,9 +127,9 @@ class Unterbrechung extends FHCAPI_Controller
 		$this->form_validation->set_rules(
 			'datum_wiedereinstieg',
 			'Datum Wiedereinstieg',
-			'required|callback_isValidDate|callback_isDateInFuture',
+			'required|is_valid_date|callback_isDateInFuture',
 			[
-				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
+				'is_valid_date' => $this->p->t('ui', 'error_invalid_date'),
 				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
 			]
 		);
@@ -209,18 +209,9 @@ class Unterbrechung extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($result));
 	}
 
-	public function isValidDate($date)
-	{
-		try {
-		    new DateTime($date);
-		} catch (Exception $e) {
-			return false;
-		}
-		return true;
-	}
-
 	public function isDateInFuture($date)
 	{
 		return new DateTime() < new DateTime($date);
 	}
 }
+
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 89c317ae4..99df11591 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -319,8 +319,8 @@ class Student extends FHCAPI_Controller
 		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
 			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
 		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_invalid_date')
 		]);
 		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
 		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 40aed007c..d339efa62 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -408,28 +408,13 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 	return null;
 }
 
-/**
- * check if String can be converted to a date
- */
-function isValidDate($dateString)
-{
-	try
-	{
-		return (new DateTime($dateString)) !== false;
-	}
-	catch(Exception $e)
-	{
-		return false;
-	}
-}
-
-
 // ------------------------------------------------------------------------
 // Collection of utility functions for form validation purposes
 // ------------------------------------------------------------------------
 
 /**
- * check if string can be converted to a date
+ * Check if the provided parameter is a string containing a valid date
+ * NOTE: the name is in the "snake case" format because othewise the CI form validation _cannot_ use it
  */
 function is_valid_date($dateString)
 {

From f9f185bfef0291274011e99fe057da8a3b42f994 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 27 Feb 2025 14:06:25 +0100
Subject: [PATCH 0072/1357] Views modal, new tab, new page, app and controller
 for newMessage to open in tab or window

---
 application/controllers/NeueNachricht.php     |  30 ++
 .../api/frontend/v1/messages/Messages.php     |   2 +-
 application/views/Nachrichten.php             |  48 ++
 public/js/apps/Messages/NewMessage.js         |  27 +
 public/js/apps/Nachrichten.js                 |  25 +
 .../components/Messages/Details/NewMessage.js |  92 +---
 .../Messages/Details/NewMessage/Modal.js      | 468 +++++++++++++++++
 .../Messages/Details/NewMessage/NewDiv.js     | 488 ++++++++++++++++++
 .../Messages/Details/TableMessages.js         |  32 +-
 public/js/components/Messages/Messages.js     | 108 +++-
 .../Studentenverwaltung/Details/Messages.js   |   2 +-
 .../VorlagenDropdown/VorlagenDropdown.js      |   2 +-
 12 files changed, 1218 insertions(+), 106 deletions(-)
 create mode 100644 application/controllers/NeueNachricht.php
 create mode 100644 application/views/Nachrichten.php
 create mode 100644 public/js/apps/Messages/NewMessage.js
 create mode 100644 public/js/apps/Nachrichten.js
 create mode 100644 public/js/components/Messages/Details/NewMessage/Modal.js
 create mode 100644 public/js/components/Messages/Details/NewMessage/NewDiv.js

diff --git a/application/controllers/NeueNachricht.php b/application/controllers/NeueNachricht.php
new file mode 100644
index 000000000..9e9e0a39b
--- /dev/null
+++ b/application/controllers/NeueNachricht.php
@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class NeueNachricht extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+		//now working
+		$this->load->view('Nachrichten', [
+			'permissions' => [
+				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
+			]
+		]);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 788c8861e..4bc9a13ab 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -129,7 +129,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($uid)
 	{
-
+		//$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
 
 	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
diff --git a/application/views/Nachrichten.php b/application/views/Nachrichten.php
new file mode 100644
index 000000000..cf34bfd53
--- /dev/null
+++ b/application/views/Nachrichten.php
@@ -0,0 +1,48 @@
+<?php
+$includesArray = array(
+	'title' => 'Nachrichten',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'primevue3' => true,
+	#'filtercomponent' => true,
+	'tabulator5' => true,
+	'tinymce5' => true,
+	'phrases' => array(
+		'global',
+		'ui',
+	),
+	'customCSSs' => [
+		'public/css/components/vue-datepicker.css',
+		'public/css/components/primevue.css',
+	],
+	'customJSs' => [
+		#'vendor/npm-asset/primevue/tree/tree.min.js',
+		#'vendor/npm-asset/primevue/toast/toast.min.js'
+	],
+	'customJSModules' => [
+		'public/js/apps/Nachrichten.js'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<?php
+$configArray = [
+	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
+];
+?>
+
+<div id="main">
+	<router-view
+		cis-root="<?= CIS_ROOT; ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+	>
+	</router-view>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/js/apps/Messages/NewMessage.js b/public/js/apps/Messages/NewMessage.js
new file mode 100644
index 000000000..693c8b0e2
--- /dev/null
+++ b/public/js/apps/Messages/NewMessage.js
@@ -0,0 +1,27 @@
+//TODO Manu
+//use this instead of Nachrichten.js
+import NewMessage from "../../components/Messages/Details/NewMessage/NewDiv.js";
+import Phrasen from "../../plugin/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/NeueNachricht`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+	]
+});
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js
new file mode 100644
index 000000000..0f921a9f8
--- /dev/null
+++ b/public/js/apps/Nachrichten.js
@@ -0,0 +1,25 @@
+import NewMessage from "../components/Messages/Details/NewMessage/NewDiv.js";
+
+import Phrasen from "../plugin/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+	]
+});
+
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index c8aae2124..33ff74d9c 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -2,13 +2,15 @@ import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
+import MessageModal from "../Details/NewMessage/Modal.js";
 
 export default {
 	components: {
 		FormForm,
 		FormInput,
 		ListBox,
-		DropdownComponent
+		DropdownComponent,
+		MessageModal,
 	},
 	props: {
 		endpoint: {
@@ -35,7 +37,7 @@ export default {
 			vorlagen: [],
 			defaultRecipient: null,
 			editor: null,
-			isVisible: true,
+			isVisible: false,
 			fieldsUser: [],
 			fieldsPerson: [],
 			fieldsPrestudent: [],
@@ -45,12 +47,6 @@ export default {
 			itemsPrestudent: [],
 			itemsPerson: [],
 			itemsUser: [],
-/*			selectedFieldStudent: null,
-			itemsStudent: [
-				{ label: "Variable 1", value: "var1" },
-				{ label: "Variable 2", value: "var2" },
-				{ label: "Variable 3", value: "var3" }
-			]*/
 			previewText: null,
 			previewBody: ""
 		}
@@ -170,62 +166,6 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		//TODO(Manu) refactor
-/*		insertVariablePrestudent() {
-				if (this.editor) {
-					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-					const lastVariable = this.selectedFieldPrestudent.value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				} else {
-				console.error("Editor instance is not available.");
-			}
-		},*/
-/*		insertVariablePrestudentByClick(selectedItem) {
-
-			if (selectedItem) {
-				this.editor.insertContent(selectedItem.value + " ");
-				console.log("Eingefügte Variable:", selectedItem);
-			} else {
-				console.warn("Keine Variable ausgewählt!");
-			}
-		},
-
-		insertVariablePerson() {
-				if (this.editor) {
-					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-					const lastVariable = this.selectedFieldPerson.value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		insertVariableUser() {
-			if (this.editor) {
-				console.log(this.selectedFieldUser.value);
-				const lastVariable = this.selectedFieldUser.value;
-
-				//Multiple
-				//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				this.selectedFieldUser = null;
-			} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		insertVariableStudent(selectedItem) {
-			if (selectedItem) {
-				console.log("Eingefügte Variable:", selectedItem);
-				this.editor.insertContent(selectedItem.value + " ");
-			} else {
-				console.warn("Keine Variable ausgewählt!");
-			}
-		},*/
 		replyMessage(message_id){
 			console.log("auf message " + message_id + " antworten");
 		},
@@ -241,9 +181,9 @@ export default {
 			this.$refs.dropdownComp.setValue(null);
 
 		},
-		toggleDivNewMessage(){
+/*		toggleDivNewMessage(){
 			this.isVisible = !this.isVisible;
-		},
+		},*/
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
 				this.getVorlagentext(vorlage_kurzbz);
@@ -254,15 +194,17 @@ export default {
 			if (this.openMode == "showDiv")
 				this.isVisible = false;
 		},
-		showTemplate(){
+		showTemplate(id, typeId){
 			if (this.openMode == "showDiv")
 				this.isVisible = true;
+			//just for testing:
+			this.isVisible = true;
 		},
 		showPreview(){
 			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
-		}
+		},
 	},
 	watch: {
 		'formData.body': {
@@ -343,9 +285,19 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-newmessage">
-			<hr>
+
+			<message-modal
+				ref="modalMsg"
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
+				:openMode="openMode"
+				@reloadTable="reloadTable"
+				>
+			</message-modal>
+<!--			<hr>
 		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
-		<hr>
+		<hr>-->
 
 		<div v-show="isVisible">
 			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
new file mode 100644
index 000000000..9bfe49929
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -0,0 +1,468 @@
+import BsModal from "../../../Bootstrap/Modal.js";
+import FormForm from "../../../Form/Form.js";
+import FormInput from '../../../Form/Input.js';
+import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		DropdownComponent,
+		FormInput,
+		ListBox
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		openMode: String,
+	},
+	data(){
+		return {
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			previewText: null,
+			previewBody: ""
+		}
+	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage() {
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
+
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.hideTemplate();
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			//console.log(typeof vorlage_kurzbz);
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				/*				this.editor.focus();
+								this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		},
+		show(){
+			this.$refs.modalNewMessage.show();
+		}
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+				//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+			}
+		}
+	},
+	created(){
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+											label: key,
+											value: value
+										}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
+	template: `
+		<bs-modal class="messages-detail-newmessage-modal" ref="modalNewMessage" dialog-class="modal-xl">
+
+			<template #title>
+				New Message
+			</template>
+
+			<form-form ref="formNewMassage">
+
+				<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
+
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+							<p>{{selectedFieldPrestudent}}</p>
+
+						</div>
+
+						<div v-if="this.fieldsPerson.length > 0">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+							<p>{{selectedFieldPerson}}</p>
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+
+			</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+					<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+					<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+					<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+
+	</div>
+	`,
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
new file mode 100644
index 000000000..b31cd9932
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -0,0 +1,488 @@
+import FormForm from '../../../Form/Form.js';
+import FormInput from '../../../Form/Input.js';
+import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
+
+export default {
+	components: {
+		FormForm,
+		FormInput,
+		ListBox,
+		DropdownComponent,
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		//for open in div and modal
+/*		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},*/
+		openMode: String,
+	},
+	computed: {
+		//params with routes for new tab and new window AND props
+/*		id(){
+			return this.$route.params.id || this.id;
+		},
+		typeId(){
+			return this.$route.params.typeId || this.typeId;
+		},*/
+		id(){
+			return this.$route.params.id || this.$props.id;
+		},
+		typeId(){
+			return this.$route.params.typeId || this.$props.id;
+		}
+	},
+	data(){
+		return {
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			isVisible: false,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			previewText: null,
+			previewBody: ""
+		}
+	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage() {
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
+
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.hideTemplate();
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				/*				this.editor.focus();
+								this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+			this.previewBody = null;
+
+		},
+		toggleDivNewMessage(){
+			this.isVisible = !this.isVisible;
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+			//just for testing:
+			this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		},
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+				//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+			}
+		},
+	},
+	created(){
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+											label: key,
+											value: value
+										}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId
+		})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
+	template: `
+
+	<div class="messages-detail-newmessage">
+
+			<!--passt für showdiv-->
+<!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
+
+			<!--new page-->
+			<div class="overflow-auto m-3">
+
+			{{id}} || {{typeId}}
+
+				<h4>New Message</h4>
+	<!--			{{formData.body}}
+				||
+				{{previewText}}-->
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 250px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<br>
+
+						<div v-if="this.fieldsPerson.length > 0" class="mt-3">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 250px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<br>
+
+						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll" style="height: 300px;"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+
+		</div>
+
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 10210ece4..7994cbe1d 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,10 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
+import NewMessage from "../Details/NewMessage.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
+		NewMessage,
 	},
 	inject: {
 		cisRoot: {
@@ -205,7 +207,8 @@ export default {
 				},
 			],
 			tabulatorData: [],
-			previewBody: ""
+			previewBody: "",
+			open: false
 		}
 	},
 	methods: {
@@ -233,20 +236,9 @@ export default {
 				});
 		},
 		actionNewMessage(){
+			this.$emit('newMessage', this.id, this.typeId);
 			//console.log("action new message");
-			if (this.openMode == "window") {
-				console.log("openInNewWindow")
-				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
-				window.open(linkWindowNewMessage, '_blank');
-			}
-			else if (this.openMode == "modal"){
-				console.log("open with bootstrap Modal");
-			}
-			else if (this.openMode == "showDiv"){
-				this.$emit('showNewMessageTemplate');
-			}
-			else
-				console.log("no valid openMode");
+
 		},
 		reload() {
 			this.$refs.table.reloadTable();
@@ -274,19 +266,10 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-<!--		<p>endpoint: {{endpoint}}</p>-->
-<!--				{{cisRoot}}-->
-<!--		<p>{{messageLayout}}</p>-->
-
-		<!-- {{statusText[0] }}
-		<hr>
-		{{$p.t('messages', 'unread')}} -->
-		<!-- {{statusText.0}} -->
-		<!-- <p v-for="(bezeichnung, key) in statusText" :key="key" :value="key">{{bezeichnung}}</p> -->
 
 		<!--View Studierendenverwaltung-->
 		<div v-if="messageLayout=='twoColumnsTableLeft'">
-		
+
 			<div class="row">
 				<!--table-->
 				<div class="col-sm-6 pt-6">
@@ -307,7 +290,6 @@ export default {
 				<!--preview wysiwyg-window-->
 				<div class="col-sm-6 pt-6">
 				<br><br><br><br>
-
 					<div ref="preview">
 						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
 					</div>
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index f862ebc46..49fdbdf79 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,10 +1,20 @@
 import TableMessages from "./Details/TableMessages.js";
 import NewMessage from "./Details/NewMessage.js";
-
+import FormOnly from "./Details/NewMessage/NewDiv.js";
+import FhcApi from "../../../../public/js/plugin/FhcApi.js";
+import Phrasen from "../../../../public/js/plugin/Phrasen.js";
 export default {
 	components: {
 		TableMessages,
-		NewMessage
+		NewMessage,
+		FormOnly,
+		FhcApi,
+		Phrasen
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		}
 	},
 	props: {
 		endpoint: {
@@ -34,6 +44,7 @@ export default {
 			validator(value) {
 				return [
 					'window',
+					'newTab',
 					'modal',
 					'showDiv'
 				].includes(value)
@@ -41,18 +52,85 @@ export default {
 		}
 	},
 	data() {
-		return {}
+		return {
+			showDiv: false
+		}
 	},
 	methods: {
-		showNewMessageTemplate(){
-			this.$refs.templateNewMessage.showTemplate();
-		},
 		reloadTable(){
 			this.$refs.templateTableMessage.reload();
-		}
+		},
+		newMessage(id, typeId){
+			if (this.openMode == "window") {
+				this.openInNewWindow(id, typeId);
+			}
+			else if (this.openMode == "newTab"){
+				this.openInNewTab(id, typeId);
+			}
+			else if (this.openMode == "modal"){
+				this.openInModal(id, typeId);
+			}
+			else if (this.openMode == "showDiv"){
+				this.$refs.templateNewMessage.showTemplate(id, typeId);
+			}
+			else
+				console.log("no valid openMode");
+		},
+		openInDiv(id, typeId){
+			this.$refs.templateNewMessage.showTemplate(id, typeId);
+			//this.showDiv = true; //local variante
+			//this.$refs.templateNewMessage.showTemplate();
+		},
+		openInModal(id, typeId){
+			//TODO(manu) define bs-modal in this component
+			this.$refs.templateNewMessage.$refs.modalMsg.show();
+		},
+		openInNewTab(id, typeId){
+			//TODO(MANU) check if array of ids...
+/*			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + this.id + "/" + this.typeId;*/
+
+			//als param
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + id + "/" + typeId;
+
+			const newTab = window.open(path, "_blank");
+		},
+		openInNewWindow(id, typeId){
+			//TODO(MANU) check if array of ids...
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + id + "/" + typeId;
+
+			const newTab = window.open(path, "_blank");
+
+			const width = Math.round(window.innerWidth * 0.75);
+			const height = Math.round(window.innerHeight * 0.75);
+			const left = Math.round((window.innerWidth - width) / 2);
+			const top = Math.round((window.innerHeight - height) / 2);
+
+			const newWindow = window.open(path, "_blank", `width=${width},height=${height},left=${left},top=${top}`);
+		},
+
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
+
+		<message-modal
+			ref="modalMsg"
+			:type-id="typeId"
+			:id="id"
+			:endpoint="endpoint"
+			:openMode="openMode"
+			@reloadTable="reloadTable"
+			>
+		</message-modal>
+
+<!--		<div>
+			<button class="btn btn-secondary m-1" @click="openInDiv(id,typeId)">Open in Div</button>
+			<button class="btn btn-secondary" @click="openInModal(id,typeId)">Open in Modal</button>
+			<button class="btn btn-secondary m-1" @click="openInNewTab(id,typeId)">Open in Tab</button>
+			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
+		</div>-->
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
 			<new-message
@@ -74,10 +152,24 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@showNewMessageTemplate="showNewMessageTemplate"
+				@newMessage="newMessage"
 			>
 			
 			</table-messages>
+
+			<!--working also with form_only-->
+			<div v-if="showDiv">
+				<form-only
+					ref="templateNewForm"
+					:type-id="typeId"
+					:id="id"
+					:endpoint="endpoint"
+					:openMode="openMode"
+					@reloadTable="reloadTable"
+				>
+				</form-only>
+			</div>
+
 		</div>
 		
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index bc07401e6..44f1a6aa2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -18,7 +18,7 @@ export default {
 			messageLayout="twoColumnsTableLeft"
 			show-table
 			show-new
-			open-mode="showDiv"
+			open-mode="newTab"
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index b074711f4..e5d80077e 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -57,7 +57,7 @@ export default {
 		if(this.useLoggedInUserOe){
 			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
 				.then(result => {
-					console.log(this.vorlagenOe);
+					//console.log(this.vorlagenOe);
 					this.vorlagenOe = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From b3481194882cdc9c40068e77168bc442cafbe529 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 27 Feb 2025 14:45:57 +0100
Subject: [PATCH 0073/1357] added comment to Documents api controller

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

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 42a2d3433..ebd1b269b 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -149,9 +149,11 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
+	 * @param string				$xml
+	 * @param string				$xsl
+	 * @param string				$sign_user (optional)
 	 * 
-	 * @param
-	 * @return object success or error
+	 * @return array with Akte data and export data
 	 */
 	private function _getAkteExportData($xml, $xsl, $sign_user = null)
 	{

From 45c929cb90c0358bd3e9cb2dec9c2dc9f0014585 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Feb 2025 14:47:45 +0100
Subject: [PATCH 0074/1357] refactor(LvInfo): refactors template layout of
 LvInfo for lehrveranstaltungen and moodle events

---
 public/js/components/Calendar/Month.js        |  2 +-
 public/js/components/Calendar/Week.js         |  2 +-
 public/js/components/Cis/Mylv/LvInfo.js       | 94 ++++++++++---------
 .../components/Cis/Stundenplan/Stundenplan.js |  2 +-
 4 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 520c4d0d9..ab20e2e03 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -2,7 +2,7 @@ import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarMonthPage from './Month/Page.js';
 import BsModal from "../Bootstrap/Modal.js";
-import Months from "./Months";
+import Months from "./Months.js";
 export default {
 	mixins: [
 		CalendarAbstract
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 9e5baac76..4b30a1b79 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -2,7 +2,7 @@ import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarWeekPage from './Week/Page.js';
 import BsModal from "../Bootstrap/Modal.js";
-import Weeks from "./Weeks";
+import Weeks from "./Weeks.js";
 
 export default {
 	mixins: [
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 18b318b4b..e2a00b5c9 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -56,21 +56,47 @@ export default {
 	},
 	template:/*html*/`
 		<table class="table table-hover mb-4">
-			<tbody>
-				<tr>
-					<th>{{
-						$p.t('global','datum')?
-						$p.t('global','datum')+':'
-						:''
-					}}</th>
-					<td>{{methodFormatDate(event.datum)}}</td>
-				</tr>
-				<tr>
-					<template v-if="event.type == LV_TYPES.moodle">
+			<template v-if="event.type == LV_TYPES.moodle">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
 						<td>{{event?.assignment}}</td>
-					</template>
-					<template v-else>
+					</tr>
+					<tr>
+						<th>{{$p.t('global','typ')}}:</th>
+						<td>{{event?.purpose}}</td>
+					</tr>
+					<tr>
+						<th>{{$p.t('fristenmanagement','frist')}}:</th>
+						<td>{{start_time}}</td>
+					</tr>
+					<tr >
+				    	<th>Link:</th>
+						<td>
+							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
+						</td>
+					</tr>
+				</tbody>
+			</template>
+			<template v-else>
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
 						<th>{{
 							$p.t('global','raum')?
 							$p.t('global','raum')+':'
@@ -80,9 +106,7 @@ export default {
 							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
-					</template>
-				</tr>
-				<template v-if="event.type != LV_TYPES.moodle">
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('lehre','lehrveranstaltung')?
@@ -91,8 +115,6 @@ export default {
 						}}</th>
 						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
 					</tr>
-				</template>
-				<template v-if="event.type != LV_TYPES.moodle">
 					<tr>
 						<th>{{
 							$p.t('lehre','lektor')?
@@ -106,40 +128,24 @@ export default {
 							</div>
 						</td>
 					</tr>
-				</template>
-				<tr>
-					<template v-if="event.type == LV_TYPES.moodle">
-						<th>{{$p.t('global','typ')}}:</th>
-						<td>{{event?.purpose}}</td>
-					</template>
-					<template v-else>
+					<tr>
 						<th>{{
-							$p.t('ui','zeitraum')?
-							$p.t('ui','zeitraum')+':'
-							:''
-						}}</th>
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
 						<td>{{start_time + ' - ' + end_time}}</td>
-					</template>
-				</tr>
-				<tr>
-				    <template v-if="event.type == LV_TYPES.moodle">
-						<th>{{$p.t('fristenmanagement','frist')}}:</th>
-						<td>{{start_time}}</td>
-					</template>
-					<template v-else>
+					</tr>
+					<tr>
 						<th>{{
 							$p.t('lehre','organisationseinheit')?
 							$p.t('lehre','organisationseinheit')+':'
 							:''
 						}}</th>
 						<td>{{event.organisationseinheit}}</td>
-					</template>
-				</tr>
-				<tr v-if="event.type == LV_TYPES.moodle">
-				    <th>Link:</th>
-					<td><a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a></td>
-				</tr>
-			</tbody>
+					</tr>
+				</tbody>
+			</template>
 		</table>
 	`
 }
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 889a3f8bf..c8c4fb91c 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -336,7 +336,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div class="p-1" v-if="event.type=='moodle'">
+			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
 				<div class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>

From 4a01198e10c86bf2f49fdcf38f60ab5cb4270f9d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 28 Feb 2025 14:52:02 +0100
Subject: [PATCH 0075/1357] refactor(Stundenplan Endpoint):puts methods used to
 fetch Stundenplan and Reservierungs Events in its own library and dynamically
 merges the moodle events if plugin is present

---
 .../api/frontend/v1/Stundenplan.php           | 568 +++---------------
 application/libraries/StundenplanLib.php      | 558 +++++++++++++++++
 public/js/api/stundenplan.js                  |  16 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  61 +-
 .../components/DashboardWidget/Stundenplan.js |  60 +-
 5 files changed, 647 insertions(+), 616 deletions(-)
 create mode 100644 application/libraries/StundenplanLib.php

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 4abff559c..c53af8e3c 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -30,11 +30,10 @@ class Stundenplan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
-			'fetchMoodleEvents' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
-			'getStundenplan' => self::PERM_LOGGED,
+			'StundenplanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 		]);
@@ -60,19 +59,83 @@ class Stundenplan extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	public function fetchMoodleEvents(){
-		$this->load->library('form_validation');
-        $this->form_validation->set_data($_GET);
-        $this->form_validation->set_rules('timestart',"timestart","required");
-        $this->form_validation->set_rules('timeend',"timeend","required");
-        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+	 /**
+     * fetches Stundenplan and Moodle events together
+     * @access public
+     *
+     */
+	public function StundenplanEvents(){
+		$this->load->library('StundenplanLib');
 
-        $timestart = intval($this->input->get('timestart', TRUE));
-        $timeend = intval($this->input->get('timeend', TRUE));
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		if ($this->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the get parameter in local variables
+		$start_date = $this->input->get('start_date', TRUE);
+		$end_date = $this->input->get('end_date', TRUE);
+		$lv_id = $this->input->get('lv_id', TRUE);
+
+		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
+		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);	
+
+		// fetching moodle events
+		$moodle_start_date = new DateTime($start_date);
+		$moodle_start_date = $moodle_start_date->getTimestamp();
+		$moodle_end_date = new DateTime($end_date);
+		$moodle_end_date = $moodle_end_date->getTimestamp();
+		$moodle_events = [];
 		Events::trigger('moodleCalendarEvents',
-						['timestart'=>$timestart,'timeend'=>$timeend, 'username'=>getAuthUID()]
+						function & () use (&$moodle_events) {
+							return $moodle_events;
+						},
+						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
 		);
-		$this->terminateWithSuccess(json_decode(ob_get_contents()));
+		
+		$moodle_events = array_map(function($event){
+			$moodle_event_timestart = new DateTime($event->timestart);
+			$moodle_event_timeend = new DateTime($event->timeend);
+			$convertedEvent = new stdClass();
+			$convertedEvent->type = 'moodle';
+			$convertedEvent->beginn = $moodle_event_timestart->format('H:i:s');
+			$convertedEvent->ende = $moodle_event_timeend->format('H:i:s');
+			$convertedEvent->allDayEvent = true;
+			$convertedEvent->datum = $moodle_event_timestart->format('Y-n-j');
+			$convertedEvent->purpose = $event->purpose;
+			$convertedEvent->assignment = $event->activityname;
+			$convertedEvent->topic = $event->activitystr;
+			$convertedEvent->lektor = [];
+			$convertedEvent->gruppe = [];
+			$convertedEvent->ort_kurzbz = $event->location;
+			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
+			$convertedEvent->titel = $event->course->fullname;
+			$convertedEvent->lehrfach = '';
+			$convertedEvent->lehrform = '';
+			$convertedEvent->lehrfach_bez = '';
+			$convertedEvent->organisationseinheit = '';
+			$convertedEvent->farbe = '00689E';
+			$convertedEvent->lehrveranstaltung_id = 0;
+			$convertedEvent->ort_content_id = 0;
+			$convertedEvent->url = $event->url;
+			return $convertedEvent;
+		},$moodle_events);
+		
+		$result = array_merge($stundenplan_events,$moodle_events);
+		// sort array with moodle events first
+		usort($result, function($a, $b){
+			if ($a->type === 'moodle' && $b->type !== 'moodle') {
+				return -1;
+			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
+				return 1;
+			} else {
+				return 0;
+			}
+		});
+		$this->terminateWithSuccess($result);
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
@@ -129,90 +192,7 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($roomplan_data);
 
 	}
-
-	/**
-	 * fetches stundenplan events from a UID and start/end date
-	 * @access public
-	 *
-	 */
-
-	public function getStundenplan(){
-
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		if ($this->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the get parameter in local variables
-		$start_date = $this->input->get('start_date', TRUE);
-		$end_date = $this->input->get('end_date', TRUE);
-		$lv_id = $this->input->get('lv_id', TRUE);
-
-		$student_uid = getAuthUID();
-		if(is_null($student_uid))
-		{
-			$this->terminateWithError("No UID");
-		}
-		
-		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
-		$this->sortStudienSemester($semester_range);
-		$this->applyLoadUeberSemesterHaelfte($semester_range);
-		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
-
-			$stundenplan_data = $this->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-			$this->expand_object_information($stundenplan_data);
-
-			// query lv itself in case its Stundenplan is being queried and it has no entries
-			$this->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv = getData($this->LehrveranstaltungModel->load($lv_id))[0];
-			$this->addMeta('lv', $lv);
-			$this->terminateWithSuccess($stundenplan_data);
-			
-		}
-		
-		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
-		if($is_mitarbeiter)
-		{
-			
-			$stundenplan_data = $this->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-			$this->expand_object_information($stundenplan_data);
-			$this->terminateWithSuccess($stundenplan_data);
-		} else {
-			// getting the gruppen_kurzbz of the student in the different studiensemester
-			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
-
-			// getting the student_lehrverbaende of the student in the different studiensemester
-			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
-
-			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
-			{
-				$this->terminateWithSuccess([]);
-			}
-			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-
-			$this->expand_object_information($stundenplan_data);
-			
-			$this->returnObj['$stundenplan_query'] = $stundenplan_query;
-			$this->returnObj['$student_lehrverband'] = $student_lehrverband;
-			$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
-			$this->terminateWithSuccess($stundenplan_data);
-		}
-		
-	}
-
+	
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
@@ -229,19 +209,10 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-		if($is_mitarbeiter)
-		{
-			$reservierungen = $this->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
-		} else {
-			// querying the reservierungen
-			$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		}
-		
-		$reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
-		$this->expand_object_information($reservierungen);
-		$this->terminateWithSuccess($reservierungen);
-		
+		$this->load->library('StundenplanLib');
+		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->getDataOrTerminateWithError($result);	
+		$this->terminateWithSuccess($result);
 	}
 
 	public function getLehreinheitStudiensemester($lehreinheit_id){
@@ -252,385 +223,6 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	// ################# Private Functions
-
-	private function expand_object_information($data){
-
-		foreach ($data as $item)
-		{
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($item->lektor as $lv_lektor)
-			{
-				$this->StundenplanModel->addLimit(1);
-				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
-				FROM public.tbl_mitarbeiter
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
-				WHERE kurzbz = ?", [$lv_lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = $this->getDataOrTerminateWithError($lektor_object);
-				if(count($lektor_object) == 0)
-				{
-					$this->terminateWithError("No lektor object");
-				}
-				$lektor_object = current($lektor_object);
-				// only provide needed information of the mitarbeiter object
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe)
-			{
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-			
-			if($item->ort_kurzbz) {
-
-				$ort_content_object = $this->StundenplanModel->execReadOnlyQuery("
-				SELECT content_id
-				FROM public.tbl_ort
-				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
-				if (isError($ort_content_object)) {
-					$this->show_error(getError($ort_content_object));
-				}
-				$ort_content_object = getData($ort_content_object)[0];
-				if($ort_content_object) {
-					$item->ort_content_id = $ort_content_object->content_id;
-				}
-				
-				
-			}
-
-			$item->gruppe = $gruppe_obj_array;
-			$item->lektor = $lektor_obj_array;
-
-		}
-	}
-
-	// function used to sort an array of studiensemester strings
-	private function sortStudienSemester(&$semester_range){
-		usort(
-			$semester_range,
-			function($first,$second)
-			{
-				$sem_first = null;
-				$year_first = null;
-				$match_first = null;
-
-				$sem_second = null;
-				$year_second = null;
-				$match_second = null;
-
-				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
-				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
-				
-				$sem_first = $match_first[1];
-				$year_first = intval($match_first[2]);
-
-				$sem_second = $match_second[1];
-				$year_second = intval($match_second[2]);
-
-				if($year_first < $year_second)
-				{
-					return -1;
-				}
-				else if($year_first > $year_second)
-				{
-					return 1;
-				}
-				else if($year_first == $year_second && $sem_first > $sem_second)
-				{
-					return 1;
-				}
-				else if($year_first == $year_second && $sem_first < $sem_second)
-				{
-					return -1;
-				}
-				return 0;
-			} 
-		);
-	}
-
 	
 
-	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
-		$benutzer_gruppen = [];
-		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
-		/*
-		[
-			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
-			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
-			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
-		]
-		*/ 
-		foreach($semester_range as $semester_key => $semester_array)
-		{
-			$benutzer_gruppen[$semester_key] = [];
-			// each semester could have ajoint semesters that need to be checked
-			foreach($semester_array as $semester=>$semester_date_range)
-			{
-				// for each active semester query the benutzer_gruppen associated to the semester
-				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
-				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
-				array_push(
-					$benutzer_gruppen[$semester_key],
-					 array_map(
-						function($item)
-						{
-							return "'".$item->gruppe_kurzbz. "'";
-						},
-						$benutzer_query_result
-					)
-				);
-			}
-		}
-		
-		// merge the gruppen of each studiensemester together for the original studiensemester
-		/*
-		[
-			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
-			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
-			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
-		]
-		*/ 
-		$benutzer_gruppen = array_map(
-			function($gruppe)
-			{
-				$merged_gruppe = [];
-				foreach($gruppe as $gruppen_array)
-				{
-					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
-				}
-				return $merged_gruppe;
-			},
-			$benutzer_gruppen
-		);
-
-		return $benutzer_gruppen;
-	}
-
-	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
-		$student_lehrverband = [];
-		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
-		/*
-		[
-			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
-			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
-			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
-		]
-		*/ 
-		foreach($semester_range as $semester_key => $semester_array)
-		{
-			$student_lehrverband[$semester_key] = [];
-			foreach($semester_array as $semester=>$semester_date_range)
-			{
-				// for each active semester query the student_lehrverband associated to the semester
-				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
-				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
-				array_push($student_lehrverband[$semester_key], array_map(
-					function ($item)
-					{
-						$result = new stdClass();
-						$result->studiengang_kz = $item->studiengang_kz;
-						$result->semester = $item->semester;
-						$result->verband = $item->verband;
-						$result->gruppe = $item->gruppe;
-						return $result;
-					},
-					$lehrverband_query_result)); 
-			}
-		}
-
-		// merge the studentlehrverband of each studiensemester together for the original studiensemester
-		/*
-		[
-			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
-			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
-			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
-		]
-		*/
-		$student_lehrverband = array_map(
-			function($studentlehrverband)
-			{	
-				$merged_studentlehrverband = [];
-				foreach($studentlehrverband as $studentlehrverband_array)
-				{
-					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
-				}
-				return $merged_studentlehrverband;
-			},
-			$student_lehrverband
-		);
-
-		return $student_lehrverband;
-	}
-
-	private function applyLoadUeberSemesterHaelfte(&$semester_range){
-		/*
-		@var($semester_collection)
-		convert the array of studiensemester into an associative array with the studiensemester as the key 
-		and the values of each key are the studiensemester needed for the query associated to that studiensemester
-		example:
-
-		#INPUT:
-		['WS2023','SS2024','WS2024']
-		#OUTPUT:
-		[
-			'WS2023' => ['SS2023','WS2023']
-			'SS2024' => ['WS2023','SS2024']
-			'WS2024' => ['SS2024','WS2024']
-		]
-		*/
-		$semester_collection = [];
-		foreach($semester_range as $studiensemester)
-		{
-			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
-			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
-			if (count($previous_studiensemester) == 0) {
-				$this->terminateWithError("No previous semester");
-			}
-			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
-			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
-		}
-
-		/*
-		@var($studienSemesterDateRanges)
-		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
-		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
-		or the semester with the full date range and the previous semester with the half date range:
-
-		#INPUT:
-		[
-			'WS2023' => ['SS2023','WS2023']
-			'SS2024' => ['WS2023','SS2024']
-			'WS2024' => ['SS2024','WS2024']
-		]
-		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
-		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
-		[
-			"SS2024": [
-				"WS2023": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				],
-				"SS2024": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				]
-			]
-		]
-		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
-		[
-			"SS2024": [
-				"WS2023": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-05-17"
-				],
-				"SS2024": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				]
-			]
-		]
-		*/
-		$studienSemesterDateRanges=[]; 
-		foreach($semester_collection as $semester_original => $semester_adjoint)
-		{
-			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
-			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
-				
-			// initialize empty arrays to add key value pairs
-			$studienSemesterDateRanges[$semester_original] = [];
-
-			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
-			$match = null;
-			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
-			if(count($match) >0)
-			{
-				$one_month = new DateInterval('P1M');
-				$one_day = DateInterval::createFromDateString('1 days');
-				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
-				$summer_studiensemester_end_date->add($one_month);
-				$summer_studiensemester_end_date->sub($one_day);
-				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
-			}
-			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
-			{
-				foreach($semester_adjoint as $adjoint)
-				{
-					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
-				}
-			}
-			else
-			{
-				//TODO: half of a DateInterval might not be correctly calculated
-				// calculate the half of the studiensemester
-				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
-				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
-				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
-				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
-				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
-				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
-				
-				$first_half = new stdClass();
-				$first_half->start = $semester_start_ende->start;
-				$first_half->ende = $studiensemester_half;
-
-				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
-				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
-			}
-			$semester_range = $studienSemesterDateRanges;
-		}
-	}
-
-	private function studienSemesterErmitteln($start_date,$end_date){
-		
-		// gets all studiensemester from the student from start_date to end_date
-		$semester_range = $this->StudiensemesterModel->getByDateRange($start_date,$end_date);
-		$semester_range = array_map( 
-			function($sem)
-			{
-				return $sem->studiensemester_kurzbz;
-			},
-			$this->getDataOrTerminateWithError($semester_range)
-		);
-
-		// if no studiensemester is found for the given timespan, get the nearest studiensemester
-		if(count($semester_range) == 0)
-		{
-			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
-			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
-			if (count($aktuelle_studiensemester) == 0) {
-				$this->terminateWithError("No aktuelles semester");
-			}
-			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
-			// push aktuelles semester in active semester array
-			array_push($semester_range, $aktuelle_studiensemester);
-
-		}
-		return $semester_range;
-	}
-
 }
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
new file mode 100644
index 000000000..5a741e10c
--- /dev/null
+++ b/application/libraries/StundenplanLib.php
@@ -0,0 +1,558 @@
+<?php
+
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StundenplanLib{
+
+	private $_ci; // Code igniter instance
+	
+
+	/**
+	 * fetches stundenplan events from a UID and start/end date
+	 * @access public
+	 *
+	 */
+	public function getStundenplan($start_date, $end_date, $lv_id = null){
+		
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+
+		$student_uid = getAuthUID();
+		if(is_null($student_uid))
+		{
+			return error("No UID");
+		}
+		
+		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
+		if(isError($semester_range))
+		{
+			return error(getData($semester_range));
+		}
+		$semester_range = getData($semester_range);
+		$this->sortStudienSemester($semester_range);
+		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
+		if(!is_null($function_error)){
+			return $function_error;
+		}
+		
+		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+
+			// query lv itself in case its Stundenplan is being queried and it has no entries
+			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
+			$lv_result = $this->LehrveranstaltungModel->load($lv_id);
+			if(isError($lv_result))
+			{
+				return error(getData($lv_result));
+			}
+			$lv = getData($lv_result)[0];
+			return $stundenplan_data;
+			
+		}
+		
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
+		if($is_mitarbeiter)
+		{
+			
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+			return $stundenplan_data;
+		} else {
+			// getting the gruppen_kurzbz of the student in the different studiensemester
+			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
+			if(isError($benutzer_gruppen))
+			{
+				return error(getData($benutzer_gruppen));
+			}
+			$benutzer_gruppen = getData($benutzer_gruppen);
+
+			// getting the student_lehrverbaende of the student in the different studiensemester
+			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
+			if(isError($student_lehrverband))
+			{
+				return error(getData($student_lehrverband));
+			}
+			$student_lehrverband = getData($student_lehrverband);
+			
+			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$stundenplan_query)
+			{
+				return [];
+			}
+			
+			
+			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+			
+			return success($stundenplan_data);
+		}
+		
+	}
+
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
+		$this->_ci =& get_instance();
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		if($is_mitarbeiter)
+		{
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+		} else {
+			// querying the reservierungen
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}
+		if(isError($reservierungen))
+		{
+			return error(getData($reservierungen));
+		}
+		$reservierungen = getData($reservierungen) ?? [];
+		$function_error = $this->expand_object_information($reservierungen);
+		if(!is_null($function_error)){
+			return $function_error;
+		}
+		return success($reservierungen);
+	}
+
+
+	private function expand_object_information($data){
+
+		foreach ($data as $item)
+		{
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor)
+			{
+				$this->_ci->StundenplanModel->addLimit(1);
+				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+				FROM public.tbl_mitarbeiter
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->_ci->show_error(getError($lektor_object));
+				}
+				if(isError($lektor_object))
+				{
+					return error(getData($lektor_object));
+				}
+				$lektor_object = getData($lektor_object);
+				if(count($lektor_object) == 0)
+				{
+					return error("No lektor object");
+				}
+				$lektor_object = current($lektor_object);
+				// only provide needed information of the mitarbeiter object
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe)
+			{
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+			
+			if($item->ort_kurzbz) {
+
+				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT content_id
+				FROM public.tbl_ort
+				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
+				if (isError($ort_content_object)) {
+					return error(getData($ort_content_object));
+				}
+				$ort_content_object = getData($ort_content_object)[0];
+				if($ort_content_object) {
+					$item->ort_content_id = $ort_content_object->content_id;
+				}
+				
+				
+			}
+
+			$item->gruppe = $gruppe_obj_array;
+			$item->lektor = $lektor_obj_array;
+
+		}
+	}
+
+	// function used to sort an array of studiensemester strings
+	private function sortStudienSemester(&$semester_range){
+		usort(
+			$semester_range,
+			function($first,$second)
+			{
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+				
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				else if($year_first > $year_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			} 
+		);
+	}
+
+	
+
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+				if(isError($benutzer_query)){
+					return error(getData($benutzer_query));
+				}
+				$benutzer_query_result = getData($benutzer_query)??[];
+				
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					 array_map(
+						function($item)
+						{
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+		
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/ 
+		$benutzer_gruppen = array_map(
+			function($gruppe)
+			{
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return success($benutzer_gruppen);
+	}
+
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				if(isError($lehrverband_query)){
+					return error(getData($lehrverband_query));
+				}	
+				$lehrverband_query_result = getData($lehrverband_query)??[];
+				
+				$converted_studentLehrverband= array_map(
+					function ($item)
+					{
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result);
+				
+				array_push($student_lehrverband[$semester_key], $converted_studentLehrverband); 
+				
+			}
+			
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		
+		$student_lehrverband = array_map(
+			function($studentlehrverband)
+			{	
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return success($student_lehrverband);
+	}
+
+	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key 
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester);
+			if(isError($previous_studiensemester))
+			{
+				return error(getData($previous_studiensemester));
+			}
+			$previous_studiensemester = getData($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				return error('no previous semester');
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->_ci->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			if(isError($semester_start_ende))
+			{
+				return error(getData($semester_start_ende));
+			}
+			$semester_start_ende = current(getData($semester_start_ende)); 
+				
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+				
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	private function studienSemesterErmitteln($start_date,$end_date){
+		
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date,$end_date);
+		if(isError($semester_range))
+		{
+			return error(getData($semester_range));
+		}
+		$semester_range = array_map( 
+			function($sem)
+			{
+				return $sem->studiensemester_kurzbz;
+			},
+			getData($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->_ci->StudiensemesterModel->getNearest();
+			if(isError($aktuelle_studiensemester))
+			{
+				return error(getData($aktuelle_studiensemester));
+			}
+			$aktuelle_studiensemester = getData($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				return error("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+
+		}
+		return success($semester_range);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 388db5454..9b831b77e 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -6,12 +6,6 @@ export default {
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
-	getStundenplan(start_date, end_date, lv_id) {
-		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/getStundenplan',
-			{ start_date, end_date, lv_id }
-		);
-	},
 	getStunden() {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Stunden',
@@ -42,14 +36,12 @@ export default {
 			{}
 		);
 	},
-	getMoodleEventsByUserid(timestart, timeend) {
+	StundenplanEvents(start_date, end_date, lv_id) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/fetchMoodleEvents`,
-			{
-				timestart: timestart,
-				timeend: timeend,
-			}
+			'/api/frontend/v1/Stundenplan/StundenplanEvents',
+			{ start_date, end_date, lv_id }
 		);
 	},
 	
+	
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index c8c4fb91c..e7d48fe21 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -191,6 +191,7 @@ const Stundenplan = {
 				this.eventCalendarDate = new CalendarDate(end);
 				Vue.nextTick(() => {
 					this.loadEvents();
+					
 				});
 			}
 		},
@@ -202,9 +203,8 @@ const Stundenplan = {
 		},
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id),
+				this.$fhcApi.factory.stundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
-				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -232,65 +232,10 @@ const Stundenplan = {
 						promise_events = promise_events.concat(data);
 					}
 				})
-				promise_events.sort((a, b) => {
-					if(a.type=='moodle'){
-						return -1;
-					}
-					else if(b.type=='moodle'){
-						return 1;
-					}
-					else{
-						return 0;
-					}
-				});
+			
 				this.events = promise_events;
 			});
 		},
-		loadMoodleEvents: function(start_date, end_date){
-			
-			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
-			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
-				let data =events.map(event =>{
-					const event_start_date = new Date(event.timestart);
-					const event_end_date = new Date(event.timeend);
-					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
-					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false});
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-					
-					return {
-						type:'moodle',
-						beginn: formatted_start_time,
-						ende: formatted_end_time,
-						allDayEvent: true,
-						datum: formatted_date,
-						purpose: event.purpose,
-						assignment: event.activityname,
-						topic: event.activitystr,
-						lektor:[],
-						gruppe:[],
-						ort_kurzbz: event.location,
-						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
-						lehreinheit_id:event.lehreinheitsNummber??null,
-						titel: event.course.fullname,
-						lehrfach:'',
-						lehrform:'',
-						lehrfach_bez:'',
-						organisationseinheit:'',
-						farbe:'00689E',
-						lehrveranstaltung_id:0,
-						ort_content_id:0,
-						url:event?.url,
-					}
-				});
-				return {
-					data: data,
-					meta: { status: 'success' }
-				};
-			})
-			
-		},
 	},
 	created()
 	{
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 006acd306..437f6a17f 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -124,9 +124,8 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
-				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -152,65 +151,10 @@ export default {
 						promise_events = promise_events.concat(data);
 					}
 				})
-				promise_events.sort((a, b) => {
-					if (a.type == 'moodle') {
-						return -1;
-					}
-					else if (b.type == 'moodle') {
-						return 1;
-					}
-					else {
-						return 0;
-					}
-				});
+				
 				this.events = promise_events;
 			});
 		},
-		loadMoodleEvents: function (start_date, end_date) {
-
-			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
-			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
-				let data = events.map(event => {
-					const event_start_date = new Date(event.timestart);
-					const event_end_date = new Date(event.timeend);
-					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth() + 1}-${event_start_date.getDate()}`;
-					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-
-					return {
-						type: 'moodle',
-						beginn: formatted_start_time,
-						ende: formatted_end_time,
-						allDayEvent: true,
-						datum: formatted_date,
-						purpose: event.purpose,
-						assignment: event.activityname,
-						topic: event.activitystr,
-						lektor: [],
-						gruppe: [],
-						ort_kurzbz: event.location,
-						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
-						lehreinheit_id: event.lehreinheitsNummber ?? null,
-						titel: event.course.fullname,
-						lehrfach: '',
-						lehrform: '',
-						lehrfach_bez: '',
-						organisationseinheit: '',
-						farbe: '00689E',
-						lehrveranstaltung_id: 0,
-						ort_content_id: 0,
-						url: event?.url,
-					}
-				});
-				return {
-					data: data,
-					meta: { status: 'success' }
-				};
-			})
-
-		},
 		setCalendarMaximized() {
 			this.minimized = false
 		}

From bc7dba1c144c7c04713bb66acd91d99e6c77bc74 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 28 Feb 2025 16:41:18 +0100
Subject: [PATCH 0076/1357] legacy raumsuche.php -> cis4 vue component

---
 application/controllers/Cis/Raumsuche.php     |  35 +++
 .../controllers/api/frontend/v1/Ort.php       |  53 ++++
 application/models/ressource/Stunde_model.php |  15 ++
 .../views/CisRouterView/CisRouterView.php     |   5 +-
 public/js/api/fhcapifactory.js                |   2 +-
 public/js/api/ort.js                          |  15 ++
 public/js/apps/Dashboard/Fhc.js               |   8 +-
 public/js/components/Cis/Mylv/Student.js      |   1 +
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 237 ++++++++++++++++++
 system/phrasesupdate.php                      |  80 ++++++
 10 files changed, 447 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/Cis/Raumsuche.php
 create mode 100644 public/js/components/Cis/Raumsuche/Raumsuche.js

diff --git a/application/controllers/Cis/Raumsuche.php b/application/controllers/Cis/Raumsuche.php
new file mode 100644
index 000000000..055038275
--- /dev/null
+++ b/application/controllers/Cis/Raumsuche.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Raumsuche extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Raumsuche']);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index 8c4059824..828fbde2e 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -35,6 +35,8 @@ class Ort extends FHCAPI_Controller
 		parent::__construct([
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
+			'getRooms' => self::PERM_LOGGED,
+			'getTypes' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
@@ -44,6 +46,57 @@ class Ort extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	/**
+	 * Retrieves all Ort entries filtered by the provided parameters
+	 */
+	public function getRooms()
+	{
+		// TODO: form validation
+		$datum = $this->input->get('datum', TRUE);
+		$von = $this->input->get('von', TRUE);
+		$bis = $this->input->get('bis', TRUE);
+		$typ = $this->input->get('typ', TRUE);
+		$personenanzahl = $this->input->get('personenanzahl', TRUE);
+
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
+		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
+		
+		$params = array();
+		$qry = "SELECT DISTINCT tbl_ort.*
+			FROM public.tbl_ort JOIN public.tbl_ortraumtyp USING(ort_kurzbz)
+			WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%'";
+		if($typ) {
+			$params[] = $typ;
+			$qry.= "AND raumtyp_kurzbz= ?";
+		}
+		$qry.= "AND (max_person>= ? OR max_person is null)";
+		$params[] = $personenanzahl;
+
+		$qry.="	AND ort_kurzbz NOT IN 
+			(
+				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum=? AND stunde>=? AND stunde<=?
+				UNION
+				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum=? AND stunde>=? AND stunde<=?
+			)
+		";
+		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
+		
+		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
+		
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getTypes()
+	{
+		$this->load->model('ressource/Raumtyp_model', 'RaumtypModel');
+		$result = $this->OrtModel->execReadOnlyQuery("
+			SELECT * FROM public.tbl_raumtyp WHERE aktiv = true ORDER BY raumtyp_kurzbz;
+		");
+
+		$this->terminateWithSuccess(getData($result));
+	}
+	
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
index 05a9cddff..0203163f7 100644
--- a/application/models/ressource/Stunde_model.php
+++ b/application/models/ressource/Stunde_model.php
@@ -11,4 +11,19 @@ class Stunde_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_stunde';
 		$this->pk = 'stunde';
 	}
+
+	/**
+	 * $time needs to be of PGSQL TIME format
+	 */
+	public function getStundeForTime($time) {
+		$query = "
+			SELECT min(stunde) as stunde FROM (
+				SELECT stunde, extract(epoch from (beginn-?)) AS delta FROM lehre.tbl_stunde
+				UNION
+				SELECT stunde, extract(epoch from (ende-?)) AS delta FROM lehre.tbl_stunde
+				) foo WHERE delta>=0
+		";
+
+		return $this->execReadOnlyQuery($query, [$time, $time]);
+	}
 }
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 1c81f3570..c03330c7a 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -5,7 +5,7 @@ $includesArray = array(
 	'axios027' => true,
 	'bootstrap5' => true,
 	'fontawesome6' => true,
-	'tabulator5' => true,
+	'tabulator5' => true, // TODO: upgrade to 6 when available
 	'vue3' => true,
 	'primevue3' => true,
 	'vuedatepicker11' => true,
@@ -24,7 +24,8 @@ $includesArray = array(
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js'
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 378d979ab..fe90a73fc 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -60,5 +60,5 @@ export default {
     addons,
 	studiengang,
 	menu,
-	authinfo,
+	authinfo
 };
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
index 4c8e2ce73..b2c1a78dd 100644
--- a/public/js/api/ort.js
+++ b/public/js/api/ort.js
@@ -7,4 +7,19 @@ export default {
 			{ ort_kurzbz: ort_kurbz }
 		);
 	},
+	getRooms(datum, von, bis, typ, personenanzahl = 0) {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			"/api/frontend/v1/Ort/getRooms",
+			{ datum, von, bis, typ, personenanzahl }
+		);
+	},
+	getRoomTypes() {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			"/api/frontend/v1/Ort/getTypes"
+		);
+	}
 }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b8ec122e0..6a46c5999 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -6,6 +6,7 @@ import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
+import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
@@ -28,7 +29,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
-		
+		{
+			path: `/Cis/Raumsuche`,
+			name: 'Raumsuche',
+			component: Raumsuche,
+			props: true
+		},
 		// Redirect old links to new format
 		{
 			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 5aab9b28a..300ed44f8 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -76,6 +76,7 @@ export default {
 			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
 		},
 		setHash(val) {
+			// TODO: make this a router param to enable history
 			location.hash = val;
 		}
 	},
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
new file mode 100644
index 000000000..d7660ef11
--- /dev/null
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -0,0 +1,237 @@
+
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+
+export default {
+	name: "Raumsuche",
+	props: {
+		
+	},
+	components: {
+		VueDatePicker,
+		CoreFilterCmpt,
+		InputNumber: primevue.inputnumber,
+	},
+	data() {
+		return {
+			tabulatorUuid: Vue.ref(0),
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			roomtypes: null,
+			defaultType: {
+				raumtyp_kurzbz: '',
+				beschreibung: Vue.computed(() => this.$p.t('global/alle'))
+			},
+			anzahl: 1,
+			selectedType: null,
+			datum: new Date(),
+			von: Vue.ref({
+				hours: new Date().getHours(),
+				minutes: new Date().getMinutes()
+			}),
+			bis: Vue.ref({
+				hours: new Date().getHours() + 1,
+				minutes: new Date().getMinutes()
+			}),
+			raumsucheTableOptions: {
+				height: Vue.ref(400),
+				index: 'prestudent_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('rauminfo/raum_kurzbz')), field: 'ort_kurzbz', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/raumInfo')),
+						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
+						field: 'linkRes', formatter: this.linkFormatter, widthGrow: 1}
+				],
+				persistence: false,
+			},
+			raumsucheTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+
+					if((cell.column.field === 'linkInfo' || cell.column.field === 'linkRes') && cell.value){
+						window.open(cell.value, '_blank');
+						e.stopPropagation();
+					}
+					
+				}
+			}
+			]};
+	},
+	methods: {
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		linkFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a></div>'
+			} else {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'-</div>'
+			}
+		},
+		roomPlanLink(room) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+			+ '/CisVue/Cms/getRoomInformation/' + room.ort_kurzbz
+		},
+		roomInfoLink(room) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/CisVue/Cms/content/' + room.content_id
+		},
+		getTimeString(time) {
+			return `${time.hours}:${time.minutes}:00`
+		},
+		setupData(data){
+			const d = data.map(room => {
+				return {
+					ort_kurzbz: room.ort_kurzbz,
+					bezeichnung: room.bezeichnung,
+					nummer: room.planbezeichnung,
+					personen: room.max_person,
+					linkInfo: room.content_id ? this.roomInfoLink(room) : null,
+					linkRes: this.roomPlanLink(room)
+					
+				}
+					
+			})
+			
+			this.$refs.raumsucheTable.tabulator.setData(d);
+		},
+		loadRoomTypes() {
+			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+				this.selectedType = this.defaultType
+				this.roomtypes = res?.data ?? []
+			})
+		},
+		loadRooms() {
+			this.$fhcApi.factory.ort.getRooms(this.date, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+				.then(res => {
+					if(res?.data?.retval) this.setupData(res.data.retval)
+			})
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		search(){
+			this.loadRooms()
+		},
+		setRoute(val) {
+			// TODO: router push
+		},
+		dateFormat(date) {
+			const day = date.getDate();
+			const month = date.getMonth() + 1;
+			const year = date.getFullYear();
+			return `${day}.${month}.${year}`
+		},
+		timeFormat(date) {
+			const hours = String(date.getHours()).padStart(2, '0');
+			const minutes = String(date.getMinutes()).padStart(2, '0');
+			return `${hours}:${minutes}`;
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+			
+			this.loadRoomTypes()
+			this.loadRooms()
+
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			const h = window.visualViewport.height - rect.top - 100
+			if(this.$refs.raumsucheTable) {
+				this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
+			}
+
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+		
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
+	<hr>
+	<div class="row">
+		<div class="col-2">
+			<VueDatePicker
+				v-model="datum"
+				:clearable="false"
+				date-picker
+				:enable-time="false"
+				:format="dateFormat"
+				text-input="true"
+				auto-apply>
+			</VueDatePicker>
+		</div>
+		<div class="col-1">
+			<VueDatePicker
+				v-model="von"
+				:clearable="false"
+				time-picker
+				:format="timeFormat"
+				text-input="true"
+				auto-apply
+				>
+			</VueDatePicker>
+		</div>
+		<div class="col-1">
+			<VueDatePicker
+				v-model="bis"
+				:clearable="false"
+				time-picker
+				:format="timeFormat"
+				text-input="true"
+				auto-apply>
+			</VueDatePicker>
+		</div>
+		<div class="col-auto">
+			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
+			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
+				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
+				<option v-for="typ in roomtypes" :key="typ" :value="typ">{{typ.beschreibung}}</option>
+			</select>
+		</div>
+		<div class="col-2">
+			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
+		</div>
+		<div class="col-2">
+			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
+		</div>
+	</div>
+
+     <core-filter-cmpt 
+		@tableBuilt="raumsucheTableBuilt"
+		@uuidDefined="handleUuidDefined"
+		:title="''"  
+		ref="raumsucheTable" 
+		:tabulator-options="raumsucheTableOptions"  
+		:tabulator-events="raumsucheTableEventHandlers"
+		tableOnly 
+		:sideMenu="false"
+	 />
+    `,
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fb71696bf..f952262f8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20184,6 +20184,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'raum_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raum Kurzbezeichnung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Shortname",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',
@@ -20204,6 +20224,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'roomSearch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Räume Suchen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Search Rooms",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'anzahlPersonen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anzahl Person",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Number of People",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'roomReservations',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raum Reservierungen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Reservations",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',

From b8c45cf2447f52fb3d48f0fbcc868c73a81da871 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 11:07:35 +0100
Subject: [PATCH 0077/1357] update(Moodle Events):adds additional fields for
 Moodle Events and disables the automatic scrolling for moodleEvents

---
 .../api/frontend/v1/Stundenplan.php           |  6 +++--
 public/js/components/Calendar/Calendar.js     | 25 +++++++++++++------
 public/js/components/Cis/Mylv/LvInfo.js       | 14 ++++++++++-
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index c53af8e3c..84c7933ad 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -95,7 +95,6 @@ class Stundenplan extends FHCAPI_Controller
 						},
 						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
 		);
-		
 		$moodle_events = array_map(function($event){
 			$moodle_event_timestart = new DateTime($event->timestart);
 			$moodle_event_timeend = new DateTime($event->timeend);
@@ -112,7 +111,7 @@ class Stundenplan extends FHCAPI_Controller
 			$convertedEvent->gruppe = [];
 			$convertedEvent->ort_kurzbz = $event->location;
 			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
-			$convertedEvent->titel = $event->course->fullname;
+			$convertedEvent->titel = isset($event->course->fullname)? $event->course->fullname:null;
 			$convertedEvent->lehrfach = '';
 			$convertedEvent->lehrform = '';
 			$convertedEvent->lehrfach_bez = '';
@@ -121,6 +120,9 @@ class Stundenplan extends FHCAPI_Controller
 			$convertedEvent->lehrveranstaltung_id = 0;
 			$convertedEvent->ort_content_id = 0;
 			$convertedEvent->url = $event->url;
+			$convertedEvent->activityIcon = isset($event->icon->iconurl)? $event->icon->iconurl:null;
+			$convertedEvent->actionname = isset($event->action->name)?$event->action->name:null;
+			$convertedEvent->overdue = !empty($event->overdue);
 			return $convertedEvent;
 		},$moodle_events);
 		
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cdceb38db..da67af6df 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -72,13 +72,16 @@ export default {
 			immediate: true,
 		},
 		// scroll to the first event if the html element was found
-		scrollTime({focusDate,scrollTime}){
+		scrollTime(newValue,oldValue){
 			// return early if the scrollTime is not set
-			if(!scrollTime) return;
+			if(!newValue.scrollTime || !newValue?.doScroll) return;
+			if(newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.compare(oldValue?.focusDate)){
+				return;
+			}
 			// scroll the Stundenplan to the closest event
 			Vue.nextTick(()=>{
-				let previousScrollAnchor = document.getElementById('scroll' + (scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-				let scrollAnchor = document.getElementById('scroll' + scrollTime + this.focusDate.d + this.focusDate.w);
+				let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
+				let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
 				if (previousScrollAnchor) {
 					previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
@@ -147,9 +150,17 @@ export default {
 				// return the first beginning time of the filtered events
 				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					let scrollTime = parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+					let doScroll = true;
+					let scrollTimeEvents = this.filteredEvents.filter(event=>{
+						return event.type !== 'moodle';
+					});
+					// do not compute a new scroll time if there are no other events than moodle events
+					if(!(scrollTimeEvents.length >0)){
+						doScroll = false;
+					}
+					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
 					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: this.focusDate, scrollTime };
+					return { focusDate: this.focusDate, doScroll, scrollTime };
 				}
 				// there is no event that matches the current view mode constraints
 				else 
@@ -181,7 +192,7 @@ export default {
 						return true;
 					}
 				})
-
+				
 				return filteredEvents;
 			}
 			else
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index e2a00b5c9..b2fc7fe3d 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -72,12 +72,24 @@ export default {
 					</tr>
 					<tr>
 						<th>{{$p.t('global','typ')}}:</th>
-						<td>{{event?.purpose}}</td>
+						<td><img v-if="event?.activityIcon" class="me-1" :src="event?.activityIcon" />{{event?.purpose}}</td>
 					</tr>
 					<tr>
 						<th>{{$p.t('fristenmanagement','frist')}}:</th>
 						<td>{{start_time}}</td>
 					</tr>
+					<tr v-if="event?.actionname">
+						<th>Action required:</th>
+						<td>
+							{{event?.actionname}}
+						</td>
+					</tr>
+					<tr v-if="event?.overdue">
+						<th>Overdue:</th>
+						<td>
+							This event is overdue
+						</td>
+					</tr>
 					<tr >
 				    	<th>Link:</th>
 						<td>

From 98fa76ca1d781d97b2fc6724ed138d9de10b3c3d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 13:04:52 +0100
Subject: [PATCH 0078/1357] fix(Calendar Month setSelectedEvent): selects the
 clicked lehrveranstaltung as selectedEvent in the click handler of the
 Month/Page View

---
 public/js/components/Calendar/Month/Page.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 47630f47f..2cdf8b21d 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -80,7 +80,8 @@ export default {
 			if(isInThePast) classstring += ' fhc-calendar-past'
 			return classstring
 		},
-		selectDay(day) {
+		selectDay(day, event) {
+			this.setSelectedEvent(event);
 			this.date.set(day);
 			this.$emit('input', day);
 		},
@@ -156,7 +157,7 @@ export default {
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
 					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click.stop="selectDay(day)">
+					v-contrast @click.stop="selectDay(day,event)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>

From a408c85fd40f4edfeb242cd7aefd592977290928 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 13:29:31 +0100
Subject: [PATCH 0079/1357] fix(Calendar Day SelectedEvent): fixes the watcher
 on the property active to additionally look at the events property and set
 the selectedEvent accordingly to the situation

---
 public/js/components/Calendar/Day/Page.js | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index e8c6f4a56..9c04136c2 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -52,29 +52,27 @@ export default {
 	watch: {
 		//TODO: on first render non of the day-page components are active and the watcher on selectedEvent does not fetch the lvMenu
 		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
-		active: {
-			handler(value) {
+		activeAndEventsReady: {
+			handler({active,events}) {
 				// handles fetching the lvMenu
-				if (value) {
+				if (active) {
 					if (!this.lvMenu) {
 						this.fetchLvMenu(this.selectedEvent);
 					}
+				
+					if(events){
+						// if no event is selected, select the first event of the day
+						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
+							let events = this.events[this.day.toDateString()];
+							if (Array.isArray(events) && events.length > 0) {
+								this.setSelectedEvent(events[0]);
+							}
+						}
+					}
 				}
 			},
 			immediate: true,
 		},
-		events: {
-			handler(newEvents) {
-				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.length > 0) {
-					let events = newEvents[this.day.toDateString()];
-					if (Array.isArray(events) && events.length > 0) {
-						this.setSelectedEvent(events[0]);
-					}
-				}
-			},
-			immediate: true
-		},
 		selectedEvent: {
 			handler(event) {
 				// return early if the day-page component is not the active carousel item
@@ -95,6 +93,12 @@ export default {
 		}
 	},
 	computed: {
+		activeAndEventsReady(){
+			return {
+				active: this.active,
+				events: this.events,
+			}
+		},
 		allDayEvents() {
 			let allDayEvents = {};
 			for (let day in this.events) {

From 225d6b0a830739a51791d6854295a1d8590a81e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 13:51:43 +0100
Subject: [PATCH 0080/1357] raumsuche student config for allowed roomtypes

---
 application/config/raumsuche.php              | 25 +++++++++++
 .../controllers/api/frontend/v1/Ort.php       | 43 ++++++++++++++-----
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 16 ++++---
 3 files changed, 66 insertions(+), 18 deletions(-)
 create mode 100644 application/config/raumsuche.php

diff --git a/application/config/raumsuche.php b/application/config/raumsuche.php
new file mode 100644
index 000000000..afc4beaf8
--- /dev/null
+++ b/application/config/raumsuche.php
@@ -0,0 +1,25 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+// liste von raumtyp_kurzbz welche in raumsuche studenten angezeigt werden
+$config['roomtypes_student'] = array(
+'LAB BM/Chem',
+'xEDV 1-36',
+'xEDV 37-60',
+'EDV 60',
+'EDV-HÖPL',
+'EDV ES',
+'LAB Elek',
+'LAB ES/TK',
+'Ener-EDV',
+'Ener-Lab',
+'Ener-SEM',
+'Ener-HS',
+'HS 59-109',
+'HS 25-38',
+'HS 39-58',
+'LAB Inf',
+'LAB Robo',
+'LAB SET'
+);
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index 828fbde2e..f1d3ddbef 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -40,7 +40,7 @@ class Ort extends FHCAPI_Controller
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
-
+		$this->config->load('raumsuche');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -51,13 +51,16 @@ class Ort extends FHCAPI_Controller
 	 */
 	public function getRooms()
 	{
-		// TODO: form validation
 		$datum = $this->input->get('datum', TRUE);
 		$von = $this->input->get('von', TRUE);
 		$bis = $this->input->get('bis', TRUE);
 		$typ = $this->input->get('typ', TRUE);
 		$personenanzahl = $this->input->get('personenanzahl', TRUE);
-
+		
+		
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
+		
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
 		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
@@ -68,20 +71,28 @@ class Ort extends FHCAPI_Controller
 			WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%'";
 		if($typ) {
 			$params[] = $typ;
-			$qry.= "AND raumtyp_kurzbz= ?";
+			$qry.= "AND raumtyp_kurzbz = ?";
 		}
+		
+		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
+			$qry.= ' AND raumtyp_kurzbz IN ?';
+			$params[] = $this->config->item('roomtypes_student');
+			$this->addMeta('config', $this->config->item('roomtypes_student'));
+		}
+		
 		$qry.= "AND (max_person>= ? OR max_person is null)";
 		$params[] = $personenanzahl;
 
 		$qry.="	AND ort_kurzbz NOT IN 
 			(
-				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum=? AND stunde>=? AND stunde<=?
-				UNION
-				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum=? AND stunde>=? AND stunde<=?
+				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum = ? AND stunde >= ? AND stunde <= ? 
+				UNION 
+				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum= ? AND stunde >= ? AND stunde <= ?
 			)
 		";
 		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-		
+		$this->addMeta('qry', $qry);
+		$this->addMeta('params', $params);
 		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 		
 		$this->terminateWithSuccess($result);
@@ -90,9 +101,19 @@ class Ort extends FHCAPI_Controller
 	public function getTypes()
 	{
 		$this->load->model('ressource/Raumtyp_model', 'RaumtypModel');
-		$result = $this->OrtModel->execReadOnlyQuery("
-			SELECT * FROM public.tbl_raumtyp WHERE aktiv = true ORDER BY raumtyp_kurzbz;
-		");
+		$qry = "SELECT * FROM public.tbl_raumtyp WHERE aktiv = true";
+		$params = array();
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
+		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
+			$qry.= ' AND raumtyp_kurzbz IN ?';
+			$params[] = $this->config->item('roomtypes_student');
+		}
+                                 
+        $qry .= " ORDER BY raumtyp_kurzbz;";
+		
+		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 
 		$this->terminateWithSuccess(getData($result));
 	}
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index d7660ef11..b5f00aafc 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -97,7 +97,7 @@ export default {
 			const d = data.map(room => {
 				return {
 					ort_kurzbz: room.ort_kurzbz,
-					bezeichnung: room.bezeichnung,
+					bezeichnung: room.bezeichnung.replace('&amp;', '&'),
 					nummer: room.planbezeichnung,
 					personen: room.max_person,
 					linkInfo: room.content_id ? this.roomInfoLink(room) : null,
@@ -111,12 +111,15 @@ export default {
 		},
 		loadRoomTypes() {
 			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+				res?.data?.forEach(type => {
+					type.beschreibung = type.beschreibung.replace('&amp;', '&')
+				})
 				this.selectedType = this.defaultType
 				this.roomtypes = res?.data ?? []
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.date, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$fhcApi.factory.ort.getRooms(this.datum, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -181,9 +184,9 @@ export default {
 				v-model="datum"
 				:clearable="false"
 				date-picker
-				:enable-time="false"
+				:enable-time-picker="false"
 				:format="dateFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -193,7 +196,7 @@ export default {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply
 				>
 			</VueDatePicker>
@@ -204,7 +207,7 @@ export default {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -224,7 +227,6 @@ export default {
 	</div>
 
      <core-filter-cmpt 
-		@tableBuilt="raumsucheTableBuilt"
 		@uuidDefined="handleUuidDefined"
 		:title="''"  
 		ref="raumsucheTable" 

From 20f22d5a7b8147798a53ade4c5b64c1333bf1dcd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 14:15:30 +0100
Subject: [PATCH 0081/1357] fix(Calendar selectedEvent and Scrolling): sorts
 the events before selecting the first as the selectedEvent and adds some
 scrolling checks

---
 public/js/components/Calendar/Calendar.js | 31 +++++++++++------------
 public/js/components/Calendar/Day/Page.js | 27 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index da67af6df..a12dc1b0a 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -74,23 +74,22 @@ export default {
 		// scroll to the first event if the html element was found
 		scrollTime(newValue,oldValue){
 			// return early if the scrollTime is not set
-			if(!newValue.scrollTime || !newValue?.doScroll) return;
-			if(newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.compare(oldValue?.focusDate)){
+			if (!newValue.scrollTime || !newValue?.doScroll) return;
+			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
 				return;
 			}
 			// scroll the Stundenplan to the closest event
-			Vue.nextTick(()=>{
-				let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-				let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
-				if (previousScrollAnchor) {
-					previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
+			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
+			if (previousScrollAnchor) {
+				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+			}
+			else {
+				if (scrollAnchor) {
+					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
-				else {
-					if (scrollAnchor) {
-						scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-					}
-				}
-			});
+			}
+			
 		},
 	},
 	emits: [
@@ -147,10 +146,10 @@ export default {
 		},
 		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
 		scrollTime() {
+				let doScroll = true;	
 				// return the first beginning time of the filtered events
 				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					let doScroll = true;
 					let scrollTimeEvents = this.filteredEvents.filter(event=>{
 						return event.type !== 'moodle';
 					});
@@ -160,12 +159,12 @@ export default {
 					}
 					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
 					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: this.focusDate, doScroll, scrollTime };
+					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w}, doScroll, scrollTime };	
 				}
 				// there is no event that matches the current view mode constraints
 				else 
 				{
-					return { focusDate: this.focusDate, scrollTime: null };
+					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w }, doScroll,scrollTime: null };
 				}
 			},
 		// filters the events based on the current calendar view mode
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 9c04136c2..f38ea50cd 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -63,7 +63,32 @@ export default {
 					if(events){
 						// if no event is selected, select the first event of the day
 						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
-							let events = this.events[this.day.toDateString()];
+							let events = this.events[this.day.toDateString()].sort((a,b)=>{
+								let [a_stunde,a_minute,a_sekunden]= a.beginn.split(":");
+								let [b_stunde, b_minute, b_sekunden] = b.beginn.split(":");
+								a_stunde = Number(a_stunde);
+								a_minute = Number(a_minute);
+								a_sekunden= Number(a_sekunden);
+								b_stunde = Number(b_stunde);
+								b_minute = Number(b_minute);
+								b_sekunden = Number(b_sekunden);
+								if(a_stunde > b_stunde){
+									return 1;
+								}
+								else if(b_stunde > a_stunde){
+									return -1;
+								}
+								else if(a_minute > b_minute){
+									return 1;
+								}
+								else if (b_minute > a_minute){
+									return -1;
+								}
+								else{
+									return a_sekunden > b_sekunden? 1:-1;
+								}
+								
+							});
 							if (Array.isArray(events) && events.length > 0) {
 								this.setSelectedEvent(events[0]);
 							}

From b8239b084250a8f1ca379df8ca54894b1b91e738 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 14:38:23 +0100
Subject: [PATCH 0082/1357] update(LvInfo Phrasen): adds some phrasen for the
 LvInfo View for the moodle events

---
 public/js/components/Cis/Mylv/LvInfo.js |  8 +--
 system/phrasesupdate.php                | 80 +++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index b2fc7fe3d..514e34779 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -79,19 +79,19 @@ export default {
 						<td>{{start_time}}</td>
 					</tr>
 					<tr v-if="event?.actionname">
-						<th>Action required:</th>
+						<th>{{$p.t('lvinfo','actionname')}}:</th>
 						<td>
 							{{event?.actionname}}
 						</td>
 					</tr>
 					<tr v-if="event?.overdue">
-						<th>Overdue:</th>
+						<th>{{$p.t('lvinfo','overdue')}}:</th>
 						<td>
-							This event is overdue
+							{{$p.t('lvinfo','overdueEvent')}}
 						</td>
 					</tr>
 					<tr >
-				    	<th>Link:</th>
+				    	<th>{{$p.t('lvinfo','moodleLink')}}</th>
 						<td>
 							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
 						</td>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f952262f8..bfae232f4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20184,6 +20184,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'actionname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Aktion",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Action",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'overdue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "überfällig",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "overdue",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'overdueEvent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Event ist überfällig",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Event is overdue",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'moodleLink',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Moodle Link",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Moodle link",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',

From e4317f7a94675e2bdb7d43ad8620f2ecae62727b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 15:57:55 +0100
Subject: [PATCH 0083/1357] mobile breakpoints & form validation;

---
 .../controllers/api/frontend/v1/Ort.php       |  9 ++++++++
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 22 ++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index f1d3ddbef..a6a3b3404 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -51,6 +51,15 @@ class Ort extends FHCAPI_Controller
 	 */
 	public function getRooms()
 	{
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('datum','Datum','required');
+		$this->form_validation->set_rules('von','Uhrzeit Von','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		$this->form_validation->set_rules('bis','Uhrzeit Bis','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		if($this->form_validation->run() == FALSE) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+		
 		$datum = $this->input->get('datum', TRUE);
 		$von = $this->input->get('von', TRUE);
 		$bis = $this->input->get('bis', TRUE);
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index b5f00aafc..a86c3825b 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -91,7 +91,9 @@ export default {
 				+ '/CisVue/Cms/content/' + room.content_id
 		},
 		getTimeString(time) {
-			return `${time.hours}:${time.minutes}:00`
+			const hours = String(time.hours).padStart(2, '0');
+			const minutes = String(time.minutes).padStart(2, '0');
+			return `${hours}:${minutes}`
 		},
 		setupData(data){
 			const d = data.map(room => {
@@ -119,7 +121,7 @@ export default {
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.datum, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$fhcApi.factory.ort.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -179,7 +181,7 @@ export default {
 	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
 	<hr>
 	<div class="row">
-		<div class="col-2">
+		<div class="col-12 col-lg-2">
 			<VueDatePicker
 				v-model="datum"
 				:clearable="false"
@@ -190,7 +192,7 @@ export default {
 				auto-apply>
 			</VueDatePicker>
 		</div>
-		<div class="col-1">
+		<div class="col-12 col-lg-1">
 			<VueDatePicker
 				v-model="von"
 				:clearable="false"
@@ -201,7 +203,7 @@ export default {
 				>
 			</VueDatePicker>
 		</div>
-		<div class="col-1">
+		<div class="col-12 col-lg-1">
 			<VueDatePicker
 				v-model="bis"
 				:clearable="false"
@@ -211,20 +213,24 @@ export default {
 				auto-apply>
 			</VueDatePicker>
 		</div>
-		<div class="col-auto">
+		
+		<div class="col-lg-auto">
 			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
 			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
 				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
 				<option v-for="typ in roomtypes" :key="typ" :value="typ">{{typ.beschreibung}}</option>
 			</select>
 		</div>
-		<div class="col-2">
+		
+
+		<div class="col-4 col-lg-2">
 			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
 		</div>
-		<div class="col-2">
+		<div class="col-8 col-lg-2 d-flex justify-content-center align-items-center">
 			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
 		</div>
 	</div>
+	
 
      <core-filter-cmpt 
 		@uuidDefined="handleUuidDefined"

From 2b16d8940f93e28b61646a15f90a3bd4118cfe66 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 17:57:42 +0100
Subject: [PATCH 0084/1357] fhc header skiplink; cis4 skiplink css;

---
 application/helpers/hlp_header_helper.php     | 10 +++++
 .../views/CisRouterView/CisRouterView.php     |  1 +
 application/views/templates/FHC-Header.php    |  3 ++
 public/css/Fhc.css                            | 38 +++++++++++++++++++
 public/js/apps/Dashboard/Fhc.js               |  3 +-
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 14f7ed338..af8a32807 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -227,3 +227,13 @@ function generateBackwardCompatibleJSMsIe($js)
 	echo "<![endif]-->\n";
 }
 
+/**
+ * Constructs an accessibility skipLink https://www.w3schools.com/accessibility/accessibility_skip_links.php
+ */
+function generateSkipLink($skipID)
+{
+	$toPrint = '<a id="skiplink" href="';
+	$toPrint.=$skipID;
+	$toPrint.='" class="fhcSkipLink"></a>';
+	echo $toPrint;
+}
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index c03330c7a..75ea0313e 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -8,6 +8,7 @@ $includesArray = array(
 	'tabulator5' => true, // TODO: upgrade to 6 when available
 	'vue3' => true,
 	'primevue3' => true,
+	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 8e813916e..7779bb823 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -9,12 +9,15 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
+	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
 
 <!DOCTYPE HTML>
 <html>
 	<head>
+		<?php if($skipID) generateSkipLink($skipID); ?>
+		
 		<title><?php printPageTitle($title); ?></title>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 376206f6e..6e6a25200 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -98,3 +98,41 @@
   padding-right: .375rem;
   background-image: none;
 }
+
+
+.fhcSkipLink {
+  position: absolute;
+  left: -10px;
+  top: -10px;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
+
+.fhcSkipLink::before {
+   content: "Skip to main content"
+ }
+
+.fhcSkipLink:focus {
+  position: absolute;
+  z-index: 9999999;
+  top: var(--fhc-cis-header-height);
+  left: var(--fhc-cis-menu-width);
+  height: 100px;
+  width: 800px;
+  font-size: 24px;
+  font-weight: bold;
+  color: #0044cc;
+  background-color: #ffeb3b;
+  text-decoration: none;
+  padding: 12px 18px;
+  border-radius: 6px;
+  box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.2);
+  transition: all 0.2s ease-in-out;
+}
+
+fhcSkipLink:hover {
+  background-color: #ffcc00;
+  color: #002b80;
+  transform: scale(1.05);
+}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 6a46c5999..a41cbb3f0 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -227,7 +227,8 @@ const app = Vue.createApp({
 		},
 		handleClick(event) {
 			const target = event.target.closest('a');
-			
+
+			if(target?.id == 'skiplink') return
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				

From 815307e392cb245dd696e10edf1ae018040bd5fb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Mar 2025 07:32:14 +0100
Subject: [PATCH 0085/1357] Reply functionality and Pagination

---
 application/controllers/NeueNachricht.php     |  2 +-
 .../api/frontend/v1/messages/Messages.php     | 82 +++++++++++++++++--
 application/models/system/Message_model.php   |  4 +-
 public/js/api/messages/person.js              |  7 ++
 public/js/apps/Nachrichten.js                 |  1 +
 .../Messages/Details/NewMessage/NewDiv.js     | 29 +++++--
 .../Messages/Details/TableMessages.js         | 29 +++++--
 public/js/components/Messages/Messages.js     | 41 ++++++++--
 8 files changed, 162 insertions(+), 33 deletions(-)

diff --git a/application/controllers/NeueNachricht.php b/application/controllers/NeueNachricht.php
index 9e9e0a39b..9b61b78ef 100644
--- a/application/controllers/NeueNachricht.php
+++ b/application/controllers/NeueNachricht.php
@@ -23,7 +23,7 @@ class NeueNachricht extends Auth_Controller
 		//now working
 		$this->load->view('Nachrichten', [
 			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 			]
 		]);
 	}
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 4bc9a13ab..d080cbee3 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -18,6 +18,8 @@ class Messages extends FHCAPI_Controller
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
+			'getReplyData' => ['admin:r', 'assistenz:r'],
+			'getPersonIdFromUid' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -70,8 +72,6 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$oe_kurzbz = current($data);
 
-	//	$this->terminateWithError("oe: ". $oe_kurzbz->oe_kurzbz, self::ERROR_TYPE_GENERAL);
-
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		//39 Stück Variante OE
@@ -129,11 +129,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($uid)
 	{
-		//$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
 
-	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
-
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
@@ -290,6 +287,46 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($bodyParsed);
 	}
 
+	public function getReplyData($messageId)
+	{
+	//	return $this->terminateWithError("in get ReplyBody" . $messageId, self::ERROR_TYPE_GENERAL);
+		//TODO(Manu) validation of messageId: if number
+
+
+		$this->MessageModel->addSelect('public.tbl_msg_message.*');
+		$this->MessageModel->addSelect('r.*');
+		$this->MessageModel->addSelect('p.nachname');
+		$this->MessageModel->addSelect('p.vorname');
+		$this->MessageModel->addJoin('public.tbl_msg_recipient r', 'ON (r.message_id = public.tbl_msg_message.message_id)');
+		$this->MessageModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_msg_message.person_id)');
+
+		$result = $this->MessageModel->loadWhere(
+			array('r.message_id' => $messageId)
+		);
+
+	//	$this->terminateWithSuccess((getData($result) ?: []));
+		$dataMessage = $this->getDataOrTerminateWithError($result);
+
+		$prefix = "Re: "; // reply subject prefix
+
+/*		$body = current($dataMessage->body);
+		$subject = $dataMessage->subject;*/
+
+		$subject = $dataMessage[0]->subject;
+		$body = $dataMessage[0]->body;
+
+
+		$replyBody = $this->_getReplyBody($body, $dataMessage[0]->nachname, $dataMessage[0]->vorname, $dataMessage[0]->insertamum);
+
+		$dataMessage[0]->replyBody = $replyBody;
+		$dataMessage[0]->rest = "Help Manu";
+		$dataMessage[0]->replySubject = $prefix . $subject;
+
+		$this->terminateWithSuccess($dataMessage);
+
+
+	}
+
 	public function deleteMessage($messageId)
 	{
 		// Start DB transaction
@@ -298,7 +335,7 @@ class Messages extends FHCAPI_Controller
 		$result = $this->MessageModel->deleteMessageRecipient($messageId);
 		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
 		}
 
 		$result = $this->MessageModel->deleteMessageStatus($messageId);
@@ -316,6 +353,19 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getPersonIdFromUid($uid)
+	{
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		$this->terminateWithSuccess($benutzer->person_id);
+	}
+
 	private function _getPersonIdFromUid($uid)
 	{
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -326,7 +376,6 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
-		//return $data->person_id;
 		return $benutzer->person_id;
 	}
 
@@ -342,4 +391,23 @@ class Messages extends FHCAPI_Controller
 
 		return $student->prestudent_id;
 	}
+
+	private function _getReplyBody($body, $receiverName, $receiverSurname, $sentDate)
+	{
+		// To quote a reply body message
+		$bodyFormat = "<br>
+					<br>
+					<blockquote>
+						<i>
+							On %s %s %s wrote:
+						</i>
+					</blockquote>
+					<blockquote style='border-left:2px solid; padding-left: 8px'>
+						%s
+					</blockquote>";
+		return sprintf(
+			$bodyFormat,
+			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
+		);
+	}
 }
\ No newline at end of file
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 0fdb39736..38defa383 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -275,7 +275,7 @@ class Message_model extends DB_Model
 				 JOIN public.tbl_msg_message m USING(message_id)
 			WHERE r.person_id = ?
 			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			ORDER BY insertamum
+			ORDER BY insertamum DESC
 				 ";
 
 		$parametersArray = array($person_id, $person_id);
@@ -287,7 +287,7 @@ class Message_model extends DB_Model
 	 * Deletes a messages from tableMessages and tbl_msg_recipient
 	 * TODO(MANU) CHECK IF NECESSARY
 	 * dependency with other tables
-	 * in case of reply... more messages
+	 * in case of reply... more messages?? delete all dependent ones?
 	 * maybe anonimize it
 	 * @param $message_id
 	 * @return boolean success
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 5cbb49550..7693c5189 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -14,6 +14,9 @@ export default {
 	getMsgVarsPrestudent(uid){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
 	},
+	getPersonIdFromUid(uid){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonIdFromUid/' + uid);
+	},
 	getVorlagentext(vorlage_kurzbz){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
 	},
@@ -24,6 +27,10 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
 			data);
 	},
+	getReplyData(messageId){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
+
+	},
 	sendMessage(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js
index 0f921a9f8..84b9ddee5 100644
--- a/public/js/apps/Nachrichten.js
+++ b/public/js/apps/Nachrichten.js
@@ -8,6 +8,7 @@ const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
 		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId/:messageId`, component: NewMessage },
 	]
 });
 
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index b31cd9932..1eb59aa20 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -36,6 +36,9 @@ export default {
 		},
 		typeId(){
 			return this.$route.params.typeId || this.$props.id;
+		},
+		messageId(){
+			return this.$route.params.messageId;
 		}
 	},
 	data(){
@@ -62,7 +65,8 @@ export default {
 			itemsPerson: [],
 			itemsUser: [],
 			previewText: null,
-			previewBody: ""
+			previewBody: "",
+			replyData: null
 		}
 	},
 	methods: {
@@ -179,9 +183,9 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		replyMessage(message_id){
+/*		replyMessage(message_id){
 			console.log("auf message " + message_id + " antworten");
-		},
+		},*/
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
@@ -293,6 +297,19 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		if(this.messageId != null) {
+
+			//get replayBody.. body receivername, receiverSurname, sentDate of message
+			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+		}
+
 	},
 	async mounted() {
 		this.initTinyMCE();
@@ -309,13 +326,7 @@ export default {
 
 			<!--new page-->
 			<div class="overflow-auto m-3">
-
-			{{id}} || {{typeId}}
-
 				<h4>New Message</h4>
-	<!--			{{formData.body}}
-				||
-				{{previewText}}-->
 
 				<div class="row">
 					<div class="col-sm-8">
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 7994cbe1d..ab6a76599 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-import NewMessage from "../Details/NewMessage.js";
+//import NewMessage from "../Details/NewMessage.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-		NewMessage,
+	//	NewMessage,
 	},
 	inject: {
 		cisRoot: {
@@ -110,13 +110,15 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
+							if (this.personId != cell.getData().recipient_id)
+								button.disabled = true;
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
 							button.innerHTML = '<i class="fa fa-reply"></i>';
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.reply(cell.getData().message_id)
+									this.actionReplyToMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -141,6 +143,8 @@ export default {
 				height: '400',
 				selectable:	true,
 				selectableRangeMode: 'click',
+				pagination: true,
+			//	paginationSize: 5,
 /*				layoutColumnsOnNewData: false,
 
 				selectableRangeMode: 'click',
@@ -208,13 +212,11 @@ export default {
 			],
 			tabulatorData: [],
 			previewBody: "",
-			open: false
+			open: false,
+			personId: null
 		}
 	},
 	methods: {
-		reply(message_id){
-			console.log("in reply " + message_id);
-		},
 		actionDeleteMessage(message_id){
 			this.$fhcAlert
 				.confirmDelete()
@@ -225,7 +227,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteMessage(message_id){
-		//	console.log("deleteMessage " + message_id);
 			return this.$fhcApi.factory.messages.person.deleteMessage(message_id)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
@@ -240,6 +241,9 @@ export default {
 			//console.log("action new message");
 
 		},
+		actionReplyToMessage(message_id){
+			this.$emit('replyToMessage', this.id, this.typeId, message_id);
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
@@ -264,6 +268,15 @@ export default {
 			});
 		});*/
 	},
+	created(){
+		if(this.typeId == 'uid') {
+		this.$fhcApi.factory.messages.person.getPersonIdFromUid(this.id)
+			.then(result => {
+				this.personId = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
 	template: `
 	<div class="messages-detail-table">
 
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 49fdbdf79..e6947a72a 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -76,6 +76,23 @@ export default {
 			else
 				console.log("no valid openMode");
 		},
+		handleMessage(id, typeId, messageId){
+			console.log("in handleMessage " + messageId);
+			if (this.openMode == "window") {
+				this.openInNewWindow(id, typeId, messageId);
+			}
+			else if (this.openMode == "newTab"){
+				this.openInNewTab(id, typeId, messageId);
+			}
+			else if (this.openMode == "modal"){
+				this.openInModal(id, typeId, messageId);
+			}
+			else if (this.openMode == "showDiv"){
+				this.$refs.templateNewMessage.showTemplate(id, typeId, messageId);
+			}
+			else
+				console.log("no valid openMode");
+		},
 		openInDiv(id, typeId){
 			this.$refs.templateNewMessage.showTemplate(id, typeId);
 			//this.showDiv = true; //local variante
@@ -85,15 +102,26 @@ export default {
 			//TODO(manu) define bs-modal in this component
 			this.$refs.templateNewMessage.$refs.modalMsg.show();
 		},
-		openInNewTab(id, typeId){
+/*		openInNewTab(id, typeId){
 			//TODO(MANU) check if array of ids...
-/*			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + this.id + "/" + this.typeId;*/
-
-			//als param
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 			path += "/NeueNachricht/" + id + "/" + typeId;
 
+			const newTab = window.open(path, "_blank");
+		},*/
+		openInNewTab(id, typeId, messageId=null){
+			//TODO(MANU) check if array of ids...
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+			if (messageId){
+				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
+			}
+
+			else {
+				path += "/NeueNachricht/" + id + "/" + typeId;
+			}
+
+
 			const newTab = window.open(path, "_blank");
 		},
 		openInNewWindow(id, typeId){
@@ -152,7 +180,8 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@newMessage="newMessage"
+				@newMessage="newMessage"		
+				@replyToMessage="handleMessage"
 			>
 			
 			</table-messages>

From 825ccfcc3708ee9271e0f221712993638271a651 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Mar 2025 11:15:51 +0100
Subject: [PATCH 0086/1357] Calendar: Get rid of Warnings

---
 public/js/apps/Cis.js                         |  1 -
 public/js/apps/Dashboard/Fhc.js               |  1 -
 public/js/components/Calendar/Calendar.js     |  1 +
 public/js/components/Calendar/Day/Page.js     | 42 ++++++++++---------
 public/js/components/Calendar/Month.js        |  3 ++
 public/js/components/Calendar/Week.js         |  6 ++-
 public/js/components/Calendar/Week/Page.js    | 13 ++++--
 public/js/components/Calendar/Weeks.js        |  2 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  5 ++-
 11 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 482c2774a..bb4b76ca4 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -117,7 +117,6 @@ const app = Vue.createApp({
         }
     }
 });
-app.use(FhcApi);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a41cbb3f0..137d1d008 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -266,7 +266,6 @@ const app = Vue.createApp({
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
 app.use(router);
-app.use(FhcApi);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index a12dc1b0a..5c2dc8bb0 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -96,6 +96,7 @@ export default {
 		'select:day',
 		'select:event',
 		'change:range',
+		'change:mode',
 		'update:minimized',
 		'selectedEvent',
 		'change:offset'
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index f38ea50cd..b339c12fc 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -403,25 +403,29 @@ export default {
 							<div class="all-day-event-container" >
 								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 									<template v-for="(events,_day) in allDayEvents" :key="_day">
-
-									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
-												:selected="event == selectedEvent"
-												:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-												class="small rounded overflow-hidden fhc-entry"
-												v-contrast
-												>
-												<div class="d-none d-xl-block">
-														<slot name="dayPage" :event="event" :day="day" :mobile="false">
-															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-														</slot>
-													</div>
-													<div class="d-block d-xl-none">
-														<slot name="dayPage" :event="event" :day="day" :mobile="true">
-															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-														</slot>
-													</div>
-											</div>
-										</template>
+										<div
+											v-if="dayindex == _day"
+											v-for="event in events"
+											:key="event"
+											style="top:0;"
+											@click.prevent="eventClick(event)"
+											:selected="event == selectedEvent"
+											:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+											class="d-grid m-1 small rounded overflow-hidden fhc-entry"
+											v-contrast
+											>
+											<div class="d-none d-xl-block">
+													<slot name="dayPage" :event="event" :day="day" :mobile="false">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+												<div class="d-block d-xl-none">
+													<slot name="dayPage" :event="event" :day="day" :mobile="true">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+										</div>
+									</template>
 								</div>
 							</div>
 
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index ab20e2e03..27ec50fbf 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -13,6 +13,9 @@ export default {
 		BsModal,
 		Months
 	},
+	emits: [
+		"change:offset"
+	],
 	data() {
 		return {
 			syncOnNextChange: false
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 4b30a1b79..2cca97a27 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -14,6 +14,9 @@ export default {
 		BsModal,
 		Weeks
 	},
+	emits: [
+		"change:offset"
+	],
 	computed: {
 		title() {
 			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
@@ -28,7 +31,8 @@ export default {
 			this.$refs.modalDatepickerContainer.hide()
 		},
 		handleHeaderClickWeek() {
-			this.$refs.modalDatepickerContainer.show()
+			this.$emit('updateMode', 'weeks');//
+			//this.$refs.modalDatepickerContainer.show()
 		},
 		paneChanged(dir) {
 			this.focusDate.d += dir * 7;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index dccca6630..55bbfbc75 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -227,7 +227,7 @@ export default {
 			if (event.orig.allDayEvent)
 			{
 				return;
-				return {
+				/*return {
 					'z-index': '2',
 					'grid-column': '1 / -1',
 					'background-color': 'rgb(204, 204, 204)',
@@ -235,7 +235,7 @@ export default {
 					color: 'black',
 					position: 'sticky',
 					top: '44px',
-				};
+				};*/
 			}
 			else
 			{
@@ -363,10 +363,15 @@ export default {
 					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-							<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
+							<div
+								v-if="dayindex == _day"
+								v-for="event in events"
+								:key="event"
+								style="top:0;"
+								@click.prevent="weekPageClick(event, _day)"
 								:selected="event == selectedEvent"
 								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-								class="small rounded overflow-hidden fhc-entry"
+								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
 								v-contrast
 								>		
 								<slot class="p-1" name="weekPage" :event="event" :day="day">
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index b8300b4b5..260540adb 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -29,7 +29,7 @@ export default {
 		setWeek(week) {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
-			this.$emit('change', week);
+			this.$emit('updateMode', 'week');
 		},
 		prev(){
 			this.focusDate.y--;
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 63ac069c9..fd944faff 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -59,7 +59,7 @@ export default {
 					}
 				)
 			}
-		},
+		}
 	},
 	mounted() {
 		this.modal = this.$refs.modalContainer.modal;
@@ -68,7 +68,7 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
 			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
 			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 0543d8fae..c0129d1d1 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -62,10 +62,10 @@ export default {
 			return !this.menu || !Array.isArray(this.menu) || Array.isArray(this.menu) && this.menu.length == 0;
 		},
 		bodyStyle() {return {};
-			const bodyStyle = {};
+			/*const bodyStyle = {};
 			if (this.farbe)
 				bodyStyle['background-color'] = '#' + this.farbe;
-			return bodyStyle;
+			return bodyStyle;*/
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index e7d48fe21..e603e5525 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -26,6 +26,7 @@ const Stundenplan = {
 		}
 	},
 	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object,
 		rowMinHeight: {
 			type: String,
@@ -155,11 +156,13 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
-			if(m === this.calendarMode) return
+			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
 			
+			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {

From b1b0d5edd0c2fe00e24bd70ff7171fd1dc5d271a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Mar 2025 12:05:24 +0100
Subject: [PATCH 0087/1357] remove(Calendar Week Page Style): removes not
 needed style check in component

---
 public/js/components/Calendar/Week/Page.js | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 55bbfbc75..1fe82ff0e 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -224,22 +224,7 @@ export default {
 			return styleObj
 		},
 		eventGridStyle(day, event) {
-			if (event.orig.allDayEvent)
-			{
-				return;
-				/*return {
-					'z-index': '2',
-					'grid-column': '1 / -1',
-					'background-color': 'rgb(204, 204, 204)',
-					'max-height': '75px',
-					color: 'black',
-					position: 'sticky',
-					top: '44px',
-				};*/
-			}
-			else
-			{
-				return {
+			return {
 					'z-index': 1,
 					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
 					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
@@ -247,8 +232,7 @@ export default {
 					'grid-row-end': this.dateToMinutesOfDay(event.end),
 					'background-color': event.orig.color,
 					'max-height': '75px'
-				};
-			}
+			};
 		},
 		calcHourPosition(event) {
 			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;

From 415e7595867269742e0c0779cdeffd53d45332da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 08:54:26 +0100
Subject: [PATCH 0088/1357] fix(StudiengangsInformationen API data): fixes
 little error when checking if the uid is a mitarbeiter or not

---
 application/controllers/api/frontend/v1/Studgang.php          | 3 ++-
 .../Cis/Cms/StudiengangInformation/StudiengangInformation.js  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studgang.php b/application/controllers/api/frontend/v1/Studgang.php
index 63579e3a6..82aebb666 100644
--- a/application/controllers/api/frontend/v1/Studgang.php
+++ b/application/controllers/api/frontend/v1/Studgang.php
@@ -45,8 +45,9 @@ class Studgang extends FHCAPI_Controller
 
 	public function getStudiengangInfo(){
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 		if($isMitarbeiter) {
-			$this->terminateWithSuccess();
+			$this->terminateWithSuccess(null);
 		}
 		
 		// fetches the Studiengang Information which is used next to the news
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 92e303801..30e6ecb6a 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -31,11 +31,11 @@ template:/*html*/`
 			<div class="card card-body mb-3">
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiengang')}}:</h2>
-					<span class="mb-1">{{studiengang.bezeichnung}}</span>
+					<span class="mb-1">{{studiengang?.bezeichnung}}</span>
 				</div>
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">Moodle:</h2>
-					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang.kurzbzlang}}</a>
+					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
 				</div>
 				<div :class="{'mb-1':studiengang?.zusatzinfo_html}">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiensemester')}}: </h2>

From 44777e2f1b74863fc19dde914670004d3189144a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 09:20:35 +0100
Subject: [PATCH 0089/1357] fix(VueRouter News Ansicht):News ansicht konnte
 nicht geladen werden weil viewData im Cms controller nicht uebergeben wurde
 aber im CisRouterView verwendet wird

---
 application/controllers/CisVue/Cms.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 0263a00c4..a9ff13c53 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -82,8 +82,9 @@ class Cms extends Auth_Controller
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'News']);
+	{	
+		$viewData = array();
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
 	}
 	
 	public function getRoomInformation($ort_kurzbz){

From ba2014b1a331cb3200579cb2152214a9c94cc989 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 11:21:49 +0100
Subject: [PATCH 0090/1357] fix(News Widget animation): fixes the animation bug
 when changing the width of the News widget from 1 to >1

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

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 98c5244e1..85bdca64a 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -152,14 +152,14 @@ export default {
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
     <div class="d-flex flex-column h-100">
-        <div class="h-100" style="overflow-y: auto" v-if="width == 1">
+        <div class="h-100" style="overflow-y: auto" v-show="width == 1">
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="mt-2">
                 <div v-if="index > 0 " class="fhc-seperator"></div>
                 <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
                 <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
 			</div>
 		</div>
-        <div v-else class="row h-100 g-0">
+        <div v-show="width >1" class="row h-100 g-0">
         	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;">
         		<template v-for="news in newsList" :key="'menu-'+news.news_id">
 					<div class="position-relative">

From a4d2a2cace664f0d3cdd4972056925c5da537209 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 5 Mar 2025 14:23:35 +0100
Subject: [PATCH 0091/1357] fix news widget carousel (re)initialization after
 resize

---
 public/js/components/DashboardWidget/News.js | 45 ++++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 98c5244e1..40a7e0406 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -14,6 +14,8 @@ export default {
 		selected: null,
 		size:0,
 	}),
+	props: ['width', 'height']
+	,
 	mixins: [AbstractWidget],
 	computed: {
 		sizeClass() {
@@ -102,6 +104,31 @@ export default {
 			this.singleNews = singleNews;
 			this.$refs.newsModal.show();
 		},
+		initCarouselInstance() {
+			Vue.nextTick(()=> {
+				if(this.$refs.carousel) { // carousel ref might not exist in every widget width/height
+					this.carouselInstance = new bootstrap.Carousel(this.$refs.carousel, {
+						wrap: false, // keep this off even though it actually wraps
+						interval: false
+					});
+				}
+			})
+		},
+		initActiveItem() {
+			Vue.nextTick(()=> {
+				if (Array.isArray(this.$refs.carouselItems) && this.$refs.carouselItems.length >0) {
+					this.$refs.carouselItems[0].classList.add("active")
+				}
+			})
+		}
+	},
+	watch: {
+		width(newVal, oldVal) {
+			if(oldVal == 1 && newVal > 1) { // carousel instance will have been disposed
+				this.initCarouselInstance()
+				this.initActiveItem()
+			}
+		}
 	},
 	created() {
 		this.$emit("setConfig", false);
@@ -111,12 +138,9 @@ export default {
 			.then((news) => {
 				this.allNewsList = Array.from(Object.values(news));
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
-				Vue.nextTick(()=>{
-					if (Array.isArray(this.$refs.carouselItems) && this.$refs.carouselItems.length >0) {
-						this.$refs.carouselItems[0].classList.add("active")
-					}
-				})
-				})
+				this.initActiveItem()
+				
+			})
 			.catch((err) => {
 				console.error("ERROR: ", err);
 			});
@@ -139,15 +163,8 @@ export default {
 			}
 			}).observe(this.$refs.container);
 		}
-		Vue.nextTick(()=> {
-			if(this.$refs.carousel) { // carousel ref might not exist in every widget width/height
-				this.carouselInstance = new bootstrap.Carousel(this.$refs.carousel, {
-					wrap: false, // keep this off even though it actually wraps
-					interval: false
-				});
-			}
-		})
 		
+		this.initCarouselInstance()
 	},
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">

From 1989e65d72d1532ab943c71eaaff4b6207581c79 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 10 Mar 2025 07:51:53 +0100
Subject: [PATCH 0092/1357] Tree structure for messages, preview in NewDiv,
 Note to close window, check recipient_id, save relationmessage_id

---
 .../api/frontend/v1/messages/Messages.php     | 163 ++++++++++--------
 public/js/api/messages/person.js              |  12 +-
 .../Messages/Details/NewMessage/NewDiv.js     | 117 ++++++++++---
 .../Messages/Details/TableMessages.js         | 144 +++++++++++++---
 public/js/components/Messages/Messages.js     |   3 +-
 .../Studentenverwaltung/Details/Messages.js   |  14 +-
 6 files changed, 329 insertions(+), 124 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index d080cbee3..65c354c4f 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -19,7 +19,8 @@ class Messages extends FHCAPI_Controller
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
-			'getPersonIdFromUid' => ['admin:r', 'assistenz:r'],
+			'getPersonId' => ['admin:r', 'assistenz:r'],
+			'getUid' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -42,17 +43,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getMessages($id, $type_id)
 	{
-		switch($type_id)
-		{
-			case 'uid':
-				$id = $this->_getPersonIdFromUid($id);
-				break;
-			case 'person_id':
-				$id = $id;
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getMessages logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
+		if($type_id != 'person_id'){
+			$id = $this->_getPersonId($id, $type_id);
 		}
 
 		$result = $this->MessageModel->getMessagesForTable($id);
@@ -74,15 +66,13 @@ class Messages extends FHCAPI_Controller
 
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-		//39 Stück Variante OE
 		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 
-		//IF ADMIN 167
+		//If admin
 		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
-		//only HTML-vorlagen -> for admin
 		$result = $this->VorlageModel->loadWhere(
 			array(
 				'mimetype' => 'text/html'
@@ -97,7 +87,7 @@ class Messages extends FHCAPI_Controller
 	public function getVorlagentext($vorlage_kurzbz)
 	{
 		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
-		//$studiengang_kz = 227; //TODO(Manu) check dynamisieren NULL
+		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
@@ -127,49 +117,32 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getMsgVarsPrestudent($uid)
+	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
+		$prestudent_id = ($typeId == 'prestudent_id') ? $id : $this->_getPrestudentIdFromUid($id);
 
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsLoggedInUser()
 	{
-		$uid = getAuthUID();
-
 		$result = $this->MessageModel->getMsgVarsLoggedInUser();
-
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getNameOfDefaultRecipient($id, $type_id)
 	{
-		switch($type_id)
-		{
-			case 'uid':
-				$id = $this->_getPersonIdFromUid($id);
-				break;
-			case 'person_id':
-				$id = $id;
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getNameOfDefaultRecipient logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
-		}
+		$id = $type_id!='person_id)' ? $this->_getPersonId($id, $type_id) : $id;
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
 		$result = $this->PersonModel->load($id);
-		//$this->terminateWithSuccess($result);
 		$data = $this->getDataOrTerminateWithError($result);
 		$name = current($data);
 
@@ -178,8 +151,11 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
+		//is always uid in FAS
+		//TODO(Manu) make dynamic for other ids
+
 		//default setting
-		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
+		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
 
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -216,15 +192,13 @@ class Messages extends FHCAPI_Controller
 
 		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
-
-
+		$relationmessage_id = $this->input->post('relationmessage_id');
 
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
 
 		if($typeId == 'uid')
 		{
-			//$this->terminateWithError("uid ", self::ERROR_TYPE_GENERAL);
 			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
 			//parseMessagetext for variables Prestudent
@@ -240,7 +214,7 @@ class Messages extends FHCAPI_Controller
 		}
 		elseif($typeId == 'prestudent_id')
 		{
-			$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
+		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
 
 			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
@@ -250,7 +224,7 @@ class Messages extends FHCAPI_Controller
 			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
 
 		$this->terminateWithSuccess($result);
 	}
@@ -271,17 +245,15 @@ class Messages extends FHCAPI_Controller
 			case 'uid':
 				$prestudent_id = $this->_getPrestudentIdFromUid($id);
 				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
-
 				break;
-			case 'person_id':
-				$id = $id;
+			case 'prestudent_id':
+				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
 				break;
 			default:
 				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 				break;
 		}
 
-		//$this->terminateWithSuccess($result);
 		$bodyParsed = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($bodyParsed);
@@ -289,10 +261,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getReplyData($messageId)
 	{
-	//	return $this->terminateWithError("in get ReplyBody" . $messageId, self::ERROR_TYPE_GENERAL);
 		//TODO(Manu) validation of messageId: if number
 
-
 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
 		$this->MessageModel->addSelect('p.nachname');
@@ -304,14 +274,9 @@ class Messages extends FHCAPI_Controller
 			array('r.message_id' => $messageId)
 		);
 
-	//	$this->terminateWithSuccess((getData($result) ?: []));
 		$dataMessage = $this->getDataOrTerminateWithError($result);
-
 		$prefix = "Re: "; // reply subject prefix
 
-/*		$body = current($dataMessage->body);
-		$subject = $dataMessage->subject;*/
-
 		$subject = $dataMessage[0]->subject;
 		$body = $dataMessage[0]->body;
 
@@ -323,8 +288,6 @@ class Messages extends FHCAPI_Controller
 		$dataMessage[0]->replySubject = $prefix . $subject;
 
 		$this->terminateWithSuccess($dataMessage);
-
-
 	}
 
 	public function deleteMessage($messageId)
@@ -353,30 +316,94 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getPersonIdFromUid($uid)
+	public function getPersonId($id, $typeId)
 	{
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$result = $this->BenutzerModel->loadWhere(
-			['uid' => $uid]
-		);
+		if ($typeId == 'uid')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['uid' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+		}
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$benutzer = current($data);
+		$person = current($data);
 
-		$this->terminateWithSuccess($benutzer->person_id);
+		$this->terminateWithSuccess($person->person_id);
 	}
 
-	private function _getPersonIdFromUid($uid)
+	public function getUid($id, $typeId)
 	{
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$result = $this->BenutzerModel->loadWhere(
-			['uid' => $uid]
-		);
+		if (!$typeId)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
+		}
+		elseif ($typeId == 'person_id')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$person = current($data);
+			$person_id = $person->person_id;
+
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $person_id]
+			);
+		}
+		elseif($typeId == 'uid')
+		{
+			$this->terminateWithSuccess($id);
+		}
+		else
+		{
+			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
+		}
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
-		return $benutzer->person_id;
+		$this->terminateWithSuccess($benutzer->uid);
+	}
+
+	private function _getPersonId($id, $typeId)
+	{
+		if ($typeId == 'uid')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['uid' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+		}
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
 	}
 
 	private function _getPrestudentIdFromUid($uid)
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 7693c5189..e53f23f6a 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -11,11 +11,14 @@ export default {
 	getMessageVarsPerson(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
 	},
-	getMsgVarsPrestudent(uid){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
+	getMsgVarsPrestudent(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
 	},
-	getPersonIdFromUid(uid){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonIdFromUid/' + uid);
+	getPersonId(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
+	},
+	getUid(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
 	},
 	getVorlagentext(vorlage_kurzbz){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
@@ -29,7 +32,6 @@ export default {
 	},
 	getReplyData(messageId){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
-
 	},
 	sendMessage(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 1eb59aa20..d8611d611 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -44,14 +44,16 @@ export default {
 	data(){
 		return {
 			formData: {
-				recipient: this.id,
+				recipient: null,
 				subject: null,
 				body: null,
 				vorlage_kurzbz: null,
 				selectedValue: '',
+				relationmessage_id: null
 			},
 			statusNew: true,
 			vorlagen: [],
+			recipientsArray: [],
 			defaultRecipient: null,
 			editor: null,
 			isVisible: false,
@@ -66,7 +68,9 @@ export default {
 			itemsUser: [],
 			previewText: null,
 			previewBody: "",
-			replyData: null
+			replyData: null,
+			uid: null,
+			messageSent: false
 		}
 	},
 	methods: {
@@ -105,19 +109,22 @@ export default {
 		sendMessage() {
 			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
+
 			const params = {
 				id: this.id,
 				type_id: this.typeId
 			};
+
 			const merged = {
 				...this.formData,
 				...params
 			};
 			data.append('data', JSON.stringify(merged));
 
+			//this.uid is important for existing sendFunction
 			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.$refs.formMessage,
-				this.id,
+				this.uid,
 				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
@@ -129,6 +136,10 @@ export default {
 						//this.resetForm();
 						//closeModal
 						//closewindwo
+					this.messageSent = true;
+					//TODO(Manu) hier route definieren? ist kein child sondern mit route aufgerufen
+					//würde allerdings neues fenster aktualisiert öffnen, altes bleibt ohne reload gleich
+					//Reload vorheriges tab???
 						this.$emit('reloadTable');
 					}
 				);
@@ -148,13 +159,13 @@ export default {
 					//closewindwo
 				});
 		},
-		getPreviewText(){
+		getPreviewText(id, typeId){
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
+				id: id,
+				type_id: typeId}, data)
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -167,7 +178,8 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
+				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
 				/*				this.editor.focus();
 								this.editor.setDirty(true);*/
 
@@ -183,9 +195,6 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-/*		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},*/
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
@@ -219,11 +228,22 @@ export default {
 			//just for testing:
 			this.isVisible = true;
 		},
-		showPreview(){
-			this.getPreviewText().then(() => {
+		showPreview(id, typeId){
+			this.getPreviewText(id, typeId).then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
+		getUid(id, typeId){
+			const params = {
+				id: id,
+				type_id: typeId
+			};
+			this.$fhcApi.factory.messages.person.getUid(params)
+				.then(result => {
+					this.uid = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -238,7 +258,6 @@ export default {
 		},
 		'formData.vorlage_kurzbz': {
 			handler(newVal){
-				//	console.log("Vorlage: " + newVal);
 
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
@@ -248,6 +267,9 @@ export default {
 		},
 	},
 	created(){
+		if(this.typeId != 'uid')
+			this.getUid(this.id, this.typeId);
+
 		if(this.typeId == 'person_id'){
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
 				.then(result => {
@@ -259,8 +281,13 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+
+		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -294,20 +321,21 @@ export default {
 		})
 			.then(result => {
 				this.defaultRecipient = result.data;
+				this.recipientsArray.push({'uid': this.uid,
+											'details': this.defaultRecipient});
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		//case of reply
 		if(this.messageId != null) {
-
-			//get replayBody.. body receivername, receiverSurname, sentDate of message
 			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
 					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-
 		}
 
 	},
@@ -320,12 +348,11 @@ export default {
 	template: `
 
 	<div class="messages-detail-newmessage">
-
 			<!--passt für showdiv-->
 <!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
 
 			<!--new page-->
-			<div class="overflow-auto m-3">
+			<div v-if="!messageSent" class="overflow-auto m-3">
 				<h4>New Message</h4>
 
 				<div class="row">
@@ -465,19 +492,26 @@ export default {
 					<div>
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
-							<div class="col-sm-2 mb-3">
+							<div class="col-sm-3 mb-3">
+							
 								<form-input
 									type="select"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
+									v-model="formData.recipient"
 								>
+									<option 
+										v-for="recipient in recipientsArray"
+										:key="recipient.uid" 
+										:value="recipient.uid" 
+										>{{recipient.details}}
+									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(formData.recipient,'uid')">Aktualisieren</button>
 							</div>
 						</form-form>
 
@@ -492,6 +526,43 @@ export default {
 				</div>
 
 		</div>
+		
+					
+		<div v-else class="container d-flex justify-content-center align-items-center m-3">
+			<div class="card" style="width: 80%">
+			  <div class="card-body alert alert-success text-dar p-5 rounded">
+						<div class="row">
+							<div class="col-6">
+								Message sent successfully!
+							</div>
+							<div class="col-6">
+								Nachricht erfolgreich versandt!
+							</div>
+						</div>
+						
+						<div class="row">
+							<div class="col-6" style="border-right: 1px">
+								You can safely close this window.
+							</div>
+							<div class="col-6">
+								Sie können dieses Fenster schließen.
+							</div>
+						</div>
+				</div>
+				<div class="text-center">
+					<p class="signatureblock">
+						Fachhochschule Technikum Wien | University of Applied Sciences Technikum Wien
+						<br>Hoechstaedtplatz 6, 1200 Wien, AUSTRIA
+						<br><a class="signatureblocklink" href="https://www.technikum-wien.at">www.technikum-wien.at</a>
+					</p>
+				
+				</div>
+						
+
+			</div>
+	
+	</div>
+
 
 	</div>
 	`
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index ab6a76599..317291c56 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -26,7 +26,6 @@ export default {
 		messageLayout: String,
 		openMode: String
 	},
-	//TODO(Manu) endpoint macht Probleme
 	data(){
 		return {
 			tabulatorOptions: {
@@ -38,7 +37,7 @@ export default {
 						type: this.typeId
 					};
 				},
-				ajaxResponse: (url, params, response) => response.data,
+				ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -63,6 +62,7 @@ export default {
 					{title: "recipient", field: "recipient"},
 					{title: "senderId", field: "sender_id"},
 					{title: "recipientId", field: "recipient_id"},
+					{title: "relationmessage_id", field: "relationmessage_id"},
 					{
 						title: "status",
 						field: "status",
@@ -110,7 +110,7 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							if (this.personId != cell.getData().recipient_id)
+							if (this.personId != cell.getData().sender_id)
 								button.disabled = true;
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
@@ -136,29 +136,23 @@ export default {
 							return container;
 						},
 						frozen: true
-					}],
+					}
+					],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
-			//	height:	'auto',
 				height: '400',
-				selectable:	true,
 				selectableRangeMode: 'click',
-				pagination: true,
-			//	paginationSize: 5,
-/*				layoutColumnsOnNewData: false,
-
-				selectableRangeMode: 'click',
-				selectable: true,
 				index: 'message_id',
-				persistenceID: 'core-message'*/
+				pagination: true,
+				dataTree: true,
+				headerSort: true,
+				dataTreeChildField: "children",
+				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
+				dataTreeChildIndent: 15,
+				dataTreeStartExpanded: false,
+				persistenceID: 'core-message'
 			},
 			tabulatorEvents: [
-				{
-					event: 'dataLoaded',
-					handler: data => this.tabulatorData = data.map(item => {
-						return item;
-					}),
-				},
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -213,7 +207,59 @@ export default {
 			tabulatorData: [],
 			previewBody: "",
 			open: false,
-			personId: null
+			personId: null,
+			//Testdata
+/*			messages: [
+				{
+					message_id: 7,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 6,
+				},
+				{
+					message_id: 1,
+					subject: "Hauptnachricht",
+					body: "Text 1",
+					insertamum: "2024-03-05",
+					relationmessage_id: null,
+				},
+				{
+					message_id: 2,
+					subject: "Antwort auf 1",
+					body: "Text 2",
+					insertamum: "2024-03-05",
+					relationmessage_id: 1,
+				},
+				{
+					message_id: 3,
+					subject: "Antwort auf 2",
+					body: "Text 3",
+					insertamum: "2024-03-05",
+					relationmessage_id: 2,
+				},
+				{
+					message_id: 4,
+					subject: "Neue Nachricht",
+					body: "Text 4",
+					insertamum: "2024-03-05",
+					relationmessage_id: null,
+				},
+				{
+					message_id: 5,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 4,
+				},
+				{
+					message_id: 6,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 5,
+				},
+			],*/
 		}
 	},
 	methods: {
@@ -237,7 +283,11 @@ export default {
 				});
 		},
 		actionNewMessage(){
+		//	this.$emit('newMessage', this.id, this.typeId);
+
+			//here already use person_id??
 			this.$emit('newMessage', this.id, this.typeId);
+
 			//console.log("action new message");
 
 		},
@@ -247,6 +297,47 @@ export default {
 		reload() {
 			this.$refs.table.reloadTable();
 		},
+		buildTreemap(messages) {
+			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 messageNested;
+}
+
+
 	},
 	computed: {
 		statusText(){
@@ -256,7 +347,7 @@ export default {
 				2: this.$p.t('messsages', 'archived'),
 				3: this.$p.t('messsages', 'deleted')
 			}
-		}
+		},
 	},
 	mounted() {
 		// change to target="_blank"
@@ -269,8 +360,12 @@ export default {
 		});*/
 	},
 	created(){
-		if(this.typeId == 'uid') {
-		this.$fhcApi.factory.messages.person.getPersonIdFromUid(this.id)
+		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+		this.$fhcApi.factory.messages.person.getPersonId(params)
 			.then(result => {
 				this.personId = result.data;
 			})
@@ -279,7 +374,7 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-
+	
 		<!--View Studierendenverwaltung-->
 		<div v-if="messageLayout=='twoColumnsTableLeft'">
 
@@ -313,6 +408,7 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
+		<!--TODO(Manu) update-->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index e6947a72a..fc73768f1 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -58,6 +58,7 @@ export default {
 	},
 	methods: {
 		reloadTable(){
+			console.log("in parent reload");
 			this.$refs.templateTableMessage.reload();
 		},
 		newMessage(id, typeId){
@@ -121,7 +122,6 @@ export default {
 				path += "/NeueNachricht/" + id + "/" + typeId;
 			}
 
-
 			const newTab = window.open(path, "_blank");
 		},
 		openInNewWindow(id, typeId){
@@ -160,6 +160,7 @@ export default {
 			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
 		</div>-->
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
+
 		<div v-if="showNew">
 			<new-message
 				ref="templateNewMessage"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 44f1a6aa2..f73ad161b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,6 +1,8 @@
 import CoreMessages from "../../../Messages/Messages.js";
 //import CoreMessages from "@/Messages/Messages.js";
 
+//TODO(Manu) refactor props
+
 export default {
 	components: {
 		CoreMessages
@@ -10,17 +12,23 @@ export default {
 	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
-			type-id="uid"
-			:id="modelValue.uid"
+			type-id="prestudent_id"
+			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
 			show-table
-			show-new
 			open-mode="newTab"
 			>
 		</core-messages>
+	</template>
+	<template v-else>
+		 <h3><strong>No valid prestudent_id!</strong></h3>
+		 <p>{{modelValue.anmerkungen}}</p>
+	</template>
+	
 
 	</div>
 	`

From f8eb265eb0914d39d9655148385c0b9b9c95db74 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 10 Mar 2025 22:35:14 +0100
Subject: [PATCH 0093/1357] Studentenverwaltung Archiv: non-signable documents
 can be archived, set correct default Vorlage (Zeugnis)

---
 public/js/api/stv/archiv.js                   |  6 +++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 52 ++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
index 76dbecec8..9b8bdf416 100644
--- a/public/js/api/stv/archiv.js
+++ b/public/js/api/stv/archiv.js
@@ -16,6 +16,12 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/stv/archiv/getArchivVorlagen');
 	},
 	archive(data) {
+		return this.$fhcApi.post(
+			'api/frontend/v1/documents/archive',
+			data
+		);
+	},
+	archiveSigned(data) {
 		return this.$fhcApi.post(
 			'api/frontend/v1/documents/archiveSigned',
 			data
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 1856815a1..fd174e16f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -23,7 +23,7 @@ export default {
 	data() {
 		return {
 			loading: false,
-			vorlage_kurzbz: '',
+			selectedVorlage: {},
 			vorlagenArchiv: [],
 			vorlageXmlXslMappings: {
 				'zeugnis.rdf.php': [
@@ -190,32 +190,34 @@ export default {
 			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionArchive() {
-			console.log(this.modelValue);
 			let archiveDataArr = Array.isArray(this.modelValue) ? this.modelValue : [this.modelValue];
 
 			for (let archiveData of archiveDataArr)
 			{
 				this.loading = true;
-				this.$fhcApi
-					.factory.stv.archiv.archive({
-						xml: this.getXmlByXsl(this.vorlage_kurzbz),
-						xsl: this.vorlage_kurzbz,
-						ss: this.defaultSemester,
-						uid: archiveData.uid,
-						prestudent_id: archiveData.prestudent_id
-					})
-					.then(result => result.data)
-					.then(() => {
-						this.reload();
-						this.loading = false;
-					})
-					.then(() => this.$p.t('ui/gespeichert'))
-					.then(this.$fhcAlert.alertSuccess)
-					.catch(error => {
-						this.$fhcAlert.handleSystemError(error);
-						this.loading = false;
-					});
-				
+				let archiveFunction =
+					this.selectedVorlage.signierbar
+					? this.$fhcApi.factory.stv.archiv.archiveSigned
+					: this.$fhcApi.factory.stv.archiv.archive;
+
+				archiveFunction({
+					xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
+					xsl: this.selectedVorlage.vorlage_kurzbz,
+					ss: this.defaultSemester,
+					uid: archiveData.uid,
+					prestudent_id: archiveData.prestudent_id
+				})
+				.then(result => result.data)
+				.then(() => {
+					this.reload();
+					this.loading = false;
+				})
+				.then(() => this.$p.t('ui/gespeichert'))
+				.then(this.$fhcAlert.alertSuccess)
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
 			}
 		},
 		actionDownload(akte_id) {
@@ -237,7 +239,7 @@ export default {
 	created() {
 		this.$fhcApi
 			.factory.stv.archiv.getArchivVorlagen()
-			.then(result => {this.vorlagenArchiv = result.data; this.vorlage_kurzbz = result.data.length > 0 ? result.data[0].vorlage_kurzbz : '';})
+			.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
 			.catch(this.$fhcAlert.handleSystemError);
 
 	},
@@ -253,8 +255,8 @@ export default {
 			>
 			<template #actions>
 				<div class="input-group w-auto">
-					<select class="form-select" v-model="vorlage_kurzbz">
-						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage.vorlage_kurzbz">
+					<select class="form-select" v-model="selectedVorlage">
+						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage">
 							{{ vorlage.bezeichnung }}
 						</option>
 					</select>

From 639c7d7e41c387a9d0a421c07dd85aa85db5c909 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 10 Mar 2025 22:50:04 +0100
Subject: [PATCH 0094/1357] Studentenverwaltung Archiv: added phrases for table
 headings

---
 system/phrasesupdate.php | 222 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 221 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 846b07f10..1b0fe6100 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38221,7 +38221,227 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_description',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Description',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_creation_date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstelldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Creation date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_accepted_on_at',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'AkzeptiertAmUm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'AcceptionOnAt',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_gedruckt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gedruckt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Printed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_signiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Signiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Signed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_title_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte aktualisieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_akte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_new_file',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Datei',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_akte_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_signed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Signiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Signed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From ea2be8026b463c8cf9c7132197aea82831aa9886 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 12 Mar 2025 08:06:23 +0100
Subject: [PATCH 0095/1357] filter hidden from kontakttyp, show
 typ.beschreibung in dropdown

---
 .../controllers/api/frontend/v1/stv/Kontakt.php   | 15 ++++++++-------
 .../Details/Kontakt/Contact.js                    |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index fd16fff06..1c3c0c95d 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -439,6 +439,7 @@ class Kontakt extends FHCAPI_Controller
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 		$this->terminateWithSuccess((getData($result) ?: []));
+
 	}
 
 	public function getKontakttypen()
@@ -446,13 +447,13 @@ class Kontakt extends FHCAPI_Controller
 		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
 
 		$result = $this->KontakttypModel->load();
-		if (isError($result)) {
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		else
-		{
-			$this->terminateWithSuccess(getData($result) ?: []);
-		}
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$filteredData = array_filter($data, function ($item) {
+			return $item->kontakttyp !== "hidden";
+		});
+		$this->terminateWithSuccess($filteredData);
 	}
 
 	public function loadContact()
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 87dc70eb1..0bda648a9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -322,7 +322,7 @@ export default{
 						v-model="contactData.kontakttyp">
 					>
 						<option value="">keine Auswahl</option>
-						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+						<option v-for="typ in kontakttypen" :key="typ.kontakttyp" :value="typ.kontakttyp">{{typ.beschreibung}}</option>
 					</form-input>
 				</div>
 				

From 669752dd907028ba2bea921545fff60196a531bd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 12 Mar 2025 13:41:01 +0100
Subject: [PATCH 0096/1357] WIP cis4 abgabetool student

---
 application/controllers/Cis/Abgabetool.php    |  35 ++
 .../controllers/api/frontend/v1/Lehre.php     |  35 +-
 application/models/education/Abgabe_model.php | 140 ++++++++
 public/css/Fhc.css                            |  17 +-
 public/js/api/lehre.js                        |  14 +
 public/js/apps/Dashboard/Fhc.js               |   9 +
 .../components/Cis/Abgabetool/AbgabeDetail.js | 197 ++++++++++
 .../components/Cis/Abgabetool/Abgabetool.js   | 205 +++++++++++
 .../js/components/Cis/Raumsuche/Raumsuche.js  |   6 +-
 public/js/components/Dashboard/Dashboard.js   |   1 +
 system/phrasesupdate.php                      | 340 ++++++++++++++++++
 11 files changed, 991 insertions(+), 8 deletions(-)
 create mode 100644 application/controllers/Cis/Abgabetool.php
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabeDetail.js
 create mode 100644 public/js/components/Cis/Abgabetool/Abgabetool.js

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
new file mode 100644
index 000000000..6c4770421
--- /dev/null
+++ b/application/controllers/Cis/Abgabetool.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Abgabetool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index f079a5b37..e41881df2 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -31,10 +31,9 @@ class Lehre extends FHCAPI_Controller
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
+			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
+			'getStudentProjektabgaben' => self::PERM_LOGGED
 		]);
-
-		
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -94,10 +93,36 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
-	
 
-	
+	public function getStudentProjektabgaben() {
+		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
+		$this->load->model('education/Abgabe_model', 'AbgabeModel');
+		$ret = $this->AbgabeModel->getProjektarbeitAbgabetermine($projektarbeit_id);
+
+		
+		$this->terminateWithSuccess($ret);
+	}
+	
+	public function getStudentProjektarbeiten($uid)
+	{
+		$this->load->model('education/Abgabe_model', 'AbgabeModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		
+		$isZugeteilterBetreuer = count($this->AbgabeModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		$ret = $this->AbgabeModel->getStudentProjektarbeitenLegacy($uid);
+		$this->addMeta('legacyQueryRetval', $ret);
+		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+		
+		if ($this->MitarbeiterModel->isMitarbeiter(getAuthUID()) && ($isZugeteilterBetreuer)){
+			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer($uid);
+		} else {
+			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+		
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));	
+	}
 	
 }
 
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
index c68bc55f4..0240beeb3 100644
--- a/application/models/education/Abgabe_model.php
+++ b/application/models/education/Abgabe_model.php
@@ -11,4 +11,144 @@ class Abgabe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_abgabe';
 		$this->pk = 'abgabe_id';
 	}
+	
+	public function checkZuordnung($studentUID, $maUID) {
+		//oder Lektor mit Betreuung dieses Studenten
+		$qry = "
+			SELECT 1
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
+			WHERE
+				tbl_projektarbeit.student_uid = ? AND
+				vw_benutzer.uid = ?";
+		
+		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
+	}
+	
+	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					   campus.tbl_paabgabe.projektarbeit_id,
+					   campus.tbl_paabgabe.fixtermin,
+					   campus.tbl_paabgabe.kurzbz,
+					   campus.tbl_paabgabe.datum,
+					   campus.tbl_paabgabetyp.bezeichnung, 
+					   campus.tbl_paabgabe.abgabedatum
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
+				ORDER BY campus.tbl_paabgabe.datum";
+		
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
+	
+	public function getStudentProjektarbeitenWithBetreuer($studentUID) {
+		$betreuerQuery = "
+		SELECT 
+			vorname as bvorname,
+			nachname as bnachname,
+			titelpre as btitelpre,
+			titelpost AS btitelpost,
+			titelpost AS btitelpost,
+			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+		
+			(SELECT person_id 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung 
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+			
+			tbl_betreuerart.betreuerart_kurzbz,
+			person_id as bperson_id,
+			projektarbeit_id,
+			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_lehrveranstaltung.studiengang_kz,
+			public.tbl_studiengang.kurzbzlang,
+			lehre.tbl_projektbetreuer.note as note,
+			public.tbl_mitarbeiter.mitarbeiter_uid,
+			lehre.tbl_projektarbeit.titel as titel,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
+		
+		FROM lehre.tbl_projektarbeit
+				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				 LEFT JOIN public.tbl_person USING(person_id)
+				 LEFT JOIN public.tbl_benutzer USING(person_id)
+				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE 
+			tbl_projektarbeit.student_uid = ? AND
+			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+		
+		// TODO: fetch senatsmitglieder
+		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
+	}
+
+	public function getStudentProjektarbeitenLegacy($studentUID)
+	{
+		$qry = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
+	   (SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
+	   (SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
+	   (SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
+	   tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+	   (SELECT person_id 
+			FROM lehre.tbl_projektbetreuer 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+	   (SELECT betreuerart_kurzbz 
+			FROM lehre.tbl_projektbetreuer 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+	   (SELECT tbl_betreuerart.beschreibung 
+			FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+	   tbl_projektbetreuer.person_id AS betreuer_person_id,
+	   tbl_projekttyp.bezeichnung AS prjbez,
+	   lehre.tbl_projektbetreuer.note as note,
+	   public.tbl_benutzer.aktiv as aktiv,
+	   (SELECT abgeschicktvon 
+			FROM extension.tbl_projektarbeitsbeurteilung 
+			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
+			AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+	   (SELECT abgeschicktvon 
+			FROM extension.tbl_projektarbeitsbeurteilung 
+			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+	   (SELECT datum FROM campus.tbl_paabgabe 
+	                 WHERE paabgabetyp_kurzbz = 'end' 
+	                 	AND abgabedatum IS NOT NULL 
+	                    AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben,
+	*
+FROM lehre.tbl_projektarbeit
+		 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+		 LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
+		 LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+		 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+		 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')
+  AND tbl_projektarbeit.student_uid= ?
+ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
+		
+		return $this->execQuery($qry, array($studentUID));
+	}
+	
 }
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 6e6a25200..b7110943d 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -131,8 +131,23 @@
   transition: all 0.2s ease-in-out;
 }
 
-fhcSkipLink:hover {
+.fhcSkipLink:hover {
   background-color: #ffcc00;
   color: #002b80;
   transform: scale(1.05);
 }
+
+.fhc-bullet::before {
+  content: "• ";
+  font-weight: bold;
+  display: inline-block;
+  transform: scale(2);
+}
+
+.fhc-bullet-red::before {
+  color: #ff001e;
+}
+
+.fhc-bullet-green::before {
+  color: #00ff26;
+}
\ No newline at end of file
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index cd7129d61..0020d3490 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -18,5 +18,19 @@ export default {
 			`/api/frontend/v1/Lehre/Pruefungen/${lehrveranstaltung_id}`
 			, {}
 		);
+	},
+	getStudentProjektarbeiten(uid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getStudentProjektarbeiten/${uid}`
+			, {}
+		);
+	},
+	getStudentProjektabgaben(detail) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getStudentProjektabgaben`
+			, {
+				projektarbeit_id: detail.projektarbeit_id
+			}
+		);
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 137d1d008..34494e324 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -11,6 +11,7 @@ import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, { DEFAULT_MODE_RAUMINFO } from "../../components/Cis/Mylv/RoomInformation.js";
+import Abgabetool from "../../components/Cis/Abgabetool/Abgabetool";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -29,6 +30,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
+		// {
+		// 	path: `/Cis/Abgabetool`,
+		// 	name: 'Abgabetool',
+		// 	component: Abgabetool,
+		// 	props: true
+		// },
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
@@ -204,6 +211,8 @@ const router = VueRouter.createRouter({
 	]
 })
 
+
+
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
new file mode 100644
index 000000000..a1c3de8ae
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
@@ -0,0 +1,197 @@
+import Upload from '../../../components/Form/Upload/Dms.js';
+import BsModal from '../../Bootstrap/Modal.js';
+
+const today = new Date()
+export const AbgabeDetail = {
+	name: "AbgabeDetail",
+	components: {
+		Upload,
+		BsModal
+	},
+	props: {
+		projektarbeit: {
+			type: Object,
+			default: null
+		}
+	},
+	data() {
+		return {
+			file: []
+		}
+	},
+	methods: {
+		triggerUpload() {
+			// todo: trigger the loadup
+
+			this.$refs.modalContainerEnduploadZusatzdaten.hide()
+		},
+		upload(termin) {
+			console.log(termin)
+			// TODO load it up
+			
+			if(termin.bezeichnung === 'Endupload') {
+				// open endupload form modal and await that it will be sent & checked
+
+				this.$refs.modalContainerEnduploadZusatzdaten.show()
+			}
+		},
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyle(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
+			
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			let color = 'white'
+			let fontColor = 'black'
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					color = 'red'
+					fontColor = 'white'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					color = 'yellow'
+				}
+			} else if(abgabedatum > datum) {
+				color = 'pink' // aka "hellrot"
+				fontColor = 'white'
+			} else {
+				color = 'green'
+			}
+			
+			return 'font-color: ' + fontColor + '; background-color: ' + color
+		}
+	},
+	watch: {
+		'file'(newVal) {
+			if(newVal == [] || newVal === null || newVal === undefined) return
+
+			// check filetype on input change
+			const file = newVal[0]
+			if(!file) return
+
+			if(file.type && file.type.includes('pdf')) {
+				// all fine
+			} else {
+				// clear and alert for filetypes
+				this.$fhcAlert.alertInfo(this.$p.t('abgabetool/c4allowedFileTypes'))
+				this.entschuldigung.files = []
+			}
+
+		}
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+
+	},
+	template: `
+		<div v-if="projektarbeit">
+		
+			<h5>{{$p.t('abgabetool/c4abgabeStudentenbereich')}}</h5>
+			<div class="row">
+				<p> {{projektarbeit?.betreuer}}</p>
+				<p> {{projektarbeit?.titel}}</p>
+			</div>
+			<div id="uploadWrapper">
+				<div class="row" style="margin-bottom: 12px;">
+					<div class="col">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col">
+						{{$p.t('abgabetool/c4fileupload')}}
+					</div>
+					<div class="col">
+					</div>
+				</div>
+				<div class="row" v-for="termin in projektarbeit.abgabetermine">
+					<div class="col d-flex justify-content-center align-items-center">
+						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+					</div>
+					<div class="col" :style="getDateStyle(termin)">{{ termin.datum?.split("-").reverse().join(".") }}</div>
+					<div class="col">{{ termin.bezeichnung }}</div>
+					<div class="col">{{ termin.kurzbz }}</div>
+					<div class="col">{{ termin.abgabedatum?.split("-").reverse().join(".") }}</div>
+					<div class="col">
+<!--						<Upload accept=".pdf" v-model="file"></Upload>-->
+					</div>
+					<div class="col">
+						<button class="btn btn-primary border-0" @click="upload(termin)">
+							Upload
+							<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+		 </div>
+	 	
+	 	<bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
+					
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					student uid
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					{{ projektarbeit?.titel }}
+				
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row mb-3 align-items-center">
+					
+					Sprache der Arbeit
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Kontrollierte Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Dt. Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Engl. Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Abstract max 5k characters
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Abstract eng max 5k chars
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Seitenanzahl
+				
+				</div>
+			</template>
+			<template v-slot:footer>
+				<button class="btn btn-primary" @click="triggerUpload">{{$p.t('ui/hochladen')}}</button>
+			</template>
+		</bs-modal>
+	 	
+    `,
+};
+
+export default AbgabeDetail;
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/Abgabetool.js
new file mode 100644
index 000000000..b1ab65181
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/Abgabetool.js
@@ -0,0 +1,205 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import AbgabeDetail from "./AbgabeDetail";
+
+export const Abgabetool = {
+	name: "Abgabetool",
+	components: {
+		VueDatePicker,
+		CoreFilterCmpt,
+		AbgabeDetail
+	},
+	props: {
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			domain: '',
+			detail: null,
+			selectedProjektarbeit: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			abgabeTableOptions: {
+				height: 200, // TODO: determine smallest necessary height
+				index: 'projektarbeit_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer', formatter: this.centeredTextFormatter,widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, widthGrow: 8}
+				],
+				persistence: false,
+			},
+			abgabeTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+
+					if(cell.getColumn().getField() === "details") {
+						const val = cell.getValue()
+						if(val.mode === 'detailTermine') {
+							this.setDetailComponent(cell.getValue())
+						} else if (val.mode === 'beurteilungDownload') {
+							//demo.dev.technikum-wien.at/cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz=Begutachter&projektarbeit_id=39239&person_id=22117
+							const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							window.open(pdfExportLink, '_blank')
+						}
+
+					}
+					console.log(cell.getData())
+					e.stopPropagation()
+
+				}
+			}
+			]};
+	},
+	methods: {
+		setDetailComponent(details){
+			this.loadAbgaben(details).then((res)=> {
+				console.log(res)
+				const pa = this.data[0]?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				pa.abgabetermine = res.data.retval
+				pa.betreuer = this.buildBetreuer(pa)
+				
+				this.selectedProjektarbeit = pa
+			})
+			
+		},
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		detailFormatter(cell) {
+			const val = cell.getValue()
+
+			if(val.mode === 'detailTermine') {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
+			} else if (val.mode === 'beurteilungDownload') {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			}
+		},
+		mailFormatter(cell) {
+			const val = cell.getValue()
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		buildMailToLink(abgabe) {
+			return 'mailto:' + abgabe.mitarbeiter_uid +'@'+ this.domain
+		},
+		buildBetreuer(abgabe) {
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ?? '')
+		},
+		setupData(data){
+			
+			this.data = data // TODO: better define what is needed from this for detail component
+			this.domain = data[1] // TODO do this in backend but this is a prototype anyway
+			const d = data[0]?.retval?.map(projekt => {
+				console.log('projekt', projekt)
+				let mode = 'detailTermine'
+				
+				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
+					mode = 'beurteilungDownload' // build dl link for both betreuer documents
+				}
+				
+				return {
+					details: {
+						student_uid: this.viewData?.uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+						betreuer_person_id: projekt.bperson_id,
+						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
+						mode
+					},
+					sem: projekt.studiensemester_kurzbz,
+					stg: projekt.kurzbzlang,
+					mail: this.buildMailToLink(projekt),
+					betreuer: this.buildBetreuer(projekt),
+					typ: projekt.projekttypbezeichnung,
+					titel: projekt.titel
+				}
+			})
+
+			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			this.$refs.abgabeTable.tabulator.setData(d);
+		},
+		loadProjektarbeiten() {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.viewData?.uid ?? null)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				})
+		},
+		loadAbgaben(details) {
+			return new Promise((resolve) => {
+				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+					.then(res => {
+						resolve(res)
+					})
+			})	
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+			
+			this.loadProjektarbeiten()
+			
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+	<hr>
+		
+     <core-filter-cmpt 
+		:title="''"  
+		ref="abgabeTable" 
+		:tabulator-options="abgabeTableOptions"  
+		:tabulator-events="abgabeTableEventHandlers"
+		tableOnly
+		:sideMenu="false"
+	 />
+	 
+	 <hr>
+	 <div v-show="selectedProjektarbeit"> 
+	 	<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+	 </div>
+    `,
+};
+
+export default Abgabetool;
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a86c3825b..119fc56be 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,7 +1,7 @@
 
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 
-export default {
+export const Raumsuche =  {
 	name: "Raumsuche",
 	props: {
 		
@@ -34,7 +34,7 @@ export default {
 			}),
 			raumsucheTableOptions: {
 				height: Vue.ref(400),
-				index: 'prestudent_id',
+				index: 'ort_kurzbz',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
@@ -243,3 +243,5 @@ export default {
 	 />
     `,
 };
+
+export default Raumsuche;
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 74a65ecaa..a0d3ddcf3 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -3,6 +3,7 @@ import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
 export default {
+	name: 'Dashboard',
 	components: {
 		DashboardSection,
 		DashboardWidgetPicker
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bfae232f4..d1bddc46b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37697,6 +37697,346 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'abgabetoolTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bachelor-/Masterarbeiten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Bachelor's/Master's theses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4details',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Details",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "details",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Semester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4stg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Studiengang",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "degree program",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4kontakt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kontakt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "contact",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Betreuer",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Assessor",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projekttyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projekttyp",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "project type",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4titel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Titel",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "title",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStudentenbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Dokumentabgabe - Studentenbereich",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "File submission - Student area",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fixtermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fixtermin",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Fixed submission deadline",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zieldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zieldatum",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "target date",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabetyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabetyp",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Type of document submitted",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabekurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kurzbeschreibung der Abgabe",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Short description of the submitted file",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabedatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabedatum",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "submission date",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fileupload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fileupload PDF max. 30 MB",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Fileupload PDF max. 30 MB",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4allowedFileTypes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Upload-File ist kein PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Upload-File is not a PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4enduploadZusatzdaten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Upload-File ist kein PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Upload-File is not a PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN START
 	array(
 		'app' => 'core',

From a0ce635c7eb60460cd8075c7f208d9f721979e3d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 12 Mar 2025 15:04:37 +0100
Subject: [PATCH 0097/1357] Refactor and Cleanup

- adapt tabulator and queries for remote pagination
- use formatterParams for messageStati to enable phrase logic
- adapt logic for mitarbeiter_uid
- refactor logic to use new Page, new Tab and newDiv with one child component
- add phrases
---
 .../api/frontend/v1/messages/Messages.php     |  59 +++++--
 application/models/system/Message_model.php   |  62 ++++++--
 public/js/api/messages/person.js              |  14 +-
 .../{NewMessage.js => Depr_NewMessage.js}     |   0
 .../Messages/Details/NewMessage/Modal.js      | 148 +++++++++++++-----
 .../Messages/Details/NewMessage/NewDiv.js     | 116 +++++++-------
 .../Messages/Details/TableMessages.js         | 108 ++++---------
 public/js/components/Messages/Messages.js     | 140 +++++++----------
 .../Studentenverwaltung/Details/Messages.js   |  31 +++-
 system/phrasesupdate.php                      |  80 ++++++++++
 10 files changed, 459 insertions(+), 299 deletions(-)
 rename public/js/components/Messages/Details/{NewMessage.js => Depr_NewMessage.js} (100%)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 65c354c4f..7834ba5f7 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -41,17 +41,27 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		$result = $this->MessageModel->getMessagesForTable($id);
+		$offset = $size * ($page - 1);
+		$limit = $size;
+
+		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		//return null if count == 0
+		if($data['count'] == 0){
+			$this->terminateWithSuccess([]);
+		}
+
+		$this->addMeta('count', $data['count']);
+
+		$this->terminateWithSuccess($data['data']);
 	}
 
 	public function getVorlagen()
@@ -107,9 +117,10 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($vorlage->text);
 	}
 
-	public function getMessageVarsPerson()
+	public function getMessageVarsPerson($id, $typeId)
 	{
-		$result = $this->MessageModel->getMessageVarsPerson();
+		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+		$result = $this->MessageModel->getMessageVarsPerson($person_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -119,7 +130,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$prestudent_id = ($typeId == 'prestudent_id') ? $id : $this->_getPrestudentIdFromUid($id);
+		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
 
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
@@ -138,7 +149,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getNameOfDefaultRecipient($id, $type_id)
 	{
-		$id = $type_id!='person_id)' ? $this->_getPersonId($id, $type_id) : $id;
+		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
@@ -151,8 +162,8 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
-		//is always uid in FAS
-		//TODO(Manu) make dynamic for other ids
+		//has to be uid
+	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
 
 		//default setting
 		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
@@ -205,10 +216,17 @@ class Messages extends FHCAPI_Controller
 			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
+		if($typeId == 'mitarbeiter_uid')
+		{
+			$person_id = $this->_getPersonId($id, $typeId);
+
+			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
+
+		}
 		elseif($typeId == 'person_id')
 		{
-			$this->terminateWithError("person_id ", self::ERROR_TYPE_GENERAL);
-
 			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
@@ -235,7 +253,6 @@ class Messages extends FHCAPI_Controller
 		{
 			$data = json_decode($_POST['data']);
 			unset($_POST['data']);
-
 		}
 		else
 			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
@@ -249,6 +266,15 @@ class Messages extends FHCAPI_Controller
 			case 'prestudent_id':
 				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
 				break;
+			case 'person_id':
+				$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
+				break;
+			case 'mitarbeiter_uid':
+				{
+					$person_id = $this->_getPersonId($id, $type_id);
+					$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
+				}
+				break;
 			default:
 				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 				break;
@@ -318,7 +344,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getPersonId($id, $typeId)
 	{
-		if ($typeId == 'uid')
+		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
 			$result = $this->BenutzerModel->loadWhere(
@@ -368,7 +394,7 @@ class Messages extends FHCAPI_Controller
 				['person_id' => $person_id]
 			);
 		}
-		elseif($typeId == 'uid')
+		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->terminateWithSuccess($id);
 		}
@@ -385,7 +411,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPersonId($id, $typeId)
 	{
-		if ($typeId == 'uid')
+		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
 			$result = $this->BenutzerModel->loadWhere(
@@ -408,6 +434,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
+	//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
@@ -415,7 +442,7 @@ class Messages extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$student = current($data);
-
+	//	$this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL);
 		return $student->prestudent_id;
 	}
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 38defa383..acbe3a44c 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -234,12 +234,15 @@ class Message_model extends DB_Model
 	/**
 	 * Gets messages for a person for tableMessages.
 	 * @param $person_id
-	 * @param null $status message status. by default, latest status is returned
+	 * paginationInitialPage: 1,
+	 * @param $offset number to skip, calculated by tabulatorParam paginationInitialPage and 	paginationSize, refers to specified numer of skipped items
+	 * and page
+	 * @param $limit refers to tabulatorParam paginationSize
 	 * @return array|null
 	 */
-	public function getMessagesForTable($person_id, $status = null)
+	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$sql = "
+		$sql_base = "
 			SELECT
 				m.message_id AS message_id,
 				m.subject AS subject,
@@ -275,20 +278,45 @@ class Message_model extends DB_Model
 				 JOIN public.tbl_msg_message m USING(message_id)
 			WHERE r.person_id = ?
 			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			ORDER BY insertamum DESC
+				 ";
+		$sql = "
+			SELECT COUNT(*) AS count FROM (
+				" . $sql_base . "
+			) a
 				 ";
 
 		$parametersArray = array($person_id, $person_id);
 
-		return $this->execQuery($sql, $parametersArray);
+		$count = $this->execQuery($sql, $parametersArray);
+
+		if (isError($count))
+			return $count;
+
+		$count = floor(current(getData($count))->count/$limit);
+		$sql = "
+			SELECT * FROM (
+				" . $sql_base . "
+			) a
+			ORDER BY insertamum DESC
+			LIMIT ?
+			OFFSET ?
+				 ";
+
+		$parametersArray = array($person_id, $person_id, $limit, $offset);
+
+		$data = $this->execQuery($sql, $parametersArray);
+
+		if (isError($data))
+			return $data;
+
+		$data = getData($data);
+
+		return success(['data' => $data, 'count' => $count]);
 	}
 
 	/**
-	 * Deletes a messages from tableMessages and tbl_msg_recipient
-	 * TODO(MANU) CHECK IF NECESSARY
-	 * dependency with other tables
-	 * in case of reply... more messages?? delete all dependent ones?
-	 * maybe anonimize it
+	 * Deletes entry in dependency table tbl_msg_recipient
+	 *
 	 * @param $message_id
 	 * @return boolean success
 	 */
@@ -302,7 +330,12 @@ class Message_model extends DB_Model
 		return $this->execQuery($sql, array($message_id));
 	}
 
-
+	/**
+	 * Deletes entry in dependency table tbl_msg_status
+	 *
+	 * @param $message_id
+	 * @return boolean success
+	 */
 	public function deleteMessageStatus($message_id)
 	{
 		$sql = "
@@ -312,7 +345,12 @@ class Message_model extends DB_Model
 
 		return $this->execQuery($sql, array($message_id));
 	}
-
+	/**
+	 * Deletes entry in dependency table tbl_msg_message
+	 *
+	 * @param $message_id
+	 * @return boolean success
+	 */
 	public function deleteMessage($message_id)
 	{
 		$sql = "
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index e53f23f6a..6fa39c6ba 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,6 +1,7 @@
 export default {
-	getMessages(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
+	getMessages(url, config, params) {
+		console.log('page ' + params.page + ' size ' + params.size);
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
 	},
 	getVorlagen(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
@@ -8,8 +9,8 @@ export default {
 	getMsgVarsLoggedInUser(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
 	},
-	getMessageVarsPerson(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
+	getMessageVarsPerson(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
 	},
 	getMsgVarsPrestudent(params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
@@ -34,9 +35,14 @@ export default {
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
 	},
 	sendMessage(form, id, data) {
+		console.log("id" + id);
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
 	},
+/*	sendMessage(id, data) {
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
+			data);
+	},*/
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
 	}
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/Depr_NewMessage.js
similarity index 100%
rename from public/js/components/Messages/Details/NewMessage.js
rename to public/js/components/Messages/Details/Depr_NewMessage.js
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 9bfe49929..c6d3e1210 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -22,19 +22,25 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		messageId: {
+			type: Number,
+			required: false,
+		},
 		openMode: String,
 	},
 	data(){
 		return {
 			formData: {
-				recipient: this.id,
+				recipient: null,
 				subject: null,
 				body: null,
 				vorlage_kurzbz: null,
 				selectedValue: '',
+				relationmessage_id: null
 			},
 			statusNew: true,
 			vorlagen: [],
+			recipientsArray: [],
 			defaultRecipient: null,
 			editor: null,
 			fieldsUser: [],
@@ -47,7 +53,9 @@ export default {
 			itemsPerson: [],
 			itemsUser: [],
 			previewText: null,
-			previewBody: ""
+			previewBody: "",
+			replyData: null,
+			uid: null,
 		}
 	},
 	methods: {
@@ -98,12 +106,14 @@ export default {
 
 			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.$refs.formMessage,
-				this.id,
+				this.uid,
 				data)
+/*			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.uid,
+				data)*/
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					this.hideTemplate();
+					this.hideModal('modalNewMessage');
 					this.resetForm();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -119,7 +129,7 @@ export default {
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
 					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
+					//this.hideModal('modalNewMessage');
 					//this.resetForm();
 					//TODO(Manu) CHECK
 					this.formData.body = response.data;
@@ -165,20 +175,22 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
 				body: null,
 				subject: null,
 			};
+			this.$emit('resetMessageId');
+
 			if (this.editor) {
 				this.editor.setContent("");
 			}
+
 			this.$refs.dropdownComp.setValue(null);
 
+			this.previewBody = null;
+
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
@@ -186,22 +198,28 @@ export default {
 				this.formData.subject = vorlage_kurzbz;
 			}
 		},
-		hideTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = false;
-		},
-		showTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = true;
-		},
 		showPreview(){
 			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
+		getUid(id, typeId){
+			const params = {
+				id: id,
+				type_id: typeId
+			};
+			this.$fhcApi.factory.messages.person.getUid(params)
+				.then(result => {
+					this.uid = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		show(){
 			this.$refs.modalNewMessage.show();
-		}
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
 	},
 	watch: {
 		'formData.body': {
@@ -223,11 +241,37 @@ export default {
 					return this.getVorlagentext(newVal);
 				}
 			}
+		},
+		messageId: {
+			immediate: true,
+			handler: async function (newMessageId) {
+				if (!newMessageId) return;
+
+				try {
+					const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					this.replyData = result.data;
+					console.log(this.replyData);
+
+					if (this.replyData.length > 0) {
+						this.formData.subject = this.replyData[0].replySubject;
+						this.formData.body = this.replyData[0].replyBody;
+						this.formData.relationmessage_id = newMessageId;
+					}
+				} catch (error) {
+					this.$fhcAlert.handleSystemError(error);
+				}
+			}
 		}
 	},
 	created(){
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+		this.getUid(this.id, this.typeId);
+
+		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 				.then(result => {
 					this.fieldsPerson = result.data;
 					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
@@ -237,16 +281,16 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+
+		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-											label: key,
-											value: value
-										}));*/
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'
@@ -271,8 +315,25 @@ export default {
 			type_id: this.typeId})
 			.then(result => {
 				this.defaultRecipient = result.data;
+			//	console.log("check " + this.uid + "|" + this.defaultRecipient);
+				this.recipientsArray.push({
+					'uid': this.uid,
+					'details': this.defaultRecipient});
+			//	console.log(JSON.stringify(this.recipientsArray));
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		//case of reply
+		if(this.messageId) {
+			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	async mounted() {
 		this.initTinyMCE();
@@ -281,10 +342,15 @@ export default {
 		this.editor.destroy();
 	},
 	template: `
-		<bs-modal class="messages-detail-newmessage-modal" ref="modalNewMessage" dialog-class="modal-xl">
+		<bs-modal
+			class="messages-detail-newmessage-modal"
+			ref="modalNewMessage" 
+			dialog-class="modal-xl"
+			@hidden.bs.modal="resetForm"
+			>
 
 			<template #title>
-				New Message
+				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
 			<form-form ref="formNewMassage">
@@ -296,7 +362,6 @@ export default {
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
 
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
 							<div class="row mb-3">
 
 								<form-input
@@ -348,7 +413,7 @@ export default {
 
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>Felder Prestudent</strong>
+							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -365,9 +430,6 @@ export default {
 
 							</div>
 
-							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-							<p>{{selectedFieldPrestudent}}</p>
-
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
@@ -387,12 +449,10 @@ export default {
 								</list-box>
 
 							</div>
-							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-							<p>{{selectedFieldPerson}}</p>
 						</div>
 
 						<div>
-							<strong>Meine Felder</strong>
+							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -408,7 +468,6 @@ export default {
 								</list-box>
 
 							</div>
-							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
 						</div>
 
 					</div>
@@ -417,7 +476,7 @@ export default {
 
 				<div class="row mt-4">
 
-					<h4>Vorschau:</h4>
+					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
 					<div>
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
@@ -428,12 +487,19 @@ export default {
 									:label="$p.t('messages/recipient')"
 									v-model="defaultRecipient"
 								>
+									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
+									<option
+										v-for="recipient in recipientsArray"
+										:key="recipient.uid"
+										:value="recipient.uid" 
+										>{{recipient.details}}
+									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview()">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
@@ -454,7 +520,7 @@ export default {
 			<template #footer>
 				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
 
-					<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+					<button class="btn btn-secondary" @click="resetForm">{{$p.t('ui', 'reset')}}</button>
 
 					<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
 					<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d8611d611..f1dc4c88a 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -15,30 +15,27 @@ export default {
 			type: String,
 			required: true
 		},
-		//for open in div and modal
-/*		typeId: String,
-		id: {
-			type: [Number, String],
-			required: true
-		},*/
 		openMode: String,
+		tempTypeId: String,
+		tempId: {
+			type: [Number, String],
+			required: false
+		},
+		tempMessageId: {
+			type: Number,
+			required: false,
+		}
 	},
 	computed: {
-		//params with routes for new tab and new window AND props
-/*		id(){
-			return this.$route.params.id || this.id;
-		},
-		typeId(){
-			return this.$route.params.typeId || this.typeId;
-		},*/
+		//params with routes for new tab and new window AND props for inSamePage
 		id(){
-			return this.$route.params.id || this.$props.id;
+			return this.$props.tempId || this.$route.params.id;
 		},
 		typeId(){
-			return this.$route.params.typeId || this.$props.id;
+			return this.$props.tempTypeId || this.$route.params.typeId;
 		},
 		messageId(){
-			return this.$route.params.messageId;
+			return this.$props.tempMessageId ||this.$route.params.messageId;
 		}
 	},
 	data(){
@@ -178,12 +175,15 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
+			//	this.editor.insertContent(selectedItem.value + ". ");
 				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
 				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
-				/*				this.editor.focus();
-								this.editor.setDirty(true);*/
+								//this.editor.focus();
+							//	this.editor.setDirty(true);
+
+				this.editor.setDirty(true);//seting dirty true if changes appear
+			//	console.log(tinyMCE.activeEditor.isDirty());//dirty output  = true
 
-				//this.editor.fire('change'); //forces
 
 				//this.editor.undoManager.add();
 
@@ -219,14 +219,12 @@ export default {
 			}
 		},
 		hideTemplate(){
-			if (this.openMode == "showDiv")
+			if (this.openMode == "inSamePage")
 				this.isVisible = false;
 		},
 		showTemplate(){
-			if (this.openMode == "showDiv")
+			if (this.openMode == "inSamePage")
 				this.isVisible = true;
-			//just for testing:
-			this.isVisible = true;
 		},
 		showPreview(id, typeId){
 			this.getPreviewText(id, typeId).then(() => {
@@ -267,23 +265,26 @@ export default {
 		},
 	},
 	created(){
-		if(this.typeId != 'uid')
-			this.getUid(this.id, this.typeId);
+		this.getUid(this.id, this.typeId);
 
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
-				.then(result => {
-					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
+		if (['person_id', 'mitarbeiter_uid'].includes(this.typeId)){
+				const params = {
+					id: this.id,
+					type_id: this.typeId
+				};
+				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+					.then(result => {
+						this.fieldsPerson = result.data;
+						this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+							label: value,
+							value: '{' + value + '}'
+						}));
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
 
-		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
-			const params = {
+		if (['prestudent_id', 'uid'].includes(this.typeId)){
+				const params = {
 				id: this.id,
 				type_id: this.typeId
 			};
@@ -291,11 +292,7 @@ export default {
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-											label: key,
-											value: value
-										}));*/
+
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'
@@ -318,11 +315,11 @@ export default {
 		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
 			id: this.id,
 			type_id: this.typeId
-		})
-			.then(result => {
+		}).then(result => {
 				this.defaultRecipient = result.data;
-				this.recipientsArray.push({'uid': this.uid,
-											'details': this.defaultRecipient});
+				this.recipientsArray.push({
+					'uid': this.uid,
+					'details': this.defaultRecipient});
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -347,13 +344,13 @@ export default {
 	},
 	template: `
 
-	<div class="messages-detail-newmessage">
-			<!--passt für showdiv-->
+	<div class="messages-detail-newmessage-newdiv">
+			<!--passt für inSamePage-->
 <!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
 
 			<!--new page-->
 			<div v-if="!messageSent" class="overflow-auto m-3">
-				<h4>New Message</h4>
+				<h4>{{ $p.t('messages', 'neueNachricht') }}</h4>
 
 				<div class="row">
 					<div class="col-sm-8">
@@ -411,7 +408,7 @@ export default {
 
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
-							<strong>Felder Prestudent</strong>
+							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 250px;">
 
 								<list-box
@@ -453,7 +450,7 @@ export default {
 						</div>
 
 						<div>
-							<strong>Meine Felder</strong>
+							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -476,7 +473,7 @@ export default {
 
 						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
 
-							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+							<button class="btn btn-secondary" @click="resetForm">{{$p.t('ui', 'reset')}}</button>
 
 							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
 							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
@@ -488,18 +485,19 @@ export default {
 
 				<div class="row mt-4">
 
-					<h4>Vorschau:</h4>
+					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
 					<div>
+					
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
-							<div class="col-sm-3 mb-3">
-							
+							<div class="col-sm-2 mb-3">
 								<form-input
 									type="select"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="formData.recipient"
+									v-model="defaultRecipient"
 								>
+									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
 									<option 
 										v-for="recipient in recipientsArray"
 										:key="recipient.uid" 
@@ -511,7 +509,7 @@ export default {
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn btn-secondary" @click="showPreview(formData.recipient,'uid')">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(id, typeId)">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
@@ -528,7 +526,7 @@ export default {
 		</div>
 		
 					
-		<div v-else class="container d-flex justify-content-center align-items-center m-3">
+		<div v-if="messageSent && openMode!='inSamePage'" class="container d-flex justify-content-center align-items-center m-3">
 			<div class="card" style="width: 80%">
 			  <div class="card-body alert alert-success text-dar p-5 rounded">
 						<div class="row">
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 317291c56..89a118fd1 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -37,7 +37,8 @@ export default {
 						type: this.typeId
 					};
 				},
-				ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
+				ajaxResponse: (url, params, response) => this.buildTreemap(response),
+				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -66,25 +67,15 @@ export default {
 					{
 						title: "status",
 						field: "status",
-						formatter: function (cell) {
-							//TODO(Manu) get phrases in this context to work?
-
-							/*							const statusMap = {
-															0: this.$p.t('messsages', 'unread'),
-															1: this.$p.t('messsages', 'read'),
-															2: this.$p.t('messsages', 'archived'),
-															3: this.$p.t('messsages', 'deleted')
-														};*/
-							const statusMap = {
-								0: 'unread',
-								1: 'read',
-								2: 'archived',
-								3: 'deleted'
-							};
-							return statusMap[cell.getValue()];
-							// return this.$p.t('messsages', 'deleted');
+						formatterParams: [
+							"unread",
+							"read",
+							"archived",
+							"deleted"
+						],
+						formatter: (cell, formatterParams) => {
+							return formatterParams[cell.getValue()];
 						}
-
 					},
 					{
 						title: "letzte Änderung",
@@ -144,6 +135,9 @@ export default {
 				selectableRangeMode: 'click',
 				index: 'message_id',
 				pagination: true,
+				paginationMode: "remote",
+				paginationSize: 15,
+				paginationInitialPage: 1,
 				dataTree: true,
 				headerSort: true,
 				dataTreeChildField: "children",
@@ -188,6 +182,15 @@ export default {
 						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();
 						/*
 						cm.getColumnByField('actions').component.updateDefinition({
 						title: this.$p.t('global', 'aktionen')
@@ -204,62 +207,9 @@ export default {
 					}
 				},
 			],
-			tabulatorData: [],
 			previewBody: "",
 			open: false,
 			personId: null,
-			//Testdata
-/*			messages: [
-				{
-					message_id: 7,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 6,
-				},
-				{
-					message_id: 1,
-					subject: "Hauptnachricht",
-					body: "Text 1",
-					insertamum: "2024-03-05",
-					relationmessage_id: null,
-				},
-				{
-					message_id: 2,
-					subject: "Antwort auf 1",
-					body: "Text 2",
-					insertamum: "2024-03-05",
-					relationmessage_id: 1,
-				},
-				{
-					message_id: 3,
-					subject: "Antwort auf 2",
-					body: "Text 3",
-					insertamum: "2024-03-05",
-					relationmessage_id: 2,
-				},
-				{
-					message_id: 4,
-					subject: "Neue Nachricht",
-					body: "Text 4",
-					insertamum: "2024-03-05",
-					relationmessage_id: null,
-				},
-				{
-					message_id: 5,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 4,
-				},
-				{
-					message_id: 6,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 5,
-				},
-			],*/
 		}
 	},
 	methods: {
@@ -283,13 +233,7 @@ export default {
 				});
 		},
 		actionNewMessage(){
-		//	this.$emit('newMessage', this.id, this.typeId);
-
-			//here already use person_id??
 			this.$emit('newMessage', this.id, this.typeId);
-
-			//console.log("action new message");
-
 		},
 		actionReplyToMessage(message_id){
 			this.$emit('replyToMessage', this.id, this.typeId, message_id);
@@ -298,6 +242,8 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		buildTreemap(messages) {
+			const last_page = messages.meta.count;
+			messages = messages.data;
 			const messageMap = new Map();
 			const messageNested = [];
 			const remainingMessages = new Set(messages);
@@ -334,7 +280,7 @@ export default {
 		// to avoid endless loop
 		if (iteration > messages.length) break;
 	}
-	return messageNested;
+	return {data: messageNested, last_page};
 }
 
 
@@ -360,7 +306,7 @@ export default {
 		});*/
 	},
 	created(){
-		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+		if(this.typeId != 'person_id') {
 			const params = {
 				id: this.id,
 				type_id: this.typeId
@@ -408,7 +354,7 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
-		<!--TODO(Manu) update-->
+		<!--TODO(Manu) finish later -->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index fc73768f1..3cc9039d8 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,15 +1,19 @@
 import TableMessages from "./Details/TableMessages.js";
-import NewMessage from "./Details/NewMessage.js";
+//import NewMessage from "./Details/NewMessage.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
 import FhcApi from "../../../../public/js/plugin/FhcApi.js";
 import Phrasen from "../../../../public/js/plugin/Phrasen.js";
+
+//TODO(Manu) Only if openMode == modal
+import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
 	components: {
 		TableMessages,
-		NewMessage,
+	//	NewMessage,
 		FormOnly,
 		FhcApi,
-		Phrasen
+		Phrasen,
+		MessageModal
 	},
 	inject: {
 		cisRoot: {
@@ -21,12 +25,22 @@ export default {
 			type: String,
 			required: true
 		},
-		typeId: String,
+		typeId: {
+			type: String,
+			required: true,
+			validator(value) {
+				return [
+					'prestudent_id',
+					'uid',
+					'person_id',
+					'mitarbeiter_uid'
+				].includes(value)
+			}
+		},
 		id: {
 			type: [Number, String],
 			required: true
 		},
-		showNew: Boolean,
 		showTable: Boolean,
 		messageLayout: {
 			type: String,
@@ -40,45 +54,29 @@ export default {
 		},
 		openMode: {
 			type: String,
-			default: 'window',
+			default: 'modal',
 			validator(value) {
 				return [
 					'window',
 					'newTab',
 					'modal',
-					'showDiv'
+					'inSamePage'
 				].includes(value)
 			}
 		}
 	},
 	data() {
 		return {
-			showDiv: false
+			isVisibleDiv: false,
+			messageId: null
 		}
 	},
 	methods: {
 		reloadTable(){
-			console.log("in parent reload");
 			this.$refs.templateTableMessage.reload();
 		},
-		newMessage(id, typeId){
-			if (this.openMode == "window") {
-				this.openInNewWindow(id, typeId);
-			}
-			else if (this.openMode == "newTab"){
-				this.openInNewTab(id, typeId);
-			}
-			else if (this.openMode == "modal"){
-				this.openInModal(id, typeId);
-			}
-			else if (this.openMode == "showDiv"){
-				this.$refs.templateNewMessage.showTemplate(id, typeId);
-			}
-			else
-				console.log("no valid openMode");
-		},
 		handleMessage(id, typeId, messageId){
-			console.log("in handleMessage " + messageId);
+			this.messageId = messageId;
 			if (this.openMode == "window") {
 				this.openInNewWindow(id, typeId, messageId);
 			}
@@ -86,32 +84,16 @@ export default {
 				this.openInNewTab(id, typeId, messageId);
 			}
 			else if (this.openMode == "modal"){
-				this.openInModal(id, typeId, messageId);
+				this.$refs.modalMsg.show();
 			}
-			else if (this.openMode == "showDiv"){
-				this.$refs.templateNewMessage.showTemplate(id, typeId, messageId);
+			else if (this.openMode == "inSamePage"){
+				this.isVisibleDiv = true;
 			}
 			else
 				console.log("no valid openMode");
 		},
-		openInDiv(id, typeId){
-			this.$refs.templateNewMessage.showTemplate(id, typeId);
-			//this.showDiv = true; //local variante
-			//this.$refs.templateNewMessage.showTemplate();
-		},
-		openInModal(id, typeId){
-			//TODO(manu) define bs-modal in this component
-			this.$refs.templateNewMessage.$refs.modalMsg.show();
-		},
-/*		openInNewTab(id, typeId){
-			//TODO(MANU) check if array of ids...
-			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + id + "/" + typeId;
+		openInNewTab(id, typeId, messageId= null){
 
-			const newTab = window.open(path, "_blank");
-		},*/
-		openInNewTab(id, typeId, messageId=null){
-			//TODO(MANU) check if array of ids...
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 			if (messageId){
@@ -124,12 +106,16 @@ export default {
 
 			const newTab = window.open(path, "_blank");
 		},
-		openInNewWindow(id, typeId){
-			//TODO(MANU) check if array of ids...
+		openInNewWindow(id, typeId, messageId){
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + id + "/" + typeId;
 
-			const newTab = window.open(path, "_blank");
+			if (messageId){
+				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
+			}
+
+			else {
+				path += "/NeueNachricht/" + id + "/" + typeId;
+			}
 
 			const width = Math.round(window.innerWidth * 0.75);
 			const height = Math.round(window.innerHeight * 0.75);
@@ -138,6 +124,9 @@ export default {
 
 			const newWindow = window.open(path, "_blank", `width=${width},height=${height},left=${left},top=${top}`);
 		},
+		resetMessageId(){
+			this.messageId = null;
+		}
 
 	},
 	template: `
@@ -147,31 +136,28 @@ export default {
 			ref="modalMsg"
 			:type-id="typeId"
 			:id="id"
+			:message-id="messageId"
 			:endpoint="endpoint"
 			:openMode="openMode"
 			@reloadTable="reloadTable"
+			@resetMessageId="resetMessageId"
 			>
 		</message-modal>
-
-<!--		<div>
-			<button class="btn btn-secondary m-1" @click="openInDiv(id,typeId)">Open in Div</button>
-			<button class="btn btn-secondary" @click="openInModal(id,typeId)">Open in Modal</button>
-			<button class="btn btn-secondary m-1" @click="openInNewTab(id,typeId)">Open in Tab</button>
-			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
-		</div>-->
-<!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
-
-		<div v-if="showNew">
-			<new-message
+		
+		<!--in same page-->
+		<div v-if="isVisibleDiv">
+			<form-only
 				ref="templateNewMessage"
-				:type-id="typeId"
-				:id="id"
+				:temp-type-id="typeId"
+				:temp-id="id"
+				:temp-message-id="messageId"
 				:endpoint="endpoint"
 				:openMode="openMode"
 				@reloadTable="reloadTable"
 			>
-			</new-message>
+			</form-only>
 		</div>
+
 		
 		<div v-if="showTable">
 			<table-messages
@@ -181,27 +167,17 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@newMessage="newMessage"		
+				@newMessage="handleMessage"		
 				@replyToMessage="handleMessage"
-			>
-			
+			>		
 			</table-messages>
-
-			<!--working also with form_only-->
-			<div v-if="showDiv">
-				<form-only
-					ref="templateNewForm"
-					:type-id="typeId"
-					:id="id"
-					:endpoint="endpoint"
-					:openMode="openMode"
-					@reloadTable="reloadTable"
-				>
-				</form-only>
-			</div>
-
 		</div>
-		
+		<div v-else>
+			<div class="col-md-2 mt-4">
+				<br>
+				<button type="button" class="btn btn-primary" @click="handleMessage(id, typeId)">{{ $p.t('messages', 'neueNachricht') }}</button>
+			</div>
+		</div>
 	</div>
 	`
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index f73ad161b..fa7d58997 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,7 +1,4 @@
 import CoreMessages from "../../../Messages/Messages.js";
-//import CoreMessages from "@/Messages/Messages.js";
-
-//TODO(Manu) refactor props
 
 export default {
 	components: {
@@ -12,6 +9,32 @@ export default {
 	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+	
+
+<!--		<h3>Test Dominik Schneider</h3>
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="mitarbeiter_uid"
+			id="ma0130"
+			messageLayout="twoColumnsTableLeft"
+			show-table
+			open-mode="modal"
+			>
+		</core-messages>-->
+		
+<!--		<h3>Test Person fields</h3>
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="mitarbeiter_uid"
+			id="ma0130"
+			messageLayout="twoColumnsTableLeft"
+			show-table
+			open-mode="modal"
+			>
+		</core-messages>-->
+		
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
@@ -19,8 +42,8 @@ export default {
 			type-id="prestudent_id"
 			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
+			open-mode="modal"
 			show-table
-			open-mode="newTab"
 			>
 		</core-messages>
 	</template>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 63cf34038..2af57dab5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37539,6 +37539,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'btnAktualisieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktualisieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Update',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'neueNachricht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Nachricht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Message',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'meineFelder',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meine Felder',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'My fields',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reset',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurücksetzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reset',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From 7b4f0f9dff4838a1d15be85167d90f169656dbd9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Mar 2025 09:05:53 +0100
Subject: [PATCH 0098/1357] Adaptions

- bugfix personFields
- validation for sendmessage for openmode inSamePage, newTab, window
- restyling div for enable scrolling in openmode InSamePage
---
 .../api/frontend/v1/messages/Messages.php     |  6 +---
 public/js/api/messages/person.js              |  7 ++--
 .../Messages/Details/NewMessage/Modal.js      | 28 ++++-----------
 .../Messages/Details/NewMessage/NewDiv.js     | 34 ++++++-------------
 public/js/components/Messages/Messages.js     | 10 +-----
 .../Studentenverwaltung/Details/Messages.js   | 15 ++++++--
 .../VorlagenDropdown/VorlagenDropdown.js      |  4 +--
 7 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 7834ba5f7..101a47185 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -120,20 +120,16 @@ class Messages extends FHCAPI_Controller
 	public function getMessageVarsPerson($id, $typeId)
 	{
 		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
-		$result = $this->MessageModel->getMessageVarsPerson($person_id);
-
+		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsPrestudent($id, $typeId)
 	{
 		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
-
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 6fa39c6ba..9bfae6f38 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -34,15 +34,14 @@ export default {
 	getReplyData(messageId){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
 	},
-	sendMessage(form, id, data) {
-		console.log("id" + id);
+	sendMessageFromModalContext(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
 	},
-/*	sendMessage(id, data) {
+	sendMessage(id, data) {
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
-	},*/
+	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
 	}
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index c6d3e1210..03345e9d4 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -92,7 +92,6 @@ export default {
 			this.formData.body = value;
 		},
 		sendMessage() {
-			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
 			const params = {
 				id: this.id,
@@ -104,13 +103,10 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			return this.$fhcApi.factory.messages.person.sendMessage(
+			return this.$fhcApi.factory.messages.person.sendMessageFromModalContext(
 				this.$refs.formMessage,
 				this.uid,
 				data)
-/*			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.uid,
-				data)*/
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -125,13 +121,8 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			//console.log(typeof vorlage_kurzbz);
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('modalNewMessage');
-					//this.resetForm();
-					//TODO(Manu) CHECK
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -234,8 +225,6 @@ export default {
 		},
 		'formData.vorlage_kurzbz': {
 			handler(newVal){
-				//	console.log("Vorlage: " + newVal);
-
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
 					return this.getVorlagentext(newVal);
@@ -274,9 +263,10 @@ export default {
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 				.then(result => {
 					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
+					const person = this.fieldsPerson[0];
+					this.itemsPerson = Object.entries(person).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
 					}));
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -315,11 +305,9 @@ export default {
 			type_id: this.typeId})
 			.then(result => {
 				this.defaultRecipient = result.data;
-			//	console.log("check " + this.uid + "|" + this.defaultRecipient);
 				this.recipientsArray.push({
 					'uid': this.uid,
 					'details': this.defaultRecipient});
-			//	console.log(JSON.stringify(this.recipientsArray));
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -399,13 +387,13 @@ export default {
 							</div>
 
 							<div class="row">
-								<DropdownComponent
+								<dropdown-component
 									ref="dropdownComp"
 									:label="$p.t('global/vorlage')"
 									@change="handleSelectedVorlage"
 									useLoggedInUserOe
 								>
-								</DropdownComponent>
+								</dropdown-component>
 							</div>
 
 						</form-form>
@@ -528,7 +516,5 @@ export default {
 			</template>
 
 		</bs-modal>
-
-	</div>
 	`,
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index f1dc4c88a..4331dd734 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -104,7 +104,6 @@ export default {
 			this.formData.body = value;
 		},
 		sendMessage() {
-			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
 
 			const params = {
@@ -118,42 +117,34 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			//this.uid is important for existing sendFunction
+			//this.uid is necessary for existing sendFunction
 			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.$refs.formMessage,
 				this.uid,
 				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
 					this.hideTemplate();
 					this.resetForm();
+					this.messageSent = true;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-						//this.resetForm();
-						//closeModal
-						//closewindwo
-					this.messageSent = true;
-					//TODO(Manu) hier route definieren? ist kein child sondern mit route aufgerufen
+					//TODO(Manu) hier route definieren für openmode in Tab, Page?
+					// ist kein child sondern mit route aufgerufen
 					//würde allerdings neues fenster aktualisiert öffnen, altes bleibt ohne reload gleich
 					//Reload vorheriges tab???
+					if(this.openMode == "inSamePage"){
 						this.$emit('reloadTable');
+						}
 					}
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					//this.resetForm();
-					//TODO(Manu) CHECK
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					//this.resetForm();
-					//closeModal
-					//closewindwo
 				});
 		},
 		getPreviewText(id, typeId){
@@ -168,8 +159,6 @@ export default {
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					//this.resetForm();
-					//closeModal
-					//closewindwo
 				});
 		},
 		insertVariable(selectedItem){
@@ -275,9 +264,10 @@ export default {
 				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 					.then(result => {
 						this.fieldsPerson = result.data;
-						this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-							label: value,
-							value: '{' + value + '}'
+						const person = this.fieldsPerson[0];
+						this.itemsPerson = Object.entries(person).map(([key, value]) => ({
+							label: key.toLowerCase(),
+							value: '{' + key.toLowerCase() + '}'
 						}));
 					})
 					.catch(this.$fhcAlert.handleSystemError);
@@ -345,9 +335,6 @@ export default {
 	template: `
 
 	<div class="messages-detail-newmessage-newdiv">
-			<!--passt für inSamePage-->
-<!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
-
 			<!--new page-->
 			<div v-if="!messageSent" class="overflow-auto m-3">
 				<h4>{{ $p.t('messages', 'neueNachricht') }}</h4>
@@ -356,7 +343,6 @@ export default {
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
 
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
 							<div class="row mb-3">
 
 								<form-input
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 3cc9039d8..5aa7eb7de 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,18 +1,10 @@
 import TableMessages from "./Details/TableMessages.js";
-//import NewMessage from "./Details/NewMessage.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
-import FhcApi from "../../../../public/js/plugin/FhcApi.js";
-import Phrasen from "../../../../public/js/plugin/Phrasen.js";
-
-//TODO(Manu) Only if openMode == modal
 import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
 	components: {
 		TableMessages,
-	//	NewMessage,
 		FormOnly,
-		FhcApi,
-		Phrasen,
 		MessageModal
 	},
 	inject: {
@@ -145,7 +137,7 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-if="isVisibleDiv">
+		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
 				ref="templateNewMessage"
 				:temp-type-id="typeId"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index fa7d58997..4c1d9bd6b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -10,7 +10,8 @@ export default {
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
-
+	<!--TODO(Manu) Delete Testdata-->
+	
 <!--		<h3>Test Dominik Schneider</h3>
 		<core-messages
 			ref="formc"
@@ -28,9 +29,19 @@ export default {
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
 			type-id="mitarbeiter_uid"
-			id="ma0130"
+			id="ma0158"
 			messageLayout="twoColumnsTableLeft"
 			show-table
+			open-mode="newTab"
+			>
+		</core-messages>-->
+		
+<!--		<h3>Test no table</h3>
+		<core-messages
+			ref="form2"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="prestudent_id"
+			:id="modelValue.prestudent_id"
 			open-mode="modal"
 			>
 		</core-messages>-->
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index e5d80077e..03d8564d6 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -23,11 +23,11 @@ export default {
 		}, */
 		isAdmin: {
 			type: Boolean,
-			required: true
+			required: false
 		},
 		useLoggedInUserOe: {
 			type: Boolean,
-			required: true
+			required: false
 		}
 	},
 	data() {

From 3b8b8d7882ee052e930da2c0df2b5f4b16ee9527 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Mar 2025 09:34:06 +0100
Subject: [PATCH 0099/1357] remove testdata in getFunction

---
 .../controllers/api/frontend/v1/messages/Messages.php        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 101a47185..dbc11735a 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -54,11 +54,6 @@ class Messages extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		//return null if count == 0
-		if($data['count'] == 0){
-			$this->terminateWithSuccess([]);
-		}
-
 		$this->addMeta('count', $data['count']);
 
 		$this->terminateWithSuccess($data['data']);

From 0dd1e4a628ee438085721325665fa60ead08b7cd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Mar 2025 10:29:08 +0100
Subject: [PATCH 0100/1357] refactor(RoomInformation): updates the
 roomInformation endpoint to use the Stundenplan library functions

---
 .../controllers/api/frontend/v1/Stundenplan.php  |  6 +++---
 application/libraries/StundenplanLib.php         |  4 ++--
 public/js/components/Cis/Mylv/RoomInformation.js | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 84c7933ad..815631d60 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -172,6 +172,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -188,8 +189,7 @@ class Stundenplan extends FHCAPI_Controller
 		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
-		$this->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -198,6 +198,7 @@ class Stundenplan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -211,7 +212,6 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$this->load->library('StundenplanLib');
 		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 5a741e10c..e0691ecab 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -144,8 +144,8 @@ class StundenplanLib{
 	}
 
 
-	private function expand_object_information($data){
-
+	public function expand_object_information($data){
+		$this->_ci =& get_instance();
 		foreach ($data as $item)
 		{
 
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 8a7354305..379f60498 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -219,25 +219,25 @@ const RoomInformation = {
 				</span>
 			</template>
 			<template #weekPage="{event,day}">
-				<div @click="showModal(event?.orig)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event?.topic}}</span>
+					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event?.ort_kurzbz}}</span>
 				</div>
 			</template>
 			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.orig.topic}}</p>
+						<p class="m-0">{{event?.topic}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+						<p class="m-0">{{event?.ort_kurzbz}}</p>
 					</div>
 				</div>
 			</template>

From d4feee89142fc6bcbf1222549b5a088376e87225 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 18 Mar 2025 14:30:19 +0100
Subject: [PATCH 0101/1357] Fixed wrong param causing wrong Notenliste for
 Wiederholer

---
 cis/private/lehre/notenliste.xls.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 6c8db5246..c525b2d6c 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -339,7 +339,7 @@ else
 					{
 						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
 						$output2 = $pr->result;
 
 						if ($output2)
@@ -360,7 +360,7 @@ else
 					{
 						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
 						$output3 = $pr->result;
 
 						if ($output3)

From 2759bb03090bded4e7317c7856f0be3444da8a09 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 19 Mar 2025 15:57:08 +0100
Subject: [PATCH 0102/1357] cis4 abgabetool student uploads/signature
 check/emails working; TODO: - testing with diff users, styling & mobile
 layout;

---
 application/controllers/Cis/Abgabetool.php    |  41 +-
 .../controllers/api/frontend/v1/Lehre.php     | 357 +++++++++++++++++-
 application/models/education/Abgabe_model.php | 139 -------
 .../models/education/Paabgabe_model.php       |  12 +
 .../models/education/Projektarbeit_model.php  | 142 +++++++
 .../views/CisRouterView/CisRouterView.php     |   8 +-
 public/js/api/lehre.js                        |  18 +-
 public/js/apps/Dashboard/Fhc.js               |  12 +-
 .../components/Cis/Abgabetool/AbgabeDetail.js | 277 ++++++++++----
 .../components/Cis/Abgabetool/Abgabetool.js   |  63 +++-
 system/phrasesupdate.php                      | 183 ++++++++-
 11 files changed, 995 insertions(+), 257 deletions(-)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 6c4770421..e00bbe837 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -13,7 +13,8 @@ class Abgabetool extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['basis/cis:r']
+			'index' => ['basis/cis:r'],
+			'getStudentProjektarbeitAbgabeFile' => ['basis/cis:r']
 		]);
 	}
 
@@ -32,4 +33,42 @@ class Abgabetool extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
+	
+	public function getStudentProjektarbeitAbgabeFile() 
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->helper('download');
+		
+		$paabgabe_id = $this->_ci->input->get('paabgabe_id');
+		$student_uid = $this->_ci->input->get('student_uid');
+
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$isZugeteilterBetreuer = count($this->_ci->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
+		
+		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer) {
+			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			if(file_exists($file_path)) {
+				
+				header('Content-Description: File Transfer');
+				header('Content-Type: application/octet-stream');
+				header('Expires: 0');
+				header('Cache-Control: must-revalidate');
+				header('Pragma: public');
+				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
+				header('Content-Length: ' . filesize($file_path));
+
+				flush(); // send headers first just in case
+				readfile($file_path); // read file content to output buffer
+				
+			} else {
+				$this->terminateWithError('File not found');
+			}
+		} else {
+			$this->terminateWithError('Keine Zuordnung!');
+		}
+	}
 }
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index e41881df2..b28bd2d45 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -18,6 +18,14 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+//require_once('../../../include/studiengang.class.php');
+//require_once('../../../include/student.class.php');
+//require_once('../../../include/datum.class.php');
+//require_once('../../../include/mail.class.php');
+//require_once('../../../include/benutzerberechtigung.class.php');
+//require_once('../../../include/phrasen.class.php');
+//require_once('../../../include/projektarbeit.class.php');
+//require_once('../../../include/projektbetreuer.class.php');
 
 class Lehre extends FHCAPI_Controller
 {
@@ -32,8 +40,27 @@ class Lehre extends FHCAPI_Controller
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
 			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
-			'getStudentProjektabgaben' => self::PERM_LOGGED
+			'getStudentProjektabgaben' => self::PERM_LOGGED,
+			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
+			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED
 		]);
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'abgabetool'
+			)
+		);
+
+		$this->load->helper('hlp_sancho_helper');
+		
+		require_once(FHCPATH . 'include/studiengang.class.php');
+		require_once(FHCPATH . 'include/student.class.php');
+		require_once(FHCPATH . 'include/projektarbeit.class.php');
+		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -94,35 +121,327 @@ class Lehre extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
+	 */
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
-		$this->load->model('education/Abgabe_model', 'AbgabeModel');
-		$ret = $this->AbgabeModel->getProjektarbeitAbgabetermine($projektarbeit_id);
-
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 		
 		$this->terminateWithSuccess($ret);
 	}
-	
+
+	/**
+	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
+	 */
 	public function getStudentProjektarbeiten($uid)
 	{
-		$this->load->model('education/Abgabe_model', 'AbgabeModel');
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		
-		$isZugeteilterBetreuer = count($this->AbgabeModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-		$ret = $this->AbgabeModel->getStudentProjektarbeitenLegacy($uid);
-		$this->addMeta('legacyQueryRetval', $ret);
-		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
-		
-		if ($this->MitarbeiterModel->isMitarbeiter(getAuthUID()) && ($isZugeteilterBetreuer)){
-			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer($uid);
-		} else {
-			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
-		}
-		
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));	
+		if (!isset($uid) || isEmptyString($uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		
+		if ($isMitarbeiter && $isZugeteilterBetreuer){
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
+		} else {
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));	
 	}
 	
+	
+
+	/**
+	 * projektarbeit - upload for zwischenabgaben in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitZwischenabgabe() 
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+			
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
+
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+			
+		} else {
+			$this->terminateWithError('File missing');
+		}
+		
+	}
+
+	/**
+	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitEndupload() 
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$sprache = $_POST['sprache'];
+		$abstract = $_POST['abstract'];
+		$abstract_en = $_POST['abstract_en'];
+		$schlagwoerter = $_POST['schlagwoerter'];
+		$schlagwoerter_en = $_POST['schlagwoerter_en'];
+		$seitenanzahl = $_POST['seitenanzahl'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// TODO: maybe check for other params aswell?
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				// Loads Libraries
+				$this->load->library('SignatureLib');
+				
+				// Check if the document is signed
+				$signaturVorhanden = true;
+				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+				if (is_array($signList) && count($signList) > 0)
+				{
+					// The document is signed
+					$uploadedDocumentSigned = 'The document is signed';
+				}
+				elseif ($signList === null)
+				{
+					$uploadedDocumentSigned = 'WARNING: signature server error';
+				}
+				else
+				{
+					$signaturVorhanden = false;
+					$uploadedDocumentSigned = 'No document signature found';
+				}
+				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
+
+				if ($signaturVorhanden === false)
+				{
+					$this->signaturFehltEmail($student_uid);
+				}
+				
+				// TODO error handle get data has data the updates
+				// update projektarbeit cols
+				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
+					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
+
+				
+				// update paabgabe datum
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+
+		} else {
+			$this->terminateWithError('File missing');
+		}
+		
+	}
+
+	private function signaturFehltEmail($student_uid) {
+		
+		
+		// Mail an Studiengang wenn keine Signatur gefunden wurde
+		$student = new student();
+		if(!$student->load($student_uid))
+			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+
+		$stg_obj = new studiengang();
+		if(!$stg_obj->load($student->studiengang_kz))
+			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
+
+		$subject = 'Abgabe ohne Signatur';
+		$tomail = $stg_obj->email;
+		$data = array(
+			'vorname' => $student->vorname,
+			'nachname' => $student->nachname,
+			'studiengang' => $stg_obj->bezeichnung
+		);
+
+		$mailres = sendSanchoMail(
+			'ParbeitsbeurteilungSiganturFehlt',
+			$data,
+			$tomail,
+			$subject,
+			'sancho_header_min_bw.jpg',
+			'sancho_footer_min_bw.jpg'
+		);
+	}
+	
+	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
+
+		$projektarbeit_obj = new projektarbeit();
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError('Ungueltiger Eintrag');
+
+		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+
+		if(!is_numeric($num_rows_sem) || $num_rows_sem < 0)
+		{
+			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
+		}
+		
+		foreach($resBetr->retval as $betreuerRow) {
+
+			// query student benutzer view for every betreuer row
+			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
+			
+			// TODO: hasdata, getData etc
+
+			// 1. Begutachter mail ohne Token
+			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
+			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
+			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
+			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
+
+			$maildata = array();
+			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
+			$maildata['anrede'] = $betreuerRow->anrede;
+			$maildata['betreuer_voller_name'] = $betreuerRow->first;
+			$maildata['student_anrede'] = $studentUser->anrede;
+			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
+			$maildata['abgabetyp'] = $abgabetyp;
+			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
+			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
+			$maildata['token'] = "";
+			
+			$mailres = sendSanchoMail(
+				'ParbeitsbeurteilungEndupload',
+				$maildata,
+				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
+				$subject,
+				'sancho_header_min_bw.jpg',
+				'sancho_footer_min_bw.jpg',
+				get_uid()."@".DOMAIN);
+
+			if(!$mailres)
+			{
+				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			}
+
+			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
+			if ($paabgabetyp_kurzbz == 'end')
+			{
+				// Zweitbegutachter holen
+				$zweitbegutachter = new projektbetreuer();
+				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
+
+				if ($zweitbegutachterRes)
+				{
+					$zweitbegutachterResults = $zweitbegutachter->result;
+
+					foreach ($zweitbegutachterResults as $begutachter)
+					{
+						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
+						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
+
+						if (!$tokenGenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+						
+						// Zweitbegutachter (evtl. mit Token) holen
+						$zweitbegutachterMitToken = new projektbetreuer();
+						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+
+						if (!$begutachterMitTokenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+						
+						// Email an Zweitbegutachter senden
+						if (isset($zweitbegutachterMitToken->result[0]))
+						{
+							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
+
+							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
+							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
+							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+							$intern = isset($begutachterMitToken->uid);
+							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
+
+							$zweitbetmaildata = array();
+							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
+							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
+							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
+							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
+							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
+							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
+							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
+							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+							
+							$mailres = sendSanchoMail(
+								'ParbeitsbeurteilungEndupload',
+								$zweitbetmaildata,
+								$begutachterMitToken->email,
+								$subject,
+								'sancho_header_min_bw.jpg',
+								'sancho_footer_min_bw.jpg',
+								get_uid()."@".DOMAIN
+							);
+
+							if (!$mailres)
+							{
+								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
index 0240beeb3..5a18c4fe3 100644
--- a/application/models/education/Abgabe_model.php
+++ b/application/models/education/Abgabe_model.php
@@ -11,144 +11,5 @@ class Abgabe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_abgabe';
 		$this->pk = 'abgabe_id';
 	}
-	
-	public function checkZuordnung($studentUID, $maUID) {
-		//oder Lektor mit Betreuung dieses Studenten
-		$qry = "
-			SELECT 1
-			FROM
-				lehre.tbl_projektarbeit
-				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
-			WHERE
-				tbl_projektarbeit.student_uid = ? AND
-				vw_benutzer.uid = ?";
-		
-		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
-	}
-	
-	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
-		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
-					   campus.tbl_paabgabe.projektarbeit_id,
-					   campus.tbl_paabgabe.fixtermin,
-					   campus.tbl_paabgabe.kurzbz,
-					   campus.tbl_paabgabe.datum,
-					   campus.tbl_paabgabetyp.bezeichnung, 
-					   campus.tbl_paabgabe.abgabedatum
-				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
-				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
-				ORDER BY campus.tbl_paabgabe.datum";
-		
-		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
-	}
-	
-	public function getStudentProjektarbeitenWithBetreuer($studentUID) {
-		$betreuerQuery = "
-		SELECT 
-			vorname as bvorname,
-			nachname as bnachname,
-			titelpre as btitelpre,
-			titelpost AS btitelpost,
-			titelpost AS btitelpost,
-			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-		
-			(SELECT person_id 
-			 FROM lehre.tbl_projektbetreuer 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-			(SELECT betreuerart_kurzbz 
-			 FROM lehre.tbl_projektbetreuer 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-			(SELECT tbl_betreuerart.beschreibung 
-			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-			
-			tbl_betreuerart.betreuerart_kurzbz,
-			person_id as bperson_id,
-			projektarbeit_id,
-			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
-			lehre.tbl_lehreinheit.studiensemester_kurzbz,
-			lehre.tbl_lehrveranstaltung.studiengang_kz,
-			public.tbl_studiengang.kurzbzlang,
-			lehre.tbl_projektbetreuer.note as note,
-			public.tbl_mitarbeiter.mitarbeiter_uid,
-			lehre.tbl_projektarbeit.titel as titel,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
-			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
-		
-		FROM lehre.tbl_projektarbeit
-				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-				 LEFT JOIN public.tbl_person USING(person_id)
-				 LEFT JOIN public.tbl_benutzer USING(person_id)
-				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
-		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		WHERE 
-			tbl_projektarbeit.student_uid = ? AND
-			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
-		
-		// TODO: fetch senatsmitglieder
-		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
-	}
 
-	public function getStudentProjektarbeitenLegacy($studentUID)
-	{
-		$qry = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
-	   (SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
-	   (SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
-	   (SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
-	   tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-	   (SELECT person_id 
-			FROM lehre.tbl_projektbetreuer 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-	   (SELECT betreuerart_kurzbz 
-			FROM lehre.tbl_projektbetreuer 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-	   (SELECT tbl_betreuerart.beschreibung 
-			FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-	   tbl_projektbetreuer.person_id AS betreuer_person_id,
-	   tbl_projekttyp.bezeichnung AS prjbez,
-	   lehre.tbl_projektbetreuer.note as note,
-	   public.tbl_benutzer.aktiv as aktiv,
-	   (SELECT abgeschicktvon 
-			FROM extension.tbl_projektarbeitsbeurteilung 
-			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
-			AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-	   (SELECT abgeschicktvon 
-			FROM extension.tbl_projektarbeitsbeurteilung 
-			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
-	   (SELECT datum FROM campus.tbl_paabgabe 
-	                 WHERE paabgabetyp_kurzbz = 'end' 
-	                 	AND abgabedatum IS NOT NULL 
-	                    AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben,
-	*
-FROM lehre.tbl_projektarbeit
-		 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-		 LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
-		 LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-		 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-		 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')
-  AND tbl_projektarbeit.student_uid= ?
-ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
-		
-		return $this->execQuery($qry, array($studentUID));
-	}
-	
 }
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 5fb58cc81..97235c37d 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -30,4 +30,16 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
+	
+	public function updatePaabgabe($paabgabe_id) {
+		$qry="
+			UPDATE campus.tbl_paabgabe SET
+				abgabedatum = now(),
+				updatevon = ?,
+				updateamum = now()
+			WHERE paabgabe_id= ?";
+
+		return $this->execQuery($qry, array(getAuthUID(), $paabgabe_id));
+	}
+	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 109e23373..c9c2b6b73 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -69,4 +69,146 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Update a Projektarbeit of a student by projektarbeit_id with 
+	 * the paramenters used by the student endupload page in cis4 abgabetool.
+	 */
+	public function updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en,
+										$schlagwoerter, $schlagwoerter_en,$seitenanzahl)
+	{
+		$qry = "UPDATE lehre.tbl_projektarbeit SET
+					seitenanzahl = ?,
+					abgabedatum = now(),
+					sprache = ?,
+					schlagwoerter_en = ?,
+					schlagwoerter = ?,
+					abstract = ?,
+					abstract_en = ?
+					WHERE projektarbeit_id = ?";
+
+		return $this->execQuery($qry, array($seitenanzahl, $sprache, $schlagwoerter_en,
+			$schlagwoerter, $abstract, $abstract_en, $projektarbeit_id));
+	}
+
+	/**
+	 * Get a List of Projektarbeiten of a student with betreuer 
+	 * used by the student cis4 abgabetool.
+	 */
+	public function getStudentProjektarbeitenWithBetreuer($studentUID)
+	{
+		$betreuerQuery = "
+		SELECT 
+			vorname as bvorname,
+			nachname as bnachname,
+			titelpre as btitelpre,
+			titelpost AS btitelpost,
+			titelpost AS btitelpost,
+			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+		
+			(SELECT person_id 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung 
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+			
+			tbl_betreuerart.betreuerart_kurzbz,
+			person_id as bperson_id,
+			projektarbeit_id,
+			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_lehrveranstaltung.studiengang_kz,
+			public.tbl_studiengang.kurzbzlang,
+			lehre.tbl_projektbetreuer.note as note,
+			public.tbl_mitarbeiter.mitarbeiter_uid,
+			lehre.tbl_projektarbeit.titel as titel,
+			lehre.tbl_projektarbeit.sprache as sprache,
+			lehre.tbl_projektarbeit.seitenanzahl as seitenanzahl,
+			lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter as schlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter_en as schlagwoerter_en,
+			lehre.tbl_projektarbeit.abstract as abstract,
+			lehre.tbl_projektarbeit.abstract_en as abstract_en, 
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
+		
+		FROM lehre.tbl_projektarbeit
+				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				 LEFT JOIN public.tbl_person USING(person_id)
+				 LEFT JOIN public.tbl_benutzer USING(person_id)
+				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE 
+			tbl_projektarbeit.student_uid = ? AND
+			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+		
+		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
+	}
+
+	/**
+	 * Get a List of Projektarbeit Abgabetermin used by the student cis4 abgabetool.
+	 */
+	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					campus.tbl_paabgabe.projektarbeit_id,
+					campus.tbl_paabgabe.fixtermin,
+					campus.tbl_paabgabe.kurzbz,
+					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
+					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabe.abgabedatum
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
+				ORDER BY campus.tbl_paabgabe.datum";
+
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
+
+	public function getProjektbetreuerAnrede($bperson_id) {
+		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
+						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
+						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE public.tbl_person.person_id= ?";
+
+		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
+
+	}
+
+	public function getProjektarbeitBenutzer($uid) {
+		$qry="SELECT * FROM campus.vw_benutzer where uid=?";
+		return $this->execReadOnlyQuery($qry, [$uid]);
+	}
+	
+	/**
+	 * Checks if mitarbeiter has a projektbetreuer zuordnung to student.
+	 */
+	public function checkZuordnung($studentUID, $maUID) {
+		//oder Lektor mit Betreuung dieses Studenten
+		$qry = "
+			SELECT 1
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
+			WHERE
+				tbl_projektarbeit.student_uid = ? AND
+				vw_benutzer.uid = ?";
+
+		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
+	}
 }
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 75ea0313e..231e25696 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -24,9 +24,11 @@ $includesArray = array(
 		'public/css/Cis4/Cms.css',
 	),
 	'customJSs' => array(
-		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js',
-		'vendor/npm-asset/primevue/inputnumber/inputnumber.js'
+		'vendor/npm-asset/primevue/accordion/accordion.min.js',
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 0020d3490..785b6abcf 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -29,8 +29,24 @@ export default {
 		return this.$fhcApi.get(
 			`/api/frontend/v1/Lehre/getStudentProjektabgaben`
 			, {
-				projektarbeit_id: detail.projektarbeit_id
+				projektarbeit_id: detail.projektarbeit_id,
+				student_uid: detail.student_uid
 			}
 		);
+	},
+	postStudentProjektarbeitEndupload(formData) {
+		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitEndupload';
+		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		return this.$fhcApi.post(url, formData, headers)
+	},
+	postStudentProjektarbeitZwischenabgabe(formData) {
+		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitZwischenabgabe';
+		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		return this.$fhcApi.post(url, formData, headers)
+	},
+	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
+		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
+
+		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 34494e324..0b50891b9 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -30,12 +30,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
-		// {
-		// 	path: `/Cis/Abgabetool`,
-		// 	name: 'Abgabetool',
-		// 	component: Abgabetool,
-		// 	props: true
-		// },
+		{
+			path: `/Cis/Abgabetool`,
+			name: 'Abgabetool',
+			component: Abgabetool,
+			props: true
+		},
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
index a1c3de8ae..5daf1a2b7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
@@ -6,7 +6,11 @@ export const AbgabeDetail = {
 	name: "AbgabeDetail",
 	components: {
 		Upload,
-		BsModal
+		BsModal,
+		InputNumber: primevue.inputnumber,
+		Checkbox: primevue.checkbox,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea
 	},
 	props: {
 		projektarbeit: {
@@ -16,23 +20,101 @@ export const AbgabeDetail = {
 	},
 	data() {
 		return {
-			file: []
+			eidAkzeptiert: false,
+			enduploadTermin: null,
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			form: Vue.reactive({
+				sprache: '',
+				abstract: '',
+				abstract_en: '',
+				schlagwoerter: '',
+				schlagwoerter_en: '',
+				kontrollschlagwoerter: '',
+				seitenanzahl: 1,
+			})
 		}
 	},
 	methods: {
-		triggerUpload() {
-			// todo: trigger the loadup
+		validate: function(termin) {
+			if(!termin.file.length) {
+				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
+				return false
+			}
 
+			return true;
+		},
+		triggerEndupload() {
+			if (!this.validate(this.enduploadTermin))
+			{
+				return false;
+			}
+			
+			// post endabgabe
+			const formData = new FormData();
+			formData.append('paabgabetyp_kurzbz', this.enduploadTermin.paabgabetyp_kurzbz)
+			formData.append('projektarbeit_id', this.enduploadTermin.projektarbeit_id);
+			formData.append('paabgabe_id', this.enduploadTermin.paabgabe_id)
+			formData.append('student_uid', this.projektarbeit.student_uid)
+			formData.append('bperson_id', this.projektarbeit.bperson_id)
+			
+			// TODO: validate/check for null etc.
+			formData.append('sprache', this.form['sprache'].sprache)
+			formData.append('abstract', this.form['abstract'])
+			formData.append('abstract_en', this.form['abstract_en'])
+			formData.append('schlagwoerter', this.form['schlagwoerter'])
+			formData.append('schlagwoerter_en', this.form['schlagwoerter_en'])
+			formData.append('seitenanzahl', this.form['seitenanzahl'])
+			
+			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
+				formData.append('file', this.enduploadTermin.file[i]);
+			}
+			this.$fhcApi.factory.lehre.postStudentProjektarbeitEndupload(formData)
+				.then(res => {
+					this.handleUploadRes(res)
+				})
+			
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
+		downloadAbgabe(termin) {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+		},
 		upload(termin) {
-			console.log(termin)
-			// TODO load it up
+
+			if (!this.validate(termin))
+			{
+				return false;
+			}
 			
 			if(termin.bezeichnung === 'Endupload') {
-				// open endupload form modal and await that it will be sent & checked
-
+				// open endupload form modal for further inputs
+				this.enduploadTermin = termin
 				this.$refs.modalContainerEnduploadZusatzdaten.show()
+			} else {
+				const formData = new FormData();
+				formData.append('paabgabetyp_kurzbz', termin.paabgabetyp_kurzbz)
+				formData.append('projektarbeit_id', this.projektarbeit.projektarbeit_id)
+				formData.append('paabgabe_id', termin.paabgabe_id)
+				formData.append('student_uid', this.projektarbeit.student_uid)
+				formData.append('bperson_id', this.projektarbeit.bperson_id)
+				
+				for (let i = 0; i < termin.file.length; i++) {
+					formData.append('file', termin.file[i]);
+				}
+				this.$fhcApi.factory.lehre.postStudentProjektarbeitZwischenabgabe(formData)
+					.then(res => {
+						this.handleUploadRes(res)
+					})
+			}
+		},
+		handleUploadRes(res) {
+			if(res.meta.status == "success") {
+				this.$fhcAlert.alertSuccess('File erfolgreich hochgeladen')
+			} else {
+				this.$fhcAlert.alertError('File upload error')
+			}
+			
+			if(res.meta.signaturInfo) {
+				this.$fhcAlert.alertInfo(res.meta.signaturInfo)
 			}
 		},
 		dateDiffInDays(datum, today){
@@ -43,6 +125,7 @@ export const AbgabeDetail = {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
+			// todo: rework styling but keep the color pattern logic
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			let color = 'white'
 			let fontColor = 'black'
@@ -61,28 +144,33 @@ export const AbgabeDetail = {
 			}
 			
 			return 'font-color: ' + fontColor + '; background-color: ' + color
+		},
+		openBeurteilungLink(link) {
+			window.open(link, '_blank')
+		},
+		getOptionLabel(option) {
+			return option.sprache
 		}
 	},
 	watch: {
-		'file'(newVal) {
-			if(newVal == [] || newVal === null || newVal === undefined) return
-
-			// check filetype on input change
-			const file = newVal[0]
-			if(!file) return
-
-			if(file.type && file.type.includes('pdf')) {
-				// all fine
-			} else {
-				// clear and alert for filetypes
-				this.$fhcAlert.alertInfo(this.$p.t('abgabetool/c4allowedFileTypes'))
-				this.entschuldigung.files = []
-			}
-
+		projektarbeit(newVal) {
+			// default select german if projektarbeit sprache was null
+			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
+			this.form.abstract = newVal.abstract
+			this.form.abstract_en = newVal.abstract_en
+			this.form.schlagwoerter = newVal.schlagwoerter
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
+			this.form.seitenanzahl = newVal.seitenanzahl
 		}
 	},
 	computed: {
-
+		getEid() {
+			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
+		},
+		getEnduploadErlaubt() {
+			return !this.eidAkzeptiert
+		}
 	},
 	created() {
 
@@ -100,33 +188,46 @@ export const AbgabeDetail = {
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
-					<div class="col">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						{{$p.t('abgabetool/c4fileupload')}}
 					</div>
-					<div class="col">
-					</div>
 				</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div class="col d-flex justify-content-center align-items-center">
+					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col" :style="getDateStyle(termin)">{{ termin.datum?.split("-").reverse().join(".") }}</div>
-					<div class="col">{{ termin.bezeichnung }}</div>
-					<div class="col">{{ termin.kurzbz }}</div>
-					<div class="col">{{ termin.abgabedatum?.split("-").reverse().join(".") }}</div>
-					<div class="col">
-<!--						<Upload accept=".pdf" v-model="file"></Upload>-->
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<div :style="getDateStyle(termin)">
+							{{ termin.datum?.split("-").reverse().join(".") }}
+						</div>				
 					</div>
-					<div class="col">
-						<button class="btn btn-primary border-0" @click="upload(termin)">
-							Upload
-							<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
-						</button>
+					<div class="col-1 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="cursor: pointer;">
+							<i class="fa-solid fa-file-pdf"></i>
+						</a>
+					</div>
+					<div class="col-6">
+						<div class="row">
+							<div class="col-6">
+								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+							</div>
+							<div class="col-6">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+									Upload
+									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
+								</button>
+							</div>
+						</div>
+						
+						
 					</div>
 				</div>
 			</div>
@@ -136,58 +237,98 @@ export const AbgabeDetail = {
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
-					
 				</div>
 				<div class="row mb-3 align-items-center">
 					
-					student uid
+					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
 				
 				</div>
 				<div class="row mb-3 align-items-center">
 					
-					{{ projektarbeit?.titel }}
+					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
 			<template v-slot:default>
 				<div class="row mb-3 align-items-center">
-					
-					Sprache der Arbeit
-				
+					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
+					<div class="row">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="form.sprache"
+							:options="allActiveLanguages"
+							:optionLabel="getOptionLabel">
+						</Dropdown>
+					</div>
 				</div>
+				
+<!--				 lektor fills these out-->
+<!--				<div class="row mb-3 align-items-center">-->
+<!--					<div class="row">Kontrollierte Schlagwörter</div>-->
+<!--					<div class="row">-->
+<!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
+<!--					</div>-->
+<!--					-->
+<!--				-->
+<!--				</div>-->
 				<div class="row mb-3 align-items-center">
-					
-					Kontrollierte Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter"></Textarea>
+					</div>
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Dt. Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter_en"></Textarea>
+					</div>
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Engl. Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract" rows="10"></Textarea>
+					</div>
 				</div>
+
 				<div class="row mb-3 align-items-center">
-					
-					Abstract max 5k characters
-				
+					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
+					</div>				
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Abstract eng max 5k chars
-				
+					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
+					<div class="row">
+						<InputNumber 
+							v-model="form.seitenanzahl"
+							inputId="seitenanzahlInput" :min="1" :max="100000">
+						</InputNumber>
+					</div>		
 				</div>
-				<div class="row mb-3 align-items-center">
-					
-					Seitenanzahl
 				
+				<div v-if="projektarbeit">
+					<div v-html="getEid"></div>
+					<div class="row">
+						<div class="col-9"></div>
+						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
+						<div class="col-1">
+							
+							<Checkbox 
+								v-model="eidAkzeptiert" 
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
 				</div>
+				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" @click="triggerUpload">{{$p.t('ui/hochladen')}}</button>
+				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
 			</template>
 		</bs-modal>
 	 	
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/Abgabetool.js
index b1ab65181..6a34ff052 100644
--- a/public/js/components/Cis/Abgabetool/Abgabetool.js
+++ b/public/js/components/Cis/Abgabetool/Abgabetool.js
@@ -21,17 +21,20 @@ export const Abgabetool = {
 	data() {
 		return {
 			domain: '',
+			student_uid: null,
 			detail: null,
+			projektarbeiten: null,
 			selectedProjektarbeit: null,
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 200, // TODO: determine smallest necessary height
+				height: 300,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), formatter: this.beurteilungFormatter, field: 'beurteilung', widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
@@ -50,20 +53,23 @@ export const Abgabetool = {
 			{
 				event: "cellClick",
 				handler: async (e, cell) => {
-
+					
 					if(cell.getColumn().getField() === "details") {
 						const val = cell.getValue()
+						
 						if(val.mode === 'detailTermine') {
 							this.setDetailComponent(cell.getValue())
 						} else if (val.mode === 'beurteilungDownload') {
-							//demo.dev.technikum-wien.at/cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz=Begutachter&projektarbeit_id=39239&person_id=22117
 							const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-							const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
 							window.open(pdfExportLink, '_blank')
 						}
 
-					}
-					console.log(cell.getData())
+					} else if (cell.getColumn().getField() === "beurteilung") {
+						const val = cell.getValue()
+						
+						if(val != '-') window.open(val, '_blank')
+					} 
 					e.stopPropagation()
 
 				}
@@ -71,13 +77,29 @@ export const Abgabetool = {
 			]};
 	},
 	methods: {
+		isPastDate(date) {
+			return new Date(date) < new Date(Date.now())	
+		},
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
-				console.log(res)
-				const pa = this.data[0]?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.forEach(termin => {
+					termin.file = []
+					termin.allowedToUpload = true
+					
+					// TODO: fixtermin logic?
+					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
+						
+						// termin.allowedToUpload = false
+					} else {
+						// termin.allowedToUpload = true
+					}
+
+				})
 				pa.betreuer = this.buildBetreuer(pa)
-				
+				pa.student_uid = this.student_uid
+
 				this.selectedProjektarbeit = pa
 			})
 			
@@ -104,6 +126,13 @@ export const Abgabetool = {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
 		},
+		beurteilungFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			} else return '-'
+		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
 		},
@@ -111,28 +140,30 @@ export const Abgabetool = {
 			return 'mailto:' + abgabe.mitarbeiter_uid +'@'+ this.domain
 		},
 		buildBetreuer(abgabe) {
-			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ?? '')
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		setupData(data){
-			
-			this.data = data // TODO: better define what is needed from this for detail component
-			this.domain = data[1] // TODO do this in backend but this is a prototype anyway
+			this.projektarbeiten = data[0]
+			this.domain = data[1]
+			this.student_uid = data[2]
 			const d = data[0]?.retval?.map(projekt => {
-				console.log('projekt', projekt)
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
-					mode = 'beurteilungDownload' // build dl link for both betreuer documents
+					// mode = 'beurteilungDownload' // build dl link for both betreuer documents
+					projekt.beurteilungLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.bperson_id
+
 				}
 				
 				return {
 					details: {
-						student_uid: this.viewData?.uid,
+						student_uid: this.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
 						betreuer_person_id: projekt.bperson_id,
 						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
 						mode
 					},
+					beurteilung: projekt.beurteilungLink ?? null,
 					sem: projekt.studiensemester_kurzbz,
 					stg: projekt.kurzbzlang,
 					mail: this.buildMailToLink(projekt),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d1bddc46b..01f0427b6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37885,13 +37885,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Fixtermin",
+				'text' => "Fix",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Fixed submission deadline",
+				'text' => "Fixed",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -38025,13 +38025,188 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Upload-File ist kein PDF!",
+				'text' => "Endupload Zusatzdaten",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Upload-File is not a PDF!",
+				'text' => "Final submission additional data",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4beurteilung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Beurteilung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Evaluation",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4schlagwoerterGer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Deutsche Schlagwörter",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "German Keywords",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4schlagwoerterEng',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Englische Schlagwörter",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "English Keywords",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abstractGer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abstract max 5000 Zeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Abstract max 5000 characters",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abstractEng',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abstract englisch max 5000 Zeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Abstract english max 5000 characters",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4seitenanzahl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Seitenanzahl",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Number of pages",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4gelesenUndAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Gelesen und akzeptiert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Read and accepted",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4eidesstattlicheErklaerung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich räume der Fachhochschule Technikum Wien das Recht ein, sämtliche übermittelte Dokumente elektronisch zu speichern und zum Zwecke der Langzeitarchivierung unter Beachtung der Bewahrung des Inhalts in andere Formate zu konvertieren.
+					<br><br>
+					Im Falle einer Masterarbeit räume ich der FH Technikum Wien das Recht ein, sie in Datennetzen öffentlich zugänglich zu machen und stimme den bezughabenden <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284975">Nutzungsbedingungen des Publikationsservers ePub</a> zu.
+					<br><br>
+					Ich bestätige hiermit, dass ich die eidesstattliche Erklärung mittels digitaler Signatur unterzeichnet habe.
+					<a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=214779">Link zum Leitfaden Digitale Signatur</a>.
+					<br><br>
+					Hiermit willige ich ein, dass meine Bachelor- oder Masterarbeit im Zuge der Beurteilung auch mittels (Online)-Tools auf die unerlaubte Verwendung von KI geprüft wird.
+					',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I grant UAS Technikum Wien the right to store all submitted documents electronically and to convert them into other formats for the purpose of long-term archiving, taking into account the preservation of the content.
+					<br><br>
+					In the case of a Master\'s thesis, I grant UAS Technikum Wien the right to make it publicly accessible in data networks and agree to the related <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284976">Terms of use for the publication server ePub</a>.
+					<br><br>
+					I hereby confirm that I have signed the affidavit using a digital signature. <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=215614">Link to the Digital Signature Guide</a>.
+					<br><br>
+					I hereby agree that my bachelor\'s or master\'s thesis will also be checked for unauthorized use of AI using (online) tools as part of the assessment.
+					',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From b75c9cc524420a68b85167e0db82da220c3d9dac Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 20 Mar 2025 11:16:05 +0100
Subject: [PATCH 0103/1357] portation of tab Anrechnungen

	- switch version edit / non edit in config
---
 application/config/stv.php                    |   6 +-
 .../api/frontend/v1/stv/Anrechnungen.php      | 241 ++++++++++
 .../api/frontend/v1/stv/Config.php            |   6 +
 .../models/education/Anrechnung_model.php     |  62 +++
 .../education/Lehrveranstaltung_model.php     |  37 ++
 .../models/ressource/Mitarbeiter_model.php    |  35 +-
 public/js/api/stv.js                          |   3 +
 public/js/api/stv/exemptions.js               |  29 ++
 .../Details/Anrechnungen.js                   |  25 ++
 .../Details/Anrechnungen/Anrechnungen.js      | 425 ++++++++++++++++++
 system/phrasesupdate.php                      | 142 ++++++
 11 files changed, 1007 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Anrechnungen.php
 create mode 100644 public/js/api/stv/exemptions.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js

diff --git a/application/config/stv.php b/application/config/stv.php
index 31ce3f521..1fdd5b28a 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -52,7 +52,11 @@ $config['tabs'] =
 					],
 				],
 			],
-		]
+		],
+		'exemptions' => [
+			//if true, Anrechnungen can be added and edited in tab Anrechnungen
+			'editableAnrechnungen' => false,
+		],
 	];
 	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
diff --git a/application/controllers/api/frontend/v1/stv/Anrechnungen.php b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
new file mode 100644
index 000000000..85019334f
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
@@ -0,0 +1,241 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Anrechnungen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAnrechnungen' => ['admin:r', 'assistenz:r'],
+			'deleteAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
+			'getBegruendungen' => ['admin:r', 'assistenz:r'],
+			'getLektoren' => ['admin:r', 'assistenz:r'],
+			'getLvsKompatibel' => ['admin:r', 'assistenz:r'],
+			'insertAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'loadAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'updateAnrechnung' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'lehre'
+		]);
+
+		// Load models
+		$this->load->model('education/Anrechnung_model', 'AnrechnungsModel');
+	}
+
+	public function getAnrechnungen($prestudent_id)
+	{
+		$result = $this->AnrechnungsModel->getAnrechnungsData($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getBegruendungen()
+	{
+		$this->load->model('education/Anrechnungbegruendung_model', 'AnrechnungbegrueundungsModel');
+
+		$result = $this->AnrechnungbegrueundungsModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getLehrveranstaltungen($prestudent_id)
+	{
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$studienplan_id = current($data)->studienplan_id;
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->getLvsByStudienplanId($studienplan_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLvsKompatibel($lehrveranstaltung_id)
+	{
+		$this->AnrechnungsModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'ON (lv.lehrveranstaltung_id = lehre.tbl_anrechnung.lehrveranstaltung_id)');
+		$result = $this->AnrechnungsModel->loadWhere(
+			['lehrveranstaltung_id_kompatibel' => $lehrveranstaltung_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLektoren($studiengang_kz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$result = $this->MitarbeiterModel->getLektoren($studiengang_kz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function insertAnrechnung()
+	{
+		$this->load->library('form_validation');
+
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['lehrveranstaltung_id'] =
+			(isset($formData['lehrveranstaltung_id']) && !empty($formData['lehrveranstaltung_id']))
+			? $formData['lehrveranstaltung_id']
+			: null;
+		$_POST['lehrveranstaltung_id_kompatibel'] =
+			(isset($formData['lehrveranstaltung_id_kompatibel']) && !empty($formData['lehrveranstaltung_id_kompatibel']))
+				? $formData['lehrveranstaltung_id_kompatibel']
+				: null;
+		$_POST['begruendung'] =
+			(isset($formData['begruendung_id']) && !empty($formData['begruendung_id']))
+				? $formData['begruendung_id']
+				: null;
+		$_POST['genehmigtVon'] = (isset($formData['genehmigt_von']) && !empty($formData['genehmigt_von']))
+			? $formData['genehmigt_von']
+			: null;
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('begruendung', 'Begruendung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Begruendung'])
+		]);
+
+		if($_POST['begruendung'] == 2)
+		{
+			$this->form_validation->set_rules('lehrveranstaltung_id_kompatibel', 'Lehrveranstaltung_id', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung Kompatibel'])
+			]);
+		}
+
+		$this->form_validation->set_rules('genehmigtVon', 'GenehmigtVon', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'GenehmigtVon'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AnrechnungsModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'lehrveranstaltung_id' => $_POST['lehrveranstaltung_id'],
+				'lehrveranstaltung_id_kompatibel' => $_POST['lehrveranstaltung_id_kompatibel'],
+				'begruendung_id' => $_POST['begruendung'],
+				'genehmigt_von' => $_POST['genehmigtVon']
+			]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAnrechnung($anrechnung_id)
+	{
+		$result = $this->AnrechnungsModel->loadWhere(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function updateAnrechnung()
+	{
+		$this->load->library('form_validation');
+
+		$anrechnung_id = $this->input->post('anrechnung_id');
+
+		if(!$anrechnung_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Anrechnung UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['lehrveranstaltung_id'] =
+			(isset($formData['lehrveranstaltung_id']) && !empty($formData['lehrveranstaltung_id']))
+				? $formData['lehrveranstaltung_id']
+				: null;
+		$_POST['lehrveranstaltung_id_kompatibel'] =
+			(isset($formData['lehrveranstaltung_id_kompatibel']) && !empty($formData['lehrveranstaltung_id_kompatibel']))
+				? $formData['lehrveranstaltung_id_kompatibel']
+				: null;
+		$_POST['begruendung'] = (isset($formData['begruendung_id']) && !empty($formData['begruendung_id'])) ? $formData['begruendung_id'] : null;
+		$_POST['genehmigtVon'] = (isset($formData['genehmigt_von']) && !empty($formData['genehmigt_von'])) ? $formData['genehmigt_von'] : null;
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('begruendung', 'Begruendung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Begruendung'])
+		]);
+
+		if($_POST['begruendung'] == 2)
+		{
+			$this->form_validation->set_rules('lehrveranstaltung_id_kompatibel', 'Lehrveranstaltung_id', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung Kompatibel'])
+			]);
+		}
+
+		$this->form_validation->set_rules('genehmigtVon', 'GenehmigtVon', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'GenehmigtVon'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AnrechnungsModel->update(
+			[
+				'anrechnung_id' => $anrechnung_id,
+			],
+			[
+
+				'lehrveranstaltung_id' => $_POST['lehrveranstaltung_id'],
+				'lehrveranstaltung_id_kompatibel' => $_POST['lehrveranstaltung_id_kompatibel'],
+				'begruendung_id' => $_POST['begruendung'],
+				'genehmigt_von' => $_POST['genehmigtVon']
+			]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteAnrechnung($anrechnung_id)
+	{
+		$result = $this->AnrechnungsModel->delete(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..319abdd83 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -117,6 +117,12 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
 		];
 
+		$result['exemptions'] = [
+			'title' => $this->p->t('lehre', 'anrechnungen'),
+			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
+			'config' => $config['exemptions']
+		];
+
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
index cbfdb6607..0b81be80c 100644
--- a/application/models/education/Anrechnung_model.php
+++ b/application/models/education/Anrechnung_model.php
@@ -202,4 +202,66 @@ class Anrechnung_model extends DB_Model
 		return success();
 		
 	}
+
+	/**
+	 * Get Anrechnungsdata for Table Anrechnungen
+	 *
+	 * @param $prestudent_id
+	 * @return array
+	 */
+	public function getAnrechnungsData($prestudent_id)
+	{
+		$qry = '
+			SELECT
+			  lehre.tbl_anrechnung.anrechnung_id,
+			  lehre.tbl_anrechnung.prestudent_id,
+			  lehre.tbl_anrechnung.lehrveranstaltung_id,
+			  lehre.tbl_lehrveranstaltung.bezeichnung AS bez_lehrveranstaltung,
+			  lehre.tbl_anrechnung_begruendung.bezeichnung AS begruendung,
+			  lehre.tbl_anrechnung_anrechnungstatus.status_kurzbz AS status,
+			  genehmigt_von,
+			  lehre.tbl_anrechnung.insertamum,
+			  lehre.tbl_anrechnung.insertvon,
+			  lehre.tbl_anrechnung.updateamum,
+			  lehre.tbl_anrechnung.updatevon,
+			  lehrveranstaltung_id_kompatibel,
+			  lv_comp.bezeichnung as lehrveranstaltung_bez_kompatibel,
+			  count(nz.notizzuordnung_id) AS notizen_anzahl
+			FROM
+			  lehre.tbl_anrechnung
+			  	JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung lv_comp ON (lehre.tbl_anrechnung.lehrveranstaltung_id_kompatibel = lv_comp.lehrveranstaltung_id)
+			  	JOIN lehre.tbl_anrechnung_begruendung USING (begruendung_id)
+			  	LEFT JOIN lehre.tbl_anrechnung_anrechnungstatus ON (lehre.tbl_anrechnung_anrechnungstatus.anrechnung_id = lehre.tbl_anrechnung.anrechnung_id)
+				AND lehre.tbl_anrechnung_anrechnungstatus.insertamum = (
+					SELECT MAX(insertamum) 
+					FROM lehre.tbl_anrechnung_anrechnungstatus 
+					WHERE anrechnung_id = lehre.tbl_anrechnung.anrechnung_id
+				)
+				LEFT JOIN lehre.tbl_anrechnungstatus USING (status_kurzbz)
+				LEFT JOIN public.tbl_notizzuordnung nz ON (nz.anrechnung_id = lehre.tbl_anrechnung.anrechnung_id)
+			WHERE
+				lehre.tbl_anrechnung.prestudent_id = ?
+			GROUP BY 
+			      nz.anrechnung_id,
+				  lehre.tbl_anrechnung.anrechnung_id,
+				  lehre.tbl_anrechnung.prestudent_id,
+				  lehre.tbl_anrechnung.lehrveranstaltung_id,
+				  bez_lehrveranstaltung,
+				  begruendung,
+				  status,
+				  genehmigt_von,
+				  lehre.tbl_anrechnung.insertamum,
+				  lehre.tbl_anrechnung.insertvon,
+				  lehre.tbl_anrechnung.updateamum,
+				  lehre.tbl_anrechnung.updatevon,
+				  lehrveranstaltung_id_kompatibel,
+				  lehrveranstaltung_bez_kompatibel
+			ORDER BY
+			  	lehre.tbl_anrechnung.updateamum ASC
+		';
+
+		return $this->execQuery($qry, array($prestudent_id));
+
+	}
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 0a48965b5..6176f00b1 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1071,4 +1071,41 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Gets lehrveranstaltungen of Studienplan
+	 * @param $studienplan_id ID des Studienplans
+	 * @param $semester Semester optional
+	 * @return array|null
+	 */
+	public function getLvsByStudienplanId($studienplan_id, $semester = null)
+	{
+		$params = array($studienplan_id);
+
+		$qry = "SELECT tbl_lehrveranstaltung.*,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+			tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+			tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+			tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+			tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+			tbl_studienplan_lehrveranstaltung.curriculum,
+			tbl_studienplan_lehrveranstaltung.export,
+			tbl_studienplan_lehrveranstaltung.genehmigung
+		FROM lehre.tbl_lehrveranstaltung
+		JOIN lehre.tbl_studienplan_lehrveranstaltung
+		USING(lehrveranstaltung_id)
+		WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ?
+		";
+
+		if ($semester !== null)
+		{
+			$qry.= " AND tbl_studienplan_lehrveranstaltung.semester = ?";
+			$params[] = $semester;
+		}
+
+		$qry .= " ORDER BY stpllv_sort, semester, sort";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 836f5d65a..2b652c65b 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -261,9 +261,9 @@ class Mitarbeiter_model extends DB_Model
 	 * @param $lehrveranstaltung_id
 	 * @return array with Mitarbeiter and their Lehreinheiten
 	 */
-	public function getMitarbeiterFromLV($lehrveranstaltung_id){
-	//TODO(manu) maybe filter that in pruefungslist.js ?
-	$qry = "SELECT DISTINCT
+	public function getMitarbeiterFromLV($lehrveranstaltung_id)
+	{
+		$qry = "SELECT DISTINCT
     			lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
 			FROM 
 			    lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
@@ -278,4 +278,33 @@ class Mitarbeiter_model extends DB_Model
 
 		return $this->execQuery($qry, $parametersArray);
 	}
+
+	/**
+	 * Get Lektoren by studiengang_kz
+	 *
+	 * @param $studiengang_kz
+	 * @return array with Mitarbeiter
+	 */
+	public function getLektoren($studiengang_kz)
+	{
+		$qry = "
+			SELECT DISTINCT
+			    campus.vw_mitarbeiter.uid,
+				campus.vw_mitarbeiter.vorname,
+				campus.vw_mitarbeiter.nachname,
+				studiengang_kz,
+				tbl_studiengang.typ,
+				tbl_studiengang.kurzbz AS stg_kurzbz
+			FROM
+			  campus.vw_mitarbeiter
+			  JOIN public.tbl_benutzerfunktion USING (uid)
+			  JOIN public.tbl_studiengang USING(oe_kurzbz)
+				WHERE studiengang_kz = ?
+				AND lektor is true
+			ORDER BY campus.vw_mitarbeiter.nachname";
+
+		$parametersArray = array($studiengang_kz);
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..0de3ac1fa 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,8 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import exemptions from './stv/exemptions.js';
+
 
 export default {
 	verband,
@@ -24,6 +26,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	exemptions,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/exemptions.js b/public/js/api/stv/exemptions.js
new file mode 100644
index 000000000..f8b421200
--- /dev/null
+++ b/public/js/api/stv/exemptions.js
@@ -0,0 +1,29 @@
+export default {
+	getAnrechnungen(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getAnrechnungen/' + params.id);
+	},
+	getLehrveranstaltungen(prestudent_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLehrveranstaltungen/' + prestudent_id);
+	},
+	getBegruendungen(){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getBegruendungen/');
+	},
+	getLvsKompatibel(lv_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLvsKompatibel/' + lv_id);
+	},
+	getLektoren(studiengang_kz){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLektoren/' + studiengang_kz);
+	},
+	addNewAnrechnung(form, data){
+		return this.$fhcApi.post(form, 'api/frontend/v1/stv/anrechnungen/insertAnrechnung/', data);
+	},
+	loadAnrechnung(anrechnung_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/loadAnrechnung/' + anrechnung_id);
+	},
+	editAnrechnung(form, data){
+		return this.$fhcApi.post(form, 'api/frontend/v1/stv/anrechnungen/updateAnrechnung/', data);
+	},
+	deleteAnrechnung(anrechnung_id){
+		return this.$fhcApi.post('api/frontend/v1/stv/anrechnungen/deleteAnrechnung/' + anrechnung_id);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
new file mode 100644
index 000000000..76d8ae7dd
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
@@ -0,0 +1,25 @@
+import AnrechnungenList from './Anrechnungen/Anrechnungen.js';
+
+export default {
+	components: {
+		AnrechnungenList
+	},
+	provide() {
+		return {
+			config: this.config
+		};
+	},
+	props: {
+		modelValue: Object,
+		config: Object
+	},
+	methods: {
+		reload() {
+			this.$refs.anrechnungen.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-anrechnungen h-100 d-flex flex-column">
+		<anrechnungen-list ref="anrechnungen" :student="modelValue"></anrechnungen-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
new file mode 100644
index 000000000..0560f1b5c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -0,0 +1,425 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+import CoreNotiz from "../../../../Notiz/Notiz.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput,
+		CoreNotiz
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		config: {
+			from: 'config',
+			required: true
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.exemptions.getAnrechnungen,
+				ajaxParams: () => {
+					return {
+						id: this.student.prestudent_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
+					{title: "lehrveranstaltung_id", field: "lehrveranstaltung_id", visible: false},
+					{title: "Lehrveranstaltung", field: "bez_lehrveranstaltung"},
+					{title: "Begründung", field: "begruendung"},
+					{title: "lehrveranstaltung_id_kompatibel", field: "lehrveranstaltung_id_kompatibel", visible: false},
+					{title: "lehrveranstaltung_bez_kompatibel", field: "lehrveranstaltung_bez_kompatibel"},
+					{title: "status", field: "status"},
+					{title: "genehmigt_von", field: "genehmigt_von"},
+					{title: "notizen_anzahl", field: "notizen_anzahl", visible: false},
+					{title: "Datum", field: "insertamum",
+						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: '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";
+
+							if(this.config.editableAnrechnungen){
+								let buttonEdit = document.createElement('button');
+								buttonEdit.className = 'btn btn-outline-secondary btn-action';
+								buttonEdit.innerHTML = '<i class="fa fa-edit"></i>';
+								buttonEdit.title = this.$p.t('ui', 'bearbeiten');
+								buttonEdit.addEventListener('click', (event) =>
+									this.actionEditAnrechnung(cell.getData().anrechnung_id)
+								);
+								container.append(buttonEdit);
+							}
+
+							let 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.deleteAnrechnung(cell.getData().anrechnung_id)
+							);
+							container.append(button);
+
+							let countNotizen = cell.getData().notizen_anzahl;
+							let buttonNotes = document.createElement('button');
+							buttonNotes.className = 'btn btn-outline-secondary btn-action';
+							if (countNotizen > 0){
+								buttonNotes.innerHTML = countNotizen + this.$p.t('anrechnung', 'existingNotes');
+							}
+							else
+								buttonNotes.innerHTML = '+' + this.$p.t('global', 'notiz');
+
+							buttonNotes.addEventListener('click', (event) =>
+								this.addNote(cell.getData().anrechnung_id)
+							);
+							container.append(buttonNotes);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				height: '500',
+				index: 'anrechnung_id',
+				persistenceID: 'stv-details-anrechnungen'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['anrechnungen', 'global', 'ui', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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('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'),
+						});
+
+					}
+				}
+			],
+			formData: {},
+			listBegruendungen: [],
+			listNewLehrveranstaltungen: [],
+			listLektoren: [],
+			listKompatibleLehrveranstaltungen: [],
+			statusNew: true,
+			showNotizen: false,
+			currentAnrechnung_id: null
+		}
+	},
+	watch: {
+		student(){
+			if (this.$refs.table) {
+				this.$refs.table.reloadTable();
+			}
+		},
+	},
+	methods: {
+		actionNewAnrechnung(){
+			this.statusNew = true;
+			this.$refs.anrechnungsModal.show();
+		},
+		actionEditAnrechnung(anrechnung_id){
+			this.resetForm();
+			this.statusNew = false;
+			this.loadAnrechnung(anrechnung_id);
+			this.$refs.anrechnungsModal.show();
+		},
+		addNote(anrechnung_id){
+			this.currentAnrechnung_id = anrechnung_id;
+			this.showNotizen = true;
+		},
+		addNewAnrechnung(){
+			const dataToSend = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.exemptions.addNewAnrechnung(this.$refs.formExemptions, dataToSend)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.anrechnungsModal.hide();
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		editAnrechnung(anrechnung_id){
+			const dataToSend = {
+				anrechnung_id: anrechnung_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.exemptions.editAnrechnung(this.$refs.formExemptions, dataToSend)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.anrechnungsModal.hide();
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deleteAnrechnung(anrechnung_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? anrechnung_id
+					: Promise.reject({handled: true}))
+				.then(this.$fhcApi.factory.stv.exemptions.deleteAnrechnung)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLvsKompatibel(){
+			if(this.formData.lehrveranstaltung_id) {
+				this.$fhcApi.factory.stv.exemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id)
+					.then(result => {
+						this.listKompatibleLehrveranstaltungen = result.data;
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
+		},
+		handleInput(){
+			if(this.formData.begruendung == 2) {
+				this.getLvsKompatibel();
+			}
+		},
+		loadAnrechnung(anrechnung_id){
+			return this.$fhcApi.factory.stv.exemptions.loadAnrechnung(anrechnung_id)
+				.then(result => {
+					this.formData = result.data;
+					this.getLvsKompatibel();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetForm(){
+			this.formData = {};
+			this.statusNew = true;
+		},
+		resetLvKompatibel(){
+			this.formData.lehrveranstaltung_id_kompatibel = null;
+			this.handleInput();
+		}
+	},
+	created() {
+		this.$fhcApi.factory.stv.exemptions.getLehrveranstaltungen(this.student.prestudent_id)
+			.then(result => {
+				this.listNewLehrveranstaltungen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.stv.exemptions.getBegruendungen()
+			.then(result => {
+				this.listBegruendungen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.stv.exemptions.getLektoren(this.student.studiengang_kz)
+			.then(result => {
+				this.listLektoren = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+					<div class="stv-details-tab_exemptions h-100 pb-3">
+					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
+					
+					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
+							<div class="justify-content-end pb-3">
+								<form-input
+									container-class="form-switch"
+									type="checkbox"
+									label="Notizen"
+									v-model="showNotizen"
+									@change="onSwitchHide"
+									>
+								</form-input>
+							</div>
+						<core-notiz
+							:endpoint="$fhcApi.factory.notiz.person"
+							ref="formNotes"
+							notiz-layout="popupModal"
+							typeId="anrechnung_id"
+							:id="currentAnrechnung_id"
+							show-document
+							show-tiny-mce
+							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+							>
+						</core-notiz>
+					
+					</div>
+					
+					<template v-if="config.editableAnrechnungen" >
+						<core-filter-cmpt
+							ref="table"
+							:tabulator-options="tabulatorOptions"
+							:tabulator-events="tabulatorEvents"
+							table-only
+							:side-menu="false"
+							reload
+							new-btn-show
+							:new-btn-label="this.$p.t('lehre', 'anrechnung')"
+							@click:new="actionNewAnrechnung"
+						>
+						</core-filter-cmpt>
+					</template>
+					<template v-else>
+						<core-filter-cmpt
+							ref="table"
+							:tabulator-options="tabulatorOptions"
+							:tabulator-events="tabulatorEvents"
+							table-only
+							:side-menu="false"
+							reload
+						>
+						</core-filter-cmpt>
+					</template>
+				
+					<bs-modal ref="anrechnungsModal" dialog-class="modal-dialog-scrollable" >
+						<template #title>
+							<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('anrechnung', 'neueAnrechnung')}}</p>							
+							<p v-else class="fw-bold mt-3">{{$p.t('anrechnung', 'editAnrechnung')}}</p>
+						</template>
+						
+						<core-form ref="formExemptions">
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('lehre/lehrveranstaltung')"
+									name="lehrveranstaltung"
+									v-model="formData.lehrveranstaltung_id"
+									@change="resetLvKompatibel"
+									>
+									<option
+										v-for="entry in listNewLehrveranstaltungen"
+										:key="entry.lehrveranstaltung_id"
+										:value="entry.lehrveranstaltung_id"
+										>
+										{{entry.bezeichnung}} Semester {{entry.semester}} {{entry.lehrform_kurzbz}}
+									</option>
+								</form-input>
+							</div>
+							
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('anrechnung/begruendung')"
+									name="begruendung"
+									v-model="formData.begruendung_id"
+									@change="handleInput"
+									>
+									<option
+										v-for="entry in listBegruendungen"
+										:key="entry.begruendung_id"
+										:value="entry.begruendung_id"
+										>
+										{{entry.bezeichnung}}
+									</option>
+								</form-input>
+							</div>
+							
+							<!--is shown when typ == kompatible LV-->
+							<div v-if="formData.begruendung_id == '2'" class="row mb-3">
+								<form-input
+									type="select"
+									label="Lehrveranstaltung Kompatibel"
+									name="lehrveranstaltung_id_kompatibel"
+									v-model="formData.lehrveranstaltung_id_kompatibel"
+									>
+									<option
+										v-for="entry in listKompatibleLehrveranstaltungen"
+										:key="entry.lehrveranstaltung_id"
+										:value="entry.lehrveranstaltung_id"
+										>
+										{{entry.bezeichnung}} Semester {{entry.semester}} {{entry.lehrform_kurzbz}}
+									</option>
+								</form-input>
+							</div>						
+							
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('anrechnung/genehmigtVon')"
+									name="genehmigtVon"
+									v-model="formData.genehmigt_von"
+									>
+									<option
+										v-for="entry in listLektoren"
+										:key="entry.uid"
+										:value="entry.uid"
+										>
+										{{entry.nachname}} {{entry.vorname}}
+									</option>
+								</form-input>
+							</div>						
+						</core-form>
+						
+						<template #footer>
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAnrechnung">{{$p.t('ui', 'speichern')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="editAnrechnung(formData.anrechnung_id)">{{$p.t('ui', 'speichern')}}</button>
+						</template>
+								
+					</bs-modal>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index acb7a12e6..54297fb6a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40432,6 +40432,148 @@ array(
 		)
 	),
 	// FHC4 Phrases Mobility End
+	// FHC4 Phrases Anrechnungen Start
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'begruendung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'genehmigtVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'genehmigt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'approved by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'editAnrechnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anrechnung bearbeiten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Edit Exemption",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'existingNotes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => " Notiz(en)",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => " note(s)",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'anrechnung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anrechnung ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exemption ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'lehrveranstaltung_id_kompatibel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV kompatibel ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course compatible ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'lehrveranstaltung_bez_kompatibel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV kompatibel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course compatible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 Phrases Anrechnungen End
 );
 
 

From 3f605e70513ce5011606f288b456a2036cbdac05 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Mar 2025 11:42:09 +0100
Subject: [PATCH 0104/1357] feature(Cis Color Themes): makes it possible to
 change color theme of the application

---
 .../api/frontend/v1/Stundenplan.php           |   6 +-
 application/libraries/StundenplanLib.php      |   4 +-
 application/views/Cis/Login.php               |   3 +-
 .../anrechnung/requestAnrechnungImportant.php |   6 +-
 composer.json                                 |   6 +-
 public/css/Cis4/Cis.css                       | 245 ++++++++++++----
 public/css/Cis4/CisVariables.css              | 265 ++++++++++++++++++
 public/css/Cis4/CisVariablesCms.css           |  14 +
 public/css/Cis4/Cms.css                       |   8 +-
 public/css/Fhc.css                            |   2 +-
 public/css/FilterWidget.css                   |  19 +-
 public/css/components/FilterComponent.css     |  14 +-
 public/css/components/FormUnderline.css       |   6 +-
 public/css/components/MyLv.css                |   6 +-
 public/css/components/NavigationComponent.css |  27 +-
 public/css/components/Profil.css              |   9 +-
 public/css/components/Sprachen.css            |   8 +-
 public/css/components/calendar.css            | 147 ++++++++--
 public/css/components/dashboard.css           |  31 +-
 public/css/components/dashboard/news.css      |  24 +-
 public/css/components/searchbar/searchbar.css |  25 +-
 public/css/components/searchbar/switches.css  |  25 +-
 public/css/components/verticalsplit.css       |   6 +-
 public/css/lehre/anrechnung.css               |  40 ---
 public/js/components/Calendar/Day/Page.js     |  30 +-
 public/js/components/Calendar/Month/Page.js   |   6 +-
 public/js/components/Calendar/Week/Page.js    |  63 ++---
 public/js/components/Cis/Cms/Content.js       |   4 +-
 .../Cis/Cms/Content_types/General.js          |  32 ++-
 public/js/components/Cis/Cms/News.js          |   2 +-
 .../StudiengangInformation.js                 |   5 +-
 .../StudiengangPerson.js                      |   8 +-
 .../StudiengangVertretung.js                  |   2 +-
 public/js/components/Cis/DarkTheme.js         |  51 ++++
 public/js/components/Cis/Menu.js              |  31 +-
 public/js/components/Cis/Mylv/LvInfo.js       |   4 +-
 public/js/components/Cis/Mylv/LvMenu.js       |   2 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  16 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |   8 +-
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  |   4 +-
 .../Cis/Profil/ProfilComponents/Adresse.js    |   2 +-
 .../ProfilComponents/FetchProfilUpdates.js    |   4 +-
 .../Cis/Profil/ProfilComponents/Kontakt.js    |   2 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |   4 +-
 .../Profil/ProfilComponents/ProfilEmails.js   |   2 +-
 .../ProfilComponents/RoleInformation.js       |   6 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |   2 +-
 .../js/components/Cis/Raumsuche/Raumsuche.js  |   2 +-
 public/js/components/Cis/Sprachen.js          |   2 +-
 public/js/components/DashboardWidget/Ampel.js |   2 +-
 .../components/DashboardWidget/Stundenplan.js |   4 +-
 public/js/components/DashboardWidget/Url.js   |   4 +-
 public/js/components/searchbar/searchbar.js   |   6 +-
 public/js/helpers/ColorThemeSetting.js        |   5 +
 54 files changed, 911 insertions(+), 350 deletions(-)
 create mode 100644 public/css/Cis4/CisVariables.css
 create mode 100644 public/css/Cis4/CisVariablesCms.css
 create mode 100644 public/js/components/Cis/DarkTheme.js
 create mode 100644 public/js/helpers/ColorThemeSetting.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 84c7933ad..815631d60 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -172,6 +172,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -188,8 +189,7 @@ class Stundenplan extends FHCAPI_Controller
 		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
-		$this->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -198,6 +198,7 @@ class Stundenplan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -211,7 +212,6 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$this->load->library('StundenplanLib');
 		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 5a741e10c..e0691ecab 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -144,8 +144,8 @@ class StundenplanLib{
 	}
 
 
-	private function expand_object_information($data){
-
+	public function expand_object_information($data){
+		$this->_ci =& get_instance();
 		foreach ($data as $item)
 		{
 
diff --git a/application/views/Cis/Login.php b/application/views/Cis/Login.php
index 68490e67e..90f78f123 100644
--- a/application/views/Cis/Login.php
+++ b/application/views/Cis/Login.php
@@ -2,7 +2,8 @@
 	$includesArray = array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,
-		'fontawesome6' => true
+		'fontawesome6' => true,
+		'customJSs' => 'public/js/helpers/ColorThemeSetting.js'
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
index 0ee13d422..d224a52dd 100644
--- a/application/views/lehre/anrechnung/requestAnrechnungImportant.php
+++ b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
@@ -4,8 +4,8 @@
        <!--    Beantragung: Fristen panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
         <div class="d-flex">
+        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
         
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenTitle'); ?>
@@ -22,8 +22,8 @@
   <!--    Referenzbeispiele ECTS Berechnung panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
         <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
         </div>
@@ -54,8 +54,8 @@
     <!--    Herkunft der Kenntnisse: Angaben panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
         <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseTitle'); ?>
         </div>
diff --git a/composer.json b/composer.json
index 6aa94c0f7..053b5227f 100644
--- a/composer.json
+++ b/composer.json
@@ -308,9 +308,9 @@
 			"type": "package",
 			"package": {
 				"name": "twbs/bootstrap5",
-				"version": "5.1.3",
+				"version": "5.3",
 				"dist": {
-					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip",
+					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.zip",
 					"type": "zip"
 				}
 			}
@@ -473,7 +473,7 @@
 		"tinymce/tinymce5": "5.10.*",
 		"tomazdragar/simplecropper": "1.0",
 		"twbs/bootstrap3": "3.4.*",
-		"twbs/bootstrap5": "5.1.*",
+		"twbs/bootstrap5": "5.3.*",
 
 		"vuejs/vuejs3": "3.3.8",
 		"vuejs/vuerouter4": "4.1.3",
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index ab8f30260..8602def32 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,4 +1,5 @@
 /* basic */
+@import './CisVariables.css';
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
 
@@ -6,57 +7,176 @@ html {
   font-size: 0.875em;
 }
 
-/* variables */
-:root {
-  --fhc-cis-primary: #00649c;
-  --fhc-cis-primary-hover: #005585;
-  --fhc-cis-header-px: 1rem;
-  --fhc-cis-header-py: .5rem;
-  --fhc-cis-main-px: 1.5rem;
-  --fhc-cis-main-py: 1.5rem;
-  --fhc-cis-menu-lvl-1-bg: #00649c;
-  --fhc-cis-menu-lvl-1-color: #fff;
-  --fhc-cis-menu-lvl-1-bg-hover: #005585;
-  --fhc-cis-menu-lvl-1-color-hover: #fff;
-  --fhc-cis-menu-lvl-2-bg: #343a40;
-  --fhc-cis-menu-lvl-2-color: #fff;
-  --fhc-cis-menu-lvl-2-bg-hover: #2c3136;
-  --fhc-cis-menu-lvl-2-color-hover: #fff;
-  --fhc-cis-menu-lvl-2-color-active: #292b2a;
-  --fhc-cis-menu-lvl-3-bg: #72777A;
-  --fhc-cis-menu-lvl-3-color: #fff;
-  --fhc-cis-menu-lvl-3-bg-hover: #616568;
-  --fhc-cis-menu-lvl-3-color-hover: #fff;
-  --fhc-cis-menu-lvl-4-bg: #ced4da;
-  --fhc-cis-menu-lvl-4-color: #000;
-  --fhc-cis-menu-lvl-4-bg-hover: #d5dae0;
-  --fhc-cis-menu-lvl-4-color-hover: #000;
-  --fhc-cis-menu-lvl-5-bg: #e9ecef;
-  --fhc-cis-menu-lvl-5-color: #000;
-  --fhc-cis-menu-lvl-5-bg-hover: #eceff1;
-  --fhc-cis-menu-lvl-5-color-hover: #000;
-  --fhc-cis-grade-positive: rgb(0, 128, 0);
-  --fhc-cis-grade-negative: rgb(128, 0, 0);
+.fhc-dark-bg{
+	background-color: var(--fhc-dark);
+	color:var(--fhc-light) !important;
 }
+
+.fhc-dark-color {
+	color: var(--fhc-dark);
+}
+
+.fhc-dark-bg:hover{
+	filter: brightness(120%);
+}
+
+.fhc-primary-color{
+	color: var(--fhc-primary) !important;
+}
+
+.fhc-primary-bg {
+	background-color: var(--fhc-primary) !important;
+}
+
+.fhc-primary-highlight-bg {
+	background-color: var(--fhc-primary-highlight) !important;
+}
+
+.fhc-body-bg{
+	background-color:var(--fhc-background) !important;
+}
+
+.fhc-body-color{
+	color: var(--fhc-text) !important;
+}
+
+.fhc-secondary-bg{
+	background-color: var(--fhc-secondary) !important;
+}
+
+.fhc-secondary-color {
+	color: var(--fhc-secondary) !important;
+}
+
+.fhc-tertiary-bg{
+	background-color: var(--fhc-tertiary) !important;
+}
+
+.fhc-tertiary-color {
+	color: var(--fhc-tertiary) !important;
+}
+
+.fhc-fourth-bg {
+	background-color: var(--fhc-fourth) !important;
+}
+
+.fhc-fourth-color {
+	color: var(--fhc-fourth) !important;
+}
+
+.fhc-fifth-bg {
+	background-color: var(--fhc-fifth) !important;
+}
+
+.fhc-fifth-color {
+	color: var(--fhc-fifth) !important;
+}
+
+.fhc-body{
+	color:var(--fhc-text);
+	background-color: var(--fhc-background);
+	border-color: var(--fhc-border);
+}
+
+.fhc-secondary {
+	color: var(--fhc-text);
+	background-color: var(--fhc-secondary);
+	border-color: var(--fhc-border);
+}
+
+.fhc-tertiary{
+	color: var(--fhc-text);
+	background-color: var(--fhc-tertiary);
+	border-color:var(--fhc-border);
+}
+
+.fhc-link-color{
+	color: var(--fhc-link);
+}
+
+.fhc-text{
+	color: var(--fhc-text) !important;
+}
+
+:root{	
+	/* sidebar colors */
+	--fhc-cis-sidebar-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-bg: var(--fhc-tertiary);
+
+	--fhc-cis-header-px: 1rem;
+	--fhc-cis-header-py: .5rem;
+	--fhc-cis-main-px: 1.5rem;
+	--fhc-cis-main-py: 1.5rem;
+
+	--fhc-cis-menu-lvl-1-bg: var(--fhc-primary);
+	--fhc-cis-menu-lvl-1-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
+	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-2-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-tertiary-highlight);
+	--fhc-cis-menu-lvl-2-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-3-bg: var(--fhc-secondary);
+	--fhc-cis-menu-lvl-3-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-secondary-highlight);
+	--fhc-cis-menu-lvl-3-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-4-bg: var(--fhc-fourth);
+	--fhc-cis-menu-lvl-4-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-4-bg-hover: var(--fhc-fourth-highlight);
+	--fhc-cis-menu-lvl-4-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-5-bg: var(--fhc-fifth);
+	--fhc-cis-menu-lvl-5-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-5-bg-hover: var(--fhc-fifth-highlight);
+	--fhc-cis-menu-lvl-5-color-hover: var(--fhc-text);
+	--fhc-cis-grade-positive: var(--fhc-success);
+	--fhc-cis-grade-negative: var(--fhc-danger);
+}
+
 @media (min-width: 992px) {
-  :root {
-    --fhc-cis-menu-width: 250px;
-    --fhc-cis-header-height: 60px;
-    --fhc-cis-menu-bg: #72777A;
-  }
+	:root {
+		--fhc-cis-menu-width: 250px;
+		--fhc-cis-header-height: 60px;
+	}
 }
+
 @media (max-width: 991.98px) {
-  :root {
-    --fhc-cis-menu-width: 400px;
-    --fhc-cis-header-height: 40px;
-    --fhc-cis-menu-bg: #343a40;
-  }
+	:root {
+		--fhc-cis-menu-width: 400px;
+		--fhc-cis-header-height: 40px;
+	}
 }
 
 /* lvMenu entry style */
+#cis-menu .menu-entry {
+	color: var(--fhc-text);
+}
+
+[disabled="true"].menu-entry {
+	pointer-events: none;
+	cursor: default;
+	background-color: var(--fhc-disabled) !important;
+	color: black !important;
+	opacity: 0.75;
+	-webkit-touch-callout: none;
+	/* iOS Safari */
+	-webkit-user-select: none;
+	/* Safari */
+	-khtml-user-select: none;
+	/* Konqueror HTML */
+	-moz-user-select: none;
+	/* Old versions of Firefox */
+	-ms-user-select: none;
+	/* Internet Explorer/Edge */
+	user-select: none;
+}
+
 #cis-menu .menu-entry:hover{
-	background-color: var(--fhc-cis-primary);
-	color:white;
+	background-color: var(--fhc-primary);
+	color:var(--fhc-light);
 }
 
 /* buttons */
@@ -199,6 +319,7 @@ html {
 
 /* searchbar */
 #nav-search {
+  background-color: var(--fhc-primary);
   z-index: 1;
 }
 #nav-search.me-3 {
@@ -227,9 +348,16 @@ html {
 }
 
 #cis-main {
+  color: var(--fhc-text);
+  background-color: var(--fhc-background);
+  border-color: var(--fhc-border);
   padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
 }
 
+#cis-main .fa-arrow-up-right-from-square {
+	color: var(--fhc-link) !important;
+}
+
 #nav-main-sticky {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
@@ -249,10 +377,6 @@ html {
   display: flex;
 }
 
-.fhc-active {
-  background-color: var(--fhc-cis-menu-lvl-2-color-active) !important;
-}
-
 .fhc-seperator {
   position: relative;
 }
@@ -265,7 +389,7 @@ html {
   margin-left: 12.5%;
   width: 75%; /* Full width of the parent element */
   height: 1px; /* Height of the border */
-  background: linear-gradient(to right, #ffffff, var(--fhc-cis-primary), #ffffff);
+  background: linear-gradient(to right, var(--fhc-background), var(--fhc-primary), var(--fhc-background));
   opacity: 0.8; /* Adjust opacity for a subtle fade effect */
 }
 
@@ -299,7 +423,7 @@ html {
     left: 0;
     height: var(--fhc-cis-header-height);
     width: var(--fhc-cis-menu-width);
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
     z-index: 2;
   }
@@ -331,7 +455,7 @@ html {
   }
   #nav-main-toggle .collapsed .fa-arrow-circle-left {
     transform: scaleX(-1);
-    color: var(--bs-dark);
+    color: var(--fhc-black-40);
   }
   #nav-search {
     position: fixed;
@@ -349,7 +473,7 @@ html {
   #nav-user-btn {
     border-width: 0;
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
   }
   #nav-user-btn img {
     object-fit: contain;
@@ -359,7 +483,7 @@ html {
   #nav-user-menu {
     position: absolute;
     min-width: var(--fhc-cis-menu-width);
-    background-color: var(--fhc-cis-menu-lvl-2-bg);
+    background-color: var(--fhc-dark);
   }
 
   #nav-user-menu img {
@@ -394,7 +518,7 @@ html {
     margin-top: var(--fhc-cis-header-height);
   }
   #cis-header {
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
     height: var(--fhc-cis-header-height);
     position: fixed;
     width: 100vw;
@@ -431,18 +555,23 @@ html {
   }
   #nav-user-menu {
     position: absolute;
-	background-color: var(--fhc-cis-menu-lvl-2-bg);
+	background-color: var(--fhc-dark);
   }
   #nav-main-menu {
     display: block;
   }
 }
+
+#nav-main{
+	background-color: var(--fhc-cis-sidebar-bg);
+}
+
 /* Typography */
 .fhc-header {
   display: flex;
   justify-content: space-between;
   align-items: end;
-  border-bottom: 1px solid #dee2e6;
+  border-bottom: 1px solid var(--fhc-border);
   margin: 1rem 0;
 }
 .fhc-header > h1 {
@@ -454,7 +583,7 @@ html {
   }
 }
 .fhc-header > h1 > small {
-  color: #6c757d;
+  color: var(--fhc-secondary);
   font-size: 1rem;
 }
 .fhc-header > h1 > small:before {
@@ -465,7 +594,7 @@ html {
   text-decoration: none;
 }
 .fhc-header > a:after {
-  color: var(--bs-body-color);
+  color: var(--fhc-text);
   content: "\f059";
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -482,7 +611,7 @@ html {
 [disabled="true"].fhc-entry {
 	pointer-events: none;
 	cursor: default;
-	background-color: #dadada !important;
+	background-color: var(--fhc-disabled) !important;
 	color: black !important;
 	-webkit-touch-callout: none; /* iOS Safari */
 	-webkit-user-select: none;/* Safari */
diff --git a/public/css/Cis4/CisVariables.css b/public/css/Cis4/CisVariables.css
new file mode 100644
index 000000000..53af08837
--- /dev/null
+++ b/public/css/Cis4/CisVariables.css
@@ -0,0 +1,265 @@
+/* css overrides for static cms content */
+@import './CisVariablesCms.css';
+
+/* colors */
+:root {
+
+	--fhc-black-10:black;
+	--fhc-black-20: #1d2024;
+	--fhc-black-30: #212529;
+	--fhc-black-40: #292b2a;
+	--fhc-black-50: #2B3035;
+	--fhc-black-60: #2c3136;
+	--fhc-black-70: #343a40;
+
+	--fhc-white-10: #FFFFFF;
+	--fhc-white-20:#f6f6f6;
+	--fhc-white-30:#eceff1;
+	--fhc-white-40:#e9ecef;
+	--fhc-white-50:#dee2e6;
+	--fhc-white-60:#d5dae0;
+	--fhc-white-70:#ced4da;
+	--fhc-white-80:#c7cbcf;
+	--fhc-white-90:#aeb3b8;
+
+	--fhc-gray-10: #858f97;
+	--fhc-gray-20: #72777A;
+	--fhc-gray-30: #616568;
+	--fhc-gray-40: #495057;
+
+	--fhc-blue-10: #0a57ca;
+	--fhc-blue-20: #79b7d8;
+	/*  --fhc-blue-20: #00649c;*/
+	--fhc-blue-30: #00598d;
+	/*--fhc-blue-40: #005585;*/
+	--fhc-blue-40: #61aed8;
+	--fhc-blue-50: #00507e;
+
+	--fhc-blue-primary: #00649c;
+	--fhc-blue-primary-highlight: #005585;
+
+	--fhc-red-10: #842029;
+	--fhc-red-20: #800000;
+	
+	--fhc-green-10: #008000;
+
+	--fhc-beige-10: rgba(245, 233, 215,0.5);
+	--fhc-beige-20: rgba(172, 153, 125,0.5);
+	
+	
+
+}
+
+:root.light{
+	
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-blue-20);
+	--fhc-primary-highlight: var(--fhc-blue-40);
+
+	--fhc-tertiary: var(--fhc-white-20);
+	--fhc-tertiary-highlight: var(--fhc-white-40);
+
+	--fhc-secondary: var(--fhc-white-40);
+	--fhc-secondary-highlight: var(--fhc-white-60);
+
+	--fhc-fourth: var(--fhc-white-60);
+	--fhc-fourth-highlight: var(--fhc-white-80);
+
+	--fhc-fifth: var(--fhc-white-80);
+	--fhc-fifth-highlight: var(--fhc-white-90);
+
+	/*background*/
+	--fhc-background: var(--fhc-white-10);
+	--fhc-background-highlight: var(--fhc-white-60);
+	
+	/*text*/
+	--fhc-text: var(--fhc-black-30);
+	
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(0, 0, 0, 0.2);
+	--fhc-shadow-40: rgba(0, 0, 0, 0.4);
+	--fhc-shadow-60: rgba(0, 0, 0, 0.6);
+	--fhc-shadow-80: rgba(0, 0, 0, 0.8);
+	--fhc-box-shadow: var(--fhc-white-50);
+	--fhc-border: var(--fhc-white-50);
+	--fhc-border-highlight: var(--fhc-gray-40);
+
+	/* links */
+	--fhc-link: var(--fhc-blue-10);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-gray-10);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-30);
+	--fhc-light: var(--fhc-white-50);
+
+
+}
+
+:root.dark{
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-blue-primary-highlight);
+	--fhc-primary-highlight: var(--fhc-blue-primary);
+
+	--fhc-secondary: var(--fhc-black-70);
+	--fhc-secondary-highlight: var(--fhc-gray-40);
+
+	--fhc-tertiary: var(--fhc-black-50);
+	--fhc-tertiary-highlight: var(--fhc-black-70);
+
+	--fhc-danger: var(--fhc-red-10);
+
+	/*background*/
+	--fhc-background: var(--fhc-black-30);
+	--fhc-background-highlight: var(--fhc-black-20);
+
+	/*text*/
+	--fhc-text: var(--fhc-white-50);
+
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(125, 125, 125, 0.2);
+	--fhc-shadow-40: rgba(125, 125, 125, 0.4);
+	--fhc-shadow-60: rgba(125, 125, 125, 0.6);
+	--fhc-shadow-80: rgba(125, 125, 125, 0.8);
+	--fhc-box-shadow: var(--fhc-gray-40);
+	--fhc-border: var(--fhc-gray-40);
+	--fhc-border-highlight: var(--fhc-white-90);
+
+	/* links */
+	--fhc-link: var(--fhc-white-70);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-gray-10);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-50);
+	--fhc-light: var(--fhc-white-70);
+
+}
+
+:root.purple {
+
+	--fhc-purple-primary: rgb(150, 120, 255);
+	--fhc-purple-primary-highlight: rgb(170, 140, 255);
+	--fhc-purple-5: rgb(245, 240, 255);
+	--fhc-purple-10: rgb(235, 225, 255);
+	--fhc-purple-20: rgb(220, 200, 255);
+	--fhc-purple-30: rgb(200, 170, 255);
+	--fhc-purple-40: rgb(180, 140, 240);
+	--fhc-purple-50: rgb(160, 110, 225);
+	--fhc-purple-60: rgb(140, 90, 210);
+	--fhc-purple-70: rgb(120, 70, 195);
+	--fhc-purple-80: rgb(100, 50, 180);
+	--fhc-purple-90: rgb(80, 30, 165);
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-purple-primary-highlight);
+	--fhc-primary-highlight: var(--fhc-purple-primary);
+
+	--fhc-secondary: var(--fhc-purple-30);
+	--fhc-secondary-highlight: var(--fhc-purple-50);
+
+	--fhc-tertiary: var(--fhc-purple-20);
+	--fhc-tertiary-highlight: var(--fhc-purple-40);
+
+	/* background */
+	--fhc-background: var(--fhc-purple-5);
+	--fhc-background-highlight: var(--fhc-purple-10);
+
+	/* text */
+	--fhc-text: var(--fhc-black-20);
+
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(150, 100, 200, 0.2);
+	--fhc-shadow-40: rgba(150, 100, 200, 0.4);
+	--fhc-shadow-60: rgba(150, 100, 200, 0.6);
+	--fhc-shadow-80: rgba(150, 100, 200, 0.8);
+	--fhc-box-shadow: var(--fhc-white-50);
+	--fhc-border: var(--fhc-white-50);
+	--fhc-border-highlight: var(--fhc-gray-40);
+
+	/* links */
+	--fhc-link: var(--fhc-black-50);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-purple-20);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-20);
+	--fhc-light: var(--fhc-white-70);
+
+}
+
+/* fhc primary*/
+html.dark .bg-primary,
+html.dark .btn-primary,
+html.dark .btn-outline-primary {
+	background-color: var(--fhc-primary) !important;
+	border-color: var(--fhc-primary) !important;
+	color: white;
+}
+
+html.dark .btn-outline-primary:hover,
+html.dark .btn-primary:hover {
+	filter: brightness(90%);
+}
+
+html.dark .text-primary {
+	color: var(--fhc-primary) !important;
+}
+
+html.dark .btn-outline-primary,
+html.dark .border-primary {
+	border-color: var(--fhc-primary) !important;
+}
+
+/* fhc danger*/
+html.dark .bg-danger,
+html.dark .btn-danger,
+html.dark .btn-outline-danger {
+	background-color: var(--fhc-danger) !important;
+	border-color: var(--fhc-danger) !important;
+	color: white;
+}
+
+html.dark .btn-outline-danger:hover,
+html.dark .btn-danger:hover {
+	filter: brightness(90%);
+}
+
+html.dark .text-danger {
+	color: var(--fhc-danger) !important;
+}
+
+html.dark .border-danger {
+	border-color: var(--fhc-danger) !important;
+}
+
+
+html.dark .tabulator,
+html.dark .tabulator .tabulator-header,
+html.dark .tabulator .tabulator-header .tabulator-col,
+html.dark .tabulator .tabulator-table,
+html.dark .tabulator .tabulator-row {
+	background-color: var(--fhc-tertiary) !important;
+	color: var(--fhc-text) !important;
+	border-color: var(--fhc-border) !important;
+}
+
+html.dark .tabulator .tabulator-cell {
+	background-color: var(--fhc-secondary) !important;
+	border-color: var(--fhc-border) !important;
+}
+
+html.dark .tabulator .tabulator-header .tabulator-col:hover {
+	background-color: var(--fhc-secondary) !important;
+}
\ No newline at end of file
diff --git a/public/css/Cis4/CisVariablesCms.css b/public/css/Cis4/CisVariablesCms.css
new file mode 100644
index 000000000..a5e46a6f9
--- /dev/null
+++ b/public/css/Cis4/CisVariablesCms.css
@@ -0,0 +1,14 @@
+/* css overrides for dark mode */
+html.dark #fhc-cms-content *[style*="color"] {
+	color: var(--fhc-text) !important;
+}
+
+/* fhc cms classes */
+html.dark #fhc-cms-content a {
+	color: var(--fhc-link);
+}
+
+html.dark #fhc-cms-content img {
+	background-color: var(--fhc-text);
+	color: var(--fhc-background);
+}
\ No newline at end of file
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
index 13b90aac5..4151e7500 100644
--- a/public/css/Cis4/Cms.css
+++ b/public/css/Cis4/Cms.css
@@ -11,14 +11,14 @@
 	margin-inline-start: 0 !important;
 }
 #cms a.btn-outline-primary {
-	color: var(--fhc-cis-primary);
-	border-color: var(--fhc-cis-primary);
+	color: var(--fhc-primary);
+	border-color: var(--fhc-primary);
 }
 #cms a.btn-outline-primary:hover,
 #cms a.btn-outline-primary:focus {
 	color: #fff;
-	background-color: var(--fhc-cis-primary);
-	border-color: var(--fhc-cis-primary);
+	background-color: var(--fhc-primary);
+	border-color: var(--fhc-primary);
 }
 #cms a.btn-primary {
 	color: var(--fhc-cis-menu-lvl-1-color);
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 6e6a25200..c5368930d 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -10,7 +10,7 @@
   font-size: calc(1.325rem + .9vw);
 }
 .fhc-header > :first-child > small {
-  color: var(--bs-secondary);
+  color: var(--fhc-secondary);
   font-size: .65em;
   padding-inline-start: 1em;
 }
diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
index 6c33f63b8..5723de69e 100644
--- a/public/css/FilterWidget.css
+++ b/public/css/FilterWidget.css
@@ -1,8 +1,15 @@
+:root{
+	--filter-widget-border: var(--fhc-dark);
+	--filter-widget-color: var(--fhc-dark);
+	--filter-widget-primary: var(--fhc-primary);
+	--filter-widget-border-light: var(--fhc-border);
+}
+
 .filter-name-title {
 	font-family: inherit;
 	font-size: 16px;
 	line-height: 1.1;
-	color: black;
+	color: var(--filter-widget-color);
 }
 
 .panel-title {
@@ -26,7 +33,7 @@
 }
 
 .drag-and-drop-fields-span {
-	border: 1px solid black;
+	border: 1px solid var(--filter-widget-border);
 	border-radius: 7px;
 	margin-right: 6px;
 	margin-bottom: 10px;
@@ -64,7 +71,7 @@
 	right: 100%;
 	height: 100%;
 	margin-right: 3px;
-	border-left: 2px solid #428bca;
+	border-left: 2px solid var(--filter-widget-primary);
 }
 
 .selection-after::after {
@@ -74,7 +81,7 @@
 	left: 100%;
 	height: 100%;
 	margin-left: 3px;
-	border-right: 2px solid #428bca;
+	border-right: 2px solid var(--filter-widget-primary);
 }
 
 .applied-filter-operation {
@@ -139,10 +146,10 @@
 
 .up-down-border {
 	border-top-width: 1px;
-	border-top-color: #ddd;
+	border-top-color: var(--filter-widget-border-light);
 	border-top-style: solid;
 	border-bottom-width: 1px;
-	border-bottom-color: #ddd;
+	border-bottom-color: var(--filter-widget-border-light);
 	border-bottom-style: solid;
 }
 
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
index 50bfe561e..805987a84 100644
--- a/public/css/components/FilterComponent.css
+++ b/public/css/components/FilterComponent.css
@@ -1,3 +1,9 @@
+:root{
+	--fhc-filtercomponent-primary: var(--fhc-primary);
+	--fhc-filtercomponent-bg:var(--fhc-background);
+	--fhc-filtercomponent-border:var(--fhc-border);
+}
+
 .filter-header-title {
 	text-align: right;
 }
@@ -26,9 +32,9 @@
 	margin-left: 7px;
 	padding: 11px;
 	display: inline-block;
-	background-color: white;
+	background-color: var(--fhc-filtercomponent-bg);
 	border-style: solid;
-	border-color: black;
+	border-color: var(--fhc-filtercomponent-border);
 	border-width: 1px;
 	border-radius: 7px;
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -47,7 +53,7 @@
         right: 100%;
         height: 100%;
         margin-right: 3px;
-        border-left: 2px solid #428bca;
+        border-left: 2px solid var(--fhc-filtercomponent-primary);
 }
 
 .selection-after::after {
@@ -57,7 +63,7 @@
         left: 100%;
         height: 100%;
         margin-left: 3px;
-        border-right: 2px solid #428bca;
+        border-right: 2px solid var(--fhc-filtercomponent-primary);
 }
 
 .filter-table-dataset {
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index 6b3092b49..f41883265 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -8,11 +8,13 @@
   
   }
   
-  
+  a.form-underline-content{
+	color: var(--fhc-link);
+  }
   
   .form-underline .form-underline-content{
     border-width: 1px;
-    border-color: transparent transparent #dee2e6 transparent;
+    border-color: transparent transparent var(--fhc-border) transparent;
     border-style: solid;
     padding-bottom: 0.25rem;
     padding-left: 0.5rem;
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index 2ce544582..b7176fb35 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -1,4 +1,8 @@
+:root{
+	--myLv-disabled: var(--fhc-disabled);
+}
+
 .unavailable, .unavailable:hover{
-	color: #565e647f !important;
+	color: var(--myLv-disabled) !important;
 	cursor: default;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index 429a131b5..bf38d3d8c 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -1,13 +1,24 @@
 /*
  * Hederer
  */
+
+ :root{
+	--nav-component-bg: var(--fhc-secondary);
+	--nav-component-border: var(--fhc-border);
+	--nav-component-color: var(--fhc-text);
+	--nav-left-component-border: var(--fhc-border);
+	--nav-left-component-bg: var(--fhc-secondary);
+	--nav-left-component-color: var(--fhc-primary);
+	--nav-left-component-hover: var(--fhc-secondary-highlight);
+ }
+
 .navbar-header {
-	background-color: #f8f8f8;
+	background-color: var(--nav-component-bg);
 	padding-top: 0px;
 	padding-bottom: 0px;
 	padding-left: 10px;
 	border-style: solid;
-	border-color: #e7e7e7;
+	border-color: var(--nav-component-border);
 	border-width: 0 0 1px;
 }
 
@@ -15,7 +26,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 18px;
 	line-height: 1.42857143;
-	color: #5e5e5e !important;
+	color: var(--nav-component-color) !important;
 	padding-top: 15px !important;
 	padding-right: 7px !important;
 	padding-left: 7px !important;
@@ -34,8 +45,8 @@
 	z-index: 1;
 	position: absolute;
 	width: 250px;
-	border-right: 1px solid #e7e7e7;
-	background-color: #f8f8f8;
+	border-right: 1px solid ;
+	background-color:var(--nav-left-component-bg);
 }
 
 .navbar-left-side ul {
@@ -43,7 +54,7 @@
 }
 
 .navbar-left-side ul li {
-	border-bottom: 1px solid #e7e7e7;
+	border-bottom: 1px solid var(--nav-left-component-border);
 }
 
 .left-side-menu-second-level {
@@ -67,7 +78,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 14px;
 	line-height: 1.42857143;
-	color: #23527c;
+	color: var(--nav-left-component-color);
 	padding-top: 10px !important;
 	padding-bottom: 10px !important;
 	padding-left: 7px !important;
@@ -76,7 +87,7 @@
 }
 
 .left-side-menu-link-entry:hover {
-	background-color: #eee;
+	background-color: var(--nav-left-component-hover);
 }
 
 /*
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index aa9932cd7..de6adbee7 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,11 +1,14 @@
 
-
+:root{
+	--profil-border: var(--fhc-border);
+	--profil-tabulator-shadow:var(--fhc-shadow-20);
+}
 
 
 .image-lock{
   height:22px; 
   width:21px; 
-  background-color:white; 
+  background-color:var(--profil-border); 
   position:absolute;
   /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
@@ -18,7 +21,7 @@
 
 .tabulator-collapsed-row{
     padding:15px;
-    background-color: rgba(0,0,0,0.1);
+    background-color: var(--profil-tabulator-shadow);
 
 }
 
diff --git a/public/css/components/Sprachen.css b/public/css/components/Sprachen.css
index 73dfa563f..028b4f2f2 100644
--- a/public/css/components/Sprachen.css
+++ b/public/css/components/Sprachen.css
@@ -1,9 +1,13 @@
 .sprachen-entry{
-	background-color: var(--fhc-cis-primary-hover);
+	background-color: var(--fhc-primary);
+}
+
+.sprachen-entry:hover {
+	background-color: var(--fhc-primary);
 }
 
 [selected="true"].sprachen-entry {
-	background-color: var(--fhc-cis-primary);
+	background-color: var(--fhc-primary-highlight);
 }
 
 .sprachen-entry.btn {
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9edc1c0f2..10958f03f 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,14 +1,44 @@
 :root{
-	--fhc-calendar-pane-height: calc(100vh - 220px);
-	--fhc-calendar-past: #F5E9D7
+	--calendar-pane-height: calc(100vh - 220px);
+	
+	--calendar-primary: var(--fhc-primary);
+	--calendar-border: var(--fhc-border);
+	--calendar-border-highlight: var(--fhc-border-highlight);
+	--calendar-text: var(--fhc-text);
+	--calendar-text-light: var(--fhc-text);
+	--calendar-bg: var(--fhc-background);
+	--calendar-hour-indicator-bg: var(--fhc-background);
+	--calendar-week-page-header-background: var(--fhc-background);
+	--calendar-week-page-header-color: var(--fhc-text);
+	--calendar-week-page-header-border: var(--fhc-border);
+	--calendar-week-page-header-hover-background: var(--fhc-background-highlight);
+	--calendar-all-day-event-background: var(--fhc-background);
+	--calendar-past: var(--fhc-beige-10);
 }
 
-.fhc-calendar-week-page-header {
-  background-color: #e9ecef;
+:root.dark{
+	--calendar-past: var(--fhc-beige-20);
+}
+
+.fhc-calendar-hour-indicator{
+	border-top: 1px solid var(--calendar-border);
+}
+
+.fhc-calendar-hour-indicator span{
+	background-color: var(--calendar-hour-indicator-bg) !important;
+}
+
+.fhc-calendar-week-page-header{
+	color: var(--calendar-text);
+	background-color: var(--calendar-week-page-header-background);
+}
+
+.fhc-calendar-week-page-header > div {
+	border-right: 1px solid var(--calendar-border);
 }
 
 .fhc-calendar-week-page-header > div:hover{
-	background-color: #dddfe2;
+	background-color: var(--calendar-week-page-header-hover-background);
 }
 
 .fhc-calendar-months .col-4,
@@ -70,7 +100,7 @@
 }
 
 .fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 #dee2e6;
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 .fhc-calendar-week-page .all-day-event{
@@ -85,7 +115,7 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
-	background-color:white;
+	background-color:var(--calendar-all-day-event-background);
 }
 
 .fhc-calendar-week-page .all-day-event-container::before {
@@ -95,12 +125,12 @@
 	bottom: 0;
 	left: -3em;
 	right: 100%;
-	background-color: white;
-	box-shadow: 1px 1px 0 #dee2e6;
+	background-color: var(--calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px #dee2e6;
+	box-shadow: 0 0 0 1px var(--fhc-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -116,13 +146,13 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
-	background-color:white;
-	box-shadow: 1px 1px 0 #dee2e6;
+	background-color:var(--calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
-	box-shadow: 0 0 0 1px #dee2e6 !important;
+	box-shadow: 0 0 0 1px var(--calendar-border) !important;
 }
 
 .fhc-calendar-no-events-overlay{
@@ -137,7 +167,7 @@
 	margin:auto;
 	width: 100%;
 	height: 100%;
-	background-image: linear-gradient(120deg, white, gray );
+	background-image: linear-gradient(120deg, var(--fhc-background), var(--fhc-dark) );
 	opacity: .7;
 }
 .fhc-calendar-day-page {
@@ -150,9 +180,7 @@
 .fhc-calendar-day-page .flex-column > .flex-grow-1 {
   padding-left: 3em;
 }
-.fhc-calendar-day-page .flex-column {
-	border-right: 1px solid #dee2e6;
-}
+
 .fhc-calendar-day-page .events {
   display: grid;
   grid-template-columns: 3em 1fr;
@@ -164,11 +192,19 @@
   display: grid;
 }
 
+.fhc-calendar-month-page-day{
+	color: var(--calendar-text) !important;
+}
+
+.fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
+	color: var(--fhc-text) !important;
+}
+
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-lg .fhc-calendar-month-page-weekday,
 .fhc-calendar-md .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-weekday {
-  border: solid 1px #dee2e6;
+  border: solid 1px var(--calendar-border);
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
@@ -178,7 +214,7 @@
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day.active,
 .fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--bs-secondary);
+  border-color: var(--calendar-border-highlight);
 }
 /*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
 /*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
@@ -223,8 +259,8 @@
 }
 
 .fhc-calendar-month-page-weekday:hover {
-	background-color:#37789c;
-	color:white;
+	background-color:var(--calendar-primary);
+	color:var(--calendar-text-light);
 	
 }
 
@@ -237,14 +273,14 @@
 
 
 .fhc-calendar-past {
-	background-color: var(--fhc-calendar-past);
-	border-color: #E8E8E8;
+	background-color: var(--calendar-past);
+	border-color: var(--calendar-border);
 	opacity: 0.5;
 }
 
 .fhc-calendar-month-page-day-focusday {
-	border-color: black !important;
-	background-color: white;
+	border-color: var(--calendar-border-highlight) !important;
+	background-color: var(--calendar-bg);
 	position: relative;
 	animation: dash-animation 2.5s linear infinite;
 }
@@ -276,20 +312,20 @@
 	bottom:0;
 	left:0;
 	right:0;
-	box-shadow: inset 0 0 0 2px black !important;
+	box-shadow: inset 0 0 0 2px var(--calendar-border) !important;
 	pointer-events: none;
 	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: rgba(var(--bs-info-rgb), 0.25);
+  background-color: var(--calendar-primary);
   border-radius: 50%;
   font-weight: bold;
 }
 .fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: rgba(var(--bs-secondary-rgb), 0.25);
+  background-color: var(--calendar-primary);
   border-radius: 50%;
 }
 /*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
@@ -317,6 +353,57 @@
 }
 
 .selectedEvent {
-	background-color: #00649c !important;
-	color: white;
+	background-color: var(--calendar-primary) !important;
+	color: var(--calendar-text-light);
+}
+
+.fhc-calendar-day-page .curTimeIndicator{
+	position: absolute;
+	left: 0;
+	right: 0;
+	pointer-events: none;
+	padding-left: 7rem;
+	margin-top: -1px;
+	z-index: 2;
+	border-color: var(--calendar-border)!important;
+}
+
+.fhc-calendar-week-page .curTimeIndicator {
+	position: absolute;
+	left: 0;
+	right: 0;
+	pointer-events: none;
+	padding-left: 1rem;
+	margin-top: -1px;
+	z-index: 2;
+	border-color: var(--calendar-border) !important;
+}
+
+.fhc-calendar-week-page .past::before{
+	content:"";
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+}
+
+.fhc-calendar-week-page .overlay {
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
+}
+
+.fhc-calendar-day-page .overlay {
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
 }
\ No newline at end of file
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e742f7fa4..ef7b9caaa 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,6 +1,21 @@
 @import './calendar.css';
 @import './dashboard/news.css';
 
+:root{
+	--dashboard-danger: var(--fhc-danger);
+	--fhc-dashboard-grid-size: 4;
+}
+
+@media(max-width: 577px) {
+	:root {
+		--fhc-dashboard-grid-size: 1;
+	}
+}
+
+.core-dashboard a{
+	color: var(--fhc-link);
+}
+
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
@@ -16,18 +31,11 @@
 }
 
 .alert-danger .form-check-input:checked {
-	border-color: #842029;
-	background-color: #842029;
+	border-color: var(--dashboard-danger);
+	background-color: var(--dashboard-danger);
 }
 
-:root {
-	--fhc-dashboard-grid-size: 4;
-}
-@media(max-width: 577px) {
-	:root {
-		--fhc-dashboard-grid-size: 1;
-	}
-}
+
 
 .mirror-x {
 	transform: scaleX(-1);
@@ -40,5 +48,8 @@
 	cursor: move;
 }
 
+#deleteBookmark i{
+	color: var(--fhc-danger);
+}
 
 
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 58d9ad263..d65b51592 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -1,5 +1,10 @@
 :root{
     --news-widget-height: 1;
+	--news-widget-bg: var(--fhc-primary);
+	--news-widget-highlight-color: var(--fhc-primary-highlight);
+	--news-widget-border: var(--fhc-border);
+	--news-widget-border-highlight: var(--fhc-border-highlight);
+	--news-widget-text-light: var(--fhc-text);
 }
 
 
@@ -48,31 +53,26 @@
 
 .fhc-news-menu-item {
     padding: 0.375rem;
-    color: var(--fhc-cis-menu-lvl-1-color);
+    color: var(--news-widget-text-light);
     min-height: 5%;
     max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
-    background-color: #00649c;
-    border: 1px solid #f1f1f1;
+    background-color: var(--news-widget-bg);
+    border: 1px solid var(--news-widget-border);
     cursor: pointer;
     transition: background-color 0.2s ease, border-color 0.2s ease; /* Smooth transition */
 }
 
 .fhc-news-menu-item:hover {
-    background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
-    border-color: #f1f1f1;
-}
-
-.fhc-news-menu-item:active {
-    background-color: var(--fhc-cis-menu-lvl-1-color-hover);
-    border-color: #f1f1f1;
+    background-color: var(--news-widget-highlight-color);
+    border-color: var(--news-widget-border-highlight);
 }
 
 .fhc-news-menu-item.selected {
-    background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
-    border-right: 2px solid #fff;
+    background-color: var(--news-widget-highlight-color);
+    border: 2px solid var(--news-widget-border-highlight);
     
 }
 
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 3250a20c7..6aa84c716 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -5,28 +5,35 @@
 
 @import url(./switches.css);
 
-#search-filter{
-    border: 1px solid #ced4da;
+:root{
+	--searchbar-shadow: var(--fhc-shadow-40);
 }
 
-
 .searchbar_settings {
-    position: absolute; 
+	position: absolute; 
     z-index: 9999; 
-    background-color: #343a40;
+    background-color: var(--fhc-dark);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: #fff; 
-    border: 1px solid lightgrey;
+    background-color: var(--fhc-background); 
+    border: 1px solid var(--fhc-border);
     padding: .5rem;
     top: 100%;
     width: 100%;
     left: 0;
     right: 0;
-	box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
+	box-shadow: 2px 2px 4px var(--searchbar-shadow);
+}
+
+.searchbar_results a{
+	color: var(--fhc-link);
+}
+
+.searchbar_results a:not(a~i) {
+	color: inherit;
 }
 
 .searchbar_results_scroller {
@@ -35,7 +42,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid lightgrey;
+    border-bottom: 1px solid var(--fhc-border);
     margin-bottom: 1rem;
 }
 
diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css
index 164976514..64da02ce8 100644
--- a/public/css/components/searchbar/switches.css
+++ b/public/css/components/searchbar/switches.css
@@ -1,23 +1,24 @@
+:root{
+	--fhc-switches-checked-bg: var(--fhc-light);
+	--fhc-switches-unchecked-bg: var(--fhc-disabled);
+	--fhc-switches-shadow: var(--fhc-shadow-20);
+}
+
 .fhc-switches:checked  {
-    background-color: white !important;
-    border-color: white !important;
+    background-color: var(--fhc-switches-checked-bg) !important;
+    border-color: transparent;
     background-position: right center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23000000'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='black'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches  {
-    background-color: var(--bs-gray-600) !important;
-    border-color: var(--bs-gray-600) !important;
+    background-color: var(--fhc-switches-unchecked-bg) !important;
+    border-color: transparent;
     background-position: left center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%236b747a'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches:focus  {
-    box-shadow: 0 0 0 .25rem rgba(108, 117, 125,.25);
+    box-shadow: 0 0 0 .25rem var(--fhc-switches-shadow);
 }
 
-/*.form-switch .form-check-input:checked {
- 
-
-rgb(52, 58, 64)*/
-
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
index 8d8599ec4..1d5a56788 100644
--- a/public/css/components/verticalsplit.css
+++ b/public/css/components/verticalsplit.css
@@ -3,9 +3,9 @@
     Author     : bambi
 */
 :root {
-    --fhc-verticalsplit-vsplitter-bg-color: #eee;
-    --fhc-verticalsplit-vsplitter-border-color: #eee;
-    --fhc-verticalsplit-vsplitter-splitactions-color: #000;
+    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background);
+    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border);
+    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark);
 }
 
 .verticalsplitted {
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 50914aa1f..22e2641fe 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -24,46 +24,6 @@
     border-color: #DEE2E6 !important;
 }
 
-.bg-info-subtle{
-    background-color: #D9EDF7 !important; 
-    color: #31708F !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #BCE8F1 !important;
-}
-
-.bg-warning-subtle{
-    background-color: #FFF3CD !important; 
-    color: #664D03 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #FFE69C !important;
-}
-
-.bg-success-subtle{
-    background-color: #D1E7DD !important; 
-    color: #0A3622 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #A3CFBB !important;
-}
-
-.bg-danger-subtle{
-    background-color: #F8D7DA !important; 
-    color: #672B31 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #F1AEB5 !important;
-}
-
-.bg-primary-subtle{
-    background-color: #CFE2FF !important; 
-    color: #052C65 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #9EC5FE !important;
-}
-
 
 /* html attribute disabled and title don't work together, sets the pointer-event to auto in order to see the title toolip */
 .btn:disabled {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index b339c12fc..ece6141b8 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -136,13 +136,7 @@ export default {
 		},
 		overlayStyle() {
 			return {
-				'background-color': '#F5E9D7',
-				'position': 'absolute',
-				'pointer-events': 'none',
-				'z-index': 2,
 				height:  this.getDayTimePercent + '%',
-				opacity: 0.5,
-				overflow: 'hidden'
 			}
 		},
 		pageHeaderStyle() {
@@ -178,7 +172,7 @@ export default {
 				'padding-left': '3.5rem',
 				'margin-top': '-1px',
 				'z-index': 2,
-				'border-color': '#00649C!important',
+				'border-color': 'var(--fhc-border)',
 				top: this.hourPosition + 'px',
 				left: 0,
 				right: 0,
@@ -190,14 +184,7 @@ export default {
 		},
 		curIndicatorStyle() {
 			return {
-				'pointer-events': 'none',
-				'padding-left': '7rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': '#00649C!important',
 				top:  this.getDayTimePercent + '%',
-				left: 0,
-				right: 0,
 			}
 		},
 		noEventsCondition() {
@@ -280,8 +267,7 @@ export default {
 			}
 
 			if(this.date.compare(this.todayDate)) {
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = '#E8E8E8';
+				styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
 				// styleObj.opacity = 0.5; // would opaque the whole column
 			}
 
@@ -390,7 +376,7 @@ export default {
 	<div class="fhc-calendar-day-page h-100">
 		<div class="row m-0 h-100">
 			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
-				<div class="d-flex flex-column h-100">
+				<div class="d-flex flex-column h-100 border">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
 							<div class="fw-bold">{{dayText.tag}}</div>
@@ -432,16 +418,16 @@ export default {
 
 
 							<div >
-								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
+								<h1 v-if="noEventsCondition" class="m-0 bs-body" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
 								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
 									<Transition>
 										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-											<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+											<span class="border border-top-0 px-2">{{hourPositionTime}}</span>
 										</div>
 									</Transition>
 									<Transition>
-										<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
-											<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+										<div v-if="lookingAtToday && !noEventsCondition" class="curTimeIndicator border-top small"  :style="curIndicatorStyle">
+											<span class="border border-top-0 px-2">{{curTime}}</span>
 										</div>
 									</Transition>
 									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
@@ -450,7 +436,7 @@ export default {
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
 										
-										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
+										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast 
 											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden" >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 2cdf8b21d..3f9d9ad67 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -123,7 +123,7 @@ export default {
 			if(day.getDate() === this.todayDate.getDate() 
 				&& day.getMonth() === this.todayDate.getMonth() 
 				&& day.getFullYear() === this.todayDate.getFullYear()) {
-				styleObj['background-color'] = '#00649c'; // fh blau
+				styleObj['background-color'] = 'var(--fhc-primary)'; 
 				styleObj.color = 'white';
 			}
 			
@@ -137,8 +137,8 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
-		<div v-if="showWeeks" class=" bg-light fw-bold border-top border-bottom text-center"></div>
-		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
+		<div v-if="showWeeks" class=" fw-bold border-top border-bottom text-center"></div>
+		<div v-for="day in weeks[0].days" :key="day" class=" fw-bold border-top border-bottom text-center">
 			{{dayText[day]}}
 		</div>
 		<template v-for="week in weeks"
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 1fe82ff0e..b7705b1ed 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -63,6 +63,11 @@ export default {
 			const now = new Date();
 			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
 		},
+		curIndicatorStyle() {
+			return {
+				top: this.getDayTimePercent + '%',
+			}
+		},
 		pageHeaderStyle(){
 			return {
 				'z-index': 4,
@@ -74,27 +79,11 @@ export default {
 		},
 		overlayStyle() {
 			return {
-				'background-color': '#F5E9D7',
-				'position': 'absolute',
-				'pointer-events': 'none',
-				'z-index': 2,
 				height:  this.getDayTimePercent + '%',
 				width: this.laneWidth + 'px',
-				opacity: 0.5
-			}
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': '#00649C!important',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
 			}
 		},
+		
 		hours(){
 			// returns an array with elements starting at 7 and ending at 24
 			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
@@ -171,16 +160,16 @@ export default {
 				d.getDate() === this.todayDate.getDate()
 			)
 		},
-		curIndicatorStyle() {
-
+		indicatorStyle() {
 			return {
 				'pointer-events': 'none',
-				'padding-left': '1rem',
+				'padding-left': '3.5rem',
 				'margin-top': '-1px',
 				'z-index': 2,
-				'border-color': '#00649C!important',
-				top: this.getDayTimePercent + '%',
-				width: this.laneWidth + 'px'
+				'border-color': 'var(--fhc-border)',
+				top: this.hourPosition + 'px',
+				left: 0,
+				right: 0,
 			}
 		},
 		getDayTimePercent() {
@@ -211,14 +200,12 @@ export default {
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
 			if(day.isPast) {
-				styleObj['background-color'] = '#F5E9D7'
-				styleObj['border-color'] = '#E8E8E8';
-				styleObj.opacity = 0.5;
+				//styleObj['background-color'] = 'var(--calendar-past)'
+				styleObj['border-color'] = 'var(--fhc-border)';
 			} else if (day.isToday) {
 				
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = '#E8E8E8';
-				styleObj.opacity = 0.5;
+				//styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
+				styleObj['border-color'] = 'var(--fhc-border)';
 			}
 			
 			return styleObj
@@ -335,7 +322,7 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="page" class="fhc-calendar-week-page" style="min-width: 700px;">
-		<div class="d-flex flex-column">
+	<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
 					<div class="fw-bold">{{dayText[day]?.tag}}</div>
@@ -357,7 +344,7 @@ export default {
 								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
 								v-contrast
-								>		
+								>
 								<slot class="p-1" name="weekPage" :event="event" :day="day">
 									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 								</slot>
@@ -366,22 +353,22 @@ export default {
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour" class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 					<Transition>
-						<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
-							<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+						<div v-if="hourPosition" class="fhc-calendar-hour-indicator position-absolute small" :style="indicatorStyle" >
+							<span class=" border border-top-0 px-2 ">{{hourPositionTime}}</span>
 						</div>
 					</Transition>
 					<div class="hours">
 						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
-							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
-								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+							<div v-if="day.isToday" class="border-top small curTimeIndicator" :style="curIndicatorStyle">
+								<span class="fhc-body-bg border border-top-0 px-2">{{curTime}}</span>
 							</div>
 						</Transition>
-						<div v-if="day.isToday" :style="overlayStyle"></div>
+						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
 						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)" 
 						:selected="event.orig == selectedEvent"
 						:style="eventGridStyle(day,event)"
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index d657322ba..90fb095f0 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -88,7 +88,9 @@ export default {
 	},
 	template: /*html*/ `
     <!-- div that contains the content -->
-    <component ref="content" :is="computeContentType" v-if="content" :content="content" :content_id="content_id_internal" />
+	<div id="fhc-cms-content" v-if="content">
+    	<component ref="content" :is="computeContentType" :content="content" :content_id="content_id_internal" />
+	</div>
     <p v-else>No content is available to display</p>
     `,
 };
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 692843e3e..85716ef43 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -85,26 +85,36 @@ export default {
                 .then(() => {
                   Axios.get(el.href)
                     .then((res) => {
-                      // TODO(chris): check for success then show message and/or reload
-                      location = location;
+                    	// TODO(chris): check for success then show message and/or reload
+                    	location = location;
                     })
                     .catch((err) => console.error("ERROR:", err));
                 })
                 .catch(() => {});
             });
           });
-          document.querySelectorAll("#cms [data-href]").forEach((el) => {
+        document.querySelectorAll("#cms [data-href]").forEach((el) => {
             el.href = el.dataset.href.replace(
-              /^ROOT\//,
-              FHC_JS_DATA_STORAGE_OBJECT.app_root
+            	/^ROOT\//,
+            	FHC_JS_DATA_STORAGE_OBJECT.app_root
             );
-          });
+        });
 			
-			document.querySelectorAll("[href]").forEach((element) => {
-				let orignal_href = element.getAttribute("href");
-				let new_href = replaceRelativeLegacyLink(orignal_href);
-				element.href = new_href;
-			});
+		document.querySelectorAll("[href]").forEach((element) => {
+			let orignal_href = element.getAttribute("href");
+			let new_href = replaceRelativeLegacyLink(orignal_href);
+			element.href = new_href;
+		});
+
+		document.querySelectorAll("[style*=background-color]").forEach((element) => {
+			if (element.style.backgroundColor == "rgb(255, 255, 255)"){
+				element.style.backgroundColor = "var(--fhc-background)";
+			}
+			if(element.querySelector("*[style*=background-color]")){
+				element.style.backgroundColor = "var(--fhc-secondary)";
+			}
+		});
+
     },
     template: /*html*/ `
       <!-- div that contains the content -->
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 1567cbef4..81d26e6c5 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -80,7 +80,7 @@ export default {
 	<hr/>
 	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
 	</pagination>
-	<div class="container-fluid">
+	<div class="container-fluid mt-4">
 		<div class="row">
 			<div class="col" v-html="content">
 			</div>
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 30e6ecb6a..c984b46eb 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -26,7 +26,7 @@ components:{
 	StudiengangVertretung,
 },
 template:/*html*/`
-
+		<div id="fhc-studiengang-informationen">
 		<template v-if="studiengang?.bezeichnung && semester">
 			<div class="card card-body mb-3">
 				<div class="mb-1">
@@ -35,7 +35,7 @@ template:/*html*/`
 				</div>
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">Moodle:</h2>
-					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
+					<a class="fhc-link-color mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
 				</div>
 				<div :class="{'mb-1':studiengang?.zusatzinfo_html}">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiensemester')}}: </h2>
@@ -72,6 +72,7 @@ template:/*html*/`
 		<template v-if="jahrgangsvertr && Array.isArray(jahrgangsvertr) && jahrgangsvertr.length >0">
 			<studiengang-vertretung :title="$p.t('studiengangInformation', 'Jahrgangsvertretung')" :vertretungsList="jahrgangsvertr"></studiengang-vertretung>
 		</template>
+		</div>
 	
 `,
 computed:{
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 10e74ef84..3b9481013 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -20,16 +20,16 @@ export default {
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
 		<div class="card-body">
-			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square" style="color:#00649C"></i></a></h6>
+			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
 		</div>
 		<hr class="my-0">
 		<div class="card-body">
-			
+
 			<div class="flex flex-column gap-3">
 			<div class="mb-3">
 				<span>
 					<i class="fa fa-phone me-2"></i>
-					<a :href="phone.link">{{phone.number}}</a>
+					<a class="fhc-link-color" :href="phone.link">{{phone.number}}</a>
 				</span>
 			</div>
 			<div class="mb-3">
@@ -41,7 +41,7 @@ export default {
 			<div>
 				<span>
 					<i class="fa-regular fa-envelope me-2"></i>
-					<a :href="email_link" v-html="formattedEmail"></a>
+					<a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a>
 				</span>
 			</div>
 			
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index abb476c19..142050e9e 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -12,7 +12,7 @@ export default {
 		<div class="card-body">
 			<p v-for="vertretung in vertretungsList">
 				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)">
-					<i class="me-2 fa fa-arrow-up-right-from-square" style="color:#00649C"></i>
+					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i>
 				</a>
 				{{vertretungFormatedName(vertretung,false)}}
 			</p>
diff --git a/public/js/components/Cis/DarkTheme.js b/public/js/components/Cis/DarkTheme.js
new file mode 100644
index 000000000..2d3192b6d
--- /dev/null
+++ b/public/js/components/Cis/DarkTheme.js
@@ -0,0 +1,51 @@
+export default {
+	data:()=>{
+		return{
+			theme:'light',
+			themes:['light','dark','purple'],
+		}
+	},
+	methods:{
+		toggleTheme(theme){
+			if(!theme) return;
+
+			for(const theme of this.themes){
+				document.documentElement.classList.remove(theme);
+			}
+			document.documentElement.classList.add(theme);
+
+			document.body.setAttribute("data-bs-theme", theme);
+
+			let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
+			if(theme =="dark"){
+				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
+			}else if(theme =="light"){
+				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+			} 
+
+			localStorage.setItem("theme",theme);
+			this.theme = theme;
+		}
+	},
+	computed:{
+		nextTheme(){
+			return this.themes[(this.themes.indexOf(this.theme) + 1) % this.themes.length];
+		},
+	},
+	mounted(){
+		const theme =localStorage.getItem("theme");
+		if(this.themes.includes(theme)){
+			this.theme = theme;
+		}
+		this.toggleTheme(this.theme);
+
+	},
+	template:/*html*/`
+
+	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-moon fhc-text"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-sun fhc-text"></i>
+		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
+	</button>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index ebab00109..08934cc78 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -1,12 +1,14 @@
 import CisMenuEntry from "./Menu/Entry.js";
 import FhcSearchbar from "../searchbar/searchbar.js";
 import CisSprachen from "./Sprachen.js"
+import DarkTheme from "./DarkTheme.js";
 
 export default {
     components: {
         CisMenuEntry,
         FhcSearchbar,
 		CisSprachen,
+		DarkTheme,
     },
     props: {
 		rootUrl: String,
@@ -103,10 +105,15 @@ export default {
 	<button id="nav-main-btn" class="navbar-toggler rounded-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
-	<fhc-searchbar ref="searchbar" id="nav-search" style="background-color:var(--fhc-cis-primary)" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
-    <a id="nav-logo" class="d-none d-lg-block" :href="rootUrl">
-        <img :src="logoUrl" alt="Logo">
-    </a>
+	<fhc-searchbar ref="searchbar" id="nav-search" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+    <div id="nav-logo" class="d-none d-lg-block">
+		<div class="d-flex h-100">
+			<a :href="rootUrl">
+				<img :src="logoUrl" alt="Logo">
+			</a>
+			<dark-theme></dark-theme>
+		</div>
+    </div>
 	<div id="nav-user">
 		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
 			<img :src="avatarUrl" class="bg-dark avatar rounded-circle border border-dark"/>
@@ -115,19 +122,19 @@ export default {
 		@[\`shown.bs.collapse\`]="handleShowNavUser"
 		@[\`hide.bs.collapse\`]="handleHideNavUser"
 		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-			<li class="btn-level-2"><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li class="btn-level-2">
+			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+			<li >
 				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
 			</li>
-			<li class="btn-level-2"><hr class="dropdown-divider m-0 "></li>
-			<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+			<li><hr class="dropdown-divider m-0 "></li>
+			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
 		</ul>
 	</div>
-    <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+    <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
-			<div id="nav-main-toggle" class="position-static d-none d-lg-block bg-dark">
-				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
-					<i class="fa fa-arrow-circle-left"></i>
+			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">
+				<button type="button" class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
+					<i class="fa fa-arrow-circle-left fhc-text"></i>
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..f8ef0dd70 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -115,7 +115,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -135,7 +135,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index fc6a3a723..d554b0e95 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -63,7 +63,7 @@ export default {
 				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
 					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }"  role="button" :href="c4_link(menuItem)"
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
-					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 8a7354305..379f60498 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -219,25 +219,25 @@ const RoomInformation = {
 				</span>
 			</template>
 			<template #weekPage="{event,day}">
-				<div @click="showModal(event?.orig)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event?.topic}}</span>
+					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event?.ort_kurzbz}}</span>
 				</div>
 			</template>
 			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.orig.topic}}</p>
+						<p class="m-0">{{event?.topic}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+						<p class="m-0">{{event?.ort_kurzbz}}</p>
 					</div>
 				</div>
 			</template>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index c0129d1d1..cb05e7fe4 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -48,11 +48,11 @@ export default {
 			// returns a suitable color for the given grade
 			if (this.positiv)
 			{
-				return 'var(--fhc-cis-grade-positive)';
+				return 'var(--fhc-success)';
 			}
 			else
 			{
-				return 'var(--fhc-cis-grade-negative)';
+				return 'var(--fhc-danger)';
 			}
 		},
 		is_organisatorische_einheit(){
@@ -179,9 +179,9 @@ export default {
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
 							<a
-							class="text-decoration-none text-truncate"
+							class="fhc-body text-decoration-none text-truncate"
 							:id="'moodle_links_'+lehrveranstaltung_id"
-							:class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
+							:class="{ 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 2c0f7f044..9e0eb4a0c 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -114,7 +114,7 @@ export default {
 							<td>
 								<ul v-if="lektorNames.length" class="list-unstyled mb-0">
 									<li v-for="name in new Set(lektorNames)" :key="name">
-									<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 										{{name}}
 									</li>
 								</ul>
@@ -128,7 +128,7 @@ export default {
 							<td>
 								<ul class="list-unstyled mb-0">
 									<li v-for="name in lvLeitung" :key="name">
-										<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+										<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 										{{name}}
 									</li>
 								</ul>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 996cdfb87..5ba2f1fe7 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -19,7 +19,7 @@ export default {
     
         <!-- column 1 in the address row -->
         <div class="col-1 text-center">
-            <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+            <i class="fa fa-location-dot fa-lg fhc-link-color" ></i>
         </div>
         
         <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 4c7411cdf..e75696a4d 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -174,9 +174,9 @@ export default {
                                         <div  class="align-middle text-center"><i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i></div>
                                     </template>
                                     <template v-else >
-                                        <div class="align-middle text-center" ><i style="color:#00639c" @click="showEditProfilModal(item)" role="button" class="fa fa-edit"></i></div>
+                                        <div class="align-middle text-center" ><i  @click="showEditProfilModal(item)" role="button" class="fa fa-edit fhc-primary-color"></i></div>
                                     </template>
-                                    <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
+                                    <div class="align-middle text-center"><i role="button" @click="deleteRequest(item)" class="text-danger fa fa-trash"></i></div>
                                 </div>
                             </td>
                         </template>          
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 704e5a1ef..3d703f6b6 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -14,7 +14,7 @@ export default{
     template:/*html*/`
     <div class="gy-2 row align-items-center justify-content-center">
         <div class="col-1 text-center" >
-            <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+            <i class="fa-solid fhc-link-color" :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" ></i>
         </div>
         <div :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
             <!-- rendering KONTAKT emails -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 82b0aad57..cf2bc22e3 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -20,10 +20,10 @@ export default {
                 <div class="col-12 ">
                     <div class="row">  
                         <div class="col-1 ">
-                            <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                            <i class="fa-solid fa-envelope fhc-link-color" ></i>
                         </div>
                         <div class="col">
-                            <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                            <a class="fhc-link-color" :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                         </div>
                     </div>
                 </div> 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 43ef807ba..1342aed8e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -22,7 +22,7 @@ export default {
             <div v-for="email in data" class="col-12 ">
                 <div class="row align-items-center">
                     <div class="col-1 text-center">
-                        <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+                        <i class="fa-solid fa-envelope fhc-link-color" ></i>
                     </div>
                     <div class="col-11">
                         <div class="form-underline">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index e49fa624a..2e2ec0c6e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -49,7 +49,7 @@ export default {
 						<span v-else-if="key == 'semester' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
@@ -57,7 +57,7 @@ export default {
 						<span v-else-if="key =='verband' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
@@ -65,7 +65,7 @@ export default {
 						<span v-else-if="key == 'gruppe' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index c30f1ab89..05e08cefe 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -248,7 +248,7 @@ export default {
                 this.profilUpdateStates["Pending"];
 
               let html = `<div class="d-flex justify-content-evenly align-items-center">
-                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye" style="color: #0d6efd;"></i></button>
+                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye fhc-primary-color"></i></button>
                 ${
                   STATUS_PENDING ?
                   `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a86c3825b..94507fa73 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -76,7 +76,7 @@ export default {
 			const val = cell.getValue()
 			if(val) {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a></div>'
+				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a></div>'
 			} else {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'-</div>'
diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js
index fd53d06db..d5e2f827a 100644
--- a/public/js/components/Cis/Sprachen.js
+++ b/public/js/components/Cis/Sprachen.js
@@ -23,7 +23,7 @@ export default {
 	template:/*html*/`
 	<div class="container">
 		<div class="row justify-content-center align-items-center flex-nowrap overflow-hidden">
-			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col text-white sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
+			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 925942079..e611af5db 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -191,7 +191,7 @@ export default {
 					</div>
 				</div>
 				<div class="col">
-					<button class="btn btn-light w-100" @click="filter = ''">
+					<button class="btn fhc-tertiary w-100" @click="filter = ''">
 						<small :class="{'fw-bold':filter===''}">{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small>
 					</button>
 				</div>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 437f6a17f..42f8dfa0e 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -187,8 +187,8 @@ export default {
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>
 					<template v-else-if="allEventsGrouped.size" v-for="([key, value], index) in allEventsGrouped" :key="index" style="margin-top: 8px;">
-						<div class="card-header d-grid p-0">
-							<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
+						<div class=" card-header d-grid p-0">
+							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
 							<template v-if="evt.type=='moodle'">
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 7f836bf1c..2910f08d9 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -175,8 +175,8 @@ export default {
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
-								<i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
+							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+								<i class="fa fa-regular fa-trash-can"></i>
 							</a>
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..fa17bc8a2 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -33,14 +33,14 @@ export default {
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
 		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-			<div ref="searchbox" class="h-100 input-group me-2 bg-white">
-				<span style="background-color:inherit" class="input-group-text">
+			<div ref="searchbox" class="h-100 input-group me-2">
+				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
                 <input @keyup="this.search" @focus="this.showsearchresult"
                     v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
             </div>
 
             <div v-show="this.showresult"
diff --git a/public/js/helpers/ColorThemeSetting.js b/public/js/helpers/ColorThemeSetting.js
new file mode 100644
index 000000000..fb3c94b8e
--- /dev/null
+++ b/public/js/helpers/ColorThemeSetting.js
@@ -0,0 +1,5 @@
+let theme = localStorage.getItem("theme");
+if (theme == 'dark') {
+	document.body.setAttribute("data-bs-theme", theme); 
+	document.documentElement.classList.add('dark');
+}
\ No newline at end of file

From 7936e08d3d8515861720bfe0cdc92bff23882bfe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Mar 2025 12:49:29 +0100
Subject: [PATCH 0105/1357] refactor(Dasboard Item): adds container for actions
 events from Dashboard widgets

---
 public/js/components/Dashboard/Item.js        | 22 +++++++++++++++----
 public/js/components/Dashboard/Section.js     |  1 +
 .../js/components/DashboardWidget/Abstract.js |  6 ++++-
 public/js/components/DashboardWidget/Url.js   | 17 +++++++++-----
 public/js/components/Drop/Grid.js             |  4 ++--
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 379437b74..1ff6a4516 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -27,6 +27,7 @@ export default {
 		"configClosed"
 	],
 	props: [
+		"index",
 		"id",
 		"config",
 		"width",
@@ -44,6 +45,15 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
+		widget_action_identifier(){
+			return `${this.widget.widget_kurzbz}-${this.index}-action-section`;
+		},
+		widgetInformation(){
+			return { 
+				action_section_identifier: this.widget_action_identifier,
+				widget_kurzbz: this.widget.widget_kurzbz,
+			}
+		}
 	},
 	methods: {
 		getWidgetC4Link(widget) {
@@ -120,14 +130,18 @@ export default {
 		</div>
 	</div>
 	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
-		<div v-if="widget" class="card-header d-flex ps-0 pe-2">
+		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
-			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="ms-auto mb-2">
+			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
+
+			<!-- container for widget specific actions -->
+			<div :id="widget_action_identifier"></div>
+
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
@@ -139,7 +153,7 @@ export default {
 			</Transition>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
@@ -147,7 +161,7 @@ export default {
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
 			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index ab931543d..387edf04e 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -199,6 +199,7 @@ export default {
 			<template #default="item">
 				
 				<dashboard-item v-if="!item.placeholder"
+					:index="item.index"
 					:id="item.widget"
 					:width="item.w"
 					:height="item.h"
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index d459abc0b..50f63cf74 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -4,7 +4,8 @@ export default {
 		"width",
 		"height",
 		"configMode",
-		"sharedData"
+		"sharedData",
+		"widgetInfo"
 	],
 	emits: [
 		"setConfig",
@@ -24,6 +25,9 @@ export default {
 			set(value) {
 				this.$emit('update:sharedData', value);
 			}
+		},
+		widget_action_css_identifier(){
+			return `#${this.widgetInfo.action_section_identifier}`;
 		}
 	},
 	methods: {
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 7f836bf1c..b962d156d 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -159,9 +159,14 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
-            <template v-if="shared">
+			<Teleport :to="widget_action_css_identifier">
+				<button v-show="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+					<i class="fa-solid fa-plus"></i>
+				</button>
+			</Teleport>
+
+			<template v-if="shared">
 
                 <template v-if="!emptyBookmarks">
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
@@ -171,11 +176,11 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="openEditModal(link)" >
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="removeLink(link.bookmark_id)" >
 								<i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
 							</a>
 						</div>
@@ -196,7 +201,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="editForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -214,7 +219,7 @@ export default {
 	</core-form>
 
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="createForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="createForm">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 0381352d4..d3ea29355 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -359,7 +359,7 @@ export default {
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item
-				v-for="item in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
@@ -378,7 +378,7 @@ export default {
 					paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 				}">
 				<template v-slot="item">
-					<slot v-bind="{...item, ...item.data}" :x="item.x" :y="item.y" ></slot>
+					<slot v-bind="{...item, ...item.data, index:index}" :x="item.x" :y="item.y" ></slot>
 				</template>
 			</grid-item>
 		</TransitionGroup>

From 0735c61361c666b9311ed47441c25c82ce8724ac Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 08:53:15 +0100
Subject: [PATCH 0106/1357] update(UrlWidget addUrl Action):adds the transition
 animation to the action button of the url widget

---
 public/js/components/DashboardWidget/Url.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b962d156d..c0f05257e 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,9 +161,11 @@ export default {
         <div class="d-flex flex-column justify-content-between">
 
 			<Teleport :to="widget_action_css_identifier">
-				<button v-show="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
-					<i class="fa-solid fa-plus"></i>
-				</button>
+				<Transition>
+					<button v-if="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+						<i class="fa-solid fa-plus"></i>
+					</button>
+				</Transition>
 			</Teleport>
 
 			<template v-if="shared">

From ff311ddaa80bb04464fcc4de13af2d89c1fc1d00 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 09:34:52 +0100
Subject: [PATCH 0107/1357] fix(News widget autoscroll): removes the ride
 attribute from the bootstrap carousel to remove the autoscrolling of the news
 widget

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

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index b7bd2f367..5a7e910ea 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -195,7 +195,7 @@ export default {
 			</div>
 			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
-					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-ride="carousel" data-bs-interval="false">
+					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
 							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item " style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>

From 80c326360f31a2769a9d0f9ebba4df12e2ca191d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 11:59:03 +0100
Subject: [PATCH 0108/1357] update(FHC Color Themes): makes the css variables
 and color modes configurable through the config for different fh's

---
 application/config/theme.php                  | 10 +++++
 application/helpers/hlp_header_helper.php     |  5 +++
 application/views/templates/CISVUE-Header.php |  4 +-
 public/css/Cis4/Cis.css                       |  1 -
 .../CisVariables.css => theme/default.css}    | 40 +++++++++----------
 .../default_cms_fixes.css}                    |  0
 public/js/components/Cis/Menu.js              |  4 +-
 .../Cis/{DarkTheme.js => ThemeSwitch.js}      |  8 +++-
 8 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 application/config/theme.php
 rename public/css/{Cis4/CisVariables.css => theme/default.css} (93%)
 rename public/css/{Cis4/CisVariablesCms.css => theme/default_cms_fixes.css} (100%)
 rename public/js/components/Cis/{DarkTheme.js => ThemeSwitch.js} (85%)

diff --git a/application/config/theme.php b/application/config/theme.php
new file mode 100644
index 000000000..f16482bea
--- /dev/null
+++ b/application/config/theme.php
@@ -0,0 +1,10 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// changing the color theme
+
+$config['theme_name']='default';
+$config['theme_css']= "public/css/theme/default.css";
+$config['theme_modes']=['light','dark'];
\ No newline at end of file
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index af8a32807..73a91594f 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -88,6 +88,7 @@ function generateCSSsInclude($CSSs)
 function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 {
 	$ci =& get_instance();
+	$ci->load->config('theme');
 	$ci->load->model('system/Sprache_model','SpracheModel');
 	$server_language = getData($ci->SpracheModel->loadWhere(['content' => true]));
 	$server_language = array_map(function($language){
@@ -103,6 +104,10 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'server_languages' => $server_language,
 		'user_language' => $user_language,
 		'timezone' => date_default_timezone_get(),
+		'theme' => [
+			'name'=>$ci->config->item('theme_name'),
+			'modes'=>$ci->config->item('theme_modes'),
+		]
 	);
 
 	$toPrint = "\n";
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 86b5b8755..2f7a3877c 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -1,4 +1,5 @@
 <?php
+$this->load->config('theme');
 $includesArray = array(
 	'title' => $title ?? 'FH-Complete',
 	'vue3' => true,
@@ -10,7 +11,8 @@ $includesArray = array(
 		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
+		'public/css/Cis4/Cis.css',
+		$this->config->item('theme_css'),
 	], $customCSSs ?? [])
 );
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8602def32..8010d0746 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,5 +1,4 @@
 /* basic */
-@import './CisVariables.css';
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
 
diff --git a/public/css/Cis4/CisVariables.css b/public/css/theme/default.css
similarity index 93%
rename from public/css/Cis4/CisVariables.css
rename to public/css/theme/default.css
index 53af08837..2d94847ee 100644
--- a/public/css/Cis4/CisVariables.css
+++ b/public/css/theme/default.css
@@ -1,10 +1,10 @@
 /* css overrides for static cms content */
-@import './CisVariablesCms.css';
+@import './default_cms_fixes.css';
 
 /* colors */
 :root {
 
-	--fhc-black-10:black;
+	--fhc-black-10: black;
 	--fhc-black-20: #1d2024;
 	--fhc-black-30: #212529;
 	--fhc-black-40: #292b2a;
@@ -13,14 +13,14 @@
 	--fhc-black-70: #343a40;
 
 	--fhc-white-10: #FFFFFF;
-	--fhc-white-20:#f6f6f6;
-	--fhc-white-30:#eceff1;
-	--fhc-white-40:#e9ecef;
-	--fhc-white-50:#dee2e6;
-	--fhc-white-60:#d5dae0;
-	--fhc-white-70:#ced4da;
-	--fhc-white-80:#c7cbcf;
-	--fhc-white-90:#aeb3b8;
+	--fhc-white-20: #f6f6f6;
+	--fhc-white-30: #eceff1;
+	--fhc-white-40: #e9ecef;
+	--fhc-white-50: #dee2e6;
+	--fhc-white-60: #d5dae0;
+	--fhc-white-70: #ced4da;
+	--fhc-white-80: #c7cbcf;
+	--fhc-white-90: #aeb3b8;
 
 	--fhc-gray-10: #858f97;
 	--fhc-gray-20: #72777A;
@@ -40,18 +40,18 @@
 
 	--fhc-red-10: #842029;
 	--fhc-red-20: #800000;
-	
+
 	--fhc-green-10: #008000;
 
-	--fhc-beige-10: rgba(245, 233, 215,0.5);
-	--fhc-beige-20: rgba(172, 153, 125,0.5);
-	
-	
+	--fhc-beige-10: rgba(245, 233, 215, 0.5);
+	--fhc-beige-20: rgba(172, 153, 125, 0.5);
+
+
 
 }
 
-:root.light{
-	
+:root.light {
+
 
 	/* fhc base colors */
 	--fhc-primary: var(--fhc-blue-20);
@@ -72,10 +72,10 @@
 	/*background*/
 	--fhc-background: var(--fhc-white-10);
 	--fhc-background-highlight: var(--fhc-white-60);
-	
+
 	/*text*/
 	--fhc-text: var(--fhc-black-30);
-	
+
 	/* shadows and borders */
 	--fhc-shadow-20: rgba(0, 0, 0, 0.2);
 	--fhc-shadow-40: rgba(0, 0, 0, 0.4);
@@ -100,7 +100,7 @@
 
 }
 
-:root.dark{
+:root.dark {
 
 	/* fhc base colors */
 	--fhc-primary: var(--fhc-blue-primary-highlight);
diff --git a/public/css/Cis4/CisVariablesCms.css b/public/css/theme/default_cms_fixes.css
similarity index 100%
rename from public/css/Cis4/CisVariablesCms.css
rename to public/css/theme/default_cms_fixes.css
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 08934cc78..aa2fc3411 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -1,14 +1,14 @@
 import CisMenuEntry from "./Menu/Entry.js";
 import FhcSearchbar from "../searchbar/searchbar.js";
 import CisSprachen from "./Sprachen.js"
-import DarkTheme from "./DarkTheme.js";
+import ThemeSwitch from "./ThemeSwitch.js";
 
 export default {
     components: {
         CisMenuEntry,
         FhcSearchbar,
 		CisSprachen,
-		DarkTheme,
+		ThemeSwitch,
     },
     props: {
 		rootUrl: String,
diff --git a/public/js/components/Cis/DarkTheme.js b/public/js/components/Cis/ThemeSwitch.js
similarity index 85%
rename from public/js/components/Cis/DarkTheme.js
rename to public/js/components/Cis/ThemeSwitch.js
index 2d3192b6d..445e71cf0 100644
--- a/public/js/components/Cis/DarkTheme.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -1,8 +1,9 @@
 export default {
 	data:()=>{
 		return{
-			theme:'light',
-			themes:['light','dark','purple'],
+			theme: FHC_JS_DATA_STORAGE_OBJECT.theme.modes[0],
+			theme_name: FHC_JS_DATA_STORAGE_OBJECT.theme.name,
+			themes: FHC_JS_DATA_STORAGE_OBJECT.theme.modes,
 		}
 	},
 	methods:{
@@ -40,6 +41,9 @@ export default {
 		this.toggleTheme(this.theme);
 
 	},
+	created(){
+		document.documentElement.classList.add(this.theme_name);	
+	},
 	template:/*html*/`
 
 	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">

From 5d39d5ec466292cff27dd8a05f7655d6821c6914 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 14:29:21 +0100
Subject: [PATCH 0109/1357] feature(FHC Theme plugin): adds a plugin that
 provides functionality and information of the current theme

---
 public/js/apps/Cis.js                   |  2 +
 public/js/apps/Dashboard/Fhc.js         |  2 +
 public/js/components/Cis/Menu.js        |  2 +-
 public/js/components/Cis/ThemeSwitch.js | 47 ++++++-----------------
 public/js/plugin/Theme.js               | 51 +++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 public/js/plugin/Theme.js

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index bb4b76ca4..c2c733b14 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -2,6 +2,7 @@ import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
 import FhcApi from '../plugin/FhcApi.js';
 import Phrasen from '../plugin/Phrasen.js';
+import Theme from "../plugin/Theme.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 Vue.$fhcapi = fhcapifactory;
 
@@ -124,4 +125,5 @@ app.use(primevue.config.default, {
 	}
 })
 app.use(Phrasen);
+app.use(Theme);
 app.mount('#cis-header');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 137d1d008..00357fb2e 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,7 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
+import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
@@ -273,5 +274,6 @@ app.use(primevue.config.default, {
 	}
 })
 app.use(Phrasen);
+app.use(Theme);
 app.directive('contrast', contrast);
 app.mount('#fhccontent');
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index aa2fc3411..73ec181a4 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -111,7 +111,7 @@ export default {
 			<a :href="rootUrl">
 				<img :src="logoUrl" alt="Logo">
 			</a>
-			<dark-theme></dark-theme>
+			<theme-switch></theme-switch>
 		</div>
     </div>
 	<div id="nav-user">
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index 445e71cf0..7f560376e 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -1,54 +1,31 @@
 export default {
 	data:()=>{
 		return{
-			theme: FHC_JS_DATA_STORAGE_OBJECT.theme.modes[0],
-			theme_name: FHC_JS_DATA_STORAGE_OBJECT.theme.name,
-			themes: FHC_JS_DATA_STORAGE_OBJECT.theme.modes,
+			theme: null,
 		}
 	},
 	methods:{
-		toggleTheme(theme){
-			if(!theme) return;
-
-			for(const theme of this.themes){
-				document.documentElement.classList.remove(theme);
-			}
-			document.documentElement.classList.add(theme);
-
-			document.body.setAttribute("data-bs-theme", theme);
-
-			let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
-			if(theme =="dark"){
-				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
-			}else if(theme =="light"){
-				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
-			} 
-
-			localStorage.setItem("theme",theme);
-			this.theme = theme;
+		switchTheme(nextTheme){
+			this.theme = nextTheme;
+			this.$theme.switchTheme(this.theme);
 		}
 	},
 	computed:{
 		nextTheme(){
-			return this.themes[(this.themes.indexOf(this.theme) + 1) % this.themes.length];
+			return this.$theme.theme_modes[(this.$theme.theme_modes.indexOf(this.theme) + 1) % this.$theme.theme_modes.length];
 		},
 	},
-	mounted(){
-		const theme =localStorage.getItem("theme");
-		if(this.themes.includes(theme)){
-			this.theme = theme;
-		}
-		this.toggleTheme(this.theme);
-
-	},
 	created(){
-		document.documentElement.classList.add(this.theme_name);	
+		this.theme = localStorage.getItem('theme');
+		if (!this.theme || !this.$theme.theme_modes.includes(this.theme)) {
+			this.theme = this.$theme.theme_modes[0];
+		}
 	},
 	template:/*html*/`
 
-	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-moon fhc-text"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-sun fhc-text"></i>
+	<button @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text"></i>
 		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
 	</button>
 	`
diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
new file mode 100644
index 000000000..29ae4c4a4
--- /dev/null
+++ b/public/js/plugin/Theme.js
@@ -0,0 +1,51 @@
+const theme_name= FHC_JS_DATA_STORAGE_OBJECT.theme.name;
+const theme_modes = FHC_JS_DATA_STORAGE_OBJECT.theme.modes;
+
+const toggleTheme = (theme)=>{
+	if (!theme) return;
+
+	for (const theme of theme_modes) {
+		document.documentElement.classList.remove(theme);
+	}
+	document.documentElement.classList.add(theme);
+
+	document.body.setAttribute("data-bs-theme", theme);
+
+	let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
+	if (theme == "dark") {
+		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
+	} else if (theme == "light") {
+		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+	}
+
+	localStorage.setItem("theme", theme);
+}
+
+const initializeTheme = ()=>{
+	
+	let theme = localStorage.getItem("theme");
+	if (!theme || !theme_modes.includes(theme)) {
+		// set the first theme mode as default
+		theme = theme_modes[0];
+		localStorage.setItem("theme",theme);
+	}
+	toggleTheme(theme);
+}
+
+
+export default {
+	install: (app,options)=>{
+		
+		document.documentElement.classList.add(theme_name);
+
+		initializeTheme();
+
+		app.config.globalProperties.$theme = {
+			theme_name,
+			theme_modes,
+			switchTheme: (theme) => {
+				toggleTheme(theme);
+			}, 
+		} 
+	}
+}
\ No newline at end of file

From 75ad88eb243a285575acee7d6d948367e9070773 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 15:03:59 +0100
Subject: [PATCH 0110/1357] update(Plugin Theme):changes the way the primevue
 theme is replaced if the theme is not dark or light

---
 public/js/plugin/Theme.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
index 29ae4c4a4..d063b4d46 100644
--- a/public/js/plugin/Theme.js
+++ b/public/js/plugin/Theme.js
@@ -17,6 +17,10 @@ const toggleTheme = (theme)=>{
 	} else if (theme == "light") {
 		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
 	}
+	else{
+		if (stylesheet.attributes.href.value.includes("bootstrap4-dark-blue"))
+			stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+	}
 
 	localStorage.setItem("theme", theme);
 }

From ab36d567b81f582b875ccdebe807b8b81a2de759 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Mar 2025 12:47:58 +0100
Subject: [PATCH 0111/1357] refactor(Url Widget): fixes add link button inside
 the widget

---
 public/js/components/Dashboard/Item.js          | 17 ++---------------
 .../js/components/DashboardWidget/Abstract.js   |  3 ---
 public/js/components/DashboardWidget/Url.js     | 12 +++---------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 1ff6a4516..59f33b711 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -45,15 +45,6 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
-		widget_action_identifier(){
-			return `${this.widget.widget_kurzbz}-${this.index}-action-section`;
-		},
-		widgetInformation(){
-			return { 
-				action_section_identifier: this.widget_action_identifier,
-				widget_kurzbz: this.widget.widget_kurzbz,
-			}
-		}
 	},
 	methods: {
 		getWidgetC4Link(widget) {
@@ -138,10 +129,6 @@ export default {
 			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
-
-			<!-- container for widget specific actions -->
-			<div :id="widget_action_identifier"></div>
-
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
@@ -153,7 +140,7 @@ export default {
 			</Transition>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
-			<component :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
@@ -161,7 +148,7 @@ export default {
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
 			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index 50f63cf74..e9f87490d 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -26,9 +26,6 @@ export default {
 				this.$emit('update:sharedData', value);
 			}
 		},
-		widget_action_css_identifier(){
-			return `#${this.widgetInfo.action_section_identifier}`;
-		}
 	},
 	methods: {
 		formatDateTime: function(dateTime) {
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index c0f05257e..8123852d0 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -160,17 +160,11 @@ export default {
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
 
-			<Teleport :to="widget_action_css_identifier">
-				<Transition>
-					<button v-if="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
-						<i class="fa-solid fa-plus"></i>
-					</button>
-				</Transition>
-			</Teleport>
-
 			<template v-if="shared">
-
                 <template v-if="!emptyBookmarks">
+					<button class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+						{{$p.t('bookmark','newLink')}}
+					</button>
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
 						<a target="_blank" :href="link.url">
 							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}

From 1cdf89e405d08b84b7d51c1f22f55efdd6c942e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Mar 2025 13:18:00 +0100
Subject: [PATCH 0112/1357] fix(Dashboard drag event): fixes bug where widget
 wouldn't drag to new position

---
 public/js/components/Drop/Grid.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d3ea29355..ed7d32bd2 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -260,7 +260,7 @@ export default {
 				return;
 			this._dragStart(evt);
 			this.mode = MODE_MOVE;
-			this.updateCursor(evt);
+			//this.updateCursor(evt);
 			this.draggedItem = item;
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 		},
@@ -274,6 +274,7 @@ export default {
 		dragOver(evt) {
 			if (!this.active)
 				return this.dragCancel();
+			
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -344,6 +345,10 @@ export default {
 		},
 		emptyTileClicked() {
 			this.$emit('newItem', this.x, this.y);
+		},
+		updateCursorOnMouseMove(evt){
+			if(this.mode == MODE_IDLE)
+				this.updateCursor(evt);
 		}
 	},
 	template: `
@@ -355,7 +360,7 @@ export default {
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
-		@mousemove="updateCursor"
+		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item

From b52993f7ccebb8843543ea7192744d018457ce7b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 13:02:48 +0100
Subject: [PATCH 0113/1357] refactor(Grid Widgets drag): shows a placeholder
 item in the space where the new widget position would be when dragging a
 widget on the dashboard

---
 public/css/components/dashboard.css       | 12 ++++++++-
 public/js/components/Dashboard/Item.js    |  4 +--
 public/js/components/Dashboard/Section.js |  5 ++--
 public/js/components/Drop/Grid.js         | 31 ++++++++++++++++++++---
 public/js/components/Drop/Grid/Item.js    |  2 ++
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e742f7fa4..eb0c2bf78 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -40,5 +40,15 @@
 	cursor: move;
 }
 
-
+.dashboard-item-overlay::before{
+	position:absolute;
+	content:"";
+	top:0;
+	left:0;
+	right:0;
+	bottom:0;
+	background-color:rgba(0, 100, 156);
+	border:1px dashed lightgray;
+	z-index: 2;
+}
 
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 59f33b711..c52c7887e 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -27,8 +27,8 @@ export default {
 		"configClosed"
 	],
 	props: [
-		"index",
 		"id",
+		"widgetID",
 		"config",
 		"width",
 		"height",
@@ -120,7 +120,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 387edf04e..7818e06b9 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -198,9 +198,10 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
-				<dashboard-item v-if="!item.placeholder"
-					:index="item.index"
+				<dashboard-item 
+					v-if="!item.placeholder"
 					:id="item.widget"
+					:widgetID="item.widgetid"
 					:width="item.w"
 					:height="item.h"
 					:loading="item.loading"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index ed7d32bd2..baa8129cc 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -34,12 +34,14 @@ export default {
 	emits: [
 		"rearrangeItems",
 		"newItem",
-		"gridHeight"
+		"gridHeight",
 	],
 	data() {
 		return {
 			x: -1,
 			y: -1,
+			clientX:0,
+			clientY: 0,
 			mode: MODE_IDLE,
 			grid: null,
 			dragGrid: null,
@@ -48,7 +50,7 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
-			additionalRow: null
+			additionalRow: null,
 		}
 	},
 	computed: {
@@ -154,6 +156,22 @@ export default {
 		}
 	},
 	methods: {
+		toggleDraggedItemOverlay(condition){
+			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
+			if(condition){
+				draggedItemNode.classList.add("dashboard-item-overlay");
+			}else{
+				draggedItemNode.classList.remove("dashboard-item-overlay");
+			}
+		},
+		dragging(event){
+			this.toggleDraggedItemOverlay(true);
+			/*  use case: instead of showing the ghost widget when dragging, 
+				change the x and y position of the widget when dragging to drag the whole widget
+			event.target.style.top = `${this.clientY}px`;
+			event.target.style.left = `${this.clientX}px`;
+			*/
+		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
@@ -228,6 +246,9 @@ export default {
 				evt.clientY = evt.touches[0].clientY;
 			}
 
+			this.clientX = (evt.clientX - rect.left);
+			this.clientY = (evt.clientY - rect.top);
+
 			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 			if (this.x == gridX && this.y == gridY)
@@ -250,7 +271,7 @@ export default {
 		},
 		_dragStart(evt) {
 			if (evt.dataTransfer) {
-				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				//evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -258,9 +279,9 @@ export default {
 		startMove(evt, item) {
 			if (!this.active)
 				return;
+			
 			this._dragStart(evt);
 			this.mode = MODE_MOVE;
-			//this.updateCursor(evt);
 			this.draggedItem = item;
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 		},
@@ -317,6 +338,7 @@ export default {
 			this.draggedItem = null;
 		},
 		dragEnd() {
+			this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -369,6 +391,7 @@ export default {
 				:item="item"
 				@start-move="startMove"
 				@start-resize="startResize"
+				@dragging="dragging"
 				@end-drag="dragCancel"
 				@drop-drag="dragEnd"
 				class="position-absolute"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 8087aadd8..1ff4213ea 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -10,6 +10,7 @@ export default {
 	emits: [
 		"startMove",
 		"startResize",
+		"dragging",
 		"endDrag",
 		"dropDrag"
 	],
@@ -65,6 +66,7 @@ export default {
 		@touchstart="tryDragStart($event, item)"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
+		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active">
 		<slot v-bind="item"></slot>

From 08cb4a7970c53b90038d2d8b3da3cb761c6050aa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 13:17:08 +0100
Subject: [PATCH 0114/1357] refactor(color update): switches fhc-secondary with
 fhc-tertiary

---
 public/css/Cis4/Cis.css                       | 36 +++++++++----------
 public/css/Fhc.css                            |  2 +-
 public/css/components/NavigationComponent.css |  4 +--
 public/css/theme/default.css                  | 30 ++++++++--------
 .../Cis/Cms/Content_types/General.js          |  2 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8010d0746..ea59cb9d8 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -40,21 +40,21 @@ html {
 }
 
 .fhc-secondary-bg{
-	background-color: var(--fhc-secondary) !important;
-}
-
-.fhc-secondary-color {
-	color: var(--fhc-secondary) !important;
-}
-
-.fhc-tertiary-bg{
 	background-color: var(--fhc-tertiary) !important;
 }
 
-.fhc-tertiary-color {
+.fhc-secondary-color {
 	color: var(--fhc-tertiary) !important;
 }
 
+.fhc-tertiary-bg{
+	background-color: var(--fhc-secondary) !important;
+}
+
+.fhc-tertiary-color {
+	color: var(--fhc-secondary) !important;
+}
+
 .fhc-fourth-bg {
 	background-color: var(--fhc-fourth) !important;
 }
@@ -79,13 +79,13 @@ html {
 
 .fhc-secondary {
 	color: var(--fhc-text);
-	background-color: var(--fhc-secondary);
+	background-color: var(--fhc-tertiary);
 	border-color: var(--fhc-border);
 }
 
 .fhc-tertiary{
 	color: var(--fhc-text);
-	background-color: var(--fhc-tertiary);
+	background-color: var(--fhc-secondary);
 	border-color:var(--fhc-border);
 }
 
@@ -99,8 +99,8 @@ html {
 
 :root{	
 	/* sidebar colors */
-	--fhc-cis-sidebar-bg: var(--fhc-tertiary);
-	--fhc-cis-menu-bg: var(--fhc-tertiary);
+	--fhc-cis-sidebar-bg: var(--fhc-secondary);
+	--fhc-cis-menu-bg: var(--fhc-secondary);
 
 	--fhc-cis-header-px: 1rem;
 	--fhc-cis-header-py: .5rem;
@@ -112,14 +112,14 @@ html {
 	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
 	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
 
-	--fhc-cis-menu-lvl-2-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-lvl-2-bg: var(--fhc-secondary);
 	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
-	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-tertiary-highlight);
+	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-secondary-highlight);
 	--fhc-cis-menu-lvl-2-color-hover: var(--fhc-text);
 
-	--fhc-cis-menu-lvl-3-bg: var(--fhc-secondary);
+	--fhc-cis-menu-lvl-3-bg: var(--fhc-tertiary);
 	--fhc-cis-menu-lvl-3-color: var(--fhc-text);
-	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-secondary-highlight);
+	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-tertiary-highlight);
 	--fhc-cis-menu-lvl-3-color-hover: var(--fhc-text);
 
 	--fhc-cis-menu-lvl-4-bg: var(--fhc-fourth);
@@ -582,7 +582,7 @@ html {
   }
 }
 .fhc-header > h1 > small {
-  color: var(--fhc-secondary);
+  color: var(--fhc-tertiary);
   font-size: 1rem;
 }
 .fhc-header > h1 > small:before {
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index c5368930d..6827f2d3f 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -10,7 +10,7 @@
   font-size: calc(1.325rem + .9vw);
 }
 .fhc-header > :first-child > small {
-  color: var(--fhc-secondary);
+  color: var(--fhc-tertiary);
   font-size: .65em;
   padding-inline-start: 1em;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index bf38d3d8c..e922d4812 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -3,11 +3,11 @@
  */
 
  :root{
-	--nav-component-bg: var(--fhc-secondary);
+	--nav-component-bg: var(--fhc-tertiary);
 	--nav-component-border: var(--fhc-border);
 	--nav-component-color: var(--fhc-text);
 	--nav-left-component-border: var(--fhc-border);
-	--nav-left-component-bg: var(--fhc-secondary);
+	--nav-left-component-bg: var(--fhc-tertiary);
 	--nav-left-component-color: var(--fhc-primary);
 	--nav-left-component-hover: var(--fhc-secondary-highlight);
  }
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 2d94847ee..7f39cff54 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -57,11 +57,11 @@
 	--fhc-primary: var(--fhc-blue-20);
 	--fhc-primary-highlight: var(--fhc-blue-40);
 
-	--fhc-tertiary: var(--fhc-white-20);
-	--fhc-tertiary-highlight: var(--fhc-white-40);
-
-	--fhc-secondary: var(--fhc-white-40);
-	--fhc-secondary-highlight: var(--fhc-white-60);
+	--fhc-secondary: var(--fhc-white-20);
+	--fhc-secondary-highlight: var(--fhc-white-40);
+	
+	--fhc-tertiary: var(--fhc-white-40);
+	--fhc-tertiary-highlight: var(--fhc-white-60);
 
 	--fhc-fourth: var(--fhc-white-60);
 	--fhc-fourth-highlight: var(--fhc-white-80);
@@ -106,11 +106,11 @@
 	--fhc-primary: var(--fhc-blue-primary-highlight);
 	--fhc-primary-highlight: var(--fhc-blue-primary);
 
-	--fhc-secondary: var(--fhc-black-70);
-	--fhc-secondary-highlight: var(--fhc-gray-40);
+	--fhc-secondary: var(--fhc-black-50);
+	--fhc-secondary-highlight: var(--fhc-black-70);
 
-	--fhc-tertiary: var(--fhc-black-50);
-	--fhc-tertiary-highlight: var(--fhc-black-70);
+	--fhc-tertiary: var(--fhc-black-70);
+	--fhc-tertiary-highlight: var(--fhc-gray-40);
 
 	--fhc-danger: var(--fhc-red-10);
 
@@ -163,11 +163,11 @@
 	--fhc-primary: var(--fhc-purple-primary-highlight);
 	--fhc-primary-highlight: var(--fhc-purple-primary);
 
-	--fhc-secondary: var(--fhc-purple-30);
-	--fhc-secondary-highlight: var(--fhc-purple-50);
+	--fhc-secondary: var(--fhc-purple-20);
+	--fhc-secondary-highlight: var(--fhc-purple-40);
 
-	--fhc-tertiary: var(--fhc-purple-20);
-	--fhc-tertiary-highlight: var(--fhc-purple-40);
+	--fhc-tertiary: var(--fhc-purple-30);
+	--fhc-tertiary-highlight: var(--fhc-purple-50);
 
 	/* background */
 	--fhc-background: var(--fhc-purple-5);
@@ -256,10 +256,10 @@ html.dark .tabulator .tabulator-row {
 }
 
 html.dark .tabulator .tabulator-cell {
-	background-color: var(--fhc-secondary) !important;
+	background-color: var(--fhc-tertiary) !important;
 	border-color: var(--fhc-border) !important;
 }
 
 html.dark .tabulator .tabulator-header .tabulator-col:hover {
-	background-color: var(--fhc-secondary) !important;
+	background-color: var(--fhc-tertiary) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 85716ef43..c57ccd8ca 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -111,7 +111,7 @@ export default {
 				element.style.backgroundColor = "var(--fhc-background)";
 			}
 			if(element.querySelector("*[style*=background-color]")){
-				element.style.backgroundColor = "var(--fhc-secondary)";
+				element.style.backgroundColor = "var(--fhc-tertiary)";
 			}
 		});
 

From 727b951bbc2632af05d2b83a22b5a556db93ed6f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 14:59:28 +0100
Subject: [PATCH 0115/1357] update(Dashboard Grid): does not show the overlay
 when resizing the widget and adds different grid sizes for different
 viewports

---
 public/css/components/dashboard.css | 25 +++++++++++++++++++++++++
 public/js/components/Drop/Grid.js   | 11 +++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index eb0c2bf78..fb9a628de 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -23,6 +23,31 @@
 :root {
 	--fhc-dashboard-grid-size: 4;
 }
+
+@media(max-width: 1400px) {
+	:root {
+		--fhc-dashboard-grid-size: 4;
+	}
+}
+
+@media(max-width: 1200px) {
+	:root {
+		--fhc-dashboard-grid-size: 3;
+	}
+}
+
+@media(max-width: 992px) {
+	:root {
+		--fhc-dashboard-grid-size: 2;
+	}
+}
+
+@media(max-width: 768px) {
+	:root {
+		--fhc-dashboard-grid-size: 2;
+	}
+}
+
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index baa8129cc..3a975d209 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -165,7 +165,8 @@ export default {
 			}
 		},
 		dragging(event){
-			this.toggleDraggedItemOverlay(true);
+			if(this.mode == MODE_MOVE)
+				this.toggleDraggedItemOverlay(true);
 			/*  use case: instead of showing the ghost widget when dragging, 
 				change the x and y position of the widget when dragging to drag the whole widget
 			event.target.style.top = `${this.clientY}px`;
@@ -271,7 +272,8 @@ export default {
 		},
 		_dragStart(evt) {
 			if (evt.dataTransfer) {
-				//evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				if(this.mode == MODE_RESIZE)
+					evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -288,9 +290,9 @@ export default {
 		startResize(evt, item) {
 			if (!this.active)
 				return;
-			this._dragStart(evt);
 			this.mode = MODE_RESIZE;
 			this.draggedItem = item;
+			this._dragStart(evt);
 		},
 		dragOver(evt) {
 			if (!this.active)
@@ -338,7 +340,8 @@ export default {
 			this.draggedItem = null;
 		},
 		dragEnd() {
-			this.toggleDraggedItemOverlay(false);
+			if(this.mode == MODE_MOVE)
+				this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)

From 95856c9e4dab2d2f301a908361166f5c2d67f18f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 27 Mar 2025 15:14:56 +0100
Subject: [PATCH 0116/1357] bootstrap5 version 5.3.3

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 053b5227f..0d45d00f1 100644
--- a/composer.json
+++ b/composer.json
@@ -308,9 +308,9 @@
 			"type": "package",
 			"package": {
 				"name": "twbs/bootstrap5",
-				"version": "5.3",
+				"version": "5.3.3",
 				"dist": {
-					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.zip",
+					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.3.zip",
 					"type": "zip"
 				}
 			}

From 51f4e1e57dc32a3b91442e9552faf711e9174815 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 31 Mar 2025 09:47:27 +0200
Subject: [PATCH 0117/1357] fix(Chrome overflow scroll display): changes
 overflow scroll to auto to change the visual in the chrome browser

---
 public/css/components/calendar.css                  | 4 ++--
 public/js/components/DashboardWidget/Studiengang.js | 2 +-
 public/js/components/DashboardWidget/Url.js         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9edc1c0f2..ddf35e3e7 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -75,7 +75,7 @@
 
 .fhc-calendar-week-page .all-day-event{
 	max-height: 75px;
-	overflow:scroll;
+	overflow:auto;
 }
 
 .fhc-calendar-week-page .all-day-event-container{
@@ -106,7 +106,7 @@
 .fhc-calendar-day-page .all-day-event {
 	grid-column:2;
 	max-height: 75px;
-	overflow: scroll;
+	overflow: auto;
 }
 
 .fhc-calendar-day-page .all-day-event-container {
diff --git a/public/js/components/DashboardWidget/Studiengang.js b/public/js/components/DashboardWidget/Studiengang.js
index 3542bb523..2dd667538 100644
--- a/public/js/components/DashboardWidget/Studiengang.js
+++ b/public/js/components/DashboardWidget/Studiengang.js
@@ -13,7 +13,7 @@ export default {
 		this.$emit('setConfig', false);
 	},
 	template:/*html*/`
-		<div class="p-3 h-100 overflow-scroll">
+		<div class="p-3 h-100 overflow-auto">
 			<studiengang-information displayWidget ></studiengang-information>
 		</div>
 	`	
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 8123852d0..ead0d0d38 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -157,7 +157,7 @@ export default {
 		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
 	},
 	template: /*html*/ `
-    <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
+    <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
 
 			<template v-if="shared">

From 232da256acd3eb5fc2f8d0417d71d6aaac3a124b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 31 Mar 2025 14:56:41 +0200
Subject: [PATCH 0118/1357] fix(Dashboard Drag Placeholder): doesn't allow
 placeholder items to be dragged anymore and keeps the height and width of a
 widget when resizing the grid of the dashboard

---
 public/js/components/Dashboard/Section.js | 14 ++++++++++++--
 public/js/components/Drop/Grid/Item.js    |  7 ++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 7818e06b9..3a71eb5fc 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -49,8 +49,18 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
+			
 			return this.widgets.map(item => {
-				return { ...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
+				let place;
+				if(!item.place[this.gridWidth]){
+					const nearestIndex = Object.keys(item.place).sort((a,b)=>Math.abs(a-this.gridWidth)-Math.abs(b-this.gridWidth)).pop();
+					if (nearestIndex === null){
+						place = {x:0,y:0,w:1,h:1};
+					}else{
+						place = item.place[nearestIndex];
+					}
+				}
+				return { ...item, ...(item.place[this.gridWidth] || place)};
 			});
 		},
 		items_hashmap() {
@@ -201,7 +211,7 @@ export default {
 				<dashboard-item 
 					v-if="!item.placeholder"
 					:id="item.widget"
-					:widgetID="item.widgetid"
+					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
 					:loading="item.loading"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 1ff4213ea..e7cafab4e 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -12,7 +12,8 @@ export default {
 		"startResize",
 		"dragging",
 		"endDrag",
-		"dropDrag"
+		"dropDrag",
+		"item"
 	],
 	data() {
 		return {
@@ -63,12 +64,12 @@ export default {
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
-		@touchstart="tryDragStart($event, item)"
+		@touchstart.prevent="tryDragStart($event, item)"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
-		:draggable="active">
+		:draggable="active && !item.placeholder">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 702a84a25d15741fb93f9dea335633ce9f65db6b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Apr 2025 09:28:29 +0200
Subject: [PATCH 0119/1357] update(Dashboard Grid Item):makes a widget only
 draggable if the dragAction is defined

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

diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index e7cafab4e..3f664eaec 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -69,7 +69,7 @@ export default {
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
-		:draggable="active && !item.placeholder">
+		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 33f800fa2844a604aca18c38a91797bd29caa600 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Apr 2025 13:06:23 +0200
Subject: [PATCH 0120/1357] fix(Dashboard Mobile Touch Events): fixes the
 behaviour of the touch event for the dashboard grid

---
 public/css/components/dashboard.css           |  8 +++
 public/js/components/Dashboard/Dashboard.js   | 14 +++++
 public/js/components/Dashboard/Section.js     | 29 +++++-----
 .../js/components/Dashboard/Widget/Picker.js  | 18 ++----
 .../components/Dashboard/Widget/WidgetIcon.js | 29 ++++++++++
 public/js/components/Drop/Grid.js             | 55 +++++++++++++------
 public/js/components/Drop/Grid/Item.js        | 15 ++---
 7 files changed, 118 insertions(+), 50 deletions(-)
 create mode 100644 public/js/components/Dashboard/Widget/WidgetIcon.js

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index fb9a628de..e31b74233 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -77,3 +77,11 @@
 	z-index: 2;
 }
 
+.dragged-widget-icon{
+	position: absolute;
+	height: 250px;
+	width: 200px;
+	top: -999px;
+	left: -999px;
+	z-index: 3;
+}
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index a0d3ddcf3..e6f26d169 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -34,6 +34,7 @@ export default {
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
+			widgetsSetup: Vue.computed(() => this.widgets),
 		}
 	},
 	computed: {
@@ -142,6 +143,19 @@ export default {
 		}
 	},
 	created() {
+
+		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
+			params: {
+				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));
+
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 3a71eb5fc..9a8a59a4f 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -49,18 +49,23 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
+
+			const computeNearestPlace = (item, gridWidth) =>{
+				let place;
+				if (Object.keys(item.place).length > 0) {
+					const nearestIndex = Object.keys(item.place)
+											   .sort((a, b) => Math.abs(a - gridWidth) - Math.abs(b - gridWidth))
+											   .pop();
+					place = item.place[nearestIndex];
+				}
+				else{
+					place = { x: 0, y: 0, w: 1, h: 1 };
+				}
+				return place;
+			}
 			
 			return this.widgets.map(item => {
-				let place;
-				if(!item.place[this.gridWidth]){
-					const nearestIndex = Object.keys(item.place).sort((a,b)=>Math.abs(a-this.gridWidth)-Math.abs(b-this.gridWidth)).pop();
-					if (nearestIndex === null){
-						place = {x:0,y:0,w:1,h:1};
-					}else{
-						place = item.place[nearestIndex];
-					}
-				}
-				return { ...item, ...(item.place[this.gridWidth] || place)};
+				return { ...item, ...(item.place[this.gridWidth] || computeNearestPlace(item, this.gridWidth))};
 			});
 		},
 		items_hashmap() {
@@ -73,10 +78,6 @@ export default {
 		items_placeholders(){
 			let placeholders = [];
 			let col_max = this.gridWidth;
-			// OLD way of calculating the max rows
-			//let max_row = Math.max(...this.items.map(item => item.y)) + 1;
-			//let max_row_max_height = Math.max(...this.items.filter(item => item.y == (max_row - 1)).map(item => item.h));
-			//max_row + max_row_max_height - 1;
 			let rows_max = this.gridHeight;
 
 			// occupied hashmap to keep track of the occupied cells
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index c96e3bc7b..7ffd0671c 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -1,8 +1,10 @@
 import BsModal from "../../Bootstrap/Modal.js";
+import WidgetIcon from "./WidgetIcon.js";
 
 export default {
 	components: {
-		BsModal
+		BsModal,
+		WidgetIcon,
 	},
 	props: [
 		"widgets"
@@ -28,11 +30,7 @@ export default {
 			this.callbacks = {};
 			this.$refs.modal.hide();
 		},
-		path(src) {
-			if (src[0] == '/')
-				return FHC_JS_DATA_STORAGE_OBJECT.app_root + src;
-			return src;
-		}
+		
 	},
 	template: `<div class="dashboard-widget-picker">
 		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
@@ -43,13 +41,7 @@ export default {
 						No Widgets available
 					</div>
 					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
-						<div class="card h-100" @click="pick(widget.widget_id)">
-							<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
-							<div class="card-body">
-								<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
-								<p class="card-text">{{ widget.beschreibung }}</p>
-							</div>
-						</div>
+						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
new file mode 100644
index 000000000..312cad659
--- /dev/null
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -0,0 +1,29 @@
+export default {
+	data(){
+		return {
+
+		}
+	},
+	props:{
+		widget:{
+			type:Object,
+			required:true,
+		}
+	},
+	methods:{
+		path(src) {
+			if (src[0] == '/')
+				return FHC_JS_DATA_STORAGE_OBJECT.app_root + src;
+			return src;
+		}
+	},
+	emits:["select"],
+	template: /*html */`
+	<div class="card h-100" @click="$emit('select',widget.widget_id);  pick(widget.widget_id)">
+		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+		<div class="card-body">
+			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
+			<p class="card-text">{{ widget.beschreibung }}</p>
+		</div>
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 3a975d209..4da51e815 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -2,6 +2,7 @@
 
 import GridItem from './Grid/Item.js';
 import GridLogic from '../../composables/GridLogic.js';
+import WidgetIcon from '../Dashboard/Widget/WidgetIcon.js';
 
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
@@ -10,10 +11,10 @@ const MODE_RESIZE = 2;
 export default {
 	name: 'Grid',
 	components: {
-		GridItem
-	},
-	inject: {
+		GridItem,
+		WidgetIcon,
 	},
+	inject: ["widgetsSetup"],
 	props: {
 		cols: Number,
 		items: Array,
@@ -50,6 +51,7 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
+			draggedItemIcon: null,
 			additionalRow: null,
 		}
 	},
@@ -125,7 +127,15 @@ export default {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
 				return false;
 			return this.grid.isFreeSlot(this.x, this.y);
-		}
+		},
+		widgetSetup(){
+			if (!this.widgetsSetup)
+				return;
+			return this.widgetsSetup.reduce((acc, ele) => { 
+				acc[ele.widget_id] =ele;
+				return acc;
+			} ,{});
+		},
 	},
 	watch: {
 		active(active) {
@@ -157,6 +167,8 @@ export default {
 	},
 	methods: {
 		toggleDraggedItemOverlay(condition){
+			if(!this.draggedItem)
+				return;
 			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
 			if(condition){
 				draggedItemNode.classList.add("dashboard-item-overlay");
@@ -165,13 +177,11 @@ export default {
 			}
 		},
 		dragging(event){
-			if(this.mode == MODE_MOVE)
+			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
-			/*  use case: instead of showing the ghost widget when dragging, 
-				change the x and y position of the widget when dragging to drag the whole widget
-			event.target.style.top = `${this.clientY}px`;
-			event.target.style.left = `${this.clientX}px`;
-			*/
+			    this.draggedItemIcon.style.top = `${this.clientY}px`;
+			    this.draggedItemIcon.style.left = `${this.clientX}px`;
+			}
 		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
@@ -270,10 +280,9 @@ export default {
 
 			return true;
 		},
-		_dragStart(evt) {
+		_dragStart(evt, item) {
 			if (evt.dataTransfer) {
-				if(this.mode == MODE_RESIZE)
-					evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -282,10 +291,11 @@ export default {
 			if (!this.active)
 				return;
 			
-			this._dragStart(evt);
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
+			this.draggedItemIcon = document.getElementById(`widget${this.draggedItem?.data.widget}`);
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
+			this._dragStart(evt, item);
 		},
 		startResize(evt, item) {
 			if (!this.active)
@@ -334,14 +344,21 @@ export default {
 			}
 		},
 		dragCancel() {
+			
+			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			
+			if(this.draggedItemIcon){
+				this.draggedItemIcon.style.top = '-999px';
+				this.draggedItemIcon.style.left = '-999px';
+				this.draggedItemIcon = null;
+			}
+			
 		},
 		dragEnd() {
-			if(this.mode == MODE_MOVE)
-				this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -388,6 +405,11 @@ export default {
 		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
+			<template v-for="(item,index) in placedItems">
+				<div class="dragged-widget-icon" :id="'widget'+item.data.widget" >
+					<widget-icon v-if="widgetsSetup" :widget="widgetSetup[item.data.widget]"></widget-icon>
+				</div>
+			</template>
 			<grid-item
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
@@ -397,6 +419,7 @@ export default {
 				@dragging="dragging"
 				@end-drag="dragCancel"
 				@drop-drag="dragEnd"
+				@touchEvent="updateCursorOnMouseMove"
 				class="position-absolute"
 				:active="active"
 				:style="{
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 3f664eaec..c677dba79 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -13,7 +13,8 @@ export default {
 		"dragging",
 		"endDrag",
 		"dropDrag",
-		"item"
+		"item",
+		"touchEvent"
 	],
 	data() {
 		return {
@@ -54,20 +55,20 @@ export default {
 			this.dragging = false;
 			this.$emit('dropDrag', evt);
 		},
-		test(evt) {
-			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
-			if (dragAction) {
-				this.dragging = true;
-			}
+		touchStart(event){
+			this.$emit('touchEvent', event); 
+			this.registerDragAction(event); 
+			this.tryDragStart(event, this.item);
 		}
 	},
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
-		@touchstart.prevent="tryDragStart($event, item)"
+		@touchstart.prevent="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
+		@touchmove="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>

From 97e34948e5da8ce636c70076a5aa7e2e91c6081a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Apr 2025 11:23:25 +0200
Subject: [PATCH 0121/1357] refactor(WidgetIcon for Dashboard dragging): puts
 the hidden dashboard icons for the dragging image in the section component so
 that each section has its relative clientX and clientY positions

---
 public/css/components/dashboard.css           |  3 ++-
 public/js/components/Dashboard/Item.js        |  2 +-
 public/js/components/Dashboard/Section.js     | 19 ++++++++++++++++---
 .../components/Dashboard/Widget/WidgetIcon.js |  2 +-
 public/js/components/Drop/Grid.js             | 18 ++++++++----------
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e31b74233..1a9808e0c 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -84,4 +84,5 @@
 	top: -999px;
 	left: -999px;
 	z-index: 3;
-}
\ No newline at end of file
+}
+
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index c52c7887e..b78659a96 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -100,7 +100,7 @@ export default {
 	},
 	watch: {
 		config() {
-			this.arguments = { ...this.widget.arguments, ...this.config };
+			this.arguments = { ...this.widget?.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 9a8a59a4f..0ff0f52e2 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -2,13 +2,20 @@ import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import WidgetIcon from "./Widget/WidgetIcon.js"
+
 export default {
 	name: 'Section',
 	components: {
 		DropGrid,
-		DashboardItem
+		DashboardItem,
+		WidgetIcon,
 	},
 	inject: {
+		widgetsSetup:{
+			type: Object,
+			default: {},
+		},
 		adminMode: {
 			type: Boolean,
 			default: false
@@ -38,7 +45,8 @@ export default {
 		return {
 			editModeIsActive: Vue.computed(() =>
 				this.editModeIsActive
-			),		
+			),	
+			sectionName: Vue.computed(() => this.name),	
 		}
 	},
 	computed: {
@@ -205,7 +213,12 @@ export default {
 		});
 	},
 	template: `
-	<div class="dashboard-section" ref="container" :style="getSectionStyle">
+	<div class="dashboard-section position-relative" ref="container" :style="getSectionStyle">
+		<template v-for="setup in widgetsSetup">
+			<div class="dragged-widget-icon" :id="'widget-'+name+'-'+setup.widget_id" >
+				<widget-icon v-if="widgetsSetup" :widget="setup"></widget-icon>
+			</div>
+		</template>
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index 312cad659..a7d816cb2 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -19,7 +19,7 @@ export default {
 	},
 	emits:["select"],
 	template: /*html */`
-	<div class="card h-100" @click="$emit('select',widget.widget_id);  pick(widget.widget_id)">
+	<div class="card h-100" @click="$emit('select',widget.widget_id);">
 		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 		<div class="card-body">
 			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4da51e815..535eed2ba 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -2,7 +2,6 @@
 
 import GridItem from './Grid/Item.js';
 import GridLogic from '../../composables/GridLogic.js';
-import WidgetIcon from '../Dashboard/Widget/WidgetIcon.js';
 
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
@@ -12,9 +11,7 @@ export default {
 	name: 'Grid',
 	components: {
 		GridItem,
-		WidgetIcon,
 	},
-	inject: ["widgetsSetup"],
 	props: {
 		cols: Number,
 		items: Array,
@@ -55,6 +52,12 @@ export default {
 			additionalRow: null,
 		}
 	},
+	inject:{
+		sectionName: {
+			type: String,
+			default: '',
+		},
+	},
 	computed: {
 		rows() {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
@@ -293,7 +296,7 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
-			this.draggedItemIcon = document.getElementById(`widget${this.draggedItem?.data.widget}`);
+			this.draggedItemIcon = document.getElementById(`widget-${this.sectionName}-${this.draggedItem?.data.widget}`);
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -398,18 +401,13 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@touchmove="dragOver"
+		@touchmove.prevent="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
 		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
-			<template v-for="(item,index) in placedItems">
-				<div class="dragged-widget-icon" :id="'widget'+item.data.widget" >
-					<widget-icon v-if="widgetsSetup" :widget="widgetSetup[item.data.widget]"></widget-icon>
-				</div>
-			</template>
 			<grid-item
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"

From 199141893197adb85db4a306e81fc54026e730a3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 3 Apr 2025 16:54:56 +0200
Subject: [PATCH 0122/1357] New tab Dokumente

---
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Dokumente.php         | 553 ++++++++++++++
 application/models/crm/Akte_model.php         |  57 +-
 application/models/crm/Dokument_model.php     |  87 +++
 .../models/crm/Dokumentprestudent_model.php   |  35 +
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/documents.js                |  33 +
 .../Studentenverwaltung/Details/Dokumente.js  |  22 +
 .../Details/Dokumente/Dokumente.js            |  51 ++
 .../Details/Dokumente/List/Accepted.js        | 331 +++++++++
 .../Details/Dokumente/List/Unaccepted.js      | 344 +++++++++
 .../Details/Dokumente/Modal/Edit.js           | 137 ++++
 .../Details/Dokumente/Modal/Upload.js         | 124 ++++
 system/phrasesupdate.php                      | 682 ++++++++++++++++++
 14 files changed, 2461 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Dokumente.php
 create mode 100644 public/js/api/stv/documents.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..ecc17119d 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -83,6 +83,10 @@ class Config extends FHCAPI_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
+		$result['documents'] = [
+			'title' => $this->p->t('stv', 'tab_dokumente'),
+			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
+		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
new file mode 100644
index 000000000..2923f7204
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -0,0 +1,553 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Dokumente extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getDocumentsUnaccepted' => ['admin:r', 'assistenz:r'],
+			'getDocumentsAccepted' => ['admin:r', 'assistenz:r'],
+			'deleteZuordnung' => ['admin:rw', 'assistenz:rw'],
+			'createZuordnung' => ['admin:rw', 'assistenz:rw'],
+			'loadAkte' => ['admin:rw', 'assistenz:rw'],
+			'deleteAkte' => ['admin:rw', 'assistenz:rw'],
+			'updateAkte' => ['admin:rw', 'assistenz:rw'],
+			'getDoktypen' => ['admin:r', 'assistenz:r'],
+			'uploadDokument' => ['admin:rw', 'assistenz:rw'],
+			'download' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'dokumente'
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$this->load->model('crm/Dokument_model', 'DokumentModel');
+		$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+
+		//TODO(Manu) check additional Berechtigungen
+		//TODO(Manu) check if using dokument lib instead of dokument model?
+	}
+
+	public function getDocumentsUnaccepted($prestudent_id, $studiengang_kz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+		$person_id = $this->_getPersonId($prestudent_id);
+		$result = $this->DokumentModel->getUnacceptedDocuments($prestudent_id, $person_id);
+
+		$dataAkteUnaccepted = $this->getDataOrTerminateWithError($result);
+		$resultMd = $this->_getMissingDocuments($studiengang_kz, $prestudent_id);
+
+		$data = $this->_mergeDocuments($dataAkteUnaccepted, $resultMd);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDocumentsAccepted($prestudent_id, $studiengang_kz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
+
+		$arrayAccepted = [];
+		$person_id = $this->_getPersonId($prestudent_id);
+
+		$docNames = array_map(function ($item) {
+			return $item->dokument_kurzbz;
+		}, $resultPreDoc);
+
+		foreach($docNames as $doc)
+		{
+			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			if (hasData($result))
+			{
+				$data = getData($result);
+				array_push($arrayAccepted, current($data));
+			}
+		}
+
+		//Merge with Data of Akte
+		$newDataMap = [];
+		//helper, lookupArray
+		foreach ($arrayAccepted as $item) {
+			$newDataMap[$item->dokument_kurzbz] = $item;
+		}
+
+		//add Data of Akte to PrestudentData
+		foreach ($resultPreDoc as $obj) {
+			if (isset($newDataMap[$obj->dokument_kurzbz])) {
+				$obj->akte_id = $newDataMap[$obj->dokument_kurzbz]->akte_id;
+				$obj->hochgeladenamum = $newDataMap[$obj->dokument_kurzbz]->hochgeladenamum;
+				$obj->titel_intern = $newDataMap[$obj->dokument_kurzbz]->titel_intern;
+				$obj->nachgereicht = $newDataMap[$obj->dokument_kurzbz]->nachgereicht;
+				$obj->akzeptiertamum = $newDataMap[$obj->dokument_kurzbz]->akzeptiertamum;
+				$obj->dms_id = $newDataMap[$obj->dokument_kurzbz]->dms_id;
+				$obj->infotext = $newDataMap[$obj->dokument_kurzbz]->infotext;
+				$obj->anmerkung_intern = $newDataMap[$obj->dokument_kurzbz]->anmerkung_intern;
+				$obj->nachgereicht_am = $newDataMap[$obj->dokument_kurzbz]->nachgereicht_am;
+				$obj->vorhanden = $newDataMap[$obj->dokument_kurzbz]->vorhanden;
+			}
+		}
+		$this->terminateWithSuccess($resultPreDoc);
+	}
+
+	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$dokument_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->DokumentprestudentModel->delete(
+			[
+				'prestudent_id' => $prestudent_id,
+				'dokument_kurzbz' => $dokument_kurzbz
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAkte($akte_id)
+	{
+		if (!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		$this->AkteModel->addSelect('public.tbl_akte.*');
+		$this->AkteModel->addSelect("CONCAT(public.tbl_person.vorname, ' ' , public.tbl_person.nachname) AS namePerson");
+		$this->AkteModel->addJoin('public.tbl_person', 'person_id');
+		$result = $this->AkteModel->loadWhere(
+			[
+				'akte_id' => $akte_id,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$data = current($data);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateAkte()
+	{
+		$this->form_validation->set_rules('akte_id', 'Akte ID', 'required', [
+			'required' => $this->p->t('dokumente', 'err_updateNotAllowed')
+		]);
+
+		$this->form_validation->set_rules('dokument_kurzbz', 'Dokumenttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Dokumenttyp'])
+		]);
+
+		$this->form_validation->set_rules('nachreichung_am', 'Nachreichung am', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Nachreichung am'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid = getAuthUID();
+
+		$result = $this->AkteModel->update(
+			[
+				'akte_id' => $this->input->post('akte_id'),
+			],
+			[
+				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
+				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
+				'titel_intern' => $this->input->post('titel_intern'),
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
+				'updateamum' => date('c'),
+				'updatevon' => $uid,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function createZuordnung($prestudent_id, $dokument_kurzbz)
+	{
+		if (!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$dokument_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
+
+		$uid = getAuthUid();
+
+		$result = $this->DokumentprestudentModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'dokument_kurzbz' => $dokument_kurzbz,
+				'mitarbeiter_uid' => $uid,
+				'datum' => date('c'),
+				'insertamum' => date('c'),
+				'insertvon' =>  $uid,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteAkte($akte_id)
+	{
+		if (!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->AkteModel->load($akte_id);
+		$dataAkte = $this->getDataOrTerminateWithError($result);
+
+		$logdata_akte = var_export($dataAkte, true);
+
+		$dms_id = current($dataAkte)->dms_id;
+		$nachgereicht = current($dataAkte)->nachgereicht;
+		$inhalt = current($dataAkte)->inhalt;
+		$inhaltVorhanden = $inhalt != '';
+		$uid = getAuthUid();
+
+		$this->db->trans_start();
+
+		if($dms_id)
+		{
+			$this->load->model('content/Dms_model', 'DmsModel');
+			$result = $this->DmsModel->load($dms_id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$logdata_dms = (array)$data;
+			$logdata_dms = "Logdata: " . var_export($logdata_dms, true);
+
+			//delete from dmsLib
+			$this->load->library('DmsLib');
+			$person_id = current($dataAkte)->person_id;
+			$result = $this->dmslib->delete($person_id, $dms_id);
+			$this->getDataOrTerminateWithError($result);
+
+			//LOGGING Dms ID
+			$this->load->model('system/Log_model', 'LogModel');
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der DMS_ID ". $dms_id,
+				'sql' => $logdata_dms
+			]);
+			$this->getDataOrTerminateWithError($result);
+
+			//delete akte
+			$result = $this->AkteModel->delete(
+				[
+					'akte_id' => $akte_id
+				]
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			//Logging Deletion Akte
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der Akte ". $akte_id,
+				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
+			]);
+			$this->getDataOrTerminateWithError($result);
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		elseif (!!$dms_id || ($nachgereicht && !$inhaltVorhanden))
+		{
+			$result = $this->AkteModel->delete(
+				[
+					'akte_id' => $akte_id
+				]
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der Akte ". $akte_id,
+				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
+			]);
+			$this->getDataOrTerminateWithError($result);
+
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		else
+			$this->terminateWithError($this->p->t('dokumente', 'err_deleteDokHere'), self::ERROR_TYPE_GENERAL);
+	}
+
+	public function uploadDokument()
+	{
+		$this->load->library('DmsLib');
+		$prestudent_id = $this->input->post('prestudent_id');
+		$anmerkung_intern = $this->input->post('anmerkung_intern');
+		$titel_intern = $this->input->post('titel_intern');
+		$dokument_kurzbz = $this->input->post('dokument_kurzbz');
+
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Prestudent ID'])
+		]);
+
+		$this->form_validation->set_rules('dokument_kurzbz', 'Dokumenttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Dokumenttyp'])
+		]);
+
+		//validation if attachment was added
+		$this->form_validation->set_rules('anhang', 'Attachment', 'callback_file_check');
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->db->trans_start();
+		$uid = getAuthUID();
+
+		$dms = array(
+			'kategorie_kurzbz'  => 'Akte',
+			'version'           => 0,
+			'name'              => $_FILES['anhang']['name'],
+			'mimetype'          => $_FILES['anhang']['type'],
+			'insertamum'        => date('c'),
+			'insertvon'         => $uid
+		);
+
+		$result = $this->dmslib->upload($dms, 'anhang', array("jpg", "png", "pdf"));
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$dms_id = $result->retval['dms_id'];
+
+		$person_id = $this->_getPersonId($prestudent_id);
+
+		$result = $this->DokumentModel->load($dokument_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$bezeichnung = current($data)->bezeichnung;
+
+		//save entry in akte
+		if($dms_id)
+		{
+			$result = $this->AkteModel->insert([
+				'person_id' => $person_id,
+				'dms_id' => $dms_id,
+				'dokument_kurzbz' => $dokument_kurzbz,
+				'mimetype' => $_FILES['anhang']['type'],
+				'insertamum' => date('c'),
+				'erstelltam' => date('c'),
+				'insertvon' => $uid,
+				'anmerkung_intern' => $anmerkung_intern,
+				'titel_intern' => $titel_intern,
+				'bezeichnung' => $bezeichnung,
+				'titel' => $_FILES['anhang']['name']
+			]);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		$this->db->trans_complete();
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDoktypen()
+	{
+		$this->DokumentModel->addSelect('dokument_kurzbz');
+		$this->DokumentModel->addSelect('bezeichnung');
+		$this->DokumentModel->addOrder('dokument_kurzbz', 'ASC');
+		$result = $this->DokumentModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function download()
+	{
+		//TODO(Manu) check filetype, Decoding
+		$akte_id = $this->input->get('akte_id');
+
+		if(!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($akte_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		header('Content-Description: File Transfer');
+		header('Content-Type: '. $data->mimetype);
+		header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		if (isset($data->inhalt) && !empty($data->inhalt)) {
+			$decodedContent = base64_decode($data->inhalt, true);
+
+			if ($decodedContent === false) {
+				die('Error: Base64-Dekodierung failed.');
+			}
+			echo $decodedContent;
+		}
+		die();
+	}
+
+	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
+	{
+		$result = $this->DokumentModel->getMissingDocuments($studiengang_kz, $prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getUnacceptedDocuments($prestudent_id)
+	{
+		$person_id = $this->_getPersonId($prestudent_id);
+		$result = $this->DokumentModel->getUnacceptedDocuments($prestudent_id, $person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	/**
+	 * helper function for merging objects
+	 * sorts object after merging according to dokument_kurzbz
+	 * @param $original object of documents of akte
+	 * @param object $toMerge documents to merge (of dokumentprestudent, dokumentstudiengang)
+	 * @return Array mergedObject
+	 */
+	private function _mergeDocuments($original, $toMerge)
+	{
+		$existingKurzbez = [];
+		foreach ($original as $doc) {
+			$existingKurzbez[$doc->dokument_kurzbz] = true;
+		}
+
+		foreach ($toMerge as $doc) {
+			if (!isset($existingKurzbez[$doc->dokument_kurzbz])) {
+				$original[] = $doc;
+				$existingKurzbez[$doc->dokument_kurzbz] = true;
+			}
+			else
+			{
+				foreach($original as $docOriginal)
+				{
+					if ($docOriginal->dokument_kurzbz == $doc->dokument_kurzbz)
+					{
+						$docOriginal->pflicht = $doc->pflicht;
+						$docOriginal->onlinebewerbung = $doc->onlinebewerbung;
+					}
+				}
+			}
+		}
+
+		usort($original, function ($a, $b) {
+			return strcmp($a->dokument_kurzbz, $b->dokument_kurzbz);
+		});
+
+		return $original;
+	}
+
+	private function _getDocumentsOfAkte($person_id)
+	{
+		$result = $this->AkteModel->getAktenFAS($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getPrestudentDokumente($prestudent_id)
+	{
+		$result = $this->DokumentprestudentModel->getPrestudentDokumente($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getPersonId($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
+	}
+
+	public function file_check($str)
+	{
+		if (isset($_FILES['anhang']) && $_FILES['anhang']['size'] > 0)
+		{
+			$allowed_mime_types = ['image/jpeg', 'image/png', 'application/pdf'];
+			$mime = mime_content_type($_FILES['anhang']['tmp_name']);
+
+			if (in_array($mime, $allowed_mime_types))
+			{
+				return true;
+			} else
+			{
+				$this->form_validation->set_message('file_check', $this->p->t('dokumente', 'error_fileType'));
+				return false;
+			}
+		}
+		else
+		{
+			$this->form_validation->set_message('file_check', $this->p->t('dokumente', 'error_fileMissing'));
+			return false;
+		}
+	}
+}
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 57b6e0665..4b36e8267 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -92,7 +92,7 @@ class Akte_model extends DB_Model
 						 a.anmerkung,
 						 a.nachgereicht,
 						 a.nachgereicht_am,
-						 CASE WHEN MAX(dp.dokument_kurzbz) IS NOT NULL THEN TRUE ELSE FALSE END AS accepted
+						 CASE WHEN MAX(dp.dokument_kurzbz) IS NOT NULL THEN TRUE ELSE FALSE END AS accepted,
 					FROM public.tbl_akte a
 			  INNER JOIN public.tbl_prestudent p USING(person_id)
 			   LEFT JOIN public.tbl_dokumentprestudent dp USING(prestudent_id, dokument_kurzbz)
@@ -111,6 +111,61 @@ class Akte_model extends DB_Model
 		return $this->execQuery($query, $parametersArray);
 	}
 
+	/**
+	 * getAktenAccepted FAS
+	 */
+	public function getAktenFAS($person_id, $dokument_kurzbz = null, $stg_kz = null, $prestudent_id = null, $returnInhalt = false)
+	{
+		$query = 'SELECT
+    				a.akte_id,
+    				a.bezeichnung,
+    				a.dokument_kurzbz,
+					a.titel_intern,
+					a.anmerkung_intern,
+					a.insertamum as hochgeladenamum,
+					a.updatevon, a.insertvon, a.uid,
+					a.dms_id, a.anmerkung as infotext,
+					a.nachgereicht,
+					CASE
+						WHEN inhalt IS NOT NULL OR a.dms_id IS NOT NULL
+						    THEN true
+						ELSE false
+					END AS vorhanden,
+    				a.nachgereicht_am,
+					ausstellungsnation, formal_geprueft_amum, archiv,
+					signiert, stud_selfservice, akzeptiertamum, inhalt
+					FROM public.tbl_akte a
+					WHERE a.person_id = ?';
+
+		$parametersArray = array($person_id);
+
+		if (!isEmptyString($dokument_kurzbz))
+		{
+			$query .= " AND dokument_kurzbz = ?
+			AND dokument_kurzbz NOT IN ('Zeugnis','DiplSupp','Bescheid')";
+			array_push($parametersArray, $dokument_kurzbz);
+		}
+
+		if($stg_kz != null && $prestudent_id != null)
+		{
+			$query.= " AND dokument_kurzbz not in (
+				SELECT dokument_kurzbz
+					FROM public.tbl_dokument
+					JOIN public.tbl_dokumentstudiengang USING(dokument_kurzbz)
+				WHERE studiengang_kz= ?
+ 				AND dokument_kurzbz NOT IN(
+ 					SELECT dokument_kurzbz FROM public.tbl_dokumentprestudent
+				JOIN public.tbl_dokument USING(dokument_kurzbz)
+				WHERE prestudent_id=?))";
+			array_push($parametersArray, $stg_kz);
+			array_push($parametersArray, $prestudent_id);
+		}
+
+		$query .= ' ORDER BY erstelltam';
+
+		return $this->execQuery($query, $parametersArray);
+	}
+
 	/**
 	 * getAktenAcceptedDms
 	 */
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
index 7ef2be716..8008202c1 100644
--- a/application/models/crm/Dokument_model.php
+++ b/application/models/crm/Dokument_model.php
@@ -11,4 +11,91 @@ class Dokument_model extends DB_Model
 		$this->dbTable = 'public.tbl_dokument';
 		$this->pk = 'dokument_kurzbz';
 	}
+
+	/**
+	 * Loads all missing Documents of a Studiengang
+	 * a Prestudent has not submitted
+	 * @param integer studiengang_kz
+	 * @param integer prestudent_id
+	 * @param boolean archivdokumente
+	 * 	Default: true.
+	 * 	If false, documents that are archivable (tbl_vorlage.archivierbar e.g. certificate, notice, ...) not retrieved
+	 * @return Array of Documents || error
+	 */
+	public function getMissingDocuments($studiengang_kz, $prestudent_id = null, $archivdokumente = false, $person_id = null)
+	{
+		$parametersArray = array($studiengang_kz);
+
+		$qry = "SELECT
+    				tbl_dokument.* ,
+					tbl_dokumentstudiengang.*
+				FROM public.tbl_dokument
+				JOIN public.tbl_dokumentstudiengang USING(dokument_kurzbz)
+				LEFT JOIN public.tbl_vorlage ON (tbl_dokument.dokument_kurzbz = tbl_vorlage.vorlage_kurzbz)
+				WHERE studiengang_kz = ? ";
+
+		if($prestudent_id)
+		{
+			array_push($parametersArray, $prestudent_id);
+			$qry.="	AND tbl_dokument.dokument_kurzbz NOT IN (
+					SELECT dokument_kurzbz FROM public.tbl_dokumentprestudent WHERE prestudent_id= ?)";
+		}
+
+		if(!$archivdokumente)
+		{
+			$qry.="	AND (tbl_vorlage.archivierbar = FALSE OR tbl_vorlage.archivierbar IS NULL)";
+		}
+
+		$qry.=" ORDER BY tbl_dokument.dokument_kurzbz;";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
+
+	public function getUnacceptedDocuments($prestudent_id, $person_id)
+	{
+		$parametersArray = array($person_id, $prestudent_id);
+
+		$qry = " SELECT
+				  a.akte_id,
+				  a.bezeichnung,
+				  a.dokument_kurzbz,
+				  a.titel_intern,
+				  a.anmerkung_intern,
+				  a.insertamum as hochgeladenamum,
+				  a.updatevon,
+				  a.insertvon,
+				  a.uid,
+				  a.dms_id,
+				  a.anmerkung as infotext,
+				  a.nachgereicht,
+				  CASE
+					WHEN inhalt IS NOT NULL
+					OR a.dms_id IS NOT NULL THEN true
+					ELSE false
+				  END AS vorhanden,
+				  a.nachgereicht_am,
+				  ausstellungsnation,
+				  formal_geprueft_amum,
+				  archiv,
+				  signiert,
+				  stud_selfservice,
+				  akzeptiertamum,
+				  inhalt
+				FROM
+				  public.tbl_akte a
+				WHERE
+				  a.person_id = ?
+				  AND a.dokument_kurzbz NOT IN (
+					SELECT
+					  dokument_kurzbz
+					FROM
+					  public.tbl_dokumentprestudent
+					WHERE
+					  prestudent_id = ?
+					)
+				AND a.dokument_kurzbz NOT IN ('Zeugnis','DiplSupp','Bescheid')
+				ORDER BY a.dokument_kurzbz;";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
index 0a6669359..2415ee483 100644
--- a/application/models/crm/Dokumentprestudent_model.php
+++ b/application/models/crm/Dokumentprestudent_model.php
@@ -69,4 +69,39 @@ class Dokumentprestudent_model extends DB_Model
 
 		return $result;
 	}
+
+	/**
+	 * Loads all Documents of Prestudent, already submitted
+	 * @param integer prestudent_id
+	 * @param boolean archivdokumente Default true. if false, archivable Documents (tbl_vorlage.archivierbar zB Zeugnis, Bescheid, ...) not retrieved
+	 * @return Array of Documents || error
+	 */
+	public function getPrestudentDokumente($prestudent_id, $archivdokumente = true)
+	{
+		$parametersArray = array($prestudent_id);
+
+		$qry = "SELECT
+				  d.bezeichnung,
+				  d.dokument_kurzbz,
+				  dp.datum as Docdatum,
+				  dp.mitarbeiter_uid as DocMitarbeiter_uid,
+				  dp.insertamum as Docinsertamum,
+				  dp.prestudent_id,
+				  CONCAT(p.vorname, ' ', p.nachname) as insertvonma
+				FROM
+				  public.tbl_dokumentprestudent dp
+				  JOIN public.tbl_dokument d USING(dokument_kurzbz)
+				  LEFT JOIN public.tbl_vorlage v ON (d.dokument_kurzbz = v.vorlage_kurzbz)
+				  LEFT JOIN public.tbl_benutzer bn ON (bn.uid = dp.mitarbeiter_uid)
+				  LEFT JOIN public.tbl_person p ON (p.person_id = bn.person_id)
+				WHERE
+				  prestudent_id = ?";
+
+		if(!$archivdokumente)
+		{
+			$qry.="	AND (v.archivierbar = FALSE OR v.archivierbar IS NULL)";
+		}
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..b1d83df88 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import documents from './stv/documents.js';
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	documents,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/documents.js b/public/js/api/stv/documents.js
new file mode 100644
index 000000000..9934520fc
--- /dev/null
+++ b/public/js/api/stv/documents.js
@@ -0,0 +1,33 @@
+export default {
+	getDocumentsUnaccepted(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDocumentsUnaccepted/' + params.id + '/' + params.studiengang_kz);
+	},
+	getDocumentsAccepted(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDocumentsAccepted/' + params.id + '/' + params.studiengang_kz);
+	},
+	deleteZuordnung(params){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/deleteZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz);
+	},
+	createZuordnung(params){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/createZuordnung/'
+			+ params.prestudent_id + '/'
+			+ params.dokument_kurzbz);
+	},
+	loadAkte(akte_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/loadAkte/' + akte_id);
+	},
+	getDoktypen(){
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDoktypen/');
+	},
+	updateFile(akte_id, data){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/updateAkte/' + akte_id,
+			data);
+	},
+	deleteFile(akte_id){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/deleteAkte/' + akte_id);
+	},
+	uploadFile(prestudent_id, data){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/uploadDokument/' + prestudent_id,
+			data);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
new file mode 100644
index 000000000..39dbeb914
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
@@ -0,0 +1,22 @@
+import ViewDocuments from "./Dokumente/Dokumente.js";
+
+export default {
+	components: {
+		ViewDocuments
+	},
+/*	provide() {
+		return {
+			config: this.config
+		};
+	},*/
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-documents h-100 d-flex flex-column">
+		<view-documents ref="vw_documents" :student="modelValue"></view-documents>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
new file mode 100644
index 000000000..be69ae70d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
@@ -0,0 +1,51 @@
+import DocumentsUnaccepted from './List/Unaccepted.js';
+import DocumentsAccepted from './List/Accepted.js';
+
+export default {
+	components: {
+		DocumentsUnaccepted,
+		DocumentsAccepted
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			listMissingDocuments: []
+		}
+	},
+	methods: {
+		reloadUnaccepted(){
+			this.$refs.tableUnaccepted.reload();
+		},
+		reloadAccepted(){
+			this.$refs.tableAccepted.reload();
+		},
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+ 	
+	 	<div class="row mb-3">
+	 		<div class="col-6">
+	 			 <documents-unaccepted
+	 			 	ref="tableUnaccepted"
+					:prestudent_id="student.prestudent_id"
+					:studiengang_kz="student.studiengang_kz"
+					@reloadAccepted="reloadAccepted"
+				></documents-unaccepted>
+			</div>	 		
+
+			<div class="col-6">
+				<documents-accepted
+					ref="tableAccepted"
+					:prestudent_id="student.prestudent_id"
+					:studiengang_kz="student.studiengang_kz"
+					@reloadUnaccepted="reloadUnaccepted"
+				></documents-accepted>	
+			</div>
+
+		</div>
+
+	 </div>
+	 `
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
new file mode 100644
index 000000000..505ee9840
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -0,0 +1,331 @@
+import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
+import ModalEdit from "../Modal/Edit.js";
+import ModalUpload from "../Modal/Upload.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		ModalEdit,
+		ModalUpload
+	},
+	props: {
+		prestudent_id: Number,
+		studiengang_kz: Number
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsAccepted,
+				ajaxParams: () => {
+					return {
+						id: this.prestudent_id,
+						studiengang_kz: this.studiengang_kz
+					};
+				},
+				ajaxResponse: (url, params, response) =>  {
+					return response.data;
+				},
+				columns: [
+					{title: "Dokument", field: "bezeichnung"},
+					{title: "Akzeptiertdatum", field: "docdatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{title: "Akzeptiertvon", field: "insertvonma"},
+					{
+						title: "UploadDatum", field: "hochgeladenamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
+					{title: "Prestudent ID", field: "prestudent_id", visible: false},
+					{title: "nachgereicht", field: "nachgereicht", visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							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"},
+					{title: "vorhanden", field: "vorhanden",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}},
+					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
+					{title: "Nachreichung am", field: "nachgereicht_am",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 50,
+						maxWidth: 100,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if(cell.getData().vorhanden){
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-download"></i>';
+								button.title = this.$p.t('ui', 'downloadDok');
+								button.addEventListener('click', (event) =>
+									this.actionDownloadFile(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								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', 'editDokument');
+								button.addEventListener('click', (event) =>
+									this.actionEditDocument(cell.getData().akte_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', 'deleteDokument');
+								button.addEventListener('click', () =>
+									this.actionDeleteFile(cell.getData().akte_id)
+								);
+								container.append(button);
+							}
+							else
+							{
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-upload"></i>';
+								button.title = this.$p.t('ui', 'uploadDokument');
+								button.addEventListener('click', () =>
+									this.actionUploadFile(cell.getData().dokument_kurzbz)
+								);
+								container.append(button);
+							}
+
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: 300,
+				selectable: true,
+				selectableRangeMode: 'click',
+				persistenceID: 'core-details-documents-accepted',
+				listDocuments: [],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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('global', 'uploaddatum')
+						});
+						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('global', 'dokument')
+						});
+					}
+				}
+			]
+		}
+	},
+	computed: {
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownloadFile(row.getData().akte_id);
+					}
+				}
+			];
+			return events;
+		}
+	},
+	methods: {
+		actionDownloadFile(akte_id){
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		actionUploadFile(dokument_kurzbz){
+			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);
+		},
+		actionEditDocument(akte_id){
+			this.$refs.modalEdit.open(akte_id);
+		},
+		actionDeleteFile(akte_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? akte_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFile)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteFile(akte_id){
+			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				});
+		},
+		deleteZuordnung(selected) {
+			Promise.allSettled(
+				selected.map(e =>
+					this.$fhcApi.factory.stv.documents.deleteZuordnung({
+						prestudent_id: this.prestudent_id,
+						dokument_kurzbz: e.dokument_kurzbz
+					}).then(() => ({
+							success: true,
+							dokument_bz: e.bezeichnung
+						}))
+						.catch(() => ({
+							success: false,
+							dokument_bz: e.bezeichnung
+						}))
+				)
+			).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', 'errorUnaccepted',
+							{'dokument_kurzbz': res.value.dokument_bz}
+						));
+					});
+					let countSuceeded = suceeded.length;
+					if(countSuceeded > 0)
+						this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successCountUnaccepted',
+							{'count': countSuceeded}));
+
+				} else {
+					this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successUnaccepted'));
+				}
+				this.reloadAll();
+			});
+		},
+
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		reloadAll(){
+			this.reload();
+			this.$emit('reloadUnaccepted');
+		}
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+		<h5>{{$p.t('dokumente', 'accepted')}}</h5>
+
+		 <modal-edit
+			ref="modalEdit"
+			@reload="reloadAll"
+		>
+		</modal-edit>
+
+		<modal-upload
+			ref="modalUpload"
+			@reload="reloadAll"
+		>
+		</modal-upload>
+
+	 	<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+	 	>
+			<template #actions="{selected}">
+				<button
+					class="btn btn-primary"
+					@click="deleteZuordnung(selected)"
+					:disabled="!selected.length"
+					>
+						{{$p.t('dokumente', 'dokumentUnaccept')}}
+				</button>
+			</template>
+		</core-filter-cmpt>
+	 </div>
+	 `
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
new file mode 100644
index 000000000..08a9d8f92
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -0,0 +1,344 @@
+import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
+import ModalEdit from "../Modal/Edit.js";
+import ModalUpload from "../Modal/Upload.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		ModalEdit,
+		ModalUpload
+	},
+	props: {
+		prestudent_id: Number,
+		studiengang_kz: Number
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsUnaccepted,
+				ajaxParams: () => {
+					return {
+						id: this.prestudent_id,
+						studiengang_kz: this.studiengang_kz
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Dokument", field: "bezeichnung"},
+					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
+					{
+						title: "UploadDatum", field: "hochgeladenamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+						},
+					{title: "nachgereicht", field: "nachgereicht", visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "vorhanden",
+						field: "vorhanden",
+						formatter: function(cell, formatterParams, onRendered) {
+							let value = cell.getValue();
+							let rowData = cell.getRow().getData();  // Zugriff auf gesamte Zeile
+							let dueDate = rowData["nachgereicht_am"];
+							const date = new Date(dueDate);
+							let dateFormatted = date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+
+							let tickCrossIcon = value
+								? '<i class="fa fa-check text-success"></i>'
+								: '<i class="fa fa-xmark text-danger"></i>';
+
+							// if nachgereicht_am show datum
+							let pill = dueDate
+								? `<span>${dateFormatted}</span>`
+								: '';
+
+							return `${tickCrossIcon} ${pill}`;
+						},
+						hozAlign: "center"
+						},
+					{title: "infotext", field: "infotext"},
+					{title: "akte_id", field: "akte_id"},
+					{title: "titel_intern", field: "titel_intern"},
+					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
+					{title: "Online", field: "onlinebewerbung",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "Pflicht", field: "pflicht",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "Nachreichung am", field: "nachgereicht_am",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 50,
+						maxWidth: 100,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if(cell.getData().akte_id){
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-download"></i>';
+								button.title = this.$p.t('ui', 'downloadDok');
+								button.addEventListener('click', (event) =>
+									this.actionDownloadFile(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								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', 'editDokument');
+								button.addEventListener('click', (event) =>
+									this.actionEditFile(cell.getData().akte_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', 'deleteDokument');
+								button.addEventListener('click', () =>
+									this.actionDeleteFile(cell.getData().akte_id)
+								);
+								container.append(button);
+							}
+							else
+							{
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-upload"></i>';
+								button.title = this.$p.t('ui', 'uploadDokument');
+								button.addEventListener('click', () =>
+									this.actionUploadFile(cell.getData().dokument_kurzbz)
+								);
+								container.append(button);
+							}
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: 300,
+				selectable: true,
+				selectableRangeMode: 'click',
+				persistenceID: 'core-details-documents-unaccepted',
+				listDocuments: [],
+				prestudentDocumentData: [],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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('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')
+						});
+					}
+				}
+			]
+		}
+	},
+	computed: {
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownloadFile(row.getData().akte_id);
+					}
+				}
+			];
+
+			return events;
+			}
+	},
+	methods: {
+		actionDownloadFile(akte_id){
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		actionUploadFile(dokument_kurzbz){
+			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);
+		},
+		actionDeleteFile(akte_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? akte_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFile)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditFile(akte_id){
+			this.$refs.modalEdit.open(akte_id);
+		},
+		acceptDocuments(selected){
+			Promise
+				.allSettled(
+					selected.map(e =>
+						this.$fhcApi.factory.stv.documents.createZuordnung({
+								prestudent_id: this.prestudent_id,
+								dokument_kurzbz: e.dokument_kurzbz,
+							}).then(() => ({
+							success: true,
+							dokument_bz: e.bezeichnung
+						}))
+							.catch(() => ({
+								success: false,
+								dokument_bz: e.bezeichnung
+							}))
+					)
+				)
+				.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}));
+
+						} else {
+							this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successAccepted'));
+						}
+						this.reloadAll();
+				});
+		},
+		deleteFile(akte_id){
+			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				});
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		reloadAll() {
+			this.reload();
+			this.$emit('reloadAccepted');
+		}
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+		<h5>{{$p.t('dokumente', 'unaccepted')}}</h5>
+
+		 <modal-edit
+			ref="modalEdit"
+			@reload="reloadAll"
+			>
+		</modal-edit>
+
+		 <modal-upload
+			ref="modalUpload"
+			@reload="reloadAll"
+			>
+		</modal-upload>
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('global', 'dokument')"
+			@click:new="actionUploadFile"
+		>
+			<template #actions="{selected}">
+				<button
+					class="btn btn-primary"
+					@click="acceptDocuments(selected)"
+					:disabled="!selected.length"
+					>
+						{{$p.t('dokumente', 'dokumentAccept')}}
+				</button>
+			</template>
+		</core-filter-cmpt>
+	 </div>
+	 `
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
new file mode 100644
index 000000000..7b8f1b984
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -0,0 +1,137 @@
+import BsModal from "../../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../../Form/Form.js";
+import FormInput from "../../../../../Form/Input.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		FormInput
+	},
+	data(){
+		return {
+			formData: [],
+			listDokTypen: []
+		}
+	},
+	methods: {
+		updateFile(akte_id){
+			console.log("in update" + akte_id);
+
+			this.$fhcApi.factory.stv.documents.updateFile(akte_id, this.formData).
+			then(response => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.$refs.modalEditDocument.hide();
+				this.$emit('reload');
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		},
+		open(akte_id){
+			this.loadFormData(akte_id);
+			this.$refs.modalEditDocument.show();
+		},
+		loadFormData(akte_id){
+			return this.$fhcApi.factory.stv.documents.loadAkte(akte_id)
+				.then(result => {
+					this.formData = result.data;
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.documents.getDoktypen()
+			.then(result => {
+				this.listDokTypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+		<bs-modal
+			ref="modalEditDocument"
+			dialog-class="modal-dialog-scrollable"
+		>
+			<template #title>
+				{{ $p.t('dokumente', 'dokDetails') }} {{formData.nameperson}}
+			</template>
+
+			<form-form
+				ref="formEditDocument"
+				>
+				<div>
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="dokument_kurzbz"
+							:label="$p.t('dokumente/dokTyp')"
+							v-model="formData.dokument_kurzbz"
+						>
+							<option
+								v-for="typ in listDokTypen"
+								:key="typ.dokument_kurzbz"
+								:value="typ.dokument_kurzbz" >{{typ.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="titel_intern"
+							:label="$p.t('dokumente/title')"
+							v-model="formData.titel_intern"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="formData.anmerkung_intern"
+							rows="5"
+						>
+						</form-input>
+					</div>			
+
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							v-model="formData.nachgereicht_am"
+							name="nachgereicht_am"
+							:label="$p.t('dokumente/nachreichungAm')"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('dokumente/anmerkung_person')"
+							v-model="formData.anmerkung"
+							rows="5"
+							disabled
+						>
+						</form-input>
+					</div>
+
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					<button type="button" class="btn btn-primary" @click="updateFile(formData.akte_id)">{{$p.t('global', 'speichern')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+	`,
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
new file mode 100644
index 000000000..84fa4a57b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -0,0 +1,124 @@
+import BsModal from "../../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../../Form/Form.js";
+import FormInput from "../../../../../Form/Input.js";
+import FormUploadDms from "../../../../../Form/Upload/Dms.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		FormInput,
+		FormUploadDms
+	},
+	data(){
+		return{
+			formData: {
+				dokument_kurzbz: null,
+				anhang: [],
+				anmerkung_intern: null
+			},
+			listDokTypen: []
+		}
+	},
+	methods:{
+		open(prestudent_id, dokument_kurzbz){
+			console.log("ps: " + prestudent_id + 'dok: ' + dokument_kurzbz);
+			this.formData.dokument_kurzbz = dokument_kurzbz;
+			this.formData.prestudent_id = prestudent_id;
+			this.$refs.modalUploadFile.show();
+		},
+		uploadFile(){
+			console.log(this.formData.anhang[0]);
+
+			return this.$fhcApi.factory.stv.documents.uploadFile(this.formData.prestudent_id, this.formData)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successUpload'));
+					this.resetModal();
+					this.$refs.modalUploadFile.hide();
+					this.$emit('reload');
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		resetModal(){
+			this.formData.dokument_kurzbz = null;
+			this.formData.anhang = [];
+			this.formData.anmerkung_intern = null;
+			this.formData.titel_intern = null;
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.documents.getDoktypen()
+			.then(result => {
+				this.listDokTypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+			<bs-modal
+			ref="modalUploadFile"
+			dialog-class="modal-dialog-scrollable"
+		>
+			<template #title>
+				Upload {{ $p.t('stv', 'tab_documents') }} 
+			</template>
+
+			<form-form
+				ref="formUploadFile"
+				>
+
+				<div>
+					<div class="row mb-3">
+						<label for="text" class="form-label col-sm-2">{{$p.t('global','dokument')}}</label>
+						<FormUploadDms ref="upload" id="file" v-model="formData.anhang"></FormUploadDms>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="dokument_kurzbz"
+							:label="$p.t('dokumente/dokTyp')"
+							v-model="formData.dokument_kurzbz"
+						>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="typ in listDokTypen"
+								:key="typ.dokument_kurzbz"
+								:value="typ.dokument_kurzbz" >{{typ.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="titel_intern"
+							:label="$p.t('dokumente/title')"
+							v-model="formData.titel_intern"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="formData.anmerkung_intern"
+							rows="5"
+						>
+						</form-input>
+					</div>
+
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					<button type="button" class="btn btn-primary" @click="uploadFile">{{$p.t('ui', 'hochladen')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+	`,
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a5b83c31d..5a63713b2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40534,6 +40534,688 @@ array(
 		)
 	),
 	// feature-55614 end
+	// FHC4 Studierendenverwaltung Dokumente START
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_documents',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'uploadDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument hochladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'deleteDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'editDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokTyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumententyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'nachreichungAm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachreichung am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submission on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokDetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumentendetails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'anmerkung_person',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkung der Person',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Notes of the Person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successUpload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument erfolgreich hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dokumentupload successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokumentAccept',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokumentUnaccept',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unaccept',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'accepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'unaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nicht Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Not Accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'err_deleteDokHere',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieses Dokument darf hier nicht gelöscht werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This document may not be deleted here',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'err_updateNotAllowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es können nur Eintraege geändert werden zu denen Dokumente hochgeladen wurden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only entries to which documents have been uploaded can be changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'downloadDok',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument herunterladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully set to accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully set to unaccepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successCountUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren von {count} Dokument(en) erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{count} Document(s) successfully set to unaccepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successCountAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren von {count} Dokument(en) erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{count} Document(s) successfully set to accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'errorUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Entakzeptieren von Dokument {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error unaccepting document {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'errorAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Akzeptieren von Dokument {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error Accepting document {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'errorMissingValue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{value} fehlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{value} missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_valueNotNumeric',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{value} darf nur Ziffern enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{value} must contain only numbers.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'nachgereicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachgereicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'vorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'akte_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'nachgereicht_am',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachgereicht am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submitted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'datumAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiertdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'akzeptiertVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dms ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dms ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_fileMissing',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte eine Datei anhängen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please attach a file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_fileType',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur Dateitypen JPEG, PNG oder PDF sind erlaubt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only JPEG, PNG, or PDF files are allowed.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 Studierendenverwaltung Dokumente END
 );
 
 

From 4d1fc5e48c9bddaffcb5290c1c319639f9d05c42 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 09:41:11 +0200
Subject: [PATCH 0123/1357] added name attribute to components

---
 .../components/Stv/Studentenverwaltung/Details/Dokumente.js | 6 +-----
 .../Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 1 +
 .../Details/Dokumente/List/Unaccepted.js                    | 1 +
 .../Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js | 1 +
 .../Studentenverwaltung/Details/Dokumente/Modal/Upload.js   | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
index 39dbeb914..01ca2d373 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
@@ -1,14 +1,10 @@
 import ViewDocuments from "./Dokumente/Dokumente.js";
 
 export default {
+	name:"TabDocuments",
 	components: {
 		ViewDocuments
 	},
-/*	provide() {
-		return {
-			config: this.config
-		};
-	},*/
 	props: {
 		modelValue: Object,
 	},
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 505ee9840..e22ad4cdb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -4,6 +4,7 @@ import ModalUpload from "../Modal/Upload.js";
 
 export default {
 	components: {
+		name: "AcceptedDocuments",
 		CoreFilterCmpt,
 		ModalEdit,
 		ModalUpload
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 08a9d8f92..5b2a2d080 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -3,6 +3,7 @@ import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
 export default {
+	name: "UnacceptedDocuments",
 	components: {
 		CoreFilterCmpt,
 		ModalEdit,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 7b8f1b984..95a12a669 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -3,6 +3,7 @@ import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 
 export default {
+	name: "modalEditDocuments",
 	components: {
 		BsModal,
 		FormForm,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
index 84fa4a57b..dec8da503 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -4,6 +4,7 @@ import FormInput from "../../../../../Form/Input.js";
 import FormUploadDms from "../../../../../Form/Upload/Dms.js";
 
 export default {
+	name: "modalUploadDocuments",
 	components: {
 		BsModal,
 		FormForm,

From b2fef71b4779aaadbe662b606935a84a019700e3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 09:53:54 +0200
Subject: [PATCH 0124/1357] added name attribute to components

---
 .../Messages/Details/Depr_NewMessage.js       | 480 ------------------
 .../Messages/Details/NewMessage/Modal.js      |   1 +
 .../Messages/Details/NewMessage/NewDiv.js     |   1 +
 .../Messages/Details/TableMessages.js         |   3 +-
 public/js/components/Messages/Messages.js     |   1 +
 .../Studentenverwaltung/Details/Messages.js   |   1 +
 6 files changed, 5 insertions(+), 482 deletions(-)
 delete mode 100644 public/js/components/Messages/Details/Depr_NewMessage.js

diff --git a/public/js/components/Messages/Details/Depr_NewMessage.js b/public/js/components/Messages/Details/Depr_NewMessage.js
deleted file mode 100644
index 33ff74d9c..000000000
--- a/public/js/components/Messages/Details/Depr_NewMessage.js
+++ /dev/null
@@ -1,480 +0,0 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
-import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
-import MessageModal from "../Details/NewMessage/Modal.js";
-
-export default {
-	components: {
-		FormForm,
-		FormInput,
-		ListBox,
-		DropdownComponent,
-		MessageModal,
-	},
-	props: {
-		endpoint: {
-			type: String,
-			required: true
-		},
-		typeId: String,
-		id: {
-			type: [Number, String],
-			required: true
-		},
-		openMode: String,
-	},
-	data(){
-		return {
-			formData: {
-				recipient: this.id,
-				subject: null,
-				body: null,
-				vorlage_kurzbz: null,
-				selectedValue: '',
-			},
-			statusNew: true,
-			vorlagen: [],
-			defaultRecipient: null,
-			editor: null,
-			isVisible: false,
-			fieldsUser: [],
-			fieldsPerson: [],
-			fieldsPrestudent: [],
-			selectedFieldPrestudent: null,
-			selectedFieldUser: null,
-			selectedFieldPerson: null,
-			itemsPrestudent: [],
-			itemsPerson: [],
-			itemsUser: [],
-			previewText: null,
-			previewBody: ""
-		}
-	},
-	methods: {
-		initTinyMCE() {
-			const vm = this;
-			tinymce.init({
-				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
-				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
-				style_formats: [
-					{title: 'Blocks', block: 'div'},
-					{title: 'Paragraph', block: 'p'},
-					{title: 'Heading 1', block: 'h1'},
-					{title: 'Heading 2', block: 'h2'},
-					{title: 'Heading 3', block: 'h3'},
-					{title: 'Heading 4', block: 'h4'},
-					{title: 'Heading 5', block: 'h5'},
-					{title: 'Heading 6', block: 'h6'},
-				],
-				autoresize_bottom_margin: 16,
-
-				setup: (editor) => {
-					vm.editor = editor;
-
-					editor.on('input', () => {
-						const newContent = editor.getContent();
-						vm.formData.body = newContent;
-					});
-				},
-			});
-		},
-		updateText(value) {
-			this.formData.body = value;
-		},
-		sendMessage() {
-			//TODO(Manu) check default recipient(s)
-			const data = new FormData();
-			const params = {
-					id: this.id,
-					type_id: this.typeId
-			};
-			const merged = {
-				...this.formData,
-				...params
-			};
-			data.append('data', JSON.stringify(merged));
-
-			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.$refs.formMessage,
-				this.id,
-				data)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					this.hideTemplate();
-					this.resetForm();
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-						//this.resetForm();
-						//closeModal
-						//closewindwo
-						this.$emit('reloadTable');
-					}
-				);
-		},
-		getVorlagentext(vorlage_kurzbz){
-			//console.log(typeof vorlage_kurzbz);
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
-				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					//this.resetForm();
-					//TODO(Manu) CHECK
-					this.formData.body = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				});
-		},
-		getPreviewText(){
-			const data = new FormData();
-
-			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
-				.then(response => {
-					this.previewText = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				});
-		},
-		insertVariable(selectedItem){
-			if (this.editor) {
-				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
-/*				this.editor.focus();
-				this.editor.setDirty(true);*/
-
-				//this.editor.fire('change'); //forces
-
-				//this.editor.undoManager.add();
-
-				//this.editor.insertContent(selectedItem.value + "\u00A0");
-				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
-				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
-
-			} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},
-		resetForm(){
-			this.formData = {
-				vorlage_kurzbz: null,
-				body: null,
-				subject: null,
-			};
-			if (this.editor) {
-				this.editor.setContent("");
-			}
-			this.$refs.dropdownComp.setValue(null);
-
-		},
-/*		toggleDivNewMessage(){
-			this.isVisible = !this.isVisible;
-		},*/
-		handleSelectedVorlage(vorlage_kurzbz) {
-			if (typeof vorlage_kurzbz === "string") {
-				this.getVorlagentext(vorlage_kurzbz);
-				this.formData.subject = vorlage_kurzbz;
-			}
-		},
-		hideTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = false;
-		},
-		showTemplate(id, typeId){
-			if (this.openMode == "showDiv")
-				this.isVisible = true;
-			//just for testing:
-			this.isVisible = true;
-		},
-		showPreview(){
-			this.getPreviewText().then(() => {
-				this.previewBody = this.previewText;
-			});
-		},
-	},
-	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-			//	console.log("Vorlage: " + newVal);
-
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getVorlagentext(newVal);
-				}
-			}
-		}
-	},
-	created(){
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
-				.then(result => {
-					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
-				.then(result => {
-					this.fieldsPrestudent = result.data;
-					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key,
-						value: value
-					}));*/
-					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key.toLowerCase(),
-						value: '{' + key.toLowerCase() + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
-			.then(result => {
-				this.fieldsUser = result.data;
-				const user = this.fieldsUser;
-				this.itemsUser = Object.entries(user).map(([key, value]) => ({
-					label: value,
-					value: '{' + value + '}'
-				}));
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId})
-			.then(result => {
-				this.defaultRecipient = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	async mounted() {
-		this.initTinyMCE();
-	},
-	beforeDestroy() {
-		this.editor.destroy();
-	},
-	template: `
-	<div class="messages-detail-newmessage">
-
-			<message-modal
-				ref="modalMsg"
-				:type-id="typeId"
-				:id="id"
-				:endpoint="endpoint"
-				:openMode="openMode"
-				@reloadTable="reloadTable"
-				>
-			</message-modal>
-<!--			<hr>
-		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
-		<hr>-->
-
-		<div v-show="isVisible">
-			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
-
-				<h4>New Message</h4>
-	<!--			{{formData.body}}
-				||
-				{{previewText}}-->
-
-				<div class="row">
-					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2" ref="formMessage">
-
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
-							<div class="row mb-3">
-
-								<form-input
-									type="text"
-									name="recipient"
-									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
-									disabled
-								>
-								</form-input>
-							</div>
-							
-							<div class="row mb-3">
-								<form-input
-									type="text"
-									name="subject"
-									:label="$p.t('global/betreff') + ' *'"
-									v-model="formData.subject"
-								>
-								</form-input>
-							</div>
-
-							<!--Tiny MCE-->
-							<div class="row mb-3">
-								<form-input
-									ref="editor"
-									:label="$p.t('global','nachricht')  + ' *'"
-									type="textarea"
-									v-model="formData.body"
-									name="text"
-									rows="15"
-									cols="75"
-									>
-								</form-input>
-							</div>
-
-							<div class="row">
-								<DropdownComponent
-									ref="dropdownComp"
-									:label="$p.t('global/vorlage')"
-									@change="handleSelectedVorlage"
-									useLoggedInUserOe
-								>
-								</DropdownComponent>
-							</div>
-
-						</form-form>
-					</div>
-
-					<div class="col-sm-4">
-						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>Felder Prestudent</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
-
-							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-							<p>{{selectedFieldPrestudent}}</p>
-
-						</div>
-
-						<div v-if="this.fieldsPerson.length > 0">
-							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
-							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-							<p>{{selectedFieldPerson}}</p>
-						</div>
-
-						<div>
-							<strong>Meine Felder</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
-							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
-						</div>
-
-						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
-
-							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
-
-							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
-							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
-						</div>
-
-					</div>
-
-				</div>
-
-				<div class="row mt-4">
-
-					<h4>Vorschau:</h4>
-					<div>
-						<form-form class="row g-3 mt-2" ref="formPreview">
-
-							<div class="col-sm-2 mb-3">
-								<form-input
-									type="select"
-									name="recipient"
-									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
-								>
-								</form-input>
-							</div>
-
-							<div class="col-md-2 mt-4">
-								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
-							</div>
-						</form-form>
-
-						<div class="col-sm-12 overflow-scroll">
-								<div ref="preview">
-									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
-								</div>
-						</div>
-
-					</div>
-
-				</div>
-	
-			</div>
-
-		</div>
-
-	</div>
-	`
-
-}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 03345e9d4..33698f1c8 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -5,6 +5,7 @@ import ListBox from "../../../../../../index.ci.php/public/js/components/primevu
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
 export default {
+	name: "ModalNewMessages",
 	components: {
 		BsModal,
 		FormForm,
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 4331dd734..d8db657df 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -4,6 +4,7 @@ import ListBox from "../../../../../../index.ci.php/public/js/components/primevu
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
 
 export default {
+	name: "ComponentNewMessages",
 	components: {
 		FormForm,
 		FormInput,
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 89a118fd1..9047d6726 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,11 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-//import NewMessage from "../Details/NewMessage.js";
 
 export default {
+	name: "TableMessages",
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-	//	NewMessage,
 	},
 	inject: {
 		cisRoot: {
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 5aa7eb7de..337883be3 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -2,6 +2,7 @@ import TableMessages from "./Details/TableMessages.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
 import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
+	name: "MessagesComponent",
 	components: {
 		TableMessages,
 		FormOnly,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 4c1d9bd6b..0c46a6333 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,6 +1,7 @@
 import CoreMessages from "../../../Messages/Messages.js";
 
 export default {
+	name: "TabMessages",
 	components: {
 		CoreMessages
 	},

From 01b3d4580e0015e8130be52d38df2d1f37c98811 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 11:03:00 +0200
Subject: [PATCH 0125/1357] set name attribute to components

---
 public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
index 1c7c47d6b..96fc6c772 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
@@ -1,6 +1,7 @@
 import GruppenList from './Gruppen/Gruppen.js';
 
 export default {
+	name: 'TabGroups',
 	components: {
 		GruppenList
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 63a9b24e1..6434f9fa8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 
 export default {
+	name: 'TblGroups',
 	components: {
 		CoreFilterCmpt,
 	},

From 958577902decc826190b75c2ef8c41e957ea1032 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 11:07:54 +0200
Subject: [PATCH 0126/1357] set name attribute to components

---
 .../components/Stv/Studentenverwaltung/Details/Anrechnungen.js   | 1 +
 .../Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
index 76d8ae7dd..c98f0598f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
@@ -1,6 +1,7 @@
 import AnrechnungenList from './Anrechnungen/Anrechnungen.js';
 
 export default {
+	name: "TabExemptions",
 	components: {
 		AnrechnungenList
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 0560f1b5c..9515f2be6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -5,6 +5,7 @@ import FormInput from "../../../../Form/Input.js";
 import CoreNotiz from "../../../../Notiz/Notiz.js";
 
 export default {
+	name: "ExemptionComponent",
 	components: {
 		CoreFilterCmpt,
 		BsModal,

From d75e26f8aea359d073d46d54d7801c681721af10 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Apr 2025 14:46:36 +0200
Subject: [PATCH 0127/1357] add basis framework for lv dates

---
 .../api/frontend/v1/stv/Config.php            |  5 ++
 .../api/frontend/v1/stv/Lvtermine.php         | 67 +++++++++++++++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/api/stv.js                          |  2 +
 public/js/api/stv/courselist.js               |  6 ++
 .../Details/Lehrveranstaltungstermine.js      | 18 +++++
 .../ListLehrveranstaltungstermine.js          | 47 +++++++++++++
 system/phrasesupdate.php                      | 24 ++++++-
 8 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Lvtermine.php
 create mode 100644 public/js/api/stv/courselist.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..2232189b5 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['coursedates'] = [
+			'title' => $this->p->t('stv', 'tab_courseDates'),
+			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/controllers/api/frontend/v1/stv/Lvtermine.php b/application/controllers/api/frontend/v1/stv/Lvtermine.php
new file mode 100644
index 000000000..17a529f85
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Lvtermine.php
@@ -0,0 +1,67 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Lvtermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStundenplan' => ['admin:r', 'assistenz:r'],
+			'getLvsStudent' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+	}
+
+	public function getStundenplan($uid)
+	{
+		//get stundenplan for uid
+		$result = $this->StundenplanModel->loadForUid($uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+
+	}
+
+	public function getLvsStudent($uid)
+	{
+		$authUID = getAuthUID();
+		//$this->terminateWithError('uid' . $uid, self::ERROR_TYPE_GENERAL);
+		//$this->terminateWithError('uid' . $authUID, self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables($authUID);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//$this->terminateWithSuccess(current($data)); // WS2025
+
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->StundeModel->addOrder('stunde', 'ASC');
+		$result = $this->StundeModel->load();
+		$dataStunden = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($dataStunden);
+	//	$this->terminateWithSuccess(current($data));
+
+		//TODO(manu) check existing apis for liste stundenplan und lvs
+		// version for student
+		// version for lehrfaecherverteilung
+
+
+
+
+	}
+}
\ No newline at end of file
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..40498a766 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -421,7 +421,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function loadForUid($uid)
 	{
-		$this->addSelect(['sp.*','le.studiensemester_kurzbz']);
+		$this->addSelect(['5sp.*','le.studiensemester_kurzbz']);
 		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..e9f0fd2f5 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import courselist from './stv/courselist.js';
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	courselist,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/courselist.js b/public/js/api/stv/courselist.js
new file mode 100644
index 000000000..b6035c098
--- /dev/null
+++ b/public/js/api/stv/courselist.js
@@ -0,0 +1,6 @@
+export default {
+	getCourselist(url, config, params) {
+		console.log("her");
+		return this.$fhcApi.get('api/frontend/v1/stv/Lvtermine/getLvsStudent/' + params.id);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
new file mode 100644
index 000000000..6845613ab
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
@@ -0,0 +1,18 @@
+import TableLvList from "./Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js";
+
+export default {
+	name: "TabCourseList",
+	components: {
+		TableLvList
+	},
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-course-list h-100 d-flex flex-column">	
+		<table-lv-list ref="tbl_course_list" :student="modelValue"></table-lv-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
new file mode 100644
index 000000000..8a6c0d2b0
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -0,0 +1,47 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+
+export default {
+	name: "TblCourseList",
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
+				ajaxParams: () => {
+					return {
+						id: this.student.uid
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Prestudent_id", field: "prestudent_id"},
+					]
+			},
+			tabulatorEvents: [],
+		}
+
+	},
+	methods: {},
+	template: `
+		<div class="stv-details-courselist h-100 pb-3">
+			<h4>Termine</h4>
+			{{student}}
+		
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				>
+			</core-filter-cmpt>
+		</div>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..7d6d7361d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,30 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC 4 Lehrveranstaltungstermine START ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_courseDates',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC 4 Lehrveranstaltungstermine ENDE ---------------------------------------------------------------------------
 );
 
 

From 9b9b8b1532e0ebde6f87805939ee102e9bfcec8f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 9 Apr 2025 10:50:19 +0200
Subject: [PATCH 0128/1357] feature(CIS Dashboard gridsystem): allows to pin
 widgets in the grid and changes how widgets are positioned in different
 viewports

---
 public/css/components/dashboard.css       |  12 +--
 public/js/components/Dashboard/Item.js    |  39 ++++++-
 public/js/components/Dashboard/Section.js |  85 ++++-----------
 public/js/components/Drop/Grid.js         | 126 +++++++++++++++++++---
 public/js/composables/GridLogic.js        |  65 ++++++++++-
 5 files changed, 233 insertions(+), 94 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 1a9808e0c..47ce239ee 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -77,12 +77,10 @@
 	z-index: 2;
 }
 
-.dragged-widget-icon{
-	position: absolute;
-	height: 250px;
-	width: 200px;
-	top: -999px;
-	left: -999px;
-	z-index: 3;
+.pin:hover{
+	cursor: pointer;
 }
 
+.pin[pinned]:hover{
+	color:rgb(153, 116, 116);
+}
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index b78659a96..33e614531 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -24,7 +24,9 @@ export default {
 		"dragstart",
 		"resizestart",
 		"configOpened",
-		"configClosed"
+		"configClosed",
+		"pinItem",
+		"unPinItem"
 	],
 	props: [
 		"id",
@@ -36,8 +38,13 @@ export default {
 		"hidden",
 		"editMode",
 		"loading",
+		"item_data",
+		"place",
 	],
 	computed: {
+		isPinned(){
+			return this.place?.pinned ? true : false;
+		},
 		isResizeable() {
 			if (!this.widget) return false;
 			return this.widget.setup.width.max || this.widget.setup.height.max;
@@ -47,6 +54,17 @@ export default {
 		},
 	},
 	methods: {
+		unpin(){
+			// Unpinning is only possible in edit mode
+			if(!this.editMode)
+				return;
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			this.$emit('unPinItem', [result]);
+		},
+		pinItem(){
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y};
+			this.$emit('pinItem',[result]);
+		},
 		getWidgetC4Link(widget) {
 			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router + widget.setup.cis4link)
@@ -120,12 +138,25 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
-				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+			<template v-if="isPinned">
+				<div v-if="editMode" pinned="true" @click="unpin" class="pin cursor-pointer col-auto me-2">
+					<i class="fa-solid fa-thumbtack "></i>
+				</div>
+				<div v-else class="col-auto me-2">
+					<i class="fa-solid fa-thumbtack "></i>
+				</div>
+			</template>
+			<template v-else>
+				<div v-if="editMode"  class="col-auto me-2 pin" @click="pinItem">
+					<i class="fa-solid fa-thumbtack" style="color:lightgray;"></i>
+				</div>
+			</template>
 			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
@@ -157,7 +188,7 @@ export default {
 			</template>
 		</bs-modal>
 		<height-transition>
-			<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
+			<div v-if="editMode && isResizeable && !isPinned" class="card-footer d-flex justify-content-end p-0">
 				<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
 			</div>
 		</height-transition>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 0ff0f52e2..44fac5550 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -57,71 +57,28 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
-
-			const computeNearestPlace = (item, gridWidth) =>{
+			// reuses the nearest placement of the widget from another viewport 
+			/* const computeNearestPlace = (item, gridWidth) =>{
 				let place;
 				if (Object.keys(item.place).length > 0) {
 					const nearestIndex = Object.keys(item.place)
 											   .sort((a, b) => Math.abs(a - gridWidth) - Math.abs(b - gridWidth))
-											   .pop();
+											   .shift();
 					place = item.place[nearestIndex];
 				}
 				else{
 					place = { x: 0, y: 0, w: 1, h: 1 };
 				}
 				return place;
-			}
+			} */
 			
-			return this.widgets.map(item => {
-				return { ...item, ...(item.place[this.gridWidth] || computeNearestPlace(item, this.gridWidth))};
+			let placedItems = this.widgets.map(item => {
+				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
 			});
+			return placedItems;
+			
 		},
-		items_hashmap() {
-			let items = {};
-			this.items.forEach(item => {
-				items[`x${item.x}y${item.y}`] = item;
-			});
-			return items
-		},
-		items_placeholders(){
-			let placeholders = [];
-			let col_max = this.gridWidth;
-			let rows_max = this.gridHeight;
-
-			// occupied hashmap to keep track of the occupied cells
-			let occupied = {};
-
-			for (let y = 0; y < rows_max; y++) {
-				for (let x = 0; x < col_max; x++) {
-					// skip current position if it was registered as occupied
-					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
-						continue;
-					}
-					let current_item = this.items_hashmap[`x${x}y${y}`];
-					if (current_item) {
-						//calculate the occupied cells from the width and the height from the items 
-						let width = current_item.w;
-						let height = current_item.h;
-						let max_x = x + width - 1;
-						let max_y = y + height - 1;
-						if(x != max_x || y != max_y){
-							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
-								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
-									if (occupied_x != x || occupied_y != y) {
-										occupied[`x${occupied_x}y${occupied_y}`]=true;
-									}
-								}
-							}
-						}
-					}
-					else {
-						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true, 
-							data: { id: 'placeholder_' + String(placeholders.length).padStart(4, "0") } });
-					}
-				}
-			}
-			return placeholders;
-		},
+		
 	},
 	methods: {
 		handleConfigOpened() {
@@ -140,7 +97,7 @@ export default {
 				else
 					minmaxW = {min:minmaxW,max:minmaxW};
 				if (w < minmaxW.min)
-					w = minmaxW.min;
+					w = minmaxW.min; 
 				if (w > minmaxW.max)
 					w = minmaxW.max;
 
@@ -170,7 +127,7 @@ export default {
 			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
-		updatePositions(updated) {
+		updatePositions(updated, pinned=false) {
 			let result = {};
 			updated.forEach(update => {
 				
@@ -182,6 +139,7 @@ export default {
 				delete item.y;
 				delete item.w;
 				delete item.h;
+				delete item.place[this.gridWidth].pinned;
 				if (update.x !== undefined)
 					item.place[this.gridWidth].x = update.x;
 				if (update.y !== undefined)
@@ -190,11 +148,13 @@ export default {
 					item.place[this.gridWidth].w = update.w;
 				if (update.h !== undefined)
 					item.place[this.gridWidth].h = update.h;
+				if (pinned){
+					item.place[this.gridWidth].pinned = true;
+				}
 
 				result[item.id] = item;
 				}
 			});
-			
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
@@ -213,13 +173,8 @@ export default {
 		});
 	},
 	template: `
-	<div class="dashboard-section position-relative" ref="container" :style="getSectionStyle">
-		<template v-for="setup in widgetsSetup">
-			<div class="dragged-widget-icon" :id="'widget-'+name+'-'+setup.widget_id" >
-				<widget-icon v-if="widgetsSetup" :widget="setup"></widget-icon>
-			</div>
-		</template>
-		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
 				<dashboard-item 
@@ -228,15 +183,19 @@ export default {
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
 					:editMode="editMode"
+					:place="item.place[gridWidth]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
-					@config-closed="handleConfigClosed">
+					@config-closed="handleConfigClosed"
+					@pinItem="updatePositions($event,true)"
+					@unPinItem="updatePositions">
 				</dashboard-item>
 				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 535eed2ba..b69973294 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -24,10 +24,6 @@ export default {
 			type: Number,
 			default: 0
 		},
-		placeholders: {
-			type: Array,
-			default: () => []
-		}
 	},
 	emits: [
 		"rearrangeItems",
@@ -48,8 +44,11 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
+			draggedNode: null,
 			draggedItemIcon: null,
 			additionalRow: null,
+			reorderedItems:[],
+			clonedWidget:null,
 		}
 	},
 	inject:{
@@ -59,6 +58,64 @@ export default {
 		},
 	},
 	computed: {
+		items_hashmap() {
+			let items = {};
+			this.items.forEach(item => {
+				if (this.reorderedItems.length > 0){
+					if(item.reorder){
+						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
+						if (rearrangedPosition) {			
+							item.x = rearrangedPosition.x;
+							item.y = rearrangedPosition.y;
+						}
+					}
+				}
+				items[`x${item.x}y${item.y}`] = item;
+			});	
+			return items
+		},
+		items_placeholders(){
+			let placeholders = [];
+			let col_max = this.cols;
+			let rows_max = this.rows;
+
+			// occupied hashmap to keep track of the occupied cells
+			let occupied = {};
+
+			for (let y = 0; y < rows_max; y++) {
+				for (let x = 0; x < col_max; x++) {
+					// skip current position if it was registered as occupied
+					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
+						continue;
+					}
+					let current_item = this.items_hashmap[`x${x}y${y}`];
+					if (current_item) {
+						//calculate the occupied cells from the width and the height from the items 
+						let width = current_item.w;
+						let height = current_item.h;
+						let max_x = x + width - 1;
+						let max_y = y + height - 1;
+						if(x != max_x || y != max_y){
+							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
+								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
+									if (occupied_x != x || occupied_y != y) {
+										occupied[`x${occupied_x}y${occupied_y}`]=true;
+									}
+								}
+							}
+						}
+					}
+					else {
+						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true, 
+							data: { id: 'placeholder_' + String(placeholders.length).padStart(4, "0") } });
+					}
+				}
+			}
+			return placeholders;
+		},
+		placedItems_withPlaceholders() {
+			return [...this.placedItems, ...this.items_placeholders];
+		},
 		rows() {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
 				return this.dragGrid.h;
@@ -83,6 +140,7 @@ export default {
 						y: item.y,
 						w: item.w,
 						h: item.h,
+						reorder: item.reorder,
 						weight: item.weight || 0,
 						data: item
 					}
@@ -110,7 +168,7 @@ export default {
 			if (!this.positionUpdates)
 				return this.prePlacedItems;
 			return this.prePlacedItems.map(item => {
-				if (!this.positionUpdates[item.index])
+				if (!this.positionUpdates[item.index] )
 					return item;
 				return {
 					index: item.index,
@@ -123,9 +181,6 @@ export default {
 				};
 			});
 		},
-		placedItems_withPlaceholders(){
-			return [...this.placedItems,...this.placeholders];
-		},
 		showEmptyTileHover() {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
 				return false;
@@ -169,27 +224,52 @@ export default {
 		}
 	},
 	methods: {
+		
 		toggleDraggedItemOverlay(condition){
-			if(!this.draggedItem)
+			if(!this.draggedNode)
 				return;
-			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
 			if(condition){
-				draggedItemNode.classList.add("dashboard-item-overlay");
+				this.draggedNode.firstElementChild.classList.add("dashboard-item-overlay");
 			}else{
-				draggedItemNode.classList.remove("dashboard-item-overlay");
+				this.draggedNode.firstElementChild.classList.remove("dashboard-item-overlay");
 			}
 		},
 		dragging(event){
 			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
-			    this.draggedItemIcon.style.top = `${this.clientY}px`;
-			    this.draggedItemIcon.style.left = `${this.clientX}px`;
+				this.clonedWidget.style.top = `${this.clientY-20}px`;
+				this.clonedWidget.style.left = `${this.clientX-15}px`;
 			}
 		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
-			[...items].sort((a, b) => a.weight > b.weight).forEach(item => {
+			let sortedItems = [...items].sort((a, b) => {
+				if (a.reorder){
+					return 999;
+				}
+				if (b.reorder){
+					return -999;
+				}
+				return a.weight > b.weight;
+			}); 
+			let reorderedItems = [];
+			sortedItems.forEach(item => {
+				let freeSlots = this.grid.getFreeSlots();
+				
+				if(item.reorder){
+					item.reorder=true;
+					let firstFreeSlot = freeSlots.shift();
+					if (!firstFreeSlot) {
+						item.x = 0;
+						item.y = this.grid.h;
+					}else{
+						item.x = firstFreeSlot.x;
+						item.y = firstFreeSlot.y;
+					}
+					reorderedItems.push(item);
+					
+				}
 				if (item.x + item.w > this.cols) {
 					let targetW = this.cols-item.x,
 						targetX = undefined;
@@ -214,10 +294,12 @@ export default {
 				item.frame = this.grid.getItemFrame(item);
 				this.convertGridResultToUpdate(this.grid.add(item), result, items);
 			});
+			this.reorderedItems = reorderedItems;
 			this.grid.clearWeights();
 			return result;
 		},
 		convertGridResultToUpdate(input, output, baseArray) {
+			
 			if (!input)
 				return;
 			if (!baseArray)
@@ -296,7 +378,14 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
-			this.draggedItemIcon = document.getElementById(`widget-${this.sectionName}-${this.draggedItem?.data.widget}`);
+			this.draggedNode = evt.target;
+			//clones the widget for the drag Image
+			let clone = evt.target.cloneNode(true);
+			clone.style.zIndex = 20;
+			clone.classList.add("widgetClone");
+			this.$refs.container.appendChild(clone);
+			this.clonedWidget = clone;
+			
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -353,6 +442,7 @@ export default {
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			this.draggedNode = null;
 			
 			if(this.draggedItemIcon){
 				this.draggedItemIcon.style.top = '-999px';
@@ -362,6 +452,10 @@ export default {
 			
 		},
 		dragEnd() {
+			let widgetClones = document.getElementsByClassName("widgetClone");
+			for(let widget of widgetClones){
+				this.$refs.container.removeChild(widget);
+			}
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 10aa2909c..fae9a082d 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -23,9 +23,34 @@ class GridLogic {
 		const i = y*this.w + x;
 		return !this.grid[i] && this.grid[i] !== 0;
 	}
+	getMaxY(){
+		return this.data.reduce((acc, item) => { 
+			if (item?.y > acc) {
+				 acc = item.y; 
+			} 
+			return acc; 
+		}, 0);
+	}
+	getFreeSlots() {
+		const freeSlots = [];
+		let biggestY = this.getMaxY();
+		let totalSpaces = this.w * (biggestY+1);
+		for(let i=0; i < totalSpaces; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
+				this.grid[i] = undefined;
+			}
+		}
+		for(let i =0; i < this.grid.length; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
+				let x = i % this.w;
+				let y = Math.floor(i / this.w);
+				freeSlots.push({x, y});
+			}
+		}
+		return freeSlots;
+	}
 	add(item, prefer) {
 		let occupiers = this.getItemsInFrame(item.frame);
-
 		if (!occupiers.length) {
 			item.frame.forEach(f => this.grid[f] = item.index);
 			this.data[item.index] = item;
@@ -63,6 +88,7 @@ class GridLogic {
 				});
 				item.frame.forEach(f => this.grid[f] = item.index);
 				this.data[item.index] = item;
+
 				return result;
 			} else {
 				console.error('FATAL', "can't arrange item on grid");
@@ -70,8 +96,11 @@ class GridLogic {
 		}
 	}
 	move(item, x, y) {
+		if (item.data.place[this.w].pinned)
+			return [];
 		if (item.x == x && item.y == y)
 			return [];
+		
 		this.remove(item);
 
 		let prefer = undefined;
@@ -91,6 +120,32 @@ class GridLogic {
 		currItem.x = x;
 		currItem.y = y;
 		currItem.frame = this.getItemFrame(currItem);
+		let occupiers = this.getItemsInFrame(currItem.frame);
+		
+		// does not update if the target conatins pinned widgets
+		if (occupiers.some(frame => this.data[frame]?.data.place[this.w].pinned)) {
+			return [];
+		}
+		
+		// checks if target contains widget with the same high and width
+		let replace = occupiers
+					.map(occupier => this.data[occupier])
+					.filter( occupier => {
+						return occupier.data.w == item.w && occupier.data.h == item.h
+					});
+		
+		// replaces positions of widget and target widget if they have same height and width
+		if(replace.length > 0){
+			let replaceUpdate =[];
+			replaceUpdate[replace[0].index] = { index: replace[0].index, x:item.x, y:item.y };
+			replaceUpdate[item.index] = { index: item.index, x: replace[0].x, y: replace[0].y};
+			//update Grid and dataGrid 
+			replace[0].frame.forEach(f => this.grid[f] = item.index)
+			item.frame.forEach(f => this.grid[f] = replace[0].index);
+			this.data[replace[0].index] = item;
+			this.data[item.index] = replace[0];
+			return replaceUpdate;
+		}
 		
 		const updates = this.add(currItem, prefer);
 		updates[item.index] = {index: item.index, x, y};
@@ -145,25 +200,27 @@ class GridLogic {
 		let targetframe;
 		switch(dir) {
 			case DIR_UP:
-				if (this.data[index].y - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].y - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-this.w*amount);
 				move.y = -amount;
 				break;
 			case DIR_DOWN:
+				if (this.data[index].data?.place[this.w]?.pinned)
+					return false;
 				if (this.data[index].y + this.data[index].h + amount > this.h)
 					cost += .4;
 				targetframe = this.data[index].frame.map(i => i+this.w*amount);
 				move.y = amount;
 				break;
 			case DIR_LEFT:
-				if (this.data[index].x - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-amount);
 				move.x = -amount;
 				break;
 			case DIR_RIGHT:
-				if (this.data[index].x + this.data[index].w + amount > this.w)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x + this.data[index].w + amount > this.w)
 					return false;
 				targetframe = this.data[index].frame.map(i => i+amount);
 				move.x = amount;

From 419c199e84ab9d2c3590546c224ff3d2c2c053c6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 9 Apr 2025 11:06:50 +0200
Subject: [PATCH 0129/1357] new Tab GemeinsameStudien

---
 .../api/frontend/v1/stv/Config.php            |   5 +
 .../api/frontend/v1/stv/GemeinsameStudien.php | 283 +++++++++++
 .../models/codex/Mobilitaetstyp_model.php     |  14 +
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/jointstudies.js             |  33 ++
 .../Details/JointStudies.js                   |  16 +
 .../Details/JointStudies/JointStudies.js      | 467 ++++++++++++++++++
 system/phrasesupdate.php                      | 144 +++++-
 8 files changed, 963 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
 create mode 100644 application/models/codex/Mobilitaetstyp_model.php
 create mode 100644 public/js/api/stv/jointstudies.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..e0d9daf26 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['jointstudies'] = [
+			'title' => $this->p->t('stv', 'tab_jointstudies'),
+			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
new file mode 100644
index 000000000..dbf9efce1
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
@@ -0,0 +1,283 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class GemeinsameStudien extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudien' => ['admin:r', 'assistenz:r'],
+			'loadStudie' => ['admin:r', 'assistenz:r'],
+			'insertStudie' => ['admin:rw', 'assistenz:rw'],
+			'updateStudie' => ['admin:rw', 'assistenz:rw'],
+			'deleteStudie' => ['admin:rw', 'assistenz:rw'],
+			'getProgramsStudien' => ['admin:r', 'assistenz:r'],
+			'getTypenMobility' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+			'getStudienprogramme' => ['admin:r', 'assistenz:r'],
+			'getPartnerfirmen' => ['admin:r', 'assistenz:r'],
+			'getStatiPrestudent' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'jointstudies'
+		]);
+
+		// Load models
+		$this->load->model('codex/Mobilitaet_model', 'MobilitaetModel');
+
+		//TODO(check if additional Permissions necessary): 'student/stammdaten'
+	}
+
+	public function getStudien($prestudent_id)
+	{
+		$this->MobilitaetModel->addSelect('mobilitaet_id');
+		$this->MobilitaetModel->addSelect('mobilitaetstyp_kurzbz');
+		$this->MobilitaetModel->addSelect('prestudent_id');
+		$this->MobilitaetModel->addSelect('studiensemester_kurzbz');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.mobilitaetsprogramm_code');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.gsprogramm_id');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.firma_id');
+		$this->MobilitaetModel->addSelect('status_kurzbz');
+		$this->MobilitaetModel->addSelect('ausbildungssemester');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.insertvon');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.insertamum');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.updatevon');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.updateamum');
+		$this->MobilitaetModel->addSelect('mp.kurzbz');
+		$this->MobilitaetModel->addSelect('gp.gsprogrammtyp_kurzbz');
+		$this->MobilitaetModel->addSelect('gp.bezeichnung as studienprogramm');
+		$this->MobilitaetModel->addSelect('f.name as partner');
+
+		$this->MobilitaetModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_mobilitaet.mobilitaetsprogramm_code)', 'LEFT');
+		$this->MobilitaetModel->addJoin('bis.tbl_gsprogramm gp', 'ON (gp.gsprogramm_id = bis.tbl_mobilitaet.gsprogramm_id)', 'LEFT');
+		$this->MobilitaetModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = bis.tbl_mobilitaet.firma_id)', 'LEFT');
+
+		$result = $this->MobilitaetModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getTypenMobility()
+	{
+		$this->load->model('codex/Mobilitaetstyp_model', 'MobilitaetstypModel');
+
+		$result = $this->MobilitaetstypModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStudienprogramme()
+	{
+		$this->load->model('codex/Gsprogramm_model', 'GsprogrammModel');
+
+		$result = $this->GsprogrammModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getPartnerfirmen()
+	{
+		$this->load->model('ressource/Firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->loadWhere(
+			['partner_code !=' => null]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStatiPrestudent()
+	{
+		$this->load->model('crm/Status_model', 'StatusModel');
+
+		$result = $this->StatusModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadStudie($mobilitaet_id)
+	{
+		$result = $this->MobilitaetModel->load($mobilitaet_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertStudie()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+			? $formData['ausbildungssemester']
+			: null;
+		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+			? $formData['mobilitaetstyp_kurzbz']
+			: null;
+		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+			? $formData['studiensemester_kurzbz'] : null;
+
+		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausbildungssemester']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ausbildungssemester']),
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_kurzbz = (isset($formData['status_kurzbz']) && !empty($formData['status_kurzbz']))
+			? $formData['status_kurzbz']
+			: null;
+		$mobilitaetsprogramm_code = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code']))
+			? $formData['mobilitaetsprogramm_code']
+			: null;
+		$gsprogramm_id = (isset($formData['gsprogramm_id']) && !empty($formData['gsprogramm_id']))
+			? $formData['gsprogramm_id']
+			: null;
+		$firma_id= (isset($formData['firma_id']) && !empty($formData['firma_id'])) ? $formData['firma_id'] : null;
+
+		$result = $this->MobilitaetModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+			'gsprogramm_id' => $gsprogramm_id,
+			'firma_id' => $firma_id,
+			'ausbildungssemester' => $_POST['ausbildungssemester'],
+			'insertvon' => $authUID,
+			'insertamum' => date('c'),
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateStudie()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$_POST['mobilitaet_id'] = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
+			? $formData['mobilitaet_id'] :
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilitaet ID']), self::ERROR_TYPE_GENERAL);
+		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+			? $formData['ausbildungssemester']
+			: null;
+		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+			? $formData['mobilitaetstyp_kurzbz']
+			: null;
+		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+			? $formData['studiensemester_kurzbz']
+			: null;
+
+		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausbildungssemester']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ausbildungssemester']),
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_kurzbz = (isset($formData['status_kurzbz']) && !empty($formData['status_kurzbz'])) ? $formData['status_kurzbz'] : null;
+		$mobilitaetsprogramm_code = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code']))
+			? $formData['mobilitaetsprogramm_code']
+			: null;
+		$gsprogramm_id = (isset($formData['gsprogramm_id']) && !empty($formData['gsprogramm_id']))
+			? $formData['gsprogramm_id']
+			: null;
+		$firma_id= (isset($formData['firma_id']) && !empty($formData['firma_id'])) ? $formData['firma_id'] : null;
+
+		$result = $this->MobilitaetModel->update(
+			[
+				'mobilitaet_id' => $_POST['mobilitaet_id'],
+			],
+			[
+				'prestudent_id' => $prestudent_id,
+				'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+				'status_kurzbz' => $status_kurzbz,
+				'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+				'gsprogramm_id' => $gsprogramm_id,
+				'firma_id' => $firma_id,
+				'ausbildungssemester' => $_POST['ausbildungssemester'],
+				'updatevon' => $authUID,
+				'updateamum' => date('c'),
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteStudie($mobilitaet_id)
+	{
+		if(!$mobilitaet_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilität ID']), self::ERROR_TYPE_GENERAL);
+		}
+		$result = $this->MobilitaetModel->delete(
+			array('mobilitaet_id' => $mobilitaet_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/models/codex/Mobilitaetstyp_model.php b/application/models/codex/Mobilitaetstyp_model.php
new file mode 100644
index 000000000..f93f588a0
--- /dev/null
+++ b/application/models/codex/Mobilitaetstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Mobilitaetstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_mobilitaetstyp';
+		$this->pk = 'mobilitaetstyp_kurzbz';
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..89a69c84e 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import jointstudies from "./stv/jointstudies.js";
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	jointstudies,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/jointstudies.js b/public/js/api/stv/jointstudies.js
new file mode 100644
index 000000000..b550852df
--- /dev/null
+++ b/public/js/api/stv/jointstudies.js
@@ -0,0 +1,33 @@
+export default {
+	getStudies(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudien/' + params.id);
+	},
+	getTypenMobility(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getTypenMobility/');
+	},
+	getStudiensemester(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudiensemester/');
+	},
+	getStudyprograms(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudienprogramme/');
+	},
+	getListPartner(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getPartnerfirmen/');
+	},
+	getStatiPrestudent(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStatiPrestudent/');
+	},
+	loadStudy(id){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/loadStudie/' + id);
+	},
+	insertStudy(form, data){
+		return this.$fhcApi.post(form,'api/frontend/v1/stv/GemeinsameStudien/insertStudie/', data);
+	},
+	updateStudy(form, data){
+		return this.$fhcApi.post(form,'api/frontend/v1/stv/GemeinsameStudien/updateStudie/', data);
+	},
+	deleteStudy(id){
+		return this.$fhcApi.post('api/frontend/v1/stv/GemeinsameStudien/deleteStudie/' + id);
+	},
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
new file mode 100644
index 000000000..e80ae34f6
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
@@ -0,0 +1,16 @@
+import TblJointStudies from "./JointStudies/JointStudies.js";
+
+export default {
+	name: 'Tab_JointStudies',
+	components: {
+		TblJointStudies
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+	<div class="stv-details-jointstudies h-100">
+		<tbl-joint-studies :student="modelValue"></tbl-joint-studies>
+	</div>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
new file mode 100644
index 000000000..1c75486de
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -0,0 +1,467 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+
+export default {
+	name: 'Tbl_JointStudies',
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.jointstudies.getStudies,
+				ajaxParams: () => {
+					return {
+						id: this.student.prestudent_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
+					{title: "StSem", field: "studiensemester_kurzbz"},
+					//	{title: "mobilitaetstyp_kurzbz", field: "mobilitaetstyp_kurzbz"},
+					{title: "kurzbz", field: "kurzbz"},
+					{title: "prestudent_id", field: "prestudent_id", visible: false},
+					{title: "Status", field: "status_kurzbz"},
+					{title: "Partner", field: "partner", visible: false},
+					{title: "Sem", field: "ausbildungssemester"},
+					{title: "gsprogrammtyp_kurzbz", field: "gsprogrammtyp_kurzbz"},
+					{title: "studienprogramm", field: "studienprogramm", visible: false},
+					{title: "insertvon", field: "insertvon", visible: false},
+					{
+						title: "insertamum", field: "insertamum",
+						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",
+							});
+						},
+						visible: false
+					},
+					{title: "updatevon", field: "updatevon", visible: false},
+					{
+						title: "updateamum", field: "updateamum",
+						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",
+							});
+						},
+						visible: false
+					},
+					{
+						title: 'Aktionen',
+						field: 'actions',
+						minWidth: 150,
+						maxWidth: 150,
+						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-copy"></i>';
+							button.title = this.$p.t('exam', 'newFromOld_studies');
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionNewFromOldJointStudy(cell.getData().mobilitaet_id)
+							);
+							container.append(button);
+
+							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('exam', 'edit_studies');
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditJointStudy(cell.getData().mobilitaet_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('exam', 'delete_studies');
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteJointStudy(cell.getData().mobilitaet_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'jointstudies', 'ui', 'lehre', 'mobility']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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')
+						});
+
+/*						cm.getColumnByField('actions').component.updateDefinition({
+						title: this.$p.t('global', 'aktionen')
+						});*/
+					}
+				}
+			],
+			formData: {
+				mobilitaetstyp_kurzbz: "GS",
+				studiensemester_kurzbz: this.currentSemester,
+				status_kurzbz: 'Student',
+				mobilitaet_id: null
+			},
+			statusNew: true,
+			listTypenMobility: [],
+			listStudiensemester: [],
+			programsMobility: [],
+			listStudienprogramme: [],
+			listPartner: [],
+			statiPrestudent: [],
+		}
+	},
+	methods: {
+		actionDeleteJointStudy(mobilitaet_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? mobilitaet_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteJointStudy)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditJointStudy(mobilitaet_id) {
+			this.resetForm();
+			this.statusNew = false;
+			this.loadJointStudy(mobilitaet_id);
+			this.$refs.jointstudyModal.show();
+		},
+		actionNewFromOldJointStudy(mobilitaet_id) {
+			this.resetForm();
+			this.loadJointStudy(mobilitaet_id);
+			this.statusNew = true;
+			this.$refs.jointstudyModal.show();
+		},
+		actionNewJointStudy() {
+			this.resetForm();
+			this.statusNew = true;
+			this.$refs.jointstudyModal.show();
+		},
+		addNewJointStudy() {
+			const data = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.jointstudies.insertStudy(this.$refs.formJointStudies, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("jointstudyModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		updateJointStudy() {
+			const data = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.jointstudies.updateStudy(this.$refs.formJointStudies, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("jointstudyModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadJointStudy(mobilitaet_id) {
+			return this.$fhcApi.factory.stv.jointstudies.loadStudy(mobilitaet_id)
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteJointStudy(mobilitaet_id) {
+			return this.$fhcApi.factory.stv.jointstudies.deleteStudy(mobilitaet_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetForm() {
+			this.formData = {};
+			this.formData.mobilitaetstyp_kurzbz = "GS";
+			this.formData.status_kurzbz = 'Student';
+			this.formData.studiensemester_kurzbz = this.currentSemester;
+			this.formData.prestudent_id = this.student.prestudent_id;
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.jointstudies.getTypenMobility()
+			.then(result => {
+				this.listTypenMobility = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStudiensemester()
+			.then(result => {
+				this.listStudiensemester = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.mobility.getProgramsMobility()
+			.then(result => {
+				this.programsMobility = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStudyprograms()
+			.then(result => {
+				this.listStudienprogramme = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getListPartner()
+			.then(result => {
+				this.listPartner = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStatiPrestudent()
+			.then(result => {
+				this.statiPrestudent = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+	<div class="stv-details-jointstudies-table h-100 pb-3">
+		<h4>{{$p.t('jointstudies', 'gemeinsameStudien')}}</h4>
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('jointstudies', 'gemeinsamesStudium')"
+			@click:new="actionNewJointStudy"
+			>
+		</core-filter-cmpt>
+
+		<!--Modal: jointstudyModal-->
+		<bs-modal ref="jointstudyModal" dialog-class="modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('jointstudies', 'neuAnlegen')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('jointstudies', 'edit')}}</p>
+			</template>
+
+			<form-form ref="formJointStudies">
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudy-mobilitaetstyp"
+						:label="$p.t('global', 'typ')"
+						type="select"
+						v-model="formData.mobilitaetstyp_kurzbz"
+						name="mobilitaetstyp_kurzbz"
+						disabled
+						>
+						<option
+							v-for="mob in listTypenMobility"
+							:key="mob.mobilitaetstyp_kurzbz"
+							:value="mob.mobilitaetstyp_kurzbz"
+							>
+							 {{mob.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-studiensemester"
+						:label="$p.t('lehre', 'studiensemester')"
+						type="select"
+						v-model="formData.studiensemester_kurzbz"
+						name="studiensemester_kurzbz"
+						>
+						<option
+							v-for="sem in listStudiensemester"
+							:key="sem.studiensemester_kurzbz"
+							:value="sem.studiensemester_kurzbz"
+							>
+							 {{sem.studiensemester_kurzbz}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-partner"
+						:label="$p.t('mobility', 'mobilitaetsprogramm')"
+						type="select"
+						v-model="formData.mobilitaetsprogramm_code"
+						name="mobilitaetsprogramm_code"
+						>
+						<option
+							v-for="mob in programsMobility"
+							:key="mob.mobilitaetsprogramm_code"
+							:value="mob.mobilitaetsprogramm_code"
+							>
+							 {{mob.beschreibung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-studienprogramm"
+						:label="$p.t('jointstudies', 'studienprogramm')"
+						type="select"
+						v-model="formData.gsprogramm_id"
+						name="gsprogramm_id"
+						>
+						<option
+							v-for="prog in listStudienprogramme"
+							:key="prog.gsprogramm_id"
+							:value="prog.gsprogramm_id"
+							>
+							 {{prog.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-partner"
+						label="Partner"
+						type="select"
+						v-model="formData.firma_id"
+						name="firma_id"
+						>
+						<option
+							v-for="partner in listPartner"
+							:key="partner.firma_id"
+							:value="partner.firma_id"
+							>
+							 {{partner.name}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-status"
+						label="Status"
+						type="select"
+						v-model="formData.status_kurzbz"
+						name="status_kurzbz"
+						>
+						<option
+							v-for="status in statiPrestudent"
+							:key="status.status_kurzbz"
+							:value="status.status_kurzbz"
+							>
+							 {{status.status_kurzbz}}
+						</option>
+					</form-input>
+				</div>
+				<div class="col-2 row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-ausbildungssemester"
+						:label="$p.t('lehre', 'ausbildungssemester')"
+						type="text"
+						v-model="formData.ausbildungssemester"
+						name="ausbildungssemester"
+						>
+					</form-input>
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" class="btn btn-primary" @click="addNewJointStudy()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-else class="btn btn-primary" @click="updateJointStudy(formData.mobilitaet_id)"> {{$p.t('ui', 'speichern')}}</button>
+			</template>
+
+		</bs-modal>
+
+	</div>
+	`
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..81089fcd6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,150 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC4 JOINT STUDIES START ----------------------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_jointstudies',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'GS',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'gemeinsamesStudium',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'gemeinsameStudien',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsame Studien',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'studienprogramm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienprogramm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study Program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'neuAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add Joint Study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Joint Study',
+				'description' => '',
+				'insertvon' => 'system',
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'mobilitaet_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mobilität ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mobility Id',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 JOINT STUDIES END   ----------------------------------------------------------------------------------------
 );
 
 

From 204ae75f5743596c77508556e2af81fb759e5f86 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Apr 2025 11:23:39 +0200
Subject: [PATCH 0130/1357] refactor(Dashboard Widget Names): adds the name
 property to the components of the dashboard widgets

---
 public/js/components/DashboardWidget/Studiengang.js | 1 +
 public/js/components/DashboardWidget/Stundenplan.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/DashboardWidget/Studiengang.js b/public/js/components/DashboardWidget/Studiengang.js
index 2dd667538..c10d0c3f4 100644
--- a/public/js/components/DashboardWidget/Studiengang.js
+++ b/public/js/components/DashboardWidget/Studiengang.js
@@ -2,6 +2,7 @@ import AbstractWidget from './Abstract.js';
 import StudiengangInformation from '../Cis/Cms/StudiengangInformation/StudiengangInformation.js';
 
 export default {
+	name: "WidgetsStudiengang",
 	data(){
 		return {};
 	},
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 437f6a17f..f4961f962 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -7,6 +7,7 @@ import CalendarDate from '../../composables/CalendarDate.js';
 import moodleSvg from "../../helpers/moodleSVG.js"
 
 export default {
+	name: "WidgetsStundenplan",
 	mixins: [
 		Phrasen,
 		AbstractWidget

From 90ce3e0263301d21faaa2e0703c44fcc61cfbd77 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Apr 2025 11:55:57 +0200
Subject: [PATCH 0131/1357] update(dashboard CSS): adds animation for pinned
 widgets and different cursor styles

---
 public/css/components/dashboard.css | 60 ++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 47ce239ee..55cd9a8ed 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -11,6 +11,12 @@
 	cursor:pointer;
 }
 
+.draggedItem {
+	height: 100%;
+	width: 100%;
+	background-color:white;
+}
+
 .empty-tile-hover:hover {
 		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
@@ -61,6 +67,19 @@
 .cursor-nw-resize {
 	cursor: nw-resize;
 }
+
+.cursor-ew-resize {
+	cursor: ew-resize;
+}
+
+.cursor-ns-resize {
+	cursor: ns-resize;
+}
+
+.no-drag-drop {
+	cursor: not-allowed;
+}
+
 .cursor-move {
 	cursor: move;
 }
@@ -73,8 +92,9 @@
 	right:0;
 	bottom:0;
 	background-color:rgba(0, 100, 156);
-	border:1px dashed lightgray;
+	border:4px dashed lightgray;
 	z-index: 2;
+	opacity: 0.5;
 }
 
 .pin:hover{
@@ -84,3 +104,41 @@
 .pin[pinned]:hover{
 	color:rgb(153, 116, 116);
 }
+
+.section-info{
+	color: #00649c;
+	cursor:pointer;
+}
+
+.section-info:hover {
+	color: #005585;
+}
+
+.denied-dragging-animation {
+	animation: wiggle 0.5s linear;
+	color:red !important;
+}
+
+@keyframes wiggle {
+
+	0% {
+		transform: rotate(0deg);
+	}
+
+	25% {
+		transform: rotate(-30deg);
+	}
+
+	50% {
+		transform: rotate(0deg);
+	}
+
+	75% {
+		transform: rotate(30deg);
+	}
+
+	100% {
+		transform: rotate(0em);
+	}
+
+}
\ No newline at end of file

From a0a2ac41bf2fa21b01d4ddcad7308234991a3764 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Apr 2025 12:00:38 +0200
Subject: [PATCH 0132/1357] refactor(Dashboard Grid): updates replace logic
 when moving widgets and fixes position detection between mousemove and
 mousedown

---
 public/js/components/Dashboard/Item.js    | 43 ++++++++++++++++++----
 public/js/components/Dashboard/Section.js | 25 ++++++++++---
 public/js/components/Drop/Grid.js         | 44 +++++++++++++++++------
 public/js/components/Drop/Grid/Item.js    |  5 +++
 public/js/composables/GridLogic.js        | 41 +++++++++++----------
 5 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 33e614531..b7a334b92 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -40,15 +40,30 @@ export default {
 		"loading",
 		"item_data",
 		"place",
+		"setup",
 	],
 	computed: {
+		maxHeight(){
+			return this.setup?.height?.max;
+		},
+		maxWidth(){
+			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]"){
+				return this.setup?.width;
+			}
+			return this.setup?.width?.max;
+		},
+		minHeight() {
+			return this.setup?.height?.min;
+		},
+		minWidth() {
+			return this.setup?.width?.min;
+		},
+		isResizeable(){
+			return this.maxWidth >1 || this.maxHeight >1;
+		},
 		isPinned(){
 			return this.place?.pinned ? true : false;
 		},
-		isResizeable() {
-			if (!this.widget) return false;
-			return this.widget.setup.width.max || this.widget.setup.height.max;
-		},
 		ready() {
 			return this.component && this.arguments !== null;
 		},
@@ -138,7 +153,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
@@ -188,8 +203,22 @@ export default {
 			</template>
 		</bs-modal>
 		<height-transition>
-			<div v-if="editMode && isResizeable && !isPinned" class="card-footer d-flex justify-content-end p-0">
-				<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
+			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
+				<template v-if="maxWidth < 2">
+					<span drag-action="resize" class="col-auto px-1 cursor-ns-resize">
+						<i  class="fa-solid fa-up-down pe-2"></i>
+					</span>
+				</template>
+				<template v-else-if="maxHeight < 2">
+					<span drag-action="resize" class="col-auto px-1 cursor-ew-resize">
+						<i class="fa-solid fa-left-right pe-2"></i>
+					</span>
+				</template>
+				<template v-else>
+					<span drag-action="resize" class="col-auto px-1 cursor-nw-resize">
+						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i>
+					</span>
+				</template>
 			</div>
 		</height-transition>
 	</div>`,
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 44fac5550..eb37009ae 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,4 +1,5 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
+import SectionModal from "../Bootstrap/Alert.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
@@ -39,6 +40,7 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
+			draggedItem:null,
 		}
 	},
 	provide() {
@@ -50,6 +52,13 @@ export default {
 		}
 	},
 	computed: {
+		computedWidgetsSetup(){
+			if(!this.widgetsSetup) return {};
+			return this.widgetsSetup.reduce((acc, setup)=>{
+				acc[setup.widget_id] = setup.setup;
+				return acc;
+			},{})
+		},
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
@@ -81,6 +90,9 @@ export default {
 		
 	},
 	methods: {
+		showSectionInformation(){
+			SectionModal.popup(`this is the information for the section ${name}`);
+		},
 		handleConfigOpened() {
 			this.configOpened = true
 		},
@@ -173,12 +185,17 @@ export default {
 		});
 	},
 	template: `
+	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+		{{name}}:
+	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
-				
+				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div v-else-if="item.widgetid == draggedItem?.data.widgetid" class="draggedItem" ></div>
 				<dashboard-item 
-					v-if="!item.placeholder"
+					v-else
 					:id="item.widget"
 					:widgetID="item.id"
 					:width="item.w"
@@ -190,6 +207,7 @@ export default {
 					:hidden="item.hidden"
 					:editMode="editMode"
 					:place="item.place[gridWidth]"
+					:setup="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
@@ -197,7 +215,6 @@ export default {
 					@pinItem="updatePositions($event,true)"
 					@unPinItem="updatePositions">
 				</dashboard-item>
-				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				
 			</template>
 			
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b69973294..b73cca9ef 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -6,6 +6,7 @@ import GridLogic from '../../composables/GridLogic.js';
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
 const MODE_RESIZE = 2;
+const MODE_MOUSE_DOWN = 3;
 
 export default {
 	name: 'Grid',
@@ -29,6 +30,7 @@ export default {
 		"rearrangeItems",
 		"newItem",
 		"gridHeight",
+		"draggedItem",
 	],
 	data() {
 		return {
@@ -45,7 +47,6 @@ export default {
 			draggedOffset: [0,0],
 			draggedItem: null,
 			draggedNode: null,
-			draggedItemIcon: null,
 			additionalRow: null,
 			reorderedItems:[],
 			clonedWidget:null,
@@ -377,11 +378,13 @@ export default {
 				return;
 			
 			this.mode = MODE_MOVE;
+			
 			this.draggedItem = item;
+			this.$emit('draggedItem',item);
 			this.draggedNode = evt.target;
 			//clones the widget for the drag Image
 			let clone = evt.target.cloneNode(true);
-			clone.style.zIndex = 20;
+			clone.style.zIndex = 5;
 			clone.classList.add("widgetClone");
 			this.$refs.container.appendChild(clone);
 			this.clonedWidget = clone;
@@ -400,6 +403,7 @@ export default {
 			if (!this.active)
 				return this.dragCancel();
 			
+			this.checkPinnedWidgetAnimation();
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -442,14 +446,9 @@ export default {
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			this.$emit('draggedItem',null);
 			this.draggedNode = null;
 			
-			if(this.draggedItemIcon){
-				this.draggedItemIcon.style.top = '-999px';
-				this.draggedItemIcon.style.left = '-999px';
-				this.draggedItemIcon = null;
-			}
-			
 		},
 		dragEnd() {
 			let widgetClones = document.getElementsByClassName("widgetClone");
@@ -486,11 +485,33 @@ export default {
 			this.$emit('newItem', this.x, this.y);
 		},
 		updateCursorOnMouseMove(evt){
-			if(this.mode == MODE_IDLE)
+			if(this.mode == MODE_IDLE){
 				this.updateCursor(evt);
-		}
+			}
+		},
+		checkPinnedWidgetAnimation(){
+			let itemAtPosition = this.items.filter(item => item.x == this.x && item.y == this.y).pop();
+			if (itemAtPosition && itemAtPosition.place[this.cols] && itemAtPosition.place[this.cols].pinned) {
+				let pinnedWidget = document.getElementById(itemAtPosition.widgetid);
+				let test = pinnedWidget.querySelector("[pinned='true']");
+				if (!test.classList.contains("denied-dragging-animation")) {
+					test.classList.add("denied-dragging-animation");
+				}
+			} else {
+				Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+					ele.classList.remove("denied-dragging-animation");
+				})
+			}
+		},
+		mouseDown(){
+			this.mode = MODE_MOUSE_DOWN;
+		},
+		mouseUp() {
+			this.mode = MODE_IDLE;
+		},
 	},
 	template: `
+	<p style="position:fixed; top:200px; left:300px; z-index:200;">{{x}}-{{y}}</p>
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"
@@ -503,10 +524,13 @@ export default {
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item
+				ref="gridItems"
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
+				@mouse-down="mouseDown"
+				@mouse-up="mouseUp"
 				@start-resize="startResize"
 				@dragging="dragging"
 				@end-drag="dragCancel"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index c677dba79..b8acf3044 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -1,4 +1,5 @@
 export default {
+	name:'GridItem',
 	components: {
 	},
 	inject: {
@@ -8,6 +9,8 @@ export default {
 		active: Boolean
 	},
 	emits: [
+		"mouseDown",
+		"mouseUp",
 		"startMove",
 		"startResize",
 		"dragging",
@@ -26,6 +29,7 @@ export default {
 	},
 	methods: {
 		registerDragAction(evt) {
+			this.$emit('mouseDown', evt);
 			if (evt.target.hasAttribute('drag-action')) {
 				this.dragAction = evt.target.getAttribute('drag-action');
 			} else {
@@ -64,6 +68,7 @@ export default {
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
+		@mouseup="$emit('mouseUp', $event)"
 		@touchstart.prevent="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index fae9a082d..ed060e123 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -96,7 +96,7 @@ class GridLogic {
 		}
 	}
 	move(item, x, y) {
-		if (item.data.place[this.w].pinned)
+		if (item.data.place[this.w]?.pinned)
 			return [];
 		if (item.x == x && item.y == y)
 			return [];
@@ -116,6 +116,8 @@ class GridLogic {
 				prefer = DIR_RIGHT;
 		}
 
+		const originalFrame = [...item.frame];
+
 		const currItem = {...item};
 		currItem.x = x;
 		currItem.y = y;
@@ -123,27 +125,27 @@ class GridLogic {
 		let occupiers = this.getItemsInFrame(currItem.frame);
 		
 		// does not update if the target conatins pinned widgets
-		if (occupiers.some(frame => this.data[frame]?.data.place[this.w].pinned)) {
+		if (occupiers.some(frame => this.data[frame]?.data.place[this.w]?.pinned)) {
 			return [];
 		}
 		
 		// checks if target contains widget with the same high and width
-		let replace = occupiers
-					.map(occupier => this.data[occupier])
-					.filter( occupier => {
-						return occupier.data.w == item.w && occupier.data.h == item.h
-					});
-		
-		// replaces positions of widget and target widget if they have same height and width
-		if(replace.length > 0){
-			let replaceUpdate =[];
-			replaceUpdate[replace[0].index] = { index: replace[0].index, x:item.x, y:item.y };
-			replaceUpdate[item.index] = { index: item.index, x: replace[0].x, y: replace[0].y};
-			//update Grid and dataGrid 
-			replace[0].frame.forEach(f => this.grid[f] = item.index)
-			item.frame.forEach(f => this.grid[f] = replace[0].index);
-			this.data[replace[0].index] = item;
-			this.data[item.index] = replace[0];
+		let occupiersData = occupiers.map(occupier => this.data[occupier]);
+		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
+		if (!occupiersFrame.some(frame => !currItem.frame.includes(frame)) && !occupiersFrame.some(frame => originalFrame.includes(frame))){
+			let replaceUpdate = [];
+			let newOccupierFrames = [];
+			for(let f of originalFrame){
+				if(newOccupierFrames.includes(f)){
+					continue;
+				}
+				let occ = occupiersData.shift();
+				if(occ){
+					newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
+					replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
+				}
+			}
+			replaceUpdate[item.index] = { index: item.index, x, y };
 			return replaceUpdate;
 		}
 		
@@ -257,6 +259,9 @@ class GridLogic {
 				frame.push(i + item.x + (j + item.y) * this.w);
 		return frame;
 	}
+	getSingleFramePosition(frame){
+		return { x: frame % this.w, y: Math.floor(frame / this.w)};
+	}
 	debug() {
 		return this.grid;
 	}

From 59ebd33ba6860df99b4c129c3a81c589c42f667d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 11:28:13 +0200
Subject: [PATCH 0133/1357] feature(Dashboard resize):adds overlays to the
 elements when resizing widgets on the dashboard

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 28 +++++++++++++++++++----
 public/js/composables/GridLogic.js        |  3 ++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index eb37009ae..1631cadcd 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.widgetid == draggedItem?.data.widgetid" class="draggedItem" ></div>
+				<div v-else-if="item.blank || item.widgetid == draggedItem?.data.widgetid" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b73cca9ef..65564c3bb 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -168,19 +168,39 @@ export default {
 		placedItems() {
 			if (!this.positionUpdates)
 				return this.prePlacedItems;
-			return this.prePlacedItems.map(item => {
+			let mappedPlacedItems= this.prePlacedItems.map(item => {
 				if (!this.positionUpdates[item.index] )
 					return item;
+				
+				let height_diff = this.positionUpdates[item.index]?.h - item.h;
+				let width_diff = this.positionUpdates[item.index]?.w - item.w;
 				return {
+					resize: this.positionUpdates[item.index]?.resize,
 					index: item.index,
 					weight: item.weight,
 					data: item.data,
 					x: this.positionUpdates[item.index].x === undefined ? item.x : this.positionUpdates[item.index].x,
 					y: this.positionUpdates[item.index].y === undefined ? item.y : this.positionUpdates[item.index].y,
-					w: this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
-					h: this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+					w: width_diff>0?item.w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
+					h: height_diff > 0 ?item.h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+					
 				};
 			});
+
+			let temporaryResizeItems = [];
+			mappedPlacedItems.forEach(item=>{
+				if(item.resize){
+					let newItem = {
+						...item,
+						w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
+						h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h,
+						resizeOverlay:true,
+						blank:true,
+					};
+					temporaryResizeItems.push(newItem)
+				}
+			})
+			return [...mappedPlacedItems, ...temporaryResizeItems];
 		},
 		showEmptyTileHover() {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
@@ -422,7 +442,6 @@ export default {
 							this.draggedOffset[1] -= y;
 							y = 0;
 						}
-
 						this.positionUpdates = this.dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
@@ -539,6 +558,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
+					zIndex: item.resizeOverlay ? -5 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index ed060e123..d6b6d4723 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,8 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h};
+		updates[item.index] = {index: item.index, w, h, resize:true};
+
 		return updates;
 	}
 	tryMoving(index, prefer) {

From 54bbfacf8680896a25d708a31a9248b871f18407 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 11:42:03 +0200
Subject: [PATCH 0134/1357] remove(Dashboard debugging):removes a debugging
 print statment

---
 public/js/components/Drop/Grid.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 65564c3bb..4df29b8ba 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -530,7 +530,6 @@ export default {
 		},
 	},
 	template: `
-	<p style="position:fixed; top:200px; left:300px; z-index:200;">{{x}}-{{y}}</p>
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"

From d4ae8b0f91457163c6cde152fed48f24a17ce527 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:33:49 +0200
Subject: [PATCH 0135/1357] fix(Dashboard Grid Height): a bug was removed where
 the grid height was not correct when adding a new widget and the widget was
 not correctly displayed when adding a new widget

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 1631cadcd..b14047148 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.blank || item.widgetid == draggedItem?.data.widgetid" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
+				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4df29b8ba..d74211997 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -118,8 +118,9 @@ export default {
 			return [...this.placedItems, ...this.items_placeholders];
 		},
 		rows() {
-			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
+			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
+			}
 			return this.grid ? this.grid.h : 1;
 		},
 		gridStyle() {
@@ -171,7 +172,6 @@ export default {
 			let mappedPlacedItems= this.prePlacedItems.map(item => {
 				if (!this.positionUpdates[item.index] )
 					return item;
-				
 				let height_diff = this.positionUpdates[item.index]?.h - item.h;
 				let width_diff = this.positionUpdates[item.index]?.w - item.w;
 				return {
@@ -345,7 +345,10 @@ export default {
 				this.x = -1;
 				this.y = -1;
 				if (this.additionalRow !== null) {
-					this.grid.h = this.additionalRow;
+					let gridHeight = this.grid.getMaxY() + 1;
+					if(this.grid.h>gridHeight){
+						this.grid.h = gridHeight;
+					}
 					this.additionalRow = null;
 				}
 			}
@@ -376,11 +379,13 @@ export default {
 					this.additionalRow = this.grid.h;
 					this.grid.h += 1;
 				} else if (this.additionalRow !== null && gridY != this.rows - 1) {
-					this.grid.h = this.additionalRow;
+					let gridHeight = this.grid.getMaxY() + 1;
+					if(this.grid.h > gridHeight){
+						this.grid.h = gridHeight;
+					}
 					this.additionalRow = null;
 				}
 			}
-			
 			this.x = gridX;
 			this.y = gridY;
 

From a25ccd79b26627a3e95ac7e896e459a8f0b29880 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:46:11 +0200
Subject: [PATCH 0136/1357] fix(Dashboard New Widget Not Draggable): adds the
 widgetid property to newly created widgets if it is not already present

---
 public/js/components/Dashboard/Section.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index b14047148..8c2826f0c 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -82,6 +82,9 @@ export default {
 			} */
 			
 			let placedItems = this.widgets.map(item => {
+				if(!item?.widgetid && item?.id){
+					item.widgetid = item.id;
+				}
 				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
 			});
 			return placedItems;

From 88c4a04aea3cd187ffd23a6c134b19147181b300 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:57:14 +0200
Subject: [PATCH 0137/1357] fix(Dashboard widget resize position): when
 resizing an widget without saved position it would save it with x:0 and y:0

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

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index d6b6d4723..4fb4f847f 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,7 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h, resize:true};
+		updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
 
 		return updates;
 	}

From fc0a09180a4a8a5d0f6384e496743a237f79258b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Apr 2025 11:16:20 +0200
Subject: [PATCH 0138/1357] update(Dashboard pinned animation): also triggers
 the pinned animation when the target area of a drag action contains a pinned
 widget

---
 public/js/components/Drop/Grid.js  | 42 +++++++++++++++++++++---------
 public/js/composables/GridLogic.js |  3 ++-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d74211997..f5572c639 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -427,7 +427,6 @@ export default {
 		dragOver(evt) {
 			if (!this.active)
 				return this.dragCancel();
-			
 			this.checkPinnedWidgetAnimation();
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
@@ -514,18 +513,37 @@ export default {
 			}
 		},
 		checkPinnedWidgetAnimation(){
-			let itemAtPosition = this.items.filter(item => item.x == this.x && item.y == this.y).pop();
-			if (itemAtPosition && itemAtPosition.place[this.cols] && itemAtPosition.place[this.cols].pinned) {
-				let pinnedWidget = document.getElementById(itemAtPosition.widgetid);
-				let test = pinnedWidget.querySelector("[pinned='true']");
-				if (!test.classList.contains("denied-dragging-animation")) {
-					test.classList.add("denied-dragging-animation");
-				}
-			} else {
-				Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
-					ele.classList.remove("denied-dragging-animation");
-				})
+			let itemAtPosition=[];
+			switch(this.mode){
+				case MODE_RESIZE:
+					for (let x = this.draggedItem.x; x <= this.x; x++) {
+						for (let y = this.draggedItem.y; y <= this.y; y++) {
+							this.items.forEach(item => {
+								if (item.x == x && item.y == y) {
+									itemAtPosition.push(item);
+								}
+							});
+						}
+					}
+					break;
+				case MODE_MOVE:
+					itemAtPosition = this.items.filter(item=>item.x == this.x && item.y == this.y);
+					break;
 			}
+			
+			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+				ele.classList.remove("denied-dragging-animation");
+			})
+			
+			itemAtPosition.forEach(item=>{
+				if (item.place[this.cols] && item.place[this.cols].pinned) {
+					let pinnedWidget = document.getElementById(item.widgetid);
+					let pinNode = pinnedWidget.querySelector("[pinned='true']");
+					if (!pinNode.classList.contains("denied-dragging-animation")) {
+						pinNode.classList.add("denied-dragging-animation");
+					}
+				}	
+			})
 		},
 		mouseDown(){
 			this.mode = MODE_MOUSE_DOWN;
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 4fb4f847f..93c662eb5 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,8 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
+		if(updates)
+			updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
 
 		return updates;
 	}

From 19f169aca2349e28ebe8d7c10b1b8fe422379b86 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Apr 2025 13:55:02 +0200
Subject: [PATCH 0139/1357] feature(Dashboard Grid): adds a red border to the
 widget if the user tries to resize the widget over its max width/height or
 under its min width/height

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 51 +++++++++++++++++++++--
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 8c2826f0c..4a2a4eaaa 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		{{name}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index f5572c639..4b4b181d3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -16,6 +16,7 @@ export default {
 	props: {
 		cols: Number,
 		items: Array,
+		itemsSetup: Object,
 		resizeLimit: Function,
 		active: {
 			type: Boolean,
@@ -404,6 +405,7 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			
+			this.grid.h += 1;
 			this.draggedItem = item;
 			this.$emit('draggedItem',item);
 			this.draggedNode = evt.target;
@@ -425,9 +427,19 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
+			if ((this.y + 1) > this.grid?.h && this.mode == MODE_MOVE) {
+				this.positionUpdates = this.positionUpdates.filter(item => {
+					return item.widgetid == this.draggedItem.data.widgetid;
+				})
+				this.dragEnd();
+				this.dragCancel();
+			}
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
+			if(this.mode == MODE_RESIZE){
+				this.checkWidgetSizeLimitAnimation();
+			}
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -463,7 +475,6 @@ export default {
 			}
 		},
 		dragCancel() {
-			
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
@@ -474,12 +485,19 @@ export default {
 			
 		},
 		dragEnd() {
+			if (this.mode == MODE_IDLE)
+				return;
+			// clean up unused classes
+			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
+			draggedItemNode.classList.remove("border-danger");
+			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+				ele.classList.remove("denied-dragging-animation");
+			})
 			let widgetClones = document.getElementsByClassName("widgetClone");
 			for(let widget of widgetClones){
 				this.$refs.container.removeChild(widget);
 			}
-			if (this.mode == MODE_IDLE)
-				return;
+			
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
 				return this.dragCancel();
 			this.mode = MODE_IDLE;
@@ -534,7 +552,7 @@ export default {
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");
 			})
-			
+
 			itemAtPosition.forEach(item=>{
 				if (item.place[this.cols] && item.place[this.cols].pinned) {
 					let pinnedWidget = document.getElementById(item.widgetid);
@@ -545,6 +563,31 @@ export default {
 				}	
 			})
 		},
+		checkWidgetSizeLimitAnimation() {
+
+			let draggedItemSetup = this.itemsSetup[this.draggedItem.data.widget];
+			let draggedItemMaxWidth = draggedItemSetup.width.max ?? draggedItemSetup.width;
+			let draggedItemMinWidth = draggedItemSetup.width.min ?? draggedItemSetup.width;
+			let draggedItemMaxHeight = draggedItemSetup.height.max ?? draggedItemSetup.height;
+			let draggedItemMinHeight = draggedItemSetup.height.min ?? draggedItemSetup.height;
+			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
+
+			let width_after_resize = this.x - this.draggedItem.x + 1; 
+			let height_after_resize = this.y - this.draggedItem.y + 1; 
+			if(  
+				(width_after_resize > 0 && (width_after_resize > draggedItemMaxWidth
+				|| width_after_resize < draggedItemMinWidth)
+				)
+				||
+				(height_after_resize > 0 && (height_after_resize > draggedItemMaxHeight
+				|| height_after_resize < draggedItemMinHeight)
+				)
+			){
+				draggedItemNode.classList.add("border-danger");
+			}else{
+				draggedItemNode.classList.remove("border-danger");
+			}
+		},
 		mouseDown(){
 			this.mode = MODE_MOUSE_DOWN;
 		},

From af30a3408cd3d6dfc462554ffdb6c3a48c90fa35 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 15 Apr 2025 14:22:39 +0200
Subject: [PATCH 0140/1357] add switch stundenplan, excel export, phrases

---
 .../api/frontend/v1/stv/LvTermine.php         | 408 ++++++++++++++++++
 .../api/frontend/v1/stv/Lvtermine.php         |  67 ---
 .../models/ressource/Stundenplan_model.php    | 124 +++++-
 public/css/Studentenverwaltung.css            |   4 +
 public/js/api/stv/courselist.js               |  13 +-
 .../ListLehrveranstaltungstermine.js          | 175 +++++++-
 system/phrasesupdate.php                      | 180 ++++++++
 7 files changed, 876 insertions(+), 95 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/LvTermine.php
 delete mode 100644 application/controllers/api/frontend/v1/stv/Lvtermine.php

diff --git a/application/controllers/api/frontend/v1/stv/LvTermine.php b/application/controllers/api/frontend/v1/stv/LvTermine.php
new file mode 100644
index 000000000..c29f56964
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/LvTermine.php
@@ -0,0 +1,408 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class LvTermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStundenplan' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		//query verwenden wie im Cis endpoint
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+	}
+
+	//TODO Build own lib or combine with Controller Stundenplan.php
+	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
+	{
+		$student_uid = $uid;
+		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
+
+		$this->sortStudienSemester($semester_range);
+		$this->applyLoadUeberSemesterHaelfte($semester_range);
+
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid);
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range, $student_uid);
+
+		if(!$groupConsecutiveHours)
+			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery(
+				$start_date,
+				$end_date,
+				$semester_range,
+				$benutzer_gruppen,
+				$student_lehrverband
+			);
+		else
+			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery(
+				$start_date,
+				$end_date,
+				$semester_range,
+				$benutzer_gruppen,
+				$student_lehrverband,
+				true,
+				$dbStundenplanTable
+			);
+
+		if(!$stundenplan_query)
+		{
+			$this->terminateWithSuccess([]);
+		}
+
+		if($groupConsecutiveHours)
+		{
+			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierungConsecutive($stundenplan_query);
+		}
+		else
+		{
+			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+		}
+
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+		$this->terminateWithSuccess($stundenplan_data);
+
+		$this->expand_object_information($stundenplan_data);
+
+		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
+		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
+		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	//copied from Stundenplan.php
+	private function studienSemesterErmitteln($start_date, $end_date)
+	{
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		$semester_range = array_map(
+			function ($sem) {
+				return $sem->studiensemester_kurzbz;
+			},
+			$this->getDataOrTerminateWithError($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				$this->terminateWithError("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+		}
+		return $semester_range;
+	}
+
+	//copied from Stundenplan.php
+	private function sortStudienSemester(&$semester_range)
+	{
+		usort(
+			$semester_range,
+			function ($first, $second) {
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/', $first, $match_first);
+				preg_match('/([WS]+)([0-9]+)/', $second, $match_second);
+
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				elseif($year_first > $year_second)
+				{
+					return 1;
+				}
+				elseif($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				elseif($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			}
+		);
+	}
+
+	//copied from Stundenplan.php
+	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	{
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
+			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				$this->terminateWithError("No previous semester");
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[];
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende));
+
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/", $semester_original, $match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date, 'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval), 'Y-m-d');
+
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	//copied from Stundenplan.php, extended with $student_uid
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid)
+	{
+		//$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester => $semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					array_map(
+						function ($item) {
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/
+		$benutzer_gruppen = array_map(
+			function ($gruppe) {
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return $benutzer_gruppen;
+	}
+
+	//copied from Stundenplan.php, extended with $student_uid
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range, $student_uid)
+	{
+		//$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester => $semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+				array_push($student_lehrverband[$semester_key], array_map(
+					function ($item) {
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result));
+			}
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		$student_lehrverband = array_map(
+			function ($studentlehrverband) {
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return $student_lehrverband;
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Lvtermine.php b/application/controllers/api/frontend/v1/stv/Lvtermine.php
deleted file mode 100644
index 17a529f85..000000000
--- a/application/controllers/api/frontend/v1/stv/Lvtermine.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Lvtermine extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getStundenplan' => ['admin:r', 'assistenz:r'],
-			'getLvsStudent' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		// Load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-	}
-
-	public function getStundenplan($uid)
-	{
-		//get stundenplan for uid
-		$result = $this->StundenplanModel->loadForUid($uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-
-	}
-
-	public function getLvsStudent($uid)
-	{
-		$authUID = getAuthUID();
-		//$this->terminateWithError('uid' . $uid, self::ERROR_TYPE_GENERAL);
-		//$this->terminateWithError('uid' . $authUID, self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-		$result = $this->VariableModel->getVariables($authUID);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		//$this->terminateWithSuccess(current($data)); // WS2025
-
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->StundeModel->load();
-		$dataStunden = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($dataStunden);
-	//	$this->terminateWithSuccess(current($data));
-
-		//TODO(manu) check existing apis for liste stundenplan und lvs
-		// version for student
-		// version for lehrfaecherverteilung
-
-
-
-
-	}
-}
\ No newline at end of file
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 40498a766..ac20c96c3 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -50,7 +50,6 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
 
-
 		$gruppierteEvents= $this->execReadOnlyQuery("
 		SELECT
 
@@ -186,6 +185,99 @@ class Stundenplan_model extends DB_Model
 		return $query_result;
 	}
 
+	/**
+	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table or lehre.vw_stundenplandev
+	 * @param string $stundenplanViewQuery the subquery used to group the result regarding consecutive hours (Tab LV Termine)
+	 *
+	 * @return stdClass
+	 */
+	public function stundenplanGruppierungConsecutive($stundenplanViewQuery)
+	{
+		$query_result = $this->execReadOnlyQuery("
+			SELECT
+			  distinct lehrveranstaltung_id,
+			  datum,
+			  MIN(beginn) as beginn,
+			  MAX(ende) as ende,
+			  type,
+			  topic,
+			  gruppe,
+			  ort_kurzbz,
+			  lehreinheit_id,
+			  lehrfach_bez,
+			  lektor,
+			  lektorname,
+			  gruppen_kuerzel,
+			  farbe
+			FROM
+			  (
+				SELECT
+				'lehreinheit' as type, beginn, ende, datum,
+				CONCAT(lehrfach,'-',lehrform) as topic,
+				array_agg(DISTINCT lektor) as lektor,
+				array_agg(DISTINCT lektorname) as lektorname,
+				array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+				array_agg(DISTINCT (gruppen_kuerzel)) as gruppen_kuerzel,
+				string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
+				array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
+				titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+
+				FROM
+				(
+					SELECT unr,datum,beginn, ende,
+					CASE
+						WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+						ELSE lektor
+					END as lektor,
+					CASE
+						WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+						ELSE (SELECT UPPER(typ || kurzbz) 
+						      FROM public.tbl_studiengang 
+							  WHERE studiengang_kz=sp.studiengang_kz) || COALESCE(sp.semester,'0') || COALESCE(sp.verband,'') || COALESCE(sp.gruppe,'')
+					END as gruppen_kuerzel,
+					(SELECT bezeichnung
+					FROM public.tbl_organisationseinheit
+					WHERE oe_kurzbz IN(
+						SELECT oe_kurzbz
+						FROM lehre.tbl_lehrveranstaltung
+						WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+					)) as organisationseinheit,
+					ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,
+					stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,
+					anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz,
+					  CONCAT(p.nachname, ' ', p.vorname) as lektorname
+
+					FROM (".$stundenplanViewQuery.") sp
+					JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+					LEFT JOIN public.tbl_benutzer bn ON bn.uid = sp.uid
+					LEFT JOIN public.tbl_person p ON p.person_id = bn.person_id
+				) as subquery
+
+			GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, 
+			farbe, lehrveranstaltung_id
+
+			ORDER BY datum, beginn) t
+
+			GROUP BY
+			  lehrveranstaltung_id,
+			  type,
+			  datum,
+			  topic,
+			  lektor,
+			  lehrfach_bez,
+			  gruppe,
+			  ort_kurzbz,
+			  lehreinheit_id,
+			  lektorname,
+			  gruppen_kuerzel,
+			  farbe
+			ORDER BY
+			  datum, beginn
+			"
+		);
+		return $query_result;
+	}
+
 	/**
 	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
 	 * 
@@ -300,10 +392,13 @@ class Stundenplan_model extends DB_Model
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
 	 *
+	 * @param isLvList if condition needed for Tab LV Termine is given
+	 * @param db_stpl_table enables switch to db 'stundenplandev'
+	 *
 	 * @return mixed
 	 */
-	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
-		
+	public function getStundenplanQuery($start_date, $end_date, $semester, $gruppen, $studentlehrverbaende, $isLvList=false, $db_stpl_table='stundenplan'){
+
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
 			$result = true;
@@ -325,7 +420,7 @@ class Stundenplan_model extends DB_Model
 
 		$query =
 		"select sp.*
-		from lehre.vw_stundenplan sp
+		from lehre.vw_".$db_stpl_table." sp
 		WHERE
 		sp.datum >= ".$this->escape($start_date)."
 		AND sp.datum <= ".$this->escape($end_date);
@@ -335,10 +430,10 @@ class Stundenplan_model extends DB_Model
 		{
 			$query .= " AND ( ";
 		} 
-		
+
 		foreach($semester as $sem => $semester_date_range)
 		{
-			
+
 			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
 				// if there are not groups for the semester skip the iteration step
@@ -358,7 +453,13 @@ class Stundenplan_model extends DB_Model
 		{
 			$query = substr($query, 0, -2);
 		}
-		
+
+		//Condition for showLVList FHC4
+		if(!$isLvList)
+			$stringGroupLv =  "AND gruppe_kurzbz is null";
+		else
+			$stringGroupLv ="";
+
 		foreach($semester as $sem=>$semester_date_range)
 		{
 			foreach($semester_date_range as $sem_date => $sem_date_range)
@@ -373,10 +474,10 @@ class Stundenplan_model extends DB_Model
 					// Eintraege fuer den ganzen Verband
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
-					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).") AND gruppe_kurzbz is null)";
-					
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)
+						." AND ".$this->escape($sem_date_range->ende).")". $stringGroupLv. ")";
+
 					$query .="OR";
-					 
 				}
 			}	
 		}
@@ -421,7 +522,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function loadForUid($uid)
 	{
-		$this->addSelect(['5sp.*','le.studiensemester_kurzbz']);
+		$this->addSelect(['sp.*','le.studiensemester_kurzbz']);
 		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
@@ -434,5 +535,4 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execQuery($query, [$uid, $uid]);
 	}
-
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 1ccac1273..67cff2982 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -77,6 +77,10 @@ html {
 	overflow: visible !important;
 }
 
+.highlight-row {
+	background-color: #e5aeae !important;
+}
+
 @media (min-width: 768px) {
 	#sidebarMenu {
 		visibility: visible!important;
diff --git a/public/js/api/stv/courselist.js b/public/js/api/stv/courselist.js
index b6035c098..6bd999e5f 100644
--- a/public/js/api/stv/courselist.js
+++ b/public/js/api/stv/courselist.js
@@ -1,6 +1,15 @@
 export default {
 	getCourselist(url, config, params) {
-		console.log("her");
-		return this.$fhcApi.get('api/frontend/v1/stv/Lvtermine/getLvsStudent/' + params.id);
+		//corresponding logic controller Stundenplan.php
+		return this.$fhcApi.get('api/frontend/v1/stv/LvTermine/getStundenplan/'
+			+ params.student_uid + '/'
+			+ params.start_date + '/'
+			+ params.end_date + '/'
+			+ params.group_consecutiveHours + '/'
+			+ params.dbStundenplanTable
+		);
+	},
+	getStudiensemester(){
+		return this.$fhcApi.get('api/frontend/v1/stv/LvTermine/getStudiensemester/');
 	},
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 8a6c0d2b0..bc4e02b51 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -1,39 +1,173 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import FormInput from "../../../../Form/Input.js";
+import FormForm from '../../../../Form/Form.js';
 
 export default {
 	name: "TblCourseList",
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		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',
+		},
 	},
 	props: {
 		student: Object
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			tabulatorOptions: null,
+			tabulatorEvents: [],
+			listStudiensemester: [],
+			dataSem: {},
+			showStundenplanDev: false
+		};
+	},
+	methods: {
+		initTabulatorOptions(){
+			this.tabulatorOptions = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
 				ajaxParams: () => {
 					return {
-						id: this.student.uid
+						student_uid: this.student.uid,
+						start_date: this.dataSem.start,
+						end_date: this.dataSem.ende,
+						group_consecutiveHours: true,
+						dbStundenplanTable: this.dbStundenplanTable
 					};
 				},
-				ajaxResponse: (url, params, response) => response.data,
+				ajaxResponse: (url, params, response) => {
+					return response.data;
+				},
 				columns: [
-					{title: "Prestudent_id", field: "prestudent_id"},
-					]
-			},
-			tabulatorEvents: [],
-		}
+					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_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",
+								hour12: false
+							});
+						}},
+					{title: "beginn", field: "beginn"},
+					{title: "ende", field: "ende"},
+					{title: "farbe", field: "farbe", visible: false},
+					{title: "Gruppen", field: "gruppen_kuerzel"},
+					{title: "ort", field: "ort_kurzbz"},
+					{title: "lektorIn", field: "lektorname"},
+					{title: "Lehrfach", field: "lehrfach_bez"}
+				],
+				rowFormatter: function(row){
+					var data = row.getData();
+					//highlight background of row if color red in table
+					if(data.farbe == "A4A7FC"){
+						let el = row.getElement();
+						row.getElement().classList.add("highlight-row");
+						row.getElement().classList.remove("tabulator-row-odd");
+						row.getElement().classList.remove("tabulator-row-even");
+					}
+				}
+			};
+			this.tabulatorEvents = [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'ui', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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')
+						});
+					}
+				}
+			];
+		},
+		getDatesOfSemester(studiensemester_kurzbz) {
+			this.dataSem = this.listStudiensemester.find(item => item.studiensemester_kurzbz === studiensemester_kurzbz);
+			},
+		exportToExcel(){
+			window.open(this.downloadLink, '_blank');
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		switchStundenplan(){
+			this.showStundenplanDev = !this.showStundenplanDev;
+			this.reload();
+		}
+	},
+	watch: {
+		currentSemester(newVal, oldVal) {
+			this.getDatesOfSemester(newVal);
+		},
+	},
+	created(){
+		this.$fhcApi.factory.stv.courselist.getStudiensemester()
+			.then(result => {
+				this.listStudiensemester = result.data;
+				this.getDatesOfSemester(this.currentSemester);
+				this.initTabulatorOptions();
+
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
-	methods: {},
 	template: `
 		<div class="stv-details-courselist h-100 pb-3">
-			<h4>Termine</h4>
-			{{student}}
-		
+			<h4>{{$p.t('global', 'termine')}}</h4>
+
 			<core-filter-cmpt
+				v-if="tabulatorOptions"
 				ref="table"
 				:tabulator-options="tabulatorOptions"
 				:tabulator-events="tabulatorEvents"
@@ -41,7 +175,20 @@ export default {
 				:side-menu="false"
 				reload
 				>
+					<template #actions>	
+						<button
+							class="btn btn-outline-secondary"
+							@click="exportToExcel">
+								{{$p.t('ui', 'export')}}
+						</button>
+						<button
+							class="btn btn-outline-secondary"
+							@click="switchStundenplan">
+								<span v-if="!showStundenplanDev">{{$p.t('lehre', 'stundenplan')}}</span>
+								<span v-else>{{$p.t('lehre', 'stundenplanDev')}}</span>
+						</button>
+					</template>
 			</core-filter-cmpt>
 		</div>
 	`
-}
\ No newline at end of file
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7d6d7361d..5749562ac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41416,6 +41416,186 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'export',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Exportieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Export',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stundenplanDev',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stundenplan DEV',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Timetable DEV',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'dateFrom',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'from',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'dateTo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'to',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gruppen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ortLocation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehrfach',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrfach',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'subject',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'termine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC 4 Lehrveranstaltungstermine ENDE ---------------------------------------------------------------------------
 );
 

From c98d0a9c4503efe1cea52d6de0ebcc95c98666fc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 17 Apr 2025 08:52:21 +0200
Subject: [PATCH 0141/1357] refactor(Dashboard Section description): updates
 the database structure for the dashboard information to add information about
 the description of a section

---
 .../libraries/dashboard/DashboardLib.php      | 10 ++++----
 public/js/components/Dashboard/Dashboard.js   | 11 +++++----
 public/js/components/Dashboard/Section.js     | 13 ++++++-----
 public/js/components/Drop/Grid.js             | 23 +++++++++++--------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index edea7c310..d411bfcfc 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -53,7 +53,6 @@ class DashboardLib
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
-		
 		return $mergedconfig;
 	}
 	
@@ -209,18 +208,19 @@ class DashboardLib
 		if (!isset($widgets[$section]) || !is_array($widgets[$section]))
 		{
 			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
 		}
 		
-		$widgets[$section][$widgetid] = $widget;
+		$widgets[$section]["widgets"][$widgetid] = $widget;
 	}
 	
 	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
+		if (isset($widgets[$section]["widgets"]) && isset($widgets[$section]["widgets"][$widgetid]))
 		{
-			unset($widgets[$section][$widgetid]);
-			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
 				unset($widgets[$section]);
 			}
 			return true;
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e6f26d169..c682d78c6 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -162,15 +162,16 @@ export default {
 			for (var name in res.data.retval.widgets) {
 				let widgets = [];
 				let remove = [];
-				for (var wid in res.data.retval.widgets[name]) {
-					res.data.retval.widgets[name][wid].id = wid;
-					if (res.data.retval.widgets[name][wid].custom || res.data.retval.widgets[name][wid].preset)
-						widgets.push(res.data.retval.widgets[name][wid]);
+				for (var wid in res.data.retval.widgets[name].widgets) {
+					res.data.retval.widgets[name].widgets[wid].id = wid;
+					if (res.data.retval.widgets[name].widgets[wid].custom || res.data.retval.widgets[name].widgets[wid].preset)
+						widgets.push(res.data.retval.widgets[name].widgets[wid]);
 					else
 						remove.push(wid);
 				}
 				this.sections.push({
 					name: name,
+					description:res.data.retval.widgets[name].description,
 					widgets: widgets
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
@@ -189,7 +190,7 @@ export default {
 			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :description="section.description" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4a2a4eaaa..9ccb729df 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -28,7 +28,8 @@ export default {
 	},
 	props: [
 		"name",
-		"widgets"
+		"widgets",
+		"description"
 	],
 	emits: [
 		"widgetAdd",
@@ -85,7 +86,7 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
+				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 } )};
 			});
 			return placedItems;
 			
@@ -94,7 +95,7 @@ export default {
 	},
 	methods: {
 		showSectionInformation(){
-			SectionModal.popup(`this is the information for the section ${name}`);
+			SectionModal.popup(this.description);
 		},
 		handleConfigOpened() {
 			this.configOpened = true
@@ -188,11 +189,11 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+	<h4 v-if="items.length>0 && editMode" >
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{name}}:
 	</h4>
-	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+	<div class="dashboard-section position-relative pb-3 border-1" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
@@ -203,7 +204,7 @@ export default {
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
-					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4b4b181d3..ade654acc 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -63,14 +63,12 @@ export default {
 		items_hashmap() {
 			let items = {};
 			this.items.forEach(item => {
-				if (this.reorderedItems.length > 0){
-					if(item.reorder){
+				if (this.reorderedItems.length > 0 && this.needsReordering(item)){
 						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
 						if (rearrangedPosition) {			
 							item.x = rearrangedPosition.x;
 							item.y = rearrangedPosition.y;
 						}
-					}
 				}
 				items[`x${item.x}y${item.y}`] = item;
 			});	
@@ -143,7 +141,6 @@ export default {
 						y: item.y,
 						w: item.w,
 						h: item.h,
-						reorder: item.reorder,
 						weight: item.weight || 0,
 						data: item
 					}
@@ -246,7 +243,12 @@ export default {
 		}
 	},
 	methods: {
-		
+		needsReordering(item){
+			if (!item?.data?.place[this.cols]){
+				return true;
+			}
+			return false;
+		},
 		toggleDraggedItemOverlay(condition){
 			if(!this.draggedNode)
 				return;
@@ -267,20 +269,23 @@ export default {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
 			let sortedItems = [...items].sort((a, b) => {
-				if (a.reorder){
+				if(this.needsReordering(a) && this.needsReordering(b)){
+					return 0;
+				}
+				else if(this.needsReordering(a)){
 					return 999;
 				}
-				if (b.reorder){
+				else if(this.needsReordering(b)){
 					return -999;
 				}
+				
 				return a.weight > b.weight;
 			}); 
 			let reorderedItems = [];
 			sortedItems.forEach(item => {
 				let freeSlots = this.grid.getFreeSlots();
 				
-				if(item.reorder){
-					item.reorder=true;
+				if(this.needsReordering(item)){
 					let firstFreeSlot = freeSlots.shift();
 					if (!firstFreeSlot) {
 						item.x = 0;

From da86575e65dc022dbbe138b28e037cf544dfd7a6 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 18 Apr 2025 13:25:00 +0200
Subject: [PATCH 0142/1357] archiv: added space in edit form

---
 application/config/javascript.php             |  2 +-
 .../Details/Archiv/Edit.js                    | 32 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/application/config/javascript.php b/application/config/javascript.php
index bfcf8d540..383002dab 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -2,6 +2,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 // use vuejs dev version
-$config['use_vuejs_dev_version'] = true;
+$config['use_vuejs_dev_version'] = false;
 // use bundled javascript
 $config['use_bundled_javascript'] = false;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index 35777b6ac..e819eb252 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -84,21 +84,23 @@ export default {
 					<!--Upload Component-->
 					<FormUploadDms ref="upload" id="inhalt" v-model="data.datei"></FormUploadDms>
 				</div>
-				<form-input
-					container-class="form-check"
-					type="checkbox"
-					name="signiert"
-					:label="$p.t('stv/archiv_signiert')"
-					v-model="data.signiert"
-				>
-				</form-input>
-				<form-input
-					container-class="form-check"
-					type="checkbox"
-					name="stud_selfservice"
-					:label="'Selfservice'"
-					v-model="data.stud_selfservice"
-				>
+				<div class="mt-3">
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="signiert"
+						:label="$p.t('stv/archiv_signiert')"
+						v-model="data.signiert"
+					>
+					</form-input>
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="stud_selfservice"
+							:label="'Selfservice'"
+							v-model="data.stud_selfservice"
+					>
+				</div>
 				</form-input>
 			</fieldset>
 

From 8c00158d04e409d03bc0114ee54c60540fff4991 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Apr 2025 09:52:07 +0200
Subject: [PATCH 0143/1357] refactor(Dashboard Database data structure):
 changes how the data for the dashboard is structured in the database, instead
 of having a global widgets property, each section has its own widgets
 property where additional properties like description can be stored

---
 application/controllers/dashboard/Config.php     | 12 ++++++------
 application/libraries/dashboard/DashboardLib.php | 15 ++++++++-------
 public/js/apps/DashboardAdmin.js                 |  3 ++-
 public/js/components/Dashboard/Admin/Presets.js  |  3 +--
 public/js/components/Dashboard/Dashboard.js      | 12 ++++++------
 public/js/components/Dashboard/Section.js        |  8 ++++----
 public/js/components/Drop/Grid.js                |  2 +-
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 2c0cf5fca..f6db9509f 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -65,7 +65,7 @@ class Config extends Auth_Controller
 		
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$preset->preset = json_encode($preset_decoded);
 				
@@ -92,7 +92,7 @@ class Config extends Auth_Controller
 		}
 		
 		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], $funktion_kurzbz, $widgetid))
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -119,7 +119,7 @@ class Config extends Auth_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		$this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$override->override = json_encode($override_decoded);
 				
@@ -148,7 +148,7 @@ class Config extends Auth_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 		
-		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], $funktion_kurzbz, $widgetid))
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -202,10 +202,10 @@ class Config extends Auth_Controller
 			if ($conf)
 			{
 				$preset = json_decode($conf->preset, true);
-				if (!isset($preset['widgets']) || !isset($preset['widgets'][$funktion]))
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
 					$result[$funktion] = [];
 				else
-					$result[$funktion] = $preset['widgets'][$funktion];
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			}
 			else
 				$result[$funktion] = [];
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index edea7c310..72072f657 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -107,7 +107,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"widgets": {"' . self::USEROVERRIDE_SECTION . '": {}}}';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}}}';
 		
 		return $emptyoverride;
 	}
@@ -127,7 +127,7 @@ class DashboardLib
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
 		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"widgets": {"' . $section . '": {}}}';
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -206,21 +206,22 @@ class DashboardLib
 	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (!isset($widgets[$section]) || !is_array($widgets[$section]))
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
 		{
 			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
 		}
 		
-		$widgets[$section][$widgetid] = $widget;
+		$widgets[$section]["widgets"][$widgetid] = $widget;
 	}
 	
 	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
 		{
-			unset($widgets[$section][$widgetid]);
-			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
 				unset($widgets[$section]);
 			}
 			return true;
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin.js
index 1f3e831c8..05b438798 100644
--- a/public/js/apps/DashboardAdmin.js
+++ b/public/js/apps/DashboardAdmin.js
@@ -1,5 +1,6 @@
 import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
 import DashboardAdmin from '../components/Dashboard/Admin.js';
+import Phrases from "../plugin/Phrasen.js"
 
 Vue.createApp({
   name: 'DashboardAdminApp',
@@ -12,4 +13,4 @@ Vue.createApp({
   },
   mounted() {
   }
-}).mount('#main');
\ No newline at end of file
+}).use(Phrases).mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index fa8f65970..8d6a07803 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -42,7 +42,7 @@ export default {
 					funktion_kurzbz: section_name,
 					widgets: [widget]
 				}).then(result => {
-					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
 					widget.id = newId;
 					widget.custom = 1;
 					this.sections.forEach(section => {
@@ -126,7 +126,6 @@ export default {
 			}}).then(res => {
 				if (this.tmpLoading !== funktionen.join('###'))
 					return; // NOTE(chris): prevent race condition
-				
 				for (var section in res.data.retval) {
 					let widgets = [];
 					for (var wid in res.data.retval[section]) {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e6f26d169..046edf920 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -70,7 +70,7 @@ export default {
 					funktion_kurzbz: section_name,
 					widgets: [widget]
 				}).then(result => {
-					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
 					widget.id = newId;
 					this.sections.forEach(section => {
 						if (section.name == section_name) {
@@ -159,13 +159,13 @@ export default {
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
-			for (var name in res.data.retval.widgets) {
+			for (var name in res.data.retval) {
 				let widgets = [];
 				let remove = [];
-				for (var wid in res.data.retval.widgets[name]) {
-					res.data.retval.widgets[name][wid].id = wid;
-					if (res.data.retval.widgets[name][wid].custom || res.data.retval.widgets[name][wid].preset)
-						widgets.push(res.data.retval.widgets[name][wid]);
+				for (var wid in res.data.retval[name].widgets) {
+					res.data.retval[name].widgets[wid].id = wid;
+					if (res.data.retval[name].widgets[wid].custom || res.data.retval[name].widgets[wid].preset)
+						widgets.push(res.data.retval[name].widgets[wid]);
 					else
 						remove.push(wid);
 				}
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4a2a4eaaa..5c4b82206 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -14,8 +14,8 @@ export default {
 	},
 	inject: {
 		widgetsSetup:{
-			type: Object,
-			default: {},
+			type: Array,
+			default: [],
 		},
 		adminMode: {
 			type: Boolean,
@@ -188,7 +188,7 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+	<h4 v-if="items.length>0 && editModeIsActive" class=" mb-0">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{name}}:
 	</h4>
@@ -208,7 +208,7 @@ export default {
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
-					:editMode="editMode"
+					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
 					:setup="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4b4b181d3..396af5901 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -609,7 +609,7 @@ export default {
 		<TransitionGroup tag="div">
 			<grid-item
 				ref="gridItems"
-				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in ((mode != 1 || mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"

From 0c95dbad1fe5901d7490bc7ea0e320810b94373f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Apr 2025 11:40:58 +0200
Subject: [PATCH 0144/1357] update(Dashboard Section description): adds phrases
 for the description of general/custom/other sections

---
 .../libraries/dashboard/DashboardLib.php      |   2 +-
 public/js/components/Dashboard/Dashboard.js   |   3 +-
 public/js/components/Dashboard/Section.js     |  27 ++++-
 system/phrasesupdate.php                      | 104 +++++++++++++++++-
 4 files changed, 130 insertions(+), 6 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 72072f657..7aab6b949 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -127,7 +127,7 @@ class DashboardLib
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
 		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}}}';
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 046edf920..005551570 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -143,7 +143,7 @@ export default {
 		}
 	},
 	created() {
-
+		this.$p.loadCategory('dashboard');
 		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
 			params: {
 				db: this.dashboard
@@ -175,6 +175,7 @@ export default {
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
 			}
+			this.sections = this.sections.sort((section1, section2) => section2.widgets.length - section1.widgets.length);
 		}).catch(err => console.error('ERROR:', err));
 	},
 	async beforeMount() {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 5c4b82206..17c2ac004 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -93,8 +93,29 @@ export default {
 		
 	},
 	methods: {
+		sectionNameTranslation(){
+			switch(this.name){
+				case "general": 
+					return this.$p.t('dashboard',this.name); 
+					break;
+				case "custom":
+					return this.$p.t('dashboard',this.name);
+					break;
+				default:
+					return this.name;
+					break;
+			}
+		},
 		showSectionInformation(){
-			SectionModal.popup(`this is the information for the section ${name}`);
+			if (this.name == "general"){
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription')); 
+			}
+			else if(this.name == "custom"){
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription'));
+			}
+			else{
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]));
+			}
 		},
 		handleConfigOpened() {
 			this.configOpened = true
@@ -188,9 +209,9 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editModeIsActive" class=" mb-0">
+	<h4 v-if="editModeIsActive" class=" mb-0">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-		{{name}}:
+		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 01f0427b6..dd874ddff 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38354,6 +38354,106 @@ array(
 		)
 	),
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN ENDE
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'General',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'custom',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Benutzerdefiniert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Custom',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardGeneralSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die vordefinierten Widgets',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the predefined widgets',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardCustomSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die Widgets Ihrer persönlichen Anpassungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the widgets of your personal cutomizations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die Widgets der {0} Funktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the widgets of the {0} function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 // CIS4 phrases from legacy code end
 	array(
 		'app' => 'core',
@@ -38414,7 +38514,9 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	
+
 );
 
 

From 2d8766384176f6b736607cc95e2b66924b39961d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Apr 2025 13:35:31 +0200
Subject: [PATCH 0145/1357] basic structure for Tab Admission Dates

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 506 ++++++++++++++++++
 .../api/frontend/v1/stv/Config.php            |   5 +
 public/js/api/factory/stv.js                  |   4 +-
 public/js/api/factory/stv/admissionDates.js   |  25 +
 public/js/api/stv/admissionDates.js           |   0
 .../Details/Aufnahmetermine.js                |  26 +
 .../Aufnahmetermine/Aufnahmetermine.js        |  58 ++
 .../Aufnahmetermine/HeaderReihungstest.js     |  14 +
 system/phrasesupdate.php                      |  25 +-
 9 files changed, 661 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
 create mode 100644 public/js/api/factory/stv/admissionDates.js
 create mode 100644 public/js/api/stv/admissionDates.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
new file mode 100644
index 000000000..519e8125d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -0,0 +1,506 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Aufnahmetermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAufnahmetermine' => ['admin:r', 'assistenz:r'],
+			'loadAufnahmetermin' => ['admin:r', 'assistenz:r'],
+			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'mobility'
+		]);
+
+		// Load models
+		$this->load->model('codex/Bisio_model', 'BisioModel');
+	}
+
+	public function getAufnahmetermine($student_uid)
+	{
+		$this->BisioModel->addSelect("*");
+		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addOrder('von', 'DESC');
+		$this->BisioModel->addOrder('bis', 'DESC');
+		$this->BisioModel->addOrder('aufnahmetermin_id', 'DESC');
+		$result = $this->BisioModel->loadWhere(
+			array('student_uid' => $student_uid)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function insertAufnahmetermin()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$student_uid = $this->input->post('uid');
+
+		if(!$student_uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		]);
+		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		]);
+		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+		]);
+		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+
+		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		]);
+
+		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+		]);
+
+		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
+		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
+		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
+		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
+
+		$result = $this->BisioModel->insert([
+			'student_uid' => $student_uid,
+			'von' => $_POST['von'],
+			'bis' => $_POST['bis'],
+			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+			'nation_code' => $_POST['nation_code'],
+			'herkunftsland_code' => $_POST['herkunftsland_code'],
+			'lehreinheit_id' => $_POST['lehreinheit_id'],
+			'ort' => $ort,
+			'universitaet' => $universitaet,
+			'ects_erworben' => $_POST['ects_erworben'] ,
+			'ects_angerechnet' => $_POST['ects_angerechnet'],
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+		]);
+
+		$aufnahmetermin_id = $this->getDataOrTerminateWithError($result);
+
+		//check if localData (purposes)
+		if(count($localPurposes) > 0){
+			foreach ($localPurposes as $zweck){
+				$zweck = (int)$zweck;
+				$this->addAufnahmeterminPurpose($aufnahmetermin_id, $zweck);
+			}
+		}
+
+		//check if localData (supports)
+		if(count($localSupports) > 0){
+			foreach ($localSupports as $support){
+				$this->addAufnahmeterminSupport($aufnahmetermin_id, $support);
+			}
+		}
+
+		$this->terminateWithSuccess($aufnahmetermin_id);
+	}
+
+	public function loadAufnahmetermin($aufnahmetermin_id)
+	{
+		$this->BisioModel->addSelect("*");
+		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$result = $this->BisioModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function updateAufnahmetermin()
+	{
+
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$student_uid = $this->input->post('uid');
+
+		if(!$student_uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$formData = $this->input->post('formData');
+
+		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		]);
+		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		]);
+		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+		]);
+		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+
+		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		]);
+
+		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+		]);
+
+		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BisioModel->update(
+			[
+				'aufnahmetermin_id' =>  $formData['aufnahmetermin_id']
+			],
+			[
+				'student_uid' => $student_uid,
+				'von' => $_POST['von'],
+				'bis' => $_POST['bis'],
+				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+				'nation_code' => $_POST['nation_code'],
+				'herkunftsland_code' => $_POST['herkunftsland_code'],
+				'lehreinheit_id' => $_POST['lehreinheit_id'],
+				'ort' => $formData['ort'],
+				'universitaet' => $formData['universitaet'],
+				'ects_erworben' => $_POST['ects_erworben'] ,
+				'ects_angerechnet' => $_POST['ects_angerechnet'],
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmetermin($aufnahmetermin_id)
+	{
+		//check if extension table exists
+		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//if table exists check if existing entry
+		if(!empty($data))
+		{
+			$this->BisioModel->addSelect("count(*)");
+			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.aufnahmetermin_id = bis.tbl_bisio.aufnahmetermin_id)', 'LEFT');
+
+			$resultCheckMo = $this->BisioModel->loadWhere(
+				array('mo.aufnahmetermin_id' => $aufnahmetermin_id)
+			);
+
+			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
+			$count = current($resultCheckMo)->count;
+
+			$existsInExtension = $count > 0 ? true : false;
+
+			if($existsInExtension)
+				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BisioModel->delete(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLVList($studiengang_kz)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudiengangkz($studiengang_kz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllLehreinheiten()
+	{
+		$lv_id = $this->input->post('lv_id');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLvsandLesByStudent($student_uid)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$lv_ids = array();
+		$allData = array();
+
+		foreach ($data as $lehrveranstaltung) {
+			$lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
+		}
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		foreach ($lv_ids as $id)
+		{
+			$result = $this->LehreinheitModel->getLesFromLvIds($id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			if (is_array($data)) {
+				$allData = array_merge($allData, $data);
+			}
+		}
+
+		return $this->terminateWithSuccess($allData);
+	}
+
+	public function getPurposes($aufnahmetermin_id)
+	{
+		$aufnahmetermin_id = (int)$aufnahmetermin_id;
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+		$this->BisiozweckModel->addSelect("*");
+		$this->BisiozweckModel->addJoin('bis.tbl_zweck zw', 'ON (zw.zweck_code = bis.tbl_bisio_zweck.zweck_code)');
+
+		$result = $this->BisiozweckModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getSupports($aufnahmetermin_id)
+	{
+		$aufnahmetermin_id = (int)$aufnahmetermin_id;
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		$this->BisioaufenthaltfoerderungModel->addSelect("*");
+		$this->BisioaufenthaltfoerderungModel->addJoin('bis.tbl_aufenthaltfoerderung af', 'ON (af.aufenthaltfoerderung_code = bis.tbl_bisio_aufenthaltfoerderung.aufenthaltfoerderung_code)');
+
+		$result = $this->BisioaufenthaltfoerderungModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListPurposes()
+	{
+		$this->load->model('codex/Zweck_model', 'ZweckModel');
+
+		$result = $this->ZweckModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListSupports()
+	{
+		$this->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
+
+		$result = $this->AufenthaltfoerderungModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function addAufnahmeterminPurpose($aufnahmetermin_id, $local_purpose = null)
+	{
+		$zweck_code = $this->input->post('zweck_code');
+
+		if($local_purpose){
+			$zweck_code = $local_purpose;
+		}
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+		if(!$local_purpose)
+		{
+			$check = $this->BisiozweckModel->loadWhere(
+				[
+					'aufnahmetermin_id' => $aufnahmetermin_id,
+					'zweck_code' => $zweck_code,
+				]
+			);
+			if (hasData($check))
+			{
+				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->BisiozweckModel->insert(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'zweck_code' => $zweck_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if($local_purpose)
+		{
+			return $data;
+		}
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmeterminPurpose($aufnahmetermin_id)
+	{
+		$zweck_code = $this->input->post('zweck_code');
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+
+		$result = $this->BisiozweckModel->delete(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'zweck_code' => $zweck_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function addAufnahmeterminSupport($aufnahmetermin_id, $local_support = null)
+	{
+		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+		if($local_support){
+			$aufenthaltfoerderung_code = $local_support;
+		}
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		if(!$local_support)
+		{
+			$check = $this->BisioaufenthaltfoerderungModel->loadWhere(
+				[
+					'aufnahmetermin_id' => $aufnahmetermin_id,
+					'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code,
+				]
+			);
+			if (hasData($check))
+			{
+				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->BisioaufenthaltfoerderungModel->insert(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if($local_support)
+		{
+			return $data;
+		}
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmeterminSupport($aufnahmetermin_id)
+	{
+		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		$result = $this->BisioaufenthaltfoerderungModel->delete(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+			)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($data));
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..f65daf627 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['admissionDates'] = [
+			'title' => $this->p->t('stv', 'tab_admissionDates'),
+			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/public/js/api/factory/stv.js b/public/js/api/factory/stv.js
index 7ea387263..95bc227f5 100644
--- a/public/js/api/factory/stv.js
+++ b/public/js/api/factory/stv.js
@@ -29,6 +29,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import admissionDates from './stv/admissionDates.js';
 
 export default {
 	app,
@@ -44,5 +45,6 @@ export default {
 	exam,
 	abschlusspruefung,
 	grades,
-	mobility
+	mobility,
+	admissionDates
 };
\ No newline at end of file
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
new file mode 100644
index 000000000..fc96f47be
--- /dev/null
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAufnahmetermine(prestudent_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/' + prestudent_id
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/api/stv/admissionDates.js b/public/js/api/stv/admissionDates.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
new file mode 100644
index 000000000..4ad8c6002
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
@@ -0,0 +1,26 @@
+import AdmissionDates from "./Aufnahmetermine/Aufnahmetermine.js";
+import HeaderPlacement from "./Aufnahmetermine/HeaderReihungstest.js";
+
+export default {
+	name: "TabAdmissionDates",
+	components: {
+		AdmissionDates,
+		HeaderPlacement
+	},
+	provide() {
+		return {
+			config: this.config
+		};
+	},
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-mobility h-30 d-flex flex-column">
+		<header-placement></header-placement>
+		<admission-dates ref="tbl_admission_dates" :student="modelValue"></admission-dates>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
new file mode 100644
index 000000000..58f440836
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -0,0 +1,58 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+
+export default {
+	name: 'ListAdmissionDates',
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvAdmissionDates.getAufnahmetermin(this.student.prestudent_id)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "aufnahmetermin_id", field: "aufnahmetermin_id"},
+					{title: "prestudent_id", field: "prestudent_id"},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: 200,
+				index: 'aufnahmetermin_id',
+				persistenceID: 'stv-details-table_admission-dates'
+			},
+			tabulatorEvents: [],
+			formData: {},
+			statusNew: true,
+		}
+	},
+	methods: {},
+	created() {
+	},
+	template: `
+	<div class="stv-details-admission-dates-table h-100 pb-3">
+		<h4>Allgemein</h4>
+		
+	</div>
+	`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
new file mode 100644
index 000000000..529979b3c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -0,0 +1,14 @@
+export default {
+	name: 'HeaderPlacement',
+	data(){
+		return {
+			statusNew: true,
+		}
+	},
+	template: `
+		<div class="stv-details-admission-header-placement h-100 pb-3">
+			<h4>Studiengang</h4>
+		
+		</div>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..fd54d9f66 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,31 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE START ---------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_admissionDates',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Admission Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
+
 );
 
 

From 08b27edd648762142c1bfc4c0021dbd648f31edb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Apr 2025 14:29:45 +0200
Subject: [PATCH 0146/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/group.js            | 33 +++++++++++++++++++
 .../Details/Gruppen/Gruppen.js                | 14 ++++----
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 public/js/api/factory/stv/group.js

diff --git a/public/js/api/factory/stv/group.js b/public/js/api/factory/stv/group.js
new file mode 100644
index 000000000..b395fbf43
--- /dev/null
+++ b/public/js/api/factory/stv/group.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getGruppen(id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/Gruppen/getGruppen/' + id
+		};
+	},
+	deleteGroup(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Gruppen/deleteGruppe/',
+			params
+		};
+	}
+}
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 6434f9fa8..67f422efb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -1,5 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 
+import ApiStvGroups from '../../../../../api/factory/stv/group.js';
+
 export default {
 	name: 'TblGroups',
 	components: {
@@ -17,12 +19,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.group.getGruppen,
-				ajaxParams: () => {
-					return {
-						id: this.student.uid
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvGroups.getGruppen(this.student.uid)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				initialFilter: [
 					{field: "uid", type: "=", value: this.student.uid},
@@ -130,7 +129,8 @@ export default {
 				gruppe_kurzbz: gruppe_kurzbz
 			};
 
-			return this.$fhcApi.factory.stv.group.deleteGroup(group_id)
+			return this.$api
+				.call(ApiStvGroups.deleteGroup(group_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)

From 65c398498fc538df8e93e543cb01b45a6a412ce6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 09:32:49 +0200
Subject: [PATCH 0147/1357] Refactoring FhcApi_Factory View Modal

---
 public/js/api/factory/messages/messages.js    | 112 ++++++++++++++++++
 public/js/api/messages/person.js              |   4 +-
 .../Messages/Details/NewMessage/Modal.js      |  47 +++++---
 .../Messages/Details/NewMessage/NewDiv.js     |  45 ++++---
 .../Messages/Details/TableMessages.js         |  42 ++++---
 5 files changed, 201 insertions(+), 49 deletions(-)
 create mode 100644 public/js/api/factory/messages/messages.js

diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
new file mode 100644
index 000000000..8424e14f2
--- /dev/null
+++ b/public/js/api/factory/messages/messages.js
@@ -0,0 +1,112 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	//TODO(manu) check how to get params size and page
+	getMessages(params) {
+		console.log('page ' + params.page + ' size ' + params.size);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getMessages/'
+				+ params.id + '/'
+				+ params.type + '/'
+				+ params.size + '/'
+				+ params.page
+		};
+	},
+	getVorlagen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getVorlagen/'
+		};
+	},
+	getMsgVarsLoggedInUser(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/'
+		};
+	},
+	getMessageVarsPerson(userParams){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getMessageVarsPerson/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getMsgVarsPrestudent(userParams){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getPersonId(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getPersonId/' + params.id + '/' + params.type_id
+		};
+	},
+	getUid(userParams){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getVorlagentext(vorlage_kurzbz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz
+		};
+	},
+	getNameOfDefaultRecipient(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id
+		};
+	},
+	getPreviewText(userParams, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getPreviewText/' + userParams.id + '/' + userParams.type_id,
+			params
+		};
+	},
+	getReplyData(messageId){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getReplyData/' + messageId
+		};
+	},
+	sendMessageFromModalContext(id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			params
+		};
+	},
+	sendMessage(id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			params
+		};
+	},
+	deleteMessage(messageId){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/deleteMessage/' + messageId
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 9bfae6f38..f41050770 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -3,7 +3,7 @@ export default {
 		console.log('page ' + params.page + ' size ' + params.size);
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
 	},
-	getVorlagen(){
+/*	getVorlagen(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
 	},
 	getMsgVarsLoggedInUser(){
@@ -44,5 +44,5 @@ export default {
 	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
-	}
+	}*/
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 33698f1c8..5bbf29f16 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -4,6 +4,8 @@ import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
+import ApiMessages from '../../../../api/factory/messages/messages.js';
+
 export default {
 	name: "ModalNewMessages",
 	components: {
@@ -104,10 +106,8 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			return this.$fhcApi.factory.messages.person.sendMessageFromModalContext(
-				this.$refs.formMessage,
-				this.uid,
-				data)
+			return this.$refs.formMessage
+				.call(ApiMessages.sendMessageFromModalContext(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -122,7 +122,8 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+			return this.$api
+				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -136,9 +137,10 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
+			return this.$api
+				.call(ApiMessages.getPreviewText({
+					id: this.id,
+					type_id: this.typeId}, data))
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -200,7 +202,8 @@ export default {
 				id: id,
 				type_id: typeId
 			};
-			this.$fhcApi.factory.messages.person.getUid(params)
+			this.$api
+				.call(ApiMessages.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -238,9 +241,9 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					//const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
 					this.replyData = result.data;
-					console.log(this.replyData);
 
 					if (this.replyData.length > 0) {
 						this.formData.subject = this.replyData[0].replySubject;
@@ -261,7 +264,9 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			//this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			this.$api
+				.call(ApiMessages.getMessageVarsPerson(params))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -278,7 +283,8 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			this.$api
+				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -290,7 +296,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+		this.$api
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -301,9 +308,10 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId})
+		this.$api
+			.call(ApiMessages.getNameOfDefaultRecipient({
+				id: this.id,
+				type_id: this.typeId}))
 			.then(result => {
 				this.defaultRecipient = result.data;
 				this.recipientsArray.push({
@@ -314,7 +322,8 @@ export default {
 
 		//case of reply
 		if(this.messageId) {
-			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
@@ -380,7 +389,7 @@ export default {
 									:label="$p.t('global','nachricht')  + ' *'"
 									type="textarea"
 									v-model="formData.body"
-									name="text"
+									name="body"
 									rows="15"
 									cols="75"
 									>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d8db657df..11335ed2a 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,6 +2,7 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
+import ApiMessages from "../../../../api/factory/messages/messages";
 
 export default {
 	name: "ComponentNewMessages",
@@ -119,9 +120,11 @@ export default {
 			data.append('data', JSON.stringify(merged));
 
 			//this.uid is necessary for existing sendFunction
-			return this.$fhcApi.factory.messages.person.sendMessage(
+/*			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.uid,
-				data)
+				data)*/
+			return this.$api
+				.call(ApiMessages.sendMessage(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
@@ -140,7 +143,9 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+		//	return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+			return this.$api
+				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -152,9 +157,13 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
+/*			return this.$fhcApi.factory.messages.person.getPreviewText({
 				id: id,
-				type_id: typeId}, data)
+				type_id: typeId}, data)*/
+			return this.$api
+				.call(ApiMessages.getPreviewText({
+					id: this.id,
+					type_id: this.typeId}, data))
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -226,7 +235,8 @@ export default {
 				id: id,
 				type_id: typeId
 			};
-			this.$fhcApi.factory.messages.person.getUid(params)
+			this.$api
+				.call(ApiMessages.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -262,7 +272,9 @@ export default {
 					id: this.id,
 					type_id: this.typeId
 				};
-				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			//	this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+				this.$api
+				.call(ApiMessages.getMessageVarsPerson(params))
 					.then(result => {
 						this.fieldsPerson = result.data;
 						const person = this.fieldsPerson[0];
@@ -279,7 +291,9 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			//this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			this.$api
+				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -292,7 +306,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+		this.$api
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -303,10 +318,11 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId
-		}).then(result => {
+		this.$api
+			.call(ApiMessages.getNameOfDefaultRecipient({
+				id: this.id,
+				type_id: this.typeId}))
+			.then(result => {
 				this.defaultRecipient = result.data;
 				this.recipientsArray.push({
 					'uid': this.uid,
@@ -316,7 +332,8 @@ export default {
 
 		//case of reply
 		if(this.messageId != null) {
-			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 9047d6726..07fdd8f20 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,6 +1,8 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 
+import ApiMessages from '../../../api/factory/messages/messages.js';
+
 export default {
 	name: "TableMessages",
 	components: {
@@ -27,8 +29,20 @@ export default {
 	},
 	data(){
 		return {
+/*			paginationSize: 15,
+			paginationInitialPage: 1,*/
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
+				//TODO(Manu) how to handle size and page?
+/*				ajaxRequestFunc: () => this.$api.call(
+					ApiMessages.getMessages({
+						id: this.id,
+						type: this.typeId,
+						size: this.paginationSize,
+						page: this.paginationInitialPage
+					})
+				),*/
+		//OLD WORKING VERSION
 				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
 				ajaxParams: () => {
 					return {
@@ -36,6 +50,7 @@ export default {
 						type: this.typeId
 					};
 				},
+
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
@@ -222,7 +237,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteMessage(message_id){
-			return this.$fhcApi.factory.messages.person.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)
@@ -276,13 +292,11 @@ export default {
 					}
 				});
 
-		// to avoid endless loop
-		if (iteration > messages.length) break;
-	}
-	return {data: messageNested, last_page};
-}
-
-
+			// to avoid endless loop
+			if (iteration > messages.length) break;
+			}
+		return {data: messageNested, last_page};
+		}
 	},
 	computed: {
 		statusText(){
@@ -310,11 +324,12 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-		this.$fhcApi.factory.messages.person.getPersonId(params)
-			.then(result => {
-				this.personId = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+			this.$api
+				.call(ApiMessages.getPersonId(params))
+				.then(result => {
+					this.personId = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	template: `
@@ -353,7 +368,6 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
-		<!--TODO(Manu) finish later -->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->

From 3200a94d17bfc4c87c3d98e845e8449b9aafd4f9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 11:06:08 +0200
Subject: [PATCH 0148/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/jointstudies.js     | 81 +++++++++++++++++++
 .../Details/JointStudies/JointStudies.js      | 42 ++++++----
 2 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 public/js/api/factory/stv/jointstudies.js

diff --git a/public/js/api/factory/stv/jointstudies.js b/public/js/api/factory/stv/jointstudies.js
new file mode 100644
index 000000000..18f398bb4
--- /dev/null
+++ b/public/js/api/factory/stv/jointstudies.js
@@ -0,0 +1,81 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getStudies(uid) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudien/' + uid
+		};
+	},
+	getTypenMobility(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getTypenMobility/'
+		};
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudiensemester/'
+		};
+	},
+	getStudyprograms(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudienprogramme/'
+		};
+	},
+	getListPartner(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getPartnerfirmen/'
+		};
+	},
+	getStatiPrestudent(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStatiPrestudent/'
+		};
+	},
+	loadStudy(id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/loadStudie/' + id
+		};
+	},
+	insertStudy(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/insertStudie/',
+			params
+		};
+	},
+	updateStudy(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/updateStudie/',
+			params
+		};
+	},
+	deleteStudy(id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/deleteStudie/' + id
+		};
+	},
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index 1c75486de..16d1593d3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -3,6 +3,9 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 
+import ApiStvJointstudies from '../../../../../api/factory/stv/jointstudies.js';
+import ApiStvMobility from "../../../../../api/factory/stv/mobility";
+
 export default {
 	name: 'Tbl_JointStudies',
 	components: {
@@ -23,12 +26,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.jointstudies.getStudies,
-				ajaxParams: () => {
-					return {
-						id: this.student.prestudent_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvJointstudies.getStudies(this.student.prestudent_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
@@ -217,7 +217,8 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.jointstudies.insertStudy(this.$refs.formJointStudies, data)
+			return this.$refs.formJointStudies
+				.call(ApiStvJointstudies.insertStudy(data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal("jointstudyModal");
@@ -233,7 +234,8 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.jointstudies.updateStudy(this.$refs.formJointStudies, data)
+			return this.$refs.formJointStudies
+				.call(ApiStvJointstudies.updateStudy(data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal("jointstudyModal");
@@ -245,14 +247,16 @@ export default {
 				});
 		},
 		loadJointStudy(mobilitaet_id) {
-			return this.$fhcApi.factory.stv.jointstudies.loadStudy(mobilitaet_id)
+			return this.$api
+				.call(ApiStvJointstudies.loadStudy(mobilitaet_id))
 				.then(result => {
 					this.formData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteJointStudy(mobilitaet_id) {
-			return this.$fhcApi.factory.stv.jointstudies.deleteStudy(mobilitaet_id)
+			return this.$api
+				.call(ApiStvJointstudies.deleteStudy(mobilitaet_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
@@ -276,32 +280,38 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.jointstudies.getTypenMobility()
+		this.$api
+			.call(ApiStvJointstudies.getTypenMobility())
 			.then(result => {
 				this.listTypenMobility = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStudiensemester()
+		this.$api
+			.call(ApiStvJointstudies.getStudiensemester())
 			.then(result => {
 				this.listStudiensemester = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.mobility.getProgramsMobility()
+		this.$api
+			.call(ApiStvMobility.getProgramsMobility())
 			.then(result => {
 				this.programsMobility = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStudyprograms()
+		this.$api
+			.call(ApiStvJointstudies.getStudyprograms())
 			.then(result => {
 				this.listStudienprogramme = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getListPartner()
+		this.$api
+			.call(ApiStvJointstudies.getListPartner())
 			.then(result => {
 				this.listPartner = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStatiPrestudent()
+		this.$api
+			.call(ApiStvJointstudies.getStatiPrestudent())
 			.then(result => {
 				this.statiPrestudent = result.data;
 			})

From 8442a3d758e837114c23827fc9065fb807234e9f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 12:03:21 +0200
Subject: [PATCH 0149/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/exemptions.js       | 75 +++++++++++++++++++
 .../Details/Anrechnungen/Anrechnungen.js      | 60 +++++++++------
 2 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 public/js/api/factory/stv/exemptions.js

diff --git a/public/js/api/factory/stv/exemptions.js b/public/js/api/factory/stv/exemptions.js
new file mode 100644
index 000000000..2bf8ee610
--- /dev/null
+++ b/public/js/api/factory/stv/exemptions.js
@@ -0,0 +1,75 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAnrechnungen(id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getAnrechnungen/' + id
+		};
+	},
+	getLehrveranstaltungen(prestudent_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLehrveranstaltungen/' + prestudent_id
+		};
+	},
+	getBegruendungen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getBegruendungen/'
+		};
+	},
+	getLvsKompatibel(lv_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLvsKompatibel/' + lv_id
+		};
+	},
+	getLektoren(studiengang_kz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLektoren/' + studiengang_kz
+		};
+	},
+	addNewAnrechnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/insertAnrechnung/',
+			params
+		};
+	},
+	loadAnrechnung(anrechnung_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/loadAnrechnung/' + anrechnung_id
+		};
+	},
+	editAnrechnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/updateAnrechnung/',
+			params
+		};
+	},
+	deleteAnrechnung(anrechnung_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/deleteAnrechnung/' + anrechnung_id
+		};
+	},
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 9515f2be6..1d6bd20df 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -4,6 +4,9 @@ import CoreForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 import CoreNotiz from "../../../../Notiz/Notiz.js";
 
+import ApiStvExemptions from "../../../../../api/factory/stv/exemptions.js";
+import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
+
 export default {
 	name: "ExemptionComponent",
 	components: {
@@ -30,12 +33,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.exemptions.getAnrechnungen,
-				ajaxParams: () => {
-					return {
-						id: this.student.prestudent_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvExemptions.getAnrechnungen(this.student.prestudent_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
@@ -83,7 +83,7 @@ export default {
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('ui', 'loeschen');
 							button.addEventListener('click', () =>
-								this.deleteAnrechnung(cell.getData().anrechnung_id)
+								this.actionDeleteAnrechnung(cell.getData().anrechnung_id)
 							);
 							container.append(button);
 
@@ -158,7 +158,8 @@ export default {
 			listKompatibleLehrveranstaltungen: [],
 			statusNew: true,
 			showNotizen: false,
-			currentAnrechnung_id: null
+			currentAnrechnung_id: null,
+			endpoint: ApiNotizPerson
 		}
 	},
 	watch: {
@@ -188,7 +189,9 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.exemptions.addNewAnrechnung(this.$refs.formExemptions, dataToSend)
+
+			return this.$refs.formExemptions
+				.call(ApiStvExemptions.addNewAnrechnung(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.anrechnungsModal.hide();
@@ -204,7 +207,8 @@ export default {
 				anrechnung_id: anrechnung_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.exemptions.editAnrechnung(this.$refs.formExemptions, dataToSend)
+			return this.$refs.formExemptions
+				.call(ApiStvExemptions.editAnrechnung(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.anrechnungsModal.hide();
@@ -215,22 +219,30 @@ export default {
 					this.reload();
 				});
 		},
-		deleteAnrechnung(anrechnung_id){
+		actionDeleteAnrechnung(anrechnung_id) {
 			this.$fhcAlert
 				.confirmDelete()
 				.then(result => result
 					? anrechnung_id
 					: Promise.reject({handled: true}))
-				.then(this.$fhcApi.factory.stv.exemptions.deleteAnrechnung)
-				.then(result => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					this.reload();
-				})
+				.then(this.deleteAnrechnung)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		deleteAnrechnung(anrechnung_id){
+			return this.$api
+				.call(ApiStvExemptions.deleteAnrechnung(anrechnung_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
 		getLvsKompatibel(){
 			if(this.formData.lehrveranstaltung_id) {
-				this.$fhcApi.factory.stv.exemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id)
+				this.$api
+					.call(ApiStvExemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id))
 					.then(result => {
 						this.listKompatibleLehrveranstaltungen = result.data;
 					})
@@ -243,7 +255,8 @@ export default {
 			}
 		},
 		loadAnrechnung(anrechnung_id){
-			return this.$fhcApi.factory.stv.exemptions.loadAnrechnung(anrechnung_id)
+			return this.$api
+				.call(ApiStvExemptions.loadAnrechnung(anrechnung_id))
 				.then(result => {
 					this.formData = result.data;
 					this.getLvsKompatibel();
@@ -263,19 +276,22 @@ export default {
 		}
 	},
 	created() {
-		this.$fhcApi.factory.stv.exemptions.getLehrveranstaltungen(this.student.prestudent_id)
+		this.$api
+			.call(ApiStvExemptions.getLehrveranstaltungen(this.student.prestudent_id))
 			.then(result => {
 				this.listNewLehrveranstaltungen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.stv.exemptions.getBegruendungen()
+		this.$api
+			.call(ApiStvExemptions.getBegruendungen())
 			.then(result => {
 				this.listBegruendungen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.stv.exemptions.getLektoren(this.student.studiengang_kz)
+		this.$api
+			.call(ApiStvExemptions.getLektoren(this.student.studiengang_kz))
 			.then(result => {
 				this.listLektoren = result.data;
 			})
@@ -298,7 +314,7 @@ export default {
 								</form-input>
 							</div>
 						<core-notiz
-							:endpoint="$fhcApi.factory.notiz.person"
+							:endpoint="endpoint"
 							ref="formNotes"
 							notiz-layout="popupModal"
 							typeId="anrechnung_id"

From e28067259bbd9be65be83992f143a517643f4f5a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 23 Apr 2025 13:59:31 +0200
Subject: [PATCH 0150/1357] WIP Abgabetool Mitarbeiter DetailComponent

---
 application/controllers/Cis/Abgabetool.php    |  29 +-
 .../controllers/api/frontend/v1/Lehre.php     |  32 +-
 .../models/education/Projektarbeit_model.php  |  30 ++
 public/js/api/lehre.js                        |   6 +
 public/js/apps/Dashboard/Fhc.js               |  17 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 286 +++++++++++++++
 ...AbgabeDetail.js => AbgabeStudentDetail.js} |   8 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 326 ++++++++++++++++++
 .../{Abgabetool.js => AbgabetoolStudent.js}   |  12 +-
 public/js/components/filter/Filter.js         |   8 +-
 .../components/verticalsplit/verticalsplit.js |   1 +
 system/phrasesupdate.php                      | 120 +++++++
 12 files changed, 853 insertions(+), 22 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
 rename public/js/components/Cis/Abgabetool/{AbgabeDetail.js => AbgabeStudentDetail.js} (98%)
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
 rename public/js/components/Cis/Abgabetool/{Abgabetool.js => AbgabetoolStudent.js} (96%)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index e00bbe837..e7d183f04 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -13,8 +13,10 @@ class Abgabetool extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['basis/cis:r'],
-			'getStudentProjektarbeitAbgabeFile' => ['basis/cis:r']
+			'index' => self::PERM_LOGGED,
+			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
+			'Mitarbeiter' => self::PERM_LOGGED,
+			'Student' => self::PERM_LOGGED
 		]);
 	}
 
@@ -33,7 +35,28 @@ class Abgabetool extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
-	
+
+	public function Student()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+
+	public function Mitarbeiter()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+
+
 	public function getStudentProjektarbeitAbgabeFile() 
 	{
 		$this->_ci =& get_instance();
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index b28bd2d45..a6c593d3a 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -42,7 +42,8 @@ class Lehre extends FHCAPI_Controller
 			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
 			'getStudentProjektabgaben' => self::PERM_LOGGED,
 			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
-			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED
+			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
+			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -443,5 +444,34 @@ class Lehre extends FHCAPI_Controller
 			}
 		}
 	}
+
+	public function getMitarbeiterProjektarbeiten() {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+//		if (!isset($uid) || isEmptyString($uid))
+//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$boolParamStr = $this->input->get('showall');
+		$trueStrings = ['true', '1'];
+		$falseStrings = ['false', '0'];
+
+		// Handle missing or invalid parameter
+		if ($boolParamStr === null) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		$boolParamStrLower = strtolower($boolParamStr);
+
+		if (in_array($boolParamStrLower, $trueStrings, true)) {
+			$showAllBool = true;
+		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
+			$showAllBool = false;
+		} else {
+//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		
+		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
+		
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
+	}
 }
 
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index c9c2b6b73..fb5c62149 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -211,4 +211,34 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
 	}
+	
+	public function getMitarbeiterProjektarbeiten($uid, $showAll){
+		$qry = "SELECT
+					*
+				FROM
+					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
+							tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
+					 FROM lehre.tbl_projektarbeit
+							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
+							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
+							  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
+							  LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
+							  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
+							  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+							  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+							  LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+							  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					 WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+					   AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
+															 WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
+															   AND public.tbl_benutzer.uid= ? )
+						 ".($showAll?'':' AND public.tbl_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
+							AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Zweitbegutachter', 'Erstbetreuer', 'Senatsvorsitz', 'Senatsmitglied')
+					 ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
+				ORDER BY nachname;";
+
+		return $this->execReadOnlyQuery($qry, array($uid));
+	}
 }
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 785b6abcf..cd8c911e2 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -48,5 +48,11 @@ export default {
 		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
 
 		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
+	},
+	getMitarbeiterProjektarbeiten(uid, all) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getMitarbeiterProjektarbeiten?showall=${all}`
+			, {}
+		);
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 0b50891b9..457d57e63 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -11,7 +11,8 @@ import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, { DEFAULT_MODE_RAUMINFO } from "../../components/Cis/Mylv/RoomInformation.js";
-import Abgabetool from "../../components/Cis/Abgabetool/Abgabetool";
+import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -31,9 +32,15 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Abgabetool`,
-			name: 'Abgabetool',
-			component: Abgabetool,
+			path: `/Cis/Abgabetool/Student`,
+			name: 'AbgabetoolStudent',
+			component: AbgabetoolStudent,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Mitarbeiter`,
+			name: 'AbgabetoolMitarbeiter',
+			component: AbgabetoolMitarbeiter,
 			props: true
 		},
 		{
@@ -211,8 +218,6 @@ const router = VueRouter.createRouter({
 	]
 })
 
-
-
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
new file mode 100644
index 000000000..016e08464
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -0,0 +1,286 @@
+import BsModal from '../../Bootstrap/Modal.js';
+
+const today = new Date()
+export const AbgabeMitarbeiterDetail = {
+	name: "AbgabeMitarbeiterDetail",
+	components: {
+		BsModal,
+		InputNumber: primevue.inputnumber,
+		Checkbox: primevue.checkbox,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea
+	},
+	props: {
+		projektarbeit: {
+			type: Object,
+			default: null
+		}
+	},
+	data() {
+		return {
+			eidAkzeptiert: false,
+			enduploadTermin: null,
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			form: Vue.reactive({
+				sprache: '',
+				abstract: '',
+				abstract_en: '',
+				schlagwoerter: '',
+				schlagwoerter_en: '',
+				kontrollschlagwoerter: '',
+				seitenanzahl: 1,
+			})
+		}
+	},
+	methods: {
+		openZusatzdatenModal(termin) {
+				
+		},
+		save(termin) {
+			// TODO: api speichern termin	
+		},
+		delete(termin) {
+			// TODO: api delete termin	
+		},
+		validate: function(termin) {
+			if(!termin.file.length) {
+				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
+				return false
+			}
+
+			return true;
+		},
+		downloadAbgabe(termin) {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+		},
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyle(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
+
+			// todo: rework styling but keep the color pattern logic
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			let color = 'white'
+			let fontColor = 'black'
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					color = 'red'
+					fontColor = 'white'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					color = 'yellow'
+				}
+			} else if(abgabedatum > datum) {
+				color = 'pink' // aka "hellrot"
+				fontColor = 'white'
+			} else {
+				color = 'green'
+			}
+
+			return 'font-color: ' + fontColor + '; background-color: ' + color
+		},
+		openBeurteilungLink(link) {
+			window.open(link, '_blank')
+		},
+		getOptionLabel(option) {
+			return option.sprache
+		}
+	},
+	watch: {
+		projektarbeit(newVal) {
+			// default select german if projektarbeit sprache was null
+			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
+			this.form.abstract = newVal.abstract
+			this.form.abstract_en = newVal.abstract_en
+			this.form.schlagwoerter = newVal.schlagwoerter
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
+			this.form.seitenanzahl = newVal.seitenanzahl
+		}
+	},
+	computed: {
+		getEid() {
+			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
+		},
+		getEnduploadErlaubt() {
+			return !this.eidAkzeptiert
+		}
+	},
+	created() {
+
+	},
+	mounted() {
+
+	},
+	template: `
+		<div v-if="projektarbeit">
+		
+			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
+			<div class="row">
+				<p> {{projektarbeit?.student}}</p>
+				<p> {{projektarbeit?.titel}}</p>
+				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+			</div>
+			<div id="uploadWrapper">
+				<div class="row" style="margin-bottom: 12px;">
+					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col">
+						
+					</div>
+				</div>
+<!--			TODO: show some nothing found placeholder when abgabetermine are empty -->
+				<div class="row" v-for="termin in projektarbeit.abgabetermine">
+					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
+						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<div :style="getDateStyle(termin)">
+<!--							TODO: date input-->
+							{{ termin.datum?.split("-").reverse().join(".") }}
+						</div>				
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+					<!-- TODO: type dropdown select -->
+							{{ termin.bezeichnung }}
+					</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">
+						<!-- TODO: abgabe kurzbz input -->
+						{{ termin.kurzbz }}
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
+							<i class="fa-solid fa-file-pdf"></i>
+						</a>
+					</div>
+					<div class="col-6">
+						<div class="row">
+							<div class="col-3">
+								<button class="btn btn-primary border-0" @click="save(termin)" :disabled="!termin.allowedToUpload">
+									Speichern
+									<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+								</button>
+							</div>
+							<div class="col-3">
+								<button class="btn btn-primary border-0" @click="delete(termin)" :disabled="!termin.allowedToUpload">
+									Löschen
+									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
+								</button>
+							</div>
+							<div v-if="termin.endupload && hasFile" class="col-3">
+								<button class="btn btn-primary border-0" @click="openZusatzdatenModal(termin)" :disabled="!termin.allowedToUpload">
+									Löschen
+									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
+								</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		 </div>
+		 <bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
+				
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
+					<div class="row">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="form.sprache"
+							:options="allActiveLanguages"
+							:optionLabel="getOptionLabel">
+						</Dropdown>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">Kontrollierte Schlagwörter</div>
+					<div class="row">
+						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>
+					</div>
+				</div>
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter_en"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract" rows="10"></Textarea>
+					</div>
+				</div>
+
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
+					</div>				
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
+					<div class="row">
+						<InputNumber 
+							v-model="form.seitenanzahl"
+							inputId="seitenanzahlInput" :min="1" :max="100000">
+						</InputNumber>
+					</div>		
+				</div>
+				
+				<div v-if="projektarbeit">
+					<div v-html="getEid"></div>
+					<div class="row">
+						<div class="col-9"></div>
+						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
+						<div class="col-1">
+							
+							<Checkbox 
+								v-model="eidAkzeptiert" 
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
+			</template>
+		</bs-modal>
+
+`,
+};
+
+export default AbgabeMitarbeiterDetail;
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
similarity index 98%
rename from public/js/components/Cis/Abgabetool/AbgabeDetail.js
rename to public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 5daf1a2b7..513d4f0e5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -2,8 +2,8 @@ import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
 
 const today = new Date()
-export const AbgabeDetail = {
-	name: "AbgabeDetail",
+export const AbgabeStudentDetail = {
+	name: "AbgabeStudentDetail",
 	components: {
 		Upload,
 		BsModal,
@@ -210,7 +210,7 @@ export const AbgabeDetail = {
 					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="cursor: pointer;">
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
@@ -335,4 +335,4 @@ export const AbgabeDetail = {
     `,
 };
 
-export default AbgabeDetail;
+export default AbgabeStudentDetail;
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
new file mode 100644
index 000000000..30344e4a0
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -0,0 +1,326 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
+import VerticalSplit from "../../verticalsplit/verticalsplit.js"
+
+export const AbgabetoolMitarbeiter = {
+	name: "AbgabetoolMitarbeiter",
+	components: {
+		CoreFilterCmpt,
+		AbgabeDetail,
+		VerticalSplit
+	},
+	props: {
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			showAll: false,
+			tabulatorUuid: Vue.ref(0),
+			selectedData: [],
+			domain: '',
+			student_uid: null,
+			detail: null,
+			detailOffset: 0,
+			projektarbeiten: null,
+			selectedProjektarbeit: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			abgabeTableOptions: {
+				height: 300,
+				index: 'projektarbeit_id',
+				layout: 'fitDataStretch',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				selectable: true,
+				columns: [
+					{
+						formatter: 'rowSelection',
+						titleFormatter: 'rowSelection',
+						titleFormatterParams: {
+							rowRange: "active" // Only toggle the values of the active filtered rows
+						},
+						hozAlign:"center",
+						headerSort: false,
+						frozen: true,
+						width: 70
+					},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beteuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
+				],
+				persistence: false,
+			},
+			abgabeTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+					debugger
+					if(cell.getColumn().getField() === "details") {
+						this.setDetailComponent(cell.getValue())
+					}
+					e.stopPropagation()
+
+				}
+			},
+			{
+				event: "rowClick",
+				handler: async (e, row) => {
+
+					debugger
+					e.stopPropagation()
+
+				}
+			},
+			{
+				event: "rowSelected",
+				handler: async (row) => {
+
+					debugger
+
+				}
+			},
+			{
+				event: "rowSelectionChanged",
+				handler: async(data) => {
+					this.selectedData = data
+				}
+			}
+			]};
+	},
+	methods: {
+		showDeadlines(){
+			// TODO: open seperate view in new window containing all future deadlines for the employee
+		},
+		toggleShowAll(showall) {
+			this.showAll = showall
+			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
+		},
+		addSeries() {
+			
+		},
+		isPastDate(date) {
+			return new Date(date) < new Date(Date.now())
+		},
+		setDetailComponent(details){
+			debugger
+			this.loadAbgaben(details).then((res)=> {
+				debugger
+				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.forEach(termin => {
+					termin.file = []
+					termin.allowedToUpload = true
+
+					// TODO: fixtermin logic?
+					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
+
+						// termin.allowedToUpload = false
+					} else {
+						// termin.allowedToUpload = true
+					}
+
+				})
+				pa.betreuer = this.buildBetreuer(pa)
+				pa.student_uid = details.student_uid
+				pa.student = `${pa.vorname} ${pa.nachname}`
+				
+				this.selectedProjektarbeit = pa
+				
+				Vue.nextTick(()=>{
+					this.$refs.verticalsplit.showBoth()
+				})
+			
+			})
+		},
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+			if(!val) return
+			
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
+		},
+		detailFormatter(cell) {
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
+		},
+		mailFormatter(cell) {
+			const val = cell.getValue()
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+		},
+		beurteilungFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			} else return '-'
+		},
+		pkzTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		buildMailToLink(abgabe) {
+			return 'mailto:' + abgabe.uid +'@'+ this.domain
+		},
+		buildPKZ(projekt) {
+			return `${projekt.uid} / ${projekt.matrikelnr}`
+		},
+		buildStg(projekt) {
+			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
+		},
+		buildBetreuer(abgabe) {
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
+		},
+		setupData(data){
+			this.projektarbeiten = data[0]
+			this.domain = data[1]
+			
+			const d = data[0]?.retval?.map(projekt => {
+				let mode = 'detailTermine'
+
+				return {
+					...projekt,
+					details: {
+						student_uid: projekt.uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+					},
+					pkz: this.buildPKZ(projekt),
+					beurteilung: projekt.beurteilungLink ?? null,
+					sem: projekt.studiensemester_kurzbz,
+					stg: this.buildStg(projekt),
+					mail: this.buildMailToLink(projekt),
+					typ: projekt.projekttyp_kurzbz,
+					titel: projekt.titel
+				}
+			})
+
+			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			this.$refs.abgabeTable.tabulator.setData(d);
+		},
+		loadProjektarbeiten(all = false, callback) {
+			this.$fhcApi.factory.lehre.getMitarbeiterProjektarbeiten(this.viewData?.uid ?? null, all)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				}).finally(() => {
+					if(callback) {
+						callback()
+					}
+				})
+		},
+		loadAbgaben(details) {
+			return new Promise((resolve) => {
+				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+					.then(res => {
+						resolve(res)
+					})
+			})
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+
+			this.loadProjektarbeiten()
+
+
+			this.$refs.verticalsplit.collapseBottom()
+			this.calcMaxTableHeight()
+			
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<div class="h-100">
+	
+
+		<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+		<hr>
+		
+		<vertical-split ref="verticalsplit">
+			<template #top>
+				<core-filter-cmpt 
+					:title="''"  
+					@uuidDefined="handleUuidDefined"
+					ref="abgabeTable"
+					:newBtnShow="true"
+					:newBtnLabel="$p.t('global/neueTerminserie')"
+					:newBtnDisabled="!selectedData.length"
+					@click:new=addSeries
+					:tabulator-options="abgabeTableOptions"  
+					:tabulator-events="abgabeTableEventHandlers"
+					tableOnly
+					:sideMenu="false"
+					:useSelectionSpan="false"
+				>
+					<template #actions>
+						<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
+							<i v-show="!showAll" class="fa fa-eye"></i>
+							<i v-show="showAll" class="fa fa-eye-slash"></i>
+							{{ $p.t('abgabetool/showAll') }}
+						</button>
+						
+						<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
+							<i class="fa fa-hourglass-end"></i>
+							{{ $p.t('abgabetool/showDeadlines') }}
+						</button>
+					</template>
+				</core-filter-cmpt>
+			</template>
+			<template #bottom>
+				<div v-show="selectedProjektarbeit" ref="selProj"> 
+					<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+				</div>
+			</template>
+		</vertical-split>
+
+	</div>
+	 
+    `,
+};
+
+export default AbgabetoolMitarbeiter;
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
similarity index 96%
rename from public/js/components/Cis/Abgabetool/Abgabetool.js
rename to public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 6a34ff052..699be7de6 100644
--- a/public/js/components/Cis/Abgabetool/Abgabetool.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,8 +1,8 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
-import AbgabeDetail from "./AbgabeDetail";
+import AbgabeDetail from "./AbgabeStudentDetail.js";
 
-export const Abgabetool = {
-	name: "Abgabetool",
+export const AbgabetoolStudent = {
+	name: "AbgabetoolStudent",
 	components: {
 		VueDatePicker,
 		CoreFilterCmpt,
@@ -33,8 +33,8 @@ export const Abgabetool = {
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), formatter: this.beurteilungFormatter, field: 'beurteilung', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung', formatter: this.beurteilungFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
@@ -233,4 +233,4 @@ export const Abgabetool = {
     `,
 };
 
-export default Abgabetool;
+export default AbgabetoolStudent;
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index c6cb6cdb3..aea50a10e 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -74,7 +74,11 @@ export const CoreFilterCmpt = {
 		// TODO soll im master kommen?
 		idField: String,
 		parentIdField: String,
-		countOnly: Boolean
+		countOnly: Boolean,
+		useSelectionSpan: {
+			type: Boolean,
+			default: true
+		}
 	},
 	data: function() {
 		return {
@@ -613,7 +617,7 @@ export const CoreFilterCmpt = {
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
-					<span v-if="$slots.actions && tabulatorHasSelector">
+					<span v-if="$slots.actions && tabulatorHasSelector && useSelectionSpan">
 						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>
 						<span v-else> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
diff --git a/public/js/components/verticalsplit/verticalsplit.js b/public/js/components/verticalsplit/verticalsplit.js
index 53a1833fb..e712d1ecb 100644
--- a/public/js/components/verticalsplit/verticalsplit.js
+++ b/public/js/components/verticalsplit/verticalsplit.js
@@ -1,4 +1,5 @@
 export default {
+    name: 'VerticalSplit',
     data: function() {
       return {          
           availHeight: 0,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dd874ddff..bfebd10cf 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38177,6 +38177,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4personenkennzeichen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Personenkennzeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Personal identity number",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4vorname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorname",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "First Name",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4nachname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nachname",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Last Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betreuerart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Betreuerart",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Supervisor type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'showAll',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Alle anzeigen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show All',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'showDeadlines',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Deadlines anzeigen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show Deadlines',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From eaaf5de9c0be9f559c5a14c2958fa743393f9732 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 07:54:06 +0200
Subject: [PATCH 0151/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/documents.js        | 76 +++++++++++++++++++
 .../Details/Dokumente/List/Accepted.js        | 25 +++---
 .../Details/Dokumente/List/Unaccepted.js      | 20 ++---
 .../Details/Dokumente/Modal/Edit.js           | 15 ++--
 .../Details/Dokumente/Modal/Upload.js         | 12 +--
 5 files changed, 117 insertions(+), 31 deletions(-)
 create mode 100644 public/js/api/factory/stv/documents.js

diff --git a/public/js/api/factory/stv/documents.js b/public/js/api/factory/stv/documents.js
new file mode 100644
index 000000000..1898023cd
--- /dev/null
+++ b/public/js/api/factory/stv/documents.js
@@ -0,0 +1,76 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getDocumentsUnaccepted(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentsUnaccepted/' + params.id + '/' + params.studiengang_kz
+		};
+	},
+	getDocumentsAccepted(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentsAccepted/' + params.id + '/' + params.studiengang_kz
+		};
+	},
+	deleteZuordnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/deleteZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz
+		};
+	},
+	createZuordnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/createZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz
+		};
+	},
+	loadAkte(akte_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/loadAkte/' + akte_id
+		};
+	},
+	getDoktypen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDoktypen/'
+		};
+	},
+	updateFile(akte_id, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/updateAkte/' + akte_id,
+			params
+		};
+	},
+	deleteFile(akte_id){
+		console.log("in deleteFile " + akte_id);
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/deleteAkte/' + akte_id,
+		};
+	},
+	uploadFile(prestudent_id, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/uploadDokument/' + prestudent_id,
+			params
+		};
+	},
+}
\ No newline at end of file
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 e22ad4cdb..7790e12f8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
 import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	components: {
 		name: "AcceptedDocuments",
@@ -17,13 +19,11 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsAccepted,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvDocuments.getDocumentsAccepted({
 						id: this.prestudent_id,
-						studiengang_kz: this.studiengang_kz
-					};
-				},
+						studiengang_kz: this.studiengang_kz})
+				),
 				ajaxResponse: (url, params, response) =>  {
 					return response.data;
 				},
@@ -240,7 +240,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteFile(akte_id){
-			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+			return this.$api
+				.call(ApiStvDocuments.deleteFile(akte_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
@@ -252,10 +253,12 @@ export default {
 		deleteZuordnung(selected) {
 			Promise.allSettled(
 				selected.map(e =>
-					this.$fhcApi.factory.stv.documents.deleteZuordnung({
-						prestudent_id: this.prestudent_id,
-						dokument_kurzbz: e.dokument_kurzbz
-					}).then(() => ({
+					this.$api
+						.call(ApiStvDocuments.deleteZuordnung({
+							prestudent_id: this.prestudent_id,
+							dokument_kurzbz: e.dokument_kurzbz
+						}))
+						.then(() => ({
 							success: true,
 							dokument_bz: e.bezeichnung
 						}))
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 5b2a2d080..6cc25cb6f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
 import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "UnacceptedDocuments",
 	components: {
@@ -17,13 +19,11 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsUnaccepted,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvDocuments.getDocumentsUnaccepted({
 						id: this.prestudent_id,
-						studiengang_kz: this.studiengang_kz
-					};
-				},
+						studiengang_kz: this.studiengang_kz})
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Dokument", field: "bezeichnung"},
@@ -252,10 +252,12 @@ export default {
 			Promise
 				.allSettled(
 					selected.map(e =>
-						this.$fhcApi.factory.stv.documents.createZuordnung({
+						this.$api
+							.call(ApiStvDocuments.createZuordnung({
 								prestudent_id: this.prestudent_id,
-								dokument_kurzbz: e.dokument_kurzbz,
-							}).then(() => ({
+								dokument_kurzbz: e.dokument_kurzbz
+							}))
+							.then(() => ({
 							success: true,
 							dokument_bz: e.bezeichnung
 						}))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 95a12a669..29c98020e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -2,6 +2,8 @@ import BsModal from "../../../../../Bootstrap/Modal.js";
 import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "modalEditDocuments",
 	components: {
@@ -17,10 +19,9 @@ export default {
 	},
 	methods: {
 		updateFile(akte_id){
-			console.log("in update" + akte_id);
-
-			this.$fhcApi.factory.stv.documents.updateFile(akte_id, this.formData).
-			then(response => {
+			this.$api
+				.call(ApiStvDocuments.updateFile(akte_id, this.formData))
+				.then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.$refs.modalEditDocument.hide();
 				this.$emit('reload');
@@ -32,7 +33,8 @@ export default {
 			this.$refs.modalEditDocument.show();
 		},
 		loadFormData(akte_id){
-			return this.$fhcApi.factory.stv.documents.loadAkte(akte_id)
+			return	this.$api
+				.call(ApiStvDocuments.loadAkte(akte_id))
 				.then(result => {
 					this.formData = result.data;
 					return result;
@@ -41,7 +43,8 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.documents.getDoktypen()
+		this.$api
+			.call(ApiStvDocuments.getDoktypen())
 			.then(result => {
 				this.listDokTypen = result.data;
 			})
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
index dec8da503..f6280a9cf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -3,6 +3,8 @@ import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 import FormUploadDms from "../../../../../Form/Upload/Dms.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "modalUploadDocuments",
 	components: {
@@ -23,15 +25,14 @@ export default {
 	},
 	methods:{
 		open(prestudent_id, dokument_kurzbz){
-			console.log("ps: " + prestudent_id + 'dok: ' + dokument_kurzbz);
 			this.formData.dokument_kurzbz = dokument_kurzbz;
 			this.formData.prestudent_id = prestudent_id;
 			this.$refs.modalUploadFile.show();
 		},
 		uploadFile(){
-			console.log(this.formData.anhang[0]);
-
-			return this.$fhcApi.factory.stv.documents.uploadFile(this.formData.prestudent_id, this.formData)
+		//	console.log(this.formData.anhang[0]);
+			return this.$api
+				.call(ApiStvDocuments.uploadFile(this.formData.prestudent_id, this.formData))
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successUpload'));
 					this.resetModal();
@@ -48,7 +49,8 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.documents.getDoktypen()
+		this.$api
+			.call(ApiStvDocuments.getDoktypen())
 			.then(result => {
 				this.listDokTypen = result.data;
 			})

From ed6b9310aeaf568836007919244e017b6e1c4fc5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 08:23:24 +0200
Subject: [PATCH 0152/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/coursedates.js      | 35 +++++++++++++++++++
 .../ListLehrveranstaltungstermine.js          | 15 ++++----
 2 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 public/js/api/factory/stv/coursedates.js

diff --git a/public/js/api/factory/stv/coursedates.js b/public/js/api/factory/stv/coursedates.js
new file mode 100644
index 000000000..71ded7285
--- /dev/null
+++ b/public/js/api/factory/stv/coursedates.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getCourselist(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + params.student_uid + '/'
+				+ params.start_date + '/'
+				+ params.end_date + '/'
+				+ params.group_consecutiveHours + '/'
+				+ params.dbStundenplanTable
+		};
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/LvTermine/getStudiensemester/'
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index bc4e02b51..0f1c2f2f0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import FormInput from "../../../../Form/Input.js";
 import FormForm from '../../../../Form/Form.js';
 
+import ApiStvCoursedates from "../../../../../api/factory/stv/coursedates.js";
+
 export default {
 	name: "TblCourseList",
 	components: {
@@ -46,16 +48,14 @@ export default {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvCoursedates.getCourselist({
 						student_uid: this.student.uid,
 						start_date: this.dataSem.start,
 						end_date: this.dataSem.ende,
 						group_consecutiveHours: true,
-						dbStundenplanTable: this.dbStundenplanTable
-					};
-				},
+						dbStundenplanTable: this.dbStundenplanTable})
+				),
 				ajaxResponse: (url, params, response) => {
 					return response.data;
 				},
@@ -153,7 +153,8 @@ export default {
 		},
 	},
 	created(){
-		this.$fhcApi.factory.stv.courselist.getStudiensemester()
+		this.$api
+			.call(ApiStvCoursedates.getStudiensemester())
 			.then(result => {
 				this.listStudiensemester = result.data;
 				this.getDatesOfSemester(this.currentSemester);

From d48a0b62fd68566d0412b5cf944c979bda553ebd Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 12:59:47 +0200
Subject: [PATCH 0153/1357] Refactoring FhcApi_Factory

---
 public/js/api/factory/messages/messages.js    |  2 -
 public/js/api/messages/person.js              | 91 +++++++++----------
 .../Messages/Details/NewMessage/Modal.js      |  2 -
 .../Messages/Details/NewMessage/NewDiv.js     | 13 +--
 .../Messages/Details/TableMessages.js         | 33 ++++---
 5 files changed, 64 insertions(+), 77 deletions(-)

diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index 8424e14f2..cec34ad8b 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -16,9 +16,7 @@
  */
 
 export default {
-	//TODO(manu) check how to get params size and page
 	getMessages(params) {
-		console.log('page ' + params.page + ' size ' + params.size);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/messages/messages/getMessages/'
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index f41050770..e2d2fd0c4 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,48 +1,47 @@
 export default {
-	getMessages(url, config, params) {
-		console.log('page ' + params.page + ' size ' + params.size);
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
-	},
-/*	getVorlagen(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
-	},
-	getMsgVarsLoggedInUser(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
-	},
-	getMessageVarsPerson(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
-	},
-	getMsgVarsPrestudent(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
-	},
-	getPersonId(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
-	},
-	getUid(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
-	},
-	getVorlagentext(vorlage_kurzbz){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
-	},
-	getNameOfDefaultRecipient(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
-	},
-	getPreviewText(params, data){
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
-			data);
-	},
-	getReplyData(messageId){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
-	},
-	sendMessageFromModalContext(form, id, data) {
-		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
-			data);
-	},
-	sendMessage(id, data) {
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
-			data);
-	},
-	deleteMessage(messageId){
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
-	}*/
+		getMessages(url, config, params) {
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
+		},
+		getVorlagen(){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
+		},
+		getMsgVarsLoggedInUser(){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
+		},
+		getMessageVarsPerson(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
+		},
+		getMsgVarsPrestudent(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
+		},
+		getPersonId(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
+		},
+		getUid(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
+		},
+		getNameOfDefaultRecipient(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
+		},
+		getPreviewText(params, data){
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
+				data);
+		},
+		getReplyData(messageId){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
+		},
+		sendMessageFromModalContext(form, id, data) {
+			return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
+				data);
+		},
+		sendMessage(id, data) {
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
+				data);
+		},
+		deleteMessage(messageId){
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
+		}
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 5bbf29f16..d44d0faeb 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -241,7 +241,6 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					//const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
 					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
 					this.replyData = result.data;
 
@@ -264,7 +263,6 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			//this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 			this.$api
 				.call(ApiMessages.getMessageVarsPerson(params))
 				.then(result => {
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 11335ed2a..34401f6ea 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -118,11 +118,6 @@ export default {
 				...params
 			};
 			data.append('data', JSON.stringify(merged));
-
-			//this.uid is necessary for existing sendFunction
-/*			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.uid,
-				data)*/
 			return this.$api
 				.call(ApiMessages.sendMessage(this.uid, data))
 				.then(response => {
@@ -143,7 +138,6 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-		//	return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 			return this.$api
 				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
@@ -157,9 +151,6 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-/*			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: id,
-				type_id: typeId}, data)*/
 			return this.$api
 				.call(ApiMessages.getPreviewText({
 					id: this.id,
@@ -174,7 +165,6 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-			//	this.editor.insertContent(selectedItem.value + ". ");
 				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
 				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
 								//this.editor.focus();
@@ -272,7 +262,7 @@ export default {
 					id: this.id,
 					type_id: this.typeId
 				};
-			//	this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+
 				this.$api
 				.call(ApiMessages.getMessageVarsPerson(params))
 					.then(result => {
@@ -291,7 +281,6 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			//this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 			this.$api
 				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 07fdd8f20..ac3d616ec 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -29,30 +29,17 @@ export default {
 	},
 	data(){
 		return {
-/*			paginationSize: 15,
-			paginationInitialPage: 1,*/
+			pageNo: 1,
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				//TODO(Manu) how to handle size and page?
-/*				ajaxRequestFunc: () => this.$api.call(
-					ApiMessages.getMessages({
-						id: this.id,
-						type: this.typeId,
-						size: this.paginationSize,
-						page: this.paginationInitialPage
-					})
-				),*/
-		//OLD WORKING VERSION
-				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
+				ajaxRequestFunc: this.loadAjaxCall,
 				ajaxParams: () => {
 					return {
 						id: this.id,
 						type: this.typeId
 					};
 				},
-
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
-				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -220,6 +207,12 @@ export default {
 							this.previewBody = body;
 					}
 				},
+				{
+					event: 'pageLoaded',
+					handler: (pageno) => {
+						this.pageNo = pageno+1;
+					}
+				}
 			],
 			previewBody: "",
 			open: false,
@@ -296,6 +289,16 @@ export default {
 			if (iteration > messages.length) break;
 			}
 		return {data: messageNested, last_page};
+		},
+		loadAjaxCall(params){
+			return this.$api.call(
+				ApiMessages.getMessages({
+					id: this.id,
+					type: this.typeId,
+					size: this.tabulatorOptions.paginationSize,
+					page: this.pageNo
+				})
+			);
 		}
 	},
 	computed: {

From 2ab01132b1a069390abc360bb359fc4dc12bf89f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 16:30:50 +0200
Subject: [PATCH 0154/1357] show List Admission Dates

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 243 +-----------------
 application/models/crm/Reihungstest_model.php |  39 +++
 public/js/api/factory/stv/admissionDates.js   |   4 +-
 public/js/api/stv/admissionDates.js           |   0
 .../Aufnahmetermine/Aufnahmetermine.js        |  31 ++-
 system/phrasesupdate.php                      |  20 ++
 6 files changed, 92 insertions(+), 245 deletions(-)
 delete mode 100644 public/js/api/stv/admissionDates.js

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 519e8125d..3a0be3d40 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -27,20 +27,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 		]);
 
 		// Load models
-		$this->load->model('codex/Bisio_model', 'BisioModel');
+		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 	}
 
-	public function getAufnahmetermine($student_uid)
+	public function getAufnahmetermine($person_id)
 	{
-		$this->BisioModel->addSelect("*");
-		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
-		$this->BisioModel->addOrder('von', 'DESC');
-		$this->BisioModel->addOrder('bis', 'DESC');
-		$this->BisioModel->addOrder('aufnahmetermin_id', 'DESC');
-		$result = $this->BisioModel->loadWhere(
-			array('student_uid' => $student_uid)
-		);
+		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -274,233 +266,4 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getLVList($studiengang_kz)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-
-		$result = $this->LehrveranstaltungModel->getLvsByStudiengangkz($studiengang_kz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAllLehreinheiten()
-	{
-		$lv_id = $this->input->post('lv_id');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getLvsandLesByStudent($student_uid)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-
-		$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$lv_ids = array();
-		$allData = array();
-
-		foreach ($data as $lehrveranstaltung) {
-			$lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
-		}
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		foreach ($lv_ids as $id)
-		{
-			$result = $this->LehreinheitModel->getLesFromLvIds($id);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if (is_array($data)) {
-				$allData = array_merge($allData, $data);
-			}
-		}
-
-		return $this->terminateWithSuccess($allData);
-	}
-
-	public function getPurposes($aufnahmetermin_id)
-	{
-		$aufnahmetermin_id = (int)$aufnahmetermin_id;
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-
-		$this->BisiozweckModel->addSelect("*");
-		$this->BisiozweckModel->addJoin('bis.tbl_zweck zw', 'ON (zw.zweck_code = bis.tbl_bisio_zweck.zweck_code)');
-
-		$result = $this->BisiozweckModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getSupports($aufnahmetermin_id)
-	{
-		$aufnahmetermin_id = (int)$aufnahmetermin_id;
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		$this->BisioaufenthaltfoerderungModel->addSelect("*");
-		$this->BisioaufenthaltfoerderungModel->addJoin('bis.tbl_aufenthaltfoerderung af', 'ON (af.aufenthaltfoerderung_code = bis.tbl_bisio_aufenthaltfoerderung.aufenthaltfoerderung_code)');
-
-		$result = $this->BisioaufenthaltfoerderungModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getListPurposes()
-	{
-		$this->load->model('codex/Zweck_model', 'ZweckModel');
-
-		$result = $this->ZweckModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getListSupports()
-	{
-		$this->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
-
-		$result = $this->AufenthaltfoerderungModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function addAufnahmeterminPurpose($aufnahmetermin_id, $local_purpose = null)
-	{
-		$zweck_code = $this->input->post('zweck_code');
-
-		if($local_purpose){
-			$zweck_code = $local_purpose;
-		}
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-		if(!$local_purpose)
-		{
-			$check = $this->BisiozweckModel->loadWhere(
-				[
-					'aufnahmetermin_id' => $aufnahmetermin_id,
-					'zweck_code' => $zweck_code,
-				]
-			);
-			if (hasData($check))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->BisiozweckModel->insert(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'zweck_code' => $zweck_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if($local_purpose)
-		{
-			return $data;
-		}
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function deleteAufnahmeterminPurpose($aufnahmetermin_id)
-	{
-		$zweck_code = $this->input->post('zweck_code');
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-
-
-		$result = $this->BisiozweckModel->delete(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'zweck_code' => $zweck_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function addAufnahmeterminSupport($aufnahmetermin_id, $local_support = null)
-	{
-		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
-
-		if($local_support){
-			$aufenthaltfoerderung_code = $local_support;
-		}
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		if(!$local_support)
-		{
-			$check = $this->BisioaufenthaltfoerderungModel->loadWhere(
-				[
-					'aufnahmetermin_id' => $aufnahmetermin_id,
-					'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code,
-				]
-			);
-			if (hasData($check))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->BisioaufenthaltfoerderungModel->insert(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if($local_support)
-		{
-			return $data;
-		}
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function deleteAufnahmeterminSupport($aufnahmetermin_id)
-	{
-		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		$result = $this->BisioaufenthaltfoerderungModel->delete(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
-			)
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess(current($data));
-	}
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index 86ebfd0af..f2732b636 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -511,4 +511,43 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, array($date, $studiengang_kz));
 	}
+
+	/**
+	 * Loads all placement tests of a given person
+	 * @param integer $person_id
+	 * @return array Returns object array with data of placement tests
+	 */
+	public function getReihungstestPerson($person_id)
+	{
+		$query = ' 
+			SELECT 
+			  tbl_rt_person.*,
+			  tbl_reihungstest.studiengang_kz,
+			  tbl_reihungstest.anmerkung,
+			  tbl_reihungstest.datum,
+			  tbl_reihungstest.uhrzeit,
+			  tbl_reihungstest.ext_id,
+			  tbl_reihungstest.max_teilnehmer,
+			  tbl_reihungstest.oeffentlich,
+			  tbl_reihungstest.freigeschaltet,
+			  tbl_reihungstest.studiensemester_kurzbz,
+			  tbl_reihungstest.stufe,
+			  tbl_reihungstest.anmeldefrist,
+			  tbl_reihungstest.aufnahmegruppe_kurzbz,
+			  tbl_studiengang.typ,
+			  UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
+			  so.studiengangbezeichnung,
+				  so.studiengangbezeichnung_englisch
+			FROM
+			  public.tbl_rt_person
+			JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			WHERE
+			  tbl_rt_person.person_id = ?
+			ORDER BY datum, uhrzeit ASC';
+
+		return $this->execQuery($query, array($person_id));
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index fc96f47be..51a92c331 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -16,10 +16,10 @@
  */
 
 export default {
-	getAufnahmetermine(prestudent_id) {
+	getAufnahmetermine(person_id) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/aufnahmetermine/' + prestudent_id
+			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
 }
\ No newline at end of file
diff --git a/public/js/api/stv/admissionDates.js b/public/js/api/stv/admissionDates.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 58f440836..7e7e2ae97 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -27,12 +27,24 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-					ApiStvAdmissionDates.getAufnahmetermin(this.student.prestudent_id)
+					ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "aufnahmetermin_id", field: "aufnahmetermin_id"},
-					{title: "prestudent_id", field: "prestudent_id"},
+					{title: "rt_id", field: "rt_id"},
+					{title: "rt_person_id", field: "rt_person_id"},
+					{title: "person_id", field: "person_id"},
+					{title: "datum", field: "datum"},
+					{title: "stufe", field: "stufe"},
+					{title: "studiensemester", field: "studiensemester_kurzbz"},
+					{title: "anmerkung", field: "anmerkung", visible: false},
+					{title: "anmeldedatum", field: "anmeldedatum", visible: false},
+					{title: "punkte", field: "punkte"},
+					{title: "teilgenommen", field: "teilgenommen"},
+					{title: "ort", field: "ort", visible: false},
+					{title: "studienplan", field: "studienplan", visible: false},
+					{title: "studienplan_id", field: "studienplan_id", visible: false},
+					{title: "stg_kuerzel", field: "stg_kuerzel"},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
@@ -53,6 +65,19 @@ export default {
 	<div class="stv-details-admission-dates-table h-100 pb-3">
 		<h4>Allgemein</h4>
 		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
+			@click:new="actionNewMobility"
+			>
+		</core-filter-cmpt>
+		
 	</div>
 	`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fd54d9f66..bf18f50c8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41416,6 +41416,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'reihungstest',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstest',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placement Test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From 97d83d3acf06fe2fa418779fd60f5914876a69a2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Apr 2025 09:59:41 +0200
Subject: [PATCH 0155/1357] WIP abgabetool mitarbeiter

---
 .../controllers/api/frontend/v1/Lehre.php     |  78 ++++++++-
 .../models/education/Paabgabe_model.php       |  11 --
 .../models/education/Projektarbeit_model.php  |   3 +-
 public/js/api/lehre.js                        |  23 +++
 public/js/apps/Dashboard/Fhc.js               |   2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 163 ++++++++++++++----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   8 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  48 ++++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  12 +-
 public/js/plugin/FhcApi.js                    |   2 -
 10 files changed, 272 insertions(+), 78 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index a6c593d3a..d0b712e36 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -43,7 +43,9 @@ class Lehre extends FHCAPI_Controller
 			'getStudentProjektabgaben' => self::PERM_LOGGED,
 			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
 			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
-			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED
+			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
+			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -448,9 +450,6 @@ class Lehre extends FHCAPI_Controller
 	public function getMitarbeiterProjektarbeiten() {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-//		if (!isset($uid) || isEmptyString($uid))
-//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
 		$boolParamStr = $this->input->get('showall');
 		$trueStrings = ['true', '1'];
 		$falseStrings = ['false', '0'];
@@ -473,5 +472,76 @@ class Lehre extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
+	
+	public function postProjektarbeitAbgabe() {
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$datum = $_POST['datum'];
+		$fixtermin = $_POST['fixtermin'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
+		if($paabgabe_id == -1) {
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => $fixtermin,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+			
+			$this->terminateWithSuccess($result);
+		} else {
+			$result = $this->PaabgabeModel->update(
+				$paabgabe_id,
+				array(
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			$this->terminateWithSuccess($result);
+		}
+	}
+	
+	public function deleteProjektarbeitAbgabe() {
+		$paabgabe_id = $_POST['paabgabe_id'];
+		
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$result = $this->PaabgabeModel->load($paabgabe_id);
+		$result = $this->getDataOrTerminateWithError($result);
+		
+		if(count($result) == 0) 
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// TODO: berechtigung?
+		if($result[0]->insertvon === getAuthUID()) {
+			$result = $this->PaabgabeModel->delete($paabgabe_id);
+			$result = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithSuccess($result);
+		}
+
+		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+	}
 }
 
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 97235c37d..558059f72 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -31,15 +31,4 @@ class Paabgabe_model extends DB_Model
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
 	
-	public function updatePaabgabe($paabgabe_id) {
-		$qry="
-			UPDATE campus.tbl_paabgabe SET
-				abgabedatum = now(),
-				updatevon = ?,
-				updateamum = now()
-			WHERE paabgabe_id= ?";
-
-		return $this->execQuery($qry, array(getAuthUID(), $paabgabe_id));
-	}
-	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index fb5c62149..1041b3aec 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -169,7 +169,8 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.datum,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
-					campus.tbl_paabgabe.abgabedatum
+					campus.tbl_paabgabe.abgabedatum,
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
 				ORDER BY campus.tbl_paabgabe.datum";
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index cd8c911e2..2bf6dd277 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -54,5 +54,28 @@ export default {
 			`/api/frontend/v1/Lehre/getMitarbeiterProjektarbeiten?showall=${all}`
 			, {}
 		);
+	},
+	postProjektarbeitAbgabe(termin) {
+		const payload = {
+			paabgabe_id: termin.paabgabe_id,
+			paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
+			datum: termin.datum,
+			fixtermin: termin.fixtermin,
+			insertvon: termin.insertvon,
+			kurzbz: termin.kurzbz,
+			projektarbeit_id: termin.projektarbeit_id
+		}
+		const url = '/api/frontend/v1/Lehre/postProjektarbeitAbgabe';
+
+		return this.$fhcApi.post(url, payload, null)
+		
+	},
+	deleteProjektarbeitAbgabe(paabgabe_id) {
+		const payload = {
+			paabgabe_id
+		}
+		const url = '/api/frontend/v1/Lehre/deleteProjektarbeitAbgabe';
+
+		return this.$fhcApi.post(url, payload, null)
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 457d57e63..31f783b09 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -32,7 +32,7 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Abgabetool/Student`,
+			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
 			name: 'AbgabetoolStudent',
 			component: AbgabetoolStudent,
 			props: true
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 016e08464..3451d97ba 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -8,7 +8,8 @@ export const AbgabeMitarbeiterDetail = {
 		InputNumber: primevue.inputnumber,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
-		Textarea: primevue.textarea
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		projektarbeit: {
@@ -21,6 +22,29 @@ export const AbgabeMitarbeiterDetail = {
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			// TODO: fetch types
+			allAbgabeTypes: [
+				{
+					paabgabetyp_kurzbz: 'abstract',
+					bezeichnung: 'Entwurf'
+				},
+				{
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				{
+					paabgabetyp_kurzbz: 'note',
+					bezeichnung: 'Benotung'
+				},
+				{
+					paabgabetyp_kurzbz: 'end',
+					bezeichnung: 'Endupload'
+				},
+				{
+					paabgabetyp_kurzbz: 'enda',
+					bezeichnung: 'Endabgabe im Sekretariat'
+				}
+			],
 			form: Vue.reactive({
 				sprache: '',
 				abstract: '',
@@ -36,11 +60,52 @@ export const AbgabeMitarbeiterDetail = {
 		openZusatzdatenModal(termin) {
 				
 		},
-		save(termin) {
-			// TODO: api speichern termin	
+		saveTermin(termin) {
+			const paabgabe_id = termin.paabgabe_id
+			this.$fhcApi.factory.lehre.postProjektarbeitAbgabe(termin).then( (res) => {
+				if(res?.meta?.status == 'success') {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
+
+					if(paabgabe_id === -1) { // new abgabe has been inserted
+						termin.paabgabe_id = res?.data?.retval
+
+						this.projektarbeit.abgabetermine.push({ // new abgatermin row
+
+							'paabgabe_id': -1,
+							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+							'fixtermin': false,
+							'kurzbz': '',
+							'datum': new Date().toISOString().split('T')[0],
+							'paabgabetyp_kurzbz': '',
+							'bezeichnung': '',
+							'abgabedatum': null,
+							'insertvon': this.viewData?.uid ?? '',
+							'allowedToSave': true,
+							'allowedToDelete': true
+						})
+					}
+					
+					
+				} else if(res?.meta?.status == 'error'){
+					this.$fhcAlert.alertError()
+				}
+				
+			})
 		},
-		delete(termin) {
-			// TODO: api delete termin	
+		deleteTermin(termin) {
+			debugger
+			this.$fhcApi.factory.lehre.deleteProjektarbeitAbgabe(termin.paabgabe_id).then( (res) => {
+				if(res?.meta?.status == 'success') {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
+					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
+					const deletedTerminIndex = this.projektarbeit.abgabetermine.findIndex(t => t.paabgabe_id === termin.paabgabe_id)
+					this.projektarbeit.abgabetermine.splice(deletedTerminIndex, 1)
+
+
+				} else if(res?.meta?.status == 'error'){
+					this.$fhcAlert.alertError()
+				}
+			})
 		},
 		validate: function(termin) {
 			if(!termin.file.length) {
@@ -84,8 +149,25 @@ export const AbgabeMitarbeiterDetail = {
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
 		},
-		getOptionLabel(option) {
+		getOptionLabelSprache(option) {
 			return option.sprache
+		},
+		getOptionLabelAbgabetyp(option){
+			return option.bezeichnung
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		openStudentPage() {
+			// TODO: do it
 		}
 	},
 	watch: {
@@ -119,39 +201,58 @@ export const AbgabeMitarbeiterDetail = {
 		
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 			<div class="row">
-				<p> {{projektarbeit?.student}}</p>
-				<p> {{projektarbeit?.titel}}</p>
-				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+				<div class="col-8">
+					<p> {{projektarbeit?.student}}</p>
+					<p> {{projektarbeit?.titel}}</p>
+					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+				</div>
+				<div>
+					<button class="btn btn-primary border-0" @click="openStudentPage">
+						Speichern
+						<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+					</button>
+				</div>
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
 					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						
 					</div>
 				</div>
-<!--			TODO: show some nothing found placeholder when abgabetermine are empty -->
+				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
 					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
-<!--							TODO: date input-->
-							{{ termin.datum?.split("-").reverse().join(".") }}
+							<VueDatePicker
+								v-model="termin.datum"
+								:clearable="false"
+								:disabled="!termin.allowedToSave"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
 						</div>				
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
-					<!-- TODO: type dropdown select -->
-							{{ termin.bezeichnung }}
-					</div>
 					<div class="col-2 d-flex justify-content-center align-items-center">
-						<!-- TODO: abgabe kurzbz input -->
-						{{ termin.kurzbz }}
+						<Dropdown 
+							:style="{'width': '100%'}"
+							:disabled="!termin.allowedToSave"
+							v-model="termin.bezeichnung"
+							:options="allAbgabeTypes"
+							:optionLabel="getOptionLabelAbgabetyp">
+						</Dropdown>
+					</div>
+					<div class="col-4 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="!termin.allowedToSave"></Textarea>
 					</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
@@ -159,22 +260,16 @@ export const AbgabeMitarbeiterDetail = {
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-6">
+					<div class="col-2 align-content-center">
 						<div class="row">
-							<div class="col-3">
-								<button class="btn btn-primary border-0" @click="save(termin)" :disabled="!termin.allowedToUpload">
+							<div class="col-6">
+								<button v-if="termin.allowedToSave" class="btn btn-primary border-0" @click="saveTermin(termin)">
 									Speichern
 									<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
 								</button>
 							</div>
-							<div class="col-3">
-								<button class="btn btn-primary border-0" @click="delete(termin)" :disabled="!termin.allowedToUpload">
-									Löschen
-									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
-								</button>
-							</div>
-							<div v-if="termin.endupload && hasFile" class="col-3">
-								<button class="btn btn-primary border-0" @click="openZusatzdatenModal(termin)" :disabled="!termin.allowedToUpload">
+							<div class="col-6">
+								<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" class="btn btn-primary border-0" @click="deleteTermin(termin)">
 									Löschen
 									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
 								</button>
@@ -208,7 +303,7 @@ export const AbgabeMitarbeiterDetail = {
 							:style="{'width': '100%'}"
 							v-model="form.sprache"
 							:options="allActiveLanguages"
-							:optionLabel="getOptionLabel">
+							:optionLabel="getOptionLabelSprache">
 						</Dropdown>
 					</div>
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 513d4f0e5..3c695a038 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -16,6 +16,10 @@ export const AbgabeStudentDetail = {
 		projektarbeit: {
 			type: Object,
 			default: null
+		},
+		viewMode: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
@@ -217,10 +221,10 @@ export const AbgabeStudentDetail = {
 					<div class="col-6">
 						<div class="row">
 							<div class="col-6">
-								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+								<Upload v-if="termin && termin.allowedToUpload" :disabled="viewMode" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
 							<div class="col-6">
-								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || viewMode">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
 								</button>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 30344e4a0..98d36be19 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -7,7 +7,7 @@ export const AbgabetoolMitarbeiter = {
 	components: {
 		CoreFilterCmpt,
 		AbgabeDetail,
-		VerticalSplit
+		VerticalSplit,
 	},
 	props: {
 		viewData: {
@@ -33,7 +33,7 @@ export const AbgabetoolMitarbeiter = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 300,
+				height: 700,
 				index: 'projektarbeit_id',
 				layout: 'fitDataStretch',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -111,6 +111,7 @@ export const AbgabetoolMitarbeiter = {
 		},
 		toggleShowAll(showall) {
 			this.showAll = showall
+			// TODO: debug tabulator row render
 			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
 		},
 		addSeries() {
@@ -120,23 +121,31 @@ export const AbgabetoolMitarbeiter = {
 			return new Date(date) < new Date(Date.now())
 		},
 		setDetailComponent(details){
-			debugger
 			this.loadAbgaben(details).then((res)=> {
-				debugger
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.push({ // new abgatermin row
+
+					'paabgabe_id': -1,
+					'projektarbeit_id': pa.projektarbeit_id,
+					'fixtermin': false,
+					'kurzbz': '',
+					'datum': new Date().toISOString().split('T')[0],
+					'paabgabetyp_kurzbz': '',
+					'bezeichnung': '',
+					'abgabedatum': null,
+					'insertvon': this.viewData?.uid ?? ''
+					
+				})
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
-					termin.allowedToUpload = true
-
-					// TODO: fixtermin logic?
-					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
-
-						// termin.allowedToUpload = false
-					} else {
-						// termin.allowedToUpload = true
+					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
+					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+					
+					termin.bezeichnung = {
+						bezeichnung: termin.bezeichnung,
+						paabgabetyp_kurzbz: termin.paabgabetyp_kurzbz
 					}
-
 				})
 				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = details.student_uid
@@ -192,6 +201,7 @@ export const AbgabetoolMitarbeiter = {
 			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
 		},
 		buildBetreuer(abgabe) {
+			// TODO: preload and insert own titled name of betreuer somehow
 			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		setupData(data){
@@ -275,14 +285,14 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
-	<div class="h-100">
-	
 
-		<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-		<hr>
+
 		
-		<vertical-split ref="verticalsplit">
+		<vertical-split ref="verticalsplit">		
+			
 			<template #top>
+				<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+				<hr>
 				<core-filter-cmpt 
 					:title="''"  
 					@uuidDefined="handleUuidDefined"
@@ -310,6 +320,7 @@ export const AbgabetoolMitarbeiter = {
 						</button>
 					</template>
 				</core-filter-cmpt>
+
 			</template>
 			<template #bottom>
 				<div v-show="selectedProjektarbeit" ref="selProj"> 
@@ -318,7 +329,6 @@ export const AbgabetoolMitarbeiter = {
 			</template>
 		</vertical-split>
 
-	</div>
 	 
     `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 699be7de6..086cc8a9d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -4,11 +4,13 @@ import AbgabeDetail from "./AbgabeStudentDetail.js";
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
-		VueDatePicker,
 		CoreFilterCmpt,
 		AbgabeDetail
 	},
 	props: {
+		student_uid_prop: {
+			default: null
+		},
 		viewData: {
 			type: Object,
 			required: true,
@@ -177,7 +179,7 @@ export const AbgabetoolStudent = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten() {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.viewData?.uid ?? null)
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop ?? this.viewData?.uid ?? null)
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})
@@ -205,7 +207,9 @@ export const AbgabetoolStudent = {
 
 	},
 	computed: {
-
+		isViewMode() {
+			return this.student_uid !== null
+		}
 	},
 	created() {
 
@@ -228,7 +232,7 @@ export const AbgabetoolStudent = {
 	 
 	 <hr>
 	 <div v-show="selectedProjektarbeit"> 
-	 	<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+	 	<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
 	 </div>
     `,
 };
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 0845a1a5e..211a2c4e1 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -1,7 +1,5 @@
 import FhcAlert from './FhcAlert.js';
 import FhcApiFactory from '../api/fhcapifactory.js';
-
-
 export default {
 	install: (app, options) => {
 		if (app.config.globalProperties.$fhcApi) {

From a5ab2f138119ae7d465fc7ca42780b894ef28234 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Apr 2025 14:30:12 +0200
Subject: [PATCH 0156/1357] match abgabetool_detail student/mitarbeiter
 look&feel; WIP terminserie, zweitbetreuer logic etc

---
 .../controllers/api/frontend/v1/Lehre.php     | 15 ++++-
 .../controllers/api/frontend/v1/Ort.php       |  4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 38 +++++++++--
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 49 ++++++++++----
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 12 ++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 64 +++++++++++++------
 .../js/components/Cis/Raumsuche/Raumsuche.js  |  1 -
 public/js/components/Form/Upload/Dms.js       |  6 +-
 system/phrasesupdate.php                      | 60 +++++++++++++++++
 9 files changed, 196 insertions(+), 53 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index d0b712e36..375551e7a 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -130,13 +130,26 @@ class Lehre extends FHCAPI_Controller
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
+		// TODO: error messages
+		
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$projektarbeit_obj = new projektarbeit();
+		if($projektarbeit_id==-1)
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
 		
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 		
-		$this->terminateWithSuccess($ret);
+		// TODO: fetch zweitbetreuer
+		
+		$this->terminateWithSuccess(array($ret, $paIsCurrent));
 	}
 
 	/**
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index a6a3b3404..0d8074fa9 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -100,8 +100,8 @@ class Ort extends FHCAPI_Controller
 			)
 		";
 		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-		$this->addMeta('qry', $qry);
-		$this->addMeta('params', $params);
+//		$this->addMeta('qry', $qry);
+//		$this->addMeta('params', $params);
 		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 		
 		$this->terminateWithSuccess($result);
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 3451d97ba..7e0da66f6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -93,7 +93,6 @@ export const AbgabeMitarbeiterDetail = {
 			})
 		},
 		deleteTermin(termin) {
-			debugger
 			this.$fhcApi.factory.lehre.deleteProjektarbeitAbgabe(termin.paabgabe_id).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
@@ -144,7 +143,7 @@ export const AbgabeMitarbeiterDetail = {
 				color = 'green'
 			}
 
-			return 'font-color: ' + fontColor + '; background-color: ' + color
+			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -167,7 +166,14 @@ export const AbgabeMitarbeiterDetail = {
 			return `${day}.${month}.${year}`;
 		},
 		openStudentPage() {
-			// TODO: do it
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/Cis/Abgabetool/Student/' + this.projektarbeit?.student_uid
+			window.open(link, '_blank')
+		},
+		openPlagiatcheck() {
+			// todo: hardcoded turnitin link pfui?
+			const link = "https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start"
+			window.open(link, '_blank')
 		}
 	},
 	watch: {
@@ -188,7 +194,14 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		getEnduploadErlaubt() {
 			return !this.eidAkzeptiert
+		},
+		getSemesterBenotbar(){
+			return this.projektarbeit?.isCurrent ?? false
+		},
+		endUploadVorhanden(){
+			return this.projektarbeit?.abgabetermine.find(abgabe => abgabe.paabgabetyp_kurzbz === 'end' && abgabe.abgabedatum !== null)
 		}
+		
 	},
 	created() {
 
@@ -206,10 +219,20 @@ export const AbgabeMitarbeiterDetail = {
 					<p> {{projektarbeit?.titel}}</p>
 					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 				</div>
-				<div>
-					<button class="btn btn-primary border-0" @click="openStudentPage">
-						Speichern
-						<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+				<div class="col-4 d-flex justify-content-end">
+					<div>
+						<button :disabled="!getSemesterBenotbar && endUploadVorhanden" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
+							benoten
+							<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+						</button>
+					</div>
+					<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
+						zur Plagiatsprüfung
+						<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+					</button>
+					<button class="btn btn-secondary border-0" @click="openStudentPage">
+						Studentenansicht
+						<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
 					</button>
 				</div>
 			</div>
@@ -232,6 +255,7 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
 							<VueDatePicker
+								style="width: 95%;"
 								v-model="termin.datum"
 								:clearable="false"
 								:disabled="!termin.allowedToSave"
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 3c695a038..9b57244e2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -10,7 +10,8 @@ export const AbgabeStudentDetail = {
 		InputNumber: primevue.inputnumber,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
-		Textarea: primevue.textarea
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		projektarbeit: {
@@ -82,6 +83,17 @@ export const AbgabeStudentDetail = {
 		downloadAbgabe(termin) {
 			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
 		upload(termin) {
 
 			if (!this.validate(termin))
@@ -147,7 +159,7 @@ export const AbgabeStudentDetail = {
 				color = 'green'
 			}
 			
-			return 'font-color: ' + fontColor + '; background-color: ' + color
+			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -193,9 +205,9 @@ export const AbgabeStudentDetail = {
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
 					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						{{$p.t('abgabetool/c4fileupload')}}
@@ -205,33 +217,42 @@ export const AbgabeStudentDetail = {
 					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
-							{{ termin.datum?.split("-").reverse().join(".") }}
+							<VueDatePicker
+								style="width: 95%;"
+								v-model="termin.datum"
+								:clearable="false"
+								:disabled="true"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
 						</div>				
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
+					<div class="col-4 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="true"></Textarea>
+					</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-6">
+					<div class="col-2" v-if="!viewMode">
 						<div class="row">
 							<div class="col-6">
-								<Upload v-if="termin && termin.allowedToUpload" :disabled="viewMode" accept=".pdf" v-model="termin.file"></Upload>
+								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
 							<div class="col-6">
-								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || viewMode">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
 								</button>
 							</div>
 						</div>
-						
-						
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 98d36be19..06a1f2d00 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -72,7 +72,6 @@ export const AbgabetoolMitarbeiter = {
 			{
 				event: "cellClick",
 				handler: async (e, cell) => {
-					debugger
 					if(cell.getColumn().getField() === "details") {
 						this.setDetailComponent(cell.getValue())
 					}
@@ -84,7 +83,6 @@ export const AbgabetoolMitarbeiter = {
 				event: "rowClick",
 				handler: async (e, row) => {
 
-					debugger
 					e.stopPropagation()
 
 				}
@@ -93,7 +91,6 @@ export const AbgabetoolMitarbeiter = {
 				event: "rowSelected",
 				handler: async (row) => {
 
-					debugger
 
 				}
 			},
@@ -123,7 +120,8 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-				pa.abgabetermine = res.data.retval
+				pa.abgabetermine = res.data[0].retval
+				pa.isCurrent = res.data[1]
 				pa.abgabetermine.push({ // new abgatermin row
 
 					'paabgabe_id': -1,
@@ -153,9 +151,9 @@ export const AbgabetoolMitarbeiter = {
 				
 				this.selectedProjektarbeit = pa
 				
-				Vue.nextTick(()=>{
-					this.$refs.verticalsplit.showBoth()
-				})
+				
+				this.$refs.verticalsplit.showBoth()
+				
 			
 			})
 		},
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 086cc8a9d..1ac9ad912 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,11 +1,13 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeStudentDetail.js";
+import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
 		CoreFilterCmpt,
-		AbgabeDetail
+		AbgabeDetail,
+		VerticalSplit
 	},
 	props: {
 		student_uid_prop: {
@@ -22,6 +24,7 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			tabulatorUuid: Vue.ref(0),
 			domain: '',
 			student_uid: null,
 			detail: null,
@@ -30,7 +33,7 @@ export const AbgabetoolStudent = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 300,
+				height: 700,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -85,7 +88,7 @@ export const AbgabetoolStudent = {
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-				pa.abgabetermine = res.data.retval
+				pa.abgabetermine = res.data[0].retval
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
 					termin.allowedToUpload = true
@@ -103,6 +106,10 @@ export const AbgabetoolStudent = {
 				pa.student_uid = this.student_uid
 
 				this.selectedProjektarbeit = pa
+
+				
+				this.$refs.verticalsplit.showBoth()
+				
 			})
 			
 		},
@@ -195,12 +202,23 @@ export const AbgabetoolStudent = {
 		handleUuidDefined(uuid) {
 			this.tabulatorUuid = uuid
 		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
+		},
 		async setupMounted() {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
 			
 			this.loadProjektarbeiten()
-			
+
+			this.$refs.verticalsplit.collapseBottom()
+			this.calcMaxTableHeight()
 		}
 	},
 	watch: {
@@ -218,22 +236,28 @@ export const AbgabetoolStudent = {
 		this.setupMounted()
 	},
 	template: `
-	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-	<hr>
-		
-     <core-filter-cmpt 
-		:title="''"  
-		ref="abgabeTable" 
-		:tabulator-options="abgabeTableOptions"  
-		:tabulator-events="abgabeTableEventHandlers"
-		tableOnly
-		:sideMenu="false"
-	 />
-	 
-	 <hr>
-	 <div v-show="selectedProjektarbeit"> 
-	 	<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-	 </div>
+	<vertical-split ref="verticalsplit">				
+		<template #top>
+			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<hr>
+				
+			 <core-filter-cmpt
+			 	@uuidDefined="handleUuidDefined"
+				:title="''"  
+				ref="abgabeTable" 
+				:tabulator-options="abgabeTableOptions"  
+				:tabulator-events="abgabeTableEventHandlers"
+				tableOnly
+				:sideMenu="false"
+			 />
+			 
+		 </template>
+		<template #bottom>
+			<div v-show="selectedProjektarbeit"> 
+				<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+			 </div>
+		</template>
+	</vertical-split>
     `,
 };
 
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 119fc56be..a279fb1c0 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,4 +1,3 @@
-
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 
 export const Raumsuche =  {
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index a8548fe53..4c7a8eb3f 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -20,6 +20,10 @@ export default {
 		accept: {
 			type: String,
 			default: ''
+		},
+		disabled: {
+			type: Boolean,
+			default: false
 		}
 	},
 	methods: {
@@ -88,7 +92,7 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
 			<dms-item
 				v-for="(file, index) in modelValue"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 27642e1e0..ae1c9daaa 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37879,6 +37879,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeMitarbeiterbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Dokumentabgabe - Mitarbeiterbereich",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "File submission - Employee area",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'abgabe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabe",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submission',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'genericDeleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{0} gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{0} deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From bf0cd8e8e3341138a2e7f74cc1927989ef14732e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Apr 2025 16:15:27 +0200
Subject: [PATCH 0157/1357] actions new, update and delete aufnahmetermine

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 250 ++++++----------
 application/models/crm/Reihungstest_model.php |  33 ++
 .../models/organisation/Studienplan_model.php |  13 +
 public/js/api/factory/stv/admissionDates.js   |  39 +++
 .../Aufnahmetermine/Aufnahmetermine.js        | 282 +++++++++++++++++-
 system/phrasesupdate.php                      | 100 +++++++
 6 files changed, 556 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 3a0be3d40..6b0356bc3 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -14,6 +14,9 @@ class Aufnahmetermine extends FHCAPI_Controller
 			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'getListPlacementTests' => ['admin:rw', 'assistenz:rw'],
+			'getListStudyPlans' => ['admin:rw', 'assistenz:rw'],
+
 		]);
 
 		// Load Libraries
@@ -23,11 +26,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load language phrases
 		$this->loadPhrases([
 			'ui',
-			'mobility'
+			'admission'
 		]);
 
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
+		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
 	}
 
 	public function getAufnahmetermine($person_id)
@@ -44,106 +48,62 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->load->library('form_validation');
 		$authUID = getAuthUID();
 
-		$student_uid = $this->input->post('uid');
+		$formData = $this->input->post('formData');
+		$person_id = $this->input->post('person_id');
 
-		if(!$student_uid)
+		if(!$person_id)
 		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
-		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
 
-		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+
+		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
 		]);
-		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		$this->form_validation->set_rules('studienplan_id', 'studienplan_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studienplan'])
 		]);
-		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
-		]);
-		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
+			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
 
-		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
-		]);
-
-		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
-		]);
-
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
-		]);
 
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
-		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
-		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
-		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
-
-		$result = $this->BisioModel->insert([
-			'student_uid' => $student_uid,
-			'von' => $_POST['von'],
-			'bis' => $_POST['bis'],
-			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-			'nation_code' => $_POST['nation_code'],
-			'herkunftsland_code' => $_POST['herkunftsland_code'],
-			'lehreinheit_id' => $_POST['lehreinheit_id'],
-			'ort' => $ort,
-			'universitaet' => $universitaet,
-			'ects_erworben' => $_POST['ects_erworben'] ,
-			'ects_angerechnet' => $_POST['ects_angerechnet'],
+		$result = $this->RtPersonModel->insert([
+			'person_id' => $person_id,
+			'rt_id' => $_POST['rt_id'],
+			'anmeldedatum' => $_POST['anmeldedatum'],
+			'teilgenommen' => $_POST['teilgenommen'],
+			'studienplan_id' => $_POST['studienplan_id'],
+			'punkte' => $_POST['punkte'],
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
 
-		$aufnahmetermin_id = $this->getDataOrTerminateWithError($result);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		//check if localData (purposes)
-		if(count($localPurposes) > 0){
-			foreach ($localPurposes as $zweck){
-				$zweck = (int)$zweck;
-				$this->addAufnahmeterminPurpose($aufnahmetermin_id, $zweck);
-			}
-		}
-
-		//check if localData (supports)
-		if(count($localSupports) > 0){
-			foreach ($localSupports as $support){
-				$this->addAufnahmeterminSupport($aufnahmetermin_id, $support);
-			}
-		}
-
-		$this->terminateWithSuccess($aufnahmetermin_id);
+		$this->terminateWithSuccess($data);
 	}
 
-	public function loadAufnahmetermin($aufnahmetermin_id)
+	public function loadAufnahmetermin($rt_person_id)
 	{
-		$this->BisioModel->addSelect("*");
-		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
-		$result = $this->BisioModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		$result = $this->RtPersonModel->loadWhere(
+			array('rt_person_id' => $rt_person_id)
 		);
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -152,118 +112,96 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 	public function updateAufnahmetermin()
 	{
-
 		$this->load->library('form_validation');
 		$authUID = getAuthUID();
 
-		$student_uid = $this->input->post('uid');
-
-		if(!$student_uid)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		}
 		$formData = $this->input->post('formData');
+		$rt_person_id = $this->input->post('rt_person_id');
+		$person_id = (isset($formData['person_id']) && !empty($formData['person_id'])) ? $formData['person_id'] : null;
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
 
-		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+		}
+		if(!$rt_person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'RT_Person ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+
+		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
 		]);
-		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		$this->form_validation->set_rules('studienplan_id', 'studienplan_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studienplan'])
 		]);
-		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
-		]);
-		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
+			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
 
-		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
-		]);
-
-		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
-		]);
-
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
-		]);
 
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$result = $this->BisioModel->update(
+		$result = $this->RtPersonModel->update(
 			[
-				'aufnahmetermin_id' =>  $formData['aufnahmetermin_id']
+				'rt_person_id' => $rt_person_id,
+				'person_id' => $person_id,
 			],
 			[
-				'student_uid' => $student_uid,
-				'von' => $_POST['von'],
-				'bis' => $_POST['bis'],
-				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-				'nation_code' => $_POST['nation_code'],
-				'herkunftsland_code' => $_POST['herkunftsland_code'],
-				'lehreinheit_id' => $_POST['lehreinheit_id'],
-				'ort' => $formData['ort'],
-				'universitaet' => $formData['universitaet'],
-				'ects_erworben' => $_POST['ects_erworben'] ,
-				'ects_angerechnet' => $_POST['ects_angerechnet'],
-				'updateamum' => date('c'),
-				'updatevon' => $authUID,
-			]
-		);
+				'rt_id' => $_POST['rt_id'],
+				'anmeldedatum' => $_POST['anmeldedatum'],
+				'teilgenommen' => $_POST['teilgenommen'],
+				'studienplan_id' => $_POST['studienplan_id'],
+				'punkte' => $_POST['punkte'],
+				'insertamum' => date('c'),
+				'insertvon' => $authUID,
+		]);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(current($data));
+		$this->terminateWithSuccess($data);
 	}
 
-	public function deleteAufnahmetermin($aufnahmetermin_id)
+	public function deleteAufnahmetermin($rt_person_id)
 	{
-		//check if extension table exists
-		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
-		$data = $this->getDataOrTerminateWithError($result);
-
-		//if table exists check if existing entry
-		if(!empty($data))
-		{
-			$this->BisioModel->addSelect("count(*)");
-			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.aufnahmetermin_id = bis.tbl_bisio.aufnahmetermin_id)', 'LEFT');
-
-			$resultCheckMo = $this->BisioModel->loadWhere(
-				array('mo.aufnahmetermin_id' => $aufnahmetermin_id)
-			);
-
-			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
-			$count = current($resultCheckMo)->count;
-
-			$existsInExtension = $count > 0 ? true : false;
-
-			if($existsInExtension)
-				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->BisioModel->delete(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		$result = $this->RtPersonModel->delete(
+			array('rt_person_id' => $rt_person_id)
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
 	}
 
+	public function getListPlacementTests()
+	{
+		$result = $this->ReihungstestModel->getAllReihungstests();
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListStudyPlans($person_id)
+	{
+		$this->load->model('organisation/Studienplan_model','StudienplanModel');
+
+		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);;
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index f2732b636..2eb08ee86 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -550,4 +550,37 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Loads all placement tests
+	 * @return array Returns object array with data of placement tests
+	 */
+	//TODO(Manu) finish Details
+	public function getAllReihungstests()
+	{
+		$query = '
+			SELECT * FROM public.tbl_reihungstest
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+		--	JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+		--	JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			ORDER BY datum DESC NULLS LAST, uhrzeit
+		';
+
+		return $this->execQuery($query);
+	}
+
+	public function getReihungstestsPs($prestudent_id)
+	{
+		$query = '
+			SELECT * FROM public.tbl_reihungstest
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			 ORDER BY datum DESC, uhrzeit
+		';
+
+		return $this->execQuery($query);
+	}
+
+
 }
\ No newline at end of file
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index e35ba52fb..569aebd0b 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -134,4 +134,17 @@ class Studienplan_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
+
+	public function getStudienplaeneForPerson($person_id)
+	{
+		$this->addDistinct();
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('ps.*');
+		$this->addJoin('public.tbl_prestudentstatus pss', 'studienplan_id');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+
+		return $this->loadWhere([
+			'person_id' => $person_id
+		]);
+	}
 }
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index 51a92c331..a5b0697da 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -22,4 +22,43 @@ export default {
 			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
+	getListPlacementTests(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/',
+		};
+	},
+	getListStudyPlans(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListStudyPlans/' + person_id,
+		};
+	},
+	addNewPlacementTest(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/insertAufnahmetermin/',
+			params
+		};
+	},
+	loadPlacementTest(rt_person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadAufnahmetermin/' + rt_person_id,
+		};
+	},
+	updatePlacementTest(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/updateAufnahmetermin/',
+			params
+		};
+	},
+	deletePlacementTest(rt_person_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/deleteAufnahmetermin/' + rt_person_id
+		};
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 7e7e2ae97..5fe32e885 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -34,17 +34,70 @@ export default {
 					{title: "rt_id", field: "rt_id"},
 					{title: "rt_person_id", field: "rt_person_id"},
 					{title: "person_id", field: "person_id"},
-					{title: "datum", field: "datum"},
+					{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_kurzbz"},
 					{title: "anmerkung", field: "anmerkung", visible: false},
-					{title: "anmeldedatum", field: "anmeldedatum", 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"},
 					{title: "ort", field: "ort", visible: false},
 					{title: "studienplan", field: "studienplan", visible: false},
 					{title: "studienplan_id", field: "studienplan_id", visible: false},
 					{title: "stg_kuerzel", 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: 'fitDataFill',
 				layoutColumnsOnNewData: false,
@@ -56,13 +109,129 @@ export default {
 			tabulatorEvents: [],
 			formData: {},
 			statusNew: true,
+			listPlacementTests: [],
+			listStudyPlans: []
 		}
 	},
-	methods: {},
+	methods: {
+		actionNewPlacementTest() {
+			this.resetForm();
+			this.statusNew = true;
+			this.$refs.placementTestModal.show();
+		},
+		actionEditPlacementTest(rt_person_id) {
+			console.log("edit Test " + rt_person_id);
+			this.resetForm();
+			this.statusNew = false;
+			this.loadPlacementTest(rt_person_id);
+			this.$refs.placementTestModal.show();
+		},
+		actionDeletePlacementTest(rt_person_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? rt_person_id
+					: Promise.reject({handled: true}))
+				.then(this.deletePlacementTest)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewPlacementTest() {
+			const dataToSend = {
+				person_id: this.student.person_id,
+				formData: this.formData
+			};
+			return this.$refs.formPlacementTest
+				.call(ApiStvAdmissionDates.addNewPlacementTest(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("placementTestModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		loadPlacementTest(rt_person_id) {
+			console.log("load Test " + rt_person_id);
+			return this.$api
+				.call(ApiStvAdmissionDates.loadPlacementTest(rt_person_id))
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updatePlacementTest(rt_person_id) {
+			const dataToSend = {
+				formData: this.formData,
+				rt_person_id: rt_person_id,
+			};
+			this.$refs.formPlacementTest
+				.call(ApiStvAdmissionDates.updatePlacementTest(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("placementTestModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deletePlacementTest(rt_person_id) {
+			console.log("delete Test" + rt_person_id);
+			return this.$api
+				.call(ApiStvAdmissionDates.deletePlacementTest(rt_person_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		resetForm() {
+			console.log("resetForm");
+			this.formData = {};
+			/*
+
+			this.formData.von = new Date();
+			this.formData.bis = new Date();
+			this.formData.mobilitaetsprogramm_code = 7;
+			this.formData.nation_code = 'A';
+			this.formData.herkunftsland_code = 'A';
+			this.formData.rt_id = null;
+			this.formData.localPurposes = [];
+			this.formData.localSupports = [];
+			this.formData.lehrveranstaltung_id = '',
+				this.formData.lehreinheit_id = '',
+				this.statusNew = true;
+			this.listLes = [];*/
+		},
+	},
 	created() {
+		this.$api
+			.call(ApiStvAdmissionDates.getListPlacementTests())
+			.then(result => {
+				this.listPlacementTests = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAdmissionDates.getListStudyPlans(this.student.person_id))
+			.then(result => {
+				this.listStudyPlans = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-admission-dates-table h-100 pb-3">
+	<div class="stv-details-admission-table h-100 pb-3">
 		<h4>Allgemein</h4>
 		
 		<core-filter-cmpt
@@ -74,10 +243,113 @@ export default {
 			reload
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
-			@click:new="actionNewMobility"
+			@click:new="actionNewPlacementTest"
 			>
 		</core-filter-cmpt>
 		
+		{{formData}}
+		
+<!--		{{student}}-->
+		
+<!--		{{listPlacementTests}}-->
+		
+		<!--Modal: placementTestModal-->
+		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('admission', 'admission_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('admission', 'admission_edit')}}</p>
+			</template>
+
+
+			<form-form ref="formPlacementTest" @submit.prevent>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-placementtest"
+						:label="$p.t('lehre', 'reihungstest')"
+						type="select"
+						v-model="formData.rt_id"
+						name="reihungstest_id"
+						>
+						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="test in listPlacementTests"
+							:key="test.reihungstest_id"
+							:value="test.reihungstest_id"
+							>
+							{{test.reihungstest_id}} {{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.kurzbzlang}} {{test.datum}} {{test.uhrzeit}}
+							{{test.anmerkung}} (x/{{test.max_teilnehmer}}) {{test.rt_id}}
+						</option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-anmeldedatum"
+						:label="$p.t('admission', 'anmeldundRtAm')"
+						type="DatePicker"
+						v-model="formData.anmeldedatum"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="anmeldedatum"
+						:teleport="true"
+						>
+					</form-input>
+				</div>				
+				
+				<div class="row mb-3">
+						<form-input
+							container-class="stv-details-admission-teilgenommen"
+							type="checkbox"
+							name="teilgenommen"
+							:label="$p.t('admission/rtAngetreten')"
+							v-model="formData.teilgenommen"
+						>
+						</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-studyplan"
+						:label="$p.t('lehre', 'studienplan')"
+						type="select"
+						v-model="formData.studienplan_id"
+						name="studienplan_id"
+						>
+						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="stplan in listStudyPlans"
+							:key="stplan.studienplan_id"
+							:value="stplan.studienplan_id"
+							>
+							{{stplan.bezeichnung}}
+						</option>
+					</form-input>
+				</div>				
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-points"
+						:label="$p.t('exam', 'punkte')"
+						type="text"
+						v-model="formData.punkte"
+						name="punkte"
+						>
+					</form-input>	
+				</div>
+				
+				<!--TODO(Manu) Reihungstestergebnis holen-->
+				
+				
+		</form-form>
+		
+		<template #footer>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
+			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
+		</template>
+		
 	</div>
 	`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bf18f50c8..66fd48a8b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41436,6 +41436,106 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermin bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit appointment for participation placement test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermin Löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete Admission Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_new',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termin für Teilnahme am Reihungstest anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create appointment for participation placement test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'anmeldundRtAm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmeldung zum Reihungstest am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Registration for the ranking test on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'rtAngetreten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zum Reihungstest angetreten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Participated in the ranking test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From 3b7a862dbeacd37682b899b7c6f6ccfce9762957 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 11:42:26 +0200
Subject: [PATCH 0158/1357] align composer.lock with composer.json

---
 composer.lock | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index b9f6924d3..2addc074e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4d532e48e895cb864fb89170e18e2a3d",
+    "content-hash": "f97c6194d4d63e90a855add1cf7d0e86",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1868,6 +1868,15 @@
             },
             "type": "library"
         },
+        {
+            "name": "vuejs/vuedatepicker_css11",
+            "version": "11.0.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/main.css"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuedatepicker_js",
             "version": "7.2.0",
@@ -1877,6 +1886,15 @@
             },
             "type": "library"
         },
+        {
+            "name": "vuejs/vuedatepicker_js11",
+            "version": "11.0.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.3.8",

From c24a9997a90fac5291baad71ff46a85cdf471754 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 12:13:29 +0200
Subject: [PATCH 0159/1357] add function StundenplanEvents to new api factory

---
 public/js/api/factory/stundenplan.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/js/api/factory/stundenplan.js b/public/js/api/factory/stundenplan.js
index 3cfa3c641..c22071955 100644
--- a/public/js/api/factory/stundenplan.js
+++ b/public/js/api/factory/stundenplan.js
@@ -63,4 +63,15 @@ export default {
 			url: `/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`
 		};
 	},
+	StundenplanEvents(start_date, end_date, lv_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Stundenplan/StundenplanEvents',
+			params: { 
+				start_date: start_date, 
+				end_date: end_date, 
+				lv_id: lv_id 
+			}
+		};
+	},
 };
\ No newline at end of file

From 38424bc875d6639953ea546aa3bb8c1d55866b1e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 29 Apr 2025 14:36:40 +0200
Subject: [PATCH 0160/1357] serientermin anlegen mitarbeiter; deadline overview
 mitarbeiter;

---
 application/controllers/Cis/Abgabetool.php    |  23 +-
 .../controllers/api/frontend/v1/Lehre.php     | 115 +++++++++-
 .../models/education/Paabgabe_model.php       |  30 +++
 .../models/education/Projektarbeit_model.php  |  21 +-
 public/js/api/lehre.js                        |  16 ++
 public/js/apps/Dashboard/Fhc.js               |   7 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 173 ++++-----------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 198 +++++++++++++++---
 .../Cis/Abgabetool/DeadlineOverview.js        | 151 +++++++++++++
 system/phrasesupdate.php                      | 182 +++++++++++++++-
 10 files changed, 750 insertions(+), 166 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/DeadlineOverview.js

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index e7d183f04..1895f7472 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -16,7 +16,8 @@ class Abgabetool extends Auth_Controller
 			'index' => self::PERM_LOGGED,
 			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
 			'Mitarbeiter' => self::PERM_LOGGED,
-			'Student' => self::PERM_LOGGED
+			'Student' => self::PERM_LOGGED,
+			'Deadlines' => self::PERM_LOGGED
 		]);
 	}
 
@@ -43,7 +44,7 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 	}
 
 	public function Mitarbeiter()
@@ -53,7 +54,17 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+	}
+
+	public function Deadlines()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
 	}
 
 
@@ -66,7 +77,7 @@ class Abgabetool extends Auth_Controller
 		$student_uid = $this->_ci->input->get('student_uid');
 
 		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			$this->terminateWithJsonError($this->p->t('global', 'wrongParameters'), 'general');
 		
 		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -88,10 +99,10 @@ class Abgabetool extends Auth_Controller
 				readfile($file_path); // read file content to output buffer
 				
 			} else {
-				$this->terminateWithError('File not found');
+				$this->terminateWithJsonError('File not found');
 			}
 		} else {
-			$this->terminateWithError('Keine Zuordnung!');
+			$this->terminateWithJsonError('Keine Zuordnung!');
 		}
 	}
 }
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index 375551e7a..0ec2456f5 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -45,7 +45,9 @@ class Lehre extends FHCAPI_Controller
 			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
 			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
 			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED
+			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'postSerientermin' => self::PERM_LOGGED,
+			'fetchDeadlines' => self::PERM_LOGGED // TODO: mitarbeiter recht prüfen
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -556,5 +558,116 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 	}
+
+	/**
+	 * endpoint for adding the same paabgabe for multiple projektarbeiten
+	 * can be slow for large n since it queries twice per projektarbeit_id
+	 */
+	public function postSerientermin() {
+		$projektarbeit_ids = $_POST['projektarbeit_ids'];
+		$datum = $_POST['datum'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$bezeichnung = $_POST['bezeichnung'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($kurzbz) || isEmptyString($kurzbz)
+			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
+		// for each termin - good to check that in principle but should not matter in this place. if necessary
+		// duplicate abgabetermine can be easily deleted manually, also via cronjob@night.
+		
+		// since this entry includes the kurzbz string match, it should have only ever mattered when there were
+		// multiple users entering the exact same set of (date, type, kurzbz) - which is a much more narrow case than the
+		// general "saveMultiple" function should handle
+		
+		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
+		// and should never unintentionally happen
+		
+		// TODO: check berechtigung &/|| zuordnung?
+		
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$res = [];
+		foreach ($projektarbeit_ids as $projektarbeit_id) {
+			
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => false,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+			
+			$data = $this->getDataOrTerminateWithError($result);
+			
+//			$res[] = $data;
+
+			// send mail to student
+			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
+			
+			$datetime = new DateTime($datum);
+			$dateEmailFormatted = $datetime->format('d.m.Y');
+			
+			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
+			
+			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
+			$res[] = $fullFormattedNameString;
+			
+			// Prepare mail content
+			$body_fields = array(
+				'anrede' => $data[0]->anrede,
+				'anredeFillString' => $anredeFillString,
+				'datum' => $dateEmailFormatted,
+				'bezeichnung' => $bezeichnung,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'kurzbz' => $kurzbz
+			);
+
+			$email = $data[0]->uid."@".DOMAIN;
+			
+			sendSanchoMail(
+				'neuerTerminBachelorMasterbetreuung',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
+			);
+		}
+		
+		$this->terminateWithSuccess($res);
+		
+	}
+	
+	public function fetchDeadlines() {
+		$person_id = $_POST['person_id'];
+		
+		if (!isset($person_id) || isEmptyString($person_id))
+			$person_id = getAuthPersonId();
+		
+		
+		if($person_id !== getAuthPersonId()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$result = $this->PaabgabeModel->getDeadlines($person_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }
 
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 558059f72..343a86706 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -30,5 +30,35 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
+
+	/**
+	 * Gets all Paabgabe Termin Deadlines of zugewiesene Projektarbeiten as a Mitarbeiter for Terminübersicht Abgabetool.
+	 * @param int $person_id
+	 * @return object
+	 */
+	public function getDeadlines($person_id)
+	{
+		$qry = "SELECT
+					DISTINCT TO_CHAR(tbl_paabgabe.datum, 'DD.MM.YYYY') as datum, tbl_paabgabe.fixtermin, tbl_paabgabe.kurzbz,
+					person_student.vorname as stud_vorname, person_student.nachname as stud_nachname,
+					person_student.titelpre as stud_titelpre, person_student.titelpost as stud_titelpost,
+					tbl_lehrveranstaltung.semester, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as stg,
+					tbl_paabgabetyp.bezeichnung as typ_bezeichnung
+				FROM
+					campus.tbl_paabgabe
+					JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+					JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+					JOIN public.tbl_benutzer bn_student ON(tbl_projektarbeit.student_uid=bn_student.uid)
+					JOIN public.tbl_person person_student ON(bn_student.person_id=person_student.person_id)
+					JOIN lehre.tbl_lehreinheit ON(tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
+					JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+					JOIN public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
+					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE
+					tbl_projektbetreuer.person_id= ? AND tbl_paabgabe.datum>=now() AND bn_student.aktiv
+				ORDER BY datum";
+
+		return $this->execReadOnlyQuery($qry, array($person_id));
+	}
 	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 1041b3aec..4083dbf6e 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -212,7 +212,11 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
 	}
-	
+
+	/**
+	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
+	 * used by the mitarbeiter cis4 abgabetool.
+	 */
 	public function getMitarbeiterProjektarbeiten($uid, $showAll){
 		$qry = "SELECT
 					*
@@ -242,4 +246,19 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($uid));
 	}
+
+	/**
+	 * Fetch Student info relevant to a projektarbeit_id
+	 */
+	public function getStudentInfoForProjektarbeitId($projektarbeit_id) {
+		
+		$qry = "SELECT *
+				FROM campus.vw_student 
+				WHERE uid IN(
+					SELECT student_uid 
+					FROM lehre.tbl_projektarbeit 
+					WHERE projektarbeit_id = ? )";
+		
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
 }
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 2bf6dd277..5797a2c75 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -76,6 +76,22 @@ export default {
 		}
 		const url = '/api/frontend/v1/Lehre/deleteProjektarbeitAbgabe';
 
+		return this.$fhcApi.post(url, payload, null)
+	},
+	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids) {
+		const payload = {
+			datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids
+		}
+		const url = '/api/frontend/v1/Lehre/postSerientermin';
+
+		return this.$fhcApi.post(url, payload, null)
+	},
+	fetchDeadlines(person_id) {
+		const payload = {
+			person_id
+		}
+		const url = '/api/frontend/v1/Lehre/fetchDeadlines';
+
 		return this.$fhcApi.post(url, payload, null)
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b04db0a83..5e6b006b9 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -12,6 +12,7 @@ import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 
 
 
@@ -44,6 +45,12 @@ const router = VueRouter.createRouter({
 			component: AbgabetoolMitarbeiter,
 			props: true
 		},
+		{
+			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
+			name: 'DeadlineOverview',
+			component: DeadlineOverview,
+			props: true
+		},
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 7e0da66f6..c49dcfd0a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -19,6 +19,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
+			oldPaBeurteilungLink: 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052', // TODO: inject from app & app provide link from config
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
@@ -44,16 +45,7 @@ export const AbgabeMitarbeiterDetail = {
 					paabgabetyp_kurzbz: 'enda',
 					bezeichnung: 'Endabgabe im Sekretariat'
 				}
-			],
-			form: Vue.reactive({
-				sprache: '',
-				abstract: '',
-				abstract_en: '',
-				schlagwoerter: '',
-				schlagwoerter_en: '',
-				kontrollschlagwoerter: '',
-				seitenanzahl: 1,
-			})
+			]
 		}
 	},
 	methods: {
@@ -171,21 +163,14 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(link, '_blank')
 		},
 		openPlagiatcheck() {
-			// todo: hardcoded turnitin link pfui?
+			// todo: hardcoded turnitin link?
 			const link = "https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start"
 			window.open(link, '_blank')
-		}
-	},
-	watch: {
-		projektarbeit(newVal) {
-			// default select german if projektarbeit sprache was null
-			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
-			this.form.abstract = newVal.abstract
-			this.form.abstract_en = newVal.abstract_en
-			this.form.schlagwoerter = newVal.schlagwoerter
-			this.form.schlagwoerter_en = newVal.schlagwoerter_en
-			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
-			this.form.seitenanzahl = newVal.seitenanzahl
+		},
+		openBenotung() {
+			const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
+			window.open(link, '_blank')
 		}
 	},
 	computed: {
@@ -212,28 +197,47 @@ export const AbgabeMitarbeiterDetail = {
 	template: `
 		<div v-if="projektarbeit">
 		
+
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
+
+
 			<div class="row">
 				<div class="col-8">
 					<p> {{projektarbeit?.student}}</p>
 					<p> {{projektarbeit?.titel}}</p>
 					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 				</div>
-				<div class="col-4 d-flex justify-content-end">
-					<div>
-						<button :disabled="!getSemesterBenotbar && endUploadVorhanden" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
-							benoten
-							<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
-						</button>
+				<div class="col-4 d-flex">
+					<div class="col">
+						<div class="row">
+							<button :disabled="!getSemesterBenotbar || !endUploadVorhanden" class="btn btn-secondary border-0" @click="openBenotung" style="width: 80%;">
+								benoten
+								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+							</button>
+						</div>
+						<div class="row" style="width: 90%;">
+							<span v-if="!getSemesterBenotbar" v-html="$p.t('abgabetool/c4aeltereParbeitBenoten', oldPaBeurteilungLink)"></span>
+							<span v-else-if="!endUploadVorhanden">Kein Endupload vorhanden!</span>
+						</div>
+					</div>
+					<div class="col">
+						<div class="row">
+							<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="width: 80%;">
+								zur Plagiatsprüfung
+								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+							</button>
+						</div>
+						
+					</div>
+					<div class="col">
+						<div class="row">
+							<button class="btn btn-secondary border-0" @click="openStudentPage" style="width: 80%;">
+								Studentenansicht
+								<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
+							</button>
+						</div>
+						
 					</div>
-					<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
-						zur Plagiatsprüfung
-						<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
-					</button>
-					<button class="btn btn-secondary border-0" @click="openStudentPage">
-						Studentenansicht
-						<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
-					</button>
 				</div>
 			</div>
 			<div id="uploadWrapper">
@@ -303,101 +307,6 @@ export const AbgabeMitarbeiterDetail = {
 				</div>
 			</div>
 		 </div>
-		 <bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
-			<template v-slot:title>
-				<div>
-					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
-				</div>
-				<div class="row mb-3 align-items-center">
-					
-					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
-				
-				</div>
-				<div class="row mb-3 align-items-center">
-					
-					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
-				
-				</div>
-			</template>
-			<template v-slot:default>
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
-					<div class="row">
-						<Dropdown 
-							:style="{'width': '100%'}"
-							v-model="form.sprache"
-							:options="allActiveLanguages"
-							:optionLabel="getOptionLabelSprache">
-						</Dropdown>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">Kontrollierte Schlagwörter</div>
-					<div class="row">
-						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>
-					</div>
-				</div>
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
-					<div class="row">
-						<Textarea v-model="form.schlagwoerter"></Textarea>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
-					<div class="row">
-						<Textarea v-model="form.schlagwoerter_en"></Textarea>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
-					<div class="row">
-						<Textarea v-model="form.abstract" rows="10"></Textarea>
-					</div>
-				</div>
-
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
-					<div class="row">
-						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
-					</div>				
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
-					<div class="row">
-						<InputNumber 
-							v-model="form.seitenanzahl"
-							inputId="seitenanzahlInput" :min="1" :max="100000">
-						</InputNumber>
-					</div>		
-				</div>
-				
-				<div v-if="projektarbeit">
-					<div v-html="getEid"></div>
-					<div class="row">
-						<div class="col-9"></div>
-						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
-						<div class="col-1">
-							
-							<Checkbox 
-								v-model="eidAkzeptiert" 
-								:binary="true" 
-								:pt="{ root: { class: 'ml-auto' }}"
-							>
-							</Checkbox>
-						</div>
-					</div>
-				</div>
-				
-			</template>
-			<template v-slot:footer>
-				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
-			</template>
-		</bs-modal>
 
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 06a1f2d00..2d2316036 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -1,13 +1,18 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
+import BsModal from '../../Bootstrap/Modal.js';
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
 	components: {
+		BsModal,
 		CoreFilterCmpt,
 		AbgabeDetail,
 		VerticalSplit,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		viewData: {
@@ -21,6 +26,39 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			saving: false,
+			loading: false,
+			// TODO: fetch types
+			allAbgabeTypes: [
+				{
+					paabgabetyp_kurzbz: 'abstract',
+					bezeichnung: 'Entwurf'
+				},
+				{
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				{
+					paabgabetyp_kurzbz: 'note',
+					bezeichnung: 'Benotung'
+				},
+				{
+					paabgabetyp_kurzbz: 'end',
+					bezeichnung: 'Endupload'
+				},
+				{
+					paabgabetyp_kurzbz: 'enda',
+					bezeichnung: 'Endabgabe im Sekretariat'
+				}
+			],
+			serienTermin: Vue.reactive({
+				datum: new Date(),
+				bezeichnung: {
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				kurzbz: ''
+			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
 			selectedData: [],
@@ -38,6 +76,7 @@ export const AbgabetoolMitarbeiter = {
 				layout: 'fitDataStretch',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				selectable: true,
+				selectableCheck: this.selectionCheck,
 				columns: [
 					{
 						formatter: 'rowSelection',
@@ -59,7 +98,7 @@ export const AbgabetoolMitarbeiter = {
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 2},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4beteuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
 				],
 				persistence: false,
 			},
@@ -74,24 +113,10 @@ export const AbgabetoolMitarbeiter = {
 				handler: async (e, cell) => {
 					if(cell.getColumn().getField() === "details") {
 						this.setDetailComponent(cell.getValue())
+						this.undoSelection(cell)
+					} else if (cell.getColumn().getField() === "mail") {
+						this.undoSelection(cell)
 					}
-					e.stopPropagation()
-
-				}
-			},
-			{
-				event: "rowClick",
-				handler: async (e, row) => {
-
-					e.stopPropagation()
-
-				}
-			},
-			{
-				event: "rowSelected",
-				handler: async (row) => {
-
-
 				}
 			},
 			{
@@ -103,16 +128,82 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		getOptionLabelAbgabetyp(option){
+			return option.bezeichnung
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		undoSelection(cell) {
+			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
+			// but actually just revert it after the fact
+
+			const row = cell.getRow()
+			if(row.isSelected()) {
+				row.deselect();
+			}
+		},
+		selectionCheck(row) {
+			const data = row.getData()
+			if(data?.betreuerart_kurzbz == 'Zweitbegutachter') return false
+			return true
+		},
 		showDeadlines(){
-			// TODO: open seperate view in new window containing all future deadlines for the employee
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/Cis/Abgabetool/Deadlines'
+			window.open(link, '_blank')
 		},
 		toggleShowAll(showall) {
 			this.showAll = showall
-			// TODO: debug tabulator row render
-			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
+			this.loading = true
+			this.loadProjektarbeiten(showall, () => {
+				this.$refs.abgabeTable?.tabulator.redraw(true)
+				this.$refs.abgabeTable?.tabulator.setSort([]);
+				this.loading = false
+			})
+		},
+		openAddSeriesModal() {
+			this.$refs.modalContainerAddSeries.show()
 		},
 		addSeries() {
+			this.saving = true
+			this.$fhcApi.factory.lehre.postSerientermin(
+				this.serienTermin.datum.toISOString(),
+				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
+				this.serienTermin.bezeichnung.bezeichnung,
+				this.serienTermin.kurzbz,
+				this.selectedData?.map(projekt => projekt.projektarbeit_id)
+			).then(res => {
+				if (res.meta.status === "success" && res.data) {
+					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
+					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
+					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
+				} else {
+					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
+				}
+			}).finally(()=>{
+				this.saving = false
+			})
+
+			this.$refs.modalContainerAddSeries.hide()
+		},
+		createInfoString(data) {
+			let str = '';
 			
+			data.forEach(name => {
+				str += name
+				str += '; '
+			})
+			
+			return str
 		},
 		isPastDate(date) {
 			return new Date(date) < new Date(Date.now())
@@ -283,8 +374,57 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
-
-
+		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
+		dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{ $p.t('abgabetool/addSeries') }}
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4zieldatum')}}
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabetyp')}}
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabekurzbz')}}
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<div>
+							<VueDatePicker
+								style="width: 95%;"
+								v-model="serienTermin.datum"
+								:clearable="false"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
+						</div>				
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="serienTermin.bezeichnung"
+							:options="allAbgabeTypes"
+							:optionLabel="getOptionLabelAbgabetyp">
+						</Dropdown>
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="3" cols="40"></Textarea>
+					</div>
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/save') }}</button>
+			</template>
+		</bs-modal>	
 		
 		<vertical-split ref="verticalsplit">		
 			
@@ -296,9 +436,9 @@ export const AbgabetoolMitarbeiter = {
 					@uuidDefined="handleUuidDefined"
 					ref="abgabeTable"
 					:newBtnShow="true"
-					:newBtnLabel="$p.t('global/neueTerminserie')"
+					:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
 					:newBtnDisabled="!selectedData.length"
-					@click:new=addSeries
+					@click:new=openAddSeriesModal
 					:tabulator-options="abgabeTableOptions"  
 					:tabulator-events="abgabeTableEventHandlers"
 					tableOnly
@@ -316,6 +456,14 @@ export const AbgabetoolMitarbeiter = {
 							<i class="fa fa-hourglass-end"></i>
 							{{ $p.t('abgabetool/showDeadlines') }}
 						</button>
+						
+						<div v-show="saving">
+							{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+						</div>
+						<div v-show="loading">
+							{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+						</div>
+						
 					</template>
 				</core-filter-cmpt>
 
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
new file mode 100644
index 000000000..d2b133979
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -0,0 +1,151 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+
+export const DeadlineOverview = {
+	name: "DeadlineOverview",
+	components: {
+		CoreFilterCmpt,
+	},
+	props: {
+		person_uid_prop: {
+			default: null	
+		},
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			fullName: null, // TODO: fetch this somewhere
+			deadlines: null,
+			tabulatorUuid: Vue.ref(0),
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			deadlineTableOptions: {
+				height: 700,
+				index: 'projektarbeit_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixtermin')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetyp')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
+					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'semester', formatter: this.centeredTextFormatter, widthGrow: 1}
+				],
+				persistence: false,
+			},
+			deadlineTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+				{
+					event: "cellClick",
+					handler: async (e, cell) => {
+
+						if(cell.getColumn().getField() === "details") {
+							const val = cell.getValue()
+
+							if(val.mode === 'detailTermine') {
+								this.setDetailComponent(cell.getValue())
+							} else if (val.mode === 'beurteilungDownload') {
+								const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+								// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+								window.open(pdfExportLink, '_blank')
+							}
+
+						} else if (cell.getColumn().getField() === "beurteilung") {
+							const val = cell.getValue()
+
+							if(val != '-') window.open(val, '_blank')
+						}
+						e.stopPropagation()
+
+					}
+				}
+			]};
+	},
+	methods: {
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		loadDeadlines() {
+			this.$fhcApi.factory.lehre.fetchDeadlines(this.person_uid_prop ??  null)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				})
+		},
+		setupData(data) {
+			this.deadlines = data
+			
+			this.deadlines.forEach(dl => {
+				dl.student = (dl.stud_titelpre ? (dl.stud_titelpre + ' ') :'') + dl.stud_vorname + ' ' + dl.stud_nachname + (dl.stud_titelpost ? (' ' + dl.stud_titelpost) :'')
+				dl.fixterminstring = dl.fixtermin ? this.$p.t('abgabetool/c4yes') : this.$p.t('abgabetool/c4no')
+			})
+
+			this.$refs.deadlineTable.tabulator.setColumns(this.deadlineTableOptions.columns)
+			this.$refs.deadlineTable.tabulator.setData(this.deadlines);
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.deadlineTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.deadlineTable.tabulator.setHeight(this.deadlineTableOptions.height)
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+
+			this.loadDeadlines()
+			this.calcMaxTableHeight()
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+		<h2>{{$p.t('abgabetool/deadlinesTitle')}} {{ fullName ? ('-' + fullName) : ''}}</h2>
+		<hr>
+			
+		 <core-filter-cmpt
+			@uuidDefined="handleUuidDefined"
+			:title="''"  
+			ref="deadlineTable" 
+			:tabulator-options="deadlineTableOptions"  
+			:tabulator-events="deadlineTableEventHandlers"
+			tableOnly
+			:sideMenu="false"
+		 />
+    `,
+};
+
+export default DeadlineOverview;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ae1c9daaa..9e9385c5c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30938,7 +30938,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Wrong parameters tranferred',
+				'text' => 'Wrong parameters transferred',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -37879,6 +37879,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'neuerTerminBachelorMasterbetreuung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Neuer Termin Bachelor-/Masterarbeitsbetreuung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "New date for Bachelor/Master thesis supervision",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'neueTerminserie',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Terminserie anlegen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Create recurring deadline",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'serienTerminEmailSentInfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Email über neuen Abgabetermin versendet an: {0}",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Email about new deadline sent to: {0}",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -39784,6 +39844,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4aeltereParbeitBenoten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit für älteres Semester, bitte <a href="{0}" target="_blank">Word-Formular zur Benotung</a> verwenden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Thesis handed in for older semester, please <a href="{0}" target="_blank">use word form for assessment</a>!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -39964,6 +40044,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'deadlinesTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Terminübersicht",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Deadline Overview",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4yes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ja",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Yes",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4no',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nein",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -40044,6 +40184,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'currentlySaving',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Speichern... ",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saving... ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'currentlyLoading',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Laden... ",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Loading... ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From d791a6d3ef92e2de2cd885be27fccfdffb9cb72b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 29 Apr 2025 15:03:10 +0200
Subject: [PATCH 0161/1357] phrasen & change email template name to under 32
 characters long

---
 .../controllers/api/frontend/v1/Lehre.php     |  2 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  4 +-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index 0ec2456f5..e42033d9c 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -639,7 +639,7 @@ class Lehre extends FHCAPI_Controller
 			$email = $data[0]->uid."@".DOMAIN;
 			
 			sendSanchoMail(
-				'neuerTerminBachelorMasterbetreuung',
+				'neuerAbgabetermin',
 				$body_fields,
 				$email,
 				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2d2316036..327c53198 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -378,7 +378,7 @@ export const AbgabetoolMitarbeiter = {
 		dialogClass="modal-lg">
 			<template v-slot:title>
 				<div>
-					{{ $p.t('abgabetool/addSeries') }}
+					{{ $p.t('abgabetool/neueTerminserie') }}
 				</div>
 			</template>
 			<template v-slot:default>
@@ -422,7 +422,7 @@ export const AbgabetoolMitarbeiter = {
 				
 			</template>
 			<template v-slot:footer>
-				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/save') }}</button>
+				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/speichern') }}</button>
 			</template>
 		</bs-modal>	
 		
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9e9385c5c..ba3fca24f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37939,6 +37939,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'serienTerminGespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Serientermin wurde erfolgreich eingetragen!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Series dates were successfully entered!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'errorSerienterminSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fehler beim speichern des Serientermins!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Error saving Series dates!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 7d3ffdde7bddab6475fec718bde3e2e5e8f46575 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 17:15:32 +0200
Subject: [PATCH 0162/1357] fix api endpoint http error 500 when
 stundenplan_events is null or empty array

---
 application/controllers/api/frontend/v1/Stundenplan.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 815631d60..f957ccff6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,7 +81,14 @@ class Stundenplan extends FHCAPI_Controller
 		$lv_id = $this->input->get('lv_id', TRUE);
 
 		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);	
+		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
+		{
+			$stundenplan_events = array();
+		}
+		else
+		{
+			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
+		}
 
 		// fetching moodle events
 		$moodle_start_date = new DateTime($start_date);

From 9b895fbd235c26a332482957eb227e47d7711e23 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 30 Apr 2025 13:45:01 +0200
Subject: [PATCH 0163/1357] feature(Studium API endpoinds): adds the api
 endpoints for the Studium View to get the studienplan from a
 studiensemester/studiengang/semester

---
 application/controllers/Cis/Studium.php       |  40 ++++
 .../controllers/api/frontend/v1/Studium.php   | 217 ++++++++++++++++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/studium.js                      |  33 +++
 public/js/apps/Dashboard/Fhc.js               |   9 +-
 public/js/components/Cis/Studium/Studium.js   | 194 ++++++++++++++++
 6 files changed, 494 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/Cis/Studium.php
 create mode 100644 application/controllers/api/frontend/v1/Studium.php
 create mode 100644 public/js/api/studium.js
 create mode 100644 public/js/components/Cis/Studium/Studium.js

diff --git a/application/controllers/Cis/Studium.php b/application/controllers/Cis/Studium.php
new file mode 100644
index 000000000..a298de648
--- /dev/null
+++ b/application/controllers/Cis/Studium.php
@@ -0,0 +1,40 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Studium extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * index loads the Studium view
+	 * @access public
+	 * @return void 
+	 */
+	public function index()
+	{
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
+	}
+
+
+
+}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
new file mode 100644
index 000000000..7541a823b
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class Studium extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudienAllSemester'=> self::PERM_LOGGED,
+			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
+			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
+		]);
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
+		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('codex/Orgform_model','OrgformModel');
+
+		
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getStudienAllSemester(){
+
+		$parameter_studiensemester = $this->input->get('studiensemester',true);
+        $parameter_studiengang = $this->input->get('studiengang',true);
+		$parameter_semester = $this->input->get('semester',true);
+		$parameter_studienplan = $this->input->get('studienplan',true);
+
+		$test1=null;
+		$test2=null;
+		$test3=null;
+		$test4=null;
+
+		if(isset($parameter_studiensemester)){
+			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
+		}
+
+		if(isset($parameter_studiengang)){
+			$parameter_studiengang = current($this->getDataOrTerminateWithError($this->StudiengangModel->loadWhere(["studiengang_kz" => $parameter_studiengang])));
+		}
+
+		if(isset($parameter_studienplan)){
+			$this->StudienplanModel->addJoin("lehre.tbl_studienordnung", "studienordnung_id");
+			$this->StudienplanModel->addJoin("lehre.tbl_studienplan_semester", "studienplan_id");
+			$parameter_studienplan = $this->StudienplanModel->loadWhere(["studienplan_id" => $parameter_studienplan, "aktiv" => TRUE]);
+			$parameter_studienplan = current($this->getDataOrTerminateWithError($parameter_studienplan));
+		}
+
+		// fetch studiensemester
+		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
+		
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
+			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
+		}))){
+			$test1=true;
+			$aktuelles_studiensemester = $parameter_studiensemester;
+		}
+		
+		// fetch studiengaenge
+		$studiengaenge = $this->computeStudiengaenge($aktuelles_studiensemester->studiensemester_kurzbz);
+		$aktuelles_studiengang = current($studiengaenge);
+		if(!$aktuelles_studiengang){
+			$aktuelles_studiengang = null;
+		}
+		if(isset($parameter_studiengang) && !empty(array_filter( $studiengaenge,function($studiengang)use($parameter_studiengang){
+			return $studiengang->studiengang_kz == $parameter_studiengang->studiengang_kz;
+		}))){
+			$test2=true;
+			$aktuelles_studiengang = $parameter_studiengang;
+		}
+		
+		// compute semester and studienplaene
+		if($aktuelles_studiengang){
+			$studienplaene = $this->computeStudienplaene($aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
+		}else{
+			$studienplaene =[];
+		}
+
+		$semester = array_values(array_unique(array_map(function($item){
+			return $item->semester;
+		}, $studienplaene))); 
+		$aktuelles_semester = current($semester);
+		if(!$aktuelles_semester){
+			$aktuelles_semester = null;
+		}
+		if(isset($parameter_semester) && in_array($parameter_semester, $semester)){
+			$test3=true;
+			$aktuelles_semester = $parameter_semester;
+		}
+
+		$semester_studienplan = array_filter($studienplaene, function($item) use($aktuelles_semester){
+			return $item->semester == $aktuelles_semester;
+		});
+		
+		// fetch current studienplan based on semester
+		$aktuelles_studienplan = current($semester_studienplan);
+		if(!$aktuelles_studienplan){
+			$aktuelles_studienplan = null;
+		}
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
+			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		}))){
+			$test4=true;
+			$aktuelles_studienplan = $parameter_studienplan ;
+		}
+
+		// result object
+		$result = new stdClass();
+		$result->studienSemester = [];
+		$result->studienSemester["all"]= $allStudienSemester;
+		$result->studienSemester["preselected"]=$aktuelles_studiensemester;
+		$result->studiengang["all"]=$studiengaenge;
+		$result->studiengang["preselected"]=$aktuelles_studiengang;
+		$result->semester["all"] =$semester;
+		$result->semester["preselected"] =$aktuelles_semester;
+		$result->studienplan["all"]=$semester_studienplan;
+		$result->studienplan["preselected"]=$aktuelles_studienplan;  
+		$result->test1=$test1;
+		$result->test2=$test2; 
+		$result->test3=$test3; 
+		$result->test4=$test4; 
+		
+		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
+			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			$result->studentLehrverband = $studentLehrverband;
+			//$currentStudienplan = $this->StudienplanModel->loadWhere(["studiengang_kz"=>$studentLehrverband->studiengang_kz,"semester"=>$studentLehrverband->semester, "verband"=>$studentLehrverband->verband, "gruppe"=>$studentLehrverband->gruppe]);
+			$studienplaene = $this->getDataOrTerminateWithError($this->computeStudienplaene($studentLehrverband->studiengang_kz, $studentLehrverband->studiensemester_kurzbz));
+			$result->studienPleane = $studienplaene;
+			
+			//get the studienplan for the user
+			$preselectedStudienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId());
+
+			//set the preselected semester
+			$preselectedSemester = $preselectedStudienplan->semester;
+			
+			//get the studienordnung for the studienplan
+			$preselectedStudienordnung = $this->getStudienOrdnungForStudienplan($preselectedStudienplan->studienplan_id);
+			
+		}  */
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getStudiengaengeForStudienSemester($studiensemester){
+		$studiengaenge = $this->computeStudiengaenge($studiensemester);
+		$this->terminateWithSuccess($studiengaenge);
+	}
+
+	public function getStudienplaeneBySemester(){
+		$this->load->library('form_validation');
+        $this->form_validation->set_data($this->input->get());
+		$this->form_validation->set_rules('studiengang', 'studiengang', 'required');
+        $this->form_validation->set_rules('studiensemester', 'studiensemester', 'required');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+ 
+        $studiengang = $this->input->get('studiengang',true);
+        $studiensemester = $this->input->get('studiensemester',true);
+        $studienplaene = $this->computeStudienplaene($studiengang, $studiensemester);
+		$this->terminateWithSuccess($studienplaene);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	private function computeStudienplaene($studiengang, $studiensemester){
+		$studienplaene = $this->StudienplanModel->getStudienplaeneBySemester($studiengang, $studiensemester);
+		$studienplaene = $this->getDataOrTerminateWithError($studienplaene);
+		$studienplaene = array_map(function($studienplan){
+			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
+			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
+			return $studienplan;
+		},$studienplaene);
+		return $studienplaene;
+	}
+
+	private function computeStudiengaenge($studiensemester){
+		$studiengang_studiensemester_result = $this->StudiengangModel->getStudiengaengeByStudiensemester($studiensemester);
+		$studiengang_studiensemester_result = $this->getDataOrTerminateWithError($studiengang_studiensemester_result);
+		return $studiengang_studiensemester_result;
+	}
+
+	private function getStudienPlanFromPrestudentStatus($person_id){
+			$studienplan_id = current($this->getDataOrTerminateWithError($this->PrestudentstatusModel->getLastStatusPerson($person_id)))->studienplan_id;
+			$studienplan =current($this->getDataOrTerminateWithError($this->StudienplanModel->loadWhere(["studienplan_id"=>$studienplan_id])));
+			return $studienplan;
+	}
+	
+}
+
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index fe90a73fc..0b7b6631c 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -37,6 +37,7 @@ import studiengang from "./studiengang.js";
 import menu from "./menu.js";
 import dashboard from "./dashboard.js";
 import authinfo from "./authinfo.js";
+import studium from "./studium.js";
 
 export default {
     search,
@@ -60,5 +61,6 @@ export default {
     addons,
 	studiengang,
 	menu,
-	authinfo
+	authinfo,
+	studium,
 };
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
new file mode 100644
index 000000000..1789c449d
--- /dev/null
+++ b/public/js/api/studium.js
@@ -0,0 +1,33 @@
+export default {
+
+	getStudiensemester: function () {
+		return this.$fhcApi.get(
+			'/components/Cis/Mylv/Studiensemester',
+			{}
+		);
+	},
+
+	getAllStudienSemester: function (studiensemester=undefined, studiengang=undefined, semester=undefined, studienplan=undefined) {
+		console.log(studiensemester, studiengang, semester, studienplan)
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Studium/getStudienAllSemester',
+			{studiensemester, studiengang, semester, studienplan}
+		);
+	},
+
+	getStudiengaengeForStudienSemester: function (studiensemester) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getStudiengaengeForStudienSemester/${studiensemester}`,
+			{}
+		);
+	},
+	getStudienplaeneBySemester: function (studiengang, studiensemester) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getStudienplaeneBySemester`,
+			{
+				studiengang,
+				studiensemester,
+			}
+		);
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 5e6b006b9..fc25fbdfe 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -13,14 +13,19 @@ import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
-
-
+import Studium from "../../components/Cis/Studium/Studium.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Studium`,
+			name: 'Studium',
+			component: Studium,
+			props: true
+		},
 		{
 			path: `/Cis/Profil/View/:uid`,
 			name: 'ProfilView',
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
new file mode 100644
index 000000000..94a012fc9
--- /dev/null
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -0,0 +1,194 @@
+export default {
+	data(){
+		return {
+			studienSemester :[],
+			selectedStudiensemester: null,
+			studiengaenge:[],
+			selectedStudiengang:null,
+			studienOrdnung: [],
+			selectedStudienordnung: null,
+			semester:[],
+			selectedSemester:null,
+		}
+	},
+	methods:{
+		changeSelectedStudienSemester(studiensemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedStudienGang(studiengang) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang.studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedSemester(semester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedStudienPlan(studienplan) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan.studienplan_id)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		/* loadStudienplan(studiengang, studiensemester){
+			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
+				.then(data => data.data)
+				.then(res => {
+					console.log("This is the result", res)
+				})
+		}, */
+		sortStudienSemester(studienSemester){
+			let regex = new RegExp(/^(WS|SS)([0-9]{4})/);
+			studienSemester.sort((sem1,sem2)=>{
+				let [sem1Match, sem1Semester, sem1Year] = sem1.studiensemester_kurzbz.match(regex);
+				let [sem2Match, sem2Semester, sem2Year] = sem2.studiensemester_kurzbz.match(regex);
+				if(sem1Year == sem2Year){
+					return sem1Semester > sem2Semester? -1:1;
+				}
+				return sem1Year > sem2Year? -1:1;
+			})
+		},
+		setHash(val) {
+			// TODO: make this a router param to enable history
+			location.hash = val;
+		},
+		extractPropertyValues(res){
+			let { studienSemester, studiengang, semester, studienplan } = res;
+			this.sortStudienSemester(studienSemester.all);
+			this.studienSemester = studienSemester.all;
+			this.selectedStudiensemester = studienSemester.preselected.studiensemester_kurzbz;
+
+			this.studiengaenge = studiengang.all;
+			this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
+
+			this.semester = semester.all;
+			this.selectedSemester = semester?.preselected;
+
+			console.log(studienplan.all,"all studienplan")
+			this.studienOrdnung = studienplan.all;
+			console.log(this.studienOrdnung,"studienordnung")
+			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
+		},
+		studienordnungTitel(studienordnung){
+			if(!studienordnung) return "";
+			return `${studienordnung?.bezeichnung}-${studienordnung?.orgform_kurzbz} ( ${studienordnung?.orgform_bezeichnung}, ${studienordnung?.sprache} )`;
+		},
+		studiengangTitel(studiengang) {
+			if (!studiengang) return "";
+			return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+		},
+		studiensemesterTitel(studiensemester){
+			if (!studiensemester) return "";
+			let studiensemester_regex = new RegExp(/^(WS|SS)([0-9]{4})/);
+			let match = studiensemester.match(studiensemester_regex);
+			switch(match[1]){
+				case "WS":
+					return `Wintersemester ${match[2]}`;
+				case "SS":
+					return `Sommersemester ${match[2]}`;	
+				default:
+					return `${studiensemester}`;
+			}
+		}
+	},
+
+	computed:{
+		
+	},
+	
+	created(){
+		this.$fhcApi.factory.studium.getAllStudienSemester()
+		.then(data => data.data)
+		.then(res => {
+			this.	extractPropertyValues(res);
+		})
+	},
+	/* selectedStudiensemester(newStudiensemester, oldStudiensemester) {
+		if (newStudiensemester !== oldStudiensemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(newStudiensemester, this.selectedStudiengang, this.selectedSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	},
+	selectedStudiengang(newStudiengang, oldStudiengang) {
+		if (newStudiengang !== oldStudiengang) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, newStudiengang, this.selectedSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	},
+	selectedSemester(newSemester, oldSemester) {
+		if (newSemester !== oldSemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, newSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	} */
+	template: `
+	<h2>this is a test titel</h2>
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+	
+	`
+};
\ No newline at end of file

From eae44bc6345245db9402c54948575463549cefee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 May 2025 11:23:39 +0200
Subject: [PATCH 0164/1357] update(Studium): loads lehrmodule and
 lehrveranstaltungen for studienplan and displays the ui with the lvModal

---
 .../controllers/api/frontend/v1/Studium.php   | 41 ++++++++++++++++++-
 public/js/components/Cis/Mylv/LvInfo.js       |  6 +--
 public/js/components/Cis/Mylv/LvModal.js      |  2 +-
 public/js/components/Cis/Studium/Studium.js   | 41 ++++++++++++++++++-
 4 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 7541a823b..b14a852a6 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -132,6 +132,14 @@ class Studium extends FHCAPI_Controller
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
 
+		// fetch studienplan lehrveranstaltungen
+		if($aktuelles_studienplan){
+			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
+			$aktuelles_lehrveranstaltungen = $lehrveranstaltungen;
+		}else{
+			$aktuelles_lehrveranstaltungen = [];
+		}
+
 		// result object
 		$result = new stdClass();
 		$result->studienSemester = [];
@@ -142,7 +150,8 @@ class Studium extends FHCAPI_Controller
 		$result->semester["all"] =$semester;
 		$result->semester["preselected"] =$aktuelles_semester;
 		$result->studienplan["all"]=$semester_studienplan;
-		$result->studienplan["preselected"]=$aktuelles_studienplan;  
+		$result->studienplan["preselected"]=$aktuelles_studienplan; 
+		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
 		$result->test1=$test1;
 		$result->test2=$test2; 
 		$result->test3=$test3; 
@@ -201,6 +210,36 @@ class Studium extends FHCAPI_Controller
 		return $studienplaene;
 	}
 
+	private function computeStudienplanLehrveranstaltungen($studienplan_id, $semester){
+		$lehrveranstaltungen = $this->StudienplanModel->getStudienplanLehrveranstaltung($studienplan_id, $semester);	
+		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+		usort($lehrveranstaltungen, function($a, $b){
+			if($a->lehrtyp_kurzbz == "modul"){
+				return -1;
+			}
+			else if($b->lehrtyp_kurzbz == "modul"){
+				return 1;
+			}
+			return 0;
+		});
+		$lehrveranstaltungen= array_reduce($lehrveranstaltungen,function($carry, $lehrv){
+			if($lehrv->lehrtyp_kurzbz == "modul"){
+				array_push($carry, $lehrv);
+			}
+			else{
+				$parent =array_filter($carry, function($item)use($lehrv){
+					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+				});
+				$parent = current($parent);
+				if($parent){
+					$parent->lehrveranstaltungen[] = $lehrv;
+				}
+			}
+			return $carry;
+		}, []);
+		return $lehrveranstaltungen;
+	}
+
 	private function computeStudiengaenge($studiensemester){
 		$studiengang_studiensemester_result = $this->StudiengangModel->getStudiengaengeByStudiensemester($studiensemester);
 		$studiengang_studiensemester_result = $this->getDataOrTerminateWithError($studiengang_studiensemester_result);
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..e248f523f 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -58,13 +58,13 @@ export default {
 		<table class="table table-hover mb-4">
 			<template v-if="event.type == LV_TYPES.moodle">
 				<tbody>
-					<tr>
+					<tr v-if="event?.datum">
 						<th>{{
 							$p.t('global','datum')?
 							$p.t('global','datum')+':'
 							:''
 						}}</th>
-						<td>{{methodFormatDate(event.datum)}}</td>
+						<td>{{methodFormatDate(event?.datum)}}</td>
 					</tr>
 					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
@@ -100,7 +100,7 @@ export default {
 			</template>
 			<template v-else>
 				<tbody>
-					<tr>
+					<tr v-if="event?.datum">
 						<th>{{
 							$p.t('global','datum')?
 							$p.t('global','datum')+':'
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index f4ac6edfc..4e4f30aea 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -51,7 +51,7 @@ export default {
 
 			if (this.event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]))
+					.call(ApiStundenplan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 94a012fc9..c7b92b6a7 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,3 +1,5 @@
+import LvModal from "../Mylv/LvModal.js";
+
 export default {
 	data(){
 		return {
@@ -9,8 +11,13 @@ export default {
 			selectedStudienordnung: null,
 			semester:[],
 			selectedSemester:null,
+			lehrveranstaltungen: [],
+			selectedLehrveranstaltung: null,
 		}
 	},
+	components:{
+		LvModal,
+	},
 	methods:{
 		changeSelectedStudienSemester(studiensemester) {
 			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
@@ -40,6 +47,16 @@ export default {
 					this.extractPropertyValues(res);
 				})
 		},
+		selectLehrveranstaltung(lehrveranstaltung) {
+			this.selectedLehrveranstaltung = lehrveranstaltung;
+			this.selectedLehrveranstaltung.type ="lehreinheit";
+			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
+			console.log(this.selectedLehrveranstaltung, "selected lehrveranstaltung")
+			Vue.nextTick(()=>{
+				this.$refs.modalContainer.show();
+			})
+			
+		},
 		/* loadStudienplan(studiengang, studiensemester){
 			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
 				.then(data => data.data)
@@ -63,7 +80,7 @@ export default {
 			location.hash = val;
 		},
 		extractPropertyValues(res){
-			let { studienSemester, studiengang, semester, studienplan } = res;
+			let { studienSemester, studiengang, semester, studienplan, lehrveranstaltungen } = res;
 			this.sortStudienSemester(studienSemester.all);
 			this.studienSemester = studienSemester.all;
 			this.selectedStudiensemester = studienSemester.preselected.studiensemester_kurzbz;
@@ -78,6 +95,8 @@ export default {
 			this.studienOrdnung = studienplan.all;
 			console.log(this.studienOrdnung,"studienordnung")
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
+
+			this.lehrveranstaltungen = lehrveranstaltungen;
 		},
 		studienordnungTitel(studienordnung){
 			if(!studienordnung) return "";
@@ -141,7 +160,9 @@ export default {
 		}
 	} */
 	template: `
-	<h2>this is a test titel</h2>
+	<div>
+	<h2>Studium</h2>
+	<hr>
 	<div class="input-group">
 		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
 			<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -189,6 +210,22 @@ export default {
 			<i class="fa fa-caret-right" aria-hidden="true"></i>
 		</button>
 	</div>
+
+	<hr>
+
+	<div class="d-grid" style="grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
+		<div class="card" v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+			<div class="card-header">
+				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
+				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
+			</div>
+			<div class="card-body">
+				<a class="d-block" href="#" v-for="lv in lehrveranstaltung.lehrveranstaltungen" @click="selectLehrveranstaltung(lv)">{{lv.bezeichnung}}</a>
+			</div>
+		</div>
+	</div>
+	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
+	</div>
 	
 	`
 };
\ No newline at end of file

From 0930866beb54582a29423eddf1c09356a9005e49 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 5 May 2025 13:55:54 +0200
Subject: [PATCH 0165/1357] revert change introduced by merging api refactoring
 branch

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

diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 05fa94c2d..c45248dc8 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -128,7 +128,7 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay)),
+				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay)),
 				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];

From 6ab50654ba219c386ec759653998f2e3e3863acb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 5 May 2025 16:55:06 +0200
Subject: [PATCH 0166/1357] add activity title to moodle calender entries,
 render activity title as html, set overscroll behavior for all day event area

---
 public/css/components/calendar.css                  | 5 +++--
 public/js/components/Cis/Mylv/LvInfo.js             | 2 +-
 public/js/components/Cis/Mylv/LvModal.js            | 2 +-
 public/js/components/Cis/Stundenplan/Stundenplan.js | 6 +++---
 public/js/components/DashboardWidget/Stundenplan.js | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index ddf35e3e7..1de5e575b 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -73,9 +73,10 @@
 	box-shadow: 1px 1px 0 #dee2e6;
 }
 
-.fhc-calendar-week-page .all-day-event{
+.fhc-calendar-week-page .all-day-event {
 	max-height: 75px;
-	overflow:auto;
+	overflow: auto;
+	overscroll-behavior: none;
 }
 
 .fhc-calendar-week-page .all-day-event-container{
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..a17eb4b67 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -68,7 +68,7 @@ export default {
 					</tr>
 					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
-						<td>{{event?.assignment}}</td>
+						<td v-html="event?.assignment"></td>
 					</tr>
 					<tr>
 						<th>{{$p.t('global','typ')}}:</th>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index f4ac6edfc..19c444a21 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -76,7 +76,7 @@ export default {
 	template: /*html*/ `
 	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
+			<template v-if="event?.type=='moodle'"><strong v-html="event.titel"></strong></template>
 			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index bf646d5e4..efb8c06ea 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -288,7 +288,7 @@ const Stundenplan = {
 			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
 				<div class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+					<span class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 				</div>
 			</div>
 			<div v-else @click="showModal(event)" class="p-1">
@@ -308,7 +308,7 @@ const Stundenplan = {
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center">{{event.topic}}</span>
+					<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
 					<span>{{event.topic}}</span>
@@ -322,7 +322,7 @@ const Stundenplan = {
 				<template v-if="event.type=='moodle'">
 					<div class="d-flex small align-items-center w-100 p-1" >
 						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center">{{event.topic}}</span>
+						<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 					</div>
 				</template>
 				<template v-else>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index c45248dc8..e492f785a 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -178,7 +178,7 @@ export default {
 				<div  v-if="event.type=='moodle'">
 					<div class="d-flex small w-100" >
 						<moodle-svg></moodle-svg>
-						<span v-contrast class="flex-grow-1 text-center ">{{event.topic}}</span>
+						<span v-contrast class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 					</div>
 				</div>
 				<span v-else class="small" >
@@ -198,7 +198,7 @@ export default {
 							<template v-if="evt.type=='moodle'">
 								<div class="d-flex align-items-center ">
 									<moodle-svg></moodle-svg>
-									<b v-contrast class="flex-grow-1 text-center">{{evt.topic}}</b>
+									<b v-contrast class="flex-grow-1 text-center"><strong v-html="evt.titel"></strong> - {{evt.topic}}</b>
 								</div>
 							</template>
 							<template v-else>

From 05de9cd94afa1631aa7c363ca2726c75c2d0a647 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 6 May 2025 13:24:08 +0200
Subject: [PATCH 0167/1357] move logic processing moodle events from core to
 moodle addon

---
 .../api/frontend/v1/Stundenplan.php           | 50 ++++---------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index f957ccff6..61a9e8f54 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -91,47 +91,19 @@ class Stundenplan extends FHCAPI_Controller
 		}
 
 		// fetching moodle events
-		$moodle_start_date = new DateTime($start_date);
-		$moodle_start_date = $moodle_start_date->getTimestamp();
-		$moodle_end_date = new DateTime($end_date);
-		$moodle_end_date = $moodle_end_date->getTimestamp();
 		$moodle_events = [];
-		Events::trigger('moodleCalendarEvents',
-						function & () use (&$moodle_events) {
-							return $moodle_events;
-						},
-						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
+		Events::trigger(
+			'moodleCalendarEvents',
+			function & () use (&$moodle_events)
+			{
+				return $moodle_events;
+			},
+			[
+				'start_date' => $start_date,
+				'end_date' => $end_date, 
+				'username' => getAuthUID()
+			]
 		);
-		$moodle_events = array_map(function($event){
-			$moodle_event_timestart = new DateTime($event->timestart);
-			$moodle_event_timeend = new DateTime($event->timeend);
-			$convertedEvent = new stdClass();
-			$convertedEvent->type = 'moodle';
-			$convertedEvent->beginn = $moodle_event_timestart->format('H:i:s');
-			$convertedEvent->ende = $moodle_event_timeend->format('H:i:s');
-			$convertedEvent->allDayEvent = true;
-			$convertedEvent->datum = $moodle_event_timestart->format('Y-n-j');
-			$convertedEvent->purpose = $event->purpose;
-			$convertedEvent->assignment = $event->activityname;
-			$convertedEvent->topic = $event->activitystr;
-			$convertedEvent->lektor = [];
-			$convertedEvent->gruppe = [];
-			$convertedEvent->ort_kurzbz = $event->location;
-			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
-			$convertedEvent->titel = isset($event->course->fullname)? $event->course->fullname:null;
-			$convertedEvent->lehrfach = '';
-			$convertedEvent->lehrform = '';
-			$convertedEvent->lehrfach_bez = '';
-			$convertedEvent->organisationseinheit = '';
-			$convertedEvent->farbe = '00689E';
-			$convertedEvent->lehrveranstaltung_id = 0;
-			$convertedEvent->ort_content_id = 0;
-			$convertedEvent->url = $event->url;
-			$convertedEvent->activityIcon = isset($event->icon->iconurl)? $event->icon->iconurl:null;
-			$convertedEvent->actionname = isset($event->action->name)?$event->action->name:null;
-			$convertedEvent->overdue = !empty($event->overdue);
-			return $convertedEvent;
-		},$moodle_events);
 		
 		$result = array_merge($stundenplan_events,$moodle_events);
 		// sort array with moodle events first

From b5d3bf3f1ebb13adf538537d185a342611c11188 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 May 2025 13:30:06 +0200
Subject: [PATCH 0168/1357] update(Cis4 Studium): finilizes Studium feature

---
 .../controllers/api/frontend/v1/Studium.php   |  36 ++-
 application/libraries/StundenplanLib.php      |  37 ++-
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/css/Cis4/Cis.css                       |  19 ++
 public/css/Cis4/Studium.css                   |  60 ++++
 public/js/api/studium.js                      |   1 -
 public/js/components/Cis/Mylv/LvUebersicht.js |  28 +-
 public/js/components/Cis/Studium/Studium.js   | 267 +++++++++++-------
 8 files changed, 331 insertions(+), 118 deletions(-)
 create mode 100644 public/css/Cis4/Studium.css

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index b14a852a6..c50915ced 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,6 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
+		$this->load->model('person/Person_model','PersonModel');
 
 		
 	}
@@ -53,11 +54,6 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
-		$test1=null;
-		$test2=null;
-		$test3=null;
-		$test4=null;
-
 		if(isset($parameter_studiensemester)){
 			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
 		}
@@ -80,7 +76,6 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
-			$test1=true;
 			$aktuelles_studiensemester = $parameter_studiensemester;
 		}
 		
@@ -93,7 +88,6 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studiengang) && !empty(array_filter( $studiengaenge,function($studiengang)use($parameter_studiengang){
 			return $studiengang->studiengang_kz == $parameter_studiengang->studiengang_kz;
 		}))){
-			$test2=true;
 			$aktuelles_studiengang = $parameter_studiengang;
 		}
 		
@@ -112,14 +106,13 @@ class Studium extends FHCAPI_Controller
 			$aktuelles_semester = null;
 		}
 		if(isset($parameter_semester) && in_array($parameter_semester, $semester)){
-			$test3=true;
 			$aktuelles_semester = $parameter_semester;
 		}
 
 		$semester_studienplan = array_filter($studienplaene, function($item) use($aktuelles_semester){
 			return $item->semester == $aktuelles_semester;
 		});
-		
+
 		// fetch current studienplan based on semester
 		$aktuelles_studienplan = current($semester_studienplan);
 		if(!$aktuelles_studienplan){
@@ -128,13 +121,19 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
 			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
-			$test4=true;
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
 
 		// fetch studienplan lehrveranstaltungen
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
+			foreach($lehrveranstaltungen as $lehrv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
+					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
+					$lv->lektoren = $lvLektoren;
+				}
+			
+			}
 			$aktuelles_lehrveranstaltungen = $lehrveranstaltungen;
 		}else{
 			$aktuelles_lehrveranstaltungen = [];
@@ -152,10 +151,6 @@ class Studium extends FHCAPI_Controller
 		$result->studienplan["all"]=$semester_studienplan;
 		$result->studienplan["preselected"]=$aktuelles_studienplan; 
 		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
-		$result->test1=$test1;
-		$result->test2=$test2; 
-		$result->test3=$test3; 
-		$result->test4=$test4; 
 		
 		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
@@ -224,6 +219,7 @@ class Studium extends FHCAPI_Controller
 		});
 		$lehrveranstaltungen= array_reduce($lehrveranstaltungen,function($carry, $lehrv){
 			if($lehrv->lehrtyp_kurzbz == "modul"){
+				$lehrv->lehrveranstaltungen = [];
 				array_push($carry, $lehrv);
 			}
 			else{
@@ -251,6 +247,18 @@ class Studium extends FHCAPI_Controller
 			$studienplan =current($this->getDataOrTerminateWithError($this->StudienplanModel->loadWhere(["studienplan_id"=>$studienplan_id])));
 			return $studienplan;
 	}
+
+	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
+		$this->load->library('StundenplanLib');
+		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		if(!$lektoren){
+			return [];
+		}
+		$lektoren = array_map(function($lektor){
+			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
+		},$lektoren);
+		return $lektoren;
+	}
 	
 }
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index e0691ecab..b64fd226e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -21,6 +21,8 @@ class StundenplanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		
 
 		$student_uid = getAuthUID();
 		if(is_null($student_uid))
@@ -55,7 +57,7 @@ class StundenplanLib{
 
 			// query lv itself in case its Stundenplan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv_result = $this->LehrveranstaltungModel->load($lv_id);
+			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
 			{
 				return error(getData($lv_result));
@@ -143,6 +145,39 @@ class StundenplanLib{
 		return success($reservierungen);
 	}
 
+	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
+		if(isError($studiensemester))
+		{
+			return error(getData($studiensemester));
+		}
+		$studiensemester = current(getData($studiensemester));
+		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
+		SELECT DISTINCT uid 
+		FROM campus.vw_stundenplan
+		WHERE lehrveranstaltung_id = ? AND
+		studiengang_kz = ? AND
+		semester = ? AND
+		(datum BETWEEN ? AND ?)
+		",[$lehrveranstaltung_id, $studiengang_kz, $semester, $studiensemester->start, $studiensemester->ende]);
+		
+		if(isError($lektoren))
+		{
+			return error(getData($lektoren));
+		}
+		$lektoren = getData($lektoren);
+		if(isset($lektoren)){
+			$lektoren = array_map(function($lektor){
+				return $lektor->uid;
+			},$lektoren);
+
+		}
+		return $lektoren;
+	}
 
 	public function expand_object_information($data){
 		$this->_ci =& get_instance();
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 231e25696..f70274f6e 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -22,6 +22,7 @@ $includesArray = array(
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
 		'public/css/Cis4/Cms.css',
+		'public/css/Cis4/Studium.css',
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index aa24641f8..f3beeddec 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -59,6 +59,25 @@ html {
 	color:white;
 }
 
+/* lvMenu entry disabled style */
+[disabled="true"].menu-entry {
+	pointer-events: none;
+	cursor: default;
+	background-color: #dadada !important;
+	color: black !important;
+	-webkit-touch-callout: none;
+	/* iOS Safari */
+	-webkit-user-select: none;
+	/* Safari */
+	-khtml-user-select: none;
+	/* Konqueror HTML */
+	-moz-user-select: none;
+	/* Old versions of Firefox */
+	-ms-user-select: none;
+	/* Internet Explorer/Edge */
+	user-select: none;
+}
+
 /* buttons */
 #cis-header .btn-level-1,
 #cis-header .btn-level-1 + .btn,
diff --git a/public/css/Cis4/Studium.css b/public/css/Cis4/Studium.css
new file mode 100644
index 000000000..c0c58e1d0
--- /dev/null
+++ b/public/css/Cis4/Studium.css
@@ -0,0 +1,60 @@
+.lvUebersicht{
+	display:grid;
+	gap: 1rem;
+}
+
+@media (min-width: 992px) {
+	.lvUebersicht {
+		grid-template-columns: 1fr 1fr 1fr;
+	}
+}
+
+@media (max-width: 992px){
+	.lvUebersicht{
+		grid-template-columns: 1fr 1fr;
+	}
+}
+
+@media (max-width: 576px){
+	.lvUebersicht{
+		grid-template-columns: 1fr;
+	}
+}
+
+.lvOptions {
+	display: grid;
+	gap: 1rem;
+}
+
+.lvOptions > div {
+	flex-basis: auto;
+	flex-grow: 1;
+	flex-shrink: 1;
+
+}
+
+.lvOptions button {
+	flex-shrink: 0;
+
+}
+
+@media (min-width: 1200px) {
+	.lvOptions {
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+	}
+}
+
+@media (max-width: 1200px) {
+	.lvOptions {
+		grid-template-columns: 1fr 1fr;
+	}
+}
+
+@media (max-width: 576px) {
+	.lvOptions {
+		grid-template-columns: 1fr;
+	}
+}
+
+
+
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index 1789c449d..cb59482e7 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -8,7 +8,6 @@ export default {
 	},
 
 	getAllStudienSemester: function (studiensemester=undefined, studiengang=undefined, semester=undefined, studienplan=undefined) {
-		console.log(studiensemester, studiengang, semester, studienplan)
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Studium/getStudienAllSemester',
 			{studiensemester, studiengang, semester, studienplan}
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index fddf97d38..dcab9acf5 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -11,6 +11,16 @@ export default  {
             required:true,
             default:null,
         },
+		studiensemester: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		titel: {
+			type: String,
+			required: false,
+			default: null,
+		},
 		// prop used to preselect a menu item and skip the grid overview
 		preselectedMenu: {
 			type: Object,
@@ -39,7 +49,7 @@ export default  {
         showModal: function(){
 			if (!this.preselectedMenu) {
                 this.$api
-                    .call(ApiAddons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz))
+					.call(ApiAddons.getLvMenu(this.event.lehrveranstaltung_id, (this.studiensemester ?? this.event.studiensemester_kurzbz)))
                     .then(res => {
     					if (res.data) {
     						this.menu = res.data;
@@ -53,14 +63,24 @@ export default  {
     mounted(){
         this.modal = this.$refs.modalContainer;
     },
+	beforeUnmount(){
+		this.$refs.modalContainer.hide();
+	},
     template:/*html*/`
     <bs-modal :bodyClass="isMenuSelected ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
-        <template #title>
-            <span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
-            <span v-else>Lehrveranstaltungs Übersicht</span>
+        
+		<template #title>
+            <template v-if="titel">
+				<span>{{titel}}</span>
+			</template>
+			<template v-else>
+				<span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
+				<span v-else>Lehrveranstaltungs Übersicht</span>
+			</template>
 
         </template>
         <template #default>
+			<slot name="content"></slot>
 			<lv-menu v-model:isMenuSelected="isMenuSelected" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index c7b92b6a7..c6de3113d 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,4 +1,5 @@
-import LvModal from "../Mylv/LvModal.js";
+import LvUebersicht from "../Mylv/LvUebersicht.js";
+
 
 export default {
 	data(){
@@ -13,21 +14,84 @@ export default {
 			selectedSemester:null,
 			lehrveranstaltungen: [],
 			selectedLehrveranstaltung: null,
+			menu:null,
 		}
 	},
-	components:{
-		LvModal,
+	components: {
+		LvUebersicht,
+	},
+	watch:{
+		selectedStudiensemester: function(newVal, oldVal){
+			if(newVal != oldVal){
+				const studiensemester =this.getDataFromLocalStorage("sudiensemester");
+				if (!studiensemester || (studiensemester && studiensemester != newVal)){
+					this.storeDataToLocalStorage("sudiensemester", newVal);
+				}
+			}
+		},
+		selectedSemester: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const semester = this.getDataFromLocalStorage("semester");
+				if (!semester || (semester && semester != newVal)) {
+					this.storeDataToLocalStorage("semester", newVal);
+				}
+			}
+		},
+		selectedStudiengang: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const studiengang = this.getDataFromLocalStorage("studiengang");
+				if (!studiengang || (studiengang && studiengang != newVal)) {
+					this.storeDataToLocalStorage("studiengang", JSON.stringify(newVal));
+				}
+			}
+		},
+		selectedStudienordnung: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const studienordnung = this.getDataFromLocalStorage("studienordnung");
+				if (!studienordnung || (studienordnung && studienordnung != newVal)) {
+					this.storeDataToLocalStorage("studienordnung", JSON.stringify(newVal));
+				}
+			}
+		},
 	},
 	methods:{
-		changeSelectedStudienSemester(studiensemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+		changeStudiensemester(value){
+			let studiensemester = this.$refs.studiensemester;
+			studiensemester.selectedIndex = (studiensemester.selectedIndex + value + studiensemester.options.length) % studiensemester.options.length;
+			this.changeSelectedStudienSemester(studiensemester.value);
+		},
+		changeStudiengang(value) {
+			let studiengang = this.$refs.studiengaenge;
+			studiengang.selectedIndex = (studiengang.selectedIndex + value + studiengang.options.length) % studiengang.options.length;
+			this.changeSelectedStudienGang(studiengang.value);
+		},
+		changeSemester(value) {
+			let semester = this.$refs.semester;
+			semester.selectedIndex = (semester.selectedIndex + value + semester.options.length) % semester.options.length;
+			this.changeSelectedSemester(semester.value);
+		},
+		changeStudienordnung(value) {
+			let studienordnung = this.$refs.studienordnung;
+			studienordnung.selectedIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			this.changeSelectedStudienPlan(studienordnung.value);
+		},
+		
+		storeDataToLocalStorage(key,value){
+			localStorage.setItem(key, value);
+		},
+		getDataFromLocalStorage(key){
+			const value = localStorage.getItem(key);
+			return value;
+		},
+		changeSelectedStudienSemester(studiensemester_kurzbz) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
-		changeSelectedStudienGang(studiengang) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang.studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+		changeSelectedStudienGang(studiengang_kz) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
@@ -40,30 +104,24 @@ export default {
 					this.extractPropertyValues(res);
 				})
 		},
-		changeSelectedStudienPlan(studienplan) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan.studienplan_id)
+		changeSelectedStudienPlan(studienplan_id) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
-		selectLehrveranstaltung(lehrveranstaltung) {
+		openLvUebersicht(lehrveranstaltung) {
 			this.selectedLehrveranstaltung = lehrveranstaltung;
+			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
-			console.log(this.selectedLehrveranstaltung, "selected lehrveranstaltung")
-			Vue.nextTick(()=>{
-				this.$refs.modalContainer.show();
-			})
+			if(this.selectedLehrveranstaltung)
+				Vue.nextTick(()=>{
+					this.$refs.lvUebersicht.show();
+				})
 			
 		},
-		/* loadStudienplan(studiengang, studiensemester){
-			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
-				.then(data => data.data)
-				.then(res => {
-					console.log("This is the result", res)
-				})
-		}, */
 		sortStudienSemester(studienSemester){
 			let regex = new RegExp(/^(WS|SS)([0-9]{4})/);
 			studienSemester.sort((sem1,sem2)=>{
@@ -91,9 +149,7 @@ export default {
 			this.semester = semester.all;
 			this.selectedSemester = semester?.preselected;
 
-			console.log(studienplan.all,"all studienplan")
 			this.studienOrdnung = studienplan.all;
-			console.log(this.studienOrdnung,"studienordnung")
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
 
 			this.lehrveranstaltungen = lehrveranstaltungen;
@@ -122,108 +178,123 @@ export default {
 	},
 
 	computed:{
-		
+		selectedLehrveranstaltungTitel(){
+			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
+			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
+		},
 	},
 	
 	created(){
-		this.$fhcApi.factory.studium.getAllStudienSemester()
+
+		const studiensemester = this.getDataFromLocalStorage("sudiensemester") ?? undefined;
+		const studiengang = JSON.parse(this.getDataFromLocalStorage("studiengang")) ?? undefined;
+		const semester = this.getDataFromLocalStorage("semester") ?? undefined;
+		const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
+
+		// only fetch default data if no data is stored in the local storage
+		
+		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
 		.then(data => data.data)
 		.then(res => {
 			this.	extractPropertyValues(res);
 		})
+
 	},
-	/* selectedStudiensemester(newStudiensemester, oldStudiensemester) {
-		if (newStudiensemester !== oldStudiensemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(newStudiensemester, this.selectedStudiengang, this.selectedSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	},
-	selectedStudiengang(newStudiengang, oldStudiengang) {
-		if (newStudiengang !== oldStudiengang) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, newStudiengang, this.selectedSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	},
-	selectedSemester(newSemester, oldSemester) {
-		if (newSemester !== oldSemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, newSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	} */
 	template: `
 	<div>
 	<h2>Studium</h2>
 	<hr>
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+	<lv-uebersicht ref="lvUebersicht" :titel="selectedLehrveranstaltungTitel" :event="selectedLehrveranstaltung" :studiensemester="selectedStudiensemester" v-if="selectedLehrveranstaltung">
+		<template #content>
+			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
+				<h4>Lektoren:</h4>
+				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
+			</div>
+		</template>
+	</lv-uebersicht>
+	<div class="lvOptions">
+		<div>
+		<h6>Studiensemester:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+		<div>
+		<h6>Studiengang:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+		<div>
+		<h6>Semester:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
+		<div>
+		<h6>Studienordnung:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung.studienplan_id)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 	</div>
 
 	<hr>
 
-	<div class="d-grid" style="grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
-		<div class="card" v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+	<div class="lvUebersicht" >
+	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
 				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
 				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
-				<a class="d-block" href="#" v-for="lv in lehrveranstaltung.lehrveranstaltungen" @click="selectLehrveranstaltung(lv)">{{lv.bezeichnung}}</a>
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
+						<a class="d-block" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+					</li>	
+				</ul>
 			</div>
 		</div>
+	</template>
 	</div>
+
+
 	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
 	</div>
 	

From 7d095b499899ad8baf0fc54f8b2743a6beaee0b7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 May 2025 11:03:12 +0200
Subject: [PATCH 0169/1357] feature(Studium LvModal): checks whether the lv has
 stundenplan entries and disables menu option if not/ checks the lvevaluierung
 information and adds it to the lvmodal information

---
 .../controllers/api/frontend/v1/Studium.php   | 14 ++++++++
 .../api/frontend/v1/Stundenplan.php           | 19 ++++++++---
 public/js/api/studium.js                      | 15 ++++++++
 public/js/components/Cis/Mylv/LvMenu.js       |  8 +++++
 public/js/components/Cis/Mylv/LvUebersicht.js | 34 ++++++++++++++++---
 public/js/components/Cis/Studium/Studium.js   | 14 ++++++--
 6 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index c50915ced..ecaf72918 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -17,6 +17,9 @@
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
 class Studium extends FHCAPI_Controller
 {
 	
@@ -29,6 +32,7 @@ class Studium extends FHCAPI_Controller
 			'getStudienAllSemester'=> self::PERM_LOGGED,
 			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
 			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
+			'getLvEvaluierungInfo'=> self::PERM_LOGGED,
 		]);
 
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -173,6 +177,14 @@ class Studium extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getLvEvaluierungInfo($studiensemester_kurzbz, $lehrveranstaltung_id){
+		$result = [];
+		Events::trigger('lvEvaluierungsInfo', function & () use (&$result) {
+			return $result;
+		},$lehrveranstaltung_id, $studiensemester_kurzbz);
+		$this->terminateWithSuccess($result);
+	}
+
 	public function getStudiengaengeForStudienSemester($studiensemester){
 		$studiengaenge = $this->computeStudiengaenge($studiensemester);
 		$this->terminateWithSuccess($studiengaenge);
@@ -259,6 +271,8 @@ class Studium extends FHCAPI_Controller
 		},$lektoren);
 		return $lektoren;
 	}
+
+	
 	
 }
 
diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index f957ccff6..4e1ed5778 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -36,6 +36,7 @@ class Stundenplan extends FHCAPI_Controller
 			'StundenplanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
+			'getLvStundenplanForStudiensemester' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -85,11 +86,6 @@ class Stundenplan extends FHCAPI_Controller
 		{
 			$stundenplan_events = array();
 		}
-		else
-		{
-			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
-		}
-
 		// fetching moodle events
 		$moodle_start_date = new DateTime($start_date);
 		$moodle_start_date = $moodle_start_date->getTimestamp();
@@ -154,6 +150,19 @@ class Stundenplan extends FHCAPI_Controller
 		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}
+
+	public function getLvStundenplanForStudiensemester($studiensemester,$lvid){
+		$this->load->library('StundenplanLib');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
+		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
+		$timespan_start = new DateTime($studiensemester_result->start);
+		$timespan_ende = new DateTime($studiensemester_result->ende);
+		$stundenplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$this->terminateWithSuccess($stundenplan);
+		
+	}
 		
 
     /**
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index cb59482e7..92bb58698 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -29,4 +29,19 @@ export default {
 			}
 		);
 	},
+	getLvStundenplanForStudiensemester: function (studiensemester, lvid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Stundenplan/getLvStundenplanForStudiensemester/${studiensemester}/${lvid}`,
+			{
+			}
+		);
+	},
+	getLvEvaluierungInfo: function (studiensemester_kurzbz, lvid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getLvEvaluierungInfo/${studiensemester_kurzbz}/${lvid}`,
+			{
+			}
+		);
+	},
+	
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index fc6a3a723..6c2577793 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -7,6 +7,11 @@ export default {
 		},
 		containerStyles: Array,
 		rowStyles: Array,
+		hasLvStundenplanEintraege: {
+			required:false,
+			default:true,
+			type:Boolean,
+		},
 	},
 	data(){
 		return{
@@ -18,6 +23,9 @@ export default {
 			if (!this.c4_link(menuItem) && !menuItem.c4_moodle_links?.length) {
 				return true;
 			}
+			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvStundenplanEintraege){
+				return true;
+			}
 			return null;
 		},
 		c4_target: function (menuItem) {
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index dcab9acf5..e5162730c 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -33,7 +33,8 @@ export default  {
             result: false,
             menu: [],
 			isMenuSelected:false,
-            
+			hasLvStundenplanEintraege: true,
+			lvEvaluierungMessage: "",
         }
     },
     mixins:[BsModal],
@@ -41,6 +42,7 @@ export default  {
         BsModal,
 		LvMenu,
     },
+	inject: ["studium_studiensemester"],
     methods:{
         
         hiddenModal: function(){
@@ -58,9 +60,32 @@ export default  {
 			} else {
 				this.isMenuSelected = true;
 			}
+
+			// check lv evaluierung info
+			if (this.studium_studiensemester) {
+				this.$fhcApi.factory.studium.getLvEvaluierungInfo(this.studium_studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+					.then(data => data.data)
+					.then(res => {
+						this.lvEvaluierungMessage = res.message;
+					})
+			}
+
+			// check if the lv has stundenplan entries for this studiensemester
+			if (this.studiensemester && this.event) {
+				return this.$fhcApi.factory.studium.getLvStundenplanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+					.then(data => data.data)
+					.then(res => {
+						if (Array.isArray(res) && res.length > 0) {
+							this.hasLvStundenplanEintraege = true;
+						} else {
+							this.hasLvStundenplanEintraege = false;
+						}
+					});
+			}
+			
         },
     },
-    mounted(){
+	mounted(){
         this.modal = this.$refs.modalContainer;
     },
 	beforeUnmount(){
@@ -68,7 +93,7 @@ export default  {
 	},
     template:/*html*/`
     <bs-modal :bodyClass="isMenuSelected ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
-        
+
 		<template #title>
             <template v-if="titel">
 				<span>{{titel}}</span>
@@ -80,8 +105,9 @@ export default  {
 
         </template>
         <template #default>
+			<div class="mb-4" v-if="lvEvaluierungMessage" v-html="lvEvaluierungMessage"></div>
 			<slot name="content"></slot>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvStundenplanEintraege="hasLvStundenplanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index c6de3113d..30d21ed1b 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -17,6 +17,15 @@ export default {
 			menu:null,
 		}
 	},
+	provide(){
+		return {
+			studium_studiengang : Vue.computed(()=> this.selectedStudiengang),
+			studium_studiensemester: Vue.computed(() => this.selectedStudiensemester),
+			studium_semester: Vue.computed(() => this.selectedSemester),
+			studium_studienordnung: Vue.computed(() => this.selectedStudienordnung),
+
+		}
+	},
 	components: {
 		LvUebersicht,
 	},
@@ -116,10 +125,11 @@ export default {
 			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
-			if(this.selectedLehrveranstaltung)
+			if(this.selectedLehrveranstaltung){
 				Vue.nextTick(()=>{
 					this.$refs.lvUebersicht.show();
 				})
+			}
 			
 		},
 		sortStudienSemester(studienSemester){
@@ -196,7 +206,7 @@ export default {
 		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
 		.then(data => data.data)
 		.then(res => {
-			this.	extractPropertyValues(res);
+			this.extractPropertyValues(res);
 		})
 
 	},

From b62c063a437c3b30eb0919a45a3ef6aadf7f8fde Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 May 2025 11:14:59 +0200
Subject: [PATCH 0170/1357] refactor(Searchbar Localstorage): adds the origin
 of the searchbar to the searchbaroptions and uses it for the localStorage
 keys

---
 public/js/apps/Cis.js                       |  1 +
 public/js/components/searchbar/searchbar.js | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b62592ebd..ac17038b5 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,6 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
+				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..0bcd4e893 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -84,11 +84,10 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem('searchstr',newSearchValue);
+			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 		},
     },
 	computed:{
-		
 		search_types_string(){
 			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
 				return this.searchsettings.types.join(' / ');
@@ -105,7 +104,7 @@ export default {
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if(Array.isArray(newValue)){
-				localStorage.setItem('searchtypes', JSON.stringify(newValue));
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -125,8 +124,8 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem('searchtypes')) {
-				result = JSON.parse(localStorage.getItem('searchtypes'));
+			if (localStorage.getItem(`${this.searchoptions.origin}_searchtypes`)) {
+				result = JSON.parse(`${this.searchoptions.origin}_searchtypes`);
 			}
 			return result;
 		},
@@ -138,7 +137,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem('searchstr') ?? '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

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

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

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

From 9d4568e15eea009573960a8edb56bc2c79f57f4f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 May 2025 09:58:08 +0200
Subject: [PATCH 0172/1357] client side placementtest handling, filtering
 Dropdowns placementtests, Phrases, show future Placementtests, open
 Reihungstestverwaltung

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 209 ++++++++++-
 application/models/crm/Reihungstest_model.php | 222 ++++++++++--
 .../models/person/Benutzergruppe_model.php    |  12 +
 application/models/testtool/Ablauf_model.php  |  27 ++
 application/views/Studentenverwaltung.php     |   5 +-
 public/js/api/factory/stv/admissionDates.js   |  41 ++-
 .../js/components/Stv/Studentenverwaltung.js  |   5 +-
 .../Details/Aufnahmetermine.js                |   2 +-
 .../Aufnahmetermine/Aufnahmetermine.js        | 338 +++++++++++++-----
 .../Aufnahmetermine/HeaderReihungstest.js     | 145 +++++++-
 rdf/reihungstest.rdf.php                      |   5 +
 system/phrasesupdate.php                      | 280 +++++++++++++++
 12 files changed, 1157 insertions(+), 134 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 6b0356bc3..538626789 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -14,9 +14,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
-			'getListPlacementTests' => ['admin:rw', 'assistenz:rw'],
-			'getListStudyPlans' => ['admin:rw', 'assistenz:rw'],
-
+			'getListPlacementTests' => ['admin:r', 'assistenz:r'],
+			'getListStudyPlans' => ['admin:r', 'assistenz:r'],
+			'loadDataRtPrestudent' => ['admin:r', 'assistenz:r'],
+			'insertOrUpdateDataRtPrestudent' => ['admin:r', 'assistenz:r'],
+			'loadAufnahmegruppen' => ['admin:r', 'assistenz:r'],
+			'getResultReihungstest' => ['admin:r', 'assistenz:r'],
+			'getZukuenftigeReihungstestStg' => ['admin:r', 'assistenz:r'],
 		]);
 
 		// Load Libraries
@@ -169,7 +173,8 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'punkte' => $_POST['punkte'],
 				'insertamum' => date('c'),
 				'insertvon' => $authUID,
-		]);
+			]
+		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -186,9 +191,53 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getListPlacementTests()
+	public function getListPlacementTests($prestudent_id)
 	{
-		$result = $this->ReihungstestModel->getAllReihungstests();
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//get studienplan array
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$this->PrestudentstatusModel->addSelect('*');
+		$this->PrestudentstatusModel->addSelect('sp.studienplan_id');
+
+		$this->PrestudentstatusModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => 'Interessent'
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$studienplan_arr = [];
+		$include_ids = [];
+		foreach ($data as $item)
+		{
+			if($item->studienplan_id != null)
+				$studienplan_arr[] = $item->studienplan_id;
+		}
+
+		//get Placementtests Person
+		$person_id = $this->_getPersonId($prestudent_id);
+		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
+
+		$dataRt = $this->getDataOrTerminateWithError($resultRt);
+
+		foreach ($dataRt as $item)
+		{
+			if(!in_array($item->studienplan_id, $studienplan_arr))
+				$studienplan_arr[] = $item->studienplan_id;
+			if(!in_array($item->rt_id, $include_ids) && ($item->rt_id != null))
+				$include_ids[] = $item->rt_id;
+		}
+
+		$result = $this->ReihungstestModel->getReihungstestByStudyPlanAndIds($studienplan_arr, $include_ids);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -196,12 +245,156 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 	public function getListStudyPlans($person_id)
 	{
-		$this->load->model('organisation/Studienplan_model','StudienplanModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
-		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);;
+		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
+	public function loadDataRtPrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect(["reihungstestangetreten"]);
+		$this->PrestudentModel->addSelect(["rt_gesamtpunkte"]);
+		$this->PrestudentModel->addSelect(["aufnahmegruppe_kurzbz"]);
+		$result = $this->PrestudentModel->loadWhere(
+			array('prestudent_id' => $prestudent_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertOrUpdateDataRtPrestudent()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$formData = $this->input->post('formData');
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+		$_POST['rt_gesamtpunkte'] =
+			(isset($formData['rt_gesamtpunkte']) && !empty($formData['rt_gesamtpunkte']))
+				? $formData['rt_gesamtpunkte']
+				: null;
+		$_POST['reihungstestangetreten'] =
+			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
+				? $formData['reihungstestangetreten']
+				: null;
+		$_POST['aufnahmegruppe_kurzbz'] =
+			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
+				? $formData['aufnahmegruppe_kurzbz']
+				: null;
+
+		$this->form_validation->set_rules('rt_gesamtpunkte', 'Rt_gesamtpunkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Rt_gesamtpunkte'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->update(
+			[
+				'prestudent_id' => $prestudent_id,
+			],
+			[
+				'reihungstestangetreten' => $_POST['reihungstestangetreten'],
+				'rt_gesamtpunkte' => $_POST['rt_gesamtpunkte'],
+				'aufnahmegruppe_kurzbz' => $_POST['aufnahmegruppe_kurzbz'],
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAufnahmegruppen()
+	{
+		$uid = $this->input->get('uid');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$result = $this->BenutzergruppeModel->loadAufnahmegruppen($uid, $studiensemester_kurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(($data));
+	}
+
+	public function getResultReihungstest()
+	{
+		$person_id = $this->input->get('person_id');
+		$punkte = $this->input->get('punkte');
+		$reihungstest_id = $this->input->get('reihungstest_id');
+
+		if(!$reihungstest_id)
+		{
+			$this->terminateWithSuccess(null);
+		}
+
+		//for gewichtung
+		$studiengang_kz = $this->input->get('studiengang_kz');
+
+		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$weightedArray = [];
+		foreach ($data as $abl)
+		{
+			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
+		}
+
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
+
+/*		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getZukuenftigeReihungstestStg()
+	{
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		if(!$studiengang_kz)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->ReihungstestModel->getZukuenftigeReihungstestStg($studiengang_kz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	private function _getPersonId($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
+	}
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index 2eb08ee86..a685b01cd 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -530,14 +530,15 @@ class Reihungstest_model extends DB_Model
 			  tbl_reihungstest.max_teilnehmer,
 			  tbl_reihungstest.oeffentlich,
 			  tbl_reihungstest.freigeschaltet,
-			  tbl_reihungstest.studiensemester_kurzbz,
+			  tbl_reihungstest.studiensemester_kurzbz as studiensemester,
 			  tbl_reihungstest.stufe,
 			  tbl_reihungstest.anmeldefrist,
 			  tbl_reihungstest.aufnahmegruppe_kurzbz,
 			  tbl_studiengang.typ,
 			  UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
 			  so.studiengangbezeichnung,
-				  so.studiengangbezeichnung_englisch
+			  so.studiengangbezeichnung_englisch,
+			  so.studiengangkurzbzlang
 			FROM
 			  public.tbl_rt_person
 			JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
@@ -552,35 +553,208 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all placement tests
-	 * @return array Returns object array with data of placement tests
+	 * 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
 	 */
-	//TODO(Manu) finish Details
-	public function getAllReihungstests()
+	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
 	{
-		$query = '
-			SELECT * FROM public.tbl_reihungstest
-			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
-		--	JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-		--	JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
-			ORDER BY datum DESC NULLS LAST, uhrzeit
-		';
+		$parametersArray = array($reihungstest_id);
 
-		return $this->execQuery($query);
+		$qry =  "
+				SELECT DISTINCT ON (vw_auswertung_ablauf.gebiet_id) gebiet_id,
+					vw_auswertung_ablauf.*,
+					tbl_studiengang.typ
+				FROM
+					testtool.vw_auswertung_ablauf
+				JOIN
+					public.tbl_studiengang USING (studiengang_kz)
+				WHERE
+					reihungstest_id = ? ";
+
+		//using prestudent Status to avoid to get the sum of more than 1 placement tests
+		$qry .= "
+				AND prestudent_id = (
+					SELECT
+						prestudent_id
+					FROM
+						public.tbl_rt_person
+					JOIN
+						public.tbl_prestudent USING(person_id)
+					JOIN
+						public.tbl_prestudentstatus USING (prestudent_id, studienplan_id)
+					JOIN
+						tbl_reihungstest ON (
+							tbl_rt_person.rt_id = tbl_reihungstest.reihungstest_id
+						)
+					WHERE
+						tbl_rt_person.person_id = ?
+					AND
+						tbl_rt_person.rt_id = ?
+					AND
+						tbl_prestudentstatus.status_kurzbz = 'Interessent'
+					AND
+						tbl_prestudentstatus.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+					ORDER BY tbl_reihungstest.datum DESC, tbl_prestudent.priorisierung ASC LIMIT 1
+				)
+		";
+		array_push($parametersArray, $person_id);
+		array_push($parametersArray, $reihungstest_id);
+
+		$resultRtPerson = $this->execQuery($qry, $parametersArray);
+
+		$ergebnis = 0;
+		$summeGewicht = 0;
+
+		foreach ($resultRtPerson->retval as $row)
+		{
+			$prozent = 0;
+			if($row->punkte>=$row->maxpunkte)
+			{
+				$prozent = 100;
+				$row->punkte = $row->maxpunkte;
+			}
+			else
+				$prozent = (($row->punkte + $row->offsetpunkte)/($row->maxpunkte + $row->offsetpunkte))*100;
+
+			if($punkte == 'true')
+			{
+				if($row->punkte)
+				{
+					$ergebnis += $row->punkte;
+				}
+			}
+			else
+			{
+				if ($row->punkte)
+				{
+					$gew = isset($weightedArray[$row->gebiet_id]) ? $weightedArray[$row->gebiet_id] : 1;
+					$ergebnis += $prozent * $gew;
+					$summeGewicht += $gew;
+				}
+			}
+		}
+		$return = $summeGewicht > 0
+					? number_format($ergebnis/$summeGewicht, 4, '.', '')
+					: number_format($ergebnis, 4, '.', '');
+
+		return $return;
 	}
 
-	public function getReihungstestsPs($prestudent_id)
+	/**
+	 * returns Reihungstests for given studyplans and include_ids
+	 *
+	 * @param Array $studienplan_arr array of studienplaene
+	 * @param Array $include_ids array of include_ids
+	 * @return Array List of Reihungstests
+	 */
+	public function getReihungstestByStudyPlanAndIds($studienplan_arr, $include_ids = null)
 	{
-		$query = '
-			SELECT * FROM public.tbl_reihungstest
-			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
-			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
-			 ORDER BY datum DESC, uhrzeit
-		';
+		$studienplan_ids_string = implode(',', $studienplan_arr);
+		$studienplan_arr = explode(',', $studienplan_ids_string);
 
-		return $this->execQuery($query);
+		$parametersArray = array($studienplan_arr);
+
+		$qry = "
+				SELECT
+					distinct a.*,
+					CASE EXTRACT(DOW FROM a.datum)
+						WHEN 0 THEN 'So'
+						WHEN 1 THEN 'Mo'
+						WHEN 2 THEN 'Di'
+						WHEN 3 THEN 'Mi'
+						WHEN 4 THEN 'Do'
+						WHEN 5 THEN 'Fr'
+						WHEN 6 THEN 'Sa'
+					  END AS wochentag,
+				    sg.kurzbzlang as stg,
+					(
+						SELECT count(*) FROM public.tbl_rt_person
+						WHERE rt_id = a.reihungstest_id
+					) as angemeldete_teilnehmer
+				FROM
+					public.tbl_reihungstest a
+					JOIN public.tbl_rt_studienplan USING(reihungstest_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+				WHERE studienplan_id IN ?";
+
+		if($include_ids && is_array($include_ids) && count($include_ids) > 0)
+		{
+			$include_ids_string = implode(',', $include_ids);
+			$include_ids = explode(',', $include_ids_string);
+
+			array_push($parametersArray, $include_ids);
+
+			$qry .= "OR reihungstest_id in ?";
+		}
+		$qry .= "ORDER BY a.datum DESC";
+
+		return $this->execQuery($qry, $parametersArray);
 	}
+	/**
+	 * returns Reihungstests for given studyplans and include_ids
+	 *
+	 * @param Integer $studiengang_kz
+	 * @param $include_id optional (here null)
+	 * @return Array List of Reihungstests
+	 */
+	public function getZukuenftigeReihungstestStg($studiengang_kz, $include_id = null)
+	{
+		$parametersArray = array($studiengang_kz, $studiengang_kz, $include_id);
 
+		$qry = "
+					SELECT *,
+					CASE EXTRACT(DOW FROM a.datum)
+						WHEN 0 THEN 'So'
+						WHEN 1 THEN 'Mo'
+						WHEN 2 THEN 'Di'
+						WHEN 3 THEN 'Mi'
+						WHEN 4 THEN 'Do'
+						WHEN 5 THEN 'Fr'
+						WHEN 6 THEN 'Sa'
+					  END AS wochentag,
+			(
+				SELECT count(*) FROM public.tbl_prestudent
+				WHERE reihungstest_id=a.reihungstest_id
+			) as angemeldete_teilnehmer
+		FROM
+			(
+			SELECT *, '1' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE
+				datum>=now()-'1 days'::interval AND studiengang_kz=?
+			UNION
+			SELECT *, '2' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE datum>=now()-'1 days'::interval AND studiengang_kz!=?
+			UNION
+			SELECT *, '0' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE reihungstest_id=?
+			ORDER BY sortierung, stg, datum
+					) a
+			";
 
-}
\ No newline at end of file
+		return $this->execQuery($qry, $parametersArray);
+	}
+}
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
index fba797641..271402ffe 100644
--- a/application/models/person/Benutzergruppe_model.php
+++ b/application/models/person/Benutzergruppe_model.php
@@ -33,4 +33,16 @@ class Benutzergruppe_model extends DB_Model
 		$uids = (hasData($res)) ? getData($res) : array();
 		return $uids;
 	}
+
+	/**
+	 * Laedt die Aufnahmegruppe(n) in Abhängigkeit von User und Studiensemester
+	 * @param uid, gruppe_kurzbz, studiensemester_kurzbz
+	 * @return array
+	 */
+	public function loadAufnahmegruppen($uid, $stsem)
+	{
+		$query = "
+				SELECT * FROM tbl_gruppe WHERE aufnahmegruppe=true;";
+		return $this->execReadOnlyQuery($query);
+	}
 }
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
index 748926658..d6d6ebe74 100644
--- a/application/models/testtool/Ablauf_model.php
+++ b/application/models/testtool/Ablauf_model.php
@@ -11,4 +11,31 @@ class Ablauf_model extends DB_Model
 		$this->dbTable = 'testtool.tbl_ablauf';
 		$this->pk = 'ablauf_id';
 	}
+
+	/**
+	 * Returns Weighting of the respective ranking test areas
+	 * @param $studiengang_kz Studiengang_kz
+	 * @param $semester Integer optional
+	 * @return array of weightings per ranking test areas of given studiengang
+	 */
+	public function getAblaufGebieteAndGewichte($studiengang_kz, $semester = null)
+	{
+		$parametersArray = array($studiengang_kz);
+
+		$qry =  "
+				SELECT
+				tbl_ablauf.gebiet_id, tbl_ablauf.gewicht
+				FROM
+					testtool.tbl_ablauf
+				WHERE
+					tbl_ablauf.studiengang_kz= ?";
+
+		if($semester)
+		{
+			$qry .= " AND semester = ?";
+			array_push($parametersArray, $semester);
+
+		}
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index c10dc475a..8e4c523d6 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -37,7 +37,10 @@ $configArray = [
 	//replaced by possibility to hide each formular field via config stv.php
 	#'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
 	#'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
-	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT
+	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT,
+	'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,
 ];
 ?>
 
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index a5b0697da..a6d743276 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -22,10 +22,10 @@ export default {
 			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
-	getListPlacementTests(){
+	getListPlacementTests(prestudent_id){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/' + prestudent_id,
 		};
 	},
 	getListStudyPlans(person_id){
@@ -59,6 +59,41 @@ export default {
 			method: 'post',
 			url: 'api/frontend/v1/stv/aufnahmetermine/deleteAufnahmetermin/' + rt_person_id
 		};
-	}
+	},
+	loadDataRtPrestudent(prestudent_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadDataRtPrestudent/' + prestudent_id,
+		};
+	},
+	saveDataRtPrestudent(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/insertOrUpdateDataRtPrestudent/',
+			params
+		};
+	},
+	loadAufnahmegruppen(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadAufnahmegruppen/',
+			params
+		};
+	},
+	getResultReihungstest(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getResultReihungstest/',
+			params
+		};
+	},
+	loadFutureReihungstests(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getZukuenftigeReihungstestStg/',
+			params
+		};
+	},
+
 
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 248cfd55c..36340a767 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -65,7 +65,10 @@ export default {
 			defaultSemester: this.defaultSemester,
 			$reloadList: () => {
 				this.$refs.stvList.reload();
-			}
+			},
+			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
+			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
+			configUseReihungstestPunkte: this.config.useReihungstestPunkte
 		}
 	},
 	data() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
index 4ad8c6002..53ae524e0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
@@ -20,7 +20,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-mobility h-30 d-flex flex-column">
-		<header-placement></header-placement>
+		<header-placement :student="modelValue"></header-placement>
 		<admission-dates ref="tbl_admission_dates" :student="modelValue"></admission-dates>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 5fe32e885..cf8a47dd3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -14,10 +14,22 @@ export default {
 		FormInput
 	},
 	inject: {
+		allowUebernahmePunkte: {
+			from: 'configAllowUebernahmePunkte',
+			default: true
+		},
+		//if true use punkte, false: use percentage
+		useReihungstestPunkte: {
+			from: 'configUseReihungstestPunkte',
+			default: true
+		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
 		},
+		cisRoot: {
+			from: 'cisRoot'
+		},
 	},
 	props: {
 		student: Object
@@ -31,9 +43,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "rt_id", field: "rt_id"},
-					{title: "rt_person_id", field: "rt_person_id"},
-					{title: "person_id", field: "person_id"},
+					{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();
@@ -48,7 +60,7 @@ export default {
 						}
 					},
 					{title: "stufe", field: "stufe"},
-					{title: "studiensemester", field: "studiensemester_kurzbz"},
+					{title: "studiensemester", field: "studiensemester"},
 					{title: "anmerkung", field: "anmerkung", visible: false},
 					{title: "anmeldedatum", field: "anmeldedatum", visible: false,
 						formatter: function (cell) {
@@ -64,11 +76,20 @@ export default {
 						}
 					},
 					{title: "punkte", field: "punkte"},
-					{title: "teilgenommen", field: "teilgenommen"},
+					{
+						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_kuerzel", field: "stg_kuerzel"},
+					{title: "stg", field: "studiengangkurzbzlang"},
+					{title: "Stg", field: "stg_kuerzel"},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -106,21 +127,77 @@ export default {
 				index: 'aufnahmetermin_id',
 				persistenceID: 'stv-details-table_admission-dates'
 			},
-			tabulatorEvents: [],
+			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: []
+			listStudyPlans: [],
+			filterOnlyFutureTestsSet: false,
+			filteredPlacementTests: []
 		}
 	},
 	methods: {
 		actionNewPlacementTest() {
 			this.resetForm();
 			this.statusNew = true;
+			this.formData.anmeldedatum = new Date();
 			this.$refs.placementTestModal.show();
 		},
 		actionEditPlacementTest(rt_person_id) {
-			console.log("edit Test " + rt_person_id);
 			this.resetForm();
 			this.statusNew = false;
 			this.loadPlacementTest(rt_person_id);
@@ -159,7 +236,6 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		loadPlacementTest(rt_person_id) {
-			console.log("load Test " + rt_person_id);
 			return this.$api
 				.call(ApiStvAdmissionDates.loadPlacementTest(rt_person_id))
 				.then(result => {
@@ -185,7 +261,6 @@ export default {
 				});
 		},
 		deletePlacementTest(rt_person_id) {
-			console.log("delete Test" + rt_person_id);
 			return this.$api
 				.call(ApiStvAdmissionDates.deletePlacementTest(rt_person_id))
 				.then(response => {
@@ -196,30 +271,72 @@ export default {
 					this.reload();
 				});
 		},
-		resetForm() {
-			console.log("resetForm");
-			this.formData = {};
-			/*
+		getResultReihungstest(reihungstest_id){
+			const paramsRt = {
+				reihungstest_id: reihungstest_id,
+				person_id: this.student.person_id,
+				punkte: this.useReihungstestPunkte,
+				studiengang_kz: this.student.studiengang_kz
+			};
 
-			this.formData.von = new Date();
-			this.formData.bis = new Date();
-			this.formData.mobilitaetsprogramm_code = 7;
-			this.formData.nation_code = 'A';
-			this.formData.herkunftsland_code = 'A';
-			this.formData.rt_id = null;
-			this.formData.localPurposes = [];
-			this.formData.localSupports = [];
-			this.formData.lehrveranstaltung_id = '',
-				this.formData.lehreinheit_id = '',
-				this.statusNew = true;
-			this.listLes = [];*/
+			return this.$api
+				.call(ApiStvAdmissionDates.getResultReihungstest(paramsRt))
+				.then(response => {
+					this.formData.punkte = response.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadFutureReihungstests(){
+			const arrayReihungstestIds = this.listPlacementTests.map(item => item.reihungstest_id);
+			const paramsRt = {
+				studiengang_kz: this.student.studiengang_kz,
+				arrayReihungstestIds : arrayReihungstestIds
+			};
+
+			return this.$api
+				.call(ApiStvAdmissionDates.loadFutureReihungstests(paramsRt))
+				.then(response => {
+					this.filteredPlacementTests = response.data;
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'filterOnlyFutureActive'));
+					this.$refs.filterButton.className = 'btn btn-secondary w-100';
+					this.$refs.filterButton.title = this.$p.t('ui', 'alleAnzeigen');
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		toggleFilter(){
+			this.filterOnlyFutureTestsSet = !this.filterOnlyFutureTestsSet;
+
+			if(this.filterOnlyFutureTestsSet) {
+				this.loadFutureReihungstests();
+			}
+			else
+			{
+				this.filteredPlacementTests = this.listPlacementTests;
+				this.$refs.filterButton.className = 'btn btn-outline-secondary w-100';
+				this.$refs.filterButton.title = this.$p.t('admission', 'loadZukuenftigeRT');}
+		},
+		openAdministrationPlacementTest(reihungstest_id){
+			let link = this.cisRoot + 'vilesci/stammdaten/reihungstestverwaltung.php';
+			if(reihungstest_id){
+				link += '?reihungstest_id=' + reihungstest_id;
+			}
+			window.open(link, '_blank');
+		},
+		resetForm() {
+			this.formData = {};
 		},
 	},
 	created() {
 		this.$api
-			.call(ApiStvAdmissionDates.getListPlacementTests())
+			.call(ApiStvAdmissionDates.getListPlacementTests(this.student.prestudent_id))
 			.then(result => {
-				this.listPlacementTests = result.data;
+				this.listPlacementTests = this.filteredPlacementTests = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -232,7 +349,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-admission-table h-100 pb-3">
-		<h4>Allgemein</h4>
+		<h4>{{$p.t('admission', 'allgemein')}}</h4>
 		
 		<core-filter-cmpt
 			ref="table"
@@ -247,14 +364,8 @@ export default {
 			>
 		</core-filter-cmpt>
 		
-		{{formData}}
-		
-<!--		{{student}}-->
-		
-<!--		{{listPlacementTests}}-->
-		
 		<!--Modal: placementTestModal-->
-		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable">
+		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable modal-lg">		
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('admission', 'admission_new')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('admission', 'admission_edit')}}</p>
@@ -262,43 +373,72 @@ export default {
 
 
 			<form-form ref="formPlacementTest" @submit.prevent>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-placementtest"
-						:label="$p.t('lehre', 'reihungstest')"
-						type="select"
-						v-model="formData.rt_id"
-						name="reihungstest_id"
-						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
-						<option
-							v-for="test in listPlacementTests"
-							:key="test.reihungstest_id"
-							:value="test.reihungstest_id"
+			
+				<div class="row mb-3 g-2">
+					<div class="col-10">
+						<form-input
+							container-class="stv-details-admission-placementtest"
+							:label="$p.t('lehre', 'reihungstest')"
+							type="select"
+							v-model="formData.rt_id"
+							name="reihungstest_id"
 							>
-							{{test.reihungstest_id}} {{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.kurzbzlang}} {{test.datum}} {{test.uhrzeit}}
-							{{test.anmerkung}} (x/{{test.max_teilnehmer}}) {{test.rt_id}}
-						</option>
-					</form-input>
+							<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="test in filteredPlacementTests"
+								:key="test.reihungstest_id"
+								:value="test.reihungstest_id"
+								>
+								{{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.stg}} {{test.datum}} {{test.uhrzeit}}
+								{{test.anmerkung}} <span v-if="test.max_teilnehmer">({{test.angemeldete_teilnehmer}}/{{test.max_teilnehmer}})</span>
+								<span v-if="test.datum">({{test.wochentag}})</span>
+							</option>
+						</form-input>			
+					</div>
+					
+					<div class="col-1">
+						<label class="form-label" style="color:transparent;">filter</label>
+						<button 
+							class="btn btn-outline-secondary w-100"
+							ref="filterButton"
+							@click="toggleFilter" 
+							:title="$p.t('admission', 'loadZukuenftigeRT')"
+							>
+								<i class="fa fa-filter"></i>
+							</button>
+					</div>						
+					<div class="col-1">
+						<label class="form-label" style="color:transparent;">edit</label>
+						<button 
+							class="btn btn-outline-secondary w-100" 
+							@click="openAdministrationPlacementTest(formData.rt_id)" 
+							:title="$p.t('admission', 'headerRTVerwaltung')"
+							>
+							<i class="fa fa-edit"></i>
+						</button>
+					</div>	
+								
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-anmeldedatum"
-						:label="$p.t('admission', 'anmeldundRtAm')"
-						type="DatePicker"
-						v-model="formData.anmeldedatum"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						name="anmeldedatum"
-						:teleport="true"
-						>
-					</form-input>
-				</div>				
+					<div class="col-7">
+						<form-input
+							container-class="stv-details-admission-anmeldedatum"
+							:label="$p.t('admission', 'anmeldundRtAm')"
+							type="DatePicker"
+							v-model="formData.anmeldedatum"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							name="anmeldedatum"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+				</div>		
 				
 				<div class="row mb-3">
+					<div class="mt-2">
 						<form-input
 							container-class="stv-details-admission-teilgenommen"
 							type="checkbox"
@@ -307,41 +447,49 @@ export default {
 							v-model="formData.teilgenommen"
 						>
 						</form-input>
+					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-studyplan"
-						:label="$p.t('lehre', 'studienplan')"
-						type="select"
-						v-model="formData.studienplan_id"
-						name="studienplan_id"
-						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
-						<option
-							v-for="stplan in listStudyPlans"
-							:key="stplan.studienplan_id"
-							:value="stplan.studienplan_id"
+					<div class="col-7">
+						<form-input
+							container-class="stv-details-admission-studyplan"
+							:label="$p.t('lehre', 'studienplan')"
+							type="select"
+							v-model="formData.studienplan_id"
+							name="studienplan_id"
 							>
-							{{stplan.bezeichnung}}
-						</option>
-					</form-input>
+							<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="stplan in listStudyPlans"
+								:key="stplan.studienplan_id"
+								:value="stplan.studienplan_id"
+								>
+								{{stplan.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
 				</div>				
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-points"
-						:label="$p.t('exam', 'punkte')"
-						type="text"
-						v-model="formData.punkte"
-						name="punkte"
-						>
-					</form-input>	
-				</div>
-				
-				<!--TODO(Manu) Reihungstestergebnis holen-->
-				
+					<div class="col-3">
+						<form-input
+							container-class="stv-details-admission-points"
+							:label="$p.t('exam', 'punkte')"
+							type="text"
+							v-model="formData.punkte"
+							name="punkte"
+							>
+						</form-input>
+						
+					</div>
 				
+					<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>
+					</div>
+
+				</div>				
 		</form-form>
 		
 		<template #footer>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index 529979b3c..fcda41f34 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -1,13 +1,156 @@
+import FormForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+
 export default {
 	name: 'HeaderPlacement',
+	components: {
+		FormForm,
+		FormInput
+	},
+	inject: {
+		showAufnahmegruppen: {
+			from: 'configShowAufnahmegruppen',
+			default: false
+		},
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
 	data(){
 		return {
 			statusNew: true,
+			formData: {
+				aufnahmegruppe_kurzbz: null
+			},
+			listAufnahmetermine: [],
+			listAufnahmegruppen: []
+		}
+	},
+	methods: {
+		saveDataRt(prestudent_id) {
+			const dataToSend = {
+				prestudent_id: prestudent_id,
+				formData: this.formData
+			};
+			return this.$api
+				.call(ApiStvAdmissionDates.saveDataRtPrestudent(dataToSend))
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		calculateTotalPoints() {
+			return this.$api
+				.call(ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id))
+				.then(result => {
+					this.listAufnahmetermine = result.data;
+
+					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;
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		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
+			.call(ApiStvAdmissionDates.loadDataRtPrestudent(this.student.prestudent_id))
+			.then(result => {
+				this.formData = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		if(this.showAufnahmegruppen)
+		{
+			const paramsGroup = {
+				uid: this.student.uid,
+				semester: this.currentSemester
+			};
+			this.$api
+				.call(ApiStvAdmissionDates.loadAufnahmegruppen(paramsGroup))
+				.then(result => {
+					this.listAufnahmegruppen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	template: `
 		<div class="stv-details-admission-header-placement h-100 pb-3">
-			<h4>Studiengang</h4>
+			<h4>{{ $p.t('lehre', 'studiengang') }}</h4>
+						
+			<form-form class="mt-3" ref="formRtGesamtData" @submit.prevent>
+				<div v-if="showAufnahmegruppen" class="row mb-3">
+					<div class="col-1">
+						<label>{{ $p.t('lehre', 'gruppe') }}</label>		
+					</div>
+					<div class="col-3">
+						<form-input
+							container-class="stv-details-admission-header-placement-aufnahmegruppe"
+							type="select"
+							name="aufnahmegruppe_kurzbz"
+							v-model="formData.aufnahmegruppe_kurzbz"
+						>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="gruppe in listAufnahmegruppen"
+							:key="gruppe.gruppe_kurzbz"
+							:value="gruppe.gruppe_kurzbz"
+							>
+							{{gruppe.bezeichnung}} - {{gruppe.gruppe_kurzbz}}
+						</option>
+						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+
+					<div class="col-3">
+						<form-input
+							container-class="form-check stv-details-admission-header-placement-rtangetreten"
+							type="checkbox"
+							name="reihungstestangetreten"
+							:label="$p.t('admission','rtAbsolviert')"
+							v-model="formData.reihungstestangetreten"
+						>
+						</form-input>	
+					</div>
+					<div class="col-2">
+						<label>{{ $p.t('admission', 'gesamtpunkte') }}</label>		
+					</div>
+					<div class="col-2">
+						<form-input
+							container-class="stv-details-admission-header-placement-gesamtpunkte"
+							type="text"
+							name="rt_gesamtpunkte"
+							v-model="formData.rt_gesamtpunkte"
+						>
+						</form-input>
+					</div>
+					<div class="col-1">
+						<button class="btn btn-outline-primary" @click="saveDataRt(student.prestudent_id)"> {{$p.t('ui', 'speichern')}}</button>		
+					</div>
+					<div class="col-3">
+						<button class="btn btn-outline-primary" @click="calculateTotalPoints"> {{$p.t('admission', 'gesamtpunkteBerechnen')}}</button>			
+					</div>
+							
+				</div>
+			</form-form>
 		
 		</div>
 	`
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
index cb4ebf8dc..15860d025 100644
--- a/rdf/reihungstest.rdf.php
+++ b/rdf/reihungstest.rdf.php
@@ -73,18 +73,23 @@ $rt = new reihungstest();
 
 if(isset($_GET['include_id']) && isset($_GET['studiengang_kz']))
 {
+	error_log("in zweig get zukuenfigte");
 	$include_id=$_GET['include_id'];
+	error_log("include_Id:" . $include_id);
 	$studiengang_kz=$_GET['studiengang_kz'];
+	error_log(" stg_kz: " . $studiengang_kz);
 	$rt->getZukuenftige($include_id, $studiengang_kz);
 }
 elseif(isset($_GET['prestudent_id']))
 {
 	$include_ids=array();
+	error_log("prestudent");
 	$prestudent = new prestudent();
 	$prestudent->getPrestudentRolle($_GET['prestudent_id'], 'Interessent');
 	$studienplan_arr = array();
 	foreach($prestudent->result as $row)
 	{
+		error_log( $row->studienplan_id);
 		$studienplan_arr[] = $row->studienplan_id;
 	}
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 66fd48a8b..2dc464259 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41536,6 +41536,286 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'rtAbsolviert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstestverfahren absolviert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placement test procedure completed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'gesamtpunkte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtpunkte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Total Points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'gesamtpunkteBerechnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtpunkte berechnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Calculate total points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'allgemein',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Generally',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'headerRTVerwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zur Reihungstestverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Administration Placement Test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'loadZukuenftigeRT',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur zukünftige Reihungstests laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show future placement tests only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'getRTErgebnis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstestergebnis holen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Get placement test result',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'filterOnlyFutureActive',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter \'Nur zukünftige Reihungstest anzeigen\' aktiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter \'Only show future placement tests\' active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reihungstest_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstest ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placementtest ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reihungstest_person_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'RtPerson ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'PtPerson ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'stufe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stufe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'anmeldedatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmeldedatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Registration Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'teilgenommen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'teilgenommen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'participated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'stg_kurz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kürzel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'shorthand',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From a6180b3d59b85b851ca778fbaec05bdc40131fbf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 8 May 2025 12:34:35 +0200
Subject: [PATCH 0173/1357] feature(Searchbar Storage): uses UUID's to store
 searchstr and searchtypes and warn user about missing searchoption origin
 property

---
 public/js/components/searchbar/searchbar.js | 33 +++++++++++++++++----
 public/js/helpers/UUID.js                   |  8 +++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 public/js/helpers/UUID.js

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 0bcd4e893..31f45455a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
 import prestudent from "./prestudent.js";
+import uuid from "../../helpers/UUID.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -84,7 +85,7 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr_${uuid}`,newSearchValue);
 		},
     },
 	computed:{
@@ -104,7 +105,7 @@ export default {
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if(Array.isArray(newValue)){
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes_${uuid}`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -113,6 +114,10 @@ export default {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
 			toggle: false
 		});
+
+		if (!this.searchoptions.origin){
+			console.warn("No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.");
+		}
 	},
 	updated() {
 		if(this.showresult) {
@@ -122,10 +127,28 @@ export default {
 		}
 	},
     methods: {
+		getStorageValue: function (key, sessionStorage = false){
+			const regex = new RegExp(`${this.searchoptions.origin}_${key}`);
+			if(sessionStorage){
+				for (let i = 0; i < sessionStorage.length; i++) {
+					if (sessionStorage.key(i).match(regex)) {
+						return sessionStorage.getItem(sessionStorage.key(i));
+					}
+				}
+			}
+			else{
+				for (let i =0; i < localStorage.length; i++){
+					if (localStorage.key(i).match(regex)){
+						return localStorage.getItem(localStorage.key(i));
+					}
+				}
+			}
+		},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem(`${this.searchoptions.origin}_searchtypes`)) {
-				result = JSON.parse(`${this.searchoptions.origin}_searchtypes`);
+			let localStorageValue = this.getStorageValue('searchtypes');
+			if (localStorageValue) {
+				result = JSON.parse(localStorageValue);
 			}
 			return result;
 		},
@@ -137,7 +160,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
+			return this.getStorageValue("searchstr",true) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else
diff --git a/public/js/helpers/UUID.js b/public/js/helpers/UUID.js
new file mode 100644
index 000000000..1c08c1237
--- /dev/null
+++ b/public/js/helpers/UUID.js
@@ -0,0 +1,8 @@
+const uuid41 = () => {
+	const b = crypto.getRandomValues(new Uint16Array(8));
+	const d = [].map.call(b, a => a.toString(16).padStart(4, '0')).join('');
+	const vr = (((b[5] >> 12) & 3) | 8).toString(16);
+	return `${d.substr(0, 8)}-${d.substr(8, 4)}-4${d.substr(13, 3)}-${vr}${d.substr(17, 3)}-${d.substr(20, 12)}`;
+};
+
+export default uuid41;
\ No newline at end of file

From 233e768aad1b322fc2df54d0e8a0d58259f27a2f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 09:11:33 +0200
Subject: [PATCH 0174/1357] copy Function files to component

---
 .../frontend/v1/funktionen/FunctionsAPI.php   | 239 +++++++
 .../api/frontend/v1/funktionen/OrgAPI.php     | 153 +++++
 .../api/frontend/v1/stv/Config.php            |   5 +
 application/views/Studentenverwaltung.php     |   2 +
 public/js/api/factory/funktionen.js           |  22 +
 public/js/api/factory/funktionen/person.js    |  68 ++
 public/js/components/Funktionen/Funktionen.js | 620 ++++++++++++++++++
 public/js/components/Funktionen/Modal.js      |  48 ++
 .../js/components/Funktionen/ModalDialog.js   |  69 ++
 public/js/components/Funktionen/OrgChooser.js |  69 ++
 public/js/components/Funktionen/Toast.js      |  47 ++
 .../Studentenverwaltung/Details/Funktionen.js |  28 +
 system/phrasesupdate.php                      |  25 +-
 13 files changed, 1394 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
 create mode 100644 application/controllers/api/frontend/v1/funktionen/OrgAPI.php
 create mode 100644 public/js/api/factory/funktionen.js
 create mode 100644 public/js/api/factory/funktionen/person.js
 create mode 100644 public/js/components/Funktionen/Funktionen.js
 create mode 100644 public/js/components/Funktionen/Modal.js
 create mode 100644 public/js/components/Funktionen/ModalDialog.js
 create mode 100644 public/js/components/Funktionen/OrgChooser.js
 create mode 100644 public/js/components/Funktionen/Toast.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js

diff --git a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
new file mode 100644
index 000000000..023100a6e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
@@ -0,0 +1,239 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class FunctionsAPI extends Auth_Controller
+{
+
+	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
+	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
+
+	public function __construct() {
+
+		//TODO(Manu) check permissions
+		parent::__construct(array(
+				'getAllFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getContractFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getCurrentFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getAllUserFunctions' => [FunctionsAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+			)
+		);
+		$this->load->library('AuthLib');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+	}
+
+
+
+	/*
+	 * return list of all functions
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getAllFunctions()
+	{
+		$sql = <<<EOSQL
+			SELECT
+				funktion_kurzbz AS value, beschreibung AS label
+			FROM
+				public.tbl_funktion
+			WHERE
+				aktiv = true
+			ORDER BY beschreibung ASC
+EOSQL;
+
+		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
+		if( hasData($fkts) )
+		{
+			$this->outputJson($fkts);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no contract relevant funktionen found');
+			return;
+		}
+	}
+
+	/*
+	 * return list of contract relevant functions
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getContractFunctions($mode='all')
+	{
+		$addwhere = '';
+		switch ($mode)
+		{
+			case 'zuordnung':
+				$addwhere = ' AND funktion_kurzbz LIKE \'%zuordnung%\'';
+				break;
+			case 'funktion':
+				$addwhere = ' AND funktion_kurzbz NOT LIKE \'%zuordnung%\'';
+				break;
+			case 'all':
+			default:
+				$addwhere = '';
+				break;
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				funktion_kurzbz AS value, beschreibung AS label
+			FROM
+				public.tbl_funktion
+			WHERE
+				aktiv = true AND vertragsrelevant = true
+				{$addwhere}
+			ORDER BY beschreibung ASC
+EOSQL;
+
+		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
+		if( hasData($fkts) )
+		{
+			$this->outputJson($fkts);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no contract relevant funktionen found');
+			return;
+		}
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getCurrentFunctions($uid, $companyOrgetkurzbz)
+	{
+		if( empty($uid) )
+		{
+			$this->outputJsonError('Missing Parameter <uid>');
+		}
+
+		if( empty($companyOrgetkurzbz) )
+		{
+			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				bf.benutzerfunktion_id AS value, f.beschreibung || ', '
+					|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
+					|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
+					|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
+					|| COALESCE(dvu.attachedtovb, '') AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz = ?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
+			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN (
+				SELECT
+					benutzerfunktion_id, ' [DV]' AS attachedtovb
+				FROM
+					"hr"."tbl_vertragsbestandteil_funktion"
+				GROUP BY
+					benutzerfunktion_id
+			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
+			WHERE bf.uid = ?
+			ORDER BY f.beschreibung ASC
+
+EOSQL;
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz, $uid));
+		if( hasData($benutzerfunktionen) )
+		{
+			$this->outputJson($benutzerfunktionen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid . ' and oe_kurzbz ' . $companyOrgetkurzbz );
+			return;
+		}
+	}
+
+	/*
+	 * return list of functions for a uid
+	 * as objects to be used in as datasource
+	 */
+	public function getAllUserFunctions($uid)
+	{
+		if( empty($uid) )
+		{
+			$this->outputJsonError('Missing Parameter <uid>');
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				dv.dienstverhaeltnis_id, 
+				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
+				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
+				f.beschreibung AS funktion_beschreibung,
+				bf.*,
+				fb.bezeichnung AS fachbereich_bezeichnung,
+			    CASE
+					WHEN
+						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
+					THEN
+						false
+					ELSE
+						true
+				END aktiv
+			FROM
+				public.tbl_benutzerfunktion bf
+			JOIN
+				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
+			JOIN
+				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+            JOIN
+				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
+			LEFT JOIN
+				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
+			LEFT JOIN
+				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
+			LEFT JOIN
+				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
+            WHERE
+				bf.uid = ?
+            ORDER BY
+				f.beschreibung, bf.datum_von ASC
+
+EOSQL;
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
+		if( hasData($benutzerfunktionen) )
+		{
+			$this->outputJson($benutzerfunktionen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid);
+			return;
+		}
+	}
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
new file mode 100644
index 000000000..f6cf5bdb8
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
@@ -0,0 +1,153 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class OrgAPI extends Auth_Controller
+{
+
+	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
+	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
+
+	public function __construct() {
+		parent::__construct(array(
+				'getOrgHeads' => OrgAPI::DEFAULT_PERMISSION,
+				'getOrgStructure' => OrgAPI::DEFAULT_PERMISSION,
+				'getOrgPersonen' => OrgAPI::DEFAULT_PERMISSION,
+				'getCompanyByOrget'  => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+				'getOrgetsForCompany' => OrgAPI::DEFAULT_PERMISSION,
+				'getUnternehmen' => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+			)
+		);
+		$this->load->library('AuthLib');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
+	}
+
+	// -----------------------------
+	// Organisation
+	// -----------------------------
+
+	function getOrgHeads()
+	{
+		$data = $this->OrganisationseinheitModel->getHeads();
+		return $this->outputJson($data);
+	}
+
+	function getOrgStructure()
+	{
+		$oe = $this->input->get('oe', TRUE);
+
+		$data = $this->OrganisationseinheitModel->getOrgStructure($oe);
+		return $this->outputJson($data);
+	}
+
+	function getOrgPersonen()
+	{
+		$oe = $this->input->get('oe', TRUE);
+
+		$data = $this->OrganisationseinheitModel->getPersonen($oe);
+		return $this->outputJson($data);
+	}
+
+
+
+
+	public function getCompanyByOrget($oe_kurzbz)
+	{
+
+		$sql = <<<EOSQL
+        WITH RECURSIVE unternehmen as
+        (
+                SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+                WHERE oe_kurzbz=?
+                UNION ALL
+                SELECT o.oe_kurzbz, o.oe_parent_kurzbz
+                FROM   public.tbl_organisationseinheit AS o
+                       INNER JOIN unternehmen u  ON u.oe_parent_kurzbz=o.oe_kurzbz
+        )
+        SELECT *
+        FROM unternehmen
+        WHERE oe_parent_kurzbz is null;
+EOSQL;
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($oe_kurzbz));
+		if( hasData($childorgets) )
+		{
+			$this->outputJson($childorgets);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $oe_kurzbz );
+			return;
+		}
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	{
+		if( empty($companyOrgetkurzbz) )
+		{
+			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
+			return;
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				oe.oe_kurzbz AS value,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz=?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC
+
+EOSQL;
+
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
+		if( hasData($childorgets) )
+		{
+			$this->outputJson($childorgets);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $companyOrgetkurzbz );
+			return;
+		}
+	}
+
+
+	public function getUnternehmen()
+	{
+		$this->OrganisationseinheitModel->resetQuery();
+		$this->OrganisationseinheitModel->addSelect('oe_kurzbz AS value, bezeichnung AS label, \'false\'::boolean AS disabled');
+		$this->OrganisationseinheitModel->addOrder('bezeichnung', 'ASC');
+		$unternehmen = $this->OrganisationseinheitModel->loadWhere('oe_parent_kurzbz IS NULL');
+		if( hasData($unternehmen) )
+		{
+			$this->outputJson($unternehmen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no companies (orgets with parent NULL) found');
+			return;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..d37a6d6ec 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['functions'] = [
+			'title' => $this->p->t('stv', 'tab_functions'),
+			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index c10dc475a..398b921d2 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -15,11 +15,13 @@
 			'notiz',
 		),
 		'customCSSs' => [
+			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css'
 		],
 		'customJSs' => [
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
diff --git a/public/js/api/factory/funktionen.js b/public/js/api/factory/funktionen.js
new file mode 100644
index 000000000..c1f4efa29
--- /dev/null
+++ b/public/js/api/factory/funktionen.js
@@ -0,0 +1,22 @@
+/**
+ * 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 "./funktionen/person.js";
+
+export default {
+	person
+};
\ No newline at end of file
diff --git a/public/js/api/factory/funktionen/person.js b/public/js/api/factory/funktionen/person.js
new file mode 100644
index 000000000..305d0bbeb
--- /dev/null
+++ b/public/js/api/factory/funktionen/person.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+export default {
+	getContractFunctions(filter) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getContractFunctions';
+		if( typeof filter !== 'undefined' && filter !== null ) {
+			url = url + '/' + filter;
+		}
+		return {
+			method: 'get',
+			url,
+		};
+
+	},
+	getOrgetsForCompany(unternehmen) {
+		var url = 'api/frontend/v1/funktionen/OrgAPI/getOrgetsForCompany'
+			+ '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCompanyByOrget(orget) {
+		var url = 'api/frontend/v1/funktionen/OrgAPI/getCompanyByOrget'
+			+ '/' + orget;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getCurrentFunctions'
+			+ '/' + mitarbeiter_uid + '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	}  ,
+	getAllUserFunctions(mitarbeiter_uid) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllUserFunctions'
+			+ '/' + mitarbeiter_uid;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getAllFunctions() {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllFunctions';
+		return {
+			method: 'get',
+			url,
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
new file mode 100644
index 000000000..c54628b24
--- /dev/null
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -0,0 +1,620 @@
+import { Modal } from './Modal.js';
+import { ModalDialog } from './ModalDialog.js';
+import { Toast } from './Toast.js';
+import {OrgChooser} from "./OrgChooser.js";
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+import ApiFunktion from '../../api/factory/funktionen/person.js';
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person";
+
+export const Funktionen = {
+	name: 'FunctionComponent',
+	components: {
+		Modal,
+		ModalDialog,
+		Toast,
+		OrgChooser,
+		"datepicker": VueDatePicker
+	},
+	props: {
+		modelValue: { type: Object, default: () => ({}), required: false},
+		config: { type: Object, default: () => ({}), required: false},
+		readonlyMode: { type: Boolean, required: false, default: false },
+		personID: { type: Number, required: false },
+		personUID: { type: String, required: false },
+		writePermission: { type: Boolean, required: false },
+	},
+	emits: ['updateHeader'],
+	setup( props, { emit } ) {
+
+		const $api = Vue.inject('$api');
+		//const fhcAlert = Vue.inject('$fhcAlert');
+
+
+		const readonly = Vue.ref(false);
+
+		const { t } = usePhrasen();
+
+		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
+		const currentPersonID = Vue.computed(() => { return props.personID });
+		const currentPersonUID = Vue.computed(() => { return props.personUID });
+
+		const dialogRef = Vue.ref();
+
+		const isFetching = Vue.ref(false);
+
+		const theModel = Vue.computed({
+			get: () => props.modelValue,
+			set: (value) => emit('update:modelValue', value),
+		});
+
+		const unternehmen = Vue.ref();
+		const jobfunctionList = Vue.ref([]);
+		const jobfunctionDefList = Vue.ref([]);
+		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
+
+		const aktivChecked = Vue.ref(true);
+
+		const table = Vue.ref(null); // reference to your table element
+		const tabulator = Vue.ref(null); // variable to hold your table
+		const tableData = Vue.reactive([]); // data for table to display
+
+
+		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
+
+		const convertArrayToObject = (array, key) => {
+			const initialValue = {};
+			return array.reduce((obj, item) => {
+				return {
+					...obj,
+					[item[key]]: item,
+				};
+			}, initialValue);
+		};
+
+		const fetchData = async () => {
+			if (currentPersonID.value==null && theModel.value.personID==null) {
+				jobfunctionList.value = [];
+				return;
+			}
+			isFetching.value = true
+
+			// fetch data and map them for easier access
+			try {
+				const response = await $api.call(
+					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
+				if(response.error === 1) {
+					let rawList = [];
+					tableData.value = [];
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				} else {
+					let rawList = response.retval;
+					tableData.value = response.retval;
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				}
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+
+		}
+
+		const createShape = () => {
+			return {
+				benutzerfunktion_id: 0,
+				uid: theModel.value.personUID || currentPersonUID.value,
+				oe_kurzbz: "",
+				funktion_kurzbz: "",
+				datum_von: "",
+				datum_bis: "",
+				bezeichnung: "",
+				wochenstunden: 0,
+			}
+		}
+
+		const currentValue = Vue.ref(createShape());
+		const preservedValue = Vue.ref(createShape());
+
+		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
+			fetchData();
+		});
+
+		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
+			fetchOrgUnits(unternehmen_kurzbz);
+			fetchFunctions();
+		});
+
+		const toggleMode = async () => {
+			if (!readonly.value) {
+				// cancel changes?
+				if (hasChanged.value) {
+					const ok = await dialogRef.value.show();
+					if (ok) {
+						console.log("ok=", ok);
+						currentValue.value = preservedValue.value;
+					} else {
+						return
+					}
+				}
+			} else {
+				// switch to edit mode and preserve data
+				preservedValue.value = {...currentValue.value};
+			}
+			readonly.value = !readonly.value;
+		}
+
+		Vue.onMounted(async () => {
+			currentValue.value = createShape();
+			await fetchData();
+
+			const dateFormatter = (cell) => {
+				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+			}
+
+			const dvFormatter = (cell) => {
+				if( props.readonlyMode === true ) {
+					return (cell.getValue() != null) ? cell.getValue() : '';
+				}
+				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
+				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
+			}
+
+			// helper
+			const createDomButton = (classValue, clickHandler) => {
+				const nodeBtn = document.createElement("button");
+				const classAttrBtn = document.createAttribute("class");
+				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
+				nodeBtn.setAttributeNode(classAttrBtn);
+				nodeBtn.addEventListener("click", clickHandler);
+				const nodeI = document.createElement("i");
+				const classAttrI = document.createAttribute("class");
+				classAttrI.value = classValue;
+				nodeI.setAttributeNode(classAttrI);
+				nodeBtn.appendChild(nodeI);
+				return nodeBtn;
+			}
+
+			const btnFormatter = (cell) => {
+
+				const nodeDiv = document.createElement("div");
+				const classAttrDiv = document.createAttribute("class");
+				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
+				nodeDiv.setAttributeNode(classAttrDiv);
+				// delete button
+				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
+				// edit button
+				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
+
+				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+					nodeDiv.appendChild(nodeBtnEdit);
+					nodeDiv.appendChild(nodeBtnDel);
+				}
+
+				return nodeDiv;
+			}
+
+
+			const columnsDef = [
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
+				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
+			];
+
+			if( props.readonlyMode === false) {
+				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
+			}
+
+			let tabulatorOptions = {
+				height: "100%",
+				layout: "fitColumns",
+				movableColumns: true,
+				reactiveData: true,
+				columns: columnsDef,
+				//data: tableData.value,
+				data: jobfunctionListArray.value,
+			};
+
+			tabulator.value = new Tabulator(
+				table.value,
+				tabulatorOptions
+			);
+
+			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
+				//headerValue - the value of the header filter element
+				//rowValue - the value of the column in this row
+				//rowData - the data for the row being filtered
+				//filterParams - params object passed to the headerFilterFuncParams property
+
+				const validDate = function(d){
+					return d instanceof Date && isFinite(d);
+				}
+
+				const date1 = new Date(rowValue);
+				date1.setHours(0,0,0,0);
+				let [day, month, year] = headerValue.split('.')
+				if (year < 1000) return true;  // prevents dates like 17.5.2
+				const date2 = new Date(+year, +month - 1, +day);
+
+				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
+			}
+
+			tabulator.value.on('tableBuilt', () => {
+				//tabulator.value.setData(tableData.value);
+
+			})
+
+		})
+
+		const jobfunctionListArray = Vue.computed(() => {
+			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
+			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
+			return filtered;
+		});
+
+		// Workaround to update tabulator
+		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
+			console.log('jobfunctionList changed');
+			tabulator.value?.setData(jobfunctionListArray.value);
+		}, {deep: true})
+
+		// Modal
+		const modalRef = Vue.ref();
+		const confirmDeleteRef = Vue.ref();
+
+		const showAddModal = () => {
+			currentValue.value = createShape();
+			// reset form state
+			frmState.orgetBlurred=false;
+			frmState.funktionBlurred=false;
+			frmState.beginnBlurred=false;
+			// call bootstrap show function
+			modalRef.value.show();
+		}
+
+		const hideModal = () => {
+			modalRef.value.hide();
+		}
+
+		const showEditModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			// fetch company
+			isFetching.value = true;
+			try {
+				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
+				if (res.error == 0) {
+					unternehmen.value = res.retval[0].oe_kurzbz;
+				} else {
+					console.log('company not found for orget!');
+				}
+
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+			//delete currentValue.value.bezeichnung;
+			modalRef.value.show();
+		}
+
+		const showDeleteModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			const ok = await confirmDeleteRef.value.show();
+
+			if (ok) {
+
+				try {
+					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
+					if (res.error == 0) {
+						delete jobfunctionList.value[id];
+						showDeletedToast();
+						theModel.value.updateHeader();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+			}
+		}
+
+
+		const okHandler = async () => {
+			if (!validate()) {
+
+				console.log("form invalid");
+
+			} else {
+
+				// submit
+				try {
+					let payload = {...currentValue.value};
+					delete payload.dienstverhaeltnis_id;
+					delete payload.dienstverhaeltnis_unternehmen;
+					delete payload.fachbereich_bezeichnung;
+					delete payload.funktion_oebezeichnung;
+					delete payload.aktiv;
+					delete payload.funktion_beschreibung;
+					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
+					if (r.error == 0) {
+						// fetch all data because of all the references in the changed record
+						await fetchData();
+						console.log('job function successfully saved');
+						theModel.value.updateHeader();
+						showToast();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+				hideModal();
+			}
+		}
+
+		// -------------
+		// form handling
+		// -------------
+
+		const jobFunctionFrm = Vue.ref();
+
+		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
+
+		const notEmpty = (n) => {
+			return !!n && n.trim() != "";
+		}
+
+		const validate = () => {
+			frmState.orgetBlurred = true;
+			frmState.funktionBlurred = true;
+			frmState.beginnBlurred = true;
+			return notEmpty(currentValue.value.datum_von) &&
+				notEmpty(currentValue.value.oe_kurzbz) &&
+				notEmpty(currentValue.value.funktion_kurzbz);
+		}
+
+
+		const hasChanged = Vue.computed(() => {
+			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
+		});
+
+		const formatDate = (d) => {
+			if (d != null && d != '') {
+				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
+			} else {
+				return ''
+			}
+		}
+
+		// Toast
+		const toastRef = Vue.ref();
+		const deleteToastRef = Vue.ref();
+
+		const showToast = () => {
+			toastRef.value.show();
+		}
+
+		const showDeletedToast = () => {
+			deleteToastRef.value.show();
+		}
+
+		const fetchOrgUnits = async (unternehmen_kurzbz) => {
+			if( unternehmen_kurzbz === '' ) {
+				return;
+			}
+			const response = await $api.call(
+				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
+			const orgets = response.retval;
+			orgets.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			orgUnitList.value = await  orgets;
+		}
+
+		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
+			if(unternehmen_kurzbz === '' || uid === '' ) {
+				return;
+			}
+			const response = await $api.call(ApiFunktion.getAllFunctions());
+			const benutzerfunktionen = response.retval;
+			benutzerfunktionen.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			jobfunctionDefList.value = benutzerfunktionen;
+		}
+
+		const unternehmenSelectedHandler = (e) => {
+			console.log('unternehmen selected: ',e);
+			unternehmen.value = e;
+		}
+
+		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
+
+		return {
+			jobfunctionList, orgUnitList, jobfunctionListArray,
+			jobfunctionDefList,
+			currentValue,
+			readonly,
+			frmState,
+			dialogRef,
+			toastRef, deleteToastRef,
+			jobFunctionFrm,
+			modalRef,
+			fullPath,
+			route,
+			aktivChecked,
+			unternehmen,
+			tabulator,
+			table,
+
+			toggleMode, formatDate, notEmpty,
+			showToast, showDeletedToast,
+			showAddModal, hideModal, okHandler,
+			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler,
+		}
+	},
+	template: `
+    <div class="row" v-if="readonlyMode === false">
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+          <Toast ref="toastRef">
+            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
+          </Toast>
+        </div>
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+            <Toast ref="deleteToastRef">
+                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
+            </Toast>
+        </div>
+    </div>
+    <div class="row pt-md-4">      
+         <div class="col">
+             <div class="card">
+                <div class="card-header">
+                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
+                </div>
+
+                <div class="card-body">
+                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
+                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
+                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
+                        </button>
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
+                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
+                        </div>
+                    </div>
+
+                    <!-- TABULATOR -->
+                    <div ref="table" class="fhc-tabulator"></div>
+                
+                </div>
+             </div>
+         </div>
+    </div>
+            
+
+    <!-- detail modal -->
+    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
+        <template #body>
+            <form class="row g-3" ref="jobFunctionFrm">
+                            
+                <div class="col-md-8">
+                    <label class="form-label">{{ t('core','unternehmen') }}</label><br>
+                    <org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
+                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
+                        @blur="frmState.orgetBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
+                        >
+                        <option v-for="(item, index) in orgUnitList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
+                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
+                        @blur="frmState.funktionBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
+                        >
+                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4"></div>
+                <!-- -->
+                <div class="col-md-2">
+                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
+                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
+                </div>
+                <!--  -->
+                <div class="col-md-3">
+                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
+                    <datepicker id="beginn"
+                        :teleport="true" 
+                        @blur="frmState.beginnBlurred = true" 
+                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
+                        v-model="currentValue.datum_von"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>
+                </div>
+                <div class="col-md-3">
+                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
+                    <datepicker id="ende"
+                        :teleport="true" 
+                        v-model="currentValue.datum_bis"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>                   
+                </div>
+                <div class="col-md-3">
+                </div>
+                <!-- -->
+                <div class="col-md-8">
+                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
+                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
+                </div>
+                <div class="col-md-4">
+                </div>
+                
+                
+                <!-- changes -->
+                <div class="col-8">
+                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
+                </div>
+                
+            </form>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-primary" @click="okHandler()" >
+                {{ t('ui','speichern') }}
+            </button>
+        </template>
+
+    </Modal>
+
+    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
+      <template #body>
+        {{ t('person','funktionNochNichtGespeichert') }}
+      </template>
+    </ModalDialog>
+
+    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
+        <template #body>
+            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
+        </template>
+    </ModalDialog>
+    `
+}
+
+export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Modal.js b/public/js/components/Funktionen/Modal.js
new file mode 100644
index 000000000..716d9ac2a
--- /dev/null
+++ b/public/js/components/Funktionen/Modal.js
@@ -0,0 +1,48 @@
+export const Modal = {
+	name: 'Modal',
+    props: {
+        type: String,
+        title: String,
+        noscroll: Boolean
+    },
+    expose: ['show', 'hide'],
+    setup(props, { emit }) {
+       
+        let modalEle = Vue.ref(null);
+        let thisModalObj;
+
+        Vue.onMounted(() => {
+            thisModalObj = new bootstrap.Modal(modalEle.value);
+        });
+        const show = () => {
+            thisModalObj.show();
+        }
+        function hide() {
+            thisModalObj.hide();
+        }
+
+        return { modalEle, show, hide };
+    },
+
+    template:`
+    <div class="modal fade " id="customModal" tabindex="-1" aria-labelledby=""
+        aria-hidden="true" ref="modalEle">
+        <div class="modal-dialog modal-lg" :class="(!noscroll) ? 'modal-dialog-scrollable' : ''">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="customModalLabel">{{ title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <slot name="body" />
+                </div>
+                <div class="modal-footer">
+                    <slot name="footer"></slot>
+                    <!-- button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+                        OK
+                    </button-->
+                </div>
+            </div>
+        </div>
+    </div>`
+};
diff --git a/public/js/components/Funktionen/ModalDialog.js b/public/js/components/Funktionen/ModalDialog.js
new file mode 100644
index 000000000..c46540cae
--- /dev/null
+++ b/public/js/components/Funktionen/ModalDialog.js
@@ -0,0 +1,69 @@
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+export const ModalDialog = {
+	name: 'ModalDialog',
+    props: {
+        type: String,
+        title: String,
+    },
+    expose: ['show', 'hide'],
+    setup(props, { emit }) {
+       
+        let modalConfirmEle = Vue.ref(null);
+        let thisModalObj;
+        let _resolve;
+        let _reject;
+        const { t } = usePhrasen();
+
+        Vue.onMounted(() => {
+            thisModalObj = new bootstrap.Modal(modalConfirmEle.value);
+        });
+        
+        const show = async () => {
+            thisModalObj.show();
+            return new Promise(function (resolve, reject) {
+              _resolve = resolve;
+              _reject = reject;
+            });
+        }
+
+        function hide() {
+            thisModalObj.hide();
+        }
+
+        const ok = () => {
+            _resolve(true);
+          }
+          
+        const cancel = () =>  {
+            _resolve(false);
+        }        
+
+        return { modalConfirmEle, show, hide, ok, cancel, t };
+    },
+
+    template:`
+    <div class="modal fade " id="customModalDialog" tabindex="-1" aria-labelledby=""
+        aria-hidden="true" ref="modalConfirmEle">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="customModalDialogLabel">{{ title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <slot name="body" />
+                </div>
+                <div class="modal-footer">
+                    <slot name="footer"></slot>
+                    <button type="button" class="btn btn-secondary" @click="cancel" data-bs-dismiss="modal">
+                      {{ t('ui','abbrechen') }}
+                    </button>
+                    <button type="button" class="btn btn-primary" @click="ok" data-bs-dismiss="modal">
+                        {{ t('ui','ok') }}
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>`
+};
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
new file mode 100644
index 000000000..9c3086e76
--- /dev/null
+++ b/public/js/components/Funktionen/OrgChooser.js
@@ -0,0 +1,69 @@
+import {CoreRESTClient} from '../../../js/RESTClient';
+
+export const OrgChooser = {
+	name: 'OrgChooser',
+    props: {
+      placeholder: String,
+      customClass: String,
+      oe: String,
+    },
+    emits: ["orgSelected"],
+    setup(props, { emit }) {   
+
+      const orgList = Vue.ref([]);
+      const isFetching = Vue.ref(false);
+      const oeRef = Vue.toRefs(props).oe
+      const selected = Vue.ref();
+
+      const fetchHead = async () => {
+        isFetching.value = true
+        try {
+          const res = await CoreRESTClient.get(
+            'extensions/FHC-Core-Personalverwaltung/api/frontend/v1/OrgAPI/getOrgHeads');
+          orgList.value = CoreRESTClient.getData(res.data);
+          if (orgList.value.length > 0)  {
+            //orgList.value.reverse();
+            if (props.oe == undefined || (props.oe != null && props.oe == '')) {
+              selected.value = orgList.value[0].oe_kurzbz;
+            }
+            emit("orgSelected", selected.value);
+          }
+          isFetching.value = false          
+        } catch (error) {
+          console.log(error)
+          isFetching.value = false
+        }
+      }
+
+      Vue.onMounted(() => {
+        fetchHead();
+      })
+
+      const orgSelected = (e) => {
+        emit("orgSelected", e.target.value);
+      }
+
+      Vue.watch(
+        oeRef,
+        (val, old) => {
+          console.log('prop value changed', val);
+          selected.value = val;
+        }
+      )
+
+      return   {
+        orgList, selected,
+
+        orgSelected
+      }
+
+
+    },
+    template: `
+    <select  id="orgHeadChooser" v-model="selected" @change="orgSelected" class="form-control-sm" aria-label=".form-select-sm " >
+        <option v-for="(item, index) in orgList" :value="item.oe_kurzbz"  :key="item.oe_kurzbz">
+            {{ item.bezeichnung }}
+        </option>         
+    </select>
+    `
+}    
diff --git a/public/js/components/Funktionen/Toast.js b/public/js/components/Funktionen/Toast.js
new file mode 100644
index 000000000..6b3faba82
--- /dev/null
+++ b/public/js/components/Funktionen/Toast.js
@@ -0,0 +1,47 @@
+export const Toast = {
+	name: 'Toast',
+    props: {
+        title: {
+            text: String,
+            default: "<<Text goes here>>",
+        },
+        type: {
+            text: String,
+            default: "success",
+        }
+    },
+    expose: ['show', 'hide'],
+    setup(props) {
+
+        let toastEle = Vue.ref(null);
+        let thisToastObj;
+
+        Vue.onMounted(() => {
+            thisToastObj = new bootstrap.Toast(toastEle.value);
+        });
+
+        const show = () => {
+            thisToastObj.show();
+        }
+
+        const hide = () => {
+            thisToastObj.hide();
+        }
+
+        const backgroundColor = Vue.computed(() => {
+            return props.type == "success" ? "bg-primary"  : "bg-danger"
+        })
+
+        return { show, hide, toastEle, backgroundColor };
+
+    },
+    template: `
+    <div class="toast align-items-center text-white border-0 " :class="backgroundColor" role="alert" aria-live="assertive" aria-atomic="true" ref="toastEle">
+        <div class="d-flex">
+            <div class="toast-body">
+            <slot name="body"></slot>
+            </div>
+            <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+        </div>
+    </div>`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
new file mode 100644
index 000000000..df73b6464
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -0,0 +1,28 @@
+import PersonFunctions from "../../../Funktionen/Funktionen.js";
+/*import fhcapifactory from "../../../../apps/api/fhcapifactory.js";
+import pv21apifactory from "../../../../../extensions/FHC-Core-Personalverwaltung/js/api/api.js";
+Vue.$fhcapi = {...fhcapifactory, ...pv21apifactory};*/
+
+export default {
+   components: {
+   	PersonFunctions
+   },
+ props: {
+		   modelValue: Object,
+	   },
+   template: `
+   <div class="stv-details-functions h-100 d-flex flex-column">
+		<table-functions 
+			ref="tbl_functions" 
+			:student="modelValue">	
+		</table-functions>
+
+	   <person-functions
+		   :readonlyMode="false"
+		   :personID="modelValue.person_id"
+		   :personUID="modelValue.uid"
+	   >
+	   </person-functions>
+
+      </div>`
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1afe4a196..6c52517b6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41453,8 +41453,31 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC-4 Studierendenverwaltung FUNCTIONS START
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_functions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktionen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Functions',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC-4 Studierendenverwaltung FUNCTIONS END
+
 );
 
 

From a99721bb2204bf2dcfccd34c48406ab2e5f42dc8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 May 2025 09:34:12 +0200
Subject: [PATCH 0175/1357] feature(Dashboard Mobile): the modal to add new
 widgets distributes the space to display widgetes more evenly

---
 public/js/components/Dashboard/Widget/Picker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 7ffd0671c..378c4ca9d 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -36,11 +36,11 @@ export default {
 		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
 			<template v-slot:title>Create new widget</template>
 			<template v-slot:default>
-				<div v-if="widgets" class="row">
+				<div v-if="widgets" class="row g-2">
 					<div v-if="!widgets.length">
 						No Widgets available
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+					<div v-for="widget in widgets" :key="widget.widget_id" class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2">
 						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>

From d3dc81eae8783e8b6191ee0f76d77978df6cc4c4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 09:51:30 +0200
Subject: [PATCH 0176/1357] add missing fileendings in imports

---
 public/js/components/Funktionen/Funktionen.js | 2 +-
 public/js/components/Funktionen/OrgChooser.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index c54628b24..0f0fd42c5 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -5,7 +5,7 @@ import {OrgChooser} from "./OrgChooser.js";
 import { usePhrasen } from '../../mixins/Phrasen.js';
 
 import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person";
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
 
 export const Funktionen = {
 	name: 'FunctionComponent',
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
index 9c3086e76..64109cc2c 100644
--- a/public/js/components/Funktionen/OrgChooser.js
+++ b/public/js/components/Funktionen/OrgChooser.js
@@ -1,4 +1,4 @@
-import {CoreRESTClient} from '../../../js/RESTClient';
+import {CoreRESTClient} from '../../../js/RESTClient.js';
 
 export const OrgChooser = {
 	name: 'OrgChooser',

From 12415279d1b8b55e071b7e2c98dd49204361118e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 14:08:49 +0200
Subject: [PATCH 0177/1357] hide column and formular field
 dienstverhaeltnis_unternehmen via prop

---
 public/js/components/Funktionen/Funktionen.js |  9 +++--
 .../Studentenverwaltung/Details/Funktionen.js | 34 +++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 0f0fd42c5..335edd906 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -23,6 +23,7 @@ export const Funktionen = {
 		personID: { type: Number, required: false },
 		personUID: { type: String, required: false },
 		writePermission: { type: Boolean, required: false },
+		showDvCompany: { tpye: Boolean, required: false, default: true }
 	},
 	emits: ['updateHeader'],
 	setup( props, { emit } ) {
@@ -197,7 +198,7 @@ export const Funktionen = {
 
 
 			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
 				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
 				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
 				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
@@ -511,8 +512,10 @@ export const Funktionen = {
             <form class="row g-3" ref="jobFunctionFrm">
                             
                 <div class="col-md-8">
-                    <label class="form-label">{{ t('core','unternehmen') }}</label><br>
-                    <org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					<template v-if="showDvCompany">
+						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
+						<org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					</template>
                 </div>
                 <div class="col-md-4">
                 </div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index df73b6464..b58c0805c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -1,28 +1,26 @@
 import PersonFunctions from "../../../Funktionen/Funktionen.js";
-/*import fhcapifactory from "../../../../apps/api/fhcapifactory.js";
-import pv21apifactory from "../../../../../extensions/FHC-Core-Personalverwaltung/js/api/api.js";
-Vue.$fhcapi = {...fhcapifactory, ...pv21apifactory};*/
 
 export default {
-   components: {
-   	PersonFunctions
-   },
- props: {
-		   modelValue: Object,
-	   },
-   template: `
-   <div class="stv-details-functions h-100 d-flex flex-column">
+  components: {
+    PersonFunctions,
+  },
+  props: {
+    modelValue: Object,
+  },
+  template: `
+	<div class="stv-details-functions h-100 d-flex flex-column">
 		<table-functions 
 			ref="tbl_functions" 
 			:student="modelValue">	
 		</table-functions>
 
-	   <person-functions
-		   :readonlyMode="false"
-		   :personID="modelValue.person_id"
-		   :personUID="modelValue.uid"
-	   >
-	   </person-functions>
+		<person-functions
+			:readonlyMode="false"
+			:personID="modelValue.person_id"
+			:personUID="modelValue.uid"
+			:showDvCompany="false"
+		>
+		</person-functions>
 
-      </div>`
+	</div>`,
 };

From a94b52dbc68b136d21f1c5ea0eb18a3622399148 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 11:44:27 +0200
Subject: [PATCH 0178/1357] refactor(Dashboard touch events): fixes the touch
 event behaviors for the widgets and the dashboard

---
 public/css/components/dashboard.css       |  1 +
 public/js/components/Dashboard/Item.js    |  6 +++++-
 public/js/components/Dashboard/Section.js |  5 +++--
 public/js/components/Drop/Grid.js         | 19 +++++++++++--------
 public/js/components/Drop/Grid/Item.js    | 15 ++++++++-------
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 55cd9a8ed..f48a25418 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -15,6 +15,7 @@
 	height: 100%;
 	width: 100%;
 	background-color:white;
+	position:relative;
 }
 
 .empty-tile-hover:hover {
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index b7a334b92..beaca64f0 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -41,6 +41,8 @@ export default {
 		"item_data",
 		"place",
 		"setup",
+		"dragstate",
+		"resizeOverlay"
 	],
 	computed: {
 		maxHeight(){
@@ -153,7 +155,8 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
+	<div v-show="!dragstate" class="h-100 card border-0">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
@@ -221,5 +224,6 @@ export default {
 				</template>
 			</div>
 		</height-transition>
+		</div>
 	</div>`,
 };
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 17c2ac004..fb5caa965 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -209,7 +209,7 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="editModeIsActive" class=" mb-0">
+	<h4 v-if="editModeIsActive" class=" mb-2">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
@@ -217,10 +217,11 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
+					:dragstate="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)"
+					:resizeOverlay="item.resizeOverlay"
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 44ca0a603..54907703b 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -405,6 +405,7 @@ export default {
 			}
 		},
 		startMove(evt, item) {
+			
 			if (!this.active)
 				return;
 			
@@ -413,14 +414,15 @@ export default {
 			this.grid.h += 1;
 			this.draggedItem = item;
 			this.$emit('draggedItem',item);
-			this.draggedNode = evt.target;
+			
+			this.draggedNode = evt.target.closest(".drop-grid-item");
 			//clones the widget for the drag Image
-			let clone = evt.target.cloneNode(true);
+			let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
+			
 			clone.style.zIndex = 5;
 			clone.classList.add("widgetClone");
 			this.$refs.container.appendChild(clone);
 			this.clonedWidget = clone;
-			
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -498,9 +500,10 @@ export default {
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");
 			})
+			
 			let widgetClones = document.getElementsByClassName("widgetClone");
-			for(let widget of widgetClones){
-				this.$refs.container.removeChild(widget);
+			for (let i=0; i <widgetClones.length; i++){ 
+				this.$refs.container.removeChild(widgetClones[i]);
 			}
 			
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -614,7 +617,7 @@ export default {
 		<TransitionGroup tag="div">
 			<grid-item
 				ref="gridItems"
-				v-for="(item,index) in ((mode != 1 || mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in ((mode != 1 && mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
@@ -623,8 +626,8 @@ export default {
 				@start-resize="startResize"
 				@dragging="dragging"
 				@end-drag="dragCancel"
-				@drop-drag="dragEnd"
-				@touchEvent="updateCursorOnMouseMove"
+				@touch-end="dragEnd();mouseUp();"
+				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
 				class="position-absolute"
 				:active="active"
 				:style="{
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index b8acf3044..a597c4f00 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -17,7 +17,8 @@ export default {
 		"endDrag",
 		"dropDrag",
 		"item",
-		"touchEvent"
+		"touchStart",
+		"touchEnd",
 	],
 	data() {
 		return {
@@ -54,16 +55,16 @@ export default {
 		},
 		touchDragEnd(evt) {
 			if (!this.dragging)
-				//return evt.preventDefault();
-                                return;
+				return;
 			this.dragging = false;
-			this.$emit('dropDrag', evt);
+			this.$emit('touchEnd', evt);
 		},
 		touchStart(event){
-			this.$emit('touchEvent', event); 
+			this.$emit('touchStart', event); 
 			this.registerDragAction(event); 
 			this.tryDragStart(event, this.item);
-		}
+		},
+		
 	},
 	template: `
 	<div class="drop-grid-item"
@@ -73,7 +74,7 @@ export default {
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
-		@touchmove="$emit('dragging',$event)"
+		@touchmove.prevent="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>

From ed2a4679264d2c89f40af5608a15e34aa4b23a2d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 13:51:20 +0200
Subject: [PATCH 0179/1357] refactor(Dashboard additional row): changes the UI
 and behavior to add an additional row to the grid

---
 public/css/components/dashboard.css       | 16 +++++++++
 public/js/components/Dashboard/Item.js    |  3 +-
 public/js/components/Dashboard/Section.js |  4 ++-
 public/js/components/Drop/Grid.js         | 41 ++++++++++++-----------
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index f48a25418..8770c1e78 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -18,6 +18,22 @@
 	position:relative;
 }
 
+.dashboard-section > .newGridRow{
+	position:absolute;
+	width:20px;
+	height:20px;
+	padding:0;
+	bottom:0;
+	left:50%;
+	transform:translate(-50%, 50%);
+	background-color:white;
+}
+
+.newGridRow:hover {
+	color:white;
+	background-color:#6c757d;
+}
+
 .empty-tile-hover:hover {
 		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index beaca64f0..68a92e701 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -42,7 +42,8 @@ export default {
 		"place",
 		"setup",
 		"dragstate",
-		"resizeOverlay"
+		"resizeOverlay",
+		"additionalRow"
 	],
 	computed: {
 		maxHeight(){
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index fb5caa965..07e636cf5 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -41,6 +41,7 @@ export default {
 			gridWidth: 1,
 			gridHeight: null,
 			draggedItem:null,
+			additionalRow:false,
 		}
 	},
 	provide() {
@@ -214,7 +215,8 @@ export default {
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
+		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<dashboard-item 
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 54907703b..9be07ca15 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -26,6 +26,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		additionalRow:{
+			type: Boolean,
+			default: false,
+		}
 	},
 	emits: [
 		"rearrangeItems",
@@ -48,7 +52,6 @@ export default {
 			draggedOffset: [0,0],
 			draggedItem: null,
 			draggedNode: null,
-			additionalRow: null,
 			reorderedItems:[],
 			clonedWidget:null,
 		}
@@ -60,6 +63,14 @@ export default {
 		},
 	},
 	computed: {
+		additionalRowComputed: {
+			get() {
+				return this.additionalRow;
+			},
+			set(value) {
+				this.$emit('update:additionalRow', value);
+			}
+		},
 		items_hashmap() {
 			let items = {};
 			this.items.forEach(item => {
@@ -120,6 +131,11 @@ export default {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
 			}
+			if (this.mode == MODE_IDLE) {
+				if (this.additionalRowComputed) {
+					return this.grid ? (this.grid.h+1) : 1;
+				}
+			}
 			return this.grid ? this.grid.h : 1;
 		},
 		gridStyle() {
@@ -350,13 +366,8 @@ export default {
 			if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
-				if (this.additionalRow !== null) {
-					let gridHeight = this.grid.getMaxY() + 1;
-					if(this.grid.h>gridHeight){
-						this.grid.h = gridHeight;
-					}
-					this.additionalRow = null;
-				}
+				this.additionalRowComputed = false;
+				
 			}
 		},
 		updateCursor(evt) {
@@ -380,18 +391,6 @@ export default {
 			if (this.x == gridX && this.y == gridY)
 				return false;
 			
-			if (this.mode == MODE_IDLE) {
-				if (this.additionalRow === null && this.y == this.rows-1 && gridY == this.rows) {
-					this.additionalRow = this.grid.h;
-					this.grid.h += 1;
-				} else if (this.additionalRow !== null && gridY != this.rows - 1) {
-					let gridHeight = this.grid.getMaxY() + 1;
-					if(this.grid.h > gridHeight){
-						this.grid.h = gridHeight;
-					}
-					this.additionalRow = null;
-				}
-			}
 			this.x = gridX;
 			this.y = gridY;
 
@@ -482,6 +481,7 @@ export default {
 			}
 		},
 		dragCancel() {
+			this.additionalRowComputed = false;
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
@@ -531,6 +531,7 @@ export default {
 			return updated;
 		},
 		emptyTileClicked() {
+			this.additionalRowComputed = false;
 			this.$emit('newItem', this.x, this.y);
 		},
 		updateCursorOnMouseMove(evt){

From 8e2fd6e61c1cad4a7c072414d29590568c8bf27c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 13:58:06 +0200
Subject: [PATCH 0180/1357] refactor(searchbar local/session storage): does not
 use uuid for localStorage and only saves values to localStorage if
 searchoptions.origin is defined

---
 public/js/components/searchbar/searchbar.js | 29 +++++----------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 31f45455a..ce08e3bfd 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -85,7 +85,9 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr_${uuid}`,newSearchValue);
+			if(this.searchoptions.origin){
+				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			}
 		},
     },
 	computed:{
@@ -104,8 +106,8 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue)){
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes_${uuid}`, JSON.stringify(newValue));
+			if(Array.isArray(newValue), this.searchoptions.origin){
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -127,26 +129,9 @@ export default {
 		}
 	},
     methods: {
-		getStorageValue: function (key, sessionStorage = false){
-			const regex = new RegExp(`${this.searchoptions.origin}_${key}`);
-			if(sessionStorage){
-				for (let i = 0; i < sessionStorage.length; i++) {
-					if (sessionStorage.key(i).match(regex)) {
-						return sessionStorage.getItem(sessionStorage.key(i));
-					}
-				}
-			}
-			else{
-				for (let i =0; i < localStorage.length; i++){
-					if (localStorage.key(i).match(regex)){
-						return localStorage.getItem(localStorage.key(i));
-					}
-				}
-			}
-		},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			let localStorageValue = this.getStorageValue('searchtypes');
+			let localStorageValue = localStorage.getItem('searchtypes');
 			if (localStorageValue) {
 				result = JSON.parse(localStorageValue);
 			}
@@ -160,7 +145,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return this.getStorageValue("searchstr",true) ?? '';
+			return sessionStorage.getItem("searchstr") ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From dab628a72d5d2f94b18ab4c607fe53fa33b74d18 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 May 2025 11:48:01 +0200
Subject: [PATCH 0181/1357] refactor(Dashboard UX): improves user experience
 for dashboard

---
 public/css/components/dashboard.css                 | 13 +++++++++++++
 public/js/apps/Dashboard/Fhc.js                     |  1 +
 public/js/components/Dashboard/Dashboard.js         |  8 +++++++-
 public/js/components/Dashboard/Section.js           | 11 +++++------
 public/js/components/Dashboard/Widget/Picker.js     |  2 +-
 public/js/components/Dashboard/Widget/WidgetIcon.js |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 8770c1e78..eeb24d007 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,6 +1,19 @@
 @import './calendar.css';
 @import './dashboard/news.css';
 
+@media (max-width: 576px){
+	.widget-icon {
+		max-height: 250px;
+		object-fit: cover;
+	}
+	.widget-icon-container{
+		max-width: 250px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+}
+
+
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index fc25fbdfe..ada267900 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -299,6 +299,7 @@ app.use(primevue.config.default, {
 		tooltip: 8000
 	}
 })
+app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.directive('contrast', contrast);
 app.mount('#fhccontent');
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index a463ff20b..825bad3f7 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -177,7 +177,13 @@ export default {
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
 			}
-			this.sections = this.sections.sort((section1, section2) => section2.widgets.length - section1.widgets.length);
+			this.sections = this.sections.sort((section1, section2) => {
+				if(section1.name == 'custom')
+					return 1;
+				if (section2.name == 'custom')
+					return -1;
+				return section2.widgets.length - section1.widgets.length;
+			});
 		}).catch(err => console.error('ERROR:', err));
 	},
 	async beforeMount() {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 07e636cf5..05c3f940f 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,5 +1,4 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
-import SectionModal from "../Bootstrap/Alert.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
@@ -109,13 +108,13 @@ export default {
 		},
 		showSectionInformation(){
 			if (this.name == "general"){
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription')); 
+				return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
 			}
 			else if(this.name == "custom"){
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription'));
+				return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
 			}
 			else{
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]));
+				return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
 			}
 		},
 		handleConfigOpened() {
@@ -211,14 +210,14 @@ export default {
 	},
 	template: `
 	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+		<i v-tooltip="{ value: showSectionInformation(name), hideDelay: 300 }" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
 		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
-				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 378c4ca9d..46b7c50e7 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -40,7 +40,7 @@ export default {
 					<div v-if="!widgets.length">
 						No Widgets available
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2">
+					<div v-for="widget in widgets" :key="widget.widget_id" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
 						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index a7d816cb2..76a32af8c 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -20,7 +20,7 @@ export default {
 	emits:["select"],
 	template: /*html */`
 	<div class="card h-100" @click="$emit('select',widget.widget_id);">
-		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+		<img class="card-img-top widget-icon" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 		<div class="card-body">
 			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
 			<p class="card-text">{{ widget.beschreibung }}</p>

From 53f2776efe2303277787c64054bff2f16e29500e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 14 May 2025 15:16:18 +0200
Subject: [PATCH 0182/1357] add CIS_REDIRECT_TO_CIS4 to cis config, add
 viewport meta tag and alter tw.css and mobile.css to improve layout of
 index.html and rendering of logos on mobile devices, add logic to redirect
 users to cis4 after login

---
 cis/index.html                    |  1 +
 cis/index_login.php               | 23 ++++++++++++++++++++-
 config/cis.config-default.inc.php |  2 ++
 skin/styles/mobile.css            | 33 ++++++++++++++++++++++++++++++-
 skin/styles/tw.css                |  7 +++++--
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/cis/index.html b/cis/index.html
index 2a3809f6f..074107e57 100644
--- a/cis/index.html
+++ b/cis/index.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 	<title>CIS</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta charset="utf-8">
 	<link href="../skin/style.css.php" rel="stylesheet" type="text/css">
 	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
diff --git a/cis/index_login.php b/cis/index_login.php
index 74c87f649..4040a9304 100644
--- a/cis/index_login.php
+++ b/cis/index_login.php
@@ -22,6 +22,8 @@
  */
 require_once('../config/cis.config.inc.php');
 require_once('../include/functions.inc.php');
+require_once('../include/benutzerberechtigung.class.php');
+require_once('../include/student.class.php');
 
 if(isset($_GET['login']))
 {
@@ -35,7 +37,26 @@ if(isset($_GET['login']))
 
 	if($uid!='')
 	{
-		header('Location: '.APP_ROOT.'cis/index.php');
+		$benutzerberechtigung = new benutzerberechtigung();
+		$benutzerberechtigung->getBerechtigungen($uid);
+		$student = new student();
+		$student->load($uid);
+
+		$redirectToCisneu = (defined('CIS_REDIRECT_TO_CIS4') && (true === CIS_REDIRECT_TO_CIS4));
+		$isBerechtigtCisneu = ($benutzerberechtigung->isBerechtigt('basis/cis') 
+			&& $benutzerberechtigung->isBerechtigt('dashboard/benutzer'));
+		$isValidStudent = $student->checkIfValidStudentUID($uid);
+
+		if( $redirectToCisneu && $isBerechtigtCisneu && $isValidStudent ) 
+		{
+			http_response_code(303);
+			header('Location: ' . APP_ROOT . 'cis.php');
+			exit();
+		}
+		else
+		{
+			header('Location: '.APP_ROOT.'cis/index.php');
+		}
 	}
 }
 
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index b61ce9869..4f6745ce7 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -296,4 +296,6 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
+// Weiterleiten zu CIS neu (wenn Rechte vorhanden)
+define('CIS_REDIRECT_TO_CIS4', false);
 ?>
diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css
index 186774433..3b691488c 100644
--- a/skin/styles/mobile.css
+++ b/skin/styles/mobile.css
@@ -935,4 +935,35 @@ table.hoverbox
 	border-style:solid;
 	border-color:grey;
 }
-*/
\ No newline at end of file
+*/
+div.header_logo
+{
+	position: absolute;
+	left: 16px;
+	top: 3%;
+	z-index: 5000;
+
+	background-image:url(styles/tw/logo_250x130.png);
+	background-repeat: no-repeat;
+	width:170px;
+	height:51px;
+	background-size: contain;
+}
+
+td.headerbar
+{
+	background-image: url(styles/tw/header.png);
+	background-position: top;
+	background-repeat: repeat-x;
+}
+
+div.cis_logo
+{
+	background-image:url(styles/tw/cis_logo_text_400x78.png);
+	background-repeat: no-repeat;
+	max-width: 400px;
+	height: 78px;
+	background-size: 100%;
+	width: 90%;
+	background-position: center;
+}
\ No newline at end of file
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index fd39adc3c..1caf01132 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -1185,13 +1185,16 @@ td.headerbar
 {
 	background-image: url(styles/tw/header.png);
 	background-position: top;
-	background-repeat: repeat-x;"
+	background-repeat: repeat-x;
 }
 
 div.cis_logo
 {
 	background-image:url(styles/tw/cis_logo_text_400x78.png);
 	background-repeat: no-repeat;
-	width: 400px;
+	max-width: 400px;
 	height: 78px;
+	background-size: 100%;
+	width: 90%;
+	background-position: center;
 }

From ebcb33b31692f4d9590b2568ca30c5103c248f24 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 May 2025 12:00:41 +0200
Subject: [PATCH 0183/1357] update(Dashboard DataStructure Migration): adds
 migration file to change all old datastructures from the
 dashboard.tbl_dashboard_preset

---
 system/dbupdate_3.4.php                       |  2 ++
 .../61730_Dashboard_Anpassungen.php           | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 system/dbupdate_3.4/61730_Dashboard_Anpassungen.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 0e2b4e7c6..8ff7fab2b 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,8 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
+
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
new file mode 100644
index 000000000..a35c6188f
--- /dev/null
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -0,0 +1,34 @@
+<?php
+
+$result = @$db->db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+$errorList = array();
+for($i = 0; $i < $result_num_rows; $i++)
+{
+	$row = $db->db_fetch_object($result, $i);
+
+	$qry = "
+	UPDATE dashboard.tbl_dashboard_preset
+	SET preset = 
+	COALESCE(
+	(SELECT jsonb_object_agg(keys,values) FROM (
+		SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+		FROM jsonb_each(preset->'widgets')
+	) AS subquery 
+	),preset)
+	WHERE preset_id = ".$row->preset_id;
+
+	$db->db_query($qry);
+	if (!$db->db_query($qry))
+        array_push($errorList,'<br><strong>dashboard.tbl_dashboard_preset: ' . $db->db_last_error() . '</strong><br>') ;
+    
+}
+
+if(empty($errorList)){
+	echo '<br>successfully updated dashboard.tbl_dashboard_preset';
+}
+else{
+	foreach($errorList as $error){
+		echo $error;
+	}
+}

From a40f304d8d4518bd3b91b17ed3ed86c40872940c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 May 2025 12:05:12 +0200
Subject: [PATCH 0184/1357] update(Dashboard DataStructure Migration): also
 changes datastructure for the dashboard.tbl_dashboard_benuter_override

---
 .../61730_Dashboard_Anpassungen.php           | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
index a35c6188f..e59df948a 100644
--- a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -24,8 +24,31 @@ for($i = 0; $i < $result_num_rows; $i++)
     
 }
 
+$result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+for($i = 0; $i < $result_num_rows; $i++)
+{
+	$row = $db->db_fetch_object($result, $i);
+
+	$qry = "
+	UPDATE dashboard.tbl_dashboard_benutzer_override
+	SET override = 
+	COALESCE(
+	(SELECT jsonb_object_agg(keys,values) FROM (
+		SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+		FROM jsonb_each(override->'widgets')
+	) AS subquery 
+	),override)
+	WHERE override_id = ".$row->override_id;
+
+	$db->db_query($qry);
+	if (!$db->db_query($qry))
+        array_push($errorList,'<br><strong>dashboard.tbl_dashboard_benutzer_override: ' . $db->db_last_error() . '</strong><br>') ;
+    
+}
+
 if(empty($errorList)){
-	echo '<br>successfully updated dashboard.tbl_dashboard_preset';
+	echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
 }
 else{
 	foreach($errorList as $error){

From a858049e15bf4363aa97215560f67de90d55d583 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 15 May 2025 18:54:28 +0200
Subject: [PATCH 0185/1357] fix viewData prop validator, change nullish
 coalescing operator to logical or since optional router param is empty string
 and not an unset prop

---
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 1ac9ad912..7a8482a3f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -16,9 +16,9 @@ export const AbgabetoolStudent = {
 		viewData: {
 			type: Object,
 			required: true,
-			default: () => ({name: '', uid: ''}),
+			default: () => ({uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid
 			}
 		}
 	},
@@ -186,7 +186,7 @@ export const AbgabetoolStudent = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten() {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop ?? this.viewData?.uid ?? null)
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null)
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})

From c04c08bca4064ac706a155397b26b523c2e6e74a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 16 May 2025 08:22:19 +0200
Subject: [PATCH 0186/1357] finetune datepicker and timepicker config

---
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a279fb1c0..20685fa09 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -31,6 +31,20 @@ export const Raumsuche =  {
 				hours: new Date().getHours() + 1,
 				minutes: new Date().getMinutes()
 			}),
+			datepickerTextInputOptions: {
+				enterSubmit: true,
+				tabSubmit: true,
+				selectOnFocus: true,
+				format: 'dd.MM.yyyy',
+				escClose: true
+			},
+			timepickerTextInputOptions: {
+				enterSubmit: true,
+				tabSubmit: true,
+				selectOnFocus: true,
+				format: 'HH:mm',
+				escClose: true
+			},
 			raumsucheTableOptions: {
 				height: Vue.ref(400),
 				index: 'ort_kurzbz',
@@ -135,8 +149,8 @@ export const Raumsuche =  {
 			// TODO: router push
 		},
 		dateFormat(date) {
-			const day = date.getDate();
-			const month = date.getMonth() + 1;
+			const day = String(date.getDate()).padStart(2, '0');
+			const month = String(date.getMonth() + 1).padStart(2, '0');
 			const year = date.getFullYear();
 			return `${day}.${month}.${year}`
 		},
@@ -187,7 +201,8 @@ export const Raumsuche =  {
 				date-picker
 				:enable-time-picker="false"
 				:format="dateFormat"
-				:text-input="true"
+				:text-input="datepickerTextInputOptions"
+				:min-date="new Date()"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -197,7 +212,8 @@ export const Raumsuche =  {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				:text-input="true"
+				:text-input="timepickerTextInputOptions"
+				:is-24="true"
 				auto-apply
 				>
 			</VueDatePicker>
@@ -208,7 +224,8 @@ export const Raumsuche =  {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				:text-input="true"
+				:text-input="timepickerTextInputOptions"
+				:is-24="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>

From 875a7884760ae8a69cbde9f8bc83fcc8da2d2ce0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 16 May 2025 09:54:05 +0200
Subject: [PATCH 0187/1357] update(Dashboard rows and columns): additional row
 is not removed when going out with the mouse

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

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 9be07ca15..fe39a07d2 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -363,12 +363,12 @@ export default {
 			});
 		},
 		mouseLeave() {
-			if (this.mode == MODE_IDLE) {
+			/* if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
 				this.additionalRowComputed = false;
 				
-			}
+			} */
 		},
 		updateCursor(evt) {
 			if (!this.active) {

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

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

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

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

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

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

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

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

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

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

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

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

From df108482eb89652e09a65894d4ad164dbf462634 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 09:09:48 +0200
Subject: [PATCH 0192/1357] update(Dashboard additionalRow): opens tooltip when
 hovering over the button to add a now line to the dashboard grid

---
 public/js/components/Dashboard/Section.js |  4 ++--
 system/phrasesupdate.php                  | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 05c3f940f..43031b8c1 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -210,11 +210,11 @@ export default {
 	},
 	template: `
 	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i v-tooltip="{ value: showSectionInformation(name), hideDelay: 300 }" class="fa-solid fa-circle-info section-info" ></i>
+		<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
+		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f51e8a200..32bbb4364 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40581,6 +40581,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'addLine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Weitere Zeile hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add another line',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',

From 4a10faeb252abf7e013119891ceb479e2b121552 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 10:28:15 +0200
Subject: [PATCH 0193/1357] update(Dashboard custom Section & additionalRow):
 the additional row is not removed when moving widgets and the custom section
 gets also created when created user_overrides

---
 application/libraries/dashboard/DashboardLib.php | 2 +-
 public/js/components/Drop/Grid.js                | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 7aab6b949..f6d7d6599 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -107,7 +107,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}}}';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index fe39a07d2..55b9b1bbd 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -128,7 +128,11 @@ export default {
 			return [...this.placedItems, ...this.items_placeholders];
 		},
 		rows() {
-			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
+			if (this.additionalRowComputed) {
+					return this.grid ? (this.grid.h+1) : 1;
+			}
+			return this.grid ? this.grid.h : 1;
+			/* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
 			}
 			if (this.mode == MODE_IDLE) {
@@ -136,7 +140,7 @@ export default {
 					return this.grid ? (this.grid.h+1) : 1;
 				}
 			}
-			return this.grid ? this.grid.h : 1;
+			return this.grid ? this.grid.h : 1; */
 		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;

From da118cbf0a789044226a43bfa934c074bdb9c3c7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 12:53:36 +0200
Subject: [PATCH 0194/1357] refactor(Studium):groups the studienplaene to their
 studienordnung, sorts the lehrveranstaltungs module and the single
 lehrveranstaltungen

---
 public/js/components/Cis/Studium/Studium.js | 54 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 30d21ed1b..e2ef65232 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -163,6 +163,27 @@ export default {
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
 
 			this.lehrveranstaltungen = lehrveranstaltungen;
+			this.lehrveranstaltungen.sort((lv1, lv2) => {
+				if (lv1.bezeichnung.toLowerCase() > lv2.bezeichnung.toLowerCase()) {
+					return 1;
+				} else if (lv1.bezeichnung.toLowerCase() < lv2.bezeichnung.toLowerCase()) {
+					return -1;
+				} else {
+					return 0;
+				}
+			});
+
+			this.lehrveranstaltungen.forEach((lehrveranstaltung)=>{
+				lehrveranstaltung.lehrveranstaltungen.sort((lv1,lv2)=>{
+					if (lv1.bezeichnung.toLowerCase() > lv2.bezeichnung.toLowerCase()) {
+						return 1;
+					} else if (lv1.bezeichnung.toLowerCase() < lv2.bezeichnung.toLowerCase()) {
+						return -1;
+					} else {
+						return 0;
+					}
+				})
+			})
 		},
 		studienordnungTitel(studienordnung){
 			if(!studienordnung) return "";
@@ -192,6 +213,35 @@ export default {
 			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
 			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
 		},
+		computedStudienOrdnung(){
+			if(!this.studienOrdnung) return null;
+			return Object.values(this.studienOrdnung).reduce((carry, item)=>{
+				if(!carry[item.bezeichnung]){
+					carry[item.bezeichnung] = [];
+				}
+				carry[item.bezeichnung].push(item);
+				return carry;
+			},{});
+		},
+		computedStudienOrdnungSelectValues() {
+			if (!this.computedStudienOrdnung) return null;
+			let result = [];
+			Object.entries(this.computedStudienOrdnung).forEach(([key,value])=>{
+				result.push({
+					bezeichnung: `Studienordnung: ${key}`,
+					disabled: true,
+				});
+				value.forEach((studienplan)=>{
+					result.push({
+						studienplan:studienplan,
+						diabled: false,
+						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${studienplan?.orgform_bezeichnung}, ${studienplan?.sprache} )`
+							
+					});
+				})
+			});
+			return result;
+		},
 	},
 	
 	created(){
@@ -275,7 +325,7 @@ export default {
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung.studienplan_id)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -291,7 +341,7 @@ export default {
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
 				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
-				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
+				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrform_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">

From af1364faef1def93725731531912d57c42687bff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 20 May 2025 16:56:25 +0200
Subject: [PATCH 0195/1357] update(Studium):changes layout

---
 public/js/components/Cis/Studium/Studium.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index e2ef65232..fe6dab458 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -270,6 +270,7 @@ export default {
 				<h4>Lektoren:</h4>
 				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
+			<h4>Menu:</h4>
 		</template>
 	</lv-uebersicht>
 	<div class="lvOptions">
@@ -336,7 +337,7 @@ export default {
 
 	<hr>
 
-	<div class="lvUebersicht" >
+	<div class="lvUebersicht align-items-start" >
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
@@ -345,8 +346,9 @@ export default {
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
-					<li class="list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="d-block" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
+						<a class="link-dark d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>
 			</div>
@@ -355,7 +357,6 @@ export default {
 	</div>
 
 
-	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
 	</div>
 	
 	`

From a1423c33e5d1c40e96b01be0854f5ff0bce8ec3b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 21 May 2025 14:12:16 +0200
Subject: [PATCH 0196/1357] update(Studium): fetches the preselect lehrverband
 values if the user is a student

---
 .../controllers/api/frontend/v1/Studium.php   | 43 +++++++++++--------
 public/js/components/Cis/Studium/Studium.js   |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index ecaf72918..be2e79800 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -58,6 +58,27 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		
+		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
+			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
+			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
+			
+			if(!isset($parameter_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
+			if(!isset($parameter_studienplan))
+			$parameter_studienplan = $student_studienplan;
+		}  
+
 		if(isset($parameter_studiensemester)){
 			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
 		}
@@ -76,7 +97,7 @@ class Studium extends FHCAPI_Controller
 		// fetch studiensemester
 		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
 		
-		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
@@ -156,24 +177,7 @@ class Studium extends FHCAPI_Controller
 		$result->studienplan["preselected"]=$aktuelles_studienplan; 
 		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
 		
-		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
-			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
-			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			$result->studentLehrverband = $studentLehrverband;
-			//$currentStudienplan = $this->StudienplanModel->loadWhere(["studiengang_kz"=>$studentLehrverband->studiengang_kz,"semester"=>$studentLehrverband->semester, "verband"=>$studentLehrverband->verband, "gruppe"=>$studentLehrverband->gruppe]);
-			$studienplaene = $this->getDataOrTerminateWithError($this->computeStudienplaene($studentLehrverband->studiengang_kz, $studentLehrverband->studiensemester_kurzbz));
-			$result->studienPleane = $studienplaene;
-			
-			//get the studienplan for the user
-			$preselectedStudienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId());
-
-			//set the preselected semester
-			$preselectedSemester = $preselectedStudienplan->semester;
-			
-			//get the studienordnung for the studienplan
-			$preselectedStudienordnung = $this->getStudienOrdnungForStudienplan($preselectedStudienplan->studienplan_id);
-			
-		}  */
+		
 		$this->terminateWithSuccess($result);
 	}
 
@@ -272,6 +276,7 @@ class Studium extends FHCAPI_Controller
 		return $lektoren;
 	}
 
+
 	
 	
 }
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index fe6dab458..9e716d7df 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -337,7 +337,7 @@ export default {
 
 	<hr>
 
-	<div class="lvUebersicht align-items-start" >
+	<div class="lvUebersicht " >
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">

From c26bb98960eb5d6186f8efc2a25144bbce59f175 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 21 May 2025 15:34:43 +0200
Subject: [PATCH 0197/1357] new Core Component Function

- autocomplete and dropdown field for search oes and search functions with active and non active entries
- possibility to dynamic styling of display switch, newButton in Tabulator, different editLabels
- possibility to show/hide column company
- possibility to show/hide to save function as copy
---
 .../api/frontend/v1/funktionen/Funktionen.php |  385 ++++++
 .../api/frontend/v1/stv/Config.php            |    5 +
 .../Organisationseinheit_model.php            |   68 +
 .../models/ressource/Funktion_model.php       |   22 +
 application/views/Studentenverwaltung.php     |    3 +-
 public/css/components/function.css            |    3 +
 public/js/api/factory/functions.js            |  124 ++
 public/js/components/Funktionen/Funktionen.js | 1126 ++++++++---------
 .../Funktionen/Funktionen_composition_api.js  |  622 +++++++++
 .../Studentenverwaltung/Details/Funktionen.js |   11 +-
 .../Details/FunktionenOld.js                  |   28 +
 system/phrasesupdate.php                      |  102 +-
 12 files changed, 1891 insertions(+), 608 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/funktionen/Funktionen.php
 create mode 100644 public/css/components/function.css
 create mode 100644 public/js/api/factory/functions.js
 create mode 100644 public/js/components/Funktionen/Funktionen_composition_api.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js

diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
new file mode 100644
index 000000000..d6d4a0ae4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -0,0 +1,385 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Funktionen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		//TODO(Manu) check permissions
+		parent::__construct(array(
+				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getContractFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getCurrentFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getOrgHeads' =>  ['admin:r', 'assistenz:r'],
+				'getOrgetsForCompany' => ['admin:r', 'assistenz:r'],
+				'loadAllOes' => ['admin:r', 'assistenz:r'],
+				'searchOes' => ['admin:r', 'assistenz:r'],
+				'searchFunctions' => ['admin:r', 'assistenz:r'],
+				'loadFunction' => ['admin:r', 'assistenz:r'],
+				'insertFunction' => ['admin:rw', 'assistenz:rw'],
+				'updateFunction' => ['admin:rw', 'assistenz:rw'],
+				'deleteFunction' => ['admin:rw', 'assistenz:rw'],
+			)
+		);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model', 'ApiModel');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+	}
+
+	public function getOrgHeads()
+	{
+		$result = $this->OrganisationseinheitModel->getHeads();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllUserFunctions($uid)
+	{
+		if(!$uid)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$sql = "
+			SELECT
+				dv.dienstverhaeltnis_id,
+				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' 
+				 || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
+				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
+				f.beschreibung AS funktion_beschreibung,
+				bf.*,
+				fb.bezeichnung AS fachbereich_bezeichnung,
+			    CASE
+					WHEN
+						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
+					THEN
+						false
+					ELSE
+						true
+				END aktiv
+			FROM
+				public.tbl_benutzerfunktion bf
+			JOIN
+				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
+			JOIN
+				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+            JOIN
+				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
+			LEFT JOIN
+				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
+			LEFT JOIN
+				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
+			LEFT JOIN
+				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
+            WHERE
+				bf.uid = ?
+            ORDER BY
+				f.beschreibung, bf.datum_von ASC";
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
+		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	//TODO(Manu) DELETE
+	public function DEPR_getCurrentFunctions($uid, $companyOrgetkurzbz)
+	{
+	$sql = "
+		SELECT
+			bf.benutzerfunktion_id, f.beschreibung || ', '
+			|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
+			|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
+			|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
+			|| COALESCE(dvu.attachedtovb, '') AS label
+
+			FROM (
+			WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+			(
+			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+			WHERE oe_kurzbz = ?
+			UNION ALL
+			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+			)
+			SELECT oe_kurzbz
+			FROM oes
+			GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
+			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN (
+			SELECT
+			benutzerfunktion_id, ' [DV]' AS attachedtovb
+			FROM
+			hr.tbl_vertragsbestandteil_funktion
+			GROUP BY
+			benutzerfunktion_id
+			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
+			WHERE bf.uid = ?
+			ORDER BY f.beschreibung ASC";
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array( $companyOrgetkurzbz,$uid));
+		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	{
+		$sql = "
+			SELECT
+				oe.oe_kurzbz,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz=?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
+		$data = $this->getDataOrTerminateWithError($childorgets);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	//TODO(Manu) DELETE
+	/*
+	 * List of Oes for autocomplete field organisation unit
+	 */
+	public function DEPR_loadAllOes($filterStudent=false, $aktiv=true)
+	{
+		$sql = "
+			SELECT
+			    oe_kurzbz,
+			    CONCAT('[', organisationseinheittyp_kurzbz, '] ', bezeichnung) as label
+			FROM public.tbl_organisationseinheit 
+			WHERE aktiv = ?";
+
+		if($filterStudent)
+			$sql .= " AND organisationseinheittyp_kurzbz in ('Studiengang','Lehrgang')";
+
+		$sql .= " ORDER BY organisationseinheittyp_kurzbz, bezeichnung";
+
+		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($aktiv));
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function searchOes($companyOrgetKurzbz, $searchString = null)
+	{
+		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function searchFunctions($searchString = null)
+	{
+
+		$result = $this->FunktionModel->getAutocompleteSuggestions($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function loadFunction($benutzerfunktion_id)
+	{
+		$this->BenutzerfunktionModel->addSelect("*");
+		$result = $this->BenutzerfunktionModel->loadWhere(
+			array('benutzerfunktion_id' => $benutzerfunktion_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertFunction()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$uid = $this->input->post('uid');
+
+		if(!$uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$datum_von = $formData['datum_von'] ?? null;
+		$datum_bis = $formData['datum_bis'] ?? null;
+		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
+		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
+			? $formData['funktion_kurzbz']['funktion_kurzbz']
+			: $formData['funktion_kurzbz'];
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$wochenstunden = $formData['wochenstunden'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
+		]);
+		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
+		]);
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
+		]);
+		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BenutzerfunktionModel->insert([
+			'uid' => $uid,
+			'datum_von' => $datum_von,
+			'datum_bis' => $datum_bis ,
+			'oe_kurzbz' => 	$formData['oe_kurzbz'],
+			'funktion_kurzbz' => $formData['funktion_kurzbz'],
+			'bezeichnung' => $bezeichnung,
+			'wochenstunden' => $wochenstunden,
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateFunction()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$uid = $this->input->post('uid');
+
+		if(!$uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$benutzerfunktion_id = $this->input->post('benutzerfunktion_id');
+
+		if(!$benutzerfunktion_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Benutzerfunktion ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$datum_von = $formData['datum_von'] ?? null;
+		$datum_bis = $formData['datum_bis'] ?? null;
+		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
+		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
+			? $formData['funktion_kurzbz']['funktion_kurzbz']
+			: $formData['funktion_kurzbz'];
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$wochenstunden = $formData['wochenstunden'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
+		]);
+		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
+		]);
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
+		]);
+		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BenutzerfunktionModel->update(
+			[
+				'benutzerfunktion_id' => $benutzerfunktion_id,
+			],
+			[
+				'uid' => $uid,
+				'datum_von' => $datum_von,
+				'datum_bis' => $datum_bis ,
+				'oe_kurzbz' => 	$formData['oe_kurzbz'],
+				'funktion_kurzbz' => $formData['funktion_kurzbz'],
+				'bezeichnung' => $bezeichnung,
+				'wochenstunden' => $wochenstunden,
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteFunction($benutzerfunktion_id)
+	{
+		$result = $this->BenutzerfunktionModel->delete(
+			array('benutzerfunktion_id' => $benutzerfunktion_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d37a6d6ec..f22f888de 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -132,6 +132,11 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_functions'),
 			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
+/*		TODO(Manu) REMOVE just for Testing*/
+		$result['functions_composition'] = [
+			'title' => 'F_PV21',
+			'component' => './Stv/Studentenverwaltung/Details/FunktionenOld.js'
+		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 1b1a826aa..b146ee7e5 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -217,4 +217,72 @@ class Organisationseinheit_model extends DB_Model
 			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
 		");
 	}
+
+	/**
+	 * Get OEs by eventQuery string and companyOrgetKurzbz
+	 * Use with autocomplete event queries in Function Component
+	 * @param $searchString String
+	 * @param $companyOrgetKurzbz String oe_kurzbz of the company (gst vs gmbh)
+	 * @return array
+	 */
+	public function getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString)
+	{
+		$sql = "
+        WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) AS (
+            SELECT oe_kurzbz, oe_parent_kurzbz
+            FROM public.tbl_organisationseinheit
+            WHERE oe_kurzbz = ?
+            UNION ALL
+            SELECT o.oe_kurzbz, o.oe_parent_kurzbz
+            FROM public.tbl_organisationseinheit o
+            INNER JOIN oes ON o.oe_parent_kurzbz = oes.oe_kurzbz
+        )
+        SELECT
+            oe.oe_kurzbz, oe.aktiv,
+            '[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+            '] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+        FROM (
+            SELECT oe_kurzbz FROM oes GROUP BY oe_kurzbz
+        ) c
+        JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+        JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+    ";
+
+		$params = [$companyOrgetKurzbz];
+
+		if (!empty($searchString)) {
+			$escaped = $this->escapeLike($searchString);
+			$ilike = '%' . $escaped . '%';
+
+			$sql .= "
+            WHERE
+                oe.oe_kurzbz ILIKE ? OR
+                oe.bezeichnung ILIKE ? OR
+                oe.organisationseinheittyp_kurzbz ILIKE ?
+        ";
+
+			$params[] = $ilike;
+			$params[] = $ilike;
+			$params[] = $ilike;
+		}
+
+		$sql .= " ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$result = $this->execQuery($sql, $params);
+
+		return $result;
+	}
+
+
+	/**
+	 * get highest organisation units
+	 */
+	public function getHeads()
+	{
+		$this->addSelect('*');
+		$this->addSelect('oe_kurzbz as head');
+		$result = $this->loadWhere(array('oe_parent_kurzbz' => null, 'aktiv' => true));
+
+		return $result;
+	}
 }
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
index 43908167c..60965b438 100644
--- a/application/models/ressource/Funktion_model.php
+++ b/application/models/ressource/Funktion_model.php
@@ -11,4 +11,26 @@ class Funktion_model extends DB_Model
 		$this->dbTable = 'public.tbl_funktion';
 		$this->pk = 'funktion_kurzbz';
 	}
+
+	/**
+	 * Get Functions by eventQuery string. Use with autocomplete event queries in Function Component
+	 * @param $eventQuery String
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery)
+	{
+		$this->addSelect('funktion_kurzbz, beschreibung, aktiv');
+		$this->addSelect("beschreibung AS label");
+		$this->addOrder('beschreibung', 'ASC');
+
+		if($eventQuery === null)
+		{
+			return $this->load();
+		}
+
+		return $this->loadWhere("
+			funktion_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
+			OR beschreibung ILIKE '%". $this->escapeLike($eventQuery). "%'
+		");
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 398b921d2..a1b7fe347 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -18,7 +18,8 @@
 			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
-			'public/css/Studentenverwaltung.css'
+			'public/css/Studentenverwaltung.css',
+			'public/css/components/function.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
diff --git a/public/css/components/function.css b/public/css/components/function.css
new file mode 100644
index 000000000..3e5e4a632
--- /dev/null
+++ b/public/css/components/function.css
@@ -0,0 +1,3 @@
+.item-inactive {
+    text-decoration: line-through;
+}
\ No newline at end of file
diff --git a/public/js/api/factory/functions.js b/public/js/api/factory/functions.js
new file mode 100644
index 000000000..ac717050a
--- /dev/null
+++ b/public/js/api/factory/functions.js
@@ -0,0 +1,124 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+export default {
+	getContractFunctions(filter) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getContractFunctions';
+		if( typeof filter !== 'undefined' && filter !== null ) {
+			url = url + '/' + filter;
+		}
+		return {
+			method: 'get',
+			url,
+		};
+
+	},
+	getOrgHeads() {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgHeads';
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getOrgetsForCompany(unternehmen) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgetsForCompany'
+			+ '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	loadAllOes(filterStudent) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/loadAllOes'
+			+ '/' + filterStudent;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCompanyByOrget(orget) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getCompanyByOrget'
+			+ '/' + orget;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getCurrentFunctions'
+			+ '/' + mitarbeiter_uid + '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	}  ,
+	getAllUserFunctions(mitarbeiter_uid) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllUserFunctions'
+			+ '/' + mitarbeiter_uid;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getAllFunctions() {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllFunctions';
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	addFunction(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/insertFunction/',
+			params
+		};
+	},
+	loadFunction(benutzerfunktion_id) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/loadFunction'
+			+ '/' + benutzerfunktion_id;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	updateFunction(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/updateFunction/',
+			params
+		};
+	},
+	deleteFunction(benutzerfunktion_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/deleteFunction/' + benutzerfunktion_id
+		};
+	},
+	getOes(head, searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/funktionen/Funktionen/searchOes/' + head + '/' + searchString
+		};
+	},
+	getFunctions(searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/funktionen/Funktionen/searchFunctions/' + searchString
+		};
+	}
+
+};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 335edd906..9618bdf9b 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -1,623 +1,547 @@
-import { Modal } from './Modal.js';
-import { ModalDialog } from './ModalDialog.js';
-import { Toast } from './Toast.js';
-import {OrgChooser} from "./OrgChooser.js";
-import { usePhrasen } from '../../mixins/Phrasen.js';
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import FormInput from "../Form/Input.js";
+import FormForm from "../Form/Form.js";
+import BsModal from "../Bootstrap/Modal.js";
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
+import ApiCoreFunktion from '../../api/factory/functions.js';
 
-export const Funktionen = {
+export default {
 	name: 'FunctionComponent',
 	components: {
-		Modal,
-		ModalDialog,
-		Toast,
-		OrgChooser,
-		"datepicker": VueDatePicker
+		CoreFilterCmpt,
+		FormInput,
+		FormForm,
+		BsModal,
+		PvAutoComplete
 	},
 	props: {
-		modelValue: { type: Object, default: () => ({}), required: false},
-		config: { type: Object, default: () => ({}), required: false},
-		readonlyMode: { type: Boolean, required: false, default: false },
-		personID: { type: Number, required: false },
-		personUID: { type: String, required: false },
-		writePermission: { type: Boolean, required: false },
-		showDvCompany: { tpye: Boolean, required: false, default: true }
+		modelValue: {
+			type: Object,
+			default: () => ({}),
+			required: false
+		},
+		config: {type: Object, default: () => ({}), required: false},
+		readonlyMode: {type: Boolean, required: false, default: false},
+		personID: {type: Number, required: true},
+		personUID: {type: String, required: true},
+		writePermission: {type: Boolean, required: false},
+		showDvCompany: {type: Boolean, required: false, default: true},
+		saveFunctionAsCopy: {type: Boolean, required: false, default: false},
+		stylePv21: {type: Boolean, required: false, default: false},
+		companyLinkFormatter: {type: Function || null,	default: null}
 	},
-	emits: ['updateHeader'],
-	setup( props, { emit } ) {
-
-		const $api = Vue.inject('$api');
-		//const fhcAlert = Vue.inject('$fhcAlert');
-
-
-		const readonly = Vue.ref(false);
-
-		const { t } = usePhrasen();
-
-		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
-		const currentPersonID = Vue.computed(() => { return props.personID });
-		const currentPersonUID = Vue.computed(() => { return props.personUID });
-
-		const dialogRef = Vue.ref();
-
-		const isFetching = Vue.ref(false);
-
-		const theModel = Vue.computed({
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		const unternehmen = Vue.ref();
-		const jobfunctionList = Vue.ref([]);
-		const jobfunctionDefList = Vue.ref([]);
-		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
-
-		const aktivChecked = Vue.ref(true);
-
-		const table = Vue.ref(null); // reference to your table element
-		const tabulator = Vue.ref(null); // variable to hold your table
-		const tableData = Vue.reactive([]); // data for table to display
-
-
-		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
-
-		const convertArrayToObject = (array, key) => {
-			const initialValue = {};
-			return array.reduce((obj, item) => {
-				return {
-					...obj,
-					[item[key]]: item,
-				};
-			}, initialValue);
-		};
-
-		const fetchData = async () => {
-			if (currentPersonID.value==null && theModel.value.personID==null) {
-				jobfunctionList.value = [];
-				return;
-			}
-			isFetching.value = true
-
-			// fetch data and map them for easier access
-			try {
-				const response = await $api.call(
-					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
-				if(response.error === 1) {
-					let rawList = [];
-					tableData.value = [];
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				} else {
-					let rawList = response.retval;
-					tableData.value = response.retval;
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				}
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-
-		}
-
-		const createShape = () => {
-			return {
-				benutzerfunktion_id: 0,
-				uid: theModel.value.personUID || currentPersonUID.value,
-				oe_kurzbz: "",
-				funktion_kurzbz: "",
-				datum_von: "",
-				datum_bis: "",
-				bezeichnung: "",
-				wochenstunden: 0,
-			}
-		}
-
-		const currentValue = Vue.ref(createShape());
-		const preservedValue = Vue.ref(createShape());
-
-		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
-			fetchData();
-		});
-
-		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
-			fetchOrgUnits(unternehmen_kurzbz);
-			fetchFunctions();
-		});
-
-		const toggleMode = async () => {
-			if (!readonly.value) {
-				// cancel changes?
-				if (hasChanged.value) {
-					const ok = await dialogRef.value.show();
-					if (ok) {
-						console.log("ok=", ok);
-						currentValue.value = preservedValue.value;
-					} else {
-						return
-					}
-				}
-			} else {
-				// switch to edit mode and preserve data
-				preservedValue.value = {...currentValue.value};
-			}
-			readonly.value = !readonly.value;
-		}
-
-		Vue.onMounted(async () => {
-			currentValue.value = createShape();
-			await fetchData();
-
-			const dateFormatter = (cell) => {
-				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-			}
-
-			const dvFormatter = (cell) => {
-				if( props.readonlyMode === true ) {
-					return (cell.getValue() != null) ? cell.getValue() : '';
-				}
-				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
-				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
-			}
-
-			// helper
-			const createDomButton = (classValue, clickHandler) => {
-				const nodeBtn = document.createElement("button");
-				const classAttrBtn = document.createAttribute("class");
-				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
-				nodeBtn.setAttributeNode(classAttrBtn);
-				nodeBtn.addEventListener("click", clickHandler);
-				const nodeI = document.createElement("i");
-				const classAttrI = document.createAttribute("class");
-				classAttrI.value = classValue;
-				nodeI.setAttributeNode(classAttrI);
-				nodeBtn.appendChild(nodeI);
-				return nodeBtn;
-			}
-
-			const btnFormatter = (cell) => {
-
-				const nodeDiv = document.createElement("div");
-				const classAttrDiv = document.createAttribute("class");
-				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
-				nodeDiv.setAttributeNode(classAttrDiv);
-				// delete button
-				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
-				// edit button
-				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
-
-				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
-					nodeDiv.appendChild(nodeBtnEdit);
-					nodeDiv.appendChild(nodeBtnDel);
-				}
-
-				return nodeDiv;
-			}
-
-
-			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
-				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
-				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
-			];
-
-			if( props.readonlyMode === false) {
-				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
-			}
-
-			let tabulatorOptions = {
-				height: "100%",
-				layout: "fitColumns",
-				movableColumns: true,
-				reactiveData: true,
-				columns: columnsDef,
-				//data: tableData.value,
-				data: jobfunctionListArray.value,
-			};
-
-			tabulator.value = new Tabulator(
-				table.value,
-				tabulatorOptions
-			);
-
-			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
-				//headerValue - the value of the header filter element
-				//rowValue - the value of the column in this row
-				//rowData - the data for the row being filtered
-				//filterParams - params object passed to the headerFilterFuncParams property
-
-				const validDate = function(d){
-					return d instanceof Date && isFinite(d);
-				}
-
-				const date1 = new Date(rowValue);
-				date1.setHours(0,0,0,0);
-				let [day, month, year] = headerValue.split('.')
-				if (year < 1000) return true;  // prevents dates like 17.5.2
-				const date2 = new Date(+year, +month - 1, +day);
-
-				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
-			}
-
-			tabulator.value.on('tableBuilt', () => {
-				//tabulator.value.setData(tableData.value);
-
-			})
-
-		})
-
-		const jobfunctionListArray = Vue.computed(() => {
-			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
-			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
-			return filtered;
-		});
-
-		// Workaround to update tabulator
-		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
-			console.log('jobfunctionList changed');
-			tabulator.value?.setData(jobfunctionListArray.value);
-		}, {deep: true})
-
-		// Modal
-		const modalRef = Vue.ref();
-		const confirmDeleteRef = Vue.ref();
-
-		const showAddModal = () => {
-			currentValue.value = createShape();
-			// reset form state
-			frmState.orgetBlurred=false;
-			frmState.funktionBlurred=false;
-			frmState.beginnBlurred=false;
-			// call bootstrap show function
-			modalRef.value.show();
-		}
-
-		const hideModal = () => {
-			modalRef.value.hide();
-		}
-
-		const showEditModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			// fetch company
-			isFetching.value = true;
-			try {
-				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
-				if (res.error == 0) {
-					unternehmen.value = res.retval[0].oe_kurzbz;
-				} else {
-					console.log('company not found for orget!');
-				}
-
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-			//delete currentValue.value.bezeichnung;
-			modalRef.value.show();
-		}
-
-		const showDeleteModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			const ok = await confirmDeleteRef.value.show();
-
-			if (ok) {
-
-				try {
-					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
-					if (res.error == 0) {
-						delete jobfunctionList.value[id];
-						showDeletedToast();
-						theModel.value.updateHeader();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-			}
-		}
-
-
-		const okHandler = async () => {
-			if (!validate()) {
-
-				console.log("form invalid");
-
-			} else {
-
-				// submit
-				try {
-					let payload = {...currentValue.value};
-					delete payload.dienstverhaeltnis_id;
-					delete payload.dienstverhaeltnis_unternehmen;
-					delete payload.fachbereich_bezeichnung;
-					delete payload.funktion_oebezeichnung;
-					delete payload.aktiv;
-					delete payload.funktion_beschreibung;
-					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
-					if (r.error == 0) {
-						// fetch all data because of all the references in the changed record
-						await fetchData();
-						console.log('job function successfully saved');
-						theModel.value.updateHeader();
-						showToast();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-				hideModal();
-			}
-		}
-
-		// -------------
-		// form handling
-		// -------------
-
-		const jobFunctionFrm = Vue.ref();
-
-		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
-
-		const notEmpty = (n) => {
-			return !!n && n.trim() != "";
-		}
-
-		const validate = () => {
-			frmState.orgetBlurred = true;
-			frmState.funktionBlurred = true;
-			frmState.beginnBlurred = true;
-			return notEmpty(currentValue.value.datum_von) &&
-				notEmpty(currentValue.value.oe_kurzbz) &&
-				notEmpty(currentValue.value.funktion_kurzbz);
-		}
-
-
-		const hasChanged = Vue.computed(() => {
-			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
-		});
-
-		const formatDate = (d) => {
-			if (d != null && d != '') {
-				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
-			} else {
-				return ''
-			}
-		}
-
-		// Toast
-		const toastRef = Vue.ref();
-		const deleteToastRef = Vue.ref();
-
-		const showToast = () => {
-			toastRef.value.show();
-		}
-
-		const showDeletedToast = () => {
-			deleteToastRef.value.show();
-		}
-
-		const fetchOrgUnits = async (unternehmen_kurzbz) => {
-			if( unternehmen_kurzbz === '' ) {
-				return;
-			}
-			const response = await $api.call(
-				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
-			const orgets = response.retval;
-			orgets.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			orgUnitList.value = await  orgets;
-		}
-
-		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
-			if(unternehmen_kurzbz === '' || uid === '' ) {
-				return;
-			}
-			const response = await $api.call(ApiFunktion.getAllFunctions());
-			const benutzerfunktionen = response.retval;
-			benutzerfunktionen.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			jobfunctionDefList.value = benutzerfunktionen;
-		}
-
-		const unternehmenSelectedHandler = (e) => {
-			console.log('unternehmen selected: ',e);
-			unternehmen.value = e;
-		}
-
-		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
-
+	data(){
 		return {
-			jobfunctionList, orgUnitList, jobfunctionListArray,
-			jobfunctionDefList,
-			currentValue,
-			readonly,
-			frmState,
-			dialogRef,
-			toastRef, deleteToastRef,
-			jobFunctionFrm,
-			modalRef,
-			fullPath,
-			route,
-			aktivChecked,
-			unternehmen,
-			tabulator,
-			table,
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiCoreFunktion.getAllUserFunctions(this.personUID)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{
+						title: "dienstverhaeltnis_unternehmen",
+						field: "dienstverhaeltnis_unternehmen",
+						width: 50,
+						headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+						formatter: this.companyLinkFormatter
+					},
+					{
+						title: "funktion_beschreibung", field: "funktion_beschreibung", headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+					},
+					{
+						title: "funktion_oebezeichnung", field: "funktion_oebezeichnung", headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"}
+					},
+					{title: "wochenstunden", field: "wochenstunden", headerFilter: true},
+					{
+						title: "Von",
+						field: "datum_von",
+						headerFilter: true,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
 
-			toggleMode, formatDate, notEmpty,
-			showToast, showDeletedToast,
-			showAddModal, hideModal, okHandler,
-			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler,
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						},
+					},
+					{
+						title: "Bis",
+						field: "datum_bis",
+						headerFilter: true,
+						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: "bezeichnung", field: "bezeichnung", headerFilter: true},
+					{title: "aktiv", field: "aktiv", visible: false},
+					{title: "benutzerfunktion_id", field: "benutzerfunktion_id", visible: false},
+					{title: "uid", field: "uid", visible: false},
+					{
+						//title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+
+							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								if(this.stylePv21)
+									button.innerHTML = '<i class="fa fa-pen"></i>';
+								else
+									button.innerHTML = '<i class="fa fa-edit"></i>';
+								button.title = this.$p.t('ui', 'bearbeiten');
+								button.addEventListener('click', (event) =>
+									this.actionEditFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+								let 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.actionDeleteFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+
+							if (cell.getRow().getData().dienstverhaeltnis_unternehmen === null  && this.saveFunctionAsCopy) {
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-copy"></i>';
+								button.title = this.$p.t('ui', 'saveAsCopy');
+								button.addEventListener('click', () =>
+									this.actionCopyFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+
+							return container;
+						},
+						frozen: true
+					}
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: '300',
+				persistenceID: 'core-functions',
+			},
+			tabulatorEvents: [
+				{
+					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: 100,
+							visible: this.showDvCompany,
+						};
+						column.component.updateDefinition(companyDv);
+
+						cm.getColumnByField('funktion_beschreibung').component.updateDefinition({
+							title: this.$p.t('person', 'zuordnung_taetigkeit'),
+							width: 100
+						});
+						cm.getColumnByField('funktion_oebezeichnung').component.updateDefinition({
+							title: this.$p.t('lehre', 'organisationseinheit'),
+							width: 100
+						});
+						cm.getColumnByField('wochenstunden').component.updateDefinition({
+							title: this.$p.t('person', 'wochenstunden')
+						});
+
+						const columnDatumVon = cm.getColumnByField('datum_von');
+						const fieldVonDatum = {
+							title: this.$p.t('ui', 'from')
+						};
+
+						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: 100
+						});
+
+					}
+				}
+			],
+			isFilterSet: false,
+			listOrgHeads: [],
+			listOrgUnits: [],
+			formData: {
+				head: 'gst',
+				oe_kurzbz: ''
+			},
+			statusNew: true,
+			listAllFunctions: [],
+			abortController: {
+				oes: null,
+				functions: null
+			},
+			filteredOes: [],
+			filteredFunctions: [],
+			newBtnStyle: ''
 		}
 	},
+	computed: {
+	},
+	methods: {
+		onSwitchChange() {
+			if (this.isFilterSet) {
+				this.$refs.table.tabulator.setFilter("aktiv", "=", true);
+			}
+			else {
+				this.$refs.table.tabulator.clearFilter();
+				this.isFilterSet = false;
+			}
+		},
+		actionNewFunction(){
+			this.resetModal();
+			this.statusNew = true;
+			this.$refs.functionModal.show();
+		},
+		actionCopyFunction(benutzerfunktion_id) {
+			this.statusNew = true;
+			this.loadFunction(benutzerfunktion_id).then(() => {
+				this.$refs.functionModal.show();
+			});
+		},
+		actionDeleteFunction(benutzerfunktion_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? benutzerfunktion_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFunction)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditFunction(benutzerfunktion_id) {
+			this.resetModal();
+			this.statusNew = false;
+			this.loadFunction(benutzerfunktion_id);
+			this.$refs.functionModal.show();
+		},
+		addFunction() {
+			const dataToSend = {
+				uid: this.personUID,
+				formData: this.formData
+			};
+			return this.$refs.functionData
+				.call(ApiCoreFunktion.addFunction(dataToSend))
+				.then(response => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('functionModal');
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadFunction(benutzerfunktion_id) {
+			return this.$api
+				.call(ApiCoreFunktion.loadFunction(benutzerfunktion_id))
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateFunction(benutzerfunktion_id){
+			const dataToSend = {
+				uid: this.personUID,
+				formData: this.formData,
+				benutzerfunktion_id: benutzerfunktion_id
+			};
+			return this.$refs.functionData
+				.call(ApiCoreFunktion.updateFunction(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('functionModal');
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deleteFunction(benutzerfunktion_id) {
+			return this.$api
+				.call(ApiCoreFunktion.deleteFunction(benutzerfunktion_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		getOrgetsForCompany(){
+			return this.$api
+				.call(ApiCoreFunktion.getOrgetsForCompany(this.formData.head))
+				.then(result => {
+					this.listOrgUnits = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		hideModal(modalRef) {
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetModal(){
+			this.formData = {};
+			this.formData.head = 'gst';
+			this.formData.oe_kurzbz = '';
+			this.formData.funktion_kurzbz = '';
+		},
+		searchOe(event) {
+			if (this.abortController.oes) {
+				this.abortController.oes.abort();
+			}
+
+			this.abortController.oes = new AbortController();
+
+			return this.$api
+				.call(ApiCoreFunktion.getOes(this.formData.head, event.query))
+				.then(result => {
+					this.filteredOes = result.data.retval;
+				});
+		},
+		searchFunctions(event) {
+			if (this.abortController.functions) {
+				this.abortController.functions.abort();
+			}
+
+			this.abortController.functions = new AbortController();
+
+			return this.$api
+				.call(ApiCoreFunktion.getFunctions(event.query))
+				.then(result => {
+					this.filteredFunctions = result.data.retval;
+				});
+		},
+		styleNewButton(){
+			if(this.stylePv21) {
+				this.newBtnStyle = "btn-sm";
+			}
+		},
+		//helper function: workaround to trigger validation if input is not a number
+		normalizeStunden() {
+			if (this.formData.wochenstunden === null || this.formData.wochenstunden === '') {
+				this.formData.wochenstunden = 'xxx'
+			}
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiCoreFunktion.getOrgHeads())
+			.then(result => {
+				this.listOrgHeads = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.styleNewButton();
+	},
 	template: `
-    <div class="row" v-if="readonlyMode === false">
+		<div class="core-functions h-100 pb-3">
 
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-          <Toast ref="toastRef">
-            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
-          </Toast>
-        </div>
+			<div class="d-flex justify-content-end pb-3" v-if="stylePv21">
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					:label="$p.t('funktion/filter_active')"
+					v-model="isFilterSet"
+					@change="onSwitchChange"
+					>
+				</form-input>
+			</div>
+			<div v-else>
+				<form-input
+					container-class="form-switch"
+					type="checkbox"
+					:label="$p.t('funktion/filter_active')"
+					v-model="isFilterSet"
+					@change="onSwitchChange"
+					>
+				</form-input>
+			</div>
 
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-            <Toast ref="deleteToastRef">
-                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
-            </Toast>
-        </div>
-    </div>
-    <div class="row pt-md-4">      
-         <div class="col">
-             <div class="card">
-                <div class="card-header">
-                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
-                </div>
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				:reload= "!this.stylePv21"
+				new-btn-show
+				:new-btn-class="this.newBtnStyle"
+				:new-btn-label="this.$p.t('person', 'funktion')"
+				@click:new="actionNewFunction"
+				>
+			</core-filter-cmpt>
 
-                <div class="card-body">
-                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
-                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
-                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
-                        </button>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
-                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
-                        </div>
-                    </div>
+			<!--Modal: functionModal-->
+			<bs-modal ref="functionModal" dialog-class="modal-lg">
+				<template #title>
+					<p v-if="statusNew" class="fw-bold mt-3">{{ $p.t('funktion', 'addFunktion') }}</p>
+					<p v-else class="fw-bold mt-3">{{ $p.t('funktion', 'editFunktion') }}</p>
+				</template>
 
-                    <!-- TABULATOR -->
-                    <div ref="table" class="fhc-tabulator"></div>
-                
-                </div>
-             </div>
-         </div>
-    </div>
-            
+				<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="getOrgetsForCompany"
+						>
+						<option
+							v-for="org in listOrgHeads"
+							:key="org.head"
+							:value="org.head"
+							@change="handleChange"
+							>
+							{{ org.bezeichnung }}
+						</option>
+					</form-input>
 
-    <!-- detail modal -->
-    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
-        <template #body>
-            <form class="row g-3" ref="jobFunctionFrm">
-                            
-                <div class="col-md-8">
-					<template v-if="showDvCompany">
-						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
-						<org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
-					</template>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
-                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
-                        @blur="frmState.orgetBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
-                        >
-                        <option v-for="(item, index) in orgUnitList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
-                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
-                        @blur="frmState.funktionBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
-                        >
-                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4"></div>
-                <!-- -->
-                <div class="col-md-2">
-                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
-                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
-                </div>
-                <!--  -->
-                <div class="col-md-3">
-                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
-                    <datepicker id="beginn"
-                        :teleport="true" 
-                        @blur="frmState.beginnBlurred = true" 
-                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
-                        v-model="currentValue.datum_von"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>
-                </div>
-                <div class="col-md-3">
-                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
-                    <datepicker id="ende"
-                        :teleport="true" 
-                        v-model="currentValue.datum_bis"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>                   
-                </div>
-                <div class="col-md-3">
-                </div>
-                <!-- -->
-                <div class="col-md-8">
-                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
-                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
-                </div>
-                <div class="col-md-4">
-                </div>
-                
-                
-                <!-- changes -->
-                <div class="col-8">
-                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
-                </div>
-                
-            </form>
-        </template>
-        <template #footer>
-            <button type="button" class="btn btn-primary" @click="okHandler()" >
-                {{ t('ui','speichern') }}
-            </button>
-        </template>
+					<!--DropDown Autocomplete Funktion-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="autocomplete"
+						:label="$p.t('person/funktion') + ' *' "
+						name="funktion_kurzbz"
+						v-model="formData.funktion_kurzbz"
+						optionLabel="label"
+						:suggestions="filteredFunctions"
+						dropdown
+						@complete="searchFunctions"
+						>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
+					</form-input>
 
-    </Modal>
+					<!--DropDown Autocomplete Organisationseinheit-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="autocomplete"
+						:label="$p.t('lehre/organisationseinheit') + ' *'"
+						name="oe_kurzbz"
+						v-model="formData.oe_kurzbz"
+						optionLabel="label"
+						:suggestions="filteredOes"
+						dropdown
+						@complete="searchOe"
+						>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
+					</form-input>
 
-    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
-      <template #body>
-        {{ t('person','funktionNochNichtGespeichert') }}
-      </template>
-    </ModalDialog>
+					<!--DropDown Bezeichnung-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="text"
+						name="bezeichnung"
+						:label="$p.t('global/bezeichnung')"
+						v-model="formData.bezeichnung"
+					>
+					</form-input>
 
-    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
-        <template #body>
-            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
-        </template>
-    </ModalDialog>
+					<div class="row mb-3">
+						<form-input
+							container-class="mb-3 col-2"
+							type="number"
+							name="wochenstunden"
+							@blur="normalizeStunden"
+							:label="$p.t('person/wochenstunden')"
+							v-model="formData.wochenstunden"
+						>
+						</form-input>
+
+						<form-input
+							container-class="mb-3 col-3"
+							type="DatePicker"
+							v-model="formData.datum_von"
+							name="datum_von"
+							:label="$p.t('ui/from') + ' *'"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						>
+						</form-input>
+
+						<form-input
+							container-class="mb-3 col-3"
+							type="DatePicker"
+							v-model="formData.datum_bis"
+							name="datum_bis"
+							:label="$p.t('global/bis')"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+						<input type="hidden" class="form-control" id="oe_kurzbz" v-model="formData.oe_kurzbz">
+
+				</form-form>
+
+				<template #footer>
+					<button type="button" class="btn btn-primary" @click="statusNew ? addFunction() : updateFunction(formData.benutzerfunktion_id)">{{$p.t('ui', 'speichern')}}</button>
+				</template>
+			</bs-modal>
+
+		</div>
     `
 }
-
-export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen_composition_api.js b/public/js/components/Funktionen/Funktionen_composition_api.js
new file mode 100644
index 000000000..d48e77fd3
--- /dev/null
+++ b/public/js/components/Funktionen/Funktionen_composition_api.js
@@ -0,0 +1,622 @@
+import { Modal } from './Modal.js';
+import { ModalDialog } from './ModalDialog.js';
+import { Toast } from './Toast.js';
+import {OrgChooser} from "./OrgChooser.js";
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+import ApiFunktion from '../../api/factory/funktionen/person.js';
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
+
+export const Funktionen = {
+	name: 'FunctionComponentOld',
+	components: {
+		Modal,
+		ModalDialog,
+		Toast,
+		OrgChooser,
+		"datepicker": VueDatePicker
+	},
+	props: {
+		modelValue: { type: Object, default: () => ({}), required: false},
+		config: { type: Object, default: () => ({}), required: false},
+		readonlyMode: { type: Boolean, required: false, default: false },
+		personID: { type: Number, required: false },
+		personUID: { type: String, required: false },
+		writePermission: { type: Boolean, required: false },
+		showDvCompany: { type: Boolean, required: false, default: true }
+	},
+	emits: ['updateHeader'],
+	setup( props, { emit } ) {
+
+		const $api = Vue.inject('$api');
+		//const fhcAlert = Vue.inject('$fhcAlert');
+
+
+		const readonly = Vue.ref(false);
+
+		const { t } = usePhrasen();
+
+		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
+		const currentPersonID = Vue.computed(() => { return props.personID });
+		const currentPersonUID = Vue.computed(() => { return props.personUID });
+
+		const dialogRef = Vue.ref();
+
+		const isFetching = Vue.ref(false);
+
+		const theModel = Vue.computed({
+			get: () => props.modelValue,
+			set: (value) => emit('update:modelValue', value),
+		});
+
+		const unternehmen = Vue.ref();
+		const jobfunctionList = Vue.ref([]);
+		const jobfunctionDefList = Vue.ref([]);
+		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
+
+		const aktivChecked = Vue.ref(true);
+
+		const table = Vue.ref(null); // reference to your table element
+		const tabulator = Vue.ref(null); // variable to hold your table
+		const tableData = Vue.reactive([]); // data for table to display
+
+
+		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
+
+		const convertArrayToObject = (array, key) => {
+			const initialValue = {};
+			return array.reduce((obj, item) => {
+				return {
+					...obj,
+					[item[key]]: item,
+				};
+			}, initialValue);
+		};
+
+		const fetchData = async () => {
+			if (currentPersonID.value==null && theModel.value.personID==null) {
+				jobfunctionList.value = [];
+				return;
+			}
+			isFetching.value = true
+
+			// fetch data and map them for easier access
+			try {
+				const response = await $api.call(
+					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
+				if(response.error === 1) {
+					let rawList = [];
+					tableData.value = [];
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				} else {
+					let rawList = response.retval;
+					tableData.value = response.retval;
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				}
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+
+		}
+
+		const createShape = () => {
+			return {
+				benutzerfunktion_id: 0,
+				uid: theModel.value.personUID || currentPersonUID.value,
+				oe_kurzbz: "",
+				funktion_kurzbz: "",
+				datum_von: "",
+				datum_bis: "",
+				bezeichnung: "",
+				wochenstunden: 0,
+			}
+		}
+
+		const currentValue = Vue.ref(createShape());
+		const preservedValue = Vue.ref(createShape());
+
+		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
+			fetchData();
+		});
+
+		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
+			fetchOrgUnits(unternehmen_kurzbz);
+			fetchFunctions();
+		});
+
+		const toggleMode = async () => {
+			if (!readonly.value) {
+				// cancel changes?
+				if (hasChanged.value) {
+					const ok = await dialogRef.value.show();
+					if (ok) {
+						console.log("ok=", ok);
+						currentValue.value = preservedValue.value;
+					} else {
+						return
+					}
+				}
+			} else {
+				// switch to edit mode and preserve data
+				preservedValue.value = {...currentValue.value};
+			}
+			readonly.value = !readonly.value;
+		}
+
+		Vue.onMounted(async () => {
+			currentValue.value = createShape();
+			await fetchData();
+
+			const dateFormatter = (cell) => {
+				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+			}
+
+			const dvFormatter = (cell) => {
+				if( props.readonlyMode === true ) {
+					return (cell.getValue() != null) ? cell.getValue() : '';
+				}
+				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
+				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
+			}
+
+			// helper
+			const createDomButton = (classValue, clickHandler) => {
+				const nodeBtn = document.createElement("button");
+				const classAttrBtn = document.createAttribute("class");
+				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
+				nodeBtn.setAttributeNode(classAttrBtn);
+				nodeBtn.addEventListener("click", clickHandler);
+				const nodeI = document.createElement("i");
+				const classAttrI = document.createAttribute("class");
+				classAttrI.value = classValue;
+				nodeI.setAttributeNode(classAttrI);
+				nodeBtn.appendChild(nodeI);
+				return nodeBtn;
+			}
+
+			const btnFormatter = (cell) => {
+
+				const nodeDiv = document.createElement("div");
+				const classAttrDiv = document.createAttribute("class");
+				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
+				nodeDiv.setAttributeNode(classAttrDiv);
+				// delete button
+				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
+				// edit button
+				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
+
+				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+					nodeDiv.appendChild(nodeBtnEdit);
+					nodeDiv.appendChild(nodeBtnDel);
+				}
+
+				return nodeDiv;
+			}
+
+
+			const columnsDef = [
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
+				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
+				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
+			];
+
+			if( props.readonlyMode === false) {
+				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
+			}
+
+			let tabulatorOptions = {
+				height: "100%",
+				layout: "fitColumns",
+				movableColumns: true,
+				reactiveData: true,
+				columns: columnsDef,
+				//data: tableData.value,
+				data: jobfunctionListArray.value,
+			};
+
+			tabulator.value = new Tabulator(
+				table.value,
+				tabulatorOptions
+			);
+
+			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
+				//headerValue - the value of the header filter element
+				//rowValue - the value of the column in this row
+				//rowData - the data for the row being filtered
+				//filterParams - params object passed to the headerFilterFuncParams property
+
+				const validDate = function(d){
+					return d instanceof Date && isFinite(d);
+				}
+
+				const date1 = new Date(rowValue);
+				date1.setHours(0,0,0,0);
+				let [day, month, year] = headerValue.split('.')
+				if (year < 1000) return true;  // prevents dates like 17.5.2
+				const date2 = new Date(+year, +month - 1, +day);
+
+				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
+			}
+
+			tabulator.value.on('tableBuilt', () => {
+				//tabulator.value.setData(tableData.value);
+
+			})
+
+		})
+
+		const jobfunctionListArray = Vue.computed(() => {
+			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
+			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
+			return filtered;
+		});
+
+		// Workaround to update tabulator
+		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
+			console.log('jobfunctionList changed');
+			tabulator.value?.setData(jobfunctionListArray.value);
+		}, {deep: true})
+
+		// Modal
+		const modalRef = Vue.ref();
+		const confirmDeleteRef = Vue.ref();
+
+		const showAddModal = () => {
+			currentValue.value = createShape();
+			// reset form state
+			frmState.orgetBlurred=false;
+			frmState.funktionBlurred=false;
+			frmState.beginnBlurred=false;
+			// call bootstrap show function
+			modalRef.value.show();
+		}
+
+		const hideModal = () => {
+			modalRef.value.hide();
+		}
+
+		const showEditModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			// fetch company
+			isFetching.value = true;
+			try {
+				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
+				if (res.error == 0) {
+					unternehmen.value = res.retval[0].oe_kurzbz;
+				} else {
+					console.log('company not found for orget!');
+				}
+
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+			//delete currentValue.value.bezeichnung;
+			modalRef.value.show();
+		}
+
+		const showDeleteModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			const ok = await confirmDeleteRef.value.show();
+
+			if (ok) {
+
+				try {
+					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
+					if (res.error == 0) {
+						delete jobfunctionList.value[id];
+						showDeletedToast();
+						theModel.value.updateHeader();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+			}
+		}
+
+
+		const okHandler = async () => {
+			if (!validate()) {
+
+				console.log("form invalid");
+
+			} else {
+
+				// submit
+				try {
+					let payload = {...currentValue.value};
+					delete payload.dienstverhaeltnis_id;
+					delete payload.dienstverhaeltnis_unternehmen;
+					delete payload.fachbereich_bezeichnung;
+					delete payload.funktion_oebezeichnung;
+					delete payload.aktiv;
+					delete payload.funktion_beschreibung;
+					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
+					if (r.error == 0) {
+						// fetch all data because of all the references in the changed record
+						await fetchData();
+						console.log('job function successfully saved');
+						theModel.value.updateHeader();
+						showToast();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+				hideModal();
+			}
+		}
+
+		// -------------
+		// form handling
+		// -------------
+
+		const jobFunctionFrm = Vue.ref();
+
+		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
+
+		const notEmpty = (n) => {
+			return !!n && n.trim() != "";
+		}
+
+		const validate = () => {
+			frmState.orgetBlurred = true;
+			frmState.funktionBlurred = true;
+			frmState.beginnBlurred = true;
+			return notEmpty(currentValue.value.datum_von) &&
+				notEmpty(currentValue.value.oe_kurzbz) &&
+				notEmpty(currentValue.value.funktion_kurzbz);
+		}
+
+
+		const hasChanged = Vue.computed(() => {
+			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
+		});
+
+		const formatDate = (d) => {
+			if (d != null && d != '') {
+				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
+			} else {
+				return ''
+			}
+		}
+
+		// Toast
+		const toastRef = Vue.ref();
+		const deleteToastRef = Vue.ref();
+
+		const showToast = () => {
+			toastRef.value.show();
+		}
+
+		const showDeletedToast = () => {
+			deleteToastRef.value.show();
+		}
+
+		const fetchOrgUnits = async (unternehmen_kurzbz) => {
+			if( unternehmen_kurzbz === '' ) {
+				return;
+			}
+			const response = await $api.call(
+				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
+			const orgets = response.retval;
+			orgets.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			orgUnitList.value = await  orgets;
+		}
+
+		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
+			if(unternehmen_kurzbz === '' || uid === '' ) {
+				return;
+			}
+			const response = await $api.call(ApiFunktion.getAllFunctions());
+			const benutzerfunktionen = response.retval;
+			benutzerfunktionen.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			jobfunctionDefList.value = benutzerfunktionen;
+		}
+
+		const unternehmenSelectedHandler = (e) => {
+			console.log('unternehmen selected: ',e);
+			unternehmen.value = e;
+		}
+
+		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
+
+		return {
+			jobfunctionList, orgUnitList, jobfunctionListArray,
+			jobfunctionDefList,
+			currentValue,
+			readonly,
+			frmState,
+			dialogRef,
+			toastRef, deleteToastRef,
+			jobFunctionFrm,
+			modalRef,
+			fullPath,
+			route,
+			aktivChecked,
+			unternehmen,
+			tabulator,
+			table,
+
+			toggleMode, formatDate, notEmpty,
+			showToast, showDeletedToast,
+			showAddModal, hideModal, okHandler,
+			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler
+		}
+	},
+	template: `
+    <div class="row" v-if="readonlyMode === false">
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+          <Toast ref="toastRef">
+            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
+          </Toast>
+        </div>
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+            <Toast ref="deleteToastRef">
+                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
+            </Toast>
+        </div>
+    </div>
+    <div class="row pt-md-4">      
+         <div class="col">
+             <div class="card">
+                <div class="card-header">
+                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
+                </div>
+
+                <div class="card-body">
+                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
+                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
+                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
+                        </button>
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
+                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
+                        </div>
+                    </div>
+
+                    <!-- TABULATOR -->
+                    <div ref="table" class="fhc-tabulator"></div>
+                
+                </div>
+             </div>
+         </div>
+    </div>    
+
+    <!-- detail modal -->
+    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
+        <template #body>
+            <form class="row g-3" ref="jobFunctionFrm">
+                            
+                <div class="col-md-8">
+					<div v-show="showDvCompany">
+						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
+						<org-chooser @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					</div>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
+                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
+                        @blur="frmState.orgetBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
+                        >
+                        <option v-for="(item, index) in orgUnitList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
+                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
+                        @blur="frmState.funktionBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
+                        >
+                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4"></div>
+                <!-- -->
+                <div class="col-md-2">
+                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
+                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
+                </div>
+                <!--  -->
+                <div class="col-md-3">
+                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
+                    <datepicker id="beginn"
+                        :teleport="true" 
+                        @blur="frmState.beginnBlurred = true" 
+                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
+                        v-model="currentValue.datum_von"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>
+                </div>
+                <div class="col-md-3">
+                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
+                    <datepicker id="ende"
+                        :teleport="true" 
+                        v-model="currentValue.datum_bis"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>                   
+                </div>
+                <div class="col-md-3">
+                </div>
+                <!-- -->
+                <div class="col-md-8">
+                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
+                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
+                </div>
+                <div class="col-md-4">
+                </div>
+                
+                
+                <!-- changes -->
+                <div class="col-8">
+                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
+                </div>
+                
+            </form>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-primary" @click="okHandler()" >
+                {{ t('ui','speichern') }}
+            </button>
+        </template>
+
+    </Modal>
+
+    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
+      <template #body>
+        {{ t('person','funktionNochNichtGespeichert') }}
+      </template>
+    </ModalDialog>
+
+    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
+        <template #body>
+            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
+        </template>
+    </ModalDialog>
+    `
+}
+
+export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index b58c0805c..3e82cc48b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -9,16 +9,17 @@ export default {
   },
   template: `
 	<div class="stv-details-functions h-100 d-flex flex-column">
-		<table-functions 
-			ref="tbl_functions" 
-			:student="modelValue">	
-		</table-functions>
+        <h4>{{ $p.t('person', 'funktionen') }}</h4>
 
 		<person-functions
 			:readonlyMode="false"
 			:personID="modelValue.person_id"
 			:personUID="modelValue.uid"
-			:showDvCompany="false"
+			:showDvCompany="true"
+			:saveFunctionAsCopy="true"
+			:filterOeStudent="true"
+			:oeDropdownAutocomplete="true"
+			:stylePv21="false"
 		>
 		</person-functions>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js b/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js
new file mode 100644
index 000000000..5188c8d1b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js
@@ -0,0 +1,28 @@
+import PersonFunctions from "../../../Funktionen/Funktionen_composition_api";
+
+//import PersonFunctions from "../../../Funktionen/Funktionen.js";
+
+export default {
+	components: {
+		PersonFunctions,
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+	<div class="stv-details-functions h-100 d-flex flex-column">
+		<table-functions 
+			ref="tbl_functions" 
+			:student="modelValue">	
+		</table-functions>
+
+		<person-functions
+			:readonlyMode="false"
+			:personID="modelValue.person_id"
+			:personUID="modelValue.uid"
+			:showDvCompany="true"
+		>
+		</person-functions>
+
+	</div>`,
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6c52517b6..ed6f71a7f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25079,7 +25079,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.',
+				'text' => 'Das Eingabefeld {field} darf nur Ziffern enthalten.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -41476,6 +41476,106 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'filter_active',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur aktive anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Display only active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'addFunktion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktion hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'editFunktion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktion bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'saveAsCopy',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Als Kopie speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save as copy',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldMustBePositiveInteger',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} darf nur positive Ganzzahlen enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The input field {field} may only contain positive integers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FUNCTIONS END
 
 );

From 66e5384de6ed1aeb44f9bedd831eabc19b150f8f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 21 May 2025 16:01:37 +0200
Subject: [PATCH 0198/1357] cleanup: remove not needed code and files

---
 .../frontend/v1/funktionen/FunctionsAPI.php   | 239 -------
 .../api/frontend/v1/funktionen/Funktionen.php |  69 --
 .../api/frontend/v1/funktionen/OrgAPI.php     | 153 -----
 .../api/frontend/v1/stv/Config.php            |   5 -
 public/js/api/factory/funktionen.js           |  22 -
 public/js/api/factory/funktionen/person.js    |  68 --
 public/js/components/Funktionen/Funktionen.js |   4 +-
 .../Funktionen/Funktionen_composition_api.js  | 622 ------------------
 public/js/components/Funktionen/Modal.js      |  48 --
 .../js/components/Funktionen/ModalDialog.js   |  69 --
 public/js/components/Funktionen/OrgChooser.js |  69 --
 public/js/components/Funktionen/Toast.js      |  47 --
 .../Studentenverwaltung/Details/Funktionen.js |   5 +-
 13 files changed, 2 insertions(+), 1418 deletions(-)
 delete mode 100644 application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
 delete mode 100644 application/controllers/api/frontend/v1/funktionen/OrgAPI.php
 delete mode 100644 public/js/api/factory/funktionen.js
 delete mode 100644 public/js/api/factory/funktionen/person.js
 delete mode 100644 public/js/components/Funktionen/Funktionen_composition_api.js
 delete mode 100644 public/js/components/Funktionen/Modal.js
 delete mode 100644 public/js/components/Funktionen/ModalDialog.js
 delete mode 100644 public/js/components/Funktionen/OrgChooser.js
 delete mode 100644 public/js/components/Funktionen/Toast.js

diff --git a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
deleted file mode 100644
index 023100a6e..000000000
--- a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class FunctionsAPI extends Auth_Controller
-{
-
-	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
-	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
-
-	public function __construct() {
-
-		//TODO(Manu) check permissions
-		parent::__construct(array(
-				'getAllFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getContractFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getCurrentFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getAllUserFunctions' => [FunctionsAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-			)
-		);
-		$this->load->library('AuthLib');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-	}
-
-
-
-	/*
-	 * return list of all functions
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getAllFunctions()
-	{
-		$sql = <<<EOSQL
-			SELECT
-				funktion_kurzbz AS value, beschreibung AS label
-			FROM
-				public.tbl_funktion
-			WHERE
-				aktiv = true
-			ORDER BY beschreibung ASC
-EOSQL;
-
-		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
-		if( hasData($fkts) )
-		{
-			$this->outputJson($fkts);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no contract relevant funktionen found');
-			return;
-		}
-	}
-
-	/*
-	 * return list of contract relevant functions
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getContractFunctions($mode='all')
-	{
-		$addwhere = '';
-		switch ($mode)
-		{
-			case 'zuordnung':
-				$addwhere = ' AND funktion_kurzbz LIKE \'%zuordnung%\'';
-				break;
-			case 'funktion':
-				$addwhere = ' AND funktion_kurzbz NOT LIKE \'%zuordnung%\'';
-				break;
-			case 'all':
-			default:
-				$addwhere = '';
-				break;
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				funktion_kurzbz AS value, beschreibung AS label
-			FROM
-				public.tbl_funktion
-			WHERE
-				aktiv = true AND vertragsrelevant = true
-				{$addwhere}
-			ORDER BY beschreibung ASC
-EOSQL;
-
-		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
-		if( hasData($fkts) )
-		{
-			$this->outputJson($fkts);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no contract relevant funktionen found');
-			return;
-		}
-	}
-
-	/*
-	 * return list of child orgets for a given company orget_kurzbz
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getCurrentFunctions($uid, $companyOrgetkurzbz)
-	{
-		if( empty($uid) )
-		{
-			$this->outputJsonError('Missing Parameter <uid>');
-		}
-
-		if( empty($companyOrgetkurzbz) )
-		{
-			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				bf.benutzerfunktion_id AS value, f.beschreibung || ', '
-					|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
-					|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
-					|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
-					|| COALESCE(dvu.attachedtovb, '') AS label
-			FROM (
-					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-					(
-						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz = ?
-						UNION ALL
-						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-					)
-					SELECT oe_kurzbz
-					FROM oes
-					GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
-			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN (
-				SELECT
-					benutzerfunktion_id, ' [DV]' AS attachedtovb
-				FROM
-					"hr"."tbl_vertragsbestandteil_funktion"
-				GROUP BY
-					benutzerfunktion_id
-			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
-			WHERE bf.uid = ?
-			ORDER BY f.beschreibung ASC
-
-EOSQL;
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz, $uid));
-		if( hasData($benutzerfunktionen) )
-		{
-			$this->outputJson($benutzerfunktionen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid . ' and oe_kurzbz ' . $companyOrgetkurzbz );
-			return;
-		}
-	}
-
-	/*
-	 * return list of functions for a uid
-	 * as objects to be used in as datasource
-	 */
-	public function getAllUserFunctions($uid)
-	{
-		if( empty($uid) )
-		{
-			$this->outputJsonError('Missing Parameter <uid>');
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				dv.dienstverhaeltnis_id, 
-				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
-				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
-				f.beschreibung AS funktion_beschreibung,
-				bf.*,
-				fb.bezeichnung AS fachbereich_bezeichnung,
-			    CASE
-					WHEN
-						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
-					THEN
-						false
-					ELSE
-						true
-				END aktiv
-			FROM
-				public.tbl_benutzerfunktion bf
-			JOIN
-				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
-			JOIN
-				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-            JOIN
-				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
-			LEFT JOIN
-				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-			LEFT JOIN
-				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
-			LEFT JOIN
-				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
-            WHERE
-				bf.uid = ?
-            ORDER BY
-				f.beschreibung, bf.datum_von ASC
-
-EOSQL;
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
-		if( hasData($benutzerfunktionen) )
-		{
-			$this->outputJson($benutzerfunktionen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid);
-			return;
-		}
-	}
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
index d6d4a0ae4..030994736 100644
--- a/application/controllers/api/frontend/v1/funktionen/Funktionen.php
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -105,51 +105,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	//TODO(Manu) DELETE
-	public function DEPR_getCurrentFunctions($uid, $companyOrgetkurzbz)
-	{
-	$sql = "
-		SELECT
-			bf.benutzerfunktion_id, f.beschreibung || ', '
-			|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
-			|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
-			|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
-			|| COALESCE(dvu.attachedtovb, '') AS label
-
-			FROM (
-			WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-			(
-			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-			WHERE oe_kurzbz = ?
-			UNION ALL
-			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-			)
-			SELECT oe_kurzbz
-			FROM oes
-			GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
-			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN (
-			SELECT
-			benutzerfunktion_id, ' [DV]' AS attachedtovb
-			FROM
-			hr.tbl_vertragsbestandteil_funktion
-			GROUP BY
-			benutzerfunktion_id
-			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
-			WHERE bf.uid = ?
-			ORDER BY f.beschreibung ASC";
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array( $companyOrgetkurzbz,$uid));
-		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
-
-		$this->terminateWithSuccess($data);
-	}
-
 	/*
 	 * return list of child orgets for a given company orget_kurzbz
 	 * as key value list to be used in select or autocomplete
@@ -184,30 +139,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	//TODO(Manu) DELETE
-	/*
-	 * List of Oes for autocomplete field organisation unit
-	 */
-	public function DEPR_loadAllOes($filterStudent=false, $aktiv=true)
-	{
-		$sql = "
-			SELECT
-			    oe_kurzbz,
-			    CONCAT('[', organisationseinheittyp_kurzbz, '] ', bezeichnung) as label
-			FROM public.tbl_organisationseinheit 
-			WHERE aktiv = ?";
-
-		if($filterStudent)
-			$sql .= " AND organisationseinheittyp_kurzbz in ('Studiengang','Lehrgang')";
-
-		$sql .= " ORDER BY organisationseinheittyp_kurzbz, bezeichnung";
-
-		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($aktiv));
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
 	public function searchOes($companyOrgetKurzbz, $searchString = null)
 	{
 		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
diff --git a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
deleted file mode 100644
index f6cf5bdb8..000000000
--- a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class OrgAPI extends Auth_Controller
-{
-
-	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
-	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
-
-	public function __construct() {
-		parent::__construct(array(
-				'getOrgHeads' => OrgAPI::DEFAULT_PERMISSION,
-				'getOrgStructure' => OrgAPI::DEFAULT_PERMISSION,
-				'getOrgPersonen' => OrgAPI::DEFAULT_PERMISSION,
-				'getCompanyByOrget'  => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-				'getOrgetsForCompany' => OrgAPI::DEFAULT_PERMISSION,
-				'getUnternehmen' => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-			)
-		);
-		$this->load->library('AuthLib');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-	}
-
-	// -----------------------------
-	// Organisation
-	// -----------------------------
-
-	function getOrgHeads()
-	{
-		$data = $this->OrganisationseinheitModel->getHeads();
-		return $this->outputJson($data);
-	}
-
-	function getOrgStructure()
-	{
-		$oe = $this->input->get('oe', TRUE);
-
-		$data = $this->OrganisationseinheitModel->getOrgStructure($oe);
-		return $this->outputJson($data);
-	}
-
-	function getOrgPersonen()
-	{
-		$oe = $this->input->get('oe', TRUE);
-
-		$data = $this->OrganisationseinheitModel->getPersonen($oe);
-		return $this->outputJson($data);
-	}
-
-
-
-
-	public function getCompanyByOrget($oe_kurzbz)
-	{
-
-		$sql = <<<EOSQL
-        WITH RECURSIVE unternehmen as
-        (
-                SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-                WHERE oe_kurzbz=?
-                UNION ALL
-                SELECT o.oe_kurzbz, o.oe_parent_kurzbz
-                FROM   public.tbl_organisationseinheit AS o
-                       INNER JOIN unternehmen u  ON u.oe_parent_kurzbz=o.oe_kurzbz
-        )
-        SELECT *
-        FROM unternehmen
-        WHERE oe_parent_kurzbz is null;
-EOSQL;
-		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($oe_kurzbz));
-		if( hasData($childorgets) )
-		{
-			$this->outputJson($childorgets);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $oe_kurzbz );
-			return;
-		}
-	}
-
-	/*
-	 * return list of child orgets for a given company orget_kurzbz
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getOrgetsForCompany($companyOrgetkurzbz=null)
-	{
-		if( empty($companyOrgetkurzbz) )
-		{
-			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
-			return;
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				oe.oe_kurzbz AS value,
-				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-			FROM (
-					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-					(
-						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz=?
-						UNION ALL
-						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-					)
-					SELECT oe_kurzbz
-					FROM oes
-					GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC
-
-EOSQL;
-
-		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
-		if( hasData($childorgets) )
-		{
-			$this->outputJson($childorgets);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $companyOrgetkurzbz );
-			return;
-		}
-	}
-
-
-	public function getUnternehmen()
-	{
-		$this->OrganisationseinheitModel->resetQuery();
-		$this->OrganisationseinheitModel->addSelect('oe_kurzbz AS value, bezeichnung AS label, \'false\'::boolean AS disabled');
-		$this->OrganisationseinheitModel->addOrder('bezeichnung', 'ASC');
-		$unternehmen = $this->OrganisationseinheitModel->loadWhere('oe_parent_kurzbz IS NULL');
-		if( hasData($unternehmen) )
-		{
-			$this->outputJson($unternehmen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no companies (orgets with parent NULL) found');
-			return;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index f22f888de..d37a6d6ec 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -132,11 +132,6 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_functions'),
 			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
-/*		TODO(Manu) REMOVE just for Testing*/
-		$result['functions_composition'] = [
-			'title' => 'F_PV21',
-			'component' => './Stv/Studentenverwaltung/Details/FunktionenOld.js'
-		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/public/js/api/factory/funktionen.js b/public/js/api/factory/funktionen.js
deleted file mode 100644
index c1f4efa29..000000000
--- a/public/js/api/factory/funktionen.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * 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 "./funktionen/person.js";
-
-export default {
-	person
-};
\ No newline at end of file
diff --git a/public/js/api/factory/funktionen/person.js b/public/js/api/factory/funktionen/person.js
deleted file mode 100644
index 305d0bbeb..000000000
--- a/public/js/api/factory/funktionen/person.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-export default {
-	getContractFunctions(filter) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getContractFunctions';
-		if( typeof filter !== 'undefined' && filter !== null ) {
-			url = url + '/' + filter;
-		}
-		return {
-			method: 'get',
-			url,
-		};
-
-	},
-	getOrgetsForCompany(unternehmen) {
-		var url = 'api/frontend/v1/funktionen/OrgAPI/getOrgetsForCompany'
-			+ '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCompanyByOrget(orget) {
-		var url = 'api/frontend/v1/funktionen/OrgAPI/getCompanyByOrget'
-			+ '/' + orget;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getCurrentFunctions'
-			+ '/' + mitarbeiter_uid + '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	}  ,
-	getAllUserFunctions(mitarbeiter_uid) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllUserFunctions'
-			+ '/' + mitarbeiter_uid;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getAllFunctions() {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllFunctions';
-		return {
-			method: 'get',
-			url,
-		};
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 9618bdf9b..7bbd26702 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -216,8 +216,6 @@ export default {
 			newBtnStyle: ''
 		}
 	},
-	computed: {
-	},
 	methods: {
 		onSwitchChange() {
 			if (this.isFilterSet) {
@@ -387,7 +385,7 @@ export default {
 					>
 				</form-input>
 			</div>
-			<div v-else>
+			<div v-else class="py-3">
 				<form-input
 					container-class="form-switch"
 					type="checkbox"
diff --git a/public/js/components/Funktionen/Funktionen_composition_api.js b/public/js/components/Funktionen/Funktionen_composition_api.js
deleted file mode 100644
index d48e77fd3..000000000
--- a/public/js/components/Funktionen/Funktionen_composition_api.js
+++ /dev/null
@@ -1,622 +0,0 @@
-import { Modal } from './Modal.js';
-import { ModalDialog } from './ModalDialog.js';
-import { Toast } from './Toast.js';
-import {OrgChooser} from "./OrgChooser.js";
-import { usePhrasen } from '../../mixins/Phrasen.js';
-
-import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
-
-export const Funktionen = {
-	name: 'FunctionComponentOld',
-	components: {
-		Modal,
-		ModalDialog,
-		Toast,
-		OrgChooser,
-		"datepicker": VueDatePicker
-	},
-	props: {
-		modelValue: { type: Object, default: () => ({}), required: false},
-		config: { type: Object, default: () => ({}), required: false},
-		readonlyMode: { type: Boolean, required: false, default: false },
-		personID: { type: Number, required: false },
-		personUID: { type: String, required: false },
-		writePermission: { type: Boolean, required: false },
-		showDvCompany: { type: Boolean, required: false, default: true }
-	},
-	emits: ['updateHeader'],
-	setup( props, { emit } ) {
-
-		const $api = Vue.inject('$api');
-		//const fhcAlert = Vue.inject('$fhcAlert');
-
-
-		const readonly = Vue.ref(false);
-
-		const { t } = usePhrasen();
-
-		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
-		const currentPersonID = Vue.computed(() => { return props.personID });
-		const currentPersonUID = Vue.computed(() => { return props.personUID });
-
-		const dialogRef = Vue.ref();
-
-		const isFetching = Vue.ref(false);
-
-		const theModel = Vue.computed({
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		const unternehmen = Vue.ref();
-		const jobfunctionList = Vue.ref([]);
-		const jobfunctionDefList = Vue.ref([]);
-		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
-
-		const aktivChecked = Vue.ref(true);
-
-		const table = Vue.ref(null); // reference to your table element
-		const tabulator = Vue.ref(null); // variable to hold your table
-		const tableData = Vue.reactive([]); // data for table to display
-
-
-		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
-
-		const convertArrayToObject = (array, key) => {
-			const initialValue = {};
-			return array.reduce((obj, item) => {
-				return {
-					...obj,
-					[item[key]]: item,
-				};
-			}, initialValue);
-		};
-
-		const fetchData = async () => {
-			if (currentPersonID.value==null && theModel.value.personID==null) {
-				jobfunctionList.value = [];
-				return;
-			}
-			isFetching.value = true
-
-			// fetch data and map them for easier access
-			try {
-				const response = await $api.call(
-					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
-				if(response.error === 1) {
-					let rawList = [];
-					tableData.value = [];
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				} else {
-					let rawList = response.retval;
-					tableData.value = response.retval;
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				}
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-
-		}
-
-		const createShape = () => {
-			return {
-				benutzerfunktion_id: 0,
-				uid: theModel.value.personUID || currentPersonUID.value,
-				oe_kurzbz: "",
-				funktion_kurzbz: "",
-				datum_von: "",
-				datum_bis: "",
-				bezeichnung: "",
-				wochenstunden: 0,
-			}
-		}
-
-		const currentValue = Vue.ref(createShape());
-		const preservedValue = Vue.ref(createShape());
-
-		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
-			fetchData();
-		});
-
-		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
-			fetchOrgUnits(unternehmen_kurzbz);
-			fetchFunctions();
-		});
-
-		const toggleMode = async () => {
-			if (!readonly.value) {
-				// cancel changes?
-				if (hasChanged.value) {
-					const ok = await dialogRef.value.show();
-					if (ok) {
-						console.log("ok=", ok);
-						currentValue.value = preservedValue.value;
-					} else {
-						return
-					}
-				}
-			} else {
-				// switch to edit mode and preserve data
-				preservedValue.value = {...currentValue.value};
-			}
-			readonly.value = !readonly.value;
-		}
-
-		Vue.onMounted(async () => {
-			currentValue.value = createShape();
-			await fetchData();
-
-			const dateFormatter = (cell) => {
-				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-			}
-
-			const dvFormatter = (cell) => {
-				if( props.readonlyMode === true ) {
-					return (cell.getValue() != null) ? cell.getValue() : '';
-				}
-				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
-				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
-			}
-
-			// helper
-			const createDomButton = (classValue, clickHandler) => {
-				const nodeBtn = document.createElement("button");
-				const classAttrBtn = document.createAttribute("class");
-				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
-				nodeBtn.setAttributeNode(classAttrBtn);
-				nodeBtn.addEventListener("click", clickHandler);
-				const nodeI = document.createElement("i");
-				const classAttrI = document.createAttribute("class");
-				classAttrI.value = classValue;
-				nodeI.setAttributeNode(classAttrI);
-				nodeBtn.appendChild(nodeI);
-				return nodeBtn;
-			}
-
-			const btnFormatter = (cell) => {
-
-				const nodeDiv = document.createElement("div");
-				const classAttrDiv = document.createAttribute("class");
-				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
-				nodeDiv.setAttributeNode(classAttrDiv);
-				// delete button
-				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
-				// edit button
-				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
-
-				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
-					nodeDiv.appendChild(nodeBtnEdit);
-					nodeDiv.appendChild(nodeBtnDel);
-				}
-
-				return nodeDiv;
-			}
-
-
-			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
-				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
-				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
-			];
-
-			if( props.readonlyMode === false) {
-				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
-			}
-
-			let tabulatorOptions = {
-				height: "100%",
-				layout: "fitColumns",
-				movableColumns: true,
-				reactiveData: true,
-				columns: columnsDef,
-				//data: tableData.value,
-				data: jobfunctionListArray.value,
-			};
-
-			tabulator.value = new Tabulator(
-				table.value,
-				tabulatorOptions
-			);
-
-			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
-				//headerValue - the value of the header filter element
-				//rowValue - the value of the column in this row
-				//rowData - the data for the row being filtered
-				//filterParams - params object passed to the headerFilterFuncParams property
-
-				const validDate = function(d){
-					return d instanceof Date && isFinite(d);
-				}
-
-				const date1 = new Date(rowValue);
-				date1.setHours(0,0,0,0);
-				let [day, month, year] = headerValue.split('.')
-				if (year < 1000) return true;  // prevents dates like 17.5.2
-				const date2 = new Date(+year, +month - 1, +day);
-
-				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
-			}
-
-			tabulator.value.on('tableBuilt', () => {
-				//tabulator.value.setData(tableData.value);
-
-			})
-
-		})
-
-		const jobfunctionListArray = Vue.computed(() => {
-			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
-			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
-			return filtered;
-		});
-
-		// Workaround to update tabulator
-		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
-			console.log('jobfunctionList changed');
-			tabulator.value?.setData(jobfunctionListArray.value);
-		}, {deep: true})
-
-		// Modal
-		const modalRef = Vue.ref();
-		const confirmDeleteRef = Vue.ref();
-
-		const showAddModal = () => {
-			currentValue.value = createShape();
-			// reset form state
-			frmState.orgetBlurred=false;
-			frmState.funktionBlurred=false;
-			frmState.beginnBlurred=false;
-			// call bootstrap show function
-			modalRef.value.show();
-		}
-
-		const hideModal = () => {
-			modalRef.value.hide();
-		}
-
-		const showEditModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			// fetch company
-			isFetching.value = true;
-			try {
-				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
-				if (res.error == 0) {
-					unternehmen.value = res.retval[0].oe_kurzbz;
-				} else {
-					console.log('company not found for orget!');
-				}
-
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-			//delete currentValue.value.bezeichnung;
-			modalRef.value.show();
-		}
-
-		const showDeleteModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			const ok = await confirmDeleteRef.value.show();
-
-			if (ok) {
-
-				try {
-					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
-					if (res.error == 0) {
-						delete jobfunctionList.value[id];
-						showDeletedToast();
-						theModel.value.updateHeader();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-			}
-		}
-
-
-		const okHandler = async () => {
-			if (!validate()) {
-
-				console.log("form invalid");
-
-			} else {
-
-				// submit
-				try {
-					let payload = {...currentValue.value};
-					delete payload.dienstverhaeltnis_id;
-					delete payload.dienstverhaeltnis_unternehmen;
-					delete payload.fachbereich_bezeichnung;
-					delete payload.funktion_oebezeichnung;
-					delete payload.aktiv;
-					delete payload.funktion_beschreibung;
-					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
-					if (r.error == 0) {
-						// fetch all data because of all the references in the changed record
-						await fetchData();
-						console.log('job function successfully saved');
-						theModel.value.updateHeader();
-						showToast();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-				hideModal();
-			}
-		}
-
-		// -------------
-		// form handling
-		// -------------
-
-		const jobFunctionFrm = Vue.ref();
-
-		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
-
-		const notEmpty = (n) => {
-			return !!n && n.trim() != "";
-		}
-
-		const validate = () => {
-			frmState.orgetBlurred = true;
-			frmState.funktionBlurred = true;
-			frmState.beginnBlurred = true;
-			return notEmpty(currentValue.value.datum_von) &&
-				notEmpty(currentValue.value.oe_kurzbz) &&
-				notEmpty(currentValue.value.funktion_kurzbz);
-		}
-
-
-		const hasChanged = Vue.computed(() => {
-			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
-		});
-
-		const formatDate = (d) => {
-			if (d != null && d != '') {
-				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
-			} else {
-				return ''
-			}
-		}
-
-		// Toast
-		const toastRef = Vue.ref();
-		const deleteToastRef = Vue.ref();
-
-		const showToast = () => {
-			toastRef.value.show();
-		}
-
-		const showDeletedToast = () => {
-			deleteToastRef.value.show();
-		}
-
-		const fetchOrgUnits = async (unternehmen_kurzbz) => {
-			if( unternehmen_kurzbz === '' ) {
-				return;
-			}
-			const response = await $api.call(
-				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
-			const orgets = response.retval;
-			orgets.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			orgUnitList.value = await  orgets;
-		}
-
-		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
-			if(unternehmen_kurzbz === '' || uid === '' ) {
-				return;
-			}
-			const response = await $api.call(ApiFunktion.getAllFunctions());
-			const benutzerfunktionen = response.retval;
-			benutzerfunktionen.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			jobfunctionDefList.value = benutzerfunktionen;
-		}
-
-		const unternehmenSelectedHandler = (e) => {
-			console.log('unternehmen selected: ',e);
-			unternehmen.value = e;
-		}
-
-		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
-
-		return {
-			jobfunctionList, orgUnitList, jobfunctionListArray,
-			jobfunctionDefList,
-			currentValue,
-			readonly,
-			frmState,
-			dialogRef,
-			toastRef, deleteToastRef,
-			jobFunctionFrm,
-			modalRef,
-			fullPath,
-			route,
-			aktivChecked,
-			unternehmen,
-			tabulator,
-			table,
-
-			toggleMode, formatDate, notEmpty,
-			showToast, showDeletedToast,
-			showAddModal, hideModal, okHandler,
-			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler
-		}
-	},
-	template: `
-    <div class="row" v-if="readonlyMode === false">
-
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-          <Toast ref="toastRef">
-            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
-          </Toast>
-        </div>
-
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-            <Toast ref="deleteToastRef">
-                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
-            </Toast>
-        </div>
-    </div>
-    <div class="row pt-md-4">      
-         <div class="col">
-             <div class="card">
-                <div class="card-header">
-                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
-                </div>
-
-                <div class="card-body">
-                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
-                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
-                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
-                        </button>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
-                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
-                        </div>
-                    </div>
-
-                    <!-- TABULATOR -->
-                    <div ref="table" class="fhc-tabulator"></div>
-                
-                </div>
-             </div>
-         </div>
-    </div>    
-
-    <!-- detail modal -->
-    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
-        <template #body>
-            <form class="row g-3" ref="jobFunctionFrm">
-                            
-                <div class="col-md-8">
-					<div v-show="showDvCompany">
-						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
-						<org-chooser @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
-					</div>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
-                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
-                        @blur="frmState.orgetBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
-                        >
-                        <option v-for="(item, index) in orgUnitList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
-                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
-                        @blur="frmState.funktionBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
-                        >
-                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4"></div>
-                <!-- -->
-                <div class="col-md-2">
-                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
-                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
-                </div>
-                <!--  -->
-                <div class="col-md-3">
-                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
-                    <datepicker id="beginn"
-                        :teleport="true" 
-                        @blur="frmState.beginnBlurred = true" 
-                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
-                        v-model="currentValue.datum_von"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>
-                </div>
-                <div class="col-md-3">
-                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
-                    <datepicker id="ende"
-                        :teleport="true" 
-                        v-model="currentValue.datum_bis"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>                   
-                </div>
-                <div class="col-md-3">
-                </div>
-                <!-- -->
-                <div class="col-md-8">
-                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
-                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
-                </div>
-                <div class="col-md-4">
-                </div>
-                
-                
-                <!-- changes -->
-                <div class="col-8">
-                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
-                </div>
-                
-            </form>
-        </template>
-        <template #footer>
-            <button type="button" class="btn btn-primary" @click="okHandler()" >
-                {{ t('ui','speichern') }}
-            </button>
-        </template>
-
-    </Modal>
-
-    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
-      <template #body>
-        {{ t('person','funktionNochNichtGespeichert') }}
-      </template>
-    </ModalDialog>
-
-    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
-        <template #body>
-            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
-        </template>
-    </ModalDialog>
-    `
-}
-
-export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Modal.js b/public/js/components/Funktionen/Modal.js
deleted file mode 100644
index 716d9ac2a..000000000
--- a/public/js/components/Funktionen/Modal.js
+++ /dev/null
@@ -1,48 +0,0 @@
-export const Modal = {
-	name: 'Modal',
-    props: {
-        type: String,
-        title: String,
-        noscroll: Boolean
-    },
-    expose: ['show', 'hide'],
-    setup(props, { emit }) {
-       
-        let modalEle = Vue.ref(null);
-        let thisModalObj;
-
-        Vue.onMounted(() => {
-            thisModalObj = new bootstrap.Modal(modalEle.value);
-        });
-        const show = () => {
-            thisModalObj.show();
-        }
-        function hide() {
-            thisModalObj.hide();
-        }
-
-        return { modalEle, show, hide };
-    },
-
-    template:`
-    <div class="modal fade " id="customModal" tabindex="-1" aria-labelledby=""
-        aria-hidden="true" ref="modalEle">
-        <div class="modal-dialog modal-lg" :class="(!noscroll) ? 'modal-dialog-scrollable' : ''">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customModalLabel">{{ title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <slot name="body" />
-                </div>
-                <div class="modal-footer">
-                    <slot name="footer"></slot>
-                    <!-- button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
-                        OK
-                    </button-->
-                </div>
-            </div>
-        </div>
-    </div>`
-};
diff --git a/public/js/components/Funktionen/ModalDialog.js b/public/js/components/Funktionen/ModalDialog.js
deleted file mode 100644
index c46540cae..000000000
--- a/public/js/components/Funktionen/ModalDialog.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { usePhrasen } from '../../mixins/Phrasen.js';
-
-export const ModalDialog = {
-	name: 'ModalDialog',
-    props: {
-        type: String,
-        title: String,
-    },
-    expose: ['show', 'hide'],
-    setup(props, { emit }) {
-       
-        let modalConfirmEle = Vue.ref(null);
-        let thisModalObj;
-        let _resolve;
-        let _reject;
-        const { t } = usePhrasen();
-
-        Vue.onMounted(() => {
-            thisModalObj = new bootstrap.Modal(modalConfirmEle.value);
-        });
-        
-        const show = async () => {
-            thisModalObj.show();
-            return new Promise(function (resolve, reject) {
-              _resolve = resolve;
-              _reject = reject;
-            });
-        }
-
-        function hide() {
-            thisModalObj.hide();
-        }
-
-        const ok = () => {
-            _resolve(true);
-          }
-          
-        const cancel = () =>  {
-            _resolve(false);
-        }        
-
-        return { modalConfirmEle, show, hide, ok, cancel, t };
-    },
-
-    template:`
-    <div class="modal fade " id="customModalDialog" tabindex="-1" aria-labelledby=""
-        aria-hidden="true" ref="modalConfirmEle">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customModalDialogLabel">{{ title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <slot name="body" />
-                </div>
-                <div class="modal-footer">
-                    <slot name="footer"></slot>
-                    <button type="button" class="btn btn-secondary" @click="cancel" data-bs-dismiss="modal">
-                      {{ t('ui','abbrechen') }}
-                    </button>
-                    <button type="button" class="btn btn-primary" @click="ok" data-bs-dismiss="modal">
-                        {{ t('ui','ok') }}
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>`
-};
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
deleted file mode 100644
index 64109cc2c..000000000
--- a/public/js/components/Funktionen/OrgChooser.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import {CoreRESTClient} from '../../../js/RESTClient.js';
-
-export const OrgChooser = {
-	name: 'OrgChooser',
-    props: {
-      placeholder: String,
-      customClass: String,
-      oe: String,
-    },
-    emits: ["orgSelected"],
-    setup(props, { emit }) {   
-
-      const orgList = Vue.ref([]);
-      const isFetching = Vue.ref(false);
-      const oeRef = Vue.toRefs(props).oe
-      const selected = Vue.ref();
-
-      const fetchHead = async () => {
-        isFetching.value = true
-        try {
-          const res = await CoreRESTClient.get(
-            'extensions/FHC-Core-Personalverwaltung/api/frontend/v1/OrgAPI/getOrgHeads');
-          orgList.value = CoreRESTClient.getData(res.data);
-          if (orgList.value.length > 0)  {
-            //orgList.value.reverse();
-            if (props.oe == undefined || (props.oe != null && props.oe == '')) {
-              selected.value = orgList.value[0].oe_kurzbz;
-            }
-            emit("orgSelected", selected.value);
-          }
-          isFetching.value = false          
-        } catch (error) {
-          console.log(error)
-          isFetching.value = false
-        }
-      }
-
-      Vue.onMounted(() => {
-        fetchHead();
-      })
-
-      const orgSelected = (e) => {
-        emit("orgSelected", e.target.value);
-      }
-
-      Vue.watch(
-        oeRef,
-        (val, old) => {
-          console.log('prop value changed', val);
-          selected.value = val;
-        }
-      )
-
-      return   {
-        orgList, selected,
-
-        orgSelected
-      }
-
-
-    },
-    template: `
-    <select  id="orgHeadChooser" v-model="selected" @change="orgSelected" class="form-control-sm" aria-label=".form-select-sm " >
-        <option v-for="(item, index) in orgList" :value="item.oe_kurzbz"  :key="item.oe_kurzbz">
-            {{ item.bezeichnung }}
-        </option>         
-    </select>
-    `
-}    
diff --git a/public/js/components/Funktionen/Toast.js b/public/js/components/Funktionen/Toast.js
deleted file mode 100644
index 6b3faba82..000000000
--- a/public/js/components/Funktionen/Toast.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export const Toast = {
-	name: 'Toast',
-    props: {
-        title: {
-            text: String,
-            default: "<<Text goes here>>",
-        },
-        type: {
-            text: String,
-            default: "success",
-        }
-    },
-    expose: ['show', 'hide'],
-    setup(props) {
-
-        let toastEle = Vue.ref(null);
-        let thisToastObj;
-
-        Vue.onMounted(() => {
-            thisToastObj = new bootstrap.Toast(toastEle.value);
-        });
-
-        const show = () => {
-            thisToastObj.show();
-        }
-
-        const hide = () => {
-            thisToastObj.hide();
-        }
-
-        const backgroundColor = Vue.computed(() => {
-            return props.type == "success" ? "bg-primary"  : "bg-danger"
-        })
-
-        return { show, hide, toastEle, backgroundColor };
-
-    },
-    template: `
-    <div class="toast align-items-center text-white border-0 " :class="backgroundColor" role="alert" aria-live="assertive" aria-atomic="true" ref="toastEle">
-        <div class="d-flex">
-            <div class="toast-body">
-            <slot name="body"></slot>
-            </div>
-            <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
-        </div>
-    </div>`
-}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index 3e82cc48b..f968ebecc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -9,16 +9,13 @@ export default {
   },
   template: `
 	<div class="stv-details-functions h-100 d-flex flex-column">
-        <h4>{{ $p.t('person', 'funktionen') }}</h4>
 
 		<person-functions
 			:readonlyMode="false"
 			:personID="modelValue.person_id"
 			:personUID="modelValue.uid"
-			:showDvCompany="true"
+			:showDvCompany="false"
 			:saveFunctionAsCopy="true"
-			:filterOeStudent="true"
-			:oeDropdownAutocomplete="true"
 			:stylePv21="false"
 		>
 		</person-functions>

From a99cc966827193f8648deceafa0a3b4ac68f96e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 May 2025 16:37:00 +0200
Subject: [PATCH 0199/1357] fix missing "import VueDatePicker from
 '../../vueDatepicker.js.php';" statements for new cis4 pages abgabetool &
 raumsuche

---
 public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 1 +
 public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js     | 1 +
 public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 1 +
 public/js/components/Cis/Raumsuche/Raumsuche.js                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index c49dcfd0a..0900282ef 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -1,4 +1,5 @@
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 const today = new Date()
 export const AbgabeMitarbeiterDetail = {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 9b57244e2..896c8fa64 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -1,5 +1,6 @@
 import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 const today = new Date()
 export const AbgabeStudentDetail = {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 327c53198..341d61920 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 20685fa09..7ec397a1a 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,4 +1,5 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 export const Raumsuche =  {
 	name: "Raumsuche",

From 12ca915b00355e6b48a995a77a91f2da18b3c79b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 May 2025 18:16:01 +0200
Subject: [PATCH 0200/1357] ddi/ddo text in legende old anw liste;
 studentdropdown order changed; email datumformat d.m.y;

---
 system/xsl/Anwesenheitsliste.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl
index 55e72900c..fc9dede58 100644
--- a/system/xsl/Anwesenheitsliste.xsl
+++ b/system/xsl/Anwesenheitsliste.xsl
@@ -309,7 +309,8 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P4">(nz) ... nicht zugelassen</text:p>
 			<text:p text:style-name="P4">(ma) ... MitarbeiterIn</text:p>
 			<text:p text:style-name="P4">(a.o.) ... Außerordentliche/r HörerIn</text:p>
-			<text:p text:style-name="P4">(d.d.) ... Double Degree Program</text:p>
+			<text:p text:style-name="P4">(d.d.i) ... Double Degree Incoming Program</text:p>
+			<text:p text:style-name="P4">(d.d.o) ... Double Degree Outgoing Program</text:p>
 			<text:p text:style-name="P4"/>
 			<text:p text:style-name="P5">
 				<xsl:choose>

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

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

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

From 4c6c45ceec70061fbd71487b81b3687736ca1f01 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 22 May 2025 18:50:30 +0200
Subject: [PATCH 0202/1357] change Layout of Notizen component to use form in
 modal

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 03376231f..d5f9174d2 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 126b2d388b6afb57abdaad75f0bde785d927cb39 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 22 May 2025 18:55:34 +0200
Subject: [PATCH 0203/1357] fix upload and adapt styling of Abgabetool Student

---
 .../controllers/api/frontend/v1/Lehre.php     | 14 +++-
 public/css/Cis4/Cis.css                       | 44 +++++++++++
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 74 +++++++++++--------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  6 +-
 4 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index e42033d9c..d5d0282bd 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -206,7 +206,11 @@ class Lehre extends FHCAPI_Controller
 				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
 
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
 				
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 				$this->terminateWithSuccess($res);
@@ -287,7 +291,11 @@ class Lehre extends FHCAPI_Controller
 				
 				// update paabgabe datum
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
 				
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
@@ -345,7 +353,7 @@ class Lehre extends FHCAPI_Controller
 
 		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
 
-		if(!is_numeric($num_rows_sem) || $num_rows_sem < 0)
+		if( null === $num_rows_sem || false === $num_rows_sem )
 		{
 			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
 		}
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index aa24641f8..075998776 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -583,4 +583,48 @@ html {
 
 .dashboard-item {
 	overscroll-behavior: none;
+}
+
+.abgabe-zieldatum-border-red,
+.abgabe-zieldatum-border-yellow,
+.abgabe-zieldatum-border-pink,
+.abgabe-zieldatum-border-green {
+	border: solid 3px lightgrey;
+}
+
+.abgabe-zieldatum-border-red {
+	border-color: red;
+}
+
+.abgabe-zieldatum-border-yellow {
+	border-color: yellow;
+}
+
+.abgabe-zieldatum-border-pink {
+	border-color: pink;
+}
+
+.abgabe-zieldatum-border-green {
+	border-color: green;
+}
+
+.abgabe-zieldatum-overlay {
+	top: 3px;
+	right: 3px;
+}
+
+.abgabe-zieldatum-border-red .abgabe-zieldatum-overlay {
+	color: red;
+}
+
+.abgabe-zieldatum-border-yellow .abgabe-zieldatum-overlay {
+	color: yellow;
+}
+
+.abgabe-zieldatum-border-pink .abgabe-zieldatum-overlay {
+	color: pink;
+}
+
+.abgabe-zieldatum-border-green .abgabe-zieldatum-overlay {
+	color: green;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 896c8fa64..1eb5d099c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -138,7 +138,7 @@ export const AbgabeStudentDetail = {
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyle(termin) {
+		getDateStyle(termin, mode) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
@@ -146,21 +146,31 @@ export const AbgabeStudentDetail = {
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			let color = 'white'
 			let fontColor = 'black'
+			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
 					color = 'red'
 					fontColor = 'white'
+					icon = 'fa-triangle-exclamation'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
 					color = 'yellow'
+					icon = 'fa-circle-exclamation'
 				}
 			} else if(abgabedatum > datum) {
 				color = 'pink' // aka "hellrot"
 				fontColor = 'white'
+				icon = 'fa-circle-question'
 			} else {
 				color = 'green'
+				icon = 'fa-square-check'
 			}
 			
-			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			//return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			if(  typeof mode !== 'undefined' || mode === 'icon') {
+				return icon;
+			} else {
+				return 'abgabe-zieldatum-border-' + color;
+			}
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -205,23 +215,26 @@ export const AbgabeStudentDetail = {
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
-					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-					<div class="col">
+					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col-3 fw-bold">
 						{{$p.t('abgabetool/c4fileupload')}}
 					</div>
 				</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
+					<div class="col-1 d-flex justify-content-center align-items-start">
+						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>
+						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>
+<!--
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+-->
 					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<div :style="getDateStyle(termin)">
+					<div class="col-2 d-flex justify-content-start align-items-start">
+						<div class="position-relative" :class="getDateStyle(termin)">
 							<VueDatePicker
-								style="width: 95%;"
 								v-model="termin.datum"
 								:clearable="false"
 								:disabled="true"
@@ -230,24 +243,25 @@ export const AbgabeStudentDetail = {
 								:text-input="true"
 								auto-apply>
 							</VueDatePicker>
-						</div>				
+							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
+						</div>
 					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
-					<div class="col-4 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="true"></Textarea>
+					<div class="col-2 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>
+					<div class="col-3 d-flex justify-content-start align-items-start">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="45" :disabled="true"></Textarea>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-1 d-flex flex-column justify-content-start align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-							<i class="fa-solid fa-file-pdf"></i>
+							<i class="fa-solid fa-3x fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-2" v-if="!viewMode">
+					<div class="col-3" v-if="!viewMode">
 						<div class="row">
-							<div class="col-6">
+							<div class="col-8">
 								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
-							<div class="col-6">
+							<div class="col-4">
 								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
@@ -264,19 +278,19 @@ export const AbgabeStudentDetail = {
 				<div>
 					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					
 					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
 				
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					
 					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
 			<template v-slot:default>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
 					<div class="row">
 						<Dropdown 
@@ -289,7 +303,7 @@ export const AbgabeStudentDetail = {
 				</div>
 				
 <!--				 lektor fills these out-->
-<!--				<div class="row mb-3 align-items-center">-->
+<!--				<div class="row mb-3 align-items-start">-->
 <!--					<div class="row">Kontrollierte Schlagwörter</div>-->
 <!--					<div class="row">-->
 <!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
@@ -297,35 +311,35 @@ export const AbgabeStudentDetail = {
 <!--					-->
 <!--				-->
 <!--				</div>-->
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter"></Textarea>
 					</div>
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter_en"></Textarea>
 					</div>
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract" rows="10"></Textarea>
 					</div>
 				</div>
 
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
 					</div>				
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
 					<div class="row">
 						<InputNumber 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 7a8482a3f..d1eab7c6e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -33,7 +33,7 @@ export const AbgabetoolStudent = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 700,
+				minHeight: 250,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -218,7 +218,7 @@ export const AbgabetoolStudent = {
 			this.loadProjektarbeiten()
 
 			this.$refs.verticalsplit.collapseBottom()
-			this.calcMaxTableHeight()
+			//this.calcMaxTableHeight()
 		}
 	},
 	watch: {
@@ -226,7 +226,7 @@ export const AbgabetoolStudent = {
 	},
 	computed: {
 		isViewMode() {
-			return this.student_uid !== null
+			return this.student_uid !== this.viewData.uid
 		}
 	},
 	created() {

From deec52b959422054e1028c99965f7903db523996 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 09:11:22 +0200
Subject: [PATCH 0204/1357] refactor(Studium): disallows to store null or
 undefined to the localStorage and changes the next and previous button logic
 for the select fields

---
 public/js/components/Cis/Studium/Studium.js | 32 ++++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 9e716d7df..a53f9a4e4 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -31,15 +31,15 @@ export default {
 	},
 	watch:{
 		selectedStudiensemester: function(newVal, oldVal){
-			if(newVal != oldVal){
+			if(newVal && newVal != oldVal){
 				const studiensemester =this.getDataFromLocalStorage("sudiensemester");
-				if (!studiensemester || (studiensemester && studiensemester != newVal)){
+				if (newVal && (!studiensemester || (studiensemester && studiensemester != newVal))){
 					this.storeDataToLocalStorage("sudiensemester", newVal);
 				}
 			}
 		},
 		selectedSemester: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const semester = this.getDataFromLocalStorage("semester");
 				if (!semester || (semester && semester != newVal)) {
 					this.storeDataToLocalStorage("semester", newVal);
@@ -47,7 +47,7 @@ export default {
 			}
 		},
 		selectedStudiengang: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const studiengang = this.getDataFromLocalStorage("studiengang");
 				if (!studiengang || (studiengang && studiengang != newVal)) {
 					this.storeDataToLocalStorage("studiengang", JSON.stringify(newVal));
@@ -55,7 +55,7 @@ export default {
 			}
 		},
 		selectedStudienordnung: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const studienordnung = this.getDataFromLocalStorage("studienordnung");
 				if (!studienordnung || (studienordnung && studienordnung != newVal)) {
 					this.storeDataToLocalStorage("studienordnung", JSON.stringify(newVal));
@@ -81,7 +81,11 @@ export default {
 		},
 		changeStudienordnung(value) {
 			let studienordnung = this.$refs.studienordnung;
-			studienordnung.selectedIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			let newSelectIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			if(studienordnung.options[newSelectIndex].disabled){
+				newSelectIndex = (newSelectIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			}
+			studienordnung.selectedIndex = newSelectIndex;
 			this.changeSelectedStudienPlan(studienordnung.value);
 		},
 		
@@ -277,13 +281,13 @@ export default {
 		<div>
 		<h6>Studiensemester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -292,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -307,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -322,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>

From fce63eb31b4cdde68eef77a7ca99930dbf06732f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 23 May 2025 10:35:47 +0200
Subject: [PATCH 0205/1357] svnr aus dem infocenter entfernt

---
 application/controllers/system/infocenter/InfoCenter.php | 3 +--
 application/views/system/infocenter/stammdaten.php       | 6 ------
 public/js/infocenter/stammdaten.js                       | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index f6e41d2e6..08162c230 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1275,7 +1275,6 @@ class InfoCenter extends Auth_Controller
 				'nachname' => $this->input->post('nachname'),
 				'titelpost' => isEmptyString($this->input->post('titelpost')) ? null : $this->input->post('titelpost'),
 				'gebdatum' => isEmptyString($this->input->post('gebdatum')) ? null : date("Y-m-d", strtotime($this->input->post('gebdatum'))),
-				'svnr' => isEmptyString($this->input->post('svnr')) ? null : $this->input->post('svnr'),
 				'staatsbuergerschaft' => isEmptyString($this->input->post('buergerschaft')) ? null : $this->input->post('buergerschaft'),
 				'geschlecht' => $this->input->post('geschlecht'),
 				'geburtsnation' => isEmptyString($this->input->post('gebnation')) ? null : $this->input->post('gebnation'),
@@ -1816,7 +1815,7 @@ class InfoCenter extends Auth_Controller
 	}
 
 	/**
-	 * Loads all necessary Person data: Stammdaten (name, svnr, contact, ...), Dokumente, Logs and Notizen
+	 * Loads all necessary Person data: Stammdaten (name, contact, ...), Dokumente, Logs and Notizen
 	 * @param $person_id
 	 * @return array
 	 */
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index f143c9c03..f852e9ace 100644
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -32,12 +32,6 @@
 					<div class='stammdaten' id="gebdatum"><?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></div>
 				</td>
 			</tr>
-			<tr>
-				<td><strong><?php echo  ucfirst($this->p->t('person','svnr')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="svnr"><?php echo $stammdaten->svnr ?></div>
-				</td>
-			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
 				<td>
diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js
index c7600f677..8e34996cd 100644
--- a/public/js/infocenter/stammdaten.js
+++ b/public/js/infocenter/stammdaten.js
@@ -44,7 +44,6 @@ $(document).ready(function ()
 			"nachname" : $('#nachname_input').val(),
 			"titelpost" : $('#titelpost_input').val(),
 			"gebdatum" : $('#gebdatum_input').val(),
-			"svnr" : $('#svnr_input').val(),
 			"buergerschaft" : $('#buergerschaft').val(),
 			"geschlecht" : $('#geschlecht').val(),
 			"gebnation" : $('#gebnation').val(),

From ad8963e5b5939c6433da32dd7bc19685542da4dc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 11:33:58 +0200
Subject: [PATCH 0206/1357] refactor(Dashboard touch events): allows to scroll
 on mobile over widgets, fixes dragging bug on mobile

---
 public/js/components/Drop/Grid.js      | 29 +++++++++-----------------
 public/js/components/Drop/Grid/Item.js | 14 +++++++++----
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 55b9b1bbd..1ecdd29ae 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -132,15 +132,7 @@ export default {
 					return this.grid ? (this.grid.h+1) : 1;
 			}
 			return this.grid ? this.grid.h : 1;
-			/* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
-				return this.dragGrid.h;
-			}
-			if (this.mode == MODE_IDLE) {
-				if (this.additionalRowComputed) {
-					return this.grid ? (this.grid.h+1) : 1;
-				}
-			}
-			return this.grid ? this.grid.h : 1; */
+			
 		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;
@@ -370,9 +362,8 @@ export default {
 			/* if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
-				this.additionalRowComputed = false;
 				
-			} */
+			}  */
 		},
 		updateCursor(evt) {
 			if (!this.active) {
@@ -381,17 +372,17 @@ export default {
 			}
 			const addH = this.active ? this.marginForExtraRow : 0;
 			const rect = this.$refs.container.getBoundingClientRect();
-
-			if (!evt.clientX && !evt.clientY && evt.touches) {
+			
+			if (!evt.clientX && !evt.clientY && evt.touches){
 				evt.clientX = evt.touches[0].clientX;
 				evt.clientY = evt.touches[0].clientY;
 			}
 
 			this.clientX = (evt.clientX - rect.left);
 			this.clientY = (evt.clientY - rect.top);
-
 			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+			
 			if (this.x == gridX && this.y == gridY)
 				return false;
 			
@@ -414,8 +405,8 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			
-			this.grid.h += 1;
 			this.draggedItem = item;
+			
 			this.$emit('draggedItem',item);
 			
 			this.draggedNode = evt.target.closest(".drop-grid-item");
@@ -437,13 +428,13 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
-			if ((this.y + 1) > this.grid?.h && this.mode == MODE_MOVE) {
-				this.positionUpdates = this.positionUpdates.filter(item => {
+			if ((this.y + 1) > this.rows && this.mode == MODE_MOVE) {
+				this.positionUpdates = this.positionUpdates?.filter(item => {
 					return item.widgetid == this.draggedItem.data.widgetid;
 				})
 				this.dragEnd();
 				this.dragCancel();
-			}
+			} 
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
@@ -613,7 +604,7 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@touchmove.prevent="dragOver"
+		@touchmove="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index a597c4f00..37bce4acf 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -64,19 +64,25 @@ export default {
 			this.registerDragAction(event); 
 			this.tryDragStart(event, this.item);
 		},
+		touchMove(event){
+			if(this.dragging){
+				event.preventDefault();
+				this.$emit('dragging', event);
+			}
+		}
 		
 	},
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
 		@mouseup="$emit('mouseUp', $event)"
-		@touchstart.prevent="touchStart"
+		@touchstart="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
-		@touchmove.prevent="$emit('dragging',$event)"
-		@dragend="$emit('endDrag', $event)"
-		:draggable="active && !item.placeholder && dragAction != ''">
+		@touchmove="touchMove"
+		@dragend="$emit('endDrag', $event); dragging = false"
+		:draggable="active && !item.placeholder && dragging">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From b5bacbbf7534e57a971b2280231f4b4ed62be04a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 12:02:13 +0200
Subject: [PATCH 0207/1357] refactor(Studium): changes the query to fetch
 lehrveranstaltungen for the studienplan

---
 .../controllers/api/frontend/v1/Studium.php   | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index be2e79800..b0be3cf41 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -222,7 +222,51 @@ class Studium extends FHCAPI_Controller
 	}
 
 	private function computeStudienplanLehrveranstaltungen($studienplan_id, $semester){
-		$lehrveranstaltungen = $this->StudienplanModel->getStudienplanLehrveranstaltung($studienplan_id, $semester);	
+
+/* 
+SELECT tbl_lehrveranstaltung.*,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+            tbl_studienplan_lehrveranstaltung.curriculum,
+            tbl_studienplan_lehrveranstaltung.export,
+            tbl_studienplan_lehrveranstaltung.genehmigung
+        FROM lehre.tbl_lehrveranstaltung
+        JOIN lehre.tbl_studienplan_lehrveranstaltung
+        USING(lehrveranstaltung_id)
+        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=" . $this->db_add_param($studienplan_id, FHC_INTEGER);
+        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
+            $qry .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
+        if (!is_null($semester))
+        {
+            $qry.=" AND tbl_studienplan_lehrveranstaltung.semester=" . $this->db_add_param($semester, FHC_INTEGER);
+        } */
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		
+		$query = "
+		SELECT tbl_lehrveranstaltung.*,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+            tbl_studienplan_lehrveranstaltung.curriculum,
+            tbl_studienplan_lehrveranstaltung.export,
+            tbl_studienplan_lehrveranstaltung.genehmigung
+        FROM lehre.tbl_lehrveranstaltung
+        JOIN lehre.tbl_studienplan_lehrveranstaltung
+        USING(lehrveranstaltung_id)
+        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
+		
+        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
+			$query .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
+		
+		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
+		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){

From fa0b534471185b9708de0bce7db1cad256c34a67 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 23 May 2025 13:27:18 +0200
Subject: [PATCH 0208/1357] Refactoring PrimeVue Autocomplete Dropdown
 Functions Refactoring PrimeVue Autocomplete Dropdown OrganisationUnits Change
 Search from Backend to Frontend Filtering minor changes Table Functions

---
 .../api/frontend/v1/funktionen/Funktionen.php |  68 ++++----
 .../Organisationseinheit_model.php            |  74 +--------
 .../models/ressource/Funktion_model.php       |  22 ---
 public/js/api/factory/functions.js            |  39 +----
 public/js/components/Funktionen/Funktionen.js | 155 +++++++++++-------
 system/phrasesupdate.php                      |  20 +++
 6 files changed, 162 insertions(+), 216 deletions(-)

diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
index 030994736..b2787072b 100644
--- a/application/controllers/api/frontend/v1/funktionen/Funktionen.php
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -11,14 +11,10 @@ class Funktionen extends FHCAPI_Controller
 		//TODO(Manu) check permissions
 		parent::__construct(array(
 				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getContractFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getCurrentFunctions' =>  ['admin:r', 'assistenz:r'],
 				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
 				'getOrgHeads' =>  ['admin:r', 'assistenz:r'],
 				'getOrgetsForCompany' => ['admin:r', 'assistenz:r'],
-				'loadAllOes' => ['admin:r', 'assistenz:r'],
-				'searchOes' => ['admin:r', 'assistenz:r'],
-				'searchFunctions' => ['admin:r', 'assistenz:r'],
+				'getAllOrgUnits' => ['admin:r', 'assistenz:r'],
 				'loadFunction' => ['admin:r', 'assistenz:r'],
 				'insertFunction' => ['admin:rw', 'assistenz:rw'],
 				'updateFunction' => ['admin:rw', 'assistenz:rw'],
@@ -43,6 +39,20 @@ class Funktionen extends FHCAPI_Controller
 		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 	}
 
+	public function getAllFunctions()
+	{
+		$this->FunktionModel->addSelect("funktion_kurzbz");
+		$this->FunktionModel->addSelect("beschreibung");
+		$this->FunktionModel->addSelect("aktiv");
+		$this->FunktionModel->addSelect("beschreibung AS label");
+		$this->FunktionModel->addOrder("beschreibung");
+		$result = $this->FunktionModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	public function getOrgHeads()
 	{
 		$result = $this->OrganisationseinheitModel->getHeads();
@@ -97,7 +107,7 @@ class Funktionen extends FHCAPI_Controller
             WHERE
 				bf.uid = ?
             ORDER BY
-				f.beschreibung, bf.datum_von ASC";
+				bf.datum_von, bf.datum_von ASC";
 
 		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
 		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
@@ -106,14 +116,35 @@ class Funktionen extends FHCAPI_Controller
 	}
 
 	/*
-	 * return list of child orgets for a given company orget_kurzbz
+	 * returns list of all organisation units
 	 * as key value list to be used in select or autocomplete
 	 */
-	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	public function getAllOrgUnits()
 	{
 		$sql = "
 			SELECT
-				oe.oe_kurzbz,
+				oe.oe_kurzbz, oe.aktiv,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM public.tbl_organisationseinheit oe
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz = null)
+	{
+		$sql = "
+			SELECT
+				oe.oe_kurzbz, oe.aktiv,
 				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
 				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
 			FROM (
@@ -139,25 +170,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function searchOes($companyOrgetKurzbz, $searchString = null)
-	{
-		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
-	}
-
-	public function searchFunctions($searchString = null)
-	{
-
-		$result = $this->FunktionModel->getAutocompleteSuggestions($searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
-	}
-
 	public function loadFunction($benutzerfunktion_id)
 	{
 		$this->BenutzerfunktionModel->addSelect("*");
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index b146ee7e5..ba91964f6 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -191,7 +191,7 @@ class Organisationseinheit_model extends DB_Model
 
     /**
      * @param string $oe_kurzbz
-     * 
+     *
      * @return stdClass
      */
     public function getWithType($oe_kurzbz)
@@ -202,78 +202,6 @@ class Organisationseinheit_model extends DB_Model
     	return $this->load($oe_kurzbz);
     }
 
-	/**
-	 * Get OEs by eventQuery string. Use with autocomplete event queries.
-	 * @param $eventQuery String
-	 * @return array
-	 */
-	public function getAutocompleteSuggestions($eventQuery)
-	{
-		$this->addSelect('oe_kurzbz');
-		$this->addSelect('organisationseinheittyp_kurzbz, oe_kurzbz, bezeichnung, aktiv, lehre');
-		$this->addOrder('organisationseinheittyp_kurzbz, bezeichnung');
-
-		return $this->loadWhere("
-			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
-		");
-	}
-
-	/**
-	 * Get OEs by eventQuery string and companyOrgetKurzbz
-	 * Use with autocomplete event queries in Function Component
-	 * @param $searchString String
-	 * @param $companyOrgetKurzbz String oe_kurzbz of the company (gst vs gmbh)
-	 * @return array
-	 */
-	public function getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString)
-	{
-		$sql = "
-        WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) AS (
-            SELECT oe_kurzbz, oe_parent_kurzbz
-            FROM public.tbl_organisationseinheit
-            WHERE oe_kurzbz = ?
-            UNION ALL
-            SELECT o.oe_kurzbz, o.oe_parent_kurzbz
-            FROM public.tbl_organisationseinheit o
-            INNER JOIN oes ON o.oe_parent_kurzbz = oes.oe_kurzbz
-        )
-        SELECT
-            oe.oe_kurzbz, oe.aktiv,
-            '[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-            '] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-        FROM (
-            SELECT oe_kurzbz FROM oes GROUP BY oe_kurzbz
-        ) c
-        JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-        JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-    ";
-
-		$params = [$companyOrgetKurzbz];
-
-		if (!empty($searchString)) {
-			$escaped = $this->escapeLike($searchString);
-			$ilike = '%' . $escaped . '%';
-
-			$sql .= "
-            WHERE
-                oe.oe_kurzbz ILIKE ? OR
-                oe.bezeichnung ILIKE ? OR
-                oe.organisationseinheittyp_kurzbz ILIKE ?
-        ";
-
-			$params[] = $ilike;
-			$params[] = $ilike;
-			$params[] = $ilike;
-		}
-
-		$sql .= " ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
-
-		$result = $this->execQuery($sql, $params);
-
-		return $result;
-	}
-
-
 	/**
 	 * get highest organisation units
 	 */
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
index 60965b438..43908167c 100644
--- a/application/models/ressource/Funktion_model.php
+++ b/application/models/ressource/Funktion_model.php
@@ -11,26 +11,4 @@ class Funktion_model extends DB_Model
 		$this->dbTable = 'public.tbl_funktion';
 		$this->pk = 'funktion_kurzbz';
 	}
-
-	/**
-	 * Get Functions by eventQuery string. Use with autocomplete event queries in Function Component
-	 * @param $eventQuery String
-	 * @return array
-	 */
-	public function getAutocompleteSuggestions($eventQuery)
-	{
-		$this->addSelect('funktion_kurzbz, beschreibung, aktiv');
-		$this->addSelect("beschreibung AS label");
-		$this->addOrder('beschreibung', 'ASC');
-
-		if($eventQuery === null)
-		{
-			return $this->load();
-		}
-
-		return $this->loadWhere("
-			funktion_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
-			OR beschreibung ILIKE '%". $this->escapeLike($eventQuery). "%'
-		");
-	}
 }
diff --git a/public/js/api/factory/functions.js b/public/js/api/factory/functions.js
index ac717050a..ef0be43cb 100644
--- a/public/js/api/factory/functions.js
+++ b/public/js/api/factory/functions.js
@@ -15,17 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 export default {
-	getContractFunctions(filter) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getContractFunctions';
-		if( typeof filter !== 'undefined' && filter !== null ) {
-			url = url + '/' + filter;
-		}
-		return {
-			method: 'get',
-			url,
-		};
-
-	},
 	getOrgHeads() {
 		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgHeads';
 		return {
@@ -41,30 +30,13 @@ export default {
 			url,
 		};
 	},
-	loadAllOes(filterStudent) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/loadAllOes'
-			+ '/' + filterStudent;
+	getAllOrgUnits(filterStudent) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllOrgUnits';
 		return {
 			method: 'get',
 			url,
 		};
 	},
-	getCompanyByOrget(orget) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getCompanyByOrget'
-			+ '/' + orget;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getCurrentFunctions'
-			+ '/' + mitarbeiter_uid + '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	}  ,
 	getAllUserFunctions(mitarbeiter_uid) {
 		var url = 'api/frontend/v1/funktionen/Funktionen/getAllUserFunctions'
 			+ '/' + mitarbeiter_uid;
@@ -114,11 +86,4 @@ export default {
 			url: 'api/frontend/v1/funktionen/Funktionen/searchOes/' + head + '/' + searchString
 		};
 	},
-	getFunctions(searchString) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/funktionen/Funktionen/searchFunctions/' + searchString
-		};
-	}
-
 };
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 7bbd26702..4fdf5b6e4 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -43,10 +43,8 @@ export default {
 					{
 						title: "dienstverhaeltnis_unternehmen",
 						field: "dienstverhaeltnis_unternehmen",
-						width: 50,
 						headerFilter: "list",
 						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
-						formatter: this.companyLinkFormatter
 					},
 					{
 						title: "funktion_beschreibung", field: "funktion_beschreibung", headerFilter: "list",
@@ -100,7 +98,6 @@ export default {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
 
-
 							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
 								let button = document.createElement('button');
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -160,18 +157,19 @@ export default {
 						const column = cm.getColumnByField('dienstverhaeltnis_unternehmen');
 						const companyDv = {
 							title: this.$p.t('person', 'dv_unternehmen'),
-							width: 100,
+							width: 140,
 							visible: this.showDvCompany,
+							formatter: this.companyLinkFormatter
 						};
 						column.component.updateDefinition(companyDv);
 
 						cm.getColumnByField('funktion_beschreibung').component.updateDefinition({
 							title: this.$p.t('person', 'zuordnung_taetigkeit'),
-							width: 100
+							width: 140
 						});
 						cm.getColumnByField('funktion_oebezeichnung').component.updateDefinition({
 							title: this.$p.t('lehre', 'organisationseinheit'),
-							width: 100
+							width: 140
 						});
 						cm.getColumnByField('wochenstunden').component.updateDefinition({
 							title: this.$p.t('person', 'wochenstunden')
@@ -192,18 +190,25 @@ export default {
 
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('ui', 'bezeichnung'),
-							width: 100
+							width: 140
 						});
 
 					}
 				}
 			],
-			isFilterSet: false,
+			isFilterSet: true,
 			listOrgHeads: [],
-			listOrgUnits: [],
+			listOrgUnits: [], //Old
+			listAllOrgUnits: [],
+			listOrgUnits_GST: [],
+			listOrgUnits_GMBH: [],
 			formData: {
 				head: 'gst',
-				oe_kurzbz: ''
+				oe_kurzbz: '',
+				funktion_kurzbz: null,
+				label:'',
+				//funktion_label: '',
+				funktion: null,
 			},
 			statusNew: true,
 			listAllFunctions: [],
@@ -213,7 +218,17 @@ export default {
 			},
 			filteredOes: [],
 			filteredFunctions: [],
-			newBtnStyle: ''
+			newBtnStyle: '',
+			selectedFunction: null,
+			selectedOe: null
+		}
+	},
+	watch: {
+		selectedFunction(newVal) {
+			this.formData.funktion_kurzbz = newVal?.funktion_kurzbz || '';
+		},
+		selectedOe(newVal) {
+			this.formData.oe_kurzbz = newVal?.oe_kurzbz || '';
 		}
 	},
 	methods: {
@@ -229,6 +244,7 @@ export default {
 		actionNewFunction(){
 			this.resetModal();
 			this.statusNew = true;
+			this.formData.datum_von = new Date();
 			this.$refs.functionModal.show();
 		},
 		actionCopyFunction(benutzerfunktion_id) {
@@ -249,7 +265,15 @@ export default {
 		actionEditFunction(benutzerfunktion_id) {
 			this.resetModal();
 			this.statusNew = false;
-			this.loadFunction(benutzerfunktion_id);
+			this.loadFunction(benutzerfunktion_id).then(() => {
+				//set selectedFunction and selectedOd to enable viewing label in primevue autocomplete fields
+				this.selectedFunction = this.listAllFunctions.find(
+					item => item.funktion_kurzbz === this.formData.funktion_kurzbz
+				);
+				this.selectedOe = this.listAllOrgUnits.find(
+					item => item.oe_kurzbz === this.formData.oe_kurzbz
+				);
+			});
 			this.$refs.functionModal.show();
 		},
 		addFunction() {
@@ -304,14 +328,6 @@ export default {
 					this.reload();
 				});
 		},
-		getOrgetsForCompany(){
-			return this.$api
-				.call(ApiCoreFunktion.getOrgetsForCompany(this.formData.head))
-				.then(result => {
-					this.listOrgUnits = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
 		},
@@ -324,32 +340,30 @@ export default {
 			this.formData.oe_kurzbz = '';
 			this.formData.funktion_kurzbz = '';
 		},
-		searchOe(event) {
-			if (this.abortController.oes) {
-				this.abortController.oes.abort();
-			}
-
-			this.abortController.oes = new AbortController();
-
-			return this.$api
-				.call(ApiCoreFunktion.getOes(this.formData.head, event.query))
-				.then(result => {
-					this.filteredOes = result.data.retval;
-				});
+		filterFunctions(event) {
+			const query = event.query.toLowerCase();
+			this.filteredFunctions = this.listAllFunctions.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
 		},
-		searchFunctions(event) {
-			if (this.abortController.functions) {
-				this.abortController.functions.abort();
+		filterOes(event) {
+			const query = event.query.toLowerCase();
+
+			if(!this.formData.head)
+				this.$fhcAlert.alertError(this.$p.t('ui', 'bitteUnternehmenWaehlen'));
+
+			if(this.formData.head == 'gst') {
+				this.filteredOes = this.listOrgUnits_GST.filter(item =>
+					item.label.toLowerCase().includes(query)
+				);
+			}
+			if(this.formData.head == 'gmbh') {
+				this.filteredOes = this.listOrgUnits_GMBH.filter(item =>
+					item.label.toLowerCase().includes(query)
+				);
 			}
-
-			this.abortController.functions = new AbortController();
-
-			return this.$api
-				.call(ApiCoreFunktion.getFunctions(event.query))
-				.then(result => {
-					this.filteredFunctions = result.data.retval;
-				});
 		},
+
 		styleNewButton(){
 			if(this.stylePv21) {
 				this.newBtnStyle = "btn-sm";
@@ -370,12 +384,38 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		this.$api
+			.call(ApiCoreFunktion.getAllFunctions())
+			.then(result => {
+				this.listAllFunctions = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getAllOrgUnits())
+			.then(result => {
+				this.listAllOrgUnits = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getOrgetsForCompany('gst'))
+			.then(result => {
+				this.listOrgUnits_GST = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getOrgetsForCompany('gmbh'))
+			.then(result => {
+				this.listOrgUnits_GMBH = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
 		this.styleNewButton();
+
 	},
 	template: `
 		<div class="core-functions h-100 pb-3">
-
-			<div class="d-flex justify-content-end pb-3" v-if="stylePv21">
+		
+			<div class="d-flex justify-content-end" v-if="stylePv21">
 				<form-input
 					container-class="form-check"
 					type="checkbox"
@@ -418,35 +458,37 @@ 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="getOrgetsForCompany"
+						@change="getOrgetsForCompanyOld"
 						>
 						<option
 							v-for="org in listOrgHeads"
 							:key="org.head"
 							:value="org.head"
-							@change="handleChange"
 							>
 							{{ org.bezeichnung }}
 						</option>
-					</form-input>
+					</form-input>			
 
-					<!--DropDown Autocomplete Funktion-->
+					<!--DropDown Autocomplete Funktion -->
 					<form-input
 						container-class="mb-3 col-8"
 						type="autocomplete"
 						:label="$p.t('person/funktion') + ' *' "
 						name="funktion_kurzbz"
-						v-model="formData.funktion_kurzbz"
+						v-model="selectedFunction"
+						forceSelection
 						optionLabel="label"
+						optionValue="funktion_kurzbz"
 						:suggestions="filteredFunctions"
 						dropdown
-						@complete="searchFunctions"
+						@complete="filterFunctions"
 						>
 							<template #option="slotProps">
 								<div
@@ -454,7 +496,7 @@ export default {
 									? 'item-inactive'
 									: ''"
 									>
-										{{slotProps.option.label}}
+										 {{ slotProps.option.label}}
 								</div>
 							</template>
 					</form-input>
@@ -465,11 +507,13 @@ export default {
 						type="autocomplete"
 						:label="$p.t('lehre/organisationseinheit') + ' *'"
 						name="oe_kurzbz"
-						v-model="formData.oe_kurzbz"
+						v-model="selectedOe"
+						forceSelection
 						optionLabel="label"
+						optionValue="oe_kurzbz"
 						:suggestions="filteredOes"
 						dropdown
-						@complete="searchOe"
+						@complete="filterOes"
 						>
 							<template #option="slotProps">
 								<div
@@ -482,7 +526,6 @@ export default {
 							</template>
 					</form-input>
 
-					<!--DropDown Bezeichnung-->
 					<form-input
 						container-class="mb-3 col-8"
 						type="text"
@@ -531,7 +574,7 @@ export default {
 							>
 						</form-input>
 					</div>
-						<input type="hidden" class="form-control" id="oe_kurzbz" v-model="formData.oe_kurzbz">
+
 
 				</form-form>
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ed6f71a7f..d9ed01641 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41576,6 +41576,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bitteUnternehmenWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vor Änderung der Organisationseinheit bitte Unternehmen wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Before changing the organizational unit, please select company',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FUNCTIONS END
 
 );

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

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

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

From b40e1a2c6569cc117e7be05dc0b4ef1225e762cf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 11:05:24 +0200
Subject: [PATCH 0210/1357] fix syntax error

---
 system/phrasesupdate.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 69c3dc793..6ac891fb6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31432,7 +31432,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Termine laut Stundenplan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -31532,13 +31532,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten gefunden für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No assigned students for the selected teaching unit found!',
+				'text' => 'No assigned students found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -40369,11 +40369,9 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	//////////// FHC4 Phrases Gruppen End ////////////
 
-	),
-// FHC4 Phrases CleanUpTasks End
 array(
 	'app' => 'core',
 	'category' => 'person',
@@ -42217,9 +42215,8 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
-	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
 	),
+	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
 	/////////// FHC4 Phrases Messages START ///////////
 	array(
 		'app' => 'core',

From a0fb34420e7e2d20446f69ba0cabc01ccf759b55 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 27 May 2025 14:30:34 +0200
Subject: [PATCH 0211/1357] fix(Stundenplan API):corrects little bug with if
 statement check

---
 application/controllers/api/frontend/v1/Stundenplan.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 61a9e8f54..35b7ccc56 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,14 +81,11 @@ class Stundenplan extends FHCAPI_Controller
 		$lv_id = $this->input->get('lv_id', TRUE);
 
 		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
+		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
 		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
 		{
 			$stundenplan_events = array();
 		}
-		else
-		{
-			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
-		}
 
 		// fetching moodle events
 		$moodle_events = [];

From 0ee5cc09cd59a333c053555f6d8a2c79fd382a03 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 17:30:50 +0200
Subject: [PATCH 0212/1357] add missing .js file extension

---
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 2 +-
 .../Details/Aufnahmetermine/HeaderReihungstest.js             | 4 ++--
 .../Studentenverwaltung/Details/JointStudies/JointStudies.js  | 2 +-
 3 files changed, 4 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 cf8a47dd3..a4ca66de6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -3,7 +3,7 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 
-import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates.js';
 
 export default {
 	name: 'ListAdmissionDates',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index fcda41f34..dbf6e3154 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -1,6 +1,6 @@
 import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
-import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates.js';
 
 export default {
 	name: 'HeaderPlacement',
@@ -154,4 +154,4 @@ export default {
 		
 		</div>
 	`
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index 16d1593d3..c24e4cba5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -4,7 +4,7 @@ import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 
 import ApiStvJointstudies from '../../../../../api/factory/stv/jointstudies.js';
-import ApiStvMobility from "../../../../../api/factory/stv/mobility";
+import ApiStvMobility from "../../../../../api/factory/stv/mobility.js";
 
 export default {
 	name: 'Tbl_JointStudies',

From 390434050ecd7a5c46a8a32bfc3851349c45277d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 17:39:33 +0200
Subject: [PATCH 0213/1357] add missing end tag, add missing .js file extension

---
 public/js/components/Messages/Details/NewMessage/NewDiv.js    | 4 ++--
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 34401f6ea..fbf7bd9d7 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,7 +2,7 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
-import ApiMessages from "../../../../api/factory/messages/messages";
+import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "ComponentNewMessages",
@@ -558,4 +558,4 @@ export default {
 	</div>
 	`
 
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index a4ca66de6..474854315 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -497,7 +497,8 @@ export default {
 			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
 			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
 		</template>
-		
+	    </bs-modal>
+
 	</div>
 	`
 }

From f96bfbe0004a41312fb64d940bf9686329939a20 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 28 May 2025 07:51:10 +0200
Subject: [PATCH 0214/1357] =?UTF-8?q?lehrf=C3=A4cherverteilung=20v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/LVVerwaltung.php      |  42 +
 .../api/frontend/v1/Lehrveranstaltung.php     | 243 ++++++
 .../api/frontend/v1/lv/DirektGruppe.php       | 108 +++
 .../api/frontend/v1/lv/Favorites.php          |  47 ++
 .../controllers/api/frontend/v1/lv/Gruppe.php | 189 +++++
 .../api/frontend/v1/lv/Lehreinheit.php        | 438 +++++++++++
 .../controllers/api/frontend/v1/lv/Lektor.php | 380 +++++++++
 .../controllers/api/frontend/v1/lv/Setup.php  | 116 +++
 .../api/frontend/v1/lv/StgTree.php            |  91 +++
 .../controllers/api/frontend/v1/lv/Tags.php   |  24 +
 .../frontend/v1/notiz/NotizLehreinheit.php    |  21 +
 application/libraries/LektorLib.php           | 342 +++++++++
 .../models/accounting/Vertrag_model.php       |  70 ++
 .../models/education/Lehreinheit_model.php    | 438 +++++++++++
 .../education/Lehreinheitgruppe_model.php     | 208 +++++
 .../Lehreinheitmitarbeiter_model.php          |  71 ++
 .../education/Lehrveranstaltung_model.php     | 225 ++++++
 .../Organisationseinheit_model.php            |  30 +
 .../models/organisation/Studienplan_model.php |  21 +
 application/models/person/Notiz_model.php     |  54 +-
 .../models/ressource/Mitarbeiter_model.php    |  14 +
 .../models/ressource/Stundenplandev_model.php |  83 ++
 .../models/ressource/Stundensatz_model.php    |  16 +
 .../Dienstverhaeltnis_model.php               |  21 +
 application/views/LVVerwaltung.php            |  39 +
 public/css/Lvverwaltung.css                   |  27 +
 public/js/api/factory/notiz.js                |   5 +-
 public/js/api/factory/notiz/lehreinheit.js    |  29 +
 public/js/api/lehrveranstaltung.js            |  28 +
 public/js/api/lehrveranstaltung/details.js    |  30 +
 .../js/api/lehrveranstaltung/direktgruppe.js  |  26 +
 public/js/api/lehrveranstaltung/gruppe.js     |  56 ++
 .../js/api/lehrveranstaltung/lehreinheit.js   |  41 +
 public/js/api/lehrveranstaltung/lektor.js     |  78 ++
 public/js/api/lehrveranstaltung/setup.js      |   9 +
 .../api/lehrveranstaltung/studiengangtree.js  |  43 ++
 public/js/api/lehrveranstaltung/tag.js        |  54 ++
 public/js/api/lehrveranstaltung/vertrag.js    |  22 +
 public/js/apps/LVVerwaltung.js                |  46 ++
 .../LVVerwaltung/Details/Direktinskription.js | 155 ++++
 .../components/LVVerwaltung/Details/Form.js   | 209 +++++
 .../LVVerwaltung/Details/Gruppen.js           | 195 +++++
 .../components/LVVerwaltung/LVVerwaltung.js   | 282 +++++++
 .../components/LVVerwaltung/Lektor/Daten.js   | 270 +++++++
 .../components/LVVerwaltung/Lektor/Table.js   | 223 ++++++
 .../components/LVVerwaltung/Lektor/Vertrag.js | 161 ++++
 .../js/components/LVVerwaltung/Setup/Table.js | 683 +++++++++++++++++
 .../js/components/LVVerwaltung/Setup/Tabs.js  |  62 ++
 .../components/LVVerwaltung/Tabs/Details.js   | 133 ++++
 .../js/components/LVVerwaltung/Tabs/Lektor.js |  70 ++
 .../js/components/LVVerwaltung/Tabs/Notiz.js  |  33 +
 .../js/components/Stv/Studentenverwaltung.js  |   4 +-
 .../Stv/Studentenverwaltung/Verband.js        |  69 +-
 public/js/components/Tag/Tag.js               |  12 +-
 .../tabulator/filters/extendedHeaderFilter.js | 110 ++-
 system/dbupdate_3.4.php                       |   1 +
 .../60882_lehrfaecherverteilung_favorites.php |  16 +
 system/phrasesupdate.php                      | 723 +++++++++++++++++-
 58 files changed, 7146 insertions(+), 90 deletions(-)
 create mode 100644 application/controllers/LVVerwaltung.php
 create mode 100644 application/controllers/api/frontend/v1/Lehrveranstaltung.php
 create mode 100644 application/controllers/api/frontend/v1/lv/DirektGruppe.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Favorites.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Gruppe.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Lehreinheit.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Lektor.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Setup.php
 create mode 100644 application/controllers/api/frontend/v1/lv/StgTree.php
 create mode 100644 application/controllers/api/frontend/v1/lv/Tags.php
 create mode 100644 application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
 create mode 100644 application/libraries/LektorLib.php
 create mode 100644 application/views/LVVerwaltung.php
 create mode 100644 public/css/Lvverwaltung.css
 create mode 100644 public/js/api/factory/notiz/lehreinheit.js
 create mode 100644 public/js/api/lehrveranstaltung.js
 create mode 100644 public/js/api/lehrveranstaltung/details.js
 create mode 100644 public/js/api/lehrveranstaltung/direktgruppe.js
 create mode 100644 public/js/api/lehrveranstaltung/gruppe.js
 create mode 100644 public/js/api/lehrveranstaltung/lehreinheit.js
 create mode 100644 public/js/api/lehrveranstaltung/lektor.js
 create mode 100644 public/js/api/lehrveranstaltung/setup.js
 create mode 100644 public/js/api/lehrveranstaltung/studiengangtree.js
 create mode 100644 public/js/api/lehrveranstaltung/tag.js
 create mode 100644 public/js/api/lehrveranstaltung/vertrag.js
 create mode 100644 public/js/apps/LVVerwaltung.js
 create mode 100644 public/js/components/LVVerwaltung/Details/Direktinskription.js
 create mode 100644 public/js/components/LVVerwaltung/Details/Form.js
 create mode 100644 public/js/components/LVVerwaltung/Details/Gruppen.js
 create mode 100644 public/js/components/LVVerwaltung/LVVerwaltung.js
 create mode 100644 public/js/components/LVVerwaltung/Lektor/Daten.js
 create mode 100644 public/js/components/LVVerwaltung/Lektor/Table.js
 create mode 100644 public/js/components/LVVerwaltung/Lektor/Vertrag.js
 create mode 100644 public/js/components/LVVerwaltung/Setup/Table.js
 create mode 100644 public/js/components/LVVerwaltung/Setup/Tabs.js
 create mode 100644 public/js/components/LVVerwaltung/Tabs/Details.js
 create mode 100644 public/js/components/LVVerwaltung/Tabs/Lektor.js
 create mode 100644 public/js/components/LVVerwaltung/Tabs/Notiz.js
 create mode 100644 system/dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php

diff --git a/application/controllers/LVVerwaltung.php b/application/controllers/LVVerwaltung.php
new file mode 100644
index 000000000..2a79d6375
--- /dev/null
+++ b/application/controllers/LVVerwaltung.php
@@ -0,0 +1,42 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class LVVerwaltung extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+		$this->load->view('LVVerwaltung', [
+			'permissions' => [
+				'lehre/lehrveranstaltung' => $this->permissionlib->isBerechtigt('lehre/lehrveranstaltung'),
+				'lv-plan/gruppenentfernen' => $this->permissionlib->isBerechtigt('lv-plan/gruppenentfernen'),
+				'lv-plan/lektorentfernen' => $this->permissionlib->isBerechtigt('lv-plan/lektorentfernen'),
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')
+			],
+			'configs' => [
+				'showVertragsdetails' => defined('FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN') && FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN,
+				'showGewichtung' => defined('CIS_GESAMTNOTE_GEWICHTUNG') && CIS_GESAMTNOTE_GEWICHTUNG,
+				'lehreinheitAnmerkungDefault' => defined('LEHREINHEIT_ANMERKUNG_DEFAULT') ? LEHREINHEIT_ANMERKUNG_DEFAULT : '',
+				'lehreinheitRaumtypDefault' => defined('DEFAULT_LEHREINHEIT_RAUMTYP') ? DEFAULT_LEHREINHEIT_RAUMTYP : '',
+				'lehreinheitRaumtypAlternativeDefault' => defined('DEFAULT_LEHREINHEIT_RAUMTYP_ALTERNATIV') ? DEFAULT_LEHREINHEIT_RAUMTYP_ALTERNATIV : ''
+			]
+		]);
+
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
new file mode 100644
index 000000000..1b2e2bc35
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * 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/>.
+ */
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Lehrveranstaltung extends FHCAPI_Controller
+{
+	private $_ci;
+	private $_uid;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'loadByEmployee' => ['admin:r', 'assistenz:r'],
+			'loadByStudiengang' => ['admin:r', 'assistenz:r'],
+			'loadByLV' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+
+		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+	}
+	public function loadByEmployee($mitarbeiter_uid = null, $stg_kz = null)
+	{
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$studiensemester_kurzbz = $this->_ci->variablelib->getVar('semester_aktuell');
+
+		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz);
+		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+
+		$tree = [];
+
+		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
+		{
+			$lehreinheiten = $this->_ci->LehreinheitModel->getLEByLV($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid);
+			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
+
+			if (!isset($lehrveranstaltung->_children))
+			{
+				$lehrveranstaltung->_children = $lehreinheiten_data;
+			}
+			$tree[] = $lehrveranstaltung;
+		}
+
+		$this->terminateWithSuccess($tree);
+	}
+
+	public function loadByStudiengang($studiengang_kz = null, $semester = null)
+	{
+		if (is_null($studiengang_kz) || !ctype_digit((string)$studiengang_kz))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$verband = null;
+		if (!is_null($semester) && !is_numeric($semester))
+		{
+			$verband = $semester;
+			$semester = null;
+		}
+
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$studiensemester_kurzbz = $this->_ci->variablelib->getVar('semester_aktuell');
+		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
+
+		$studienplan_ids = array();
+		$only_ids = array();
+		$placeholders = array();
+
+		if (hasData($studienplan_data))
+		{
+			foreach (getData($studienplan_data) as $studienplan) {
+				$placeholders[] = "(?, ?)";
+				$studienplan_ids[] = $studienplan->studienplan_id;
+				$studienplan_ids[] = $studienplan->semester;
+				$only_ids[] = $studienplan->studienplan_id;
+			}
+		}
+
+		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
+		$lehrveranstaltungen_data = hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
+
+
+		$tree = [];
+		foreach ($lehrveranstaltungen_data as $row)
+		{
+			$rowData = $row;
+
+			$lehreinheiten_data = $this->_ci->LehreinheitModel->getByLvidStudiensemester($row->lehrveranstaltung_id, $studiensemester_kurzbz);
+
+			if (hasData($lehreinheiten_data))
+			{
+				$lehreinheiten = getData($lehreinheiten_data);
+				$rowData->_children = $lehreinheiten;
+			}
+
+			if (!isEmptyString($row->studienplan_lehrveranstaltung_id_parent))
+			{
+				$child = $this->_ci->StudienplanModel->loadStudienplanLehrveranstaltung($row->studienplan_lehrveranstaltung_id_parent);
+
+				if (hasData($child))
+				{
+					$child = getData($child)[0];
+					$searchId = $child->lehrveranstaltung_id;
+
+					foreach ($lehrveranstaltungen_data as &$searchParent)
+					{
+						if ($searchParent->lehrveranstaltung_id === $searchId)
+						{
+							if (!isset($searchParent->_children))
+							{
+								$searchParent->_children = [];
+							}
+
+							if (is_array($searchParent->_children))
+							{
+								$searchParent->_children[] = $row;
+							}
+							else
+							{
+								$searchParent->_children = [$searchParent->_children, $row];
+							}
+							break;
+						}
+					}
+
+				}
+			}
+			else
+			{
+				$tree[] = $rowData;
+			}
+		}
+
+		$counter = 0;
+		$this->assignUniqueIndex($tree, $counter);
+		$this->terminateWithSuccess($tree);
+	}
+
+
+	public function loadByLV($lehrveranstaltung_id = null)
+	{
+		if (is_null($lehrveranstaltung_id) || !ctype_digit((string)$lehrveranstaltung_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->_ci->LehrveranstaltungModel->addSelect('lehrveranstaltung_id, lehrform_kurzbz, lehre, bezeichnung as lvbezeichnung');
+		$lehrveranstaltung_result = $this->_ci->LehrveranstaltungModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung_id));
+		$lehrveranstaltung_result = $this->getDataOrTerminateWithError($lehrveranstaltung_result);
+		$lehrveranstaltung = $lehrveranstaltung_result[0];
+
+		$this->_ci->LehreinheitModel->addSelect('lehrveranstaltung_id_kompatibel');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung_kompatibel', 'lehrveranstaltung_id');
+		$lehrfaecher = $this->_ci->LehreinheitModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung->lehrveranstaltung_id));
+
+		$lehrfaecher_array = [];
+		if (hasData($lehrfaecher))
+			$lehrfaecher_array = array_merge($lehrfaecher_array, array_column(getData($lehrfaecher), 'lehrveranstaltung_id_kompatibel'));
+
+		$lehrfaecher_array[] = $lehrveranstaltung->lehrveranstaltung_id;
+
+		$this->_ci->LehrveranstaltungModel->addDistinct('lehrfach_id');
+		$this->_ci->LehrveranstaltungModel->addSelect("tbl_lehrveranstaltung.lehrveranstaltung_id, CONCAT(tbl_lehrveranstaltung.bezeichnung || '(' || tbl_lehrveranstaltung.oe_kurzbz || ')') as lehrfach");
+		$this->_ci->LehrveranstaltungModel->db->where_in('tbl_lehrveranstaltung.lehrveranstaltung_id', $lehrfaecher_array);
+		$lehrfaecher_result = $this->_ci->LehrveranstaltungModel->load();
+
+		$lehrfaecher_array = hasData($lehrfaecher_result) ? getData($lehrfaecher_result) : array();
+
+		$lehrveranstaltung->lehrfaecher = $lehrfaecher_array;
+		$this->terminateWithSuccess($lehrveranstaltung);
+	}
+
+	/*
+	 * (david) ggf. im naechsten release
+	 * public function loadByOrganization($oe_kurzbz)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$lehrveranstaltungen = $this->LehrveranstaltungModel->getLvsByOrganization($oe_kurzbz);
+		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+		$tree = [];
+
+		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
+		{
+			$lehreinheiten = $this->LehreinheitModel->getLEByLV($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
+			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
+
+			if (!isset($lehrveranstaltung->_children))
+			{
+
+				$lehrveranstaltung->_children = $lehreinheiten_data;
+			}
+			$tree[] = $lehrveranstaltung;
+		}
+		$this->terminateWithSuccess($tree);
+	}*/
+
+	/*public function loadByFachbereich($fachbereich, $mitarbeiter_uid = null)
+	{
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
+		$this->LehreinheitModel->getLvsByFachbereich($fachbereich, $studiensemester_kurzbz, $mitarbeiter_uid);
+	}*/
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+
+	private function assignUniqueIndex(&$nodes, &$counter)
+	{
+		foreach ($nodes as &$node)
+		{
+			$node->uniqueindex = $counter++;
+			if (!empty($node->_children) && is_array($node->_children))
+			{
+				$this->assignUniqueIndex($node->_children, $counter);
+			}
+		}
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/DirektGruppe.php b/application/controllers/api/frontend/v1/lv/DirektGruppe.php
new file mode 100644
index 000000000..fe1737f6a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/DirektGruppe.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * 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/>.
+ */
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class DirektGruppe extends FHCAPI_Controller
+{
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'add' => ['admin:rw', 'assistenz:rw'],
+			'delete' => ['admin:rw', 'assistenz:rw'],
+			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+
+		$this->loadPhrases([
+			'ui'
+		]);
+		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	public function add()
+	{
+		$uid = $this->input->post('uid');
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+
+		$this->checkPermission($lehreinheit_id, $uid);
+
+		$result = $this->_ci->LehreinheitgruppeModel->direktUserAdd($uid, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function delete()
+	{
+		$uid = $this->input->post('uid');
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+
+		$this->checkPermission($lehreinheit_id, $uid);
+
+		$result = $this->_ci->LehreinheitgruppeModel->direktUserDelete($uid, $lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getByLehreinheit($lehreinheit_id = null)
+	{
+		$this->checkPermission($lehreinheit_id);
+		$gruppen = $this->_ci->LehreinheitgruppeModel->getDirectGroup($lehreinheit_id);
+		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : array());
+	}
+
+	private function checkPermission($lehreinheit_id, $uid = false)
+	{
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit_result) || isError($lehreinheit_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		if ($uid)
+		{
+			$benuzuer_result = $this->_ci->BenutzerModel->load(array($uid));
+			if (!hasData($benuzuer_result) || isError($benuzuer_result))
+				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->_ci->LehreinheitModel->getOes($lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$oe_array = $result;
+
+		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid'))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/Favorites.php b/application/controllers/api/frontend/v1/lv/Favorites.php
new file mode 100644
index 000000000..080a4ec6e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Favorites.php
@@ -0,0 +1,47 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Favorites extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => self::PERM_LOGGED,
+			'set' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Variable_model', 'VariableModel');
+	}
+
+	public function index()
+	{
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['lv_favorites']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if (!$data)
+			$this->terminateWithSuccess(null);
+		else
+			$this->terminateWithSuccess(isset($data['lv_favorites']) ? $data['lv_favorites'] : null);
+	}
+
+	public function set()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('favorites', 'Favorites', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$favorites = $this->input->post('favorites');
+
+		$result = $this->VariableModel->setVariable(getAuthUID(), 'lv_favorites', $favorites);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess(true);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
new file mode 100644
index 000000000..01c11f98f
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -0,0 +1,189 @@
+<?php
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Gruppe extends FHCAPI_Controller
+{
+	private $_uid;
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'add' => ['admin:rw', 'assistenz:rw'],
+			'delete' => ['admin:rw', 'assistenz:rw'],
+			'deleteFromLVPlan' => ['admin:rw', 'assistenz:rw'],
+			'getBenutzer' => ['admin:r', 'assistenz:r'],
+			'getAll' => ['admin:r', 'assistenz:r'],
+			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+		$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
+		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+	}
+
+	public function delete()
+	{
+		$lehreinheitgruppe_id = $this->input->post('lehreinheitgruppe_id');
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($lehreinheitgruppe_id) || !ctype_digit((string)$lehreinheitgruppe_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheitgruppe_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheitgruppe_id' => $lehreinheitgruppe_id));
+		if (!hasData($lehreinheitgruppe_result) || isError($lehreinheitgruppe_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->checkPermission($lehreinheit_id);
+
+		$result = $this->_ci->LehreinheitgruppeModel->deleteGroup($lehreinheit_id, $lehreinheitgruppe_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function add()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$gid = $this->input->post('gid');
+		$lehrverband = $this->input->post('lehrverband');
+
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($gid) || !ctype_digit((string)$gid) || is_null($lehrverband))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$gruppe_result = $this->_ci->GruppeModel->loadWhere(array('gid' => $gid));
+		if (!hasData($gruppe_result) || isError($gruppe_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->checkPermission($lehreinheit_id);
+
+		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getByLehreinheit($lehreinheit_id = null)
+	{
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->checkPermission($lehreinheit_id);
+
+		$gruppen = $this->_ci->LehreinheitgruppeModel->getByLehreinheit($lehreinheit_id);
+		$this->terminateWithSuccess(hasData($gruppen) ? getData($gruppen) : array());
+	}
+
+	public function deleteFromLVPlan()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$lehreinheitgruppe_id = $this->input->post('lehreinheitgruppe_id');
+
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($lehreinheitgruppe_id) || !ctype_digit((string)$lehreinheitgruppe_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheitgruppe_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheitgruppe_id' => $lehreinheitgruppe_id));
+		if (!hasData($lehreinheitgruppe_result) || isError($lehreinheitgruppe_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->checkPermission($lehreinheit_id);
+
+		$result = $this->_ci->StundenplandevModel->deleteGroupPlanning($lehreinheit_id, $lehreinheitgruppe_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+
+	public function getAll()
+	{
+		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
+											studiengang_kz,
+											semester,
+											bezeichnung,
+											gid,
+											\'false\' as lehrverband');
+		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false));
+
+		$gruppen_array = array();
+
+		if (isError($gruppen_result))
+			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
+
+		if (hasData($gruppen_result))
+			$gruppen_array = getData($gruppen_result);
+
+		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
+												studiengang_kz,
+												semester,
+												tbl_lehrverband.bezeichnung,
+												gid,
+												\'true\' as lehrverband');
+		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehrverbandModel->addOrder('verband');
+		$this->_ci->LehrverbandModel->addOrder('gruppe');
+		$lehrverband_result = $this->_ci->LehrverbandModel->loadWhere(array('tbl_lehrverband.aktiv' => true));
+
+		$lehrverband_array = array();
+
+		if (isError($lehrverband_result))
+			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
+
+		if (hasData($lehrverband_result))
+			$lehrverband_array = getData($lehrverband_result);
+
+		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
+
+		$this->terminateWithSuccess($all_gruppen);
+	}
+
+	public function getBenutzer()
+	{
+		$this->_ci->PersonModel->addSelect('vorname, nachname, uid, semester, UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang');
+		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
+		$this->_ci->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid', 'LEFT');
+		$this->_ci->PersonModel->addJoin('public.tbl_student', 'uid = student_uid', 'LEFT');
+		$this->_ci->PersonModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+
+		$personen = $this->_ci->PersonModel->loadWhere(array('tbl_benutzer.aktiv' => true));
+		$this->terminateWithSuccess(hasData($personen) ? getData($personen) : array());
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+
+	private function checkPermission($lehreinheit_id)
+	{
+		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit_result) || isError($lehreinheit_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->_ci->LehreinheitModel->getOes($lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$oe_array = $result;
+
+		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('lv-plan', $oe_array, 'suid'))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+	}
+
+}
diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
new file mode 100644
index 000000000..84ee66d5d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -0,0 +1,438 @@
+<?php
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Lehreinheit extends FHCAPI_Controller
+{
+	private $_uid;
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'add' => ['admin:rw',  'assistenz:rw'],
+			'copy' => ['admin:rw',  'assistenz:rw'],
+			'delete' => ['admin:rw',  'assistenz:rw'],
+			'update' => ['admin:rw',  'assistenz:rw'],
+
+			'get' =>  ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+			'getLehrfach' => ['admin:r', 'assistenz:r'],
+			'getSprache' => ['admin:r', 'assistenz:r'],
+			'getRaumtyp' => ['admin:r', 'assistenz:r'],
+			'getLehrform' => ['admin:r', 'assistenz:r']
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+			)
+		);
+
+		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+	}
+
+	public function get($lehreinheit_id)
+	{
+		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+		$lehreinheit->lehrfaecher = $this->getLehrfaecher($lehreinheit);
+		$this->terminateWithSuccess($lehreinheit);
+	}
+
+	private function getLehrfaecher($lehreinheit)
+	{
+		$lehrfacher_array = array($lehreinheit->lehrfach_id);
+		$this->_ci->LehreinheitModel->addSelect('lehrveranstaltung_id_kompatibel');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung_kompatibel', 'lehrveranstaltung_id');
+		$lehrfaecher = $this->_ci->LehreinheitModel->loadWhere(array('lehrveranstaltung_id' => $lehreinheit->lehrveranstaltung_id));
+
+
+		if (hasData($lehrfaecher))
+			$lehrfaecher_array = array_merge($lehrfacher_array, array_column(getData($lehrfaecher), 'lehrveranstaltung_id_kompatibel'));
+
+		$lehrfaecher_array[] = $lehreinheit->lehrveranstaltung_id;
+
+		$this->_ci->LehrveranstaltungModel->addDistinct('lehrfach_id');
+		$this->_ci->LehrveranstaltungModel->addSelect("tbl_lehrveranstaltung.lehrveranstaltung_id, CONCAT(tbl_lehrveranstaltung.bezeichnung || '(' || tbl_lehrveranstaltung.oe_kurzbz || ')') as lehrfach");
+		$this->_ci->LehrveranstaltungModel->db->where_in('tbl_lehrveranstaltung.lehrveranstaltung_id', $lehrfaecher_array);
+		$lehrfaecher_result = $this->_ci->LehrveranstaltungModel->load();
+
+		return hasData($lehrfaecher_result) ? getData($lehrfaecher_result) : array();
+	}
+
+	public function add()
+	{
+		$lehrveranstaltung_id = $this->input->post('lehrveranstaltung_id');
+
+		if (is_null($lehrveranstaltung_id) || !ctype_digit((string)$lehrveranstaltung_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehrveranstaltung_result = $this->_ci->LehrveranstaltungModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung_id));
+
+		if (!hasData($lehrveranstaltung_result) || isError($lehrveranstaltung_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehrveranstaltung = getData($lehrveranstaltung_result)[0];
+
+		$oe_result = $this->_ci->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id, $lehrveranstaltung->studiengang_kz);
+		$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
+
+		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('lv-plan', $oe_array, 'suid'))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+
+		$this->_ci->load->library('form_validation');
+
+		$updatableFields = array(
+			'lehrveranstaltung_id',
+			'studiensemester_kurzbz',
+			'lehrfach_id',
+			'lehrform_kurzbz',
+			'stundenblockung',
+			'wochenrythmus',
+			'gewicht',
+			'start_kw',
+			'raumtyp',
+			'raumtypalternativ',
+			'sprache',
+			'lehre',
+			'anmerkung',
+			'lvnr',
+			'unr',
+		);
+
+		foreach ($updatableFields as $field)
+		{
+			switch ($field) {
+				case 'lehrveranstaltung_id':
+					$this->form_validation->set_rules($field, 'Lehrveranstaltung ID', 'required|integer');
+					break;
+				case 'studiensemester_kurzbz':
+					$this->form_validation->set_rules($field, 'Studiensemester', 'required|max_length[16]');
+					break;
+				case 'lehrfach_id':
+					$this->form_validation->set_rules($field, 'Lehrfach ID', 'required|integer');
+					break;
+				case 'lehrform_kurzbz':
+					$this->form_validation->set_rules($field, 'Lehrform', 'required|max_length[8]');
+					break;
+				case 'stundenblockung':
+					$this->form_validation->set_rules($field, 'Stundenblockung', 'required|integer|greater_than_equal_to[0]');
+					break;
+				case 'wochenrythmus':
+					$this->form_validation->set_rules($field, 'Wochenrhytmus', 'required|integer|greater_than_equal_to[0]');
+					break;
+				case 'start_kw':
+					$this->form_validation->set_rules($field, 'Start KW', 'integer|greater_than[0]|less_than_equal_to[53]');
+					break;
+				case 'gewicht':
+					$this->form_validation->set_rules($field, 'Gewicht', 'numeric');
+					break;
+				case 'raumtyp':
+					$this->form_validation->set_rules($field, 'Raumtyp', 'required|max_length[16]');
+					break;
+				case 'raumtypalternativ':
+					$this->form_validation->set_rules($field, 'Raumtyp Alternativ', 'required|max_length[16]');
+					break;
+				case 'sprache':
+					$this->form_validation->set_rules($field, 'Sprache', 'required|max_length[16]');
+					break;
+				case 'lvnr':
+					$this->form_validation->set_rules($field, 'LVNR', 'integer');
+					break;
+				case 'unr':
+					$this->form_validation->set_rules($field, 'UNR', 'integer');
+					break;
+				case 'lehre':
+					$this->form_validation->set_rules($field, 'Lehre', 'trim');
+					break;
+				case 'anmerkung':
+					$this->form_validation->set_rules($field, 'Anmerkung', 'trim');
+					break;
+			}
+		}
+
+		if ($this->form_validation->run() === false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+
+		$updateData = array();
+		foreach ($updatableFields as $field)
+		{
+			$value = $this->input->post($field);
+
+			if ($value !== null)
+			{
+				$updateData[$field] = $value;
+			}
+		}
+
+		$updateData['insertvon'] = $this->_uid;
+		$updateData['insertamum'] = date('Y-m-d H:i:s');
+
+		$result = $this->_ci->LehreinheitModel->insert(
+			$updateData
+		);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function copy()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$art = $this->input->post('art');
+
+		$lehreinheit_old = $this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit_old->lehreinheit_id);
+
+		$lehreinheit_new = $lehreinheit_old;
+
+		$lehreinheit_new->unr = null;
+		unset($lehreinheit_new->lehreinheit_id);
+		$lehreinheit_new->updateamum = date('Y-m-d H:i:s');
+		$lehreinheit_new->updatevon = $this->_uid;
+		$lehreinheit_new->insertamum = date('Y-m-d H:i:s');
+		$lehreinheit_new->insertvon = $this->_uid;
+
+		$insert_result = $this->_ci->LehreinheitModel->insert($lehreinheit_new);
+
+		if (isError($insert_result))
+			$this->terminateWithError(getError($insert_result), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheit_id_new = getData($insert_result);
+
+		if (in_array($art, array('gruppen', 'alle')))
+		{
+			$gruppen_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+			if (isError($gruppen_result))
+				$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
+
+			if (hasData($gruppen_result))
+			{
+				$gruppen = getData($gruppen_result);
+
+				foreach ($gruppen as $gruppe)
+				{
+					$gruppe_new = $gruppe;
+					unset($gruppe_new->lehreinheitgruppe_id);
+					$gruppe_new->lehreinheit_id = $lehreinheit_id_new;
+					$gruppe_new->insertamum = date('Y-m-d H:i:s');
+					$gruppe_new->insertvon = $this->_uid;
+					$gruppe_new->updateamum = date('Y-m-d H:i:s');
+					$gruppe_new->updatevon = $this->_uid;
+
+					$gruppe_new_result = $this->_ci->LehreinheitgruppeModel->insert($gruppe_new);
+
+					if (isError($gruppe_new_result))
+						$this->terminateWithError(getError($gruppe_new_result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		if (in_array($art, array('lektoren', 'alle')))
+		{
+			$lektoren_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+			if (isError($lektoren_result))
+				$this->terminateWithError(getError($lektoren_result), self::ERROR_TYPE_GENERAL);
+
+			if (hasData($lektoren_result))
+			{
+				$lektoren = getData($lektoren_result);
+
+				foreach ($lektoren as $lektor)
+				{
+
+					$lektor_new = $lektor;
+					$lektor_new->lehreinheit_id = $lehreinheit_id_new;
+					$lektor_new->insertamum = date('Y-m-d H:i:s');
+					$lektor_new->insertvon = $this->_uid;
+					$lektor_new->updateamum = date('Y-m-d H:i:s');
+					$lektor_new->updatevon = $this->_uid;
+					unset($lektor_new->vertrag_id);
+
+					$lektor_new_result = $this->_ci->LehreinheitmitarbeiterModel->insert((array)$lektor_new);
+
+					if (isError($lektor_new_result))
+						$this->terminateWithError(getError($lektor_new_result), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+
+		$this->terminateWithSuccess("Erfolgeich gespeichert");
+	}
+
+	public function delete()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit->lehreinheit_id);
+
+		$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithValidationErrors(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich geloescht');
+	}
+
+	public function update()
+	{
+		$lehreinheit = $this->checkLehreinheit($this->input->post('lehreinheit_id'));
+
+		$this->checkPermission($lehreinheit->lehreinheit_id);
+
+		$this->_ci->load->library('form_validation');
+
+		$formData = $this->input->post('formData');
+
+		$updatableFields = array(
+			'lehrveranstaltung_id',
+			'studiensemester_kurzbz',
+			'lehrfach_id',
+			'lehrform_kurzbz',
+			'stundenblockung',
+			'wochenrythmus',
+			'gewicht',
+			'start_kw',
+			'raumtyp',
+			'raumtypalternativ',
+			'sprache',
+			'lehre',
+			'anmerkung',
+			'lvnr',
+			'unr',
+		);
+
+		$this->form_validation->set_data($formData);
+
+		foreach ($updatableFields as $field)
+		{
+			if (array_key_exists($field, $formData))
+			{
+				switch ($field)
+				{
+					case 'lehrveranstaltung_id':
+						$this->form_validation->set_rules($field, 'Lehrveranstaltung ID', 'required|integer');
+						break;
+					case 'studiensemester_kurzbz':
+						$this->form_validation->set_rules($field, 'Studiensemester', 'required|max_length[16]');
+						break;
+					case 'lehrfach_id':
+						$this->form_validation->set_rules($field, 'Lehrfach ID', 'required|integer');
+						break;
+					case 'lehrform_kurzbz':
+						$this->form_validation->set_rules($field, 'Lehrform', 'required|max_length[8]');
+						break;
+					case 'stundenblockung':
+						$this->form_validation->set_rules($field, 'Stundenblockung', 'required|integer|greater_than_equal_to[0]');
+						break;
+					case 'wochenrythmus':
+						$this->form_validation->set_rules($field, 'Wochenrhytmus', 'required|integer|greater_than_equal_to[0]');
+						break;
+					case 'start_kw':
+						$this->form_validation->set_rules($field, 'Start KW', 'integer|greater_than[0]|less_than_equal_to[53]');
+						break;
+					case 'gewicht':
+						$this->form_validation->set_rules($field, 'Gewicht', 'numeric');
+						break;
+					case 'raumtyp':
+						$this->form_validation->set_rules($field, 'Raumtyp', 'required|max_length[16]');
+						break;
+					case 'raumtypalternativ':
+						$this->form_validation->set_rules($field, 'Raumtyp Alternativ', 'required|max_length[16]');
+						break;
+					case 'sprache':
+						$this->form_validation->set_rules($field, 'Sprache', 'required|max_length[16]');
+						break;
+					case 'lvnr':
+						$this->form_validation->set_rules($field, 'LVNR', 'integer');
+						break;
+					case 'unr':
+						$this->form_validation->set_rules($field, 'UNR', 'integer');
+						break;
+					case 'lehre':
+						$this->form_validation->set_rules($field, 'Lehre', 'trim');
+						break;
+					case 'anmerkung':
+						$this->form_validation->set_rules($field, 'Anmerkung', 'trim');
+						break;
+				}
+			}
+		}
+
+		if ($this->form_validation->run() === false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$updateData = [];
+		foreach ($updatableFields as $field)
+		{
+			if (array_key_exists($field, $formData))
+			{
+				$updateData[$field] = $formData[$field];
+			}
+		}
+
+
+		$updateData['updatevon'] = $this->_uid;
+		$updateData['updateamum'] = date('Y-m-d H:i:s');
+		$result = $this->_ci->LehreinheitModel->update(
+			[
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+			],
+			$updateData
+		);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($this->p->t('global', 'gespeichert'));
+	}
+
+
+	private function checkPermission($lehreinheit_id)
+	{
+		$result = $this->_ci->LehreinheitModel->getOes($lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$oe_array = $result;
+
+		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
+			!$this->_ci->permissionlib->isBerechtigtMultipleOe('lv-plan', $oe_array, 'suid'))
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+	}
+	private function checkLehreinheit($lehreinheit_id)
+	{
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit_result) || isError($lehreinheit_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		return getData($lehreinheit_result)[0];
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/Lektor.php b/application/controllers/api/frontend/v1/lv/Lektor.php
new file mode 100644
index 000000000..332bc47b6
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Lektor.php
@@ -0,0 +1,380 @@
+<?php
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Lektor extends FHCAPI_Controller
+{
+	private $_uid;
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'add' => ['admin:rw', 'assistenz:rw'],
+			'update' => ['admin:rw', 'assistenz:rw'],
+			'cancelVertrag' => ['admin:rw', 'assistenz:rw'],
+			'deleteLVPlan' => ['admin:rw', 'assistenz:rw'],
+			'deletePerson' => ['admin:rw', 'assistenz:rw'],
+			'getLehrfunktionen' => ['admin:r', 'assistenz:r'],
+			'getLektoren' => ['admin:r', 'assistenz:r'],
+			'getLektorenByLE' => ['admin:r', 'assistenz:r'],
+			'getLektorDaten' => ['admin:r', 'assistenz:r'],
+			'getLektorVertrag' => ['admin:r', 'assistenz:r'],
+
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+		$this->_ci->load->library('PermissionLib');
+		$this->_ci->load->library('LektorLib');
+		$this->_ci->load->library('form_validation');
+		$this->loadPhrases([
+			'ui'
+		]);
+
+		$this->_ci->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+		$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		$this->_ci->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+
+	}
+
+	private function checkMitarbeiter($mitarbeiter_uid)
+	{
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_result = $this->_ci->MitarbeiterModel->load($mitarbeiter_uid);
+
+		if (!hasData($mitarbeiter_result) || isError($mitarbeiter_result))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+	}
+
+	public function add()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
+		$this->checkLehreinheit($lehreinheit_id);
+		$this->checkMitarbeiter($mitarbeiter_uid);
+		$lehrfach_permission = $this->checkLehrfachPermission($lehreinheit_id, array('assistenz', 'admin'));
+		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
+
+		if (!$lehrfach_permission && !$lehreinheit_permission)
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+
+		$result = $this->_ci->lektorlib->addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid);
+
+		if (isError($result)) $this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess("Erfolgreich gespeichert");
+	}
+
+	public function update()
+	{
+		$formData = $this->input->post('formData');
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
+		$this->checkLehreinheit($lehreinheit_id);
+		$this->checkMitarbeiter($mitarbeiter_uid);
+
+		$updatableFields = array(
+			'lehrfunktion_kurzbz',
+			'planstunden',
+			'stundensatz',
+			'faktor',
+			'anmerkung',
+			'bismelden',
+			'semesterstunden',
+			'mitarbeiter_uid'
+		);
+
+		$this->form_validation->set_data($formData);
+
+		foreach ($updatableFields as $field)
+		{
+			if (array_key_exists($field, $formData))
+			{
+				switch ($field)
+				{
+					case 'lehrfunktion_kurzbz':
+						$this->form_validation->set_rules($field, 'Lehrfunktion', 'required|max_length[16]');
+						break;
+					case 'planstunden':
+						$this->form_validation->set_rules($field, 'Planstunden', 'integer|greater_than_equal_to[0]');
+						break;
+					case 'stundensatz':
+						$this->form_validation->set_rules($field, 'Stundensatz', 'numeric|greater_than_equal_to[0]');
+						break;
+					case 'faktor':
+						$this->form_validation->set_rules($field, 'Faktor', 'numeric|greater_than_equal_to[0]');
+						break;
+					case 'anmerkung':
+						$this->form_validation->set_rules($field, 'Anmerkung', 'max_length[256]');
+						break;
+					case 'bismelden':
+						$this->form_validation->set_rules($field, 'Bis Melden', 'trim');
+						break;
+					case 'semesterstunden':
+						$this->form_validation->set_rules($field, 'Semesterstunden', 'callback__check_semesterstunden');
+						break;
+					case 'mitarbeiter_uid':
+						$this->form_validation->set_rules($field, 'Semesterstunden', 'required|max_length[32]');
+						break;
+				}
+			}
+		}
+		if (!$this->form_validation->run())
+		{
+			$this->terminateWithError($this->form_validation->error_array());
+		}
+
+		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
+		{
+			$formData['semesterstunden'] = null;
+		}
+
+		$lehreinheit_permission = $this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
+
+		if (!$lehreinheit_permission)
+			$this->terminateWithError($this->p->t('ui', 'error_fieldWriteAccess'));
+
+		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
+
+		if (isError($result)) $this->terminateWithError(getError($result));
+		$this->terminateWithSuccess("Erfolgreich geupdated");
+	}
+
+	public function _check_semesterstunden($value)
+	{
+		if ($value === null || $value === '') {
+			return true;
+		}
+
+		if (!is_numeric($value))
+		{
+			$this->form_validation->set_message(
+				'_check_semesterstunden',
+				'Das Feld {field} muss eine Zahl sein.'
+			);
+			return false;
+		}
+
+		if ($value < 0)
+		{
+			$this->form_validation->set_message(
+				'_check_semesterstunden',
+				'Das Feld {field} muss eine Zahl größer oder gleich 0 sein.'
+			);
+			return false;
+		}
+
+		return true;
+	}
+	public function getLehrfunktionen()
+	{
+		$this->_ci->load->model('education/Lehrfunktion_model', 'LehrfunktionModel');
+		$this->_ci->LehrfunktionModel->addOrder('lehrfunktion_kurzbz');
+		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
+	}
+
+	public function getLektoren()
+	{
+		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+		$this->terminateWithSuccess(getData($this->_ci->MitarbeiterModel->loadWhere(array('public.tbl_benutzer.aktiv' => true))));
+	}
+
+	private function checkLehreinheit($lehreinheit_id)
+	{
+		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$lehreinheit_result = $this->_ci->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit_result) || isError($lehreinheit_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		return getData($lehreinheit_result)[0];
+
+	}
+	public function getLektorenByLE($lehreinheit_id = null)
+	{
+		$this->checkLehreinheit($lehreinheit_id);
+		$le_mitarbeiter_data = $this->_ci->LehreinheitmitarbeiterModel->getLektorenByLe($lehreinheit_id);
+		$this->terminateWithSuccess(hasData($le_mitarbeiter_data) ? getData($le_mitarbeiter_data) : array());
+	}
+
+	public function getLektorDaten($lehreinheit_id = null, $mitarbeiter_uid = null)
+	{
+		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_result = $this->_ci->MitarbeiterModel->load($mitarbeiter_uid);
+
+		if (!hasData($mitarbeiter_result) || isError($mitarbeiter_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
+		$studiensemester = getData($studiensemester_result)[0];
+
+		$defaultStundensatz = $this->_ci->StundensatzModel->getDefaultStundensatz($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre');
+
+		$le_mitarbeiter_result = $this->_ci->LehreinheitmitarbeiterModel->getByLeLektor($lehreinheit_id, $mitarbeiter_uid);
+
+		$le_mitarbeiter_data = array();
+		if (hasData($le_mitarbeiter_result))
+		{
+			$le_mitarbeiter_data = getData($le_mitarbeiter_result)[0];
+			$le_mitarbeiter_data->default_stundensatz = $defaultStundensatz;
+		}
+		$vertrag = $this->getLektorVertrag($lehreinheit_id, $mitarbeiter_uid);
+		$le_mitarbeiter_data->vertrag = $vertrag;
+		$this->terminateWithSuccess($le_mitarbeiter_data);
+	}
+
+	private function getLektorVertrag($lehreinheit_id = null, $mitarbeiter_uid = null)
+	{
+		$this->_ci->load->model('accounting/Vertrag_model', 'VertragModel');
+		$vertrag = $this->_ci->VertragModel->getVertrag($mitarbeiter_uid, $lehreinheit_id);
+		return hasData($vertrag) ? getData($vertrag)[0] : null;
+	}
+
+	private function checkLehrfachPermission($lehreinheit_id, $permissions)
+	{
+		$lehrfach_oe_kurzbz = $this->_ci->LehreinheitModel->getLehrfachOe($lehreinheit_id);
+
+		if (isError($lehrfach_oe_kurzbz))
+			$this->terminateWithError(getError($lehrfach_oe_kurzbz), self::ERROR_TYPE_GENERAL);
+
+		$lehrfach_oe_kurzbz = array('');
+		if (hasData($lehrfach_oe_kurzbz))
+			$lehrfach_oe_kurzbz = array_column(getData($lehrfach_oe_kurzbz), 'oe_kurzbz');
+
+
+		return $this->checkPermissionGenerel($permissions, $lehrfach_oe_kurzbz);
+	}
+
+	private function checkPermissionGenerel($permissions, $oe_array)
+	{
+		$hasPermission = false;
+		foreach ($permissions as $permission)
+		{
+			if ($this->_ci->permissionlib->isBerechtigtMultipleOe($permission, $oe_array, 'suid'))
+			{
+				$hasPermission = true;
+				break;
+			}
+		}
+
+		return $hasPermission;
+	}
+
+	private function checkPermission($lehreinheit_id, $permissions)
+	{
+		$result = $this->_ci->LehreinheitModel->getOes($lehreinheit_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$oe_array = $result;
+
+		return $this->checkPermissionGenerel($permissions, $oe_array);
+	}
+	public function cancelVertrag()
+	{
+		$vertrag_id = $this->input->post('vertrag_id');
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
+		$this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit_id, array('admin', 'lehre/lehrauftrag_bestellen'));
+
+		if (is_null($vertrag_id) || !ctype_digit((string)$vertrag_id))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$vertrag_result = $this->_ci->VertragModel->load($vertrag_id);
+
+		if (!hasData($vertrag_result) || isError($vertrag_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_result = $this->_ci->MitarbeiterModel->load($mitarbeiter_uid);
+
+		if (!hasData($mitarbeiter_result) || isError($mitarbeiter_result))
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->_ci->VertragModel->cancelVertrag($vertrag_id, $mitarbeiter_uid);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deletePerson()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
+		$this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit_id, array('admin', 'assistenz', 'lv-plan'));
+
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_result = $this->_ci->MitarbeiterModel->load($mitarbeiter_uid);
+
+		if (!hasData($mitarbeiter_result) || isError($mitarbeiter_result))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$delete_result =$this->_ci->LehreinheitmitarbeiterModel->deleteLektorFromLe($lehreinheit_id, $mitarbeiter_uid);
+
+		if (isError($delete_result))
+			$this->terminateWithError(getError($delete_result));
+
+		$this->terminateWithSuccess($delete_result);
+	}
+
+	public function deleteLVPlan()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+
+		$this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit_id, array('lv-plan/lektorentfernen'));
+
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$mitarbeiter_result = $this->_ci->MitarbeiterModel->load($mitarbeiter_uid);
+
+		if (!hasData($mitarbeiter_result) || isError($mitarbeiter_result))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+
+		$delete_result = $this->_ci->StundenplandevModel->deleteLektorPlanning($lehreinheit_id, $mitarbeiter_uid);
+
+		if (isError($delete_result))
+			$this->terminateWithError(getError($delete_result));
+
+		$this->terminateWithSuccess($delete_result);
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/Setup.php b/application/controllers/api/frontend/v1/lv/Setup.php
new file mode 100644
index 000000000..cf73697a7
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Setup.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * 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/>.
+ */
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Setup extends FHCAPI_Controller
+{
+	private $_ci;
+	private $_uid;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'getTabs' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+			'getSprache' => ['admin:r', 'assistenz:r'],
+			'getRaumtyp' => ['admin:r', 'assistenz:r'],
+			'getLehrform' => ['admin:r', 'assistenz:r'],
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_setAuthUID();
+
+		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+	}
+
+	public function getTabs()
+	{
+		$tabs['details'] = array (
+			'title' =>  'Details',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Details.js',
+			'config' => []
+		);
+		$tabs['lektor'] = array (
+			'title' =>  'LektorInnenzuteilung',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Lektor.js',
+			'config' => []
+		);
+		$tabs['notiz'] = array (
+			'title' =>  'Notizen',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Notiz.js',
+			'config' => []
+		);
+		$this->terminateWithSuccess($tabs);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
+		$this->terminateWithSuccess(getData($this->_ci->StudiensemesterModel->load()));
+	}
+	public function getSprache()
+	{
+		$this->_ci->load->model('system/Sprache_model', 'SpracheModel');
+		$this->terminateWithSuccess(getData($this->_ci->SpracheModel->load()));
+	}
+
+	public function getRaumtyp()
+	{
+		$this->_ci->load->model('ressource/Raumtyp_model', 'RaumtypModel');
+		$this->_ci->RaumtypModel->addOrder('raumtyp_kurzbz');
+		$this->terminateWithSuccess(getData($this->_ci->RaumtypModel->loadWhere(array('aktiv' => true))));
+	}
+
+	public function getLehrform()
+	{
+		$language = $this->_getLanguageIndex();
+
+		$this->_ci->load->model('codex/lehrform_model', 'LehrformModel');
+
+		$this->_ci->LehrformModel->addSelect(
+			'*,
+			bezeichnung_kurz[('.$language.')] as bez_kurz,
+			bezeichnung_lang[('.$language.')] as bez
+			'
+		);
+		$this->terminateWithSuccess(getData($this->_ci->LehrformModel->load()));
+	}
+
+	private function _getLanguageIndex()
+	{
+		$this->_ci->load->model('system/Sprache_model', 'SpracheModel');
+		$this->_ci->SpracheModel->addSelect('index');
+		$result = $this->_ci->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+		return hasData($result) ? getData($result)[0]->index : 1;
+	}
+
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid)
+			show_error('User authentification failed');
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/StgTree.php b/application/controllers/api/frontend/v1/lv/StgTree.php
new file mode 100644
index 000000000..fe3047902
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/StgTree.php
@@ -0,0 +1,91 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StgTree extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+	}
+
+	public function _remap($method, $params = [])
+	{
+		if ($method == '' || $method == 'index')
+			return $this->getBase();
+
+		if (!$this->permissionlib->isBerechtigt('assistenz', 's', $method)
+			&& !$this->permissionlib->isBerechtigt('admin', 's', $method)
+		) {
+			return $this->_outputAuthError([$method => ['admin:r', 'assistenz:r']]);
+		}
+
+		return $this->getStudiengang($method);
+		show_404();
+	}
+
+	protected function getBase()
+	{
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("v.studiengang_kz AS link");
+		$this->StudiengangModel->addSelect(
+			"CONCAT(kurzbzlang, ' (', UPPER(CONCAT(typ, kurzbz)), ') - ', tbl_studiengang.bezeichnung) AS name",
+			false
+		);
+		$this->StudiengangModel->addSelect('erhalter_kz');
+		$this->StudiengangModel->addSelect('typ');
+		$this->StudiengangModel->addSelect('kurzbz');
+		$this->StudiengangModel->addSelect('studiengang_kz');
+		$this->StudiengangModel->addSelect('studiengang_kz AS stg_kz');
+
+		$this->StudiengangModel->addOrder('erhalter_kz');
+		$this->StudiengangModel->addOrder('typ');
+		$this->StudiengangModel->addOrder('kurzbz');
+
+		$stgs = $this->permissionlib->getSTG_isEntitledFor('admin') ?: [];
+		$stgs = array_merge($stgs, $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: []);
+
+		if (!$stgs)
+			$this->terminateWithSuccess([]);
+
+		$this->StudiengangModel->db->where_in('studiengang_kz', $stgs);
+
+		$result = $this->StudiengangModel->loadWhere(['v.aktiv' => true]);
+
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+
+	protected function getStudiengang($studiengang_kz)
+	{
+		$link = $studiengang_kz . '/';
+
+		$this->StudiengangModel->addJoin('public.tbl_lehrverband v', 'studiengang_kz');
+
+		$this->StudiengangModel->addDistinct();
+		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
+
+		$this->StudiengangModel->addSelect('semester');
+		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
+
+		$this->StudiengangModel->addOrder('semester');
+
+		$result = $this->StudiengangModel->loadWhere([
+			'v.studiengang_kz' => $studiengang_kz,
+			'v.aktiv' => true
+		]);
+		$list = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($list);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/lv/Tags.php b/application/controllers/api/frontend/v1/lv/Tags.php
new file mode 100644
index 000000000..234ab3cba
--- /dev/null
+++ b/application/controllers/api/frontend/v1/lv/Tags.php
@@ -0,0 +1,24 @@
+<?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,
+		]);
+	}
+}
\ 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..f8e1f816b
--- /dev/null
+++ b/application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php
@@ -0,0 +1,21 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class NotizLehreinheit extends Notiz_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getUid' => ['admin:r', 'assistenz:r'],
+			'getNotizen' => ['admin:r', 'assistenz:r'],
+			'loadNotiz' => ['admin:r', 'assistenz:r'],
+			'addNewNotiz' => ['admin:rw', 'assistenz:rw'],
+			'updateNotiz' => ['admin:rw', 'assistenz:rw'],
+			'deleteNotiz' => ['admin:rw', 'assistenz:rw'],
+			'loadDokumente' => ['admin:r', 'assistenz:r'],
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
+			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+		]);
+	}
+}
\ No newline at end of file
diff --git a/application/libraries/LektorLib.php b/application/libraries/LektorLib.php
new file mode 100644
index 000000000..44c71cdaa
--- /dev/null
+++ b/application/libraries/LektorLib.php
@@ -0,0 +1,342 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class LektorLib
+{
+	private $_ci; // Code igniter instance
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$this->_ci->load->model('ressource/Stundensatz_model', 'StundensatzModel');
+		$this->_ci->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
+	{
+		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.*, tbl_lehrveranstaltung.studiengang_kz, semesterstunden');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+		$lehreinheit_result = $this->_ci->LehreinheitModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+		if (isError($lehreinheit_result)) return $lehreinheit_result;
+
+		if (!hasData($lehreinheit_result)) return error("Lehreinheit not found");
+
+		$lehreinheit = getData($lehreinheit_result)[0];
+
+		$already_assigned = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit->lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+		if (isError($already_assigned)) return $already_assigned;
+
+		if (hasData($already_assigned)) return error('Lektor already assigned');
+
+		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
+		if (isError($studiensemester_result)) return $studiensemester_result;
+		$studiensemester = getData($studiensemester_result)[0];
+
+		$stundensatz = $this->_ci->StundensatzModel->getDefaultStundensatz($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre');
+		$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+
+		$echter_dv = false;
+
+		if (hasData($echter_dv_result))
+		{
+			$echter_dv = true;
+		}
+
+		$maxstunden = $this->getMaxStunden($mitarbeiter_uid, $studiensemester->studiensemester_kurzbz, $lehreinheit->studiengang_kz, $echter_dv);
+
+		$newData['semesterstunden'] = 0;
+		$newData['planstunden'] = 0;
+		if (!is_null($lehreinheit->semesterstunden))
+		{
+			$newData['semesterstunden'] = min($lehreinheit->semesterstunden, $maxstunden);
+			$newData['planstunden'] = min($lehreinheit->semesterstunden, $maxstunden);
+		}
+
+		$newData['lehreinheit_id'] = $lehreinheit->lehreinheit_id;
+		$newData['mitarbeiter_uid'] = $mitarbeiter_uid;
+		$newData['lehrfunktion_kurzbz'] = 'Lektor';
+		$newData['bismelden'] = true;
+		$newData['insertvon'] = getAuthUID();
+		$newData['insertamum'] = date('Y-m-d H:i:s');
+		$newData['stundensatz'] = $stundensatz;
+		$result = $this->_ci->LehreinheitmitarbeiterModel->insert($newData);
+
+		if (isError($result)) return $result;
+
+		return success("Lektor added successfully");
+	}
+
+	public function updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $new_data)
+	{
+		$this->_ci->LehreinheitmitarbeiterModel->addSelect('lehre.tbl_lehreinheitmitarbeiter.*, lehre.tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.studiengang_kz');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+		$lehreinheit_result = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+		if (isError($lehreinheit_result)) return $lehreinheit_result;
+
+		if (!hasData($lehreinheit_result)) return error("Lehreinheit not found");
+
+		$lehreinheit = getData($lehreinheit_result)[0];
+
+		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
+		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
+		{
+			$this->_ci->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+			$this->_ci->StundenplandevModel->addGroupBy('stundenplandev_id');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$this->_ci->StundenplandevModel->addGroupBy('mitarbeiter_uid');
+			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+			if (hasData($verplant))
+				return error('Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist!');
+		}
+		$warning = '';
+		if (isset($new_data['semesterstunden']))
+		{
+			$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $lehreinheit->studiengang_kz));
+			if (isError($studiengang_result)) return $studiengang_result;
+			if (!hasData($studiengang_result)) return error('Studiengang not found');
+			$studiengang = getData($studiengang_result)[0];
+
+			$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
+			if (isError($studiensemester_result)) return $studiensemester_result;
+			$studiensemester = getData($studiensemester_result)[0];
+
+			$echter_dv_result = $this->_ci->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'echterdv');
+
+			$echter_dv = false;
+
+			if (hasData($echter_dv_result))
+			{
+				$echter_dv = true;
+			}
+
+			$neue_stunden_eingerechnet = isset($new_data['bismelden']) ? $new_data['bismelden'] : $lehreinheit->bismelden;
+			$alte_stunden_eingerechnet = $lehreinheit->bismelden;
+
+			if (($new_data['semesterstunden'] > $lehreinheit->semesterstunden) || $neue_stunden_eingerechnet)
+			{
+				$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
+				if (isError($stundengrenze_result)) return $stundengrenze_result;
+
+				$stundengrenze = getData($stundengrenze_result)[0];
+
+				$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
+				$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array('');
+
+				if ($alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden) + {$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])}) as summe");
+				else if ($alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) - ($lehreinheit->semesterstunden)) as summe");
+				else if (!$alte_stunden_eingerechnet && $neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden) + ({$this->_ci->LehreinheitmitarbeiterModel->db->escape($new_data['semesterstunden'])})) as summe");
+				else if (!$alte_stunden_eingerechnet && !$neue_stunden_eingerechnet)
+					$this->_ci->LehreinheitmitarbeiterModel->addSelect("(SUM(tbl_lehreinheitmitarbeiter.semesterstunden)) as summe");
+
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+				$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', (isset($new_data['mitarbeiter_uid']) ? $new_data['mitarbeiter_uid'] : $mitarbeiter_uid));
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $lehreinheit->studiensemester_kurzbz);
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+				$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
+
+				$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
+
+
+				if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+					&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+					&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+				{
+					$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+				}
+
+				$summe_result = $this->_ci->LehreinheitmitarbeiterModel->load();
+
+				if (isError($summe_result)) return $summe_result;
+
+				if (!hasData($summe_result)) return error('Fehler beim Ermitteln der Gesamtstunden');
+
+				$summe = getData($summe_result)[0]->summe;
+
+				if ($summe > $stundengrenze->stunden)
+				{
+
+					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
+					{
+						if (!$this->LehrauftragAufFirma(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid))
+							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\n Daten wurden NICHT gespeichert!\n\n");
+					}
+					else
+					{
+						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\n Daten wurden gespeichert!\n\n";
+					}
+
+					$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
+
+					if (hasData($stunden_limit_result))
+					{
+						$stunden_limit_array = getData($stunden_limit_result);
+						foreach ($stunden_limit_array as $stunden_limit)
+						{
+							$warning .= $stunden_limit->summe . ' Stunden' . $stunden_limit->bezeichnung;
+						}
+					}
+				}
+			}
+		}
+
+		$benutzer_result = $this->_ci->BenutzerModel->load(array(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid));
+
+		if (isError($benutzer_result)) return $benutzer_result;
+
+		if (!hasData($benutzer_result)) return error('Benutzer not found');
+
+		$benutzer_aktiv = getData($benutzer_result)[0]->aktiv;
+
+		if (!$benutzer_aktiv)
+			$warning .= "Achtung: Der/Die Benutzer*in ist inaktiv!\nBitte informieren Sie die Personalbteilung.\n\nDaten wurden gespeichert.\n\n";
+
+		$updatableFields = array(
+			'semesterstunden',
+			'planstunden',
+			'stundensatz',
+			'faktor',
+			'anmerkung',
+			'lehrfunktion_kurzbz',
+			'mitarbeiter_uid',
+			'bismelden'
+		);
+
+		$updateData = array();
+		foreach ($updatableFields as $field)
+		{
+			$value = isset($new_data[$field]) ? $new_data[$field] : null;
+
+			if ($value !== null)
+			{
+				$updateData[$field] = $value;
+			}
+		}
+		$updateData['updatevon'] = getAuthUID();
+		$updateData['updateamum'] = date('Y-m-d H:i:s');
+
+		$result = $this->_ci->LehreinheitmitarbeiterModel->update(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid), $updateData);
+
+		if (isError($result)) return $result;
+
+		if ($warning !== '') return error($warning);
+
+		return success('Successfully updated Lehreinheit');
+	}
+
+	private function getMaxStunden($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz, $echter_dv)
+	{
+		$maxstunden = 9999;
+
+		$studiengang_result = $this->_ci->StudiengangModel->loadWhere(array('studiengang_kz' => $studiengang_kz));
+		if (isError($studiengang_result)) return $studiengang_result;
+
+		$studiengang = getData($studiengang_result)[0];
+
+		$stundengrenze_result = $this->_ci->OrganisationseinheitModel->getStundengrenze($studiengang->oe_kurzbz, $echter_dv);
+		if (isError($stundengrenze_result)) return $stundengrenze_result;
+
+		$stundengrenze = getData($stundengrenze_result)[0];
+		$maxstunden = $stundengrenze->stunden;
+
+		$lehrauftrag_firma = $this->LehrauftragAufFirma($mitarbeiter_uid);
+
+		if (!$echter_dv && !$lehrauftrag_firma)
+		{
+			$oe_result = $this->_ci->OrganisationseinheitModel->getChilds($stundengrenze->oe_kurzbz);
+			$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array('');
+
+			$stunden_summe_result = $this->getSumSemesterstunden($mitarbeiter_uid, $studiensemester_kurzbz, $oe_array);
+
+			$stunden_summe = hasData($stunden_summe_result) ? getData($stunden_summe_result)[0]->summe : 0;
+
+			if ($stunden_summe >= $maxstunden && (!$this->_ci->permissionlib->isBerechtigt('admin')))
+			{
+				$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $studiensemester_kurzbz, $oe_array);
+
+				$error = "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $maxstunden Stunden ($stundengrenze->oe_kurzbz) wurde ueberschritten!\n
+				 			Daten wurden NICHT gespeichert!\n\n";
+
+				if (hasData($stunden_limit_result))
+				{
+					$stunden_limit_array = getData($stunden_limit_result);
+
+					foreach ($stunden_limit_array as $stunden_limit)
+					{
+						$error .= $stunden_limit->summe . ' Stunden' . $stunden_limit->bezeichnung;
+					}
+				}
+				return error($error);
+			}
+			else
+				$maxstunden =- $stunden_summe;
+		}
+		return $maxstunden;
+	}
+
+	private function LehrauftragAufFirma($mitarbeiter_uid)
+	{
+		$this->_ci->MitarbeiterModel->addJoin('tbl_benutzer', 'tbl_mitarbeiter.mitarbeiter_uid = tbl_benutzer.uid');
+		$this->_ci->MitarbeiterModel->addJoin('tbl_person', 'person_id');
+		$this->_ci->MitarbeiterModel->addJoin('tbl_adresse', 'person_id', 'LEFT');
+		$this->_ci->MitarbeiterModel->addOrder('zustelladresse', 'DESC');
+		$this->_ci->MitarbeiterModel->addOrder('firma_id');
+		$this->_ci->MitarbeiterModel->addLimit(1);
+		$firma_result = $this->_ci->MitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid));
+		$firma = getData($firma_result)[0]->firma_id;
+		return !is_null($firma);
+	}
+
+	private function getSumSemesterstunden($mitarbeiter_uid, $studiensemester_kurzbz, $oe_array = array())
+	{
+		$this->_ci->LehreinheitmitarbeiterModel->addSelect('SUM(tbl_lehreinheitmitarbeiter.semesterstunden) as summe');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', $mitarbeiter_uid);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('lower(mitarbeiter_uid) NOT LIKE', '_dummy%');
+		$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
+		return $this->_ci->LehreinheitmitarbeiterModel->load();
+	}
+
+	private function getStundenInstitut($mitarbeiter_uid, $studiensemester_kurzbz, $oe_array = array())
+	{
+		$this->_ci->LehreinheitmitarbeiterModel->addSelect('SUM(tbl_lehreinheitmitarbeiter.semesterstunden) as summe, tbl_studiengang.bezeichnung');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
+		$this->_ci->LehreinheitmitarbeiterModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('mitarbeiter_uid', $mitarbeiter_uid);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('studiensemester_kurzbz', $studiensemester_kurzbz);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where('bismelden', true);
+		$this->_ci->LehreinheitmitarbeiterModel->db->where_in('tbl_studiengang.oe_kurzbz', $oe_array);
+
+		if(defined('FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE')
+			&& is_array(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE)
+			&& count(FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE) > 0)
+		{
+			$this->_ci->LehreinheitmitarbeiterModel->db->where_not_in('tbl_studiengang.oe_kurzbz', FAS_LV_LEKTORINNENZUTEILUNG_STUNDEN_IGNORE_OE);
+		}
+
+		$this->_ci->LehreinheitmitarbeiterModel->addGroupBy('tbl_studiengang.bezeichnung');
+		return $this->_ci->LehreinheitmitarbeiterModel->load();
+	}
+}
diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index abc2114a6..c17c676c7 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -384,6 +384,60 @@ class Vertrag_model extends DB_Model
 	    }
     }
 
+	public function getVertrag($mitarbeiter_uid, $lehreinheit_id)
+	{
+		$this->addSelect('tbl_lehreinheitmitarbeiter.*, tbl_vertrag.*, status.bezeichnung as vertragsstatus, status.vertragsstatus_kurzbz');
+		$this->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'vertrag_id');
+		$this->addJoin('lehre.tbl_vertragstyp', 'vertragstyp_kurzbz', 'LEFT');
+		$this->addJoin('
+			(
+				SELECT DISTINCT ON(vertrag_id) vertrag_id,
+					bezeichnung, 
+					tbl_vertragsstatus.vertragsstatus_kurzbz 
+				FROM lehre.tbl_vertrag_vertragsstatus 
+					JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz) 
+				ORDER BY vertrag_id, datum DESC
+			) as status', 'status.vertrag_id = lehre.tbl_vertrag.vertrag_id', 'LEFT');
+
+		return $this->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid, 'lehreinheit_id' => $lehreinheit_id));
+	}
+
+	public function cancelVertrag($vertrag_id, $mitarbeiter_uid)
+	{
+		$vertrag = $this->load($vertrag_id);
+
+		if (!hasData($vertrag))
+			return error("Contract not found");
+
+		$vertrag = getData($vertrag)[0];
+
+		$this->_updateVertragRelevant($vertrag->vertrag_id);
+
+		return $this->VertragvertragsstatusModel->insert(array(
+			'vertrag_id' => $vertrag->vertrag_id,
+			'vertragsstatus_kurzbz' => 'storno',
+			'uid' => $mitarbeiter_uid,
+			'datum' => 'NOW()',
+			'insertamum' => 'NOW()',
+			'insertvon' => getAuthUID()
+		));
+	}
+
+	public function deleteVertrag($vertrag_id)
+	{
+		$vertrag = $this->load($vertrag_id);
+
+		if (!hasData($vertrag))
+			return error("Contract not found");
+
+		$vertrag = getData($vertrag)[0];
+
+		$this->_updateVertragRelevant($vertrag->vertrag_id);
+
+		$this->VertragvertragsstatusModel->delete(array('vertrag_id' => $vertrag->vertrag_id));
+		return $this->delete(array('vertrag_id' => $vertrag->vertrag_id));
+	}
+
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods
 
@@ -415,4 +469,20 @@ class Vertrag_model extends DB_Model
 
         return $bezeichnung;
     }
+
+	private function _updateVertragRelevant($vertrag_id)
+	{
+		$this->LehreinheitmitarbeiterModel->update(
+			array("vertrag_id" => $vertrag_id),
+			array(
+				'vertrag_id' => null
+			)
+		);
+		$this->ProjektbetreuerModel->update(
+			array("vertrag_id" => $vertrag_id),
+			array(
+				'vertrag_id' => null
+			)
+		);
+	}
 }
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index d4bc7a22f..ba9e82c64 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -1,4 +1,6 @@
 <?php
+
+use \CI3_Events as Events;
 class Lehreinheit_model extends DB_Model
 {
 
@@ -15,6 +17,9 @@ class Lehreinheit_model extends DB_Model
 		$this->load->model('education/lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 		$this->load->model('education/lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
 		$this->load->model('organisation/studiengang_model', 'StudiengangModel');
+		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		$this->load->model('system/Log_model', 'LogModel');
 	}
 
 	/**
@@ -303,4 +308,437 @@ EOSQL;
 
 		return $this->execQuery($query, $params);
 	}
+
+
+	public function getOes($lehreinheit_id)
+	{
+		$this->addSelect('tbl_lehrveranstaltung.studiengang_kz,
+								tbl_lehrveranstaltung.lehrveranstaltung_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung', 'tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrveranstaltung_id');
+		$result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+		if (isError($result)) return $result;
+
+		if (hasData($result))
+		{
+			$lehrveranstaltung = getData($result)[0];
+			$oe_result = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id, $lehrveranstaltung->studiengang_kz);
+			return success(hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array(''));
+		}
+	}
+
+	public function getLehrfachOe($lehreinheit_id)
+	{
+		$this->addSelect('lehrfach.oe_kurzbz');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id', 'LEFT');
+		return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+	}
+
+
+	public function getByLvidStudiensemester($lv_id, $studiensemester_kurzbz)
+	{
+		$qry = "WITH lehreinheiten AS (
+				SELECT *
+				FROM lehre.tbl_lehreinheit
+				WHERE lehrveranstaltung_id = ?
+					AND studiensemester_kurzbz = ?
+			),
+			gruppen AS (
+				SELECT
+					COALESCE(
+						string_agg(
+							tbl_lehreinheitgruppe.gruppe_kurzbz, ' '
+						) FILTER (WHERE NOT direktinskription),
+							string_agg(
+								COALESCE(
+									upper(tbl_studiengang.typ::varchar(1) ||tbl_studiengang.kurzbz) ||
+									'-'||
+									COALESCE(tbl_lehreinheitgruppe.semester::varchar, '') ||
+									COALESCE(tbl_lehreinheitgruppe.verband::varchar, '')||
+									COALESCE(tbl_lehreinheitgruppe.gruppe, '')), ', '
+							)
+					) AS gruppe,
+					lehreinheit_id
+					FROM
+						lehre.tbl_lehreinheitgruppe
+							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+							LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
+					GROUP BY lehreinheit_id
+				),
+				mitarbeiter AS (
+					SELECT kurzbz, semesterstunden, planstunden, lehreinheit_id
+					FROM lehre.tbl_lehreinheitmitarbeiter
+						JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
+				),
+				fachbereich AS (
+					SELECT
+						tbl_organisationseinheit.bezeichnung,
+						tbl_organisationseinheit.organisationseinheittyp_kurzbz,
+						lehreinheit_id
+					FROM
+						public.tbl_organisationseinheit,
+						lehre.tbl_lehrveranstaltung as lehrfach,
+						lehre.tbl_lehreinheit
+					WHERE tbl_organisationseinheit.oe_kurzbz = lehrfach.oe_kurzbz
+						AND lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
+				),
+				tag_data_agg AS (
+					SELECT
+						lehreinheit_id,
+						COALESCE(json_agg(tag ORDER BY id), '[]'::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,
+								lehreinheit_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 lehreinheit_id IN (SELECT lehreinheit_id FROM lehreinheiten)
+						) AS tag
+					GROUP BY lehreinheit_id
+				)
+				SELECT lehreinheiten.*,
+						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
+						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
+						(
+							SELECT string_agg(gr.gruppe, ' ')
+							FROM gruppen gr
+							WHERE gr.lehreinheit_id = lehreinheiten.lehreinheit_id
+						) AS gruppen,
+						(
+							SELECT string_agg(ma.kurzbz, ' ')
+							FROM mitarbeiter ma
+							WHERE ma.lehreinheit_id = lehreinheiten.lehreinheit_id
+						) AS lektoren,
+						(
+							SELECT string_agg(fachbereich.bezeichnung, ' ')
+							FROM fachbereich
+							WHERE fachbereich.lehreinheit_id = lehreinheiten.lehreinheit_id
+						) AS fachbereich
+				FROM lehreinheiten
+					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
+					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id";
+
+		return $this->execReadOnlyQuery($qry, array($lv_id, $studiensemester_kurzbz));
+	}
+
+	private function getLVTmp($stg_kz = null)
+	{
+		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
+						'' as studienplan_id, '' as studienplan_beeichnung, 
+						CONCAT(vw_lehreinheit.stg_typ, vw_lehreinheit.stg_kurzbz) as studiengang
+				FROM campus.vw_lehreinheit
+				WHERE mitarbeiter_uid = ?
+				  AND studiensemester_kurzbz = ?";
+
+		if (!is_null($stg_kz)) {
+			$qry .= " AND lv_studiengang_kz = ?";
+		}
+
+		return $qry;
+	}
+
+	public function getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz = null)
+	{
+		$qry = "WITH lvs AS (" . $this->getLVTmp($stg_kz) . ")
+				SELECT lvs.*
+				FROM lvs
+				";
+
+		$params = array($mitarbeiter_uid, $studiensemester_kurzbz);
+		if (!is_null($stg_kz))
+		{
+			$params[] = $stg_kz;
+		}
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
+
+
+	public function getLEByLV($lv_id, $studiensemester_kurzbz, $mitarbeiter_uid = null, $fachbereich_kurzbz = null)
+	{
+		$qry = "
+				WITH gruppen AS (
+					SELECT
+						COALESCE(
+							string_agg(
+								tbl_lehreinheitgruppe.gruppe_kurzbz, ', '
+								) FILTER (WHERE NOT direktinskription),
+								string_agg(
+									COALESCE(
+										upper(tbl_studiengang.typ::varchar(1) ||tbl_studiengang.kurzbz) ||
+										'-'||
+										COALESCE(tbl_lehreinheitgruppe.semester::varchar, '') ||
+										COALESCE(tbl_lehreinheitgruppe.verband::varchar, '')||
+										COALESCE(tbl_lehreinheitgruppe.gruppe, '')), ', '
+									)
+						) AS gruppen,
+						lehreinheit_id
+					FROM
+						lehre.tbl_lehreinheitgruppe
+							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+							LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
+					GROUP BY lehreinheit_id
+				),
+				lektoren AS (
+					SELECT string_agg(kurzbz, ' ') as lektoren,
+						   string_agg(semesterstunden::text, ' ') as semesterstunden,
+						   string_agg(planstunden::text, ' ') as planstunden,
+						   lehreinheit_id
+					FROM lehre.tbl_lehreinheitmitarbeiter
+							 JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
+					GROUP BY lehreinheit_id
+				),
+				fachbereich AS (
+					SELECT
+						string_agg(CONCAT(tbl_organisationseinheit.bezeichnung, ' (', tbl_organisationseinheit.organisationseinheittyp_kurzbz, ')'),' ')  as fachbereich,
+						lehreinheit_id
+					FROM
+						public.tbl_organisationseinheit,
+						lehre.tbl_lehrveranstaltung as lehrfach,
+						lehre.tbl_lehreinheit
+					WHERE
+						tbl_organisationseinheit.oe_kurzbz = lehrfach.oe_kurzbz
+					  AND lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
+					GROUP BY lehreinheit_id
+				)
+				SELECT tbl_lehreinheit.*,
+						tbl_lehrveranstaltung.*,
+						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+						lektoren.lektoren,
+						lektoren.semesterstunden,
+						lektoren.planstunden,
+						fachbereich.fachbereich
+				FROM lehre.tbl_lehreinheit
+					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
+					LEFT JOIN gruppen ON tbl_lehreinheit.lehreinheit_id = gruppen.lehreinheit_id
+					LEFT JOIN lektoren ON tbl_lehreinheit.lehreinheit_id = lektoren.lehreinheit_id
+					LEFT JOIN fachbereich ON tbl_lehreinheit.lehreinheit_id = fachbereich.lehreinheit_id
+				WHERE tbl_lehreinheit.lehrveranstaltung_id = ?
+				AND studiensemester_kurzbz = ?
+				";
+
+		$params = array($lv_id, $studiensemester_kurzbz);
+		if ($mitarbeiter_uid !== null)
+		{
+			$qry .= " AND tbl_lehreinheit.lehreinheit_id IN ( SELECT lehreinheit_id FROM lehre.tbl_lehreinheitmitarbeiter WHERE mitarbeiter_uid = ?) ";
+			$params[] = $mitarbeiter_uid;
+		}
+
+		if($fachbereich_kurzbz !== null)
+		{
+			$qry .= " AND EXISTS ( SELECT 1 FROM lehre.tbl_lehrveranstaltung JOIN public.tbl_fachbereich USING(oe_kurzbz) WHERE fachbereich_kurzbz= ? AND lehrveranstaltung_id=tbl_lehreinheit.lehrfach_id)";
+			$params[] = $fachbereich_kurzbz;
+		}
+		$qry .= " ORDER BY lehreinheit_id;";
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
+	public function deleteLehreinheit($lehreinheit_id)
+	{
+		$lehreinheit = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+		if (isError($lehreinheit)) return $lehreinheit;
+
+		if (!hasData($lehreinheit))
+			return error("Lehreinheit not found!");
+
+		$errorReasons = [];
+		$addError = function ($reason = null) use (&$errorReasons)
+		{
+			if ($reason !== null)
+			{
+				$errorReasons[] = $reason;
+			}
+		};
+
+		$stundenplandev_result = $this->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+		$stundenplan_result = $this->StundenplanModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+		if (hasData($stundenplan_result) || hasData($stundenplandev_result))
+			$addError('Dieser LV-Teil ist bereits im LV-Plan verplant und kann daher nicht geloescht werden!');
+
+		Events::trigger(
+			'lehreinheit_delete_check',
+			$addError,
+			$lehreinheit_id
+		);
+
+		if (!empty($errorReasons)) return error($errorReasons);
+
+		$this->db->trans_begin();
+
+		Events::trigger(
+			'lehreinheit_delete',
+			$addError,
+			$lehreinheit_id
+		);
+
+		$undosql = '';
+
+		$lehreinheit_gruppe_result = $this->LehreinheitgruppeModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+		if (hasData($lehreinheit_gruppe_result))
+		{
+			foreach (getData($lehreinheit_gruppe_result) as $row)
+			{
+				$values = [
+					$this->db->escape($row->lehreinheitgruppe_id),
+					$this->db->escape($row->lehreinheit_id),
+					$this->db->escape($row->studiengang_kz),
+					$this->db->escape($row->semester),
+					$this->db->escape($row->verband),
+					$this->db->escape($row->gruppe),
+					$this->db->escape($row->gruppe_kurzbz),
+					$this->db->escape($row->updateamum),
+					$this->db->escape($row->updatevon),
+					$this->db->escape($row->insertamum),
+					$this->db->escape($row->insertvon)
+				];
+
+				$undosql .= "INSERT INTO lehre.tbl_lehreinheitgruppe (
+						lehreinheitgruppe_id,
+						lehreinheit_id,
+						studiengang_kz,
+						semester,
+						verband,
+						gruppe,
+						gruppe_kurzbz,
+						updateamum,
+						updatevon,
+						insertamum,
+						insertvon
+					) VALUES (" . implode(', ', $values) . ");\n";
+			}
+
+			$lehreinheit_gruppe_delete_result = $this->LehreinheitgruppeModel->delete(array('lehreinheit_id' => $lehreinheit_id));
+
+			if (isError($lehreinheit_gruppe_delete_result))
+				$addError(getError($lehreinheit_gruppe_delete_result));
+		}
+
+		$lehreinheit_mitarbeiter_result = $this->LehreinheitmitarbeiterModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+		if (hasData($lehreinheit_mitarbeiter_result))
+		{
+			foreach (getData($lehreinheit_mitarbeiter_result) as $row)
+			{
+				$values = [
+					$this->db->escape($row->lehreinheit_id),
+					$this->db->escape($row->mitarbeiter_uid),
+					$this->db->escape($row->lehrfunktion_kurzbz),
+					$this->db->escape($row->planstunden),
+					$this->db->escape($row->stundensatz),
+					$this->db->escape($row->faktor),
+					$this->db->escape($row->anmerkung),
+					$this->db->escape($row->bismelden),
+					$this->db->escape($row->updateamum),
+					$this->db->escape($row->updatevon),
+					$this->db->escape($row->insertamum),
+					$this->db->escape($row->insertvon),
+					$this->db->escape($row->semesterstunden)
+				];
+
+				$undosql .= "INSERT INTO lehre.tbl_lehreinheitmitarbeiter (
+								lehreinheit_id,
+								mitarbeiter_uid,
+								lehrfunktion_kurzbz,
+								planstunden,
+								stundensatz,
+								faktor,
+								anmerkung,
+								bismelden,
+								updateamum,
+								updatevon,
+								insertamum,
+								insertvon,
+								semesterstunden
+							) VALUES (" . implode(', ', $values) . ");\n";
+			}
+
+			$lehreinheit_mitarbeiter_delete_result = $this->LehreinheitmitarbeiterModel->delete(array('lehreinheit_id' => $lehreinheit_id));
+			if (isError($lehreinheit_mitarbeiter_delete_result))
+				$addError(getError($lehreinheit_mitarbeiter_delete_result));
+		}
+
+		foreach (getData($lehreinheit) as $row)
+		{
+			$values = [
+				$this->db->escape($row->lehreinheit_id),
+				$this->db->escape($row->lehrveranstaltung_id),
+				$this->db->escape($row->studiensemester_kurzbz),
+				$this->db->escape($row->lehrfach_id),
+				$this->db->escape($row->lehrform_kurzbz),
+				$this->db->escape($row->stundenblockung),
+				$this->db->escape($row->wochenrythmus),
+				$this->db->escape($row->start_kw),
+				$this->db->escape($row->raumtyp),
+				$this->db->escape($row->raumtypalternativ),
+				$this->db->escape($row->sprache),
+				$this->db->escape($row->lehre),
+				$this->db->escape($row->anmerkung),
+				$this->db->escape($row->unr),
+				$this->db->escape($row->lvnr),
+				$this->db->escape($row->updateamum),
+				$this->db->escape($row->updatevon),
+				$this->db->escape($row->insertamum),
+				$this->db->escape($row->insertvon),
+			];
+
+			$undosql .= "INSERT INTO lehre.tbl_lehreinheit (
+						lehreinheit_id,
+						lehrveranstaltung_id,
+						studiensemester_kurzbz,
+						lehrfach_id,
+						lehrform_kurzbz,
+						stundenblockung,
+						wochenrythmus,
+						start_kw,
+						raumtyp,
+						raumtypalternativ,
+						sprache,
+						lehre,
+						anmerkung,
+						unr,
+						lvnr,
+						updateamum,
+						updatevon,
+						insertamum,
+						insertvon
+					) VALUES (" . implode(', ', $values) . ");\n";
+		}
+		$lehreinheit_result = $this->delete($lehreinheit_id);
+
+		$deleteSql = "DELETE FROM lehre.tbl_lehreinheitmitarbeiter WHERE lehreinheit_id = " . $this->db->escape($lehreinheit_id) ."; \n
+						DELETE FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id = " . $this->db->escape($lehreinheit_id) ."; \n
+						DELETE FROM lehre.tbl_lehreinheit WHERE lehreinheit_id = " . $this->db->escape($lehreinheit_id) .";";
+		if (isError($lehreinheit_result))
+			$addError($lehreinheit_result);
+
+		$log_result = $this->LogModel->insert([
+			'sql' => $deleteSql,
+			'sqlundo' => $undosql,
+			'beschreibung' => 'Lehreinheit loeschen - ' . $lehreinheit_id,
+			'mitarbeiter_uid' => getAuthUID(),
+		]);
+
+		if (isError($log_result))
+			$addError($log_result);
+
+		if (!empty($errorReasons))
+		{
+			$this->db->trans_rollback();
+			return error($errorReasons);
+		}
+
+		$this->db->trans_commit();
+		return success('Contract successfully updated.');
+	}
 }
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
index 2a6f9571a..5dd2fa66c 100644
--- a/application/models/education/Lehreinheitgruppe_model.php
+++ b/application/models/education/Lehreinheitgruppe_model.php
@@ -14,6 +14,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$this->load->model('organisation/studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/gruppe_model', 'GruppeModel');
 		$this->load->model('person/benutzergruppe_model', 'BenutzergruppeModel');
+		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
 	}
 
 	/**
@@ -23,7 +24,15 @@ class Lehreinheitgruppe_model extends DB_Model
 	 */
 	public function getDirectGroup($lehreinheit_id)
 	{
+		$this->addSelect('tbl_lehreinheitgruppe.*');
+		$this->addSelect('tbl_gruppe.*');
+		$this->addSelect('uid');
+		$this->addSelect('vorname');
+		$this->addSelect('nachname');
 		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->addJoin('public.tbl_benutzergruppe', 'gruppe_kurzbz', 'LEFT');
+		$this->addJoin('public.tbl_benutzer', 'uid', 'LEFT');
+		$this->addJoin('public.tbl_person', 'person_id', 'LEFT');
 		return $this->loadWhere(
 			array(
 			'tbl_gruppe.direktinskription' => true,
@@ -264,4 +273,203 @@ class Lehreinheitgruppe_model extends DB_Model
 		}
 		return $result;
 	}
+
+	public function addGroup($lehreinheit_id, $gid, $verband)
+	{
+		$lehreinheit = $this->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit))
+			return error ('No Lehreinheit found!');
+
+		if ($verband === false)
+		{
+			$gruppen_result = $this->GruppeModel->loadWhere(array('gid' => $gid));
+
+			if (!hasData($gruppen_result))
+				return error('No group found for gid ' . $gid);
+
+			$gruppen_array = getData($gruppen_result)[0];
+
+			if (!isEmptyString($gruppen_array->gruppe_kurzbz))
+			{
+				$this->db->where('trim(gruppe_kurzbz)', $gruppen_array->gruppe_kurzbz);
+			}
+			else
+			{
+				$this->db->group_start();
+				$this->db->where("trim(gruppe_kurzbz) = ''");
+				$this->db->or_where("gruppe_kurzbz IS NULL");
+				$this->db->group_end();
+			}
+		}
+		else if ($verband === true)
+		{
+			$gruppen_result = $this->_ci->LehrverbandModel->loadWhere(array('gid' => $gid));
+
+			if (!hasData($gruppen_result))
+				return error('No group found for gid ' . $gid);
+
+			$gruppen_array = getData($gruppen_result)[0];
+
+			if (!isEmptyString($gruppen_array->verband))
+			{
+				$this->db->where('verband', $gruppen_array->verband);
+			}
+			else
+			{
+				$this->db->group_start();
+				$this->db->where("trim(verband) = ''");
+				$this->db->or_where("verband IS NULL");
+				$this->db->group_end();
+			}
+
+			if (!isEmptyString($gruppen_array->gruppe))
+			{
+				$this->db->where('gruppe', $gruppen_array->gruppe);
+			}
+			else
+			{
+				$this->db->group_start();
+				$this->db->where("trim(gruppe) = ''");
+				$this->db->or_where("gruppe IS NULL");
+				$this->db->group_end();
+			}
+		}
+		else
+			return error('Wrong type of verband');
+
+		$this->db->where('lehreinheit_id', $lehreinheit_id);
+		$this->db->where('studiengang_kz', $gruppen_array->studiengang_kz);
+
+		if (!isEmptyString($gruppen_array->semester))
+		{
+			$this->db->where('semester', $gruppen_array->semester);
+		}
+		else
+		{
+			$this->db->group_start();
+			$this->db->where("semester = ''");
+			$this->db->or_where("semester IS NULL");
+			$this->db->group_end();
+		}
+
+		$exist_result = $this->load();
+
+		if (!hasData($exist_result))
+		{
+			$new_group_result = $this->insert(array(
+				'lehreinheit_id' => $lehreinheit_id,
+				'studiengang_kz' => $gruppen_array->studiengang_kz,
+				'gruppe_kurzbz' => isset($gruppen_array->gruppe_kurzbz) ? $gruppen_array->gruppe_kurzbz : null,
+				'semester' => $gruppen_array->semester,
+				'verband' => isset($gruppen_array->verband) && !isEmptyString($gruppen_array->verband) ? $gruppen_array->verband : null,
+				'gruppe' => isset($gruppen_array->gruppe) && !isEmptyString($gruppen_array->gruppe) ? $gruppen_array->gruppe : null,
+				'insertamum' => date('Y-m-d H:i:s'),
+				'insertvon' => getAuthUID()
+			));
+
+			if (isError($new_group_result))
+				return error('Error when adding Group');
+
+			return success('Group assigned successfully to Lehreinheit');
+		}
+		else
+			return error('Group already assigned');
+	}
+
+	public function deleteGroup($lehreinheit_id, $lehreinheitgruppe_id)
+	{
+		$lehreinheit = $this->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit))
+			return error ('No Lehreinheit found!');
+
+		$lehreinheitgruppe = $this->load($lehreinheitgruppe_id);
+
+		if (!hasData($lehreinheitgruppe))
+			return error ('No Lehreinheitgruppe found!');
+
+		$this->addSelect('stundenplandev_id');
+		$this->addJoin('lehre.tbl_stundenplandev',
+			"tbl_stundenplandev.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+				AND tbl_stundenplandev.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_stundenplandev.semester = tbl_lehreinheitgruppe.semester
+				AND trim(COALESCE(tbl_stundenplandev.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+				AND trim(COALESCE(tbl_stundenplandev.gruppe, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+				AND trim(COALESCE(tbl_stundenplandev.gruppe_kurzbz, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, ''))"
+		);
+		$stundenplan_result = $this->loadWhere(array('tbl_lehreinheitgruppe.lehreinheitgruppe_id' => $lehreinheitgruppe_id));
+
+		if (hasData($stundenplan_result))
+			return error('Gruppe already verplant');
+
+		$delete_result = $this->delete($lehreinheitgruppe_id);
+
+		if (isError($delete_result))
+			return error('Error deleting Group');
+
+		return success('Group deleted');
+	}
+
+	public function getByLehreinheit($lehreinheit_id)
+	{
+		$lehreinheit = $this->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit))
+			return error ('No Lehreinheit found!');
+
+		$this->addSelect('tbl_lehreinheitgruppe.*');
+		$this->addSelect('tbl_gruppe.direktinskription');
+		$this->addSelect('tbl_gruppe.gruppe_kurzbz');
+		$this->addSelect("CASE 
+									WHEN tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL THEN 
+										COALESCE (
+											UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || 
+											COALESCE(tbl_lehreinheitgruppe.semester::varchar, '') || 
+											COALESCE(tbl_lehreinheitgruppe.verband::varchar, '') || 
+											COALESCE(tbl_lehreinheitgruppe.gruppe, ''), 
+										'')
+									ELSE tbl_lehreinheitgruppe.gruppe_kurzbz
+								END AS bezeichnung");
+		$this->addSelect("CASE 
+									WHEN tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL THEN 
+										(
+											SELECT bezeichnung
+											FROM public.tbl_lehrverband
+											WHERE studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+												AND semester = tbl_lehreinheitgruppe.semester
+												AND verband = tbl_lehreinheitgruppe.verband
+												AND gruppe = tbl_lehreinheitgruppe.gruppe
+											LIMIT 1
+										) 
+									ELSE tbl_gruppe.beschreibung
+								END AS beschreibung");
+		$this->addSelect("CASE 
+									WHEN tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL THEN 
+										(
+											SELECT EXISTS (
+												SELECT 1 
+												FROM lehre.tbl_stundenplandev
+												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+													AND semester = tbl_lehreinheitgruppe.semester
+													AND TRIM(COALESCE(verband, '')) = TRIM(tbl_lehreinheitgruppe.verband)
+													AND TRIM(COALESCE(gruppe, '')) = TRIM(tbl_lehreinheitgruppe.gruppe)
+													AND (gruppe_kurzbz IS NULL OR gruppe_kurzbz = '')
+											)
+										)
+									ELSE 
+										(
+											SELECT EXISTS (
+												SELECT 1
+												FROM lehre.tbl_stundenplandev
+												WHERE lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+													AND gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+											)
+										)
+								END AS verplant");
+		$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
+		return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_gruppe.direktinskription' => false));
+	}
 }
diff --git a/application/models/education/Lehreinheitmitarbeiter_model.php b/application/models/education/Lehreinheitmitarbeiter_model.php
index ae1ac55d2..efdb2e74d 100644
--- a/application/models/education/Lehreinheitmitarbeiter_model.php
+++ b/application/models/education/Lehreinheitmitarbeiter_model.php
@@ -10,6 +10,14 @@ class Lehreinheitmitarbeiter_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_lehreinheitmitarbeiter';
 		$this->pk = array('mitarbeiter_uid', 'lehreinheit_id');
+		$this->hasSequence = false;
+
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 	}
 
     /**
@@ -75,4 +83,67 @@ class Lehreinheitmitarbeiter_model extends DB_Model
         ]);
     }
 
+	public function getLektorenByLe($lehreinheit_id)
+	{
+		$this->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant');
+		$this->addJoin('tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->addJoin('tbl_person', 'person_id');
+
+		$this->addJoin('(
+			SELECT 1 as verplant, lehreinheit_id, mitarbeiter_uid
+			FROM lehre.tbl_stundenplandev
+			GROUP BY lehreinheit_id, mitarbeiter_uid
+			
+		) stundenplan', 'stundenplan.mitarbeiter_uid = tbl_lehreinheitmitarbeiter.mitarbeiter_uid AND stundenplan.lehreinheit_id = tbl_lehreinheitmitarbeiter.lehreinheit_id', 'LEFT');
+
+		return $this->loadWhere(array('tbl_lehreinheitmitarbeiter.lehreinheit_id' => $lehreinheit_id));
+	}
+
+	public function getByLeLektor($lehreinheit_id, $mitarbeiter_uid)
+	{
+		$this->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*');
+		$this->addJoin('tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->addJoin('tbl_person', 'person_id');
+		return $this->loadWhere(array('tbl_lehreinheitmitarbeiter.lehreinheit_id' => $lehreinheit_id, 'tbl_lehreinheitmitarbeiter.mitarbeiter_uid' => $mitarbeiter_uid));
+	}
+
+	public function deleteLektorFromLe($lehreinheit_id, $mitarbeiter_uid)
+	{
+		if (defined('FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN') && FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN)
+		{
+			$vertrag_result = $this->VertragModel->getVertrag($mitarbeiter_uid, $lehreinheit_id);
+
+			if (hasData($vertrag_result))
+				return error("Loeschen nur nach Stornierung des Vertrags möglich");
+		}
+
+		$stundenplandev_result = $this->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+		$stundenplan_result = $this->StundenplanModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+		if (hasData($stundenplandev_result) || hasData($stundenplan_result))
+			return error("Diese/r LektorIn kann nicht gelöscht werden da er schon verplant ist");
+
+		$result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+		if (hasData($result))
+		{
+			$le_mitarbeiter_array = getData($result)[0];
+
+			if ($le_mitarbeiter_array->vertrag_id !== null)
+			{
+				$vertrag_result = $this->VertragModel->deleteVertrag($le_mitarbeiter_array->vertrag_id);
+				if (isError($vertrag_result))
+					return $vertrag_result;
+			}
+
+			$delete_result = $this->delete(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+
+			if (isError($delete_result))
+				return $delete_result;
+
+			return success($delete_result);
+		}
+	}
+
+
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 056fb45d7..955177273 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -988,4 +988,229 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	public function getLvsByOrganization($oe_kurzbz)
+	{
+		$qry="
+			SELECT
+				distinct on (lehrveranstaltung_id)
+				tbl_lehrveranstaltung.studiengang_kz as lv_studiengang_kz, tbl_lehrveranstaltung.semester as lv_semester,
+				tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, tbl_lehrveranstaltung.ects as lv_ects,
+				tbl_lehrveranstaltung.lehreverzeichnis as lv_lehreverzeichnis, tbl_lehrveranstaltung.planfaktor as lv_planfaktor,
+				tbl_lehrveranstaltung.planlektoren as lv_planlektoren, tbl_lehrveranstaltung.planpersonalkosten as lv_planpersonalkosten,
+				tbl_lehrveranstaltung.plankostenprolektor as lv_plankostenprolektor, tbl_lehrveranstaltung.orgform_kurzbz as lv_orgform_kurzbz,
+				tbl_lehrveranstaltung.lehrveranstaltung_id,
+				tbl_lehrveranstaltung.lehrform_kurzbz as lehrform_kurzbz,
+				tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz,
+				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
+				tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.anmerkung, tbl_lehrveranstaltung.sprache, tbl_lehrveranstaltung.semesterstunden,
+				tbl_lehrveranstaltung.lehre, tbl_lehrveranstaltung.aktiv,
+				'' as studienplan_id, '' as studienplan_bezeichnung, tbl_lehrveranstaltung.lehrtyp_kurzbz
+			FROM
+				lehre.tbl_lehrveranstaltung
+			WHERE
+				tbl_lehrveranstaltung.oe_kurzbz= ?
+				AND tbl_lehrveranstaltung.aktiv
+		";
+
+		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
+	}
+
+	public function getLvsByFachbereich($fachbereich, $studiensemester_kurbz, $mitarbeiter_uid = null)
+	{
+		$qry = "";
+		if (!is_null($mitarbeiter_uid))
+		{
+			$qry = $this->getLvsFromStudienplanByEmp();
+			$params = array($fachbereich, $studiensemester_kurbz);
+		}
+
+		$qry .= "SELECT
+					distinct on(lehrveranstaltung_id)
+					lv_studiengang_kz, lv_semester, lv_kurzbz, lv_bezeichnung, lv_ects,
+					lv_lehreverzeichnis, lv_planfaktor, lv_planlektoren, lv_planpersonalkosten,
+					lv_plankostenprolektor, lv_orgform_kurzbz, lehrveranstaltung_id,
+					lehrform_kurzbz, lv_lehrform_kurzbz, lv_bezeichnung_english, studiengang_kz, semester, anmerkung, sprache, semesterstunden,
+					lehre, aktiv,
+					'' as studienplan_id, '' as studienplan_bezeichnung,
+					(SELECT lehrtyp_kurzbz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=vw_lehreinheit.lehrveranstaltung_id) as lehrtyp_kurzbz
+				FROM
+					campus.vw_lehreinheit
+				WHERE studiensemester_kurzbz = ?
+				AND fachbereich_kurzbz = ?";
+
+		$params[] = array($studiensemester_kurbz, $fachbereich);
+
+		if (!is_null($mitarbeiter_uid))
+		{
+			$qry .= " AND mitarbeiter_uid = ?";
+			$params[] = $mitarbeiter_uid;
+		}
+		else
+		{
+			$qry.=" AND lehrveranstaltung_id NOT IN (SELECT lehrveranstaltung_id
+					FROM
+						lehre.tbl_lehrveranstaltung
+						JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id)
+						JOIN lehre.tbl_studienplan USING(studienplan_id)
+						JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+						JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
+					WHERE
+						tbl_lehrveranstaltung.oe_kurzbz=(Select oe_kurzbz from public.tbl_fachbereich where fachbereich_kurzbz= ?)
+						AND tbl_studienplan_semester.studiensemester_kurzbz= ?";
+
+			$params[] = array($fachbereich, $studiensemester_kurbz);
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+
+	private function getLvsFromStudienplanByEmp()
+	{
+		return "
+		SELECT
+				distinct on (lehrveranstaltung_id)
+				tbl_lehrveranstaltung.studiengang_kz as lv_studiengang_kz, 
+				tbl_lehrveranstaltung.semester as lv_semester,
+				tbl_lehrveranstaltung.kurzbz as lv_kurzbz, 
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				tbl_lehrveranstaltung.ects as lv_ects,
+				tbl_lehrveranstaltung.lehreverzeichnis as lv_lehreverzeichnis,
+				tbl_lehrveranstaltung.planfaktor as lv_planfaktor,
+				tbl_lehrveranstaltung.planlektoren as lv_planlektoren,
+				tbl_lehrveranstaltung.planpersonalkosten as lv_planpersonalkosten,
+				tbl_lehrveranstaltung.plankostenprolektor as lv_plankostenprolektor,
+				tbl_lehrveranstaltung.orgform_kurzbz as lv_orgform_kurzbz,
+				tbl_lehrveranstaltung.lehrveranstaltung_id,
+				tbl_lehrveranstaltung.lehrform_kurzbz as lehrform_kurzbz,
+				tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz,
+				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
+				tbl_lehrveranstaltung.studiengang_kz,
+				tbl_studienplan_lehrveranstaltung.semester,
+				tbl_lehrveranstaltung.anmerkung,
+				tbl_lehrveranstaltung.sprache,
+				tbl_lehrveranstaltung.semesterstunden,
+				tbl_lehrveranstaltung.lehre,
+				tbl_lehrveranstaltung.aktiv,
+				tbl_studienplan.studienplan_id::text,
+				tbl_studienplan.bezeichnung as studienplan_bezeichnung,
+				tbl_lehrveranstaltung.lehrtyp_kurzbz
+			FROM
+				lehre.tbl_lehrveranstaltung
+				JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
+			WHERE
+				tbl_lehrveranstaltung.oe_kurzbz=(Select oe_kurzbz from public.tbl_fachbereich where fachbereich_kurzbz= ?)
+				AND tbl_studienplan_semester.studiensemester_kurzbz = ?
+				AND tbl_lehrveranstaltung.aktiv
+			UNION
+		";
+	}
+
+	public function getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester = null, $verband = null)
+	{
+		$qry = "";
+		$params = array();
+
+		if (!empty($studienplan_ids))
+		{
+			$qry = $this->getLvsFromStudienplanByStudienplanID($placeholders);
+			$params = $studienplan_ids;
+		}
+
+		$qry .= "
+			SELECT DISTINCT on(lehrveranstaltung_id) lehrveranstaltung_id, 
+				kurzbz as lv_kurzbz,
+				bezeichnung as lv_bezeichnung,
+				bezeichnung_english as lv_bezeichnung_english,
+				studiengang_kz,
+				semester,
+				tbl_lehrveranstaltung.sprache,
+				ects as lv_ects,
+				semesterstunden,
+				tbl_lehrveranstaltung.anmerkung,
+				tbl_lehrveranstaltung.lehre,
+				lehreverzeichnis as lv_lehreverzeichnis,
+				aktiv,
+				planfaktor as lv_planfaktor,
+				planlektoren as lv_planlektoren,
+				planpersonalkosten as lv_planpersonalkosten,
+				plankostenprolektor as lv_plankostenprolektor,
+				tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz,
+				tbl_lehrveranstaltung.orgform_kurzbz,
+				''::text as studienplan_id,
+				'' as studienplan_bezeichnung,
+				'' as studienplan_lehrveranstaltung_id_parent,
+				tbl_lehrveranstaltung.lehrtyp_kurzbz
+			FROM lehre.tbl_lehrveranstaltung 
+				JOIN lehre.tbl_lehreinheit USING (lehrveranstaltung_id)
+				WHERE studiengang_kz = ?
+					AND studiensemester_kurzbz = ?
+		";
+
+		$params[] = $studiengang_kz;
+		$params[] = $studiensemester_kurzbz;
+		if (!is_null($semester))
+		{
+			$qry .= ' AND semester = ?';
+			$params[] = $semester;
+		}
+		if (!is_null($verband))
+		{
+			$qry .= ' AND (orgform_kurzbz = ? OR orgform_kurzbz IS NULL)';
+			$params[] = $verband;
+		}
+
+		if (!empty($only_ids))
+		{
+
+			$qry .= ' AND NOT EXISTS (SELECT 1 FROM lehre.tbl_studienplan_lehrveranstaltung where studienplan_id IN ?
+						AND lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND tbl_lehrveranstaltung.aktiv)';
+
+			$params[] = $only_ids;
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
+	private function getLvsFromStudienplanByStudienplanID($placeholders)
+	{
+		return "
+		SELECT
+				lehrveranstaltung_id, kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
+				tbl_studienplan_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
+				ects as lv_ects, semesterstunden, anmerkung, lehre, lehreverzeichnis as lv_lehreverzeichnis, tbl_lehrveranstaltung.aktiv,
+				planfaktor as lv_planfaktor, planlektoren as lv_planlektoren, planpersonalkosten as lv_planpersonalkosten,
+				plankostenprolektor as lv_plankostenprolektor, lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.orgform_kurzbz,
+				tbl_studienplan_lehrveranstaltung.studienplan_id::text as studienplan_id, tbl_studienplan.bezeichnung as studienplan_bezeichnung, tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent::text,
+				tbl_lehrveranstaltung.lehrtyp_kurzbz
+			FROM
+			    lehre.tbl_lehrveranstaltung
+				JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id)
+				JOIN lehre.tbl_studienplan USING(studienplan_id)
+			WHERE
+				tbl_lehrveranstaltung.aktiv AND ((studienplan_id, tbl_studienplan_lehrveranstaltung.semester) IN ( " . implode(',', $placeholders) . "))
+			UNION
+		";
+	}
+
+	public function getAllOe($lv_id, $stg_kz = null)
+	{
+		$qry = "SELECT DISTINCT oe_kurzbz
+			FROM lehre.tbl_studienplan_lehrveranstaltung
+			JOIN lehre.tbl_studienplan USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+			JOIN public.tbl_studiengang USING(studiengang_kz)
+			WHERE lehrveranstaltung_id = ? ";
+
+		$params = array($lv_id);
+		if (!is_null($stg_kz))
+		{
+			$qry .= ' OR studiengang_kz = ?';
+			$params[] = $stg_kz;
+		}
+
+		return $this->execReadOnlyQuery($qry, $params);
+	}
 }
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 1b1a826aa..b07a90c87 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -217,4 +217,34 @@ class Organisationseinheit_model extends DB_Model
 			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
 		");
 	}
+
+	/**
+	 * Ermittelt die Stundenobergrenze fuer Lektoren
+	 * Dabei wird im OE Baum nach oben nach Stundengrenzen gesucht und die niedrigste Stundengrenze ermittelt
+	 * @param $oe_kurzbz Organisationseinheit
+	 * @param $fixangestellt boolean legt fest ob die Grenze
+	 *        fuer Freie oder Fixangestellte Lektoren ermittelt werden soll
+
+	 */
+	public function getStundengrenze($oe_kurzbz, $fixangestellt = true)
+	{
+		$fixfrei = $fixangestellt ? 'fix' : 'frei';
+
+		$qry = "
+			WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+			(
+				SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+				WHERE oe_kurzbz= ?
+				UNION ALL
+				SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+				WHERE o.oe_kurzbz=oes.oe_parent_kurzbz
+			)
+			SELECT oe_kurzbz, warn_semesterstunden_{$fixfrei} AS stunden
+			FROM oes
+				JOIN public.tbl_organisationseinheit USING (oe_kurzbz)
+			ORDER BY warn_semesterstunden_{$fixfrei} ASC
+			LIMIT 1";
+
+		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
+	}
 }
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index e35ba52fb..5a9097d9a 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -134,4 +134,25 @@ class Studienplan_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
+
+	public function loadStudienplanLehrveranstaltung($lv_id)
+	{
+		$qry = "SELECT studienplan_lehrveranstaltung_id,
+					semester,
+					pflicht,
+					studienplan_id,
+					koordinator,
+ 					studienplan_lehrveranstaltung_id_parent,
+					lehrveranstaltung_id,
+					insertamum,
+					insertvon,
+					updateamum,
+					updatevon,
+					sort,
+					curriculum,
+					export
+				FROM lehre.tbl_studienplan_lehrveranstaltung WHERE studienplan_lehrveranstaltung_id = ? ";
+		return $this->execReadOnlyQuery($qry, array($lv_id));
+	}
+
 }
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 2e99d1cdd..e13c6ccb9 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -151,36 +151,36 @@ class Notiz_model extends DB_Model
 	 *         bestellung_id, lehreinheit_id, anrechnung_id, uid)
 	 * @param $id the corresponding id, part of public.tbl_notizzuordnung
 	 */
-	public function getNotizWithDocEntries($id, $type)
+	public function getNotizWithDocEntries($id, $type, $withoutTags = true)
 	{
-			$qry = "
-				SELECT 
-						n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
-						(CASE
-							WHEN n.updateamum >= n.insertamum THEN n.updateamum 
-							ELSE n.insertamum
-						END) AS lastUpdate,
-						regexp_replace(n.text, '<[^>]*>', '', 'g') as text_stripped,
-						TO_CHAR(n.start::timestamp, 'DD.MM.YYYY') AS start_format,
-						TO_CHAR(n.ende::timestamp, 'DD.MM.YYYY') AS ende_format,
-						z.notiz_id, z.person_id as id, ? as type_id
-						
-				FROM
-						public.tbl_notiz n
-				JOIN 
-							public.tbl_notizzuordnung z USING (notiz_id)
-				LEFT JOIN 
-							public.tbl_notiz_dokument dok USING (notiz_id)
-				LEFT JOIN 
-							campus.tbl_dms_version USING (dms_id)
-				WHERE 
-				   z.$type  = ?
-				GROUP BY 
-					notiz_id, z.notizzuordnung_id
-			";
+		$this->addSelect("tbl_notiz.*, 
+			count(dms_id) as countDoc, 
+			z.notizzuordnung_id,
+			(CASE
+				WHEN tbl_notiz.updateamum >= tbl_notiz.insertamum THEN tbl_notiz.updateamum 
+				ELSE tbl_notiz.insertamum
+			END) AS lastUpdate,
+			regexp_replace(tbl_notiz.text, '<[^>]*>', '', 'g') as text_stripped,
+			TO_CHAR(tbl_notiz.start::timestamp, 'DD.MM.YYYY') AS start_format,
+			TO_CHAR(tbl_notiz.ende::timestamp, 'DD.MM.YYYY') AS ende_format,
+			z.notiz_id, 
+			z.person_id as id, 
+			{$type} as type_id
+		");
 
-		return $this->execQuery($qry, array($type, $id));
+		$this->addJoin('public.tbl_notizzuordnung z', 'notiz_id');
+		$this->addJoin('public.tbl_notiz_dokument dok', 'notiz_id', 'LEFT');
+		$this->addJoin('campus.tbl_dms_version', 'dms_id', 'LEFT');
 
+		$this->db->where("z.{$type}", $id);
+
+		if ($withoutTags)
+			$this->db->where('tbl_notiz.typ IS NULL');
+
+		$this->addGroupBy('notiz_id');
+		$this->addGroupBy('z.notizzuordnung_id');
+
+		return $this->load();
 	}
 
 
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 836f5d65a..337997b8e 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -278,4 +278,18 @@ class Mitarbeiter_model extends DB_Model
 
 		return $this->execQuery($qry, $parametersArray);
 	}
+
+	public function isLehrauftragFirma($mitarbeiter_uid)
+	{
+		$this->addSelect('firma_id');
+		$this->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->addJoin('public.tbl_person', 'person_id');
+		$this->addJoin('public.tbl_adresse', 'person_id', 'LEFT');
+		$this->addOrder('zustelladresse', 'DESC');
+		$this->addOrder('firma_id');
+		$this->addLimit(1);
+		$firma_result = $this->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid));
+		$firma = getData($firma_result)[0]->firma_id;
+		return !is_null($firma);
+	}
 }
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 800540d60..82b3779ab 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -10,6 +10,9 @@ class Stundenplandev_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_stundenplandev';
 		$this->pk = 'stundenplandev_id';
+
+		$this->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 	}
 
 	
@@ -157,4 +160,84 @@ class Stundenplandev_model extends DB_Model
         return $this->execQuery($qry, $params);
     }
 
+	public function deleteGroupPlanning($lehreinheit_id, $lehreinheitgruppe_id)
+	{
+		$lehreinheit = $this->LehreinheitModel->load($lehreinheit_id);
+
+		if (!hasData($lehreinheit))
+			return error ('No Lehreinheit found!');
+
+		$lehreinheitgruppe = $this->LehreinheitgruppeModel->load($lehreinheitgruppe_id);
+
+		if (!hasData($lehreinheitgruppe))
+			return error ('No Lehreinheitgruppe found!');
+
+		$this->addJoin('lehre.tbl_stundenplan_betriebsmittel', 'stundenplandev_id');
+		$this->addJoin('lehre.tbl_lehreinheitgruppe', 'lehreinheit_id');
+		$this->db->where('tbl_lehreinheitgruppe.lehreinheitgruppe_id', $lehreinheitgruppe_id);
+
+		$this->db->group_start();
+			$this->db->group_start();
+				$this->db->where('tbl_lehreinheitgruppe.gruppe_kurzbz IS NOT NULL', null, false);
+				$this->db->where('tbl_lehreinheitgruppe.gruppe_kurzbz = tbl_stundenplandev.gruppe_kurzbz', null, false);
+			$this->db->group_end();
+			$this->db->or_group_start();
+				$this->db->where('tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL', null, false);
+				$this->db->where('tbl_lehreinheitgruppe.studiengang_kz = tbl_stundenplandev.studiengang_kz', null, false);
+				$this->db->where('tbl_lehreinheitgruppe.semester = tbl_stundenplandev.semester', null, false);
+				$this->db->where('tbl_lehreinheitgruppe.verband = tbl_stundenplandev.verband', null, false);
+				$this->db->where('tbl_lehreinheitgruppe.gruppe = tbl_stundenplandev.gruppe', null, false);
+			$this->db->group_end();
+		$this->db->group_end();
+
+		$betriebsmittel_result = $this->load();
+		$betriebsmittel_array = hasData($betriebsmittel_result) ? getData($betriebsmittel_result) : array();
+		if (sizeof($betriebsmittel_array) > 0)
+		{
+			return error ('Gruppe kann nicht entfernt werden da bereits Ressourcen zugeordnet wurden');
+		}
+
+		$this->addSelect('stundenplandev_id');
+		$this->addJoin('lehre.tbl_lehreinheitgruppe',
+			"tbl_stundenplandev.lehreinheit_id = tbl_lehreinheitgruppe.lehreinheit_id
+				AND tbl_stundenplandev.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_stundenplandev.semester = tbl_lehreinheitgruppe.semester
+				AND trim(COALESCE(tbl_stundenplandev.verband, '')) = trim(COALESCE(tbl_lehreinheitgruppe.verband, ''))
+				AND trim(COALESCE(tbl_stundenplandev.gruppe, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe, ''))
+				AND trim(COALESCE(tbl_stundenplandev.gruppe_kurzbz, '')) = trim(COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, ''))"
+		);
+		$stundenplan_result = $this->loadWhere(array('tbl_lehreinheitgruppe.lehreinheitgruppe_id' => $lehreinheitgruppe_id));
+
+		if (hasData($stundenplan_result))
+		{
+			$stundenplan_ids = array_column(getData($stundenplan_result), 'stundenplandev_id');
+			$this->db->where_in('stundenplandev_id', $stundenplan_ids);
+			$delete_result = $this->db->delete('lehre.tbl_stundenplandev');
+
+			if ($delete_result)
+				return success('Group deleted successfully from Stundenplandev');
+			else
+				return error('Error deleting Group from Stundenplandev');
+		}
+	}
+
+	public function deleteLektorPlanning($lehreinheit_id, $mitarbeiter_uid)
+	{
+		$this->addDistinct('mitarbeiter_uid');
+		$this->addSelect('mitarbeiter_uid');
+		$stundenplan_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+		$stundenplan_array = hasData($stundenplan_result) ? (getData($stundenplan_result)) : array();
+
+		if (sizeof($stundenplan_array) <= 1)
+			return error('Diese/r LektorIn kann nicht aus dem LVPlan entfernt werden da dies der/die letzte verplante LektorIn ist');
+
+		$this->addJoin('lehre.tbl_stundenplan_betriebsmittel', 'stundenplandev_id');
+		$betriebsmittel_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_stundenplandev.mitarbeiter_uid' => $mitarbeiter_uid));
+		$betriebsmittel_array = hasData($betriebsmittel_result) ? getData($betriebsmittel_result) : array();
+
+		if (sizeof($betriebsmittel_array) > 0)
+			return error('Gruppe kann nicht entfernt werden da bereits Ressourcen zugeordnet wurden');
+
+		return $this->delete(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
+	}
 }
diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index 10f5a6aa1..f34ad07ed 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -42,4 +42,20 @@ class Stundensatz_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	public function getDefaultStundensatz($mitarbeiter_uid, $beginn, $ende = null, $typ = null)
+	{
+		$stundensatz_result = $this->getStundensatzByDatum($mitarbeiter_uid, $beginn, $ende, $typ);
+		$default_stundensatz = hasData($stundensatz_result) ? getData($stundensatz_result)[0]->stundensatz : null;
+		if (defined('FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ') && !FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ)
+		{
+			$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+			$echterdv_result = $this->DienstverhaeltnisModel->existsDienstverhaeltnis($mitarbeiter_uid, $beginn, $ende, 'echterdv');
+			if (hasData($echterdv_result))
+			{
+				$default_stundensatz = null;
+			}
+		}
+		return $default_stundensatz;
+	}
 }
\ No newline at end of file
diff --git a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
index f81a2d518..b055ee954 100644
--- a/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
+++ b/application/models/vertragsbestandteil/Dienstverhaeltnis_model.php
@@ -253,4 +253,25 @@ EOSQL;
 	}
 	return $dvs;
     }
+
+	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende = null, $vertragsart_kurzbz = null)
+	{
+		$this->addOrder('von', 'DESC');
+		$this->db->where('mitarbeiter_uid', $mitarbeiter_uid);
+		if (!is_null($vertragsart_kurzbz))
+			$this->db->where('vertragsart_kurzbz', $this->escape($vertragsart_kurzbz));
+
+		$this->db->where('von <=', $ende);
+
+		if (!is_null($ende))
+		{
+			$this->db->group_start();
+			$this->db->where('bis >=', $start);
+			$this->db->or_where('bis IS NULL', null, false);
+			$this->db->group_end();
+		}
+
+		$this->addLimit(1);
+		return $this->load();
+	}
 }
diff --git a/application/views/LVVerwaltung.php b/application/views/LVVerwaltung.php
new file mode 100644
index 000000000..4cebae839
--- /dev/null
+++ b/application/views/LVVerwaltung.php
@@ -0,0 +1,39 @@
+<?php
+	$includesArray = array(
+		'title' => 'LVVerwaltung',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		'tabulator6' => true,
+		'tinymce5' => true,
+		'tags' => true,
+
+		'customCSSs' => [
+			'public/css/components/vue-datepicker.css',
+			'public/css/components/primevue.css',
+			'public/css/Studentenverwaltung.css',
+			'public/css/Lvverwaltung.css'
+
+		],
+		'customJSModules' => [
+			'public/js/apps/LVVerwaltung.js'
+		]
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+
+?>
+<div id="main">
+	<router-view
+		default-semester="<?= $variables['semester_aktuell']; ?>"
+		lv-root="<?= site_url('LVVerwaltung'); ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions));?>"
+		:config="<?=  htmlspecialchars(json_encode($configs)); ?>"
+	>
+	</router-view>
+
+</div>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/css/Lvverwaltung.css b/public/css/Lvverwaltung.css
new file mode 100644
index 000000000..1ca3f0be1
--- /dev/null
+++ b/public/css/Lvverwaltung.css
@@ -0,0 +1,27 @@
+textarea[name="anmerkung"] {
+	position: absolute;
+	max-height: 300px;
+}
+
+.lv_table_icon::before
+{
+	font-family: 'Font Awesome 6 Free';
+	font-weight: 900;
+	margin-left: 5px;
+	display: inline-block;
+}
+
+.lv_table_icon.icon-modul::before
+{
+	content: '\f468';
+}
+
+.lv_table_icon.icon-lv::before
+{
+	content: '\f466';
+}
+
+.lv_table_icon.icon-::before
+{
+	content: '\f073';
+}
\ No newline at end of file
diff --git a/public/js/api/factory/notiz.js b/public/js/api/factory/notiz.js
index 074d4b6a5..ce14269d6 100644
--- a/public/js/api/factory/notiz.js
+++ b/public/js/api/factory/notiz.js
@@ -16,7 +16,10 @@
  */
 
 import person from "./notiz/person.js";
+import lehreinheit from "./notiz/lehreinheit.js";
+
 
 export default {
-    person
+	person,
+	lehreinheit
 };
diff --git a/public/js/api/factory/notiz/lehreinheit.js b/public/js/api/factory/notiz/lehreinheit.js
new file mode 100644
index 000000000..d93bb50f9
--- /dev/null
+++ b/public/js/api/factory/notiz/lehreinheit.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/notizLehreinheit/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
+		};
+	},
+};
diff --git a/public/js/api/lehrveranstaltung.js b/public/js/api/lehrveranstaltung.js
new file mode 100644
index 000000000..0499572ba
--- /dev/null
+++ b/public/js/api/lehrveranstaltung.js
@@ -0,0 +1,28 @@
+export default {
+
+	getByLV(lehrveranstaltung_id)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Lehrveranstaltung/loadByLV/' + encodeURIComponent(lehrveranstaltung_id)
+		};
+	},
+	getByStg(studiengang_kz, semester)
+	{
+		return ("/api/frontend/v1/Lehrveranstaltung/loadByStudiengang/" + encodeURIComponent(studiengang_kz) + "/" + encodeURIComponent(semester));
+	},
+
+	getByEmpStg(mitarbeiter_uid, stg)
+	{
+		return ("/api/frontend/v1/Lehrveranstaltung/loadByEmployee/" + encodeURIComponent(mitarbeiter_uid) + "/" + encodeURIComponent(stg));
+	},
+
+	getTable(url)
+	{
+		return {
+			method: 'get',
+			url: url
+		};
+	},
+
+}
\ No newline at end of file
diff --git a/public/js/api/lehrveranstaltung/details.js b/public/js/api/lehrveranstaltung/details.js
new file mode 100644
index 000000000..db251330a
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/details.js
@@ -0,0 +1,30 @@
+export default {
+	getStudiensemester()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getStudiensemester/'
+		};
+	},
+	getSprache()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getSprache/'
+		};
+	},
+	getLehrform()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getLehrform/'
+		};
+	},
+	getRaumtyp()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getRaumtyp/'
+		};
+	},
+}
diff --git a/public/js/api/lehrveranstaltung/direktgruppe.js b/public/js/api/lehrveranstaltung/direktgruppe.js
new file mode 100644
index 000000000..9cd72fcc7
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/direktgruppe.js
@@ -0,0 +1,26 @@
+export default {
+	add(newData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/DirektGruppe/add/',
+			params: newData
+		};
+	},
+	delete(deleteData)
+	{
+
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/DirektGruppe/delete/',
+			params: deleteData
+		};
+	},
+	getByLehreinheit(lehreinheit_id)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/DirektGruppe/getByLehreinheit/' + encodeURIComponent(lehreinheit_id)
+		};
+	},
+}
diff --git a/public/js/api/lehrveranstaltung/gruppe.js b/public/js/api/lehrveranstaltung/gruppe.js
new file mode 100644
index 000000000..12c55509c
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/gruppe.js
@@ -0,0 +1,56 @@
+export default {
+
+	delete(deleteData)
+	{
+
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/gruppe/delete/',
+			params: deleteData
+		};
+	},
+
+	add(newData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/gruppe/add/',
+			params: newData
+		};
+	},
+	getByLehreinheit(lehreinheit_id)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/gruppe/getByLehreinheit/' + encodeURIComponent(lehreinheit_id)
+		};
+	},
+
+	deleteFromLVPlan(deleteData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/gruppe/deleteLVPlan/',
+			params: deleteData
+		};
+	},
+
+
+/*------------- details -------- */
+	getAll()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/gruppe/getAll/'
+		};
+	},
+
+	getBenutzer()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/gruppe/getBenutzer/'
+		};
+	}
+
+}
diff --git a/public/js/api/lehrveranstaltung/lehreinheit.js b/public/js/api/lehrveranstaltung/lehreinheit.js
new file mode 100644
index 000000000..d8f12e27a
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/lehreinheit.js
@@ -0,0 +1,41 @@
+export default {
+	copy(data)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lehreinheit/copy/',
+			params: data
+		};
+	},
+	delete(data)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lehreinheit/delete/',
+			params: data
+		};
+	},
+	add(newData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lehreinheit/add/',
+			params: newData
+		};
+	},
+	get(lehreinheit)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lehreinheit/get/' + encodeURIComponent(lehreinheit)
+		};
+	},
+	update(updatedData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lehreinheit/update/',
+			params: updatedData
+		};
+	},
+}
diff --git a/public/js/api/lehrveranstaltung/lektor.js b/public/js/api/lehrveranstaltung/lektor.js
new file mode 100644
index 000000000..e8c2fb673
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/lektor.js
@@ -0,0 +1,78 @@
+export default {
+
+	getLehrfunktionen()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lektor/getLehrfunktionen/'
+		};
+	},
+
+
+	getLektoren()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lektor/getLektoren/'
+		};
+	},
+
+
+	getByLehreinheit(lehreinheit_id)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lektor/getLektorenByLE/' + encodeURIComponent(lehreinheit_id)
+		};
+	},
+
+
+	add(newData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lektor/add/',
+			params: newData
+		};
+	},
+
+	update(updatedData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lektor/update/',
+			params: updatedData
+		};
+	},
+
+
+	deletePerson(deleteData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lektor/deletePerson/',
+			params: deleteData
+		};
+	},
+	deleteFromLVPlan(deleteData)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lektor/deleteLVPlan/',
+			params: deleteData
+		};
+	},
+	getLektorDaten(lehreinheit_id, mitarbeiter_uid)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lektor/getLektorDaten/' + encodeURIComponent(lehreinheit_id) + '/' + encodeURIComponent(mitarbeiter_uid)
+		};
+	},
+
+
+
+
+
+
+}
diff --git a/public/js/api/lehrveranstaltung/setup.js b/public/js/api/lehrveranstaltung/setup.js
new file mode 100644
index 000000000..78f78b05b
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/setup.js
@@ -0,0 +1,9 @@
+export default {
+	getTabs()
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/setup/getTabs/'
+		};
+	},
+}
diff --git a/public/js/api/lehrveranstaltung/studiengangtree.js b/public/js/api/lehrveranstaltung/studiengangtree.js
new file mode 100644
index 000000000..fb63db729
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/studiengangtree.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get(path) {
+		let url = 'api/frontend/v1/lv/StgTree';
+		if (path)
+			url += '/' + path;
+		return {
+			method: 'get',
+			url
+		};
+	},
+	favorites: {
+		get() {
+			return {
+				method: 'get',
+				url: 'api/frontend/v1/lv/favorites'
+			};
+		},
+		set(favorites) {
+			return {
+				method: 'post',
+				url: 'api/frontend/v1/lv/favorites/set',
+				params: { favorites }
+			};
+		}
+	}
+};
\ No newline at end of file
diff --git a/public/js/api/lehrveranstaltung/tag.js b/public/js/api/lehrveranstaltung/tag.js
new file mode 100644
index 000000000..3d5a5f2ea
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/tag.js
@@ -0,0 +1,54 @@
+export default {
+
+	getTag(data)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/lv/Tags/getTag',
+			params: data
+		};
+	},
+
+	getTags(data)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/lv/Tags/getTags'
+		};
+	},
+
+	addTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/lv/Tags/addTag',
+			params: data
+		};
+	},
+
+	updateTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/lv/Tags/updateTag',
+			params: data
+		};
+	},
+	doneTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/lv/Tags/doneTag',
+			params: data
+		};
+	},
+
+	deleteTag(data)
+	{
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/lv/Tags/deleteTag',
+			params: data
+		};
+	},
+};
\ No newline at end of file
diff --git a/public/js/api/lehrveranstaltung/vertrag.js b/public/js/api/lehrveranstaltung/vertrag.js
new file mode 100644
index 000000000..601f4b7e3
--- /dev/null
+++ b/public/js/api/lehrveranstaltung/vertrag.js
@@ -0,0 +1,22 @@
+export default {
+
+	getByLeEmp(lehreinheit_id, mitarbeiter_uid)
+	{
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/lv/lektor/getLektorDaten/' + encodeURIComponent(lehreinheit_id) + '/' + encodeURIComponent(mitarbeiter_uid),
+		};
+	},
+
+	cancelByLeEmp(needUpdate)
+	{
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lv/lektor/cancelVertrag/',
+			params: needUpdate
+		};
+	},
+
+
+
+}
diff --git a/public/js/apps/LVVerwaltung.js b/public/js/apps/LVVerwaltung.js
new file mode 100644
index 000000000..c582f817e
--- /dev/null
+++ b/public/js/apps/LVVerwaltung.js
@@ -0,0 +1,46 @@
+import LVVerwaltung from "../components/LVVerwaltung/LVVerwaltung.js";
+import Phrasen from "../plugins/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(`/${ciPath}/LVVerwaltung`),
+	routes: [
+		{
+			name: 'index',
+			path: `/`,
+			component: LVVerwaltung
+		},
+		{
+			name: `byEmp`,
+			path: `/emp/:emp/:stg?`,
+			component: LVVerwaltung
+		},
+		/*{
+			name: `byFachbereich`,
+			path: `/fachbereich/:fachbereich/:emp?`,
+			component: LVVerwaltung
+		},*/
+		{
+			name: `byStg`,
+			path: `/stg/:stg/:semester?`,
+			component: LVVerwaltung
+		},
+		{
+			path: '/:pathMatch(.*)*',
+			redirect: '/'
+		}
+	]
+});
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
diff --git a/public/js/components/LVVerwaltung/Details/Direktinskription.js b/public/js/components/LVVerwaltung/Details/Direktinskription.js
new file mode 100644
index 000000000..c7b8e5894
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Details/Direktinskription.js
@@ -0,0 +1,155 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ApiDirektGruppe from "../../../api/lehrveranstaltung/direktgruppe.js";
+export default{
+	name: "LVDirektGruppen",
+	components: {
+		CoreFilterCmpt,
+		FormForm,
+		FormInput
+	},
+	props: {
+		lehreinheit_id: Number
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		},
+	},
+	computed: {
+		tabulatorOptions() {
+			return {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiDirektGruppe.getByLehreinheit(this.lehreinheit_id)),
+				ajaxResponse: (url, params, response) => { return response.data || [] },
+				columns:[
+					{title: this.$p.t('person', 'uid'), field:"uid"},
+					{title: this.$p.t('person', 'vorname'), field:"vorname"},
+					{title: this.$p.t('person', 'nachname'), field:"nachname"},
+					{title: this.$p.t('lehre', 'gruppe'), field:"gruppe_kurzbz"},
+					{
+						title: this.$p.t('global', 'actions'), field: 'actions',
+						minWidth: 150,
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							let button = document.createElement('button');
+							container.className = "d-flex gap-1";
+
+							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', (event) => {
+								event.stopPropagation();
+								this.deleteDirektGroup(cell.getData().gruppe_kurzbz, cell.getData().uid)
+							});
+							container.append(button);
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				selectable: true,
+				persistenceID: 'lvverwaltung_direkt_gruppen_2025_05_27_v1',
+				height: 'auto',
+			}
+		}
+	},
+	data() {
+		return{
+			lastSelected: null,
+			gruppen: [],
+			tabulatorEvents: [],
+			showAutocomplete: false,
+			selectedUser: null,
+			filteredUsers: [],
+			abortController: null,
+			searchTimeout: null,
+		}
+	},
+	watch: {
+		lehreinheit_id(n) {
+			this.$refs.table.reloadTable();
+		}
+	},
+	methods:{
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+
+		deleteDirektGroup(gruppe_kurzbz, uid)
+		{
+			let deleteData = {
+				'gruppe_kurzbz': gruppe_kurzbz,
+				'uid': uid,
+				'lehreinheit_id': this.lehreinheit_id
+			}
+
+			this.$api.call(ApiDirektGruppe.delete(deleteData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				})
+		},
+		searchUser(event)
+		{
+			const query = event.query.toLowerCase().trim();
+			this.filteredUsers = this.dropdowns.benutzer_array.filter(user => {
+
+				const fullName = `${user.vorname.toLowerCase()} ${user.nachname.toLowerCase()}`;
+				const reverseFullName = `${user.nachname.toLowerCase()} ${user.vorname.toLowerCase()}`;
+				return fullName.includes(query) || reverseFullName.includes(query) || user.uid.toLowerCase().includes(query) || user.studiengang.toLowerCase().includes(query);
+			}).map(user => ({
+				label: user.studiengang
+					? `${user.nachname} ${user.vorname} ${user.uid} ${user.studiengang} ${user.semester}`
+					: `${user.nachname} ${user.vorname} ${user.uid}`,
+				uid: user.uid
+			}));
+		},
+		addUser()
+		{
+			let newData = {
+				'uid': this.selectedUser.uid,
+				'lehreinheit_id': this.lehreinheit_id
+			}
+			return this.$api.call(ApiDirektGruppe.add(newData))
+				.then(result => {
+					this.reload()
+					this.selectedUser = ''
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+	},
+	template: `
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			:reload=true
+			:new-btn-label="$p.t('lehre', 'assignPerson')"
+			new-btn-show
+			@click:new="showAutocomplete = !showAutocomplete"
+			>
+			<template #search> <!--TODO (david) Slot prüfen -->
+				<form-input
+					v-if="showAutocomplete"
+					type="autocomplete"
+					:suggestions="filteredUsers"
+					:placeholder="$p.t('lehre', 'assignPerson')"
+					v-model="selectedUser"
+					field="label"
+					:minLength="3"
+					@item-select="addUser"
+					@complete="searchUser"
+				></form-input>
+			</template>
+			
+		</core-filter-cmpt>
+		`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Details/Form.js b/public/js/components/LVVerwaltung/Details/Form.js
new file mode 100644
index 000000000..eed65f7ad
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Details/Form.js
@@ -0,0 +1,209 @@
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+
+export default {
+	name: "LVDetailsForm",
+	components: {
+		FormInput,
+		CoreForm
+	},
+	props: {
+		data: {
+			type: Object,
+			required: true
+		}
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		},
+		showLVID: {
+			from: 'permissionLehrveranstaltung',
+			default: false
+		},
+		showGewichtung: {
+			from: 'configShowGewichtung',
+			default: true
+		}
+	},
+	computed: {
+		formattedAnmerkung: {
+			get() {
+				return (this.data.anmerkung || '').replace(/\\n/g, '\n');
+			},
+			set(value) {
+				this.data.anmerkung = (value || '').replace(/\n/g, '\\n');
+			}
+		}
+	},
+	template: `
+	<div>
+		<div class="row align-items-start mb-3">
+			<form-input
+				v-if="showLVID"
+				:label="$p.t('lehre', 'lehrveranstaltung_id')"
+				type="text"
+				container-class="col-3"
+				v-model="data.lehrveranstaltung_id"
+				name="lehrveranstaltung_id"
+			 />
+			<form-input
+				v-if="showGewichtung"
+				:label="$p.t('lehre', 'gewicht')"
+				type="text"
+				container-class="col-3"
+				v-model="data.gewicht"
+				name="gewicht"
+			/>
+			<form-input
+				:label="$p.t('lehre', 'detailanmerkung')"
+				type="textarea"
+				container-class="col-3"
+				v-model="formattedAnmerkung"
+				name="anmerkung"
+				id="anmerkung"
+				rows="4"
+			/>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('lehre', 'lehrfach')"
+				type="select"
+				container-class="col-3"
+				v-model="data.lehrfach_id"
+				name="lehrfach_id"
+			>
+				<option
+					v-for="lehrfach in data.lehrfaecher"
+					:value="lehrfach.lehrveranstaltung_id"
+					:key="lehrfach.lehrfach"
+				>
+					{{ lehrfach.lehrfach }}
+				</option>
+			</form-input>
+			<form-input
+				:label="$p.t('lehre', 'lehrform')"
+				type="select"
+				container-class="col-3"
+				v-model="data.lehrform_kurzbz"
+				name="lehrform_kurzbz"
+			>
+				<option
+				v-for="lehrform in dropdowns.lehrform_array"
+				:value="lehrform.lehrform_kurzbz"
+				:key="lehrform.lehrform_kurzbz"
+				>
+				{{ lehrform.bez_kurz }} {{ lehrform.bez }}
+				</option>
+			</form-input>
+		</div>
+	
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('global', 'sprache')"
+				type="select"
+				container-class="col-3"
+				v-model="data.sprache"
+				name="sprache"
+			>
+				<option
+				v-for="sprache in dropdowns.sprachen_array"
+				:key="sprache.sprache"
+				:value="sprache.sprache"
+				>
+				{{ sprache.sprache }}
+				</option>
+			</form-input>
+			<form-input
+				:label="$p.t('lehre', 'unr')"
+				type="text"
+				container-class="col-3"
+				v-model="data.unr"
+				name="unr"
+			/>
+		</div>
+	
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('lehre', 'studiensemester')"
+				type="select"
+				container-class="col-3"
+				v-model="data.studiensemester_kurzbz"
+				name="studiensemester_kurzbz"
+			>
+				<option
+				v-for="semester in dropdowns.studiensemester_array"
+				:key="semester.studiensemester_kurzbz"
+				:value="semester.studiensemester_kurzbz"
+				>
+				{{ semester.studiensemester_kurzbz }}
+				</option>
+			</form-input>
+			<form-input
+				:label="$p.t('lehre', 'lehre')"
+				type="checkbox"
+				container-class="col-3"
+				v-model="data.lehre"
+				name="lehre"
+			/>
+		</div>
+	
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('lehre', 'raumtyp')"
+				type="select"
+				container-class="col-3"
+				v-model="data.raumtyp"
+				name="raumtyp"
+			>
+				<option
+				v-for="raumtyp in dropdowns.raumtyp_array"
+				:value="raumtyp.raumtyp_kurzbz"
+				:key="raumtyp.raumtyp_kurzbz"
+				>
+				{{ raumtyp.raumtyp_kurzbz }} {{ raumtyp.beschreibung }}
+				</option>
+			</form-input>
+			<form-input
+				:label="$p.t('lehre', 'raumtypalternativ')"
+				type="select"
+				container-class="col-3"
+				v-model="data.raumtypalternativ"
+				name="raumtypalternativ"
+			>
+				<option
+				v-for="raumtyp in dropdowns.raumtyp_array"
+				:value="raumtyp.raumtyp_kurzbz"
+				:key="raumtyp.raumtyp_kurzbz + '-alt'"
+				>
+				{{ raumtyp.raumtyp_kurzbz }} {{ raumtyp.beschreibung }}
+				</option>
+			</form-input>
+		</div>
+	
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('lehre', 'startkw')"
+				type="number"
+				container-class="col-2"
+				v-model="data.start_kw"
+				name="start_kw"
+			/>
+			<form-input
+				:label="$p.t('lehre', 'stundenblockung')"
+				type="number"
+				container-class="col-2"
+				v-model="data.stundenblockung"
+				name="stundenblockung"
+			/>
+			<form-input
+				:label="$p.t('lehre', 'wochenrhythmus')"
+				type="number"
+				container-class="col-2"
+				v-model="data.wochenrythmus"
+				name="wochenrythmus"
+			/>
+		</div>
+	</div>
+`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
new file mode 100644
index 000000000..62dae172f
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -0,0 +1,195 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ApiGruppe from "../../../api/lehrveranstaltung/gruppe.js";
+export default{
+	name: "LVGruppen",
+	components: {
+		CoreFilterCmpt,
+		FormForm,
+		FormInput
+	},
+	props: {
+		lehreinheit_id: Number
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		},
+		showLVPlanGruppenDel: {
+			from: 'permissionGruppenEntfernen',
+			default: false
+		},
+	},
+	computed: {
+		tabulatorOptions() {
+			return {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiGruppe.getByLehreinheit(this.lehreinheit_id)),
+				ajaxResponse: (url, params, response) => response.data,
+				columns:[
+					{title: this.$p.t('global', 'bezeichnung'), field:"bezeichnung"},
+					{title: this.$p.t('global', 'beschreibung'), field:"beschreibung"},
+					{title: this.$p.t('lehre', 'studiengang'), field:"studiengang"},
+					{title: "ID", field:"id", visible:false},
+					{
+						title: this.$p.t('lehre', 'verplant'),
+						field:"verplant",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{
+						title: this.$p.t('global', 'actions'), field: 'actions',
+						minWidth: 150,
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							let button = document.createElement('button');
+							container.className = "d-flex gap-1";
+
+							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', (event) => {
+								event.stopPropagation();
+								this.deleteGroup(cell.getData().lehreinheitgruppe_id)
+							});
+							container.append(button);
+
+							if (this.showLVPlanGruppenDel)
+							{
+								button = document.createElement('button');
+								container.className = "d-flex gap-2";
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-calendar-xmark"></i>';
+								button.title = this.$p.t('lehre', 'auslvplanentfernen');
+								button.disabled = !cell.getData().verplant;
+								button.addEventListener('click', (event) => {
+										event.stopPropagation();
+										this.deleteLVPlan(cell.getData().lehreinheitgruppe_id)
+								});
+								container.append(button);
+							}
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				selectable: true,
+				persistenceID: 'lvverwaltung_gruppen_2025_05_27_v1',
+				height: 'auto',
+			}
+		}
+	},
+	data() {
+		return{
+			tabulatorEvents: [],
+			showAutocomplete: false,
+			filteredGroups: [],
+			selectedGroup: null
+		}
+	},
+	watch: {
+		lehreinheit_id() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	methods:{
+		searchGroup(event)
+		{
+			const query = event.query.toLowerCase().trim();
+			this.filteredGroups = this.dropdowns.gruppen_array.filter(gruppe => {
+				return gruppe.gruppe_kurzbz.toLowerCase().includes(query);
+			}).map(gruppe => ({
+				label: gruppe.bezeichnung
+					? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
+					: gruppe.gruppe_kurzbz.trim(),
+				gid: gruppe.gid,
+				gruppe_kurzbz: gruppe.gruppe_kurzbz.trim(),
+				lehrverband: gruppe.lehrverband,
+			}));
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		addGroup()
+		{
+			let newData = {
+				'gid': this.selectedGroup.gid,
+				'lehreinheit_id': this.lehreinheit_id,
+				'lehrverband': this.selectedGroup.lehrverband,
+				'gruppe_kurzbz' : this.selectedGroup.gruppe_kurzbz
+			}
+
+			return this.$api.call(ApiGruppe.add(newData))
+				.then(result => {
+					this.reload()
+					this.selectedGroup = ''
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteLVPlan(lehreinheitgruppe_id)
+		{
+			let deleteData = {
+				'lehreinheitgruppe_id': lehreinheitgruppe_id,
+				'lehreinheit_id': this.lehreinheit_id
+			}
+
+			this.$api.call(ApiGruppe.deleteFromLVPlan(deleteData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				})
+		},
+		deleteGroup(lehreinheitgruppe_id)
+		{
+			let deleteData = {
+				'lehreinheitgruppe_id': lehreinheitgruppe_id,
+				'lehreinheit_id': this.lehreinheit_id
+			}
+
+			this.$api.call(ApiGruppe.delete(deleteData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				})
+		},
+	},
+	template: `
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			:reload=true
+			:new-btn-label="$p.t('lehre', 'addGroup')"
+			new-btn-show
+			@click:new="showAutocomplete = !showAutocomplete"
+			>
+			<template #search> <!--TODO (david) Slot prüfen -->
+				<form-input
+					v-if="showAutocomplete"
+					type="autocomplete"
+					:suggestions="filteredGroups"
+					:placeholder="$p.t('lehre', 'addGroup')"
+					v-model="selectedGroup"
+					field="label"
+					@item-select="addGroup"
+					@complete="searchGroup"
+				></form-input>
+			</template>
+			
+		</core-filter-cmpt>
+		`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
new file mode 100644
index 000000000..772af5a47
--- /dev/null
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -0,0 +1,282 @@
+import CoreSearchbar from "../searchbar/searchbar.js";
+import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import StvVerband from "../Stv/Studentenverwaltung/Verband.js";
+import StvStudiensemester from "../Stv/Studentenverwaltung/Studiensemester.js";
+import LvTable from "./Setup/Table.js";
+import LvTabs from "./Setup/Tabs.js";
+
+import ApiDetails from "../../api/lehrveranstaltung/details.js";
+import ApiLektor from "../../api/lehrveranstaltung/lektor.js";
+import ApiGruppe from "../../api/lehrveranstaltung/gruppe.js";
+import ApiStudiengangTree from "../../api/lehrveranstaltung/studiengangtree.js";
+import ApiSearchbar from "../../api/factory/searchbar.js";
+
+
+export default {
+	name: "LVVerwaltung",
+	components: {
+		CoreSearchbar,
+		VerticalSplit,
+		StvVerband,
+		StvStudiensemester,
+		LvTable,
+		LvTabs,
+	},
+	props: {
+		defaultSemester: String,
+		lvRoot: String,
+		permissions: Object,
+		config: Object
+	},
+	computed: {
+		type(){
+			return this.$route.params.type
+		}
+	},
+	provide() {
+		return {
+			currentSemester: Vue.computed(() => this.studiensemesterKurzbz),
+			dropdowns: this.dropdowns,
+			configShowVertragsdetails: this.config.showVertragsdetails,
+			configShowGewichtung: this.config.showGewichtung,
+			lehreinheitAnmerkungDefault: this.config.lehreinheitAnmerkungDefault,
+			lehreinheitRaumtypDefault: this.config.lehreinheitRaumtypDefault,
+			lehreinheitRaumtypAlternativeDefault: this.config.lehreinheitRaumtypAlternativeDefault,
+
+			permissionLehrveranstaltung: this.permissions['lehre/lehrveranstaltung'],
+			permissionGruppenEntfernen: this.permissions['lv-plan/gruppenentfernen'],
+			permissionLektorEntfernen: this.permissions['lv-plan/lektorentfernen'],
+		}
+	},
+	mounted() {
+		this.updateFilter(this.$route);
+	},
+	watch: {
+		'$route'(to) {
+			this.updateFilter(to);
+		},
+	},
+	data() {
+		return {
+			selected: [],
+			studiensemesterKurzbz: this.defaultSemester,
+			stg: "",
+			filter: {},
+			endpoint: ApiStudiengangTree,
+			dropdowns: {
+				studiensemester_array: [],
+				sprachen_array: [],
+				lehrform_array: [],
+				raumtyp_array: [],
+				lektor_array: [],
+				gruppen_array: [],
+				benutzer_array: [],
+			},
+			selectedStudiengang: '',
+			searchbaroptions: {
+				cssclass: "position-relative",
+				calcheightonly: true,
+				types: [
+					"mitarbeiter"
+				],
+				actions: {
+					employee: {
+						defaultaction: {
+							type: "function",
+							action: (data) => {
+								this.onSelectEmployee(data.uid);
+							}
+						},
+						childactions: [
+						]
+					},
+				}
+			},
+		}
+	},
+	methods: {
+		updateFilter(route)
+		{
+			let filter = { ...route.params, ...route.query };
+			if (!filter.activeFilter)
+			{
+				if (filter.emp)
+				{
+					filter.activeFilter = 'employee';
+				}
+				else if (filter.stg)
+				{
+					filter.activeFilter = 'verband';
+				}
+			}
+			this.filter = filter;
+		},
+		handleRowClicked(data)
+		{
+			this.selected = data
+		},
+		onSelectEmployee(emp)
+		{
+			let stg = this.stg === '' ? null : this.stg;
+
+			this.$router.push({
+				name: 'byEmp',
+				params: { emp, stg, activeFilter: 'employee'},
+			});
+		},
+
+		onSelectVerband({link})
+		{
+			let stg = null;
+			let semester = null;
+
+			if (typeof link === 'number')
+				stg = link;
+			else if (typeof link === 'string')
+			{
+				[stg, semester] = link.split('/');
+			}
+
+			this.stg = stg;
+
+			if (this.filter && this.filter.emp)
+			{
+				this.$router.push({
+					name: 'byEmp',
+					params: { emp: this.filter.emp, stg, activeFilter: 'employee' },
+				});
+			}
+			else
+			{
+				this.$router.push({
+					name: 'byStg',
+					params: { stg, semester, activeFilter: 'verband' },
+				});
+			}
+
+			this.selected = [];
+		},
+		resetEmployeeFilter()
+		{
+			const newParams = { ...this.$route.params, activeFilter: 'verband' };
+			if (newParams.stg === '')
+				this.$router.replace({ name: 'index' });
+			else
+			{
+				delete newParams.emp;
+				newParams.semester = null;
+				this.$router.replace({ name: 'byStg', params: newParams });
+
+			}
+		},
+		searchfunction(params) {
+			return this.$api.call(ApiSearchbar.search(params));
+		},
+		studiensemesterChanged(newValue) {
+			this.studiensemesterKurzbz = newValue;
+			this.$refs.lvTable.reload();
+			this.selected = [];
+		},
+	},
+	created() {
+		if (this.$route.params.stg !== undefined)
+		{
+			this.selectedStudiengang = this.$route.params?.semester !== '' && this.$route.params?.semester
+				? `${this.$route.params.stg}/${this.$route.params.semester}`
+				: this.$route.params.stg;
+		}
+
+		this.$p.loadCategory(['lehre', 'person'])
+
+		this.$api.call(ApiDetails.getStudiensemester())
+			.then(result => {
+				this.dropdowns.studiensemester_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiDetails.getSprache())
+			.then(result => {
+				this.dropdowns.sprachen_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiDetails.getLehrform())
+			.then(result => {
+				this.dropdowns.lehrform_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiDetails.getRaumtyp())
+			.then(result => {
+				this.dropdowns.raumtyp_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiLektor.getLehrfunktionen())
+			.then(result => {
+				this.dropdowns.lehrfunktion_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiLektor.getLektoren())
+			.then(result => {
+				this.dropdowns.lektor_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiGruppe.getAll())
+			.then(result => {
+				this.dropdowns.gruppen_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api.call(ApiGruppe.getBenutzer())
+			.then(result => {
+				this.dropdowns.benutzer_array = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+
+	template: `
+	<div class="stv">
+		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
+			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3">LV Verwaltung</a>
+			<core-searchbar :searchoptions="searchbaroptions" :searchfunction=searchfunction class="searchbar w-100"></core-searchbar>
+		</header>
+		<div class="container-fluid overflow-hidden">
+			<div class="row h-100">
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%" :preselectedKey="selectedStudiengang" :endpoint="endpoint"></stv-verband>
+					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<lv-table ref="lvTable"
+								v-model:selected="selected"
+								 @row-clicked="handleRowClicked"
+								:filter="filter"
+							>
+								<template #filterzuruecksetzen v-if="filter.activeFilter === 'employee'">
+									<button type="button" 
+										class="btn btn-outline-secondary btn-action"
+										title="Mitarbeiter Filter entfernen"
+										@click="resetEmployeeFilter">
+										<i class="fa fa-xmark"></i>
+									</button>
+								</template>
+							</lv-table>
+						</template>
+						<template #bottom>
+							<lv-tabs ref="details" :lv="selected"></lv-tabs>
+						</template>
+					</vertical-split>
+				</main>
+			</div>
+		</div>
+	</div>`
+};
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
new file mode 100644
index 000000000..bb40f56fe
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -0,0 +1,270 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ApiLektor from "../../../api/lehrveranstaltung/lektor.js";
+
+export default{
+	name: "LVLektorDaten",
+	components: {
+		CoreFilterCmpt,
+		CoreForm,
+		FormInput
+	},
+	props: {
+		lehreinheit_id: Number,
+		mitarbeiter_uid: String
+	},
+	emits: [
+		'changedLektor',
+		'changedCosts',
+	],
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		}
+	},
+
+	data() {
+		return{
+			original: null,
+			data: null,
+			changed: {},
+			internal_mitarbeiter_uid: null,
+			filteredLektor: [],
+		}
+	},
+	computed: {
+		changedLength() {
+			return Object.keys(this.changed).length;
+		},
+		berechneteGesamtkosten() {
+			if (!this.data) return 0;
+
+			const stunden = Number(this.data.semesterstunden) || 0;
+			const stundensatz = Number(this.data.stundensatz) || 0;
+
+			return (stunden * stundensatz).toFixed(2);
+		}
+	},
+	watch: {
+		lehreinheit_id:
+		{
+			deep: true,
+			handler(newVal, oldVal) {
+				this.data = null;
+				this.original = null;
+				this.internal_mitarbeiter_uid = null;
+			}
+		},
+		mitarbeiter_uid:
+		{
+			deep: true,
+			handler(newVal, oldVal) {
+				this.internal_mitarbeiter_uid = newVal;
+
+				if (newVal === null)
+					this.data = null;
+				else if (newVal !== undefined && this.lehreinheit_id !== undefined)
+					this.getLektorData();
+			}
+
+		},
+		data: {
+			handler(newValue) {
+				if (newValue === null)
+				{
+					this.changed = {}
+					return
+				}
+				let changed = {};
+
+				let keys = Object.keys(this.original);
+
+				for (let key of keys)
+				{
+					if (this.original[key] !== newValue[key])
+						changed[key] = newValue[key];
+				}
+				this.changed = changed;
+			},
+			deep: true
+		},
+	},
+	methods: {
+		getLektorData()
+		{
+			if (!this.lehreinheit_id || !this.internal_mitarbeiter_uid)
+				return;
+
+			return this.$api.call(ApiLektor.getLektorDaten(this.lehreinheit_id, this.internal_mitarbeiter_uid))
+				.then(result => {
+					this.data = result.data;
+					this.original = { ...this.data };
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateDaten()
+		{
+			if (!this.changedLength)
+				return;
+
+			if (this.changed.mitarbeiter_uid && this.changed.mitarbeiter_uid.uid)
+			{
+				this.changed.mitarbeiter_uid = this.changed.mitarbeiter_uid.uid;
+			}
+			this.$refs.form.clearValidation();
+
+			let updatedData = {
+				lehreinheit_id: this.lehreinheit_id,
+				mitarbeiter_uid: this.mitarbeiter_uid,
+				formData: this.changed
+			}
+			this.$refs.form.call(ApiLektor.update(updatedData))
+				.then(result => {
+					let error = result.data?.error;
+					if (error)
+						this.$fhcAlert.alertWarning(error)
+					this.original = {...this.data};
+
+					if (this.changed.mitarbeiter_uid)
+					{
+						this.$emit('changedLektor', this.changed.mitarbeiter_uid);
+					}
+					if (this.changed.semesterstunden || this.changed.stundensatz)
+					{
+						this.$emit('changedCosts');
+					}
+					this.changed = {};
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		searchLektor(event)
+		{
+			const query = event.query.toLowerCase().trim();
+			this.filteredLektor = this.dropdowns.lektor_array.filter(lektor => {
+				const fullName = `${lektor.vorname.toLowerCase()} ${lektor.nachname.toLowerCase()}`;
+				const reverseFullName = `${lektor.nachname.toLowerCase()} ${lektor.vorname.toLowerCase()}`;
+				return fullName.includes(query) || reverseFullName.includes(query) || lektor.uid.toLowerCase().includes(query);
+			}).map(lektor => ({
+				label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
+				uid: lektor.uid
+			}));
+		},
+
+	},
+	created() {
+		this.getLektorData()
+	},
+	template: `
+		<core-form ref="form" @submit.prevent="updateDaten">
+			<div class="position-sticky top-0 z-1">
+				<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">{{$p.t('ui', 'speichern')}}</button>
+			</div>
+		<fieldset class="overflow-hidden">
+			<legend>{{$p.t('lehre', 'daten')}}</legend>
+			<template v-if="data">
+				<div class="row align-items-start mb-3">
+					<form-input
+						:label="$p.t('lehre', 'lehrfunktion')"
+						type="select"
+						container-class="col-3"
+						v-model="data.lehrfunktion_kurzbz"
+						name="lehrfunktion_kurzbz"
+						>
+						<option
+							v-for="lehrfunktion in dropdowns.lehrfunktion_array"
+							:value="lehrfunktion.lehrfunktion_kurzbz"
+						>
+							{{ lehrfunktion.lehrfunktion_kurzbz }}
+						</option>
+					</form-input>
+					
+
+					<form-input
+						type="autocomplete"
+						:label="$p.t('lehre', 'lektor')"
+						:disabled="data.vertrag_id !== null"
+						:suggestions="filteredLektor"
+						placeholder="Mitarbeiter hinzufügen"
+						v-model="data.mitarbeiter_uid"
+						field="label"
+						container-class="col-3"
+						dropdown
+						@complete="searchLektor"
+					></form-input>
+					
+					<form-input
+						:label="$p.t('lehre', 'anmerkung')"
+						type="text"
+						container-class="col-3"
+						v-model="data.anmerkung"
+						name="anmerkung"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						:label="$p.t('lehre', 'las')"
+						type="text"
+						container-class="col-3"
+						:disabled="data.vertrag?.vertragsstatus_kurzbz === 'akzeptiert'"
+						v-model="data.semesterstunden"
+						name="semesterstunden"
+						>
+					</form-input>
+					
+					<form-input
+						:label="$p.t('lehre', 'planstunden')"
+						type="text"
+						container-class="col-3"
+						v-model="data.planstunden"
+						name="planstunden"
+						>
+					</form-input>
+
+				</div>
+				<div class="row mb-3">
+					
+					<form-input
+						:label="data.default_stundensatz !== null 
+							? $p.t('lehre', 'stundensatz') + ' (' + $p.t('lehre', 'default') + ': ' + data.default_stundensatz + ')'
+							: $p.t('lehre', 'stundensatz')"
+						type="text"
+						container-class="col-3"
+						v-model="data.stundensatz"
+						:disabled="data.vertrag?.vertragsstatus_kurzbz === 'akzeptiert'"
+						name="stundensatz"
+						>
+					</form-input>
+					
+					<form-input
+						:label="$p.t('lehre', 'bismelden')"
+						type="checkbox"
+						container-class="col-3"
+						v-model="data.bismelden"
+						name="bismelden"
+						>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						:label="$p.t('lehre', 'gesamtkosten')"
+						type="number"
+						container-class="col-3"
+						readonly
+						v-model="berechneteGesamtkosten" 
+						:style="{ color: berechneteGesamtkosten <= 0 ? 'red' : 'black' }"
+						>
+					</form-input>
+					
+				</div>
+				
+			</template>
+			
+		</fieldset>
+	</core-form>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
new file mode 100644
index 000000000..373a8955c
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -0,0 +1,223 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ApiLektor from "../../../api/lehrveranstaltung/lektor.js";
+
+
+export default{
+	name: "LVLektorTable",
+	components: {
+		CoreFilterCmpt,
+		FormForm,
+		FormInput
+	},
+	props: {
+		lehreinheit_id: Number,
+		selected: String
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		},
+		showLVPlanLektorDel: {
+			from: 'permissionLektorEntfernen',
+			default: false
+		},
+	},
+	emits: ['update:selected'],
+
+	data() {
+		return {
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.lektorSelected
+				}
+			],
+			showAutocomplete: false,
+			filteredLektor: [],
+			selectedLektor: ''
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			return {
+
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiLektor.getByLehreinheit(this.lehreinheit_id)),
+				ajaxResponse: (url, params, response) => { return response.data || [] },
+				columns:[
+				{title: this.$p.t('person', 'nachname'), field:"nachname"},
+				{title: this.$p.t('person', 'vorname'), field:"vorname"},
+				{title: this.$p.t('person', 'uid'), field:"mitarbeiter_uid"},
+				{title: this.$p.t('lehre', 'lehreinheit_id'), field:"lehreinheit_id"},
+				{
+					title: this.$p.t('lehre', 'verplant'),
+					field:"verplant",
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					}
+				},
+				{
+					title:  this.$p.t('global', 'actions'), field: 'actions',
+					minWidth: 150,
+					formatter: (cell, formatterParams, onRendered) => {
+						let container = document.createElement('div');
+						let button = document.createElement('button');
+
+						container.className = "d-flex gap-2";
+
+						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', (event) => {
+							event.stopPropagation();
+							this.deletePerson(cell.getData().mitarbeiter_uid, cell.getData().lehreinheit_id);
+						});
+
+						container.append(button);
+						if (this.showLVPlanLektorDel)
+						{
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-calendar-xmark"></i>';
+							button.disabled = !cell.getData().verplant;
+							button.title = this.$p.t('ui', 'auslvplanentfernen');
+							button.addEventListener('click', (event) => {
+								event.stopPropagation();
+								this.deleteLVPlan(cell.getData().mitarbeiter_uid, cell.getData().lehreinheit_id)
+							});
+							container.append(button);
+						}
+
+						return container;
+					},
+					frozen: true
+				},
+			],
+				layout: 'fitDataFill',
+				height:	'auto',
+				selectable: true,
+				selectableRangeMode: 'click',
+				selectableRows:1,
+				persistenceID: 'lehrveranstaltungen_lektor_table_2025_05_27_v1',
+		}},
+	},
+	mounted(){
+	},
+	watch: {
+		lehreinheit_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/lv/lektor/getLektorenByLE/' + encodeURIComponent(this.lehreinheit_id));
+		},
+	},
+	methods:{
+		lektorSelected(data)
+		{
+			if (data.length > 0)
+			{
+				let mitarbeiter_uid = data[0].mitarbeiter_uid;
+				this.$emit('update:selected', mitarbeiter_uid);
+			}
+			else
+			{
+				this.$emit('update:selected', null);
+			}
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+
+		deleteLVPlan(uid, lehreinheit_id)
+		{
+			let deleteData = {
+				'mitarbeiter_uid': uid,
+				'lehreinheit_id': lehreinheit_id,
+			}
+
+			this.$api.call(ApiLektor.deleteFromLVPlan(deleteData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				})
+		},
+		deletePerson(uid, lehreinheit_id)
+		{
+			let deleteData = {
+				'mitarbeiter_uid': uid,
+				'lehreinheit_id': lehreinheit_id,
+			}
+
+			this.$api.call(ApiLektor.deletePerson(deleteData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+
+				})
+		},
+		searchLektor(event)
+		{
+			const query = event.query.toLowerCase().trim();
+			this.filteredLektor = this.dropdowns.lektor_array.filter(lektor => {
+				const fullName = `${lektor.vorname.toLowerCase()} ${lektor.nachname.toLowerCase()}`;
+				const reverseFullName = `${lektor.nachname.toLowerCase()} ${lektor.vorname.toLowerCase()}`;
+				return fullName.includes(query) || reverseFullName.includes(query) || lektor.uid.toLowerCase().includes(query);
+			}).map(lektor => ({
+				label: `${lektor.nachname} ${lektor.vorname} (${lektor.uid})`,
+				uid: lektor.uid
+			}));
+		},
+		addLektor()
+		{
+			let newData = {
+				'mitarbeiter_uid': this.selectedLektor.uid,
+				'lehreinheit_id': this.lehreinheit_id
+			}
+
+			this.$api.call(ApiLektor.add(newData))
+				.then(result => {
+					this.reload()
+					this.selectedLektor = ''
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+
+	},
+	template: `
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			:new-btn-label="$p.t('lehre', 'addlektor')"
+			new-btn-show
+			@click:new="showAutocomplete = !showAutocomplete"
+			>
+		<template #search> <!--TODO (david) Slot prüfen -->
+			<form-input
+				v-if="showAutocomplete"
+				type="autocomplete"
+				:suggestions="filteredLektor"
+				:placeholder="$p.t('lehre', 'addLektor')"
+				v-model="selectedLektor"
+				field="label"
+				@item-select="addLektor"
+				@complete="searchLektor"
+			></form-input>
+		</template>
+
+</core-filter-cmpt>
+`
+};
+
+
diff --git a/public/js/components/LVVerwaltung/Lektor/Vertrag.js b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
new file mode 100644
index 000000000..f36fad8e0
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
@@ -0,0 +1,161 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ApiVertrag from "../../../api/lehrveranstaltung/vertrag.js";
+
+export default{
+	name: "LVLektorVertrag",
+	components: {
+		CoreFilterCmpt,
+		CoreForm,
+		FormInput
+	},
+	emits: [
+		'canceledVertrag'
+	],
+	props: {
+		lehreinheit_id: Number,
+		mitarbeiter_uid: String
+	},
+
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		},
+		showVertragsdetails: {
+			from: 'configShowVertragsdetails',
+			default: false
+		}
+	},
+
+	data() {
+		return{
+			data: null,
+			internal_mitarbeiter_uid: null,
+		}
+	},
+	watch: {
+		lehreinheit_id:
+		{
+			deep: true,
+			handler(newVal, oldVal) {
+				this.data = null;
+				this.internal_mitarbeiter_uid = null;
+			}
+
+		},
+		mitarbeiter_uid:
+		{
+			deep: true,
+			handler(newVal, oldVal) {
+				this.internal_mitarbeiter_uid = newVal;
+
+				if (newVal === null)
+					this.data = null;
+				else if (newVal !== undefined && this.lehreinheit_id !== undefined)
+					this.getLektorVertrag();
+			}
+		},
+	},
+	computed: {
+		vertragsstatus() {
+			if (!this.data || !this.data.vertrag) return;
+
+			const betragVertrag = Number(this.data.vertrag.betrag) || 0;
+			const stundenVertrag = Number(this.data.vertrag.vertragsstunden) || 0;
+
+			const semStunden = Number(this.data.semesterstunden) || 0;
+			const stundensatz = Number(this.data.stundensatz) || 0;
+
+			const kostenAktuell  = semStunden * stundensatz;
+
+			return (stundenVertrag !== semStunden || betragVertrag !== kostenAktuell) ? 'Geändert' : (this.data.vertrag.vertragsstatus || '');
+		},
+	},
+	methods: {
+		getLektorVertrag ()
+		{
+			if (this.showVertragsdetails === false)
+				return;
+
+			if (!this.lehreinheit_id || !this.internal_mitarbeiter_uid)
+				return;
+
+			this.$api.call(ApiVertrag.getByLeEmp(this.lehreinheit_id, this.internal_mitarbeiter_uid))
+				.then(result => {
+					this.data = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+
+		cancelVertrag()
+		{
+			let needUpdate = {
+				vertrag_id: this.data.vertrag.vertrag_id,
+				mitarbeiter_uid: this.mitarbeiter_uid,
+				lehreinheit_id: this.lehreinheit_id
+			}
+			this.$api.call(ApiVertrag.cancelByLeEmp(needUpdate))
+				.then(result => {
+					this.data.vertrag = null;
+					this.$emit('canceledVertrag');
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+	},
+	// language=HTML
+	template: `
+		<core-form ref="form">
+			<fieldset class="overflow-hidden" v-if="showVertragsdetails">
+				<legend>  {{$p.t('lehre', 'vertragsdetails')}}  
+						  {{ data === null ? ' – Noch kein Vertrag' : '' }}
+				  </legend>
+				<template v-if="data?.vertrag">
+					<div class="row align-items-end mb-3">
+						<form-input 
+							:label="$p.t('lehre', 'vertragsstatus')"
+							type="text"
+							readonly
+							container-class="col-3"
+							v-model="vertragsstatus"
+							:style="{fontWeight: vertragsstatus === 'Geändert' ? 'bold' : 'normal'}"
+							name="vertragsstatus"
+						/>
+						<div class="col-3 d-flex align-items-end">
+							<button 
+								type="button" 
+								class="btn btn-outline-secondary w-100"
+								@click="cancelVertrag"
+							>
+								<i class="fa-solid fa-ban"></i>
+							</button>
+						</div>
+					</div>
+					{{$p.t('lehre', 'vertragurfassung')}}
+					<div class="row mb-3">
+						<form-input
+							:label="$p.t('lehre', 'semesterstunden')"
+							type="text"
+							container-class="col-3"
+							readonly
+							v-model="data.vertrag.vertragsstunden"
+							name="vertragsstunden"
+							>
+						</form-input>
+					</div>
+					<div class="row mb-3">
+						<form-input
+							:label="$p.t('lehre', 'studiensemester')"
+							type="text"
+							container-class="col-3"
+							readonly
+							v-model="data.vertrag.vertragsstunden_studiensemester_kurzbz"
+							name="vertragsstunden_studiensemester_kurzbz"
+							>
+						</form-input>
+					</div>
+				</template>
+			</fieldset>
+		</core-form>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
new file mode 100644
index 000000000..9b0ae71f3
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -0,0 +1,683 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+import BsModal from "../../Bootstrap/Modal.js";
+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 ApiLv from "../../../api/lehrveranstaltung.js";
+import ApiTag from "../../../api/lehrveranstaltung/tag.js";
+import ApiLehreinheit from "../../../api/lehrveranstaltung/lehreinheit.js";
+
+export default {
+	name: "LVVerwaltungTable",
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		DetailsForm,
+		CoreTag
+
+	},
+	props: {
+		selected: Object,
+		filter: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester'
+		},
+		lehreinheitAnmerkungDefault: {
+			from: 'lehreinheitAnmerkungDefault',
+			default: ''
+		},
+		lehreinheitRaumtypDefault: {
+			from: 'lehreinheitRaumtypDefault',
+			default: ''
+		},
+		lehreinheitRaumtypAlternativeDefault: {
+			from: 'lehreinheitRaumtypAlternativeDefault',
+			default: ''
+		}
+	},
+	emits: [
+		'update:selected',
+		'row-clicked'
+	],
+	watch: {
+		filter: {
+			handler() {
+				if (this.$refs.table && this.$refs.table.tabulator)
+				{
+					this.expanded = [];
+					this.reload();
+				}
+			},
+			deep: true,
+
+		}
+	},
+	data() {
+		return {
+			fieldTitleMap: {
+				lv_kurzbz: ['lehre', 'kurzbz'],
+				tags: ['ui', 'tags'],
+				lehrveranstaltung_id: ['lehre', 'lehrveranstaltung_id'],
+				lv_bezeichnung: ['ui', 'bezeichnung'],
+				lv_bezeichnung_english: ['lehre', 'bezeichnungeng'],
+				lv_studiengang_kz: ['lehre', 'studiengangskennzahlLehre'],
+				studiengang: ['lehre', 'studiengang'],
+				semester: ['lehre', 'semester'],
+				sprache: ['global', 'sprache'],
+				lv_ects: ['lehre', 'ects'],
+				semesterstunden: ['lehre', 'semesterstunden'],
+				anmerkung: ['global', 'anmerkung'],
+				lehre: ['lehre', 'lehre'],
+				lehreverzeichnis: ['ui', 'lehreverzeichnis'],
+				aktiv: ['person', 'aktiv'],
+				planfaktor: ['ui', 'planfaktor'],
+				planlektoren: ['ui', 'planlektoren'],
+				planpersonalkosten: ['ui', 'planpersonalkosten'],
+				plankostenprolektor: ['ui', 'plankostenprolektor'],
+				orgform_kurzbz: ['lehre', 'organisationsform'],
+				studienplan_id: ['ui', 'studienplan_id'],
+				studienplan_bezeichnung: ['ui', 'studienplan_bezeichnung'],
+				lehrtyp_kurzbz: ['ui', 'lehrtyp_kurzbz'],
+				lehrform_kurzbz: ['lehre', 'lehrform'],
+				le_planstunden: ['lehre', 'leplanstunden'],
+				lehreinheit_id: ['lehre', 'lehreinheit_id'],
+				stundenblockung: ['lehre', 'stundenblockung'],
+				wochenrythmus: ['lehre', 'wochenrhytmus'],
+				startkw: ['lehre', 'startkw'],
+				raumtyp: ['lehre', 'raumtyp'],
+				raumtypalternativ: ['lehre', 'raumtypalternativ'],
+				gruppen: ['lehre', 'gruppen'],
+				lektoren: ['lehre', 'lehrende'],
+			},
+
+			expanded: [],
+			selectedColumnValues: [],
+			tagEndpoint: ApiTag,
+			iconPath: FHC_JS_DATA_STORAGE_OBJECT.app_root + '/skin/images/lehrtyp_',
+			tabulatorEvents: [
+				{
+					event: 'rowSelectionChanged',
+					handler: this.rowSelectionChanged
+				},
+
+				{
+					event: 'dataProcessed',
+					handler: (data) => {
+						this.reexpandRows()
+						this.$emit('update:selected', {})
+					}
+				},
+				{
+					event: 'dataTreeRowExpanded',
+					handler: (data) => {
+						this.getExpandedRows()
+					}
+				},{
+					event: 'dataTreeRowCollapsed',
+					handler: (data) => {
+						this.getExpandedRows()
+					}
+				}
+
+			],
+			formData: {},
+			lv_info: false,
+			lv_info_default: {
+				stundenblockung: 2,
+				wochenrythmus: 1,
+				studiensemester_kurzbz: this.currentSemester,
+				lehrform_kurzbz: 'UE',
+				anmerkung: this.lehreinheitAnmerkungDefault.replace("'","\'"),
+				raumtyp: this.lehreinheitRaumtypDefault,
+				raumtypalternativ: this.lehreinheitRaumtypAlternativeDefault,
+				lehrfach_id: ''
+
+			}
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+			return {
+				index: 'uniqueindex',
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: async (url, config, params) => {
+					let realUrl = this.buildApiUrl();
+					if (realUrl)
+						return this.$api.call(ApiLv.getTable(this.buildApiUrl()));
+				},
+				ajaxResponse: (url, params, response) => { return response?.data || [] },
+				dataTree: true,
+				initialSort:[
+					{column: 'lv_bezeichnung', dir: 'desc'},
+				],
+				dataTreeElementColumn: "lv_kurzbz",
+				dataTreeFilter: true,
+				dataTreeStartExpanded: false,
+				dataTreeCollapseElement: '<i class="fa-solid fa-caret-down"></i>',
+				dataTreeExpandElement: '<i class="fa-solid fa-caret-right"></i>',
+				columnDefaults: {
+					tooltip: true,
+					headerFilter: "input",
+					headerFilterFunc: extendedHeaderFilter
+				},
+				layout: 'fitDataStretch',
+				layoutColumnsOnNewData: false,
+				height: '100%',
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
+				rowContextMenu: (component, e) => {
+
+					return [
+						{
+							label: "LV-Teil kopieren",
+							menu: [
+								{
+									label: "Alles",
+									action: (e, row) =>
+									{
+										this.copyLehreinheit(row, "alle");
+									},
+								},
+								{
+									label: "Nur LV-Teil",
+									action: (e, row) =>
+									{
+										this.copyLehreinheit(row, "lvteil");
+									},
+								},
+								{
+									label: "Nur mit Gruppen",
+									action: (e, row) =>
+									{
+										this.copyLehreinheit(row, "halb");
+									},
+								},
+								{
+									label: "Nur mit Lehrenden",
+									action: (e, row) =>
+									{
+										this.copyLehreinheit(row, "lektoren");
+									},
+								},
+							],
+						},
+						{
+							label: "Entfernen",
+							action: (e, row)  => {
+								this.deleteLehreinheit(row)
+							},
+						},
+					];
+				},
+
+				persistenceID: 'lehrveranstaltungen_2025_05_27_v1',
+				columns: [
+					{
+						title: this.$p.t('lehre', 'kurzbz'),
+						field: "lv_kurzbz",
+						headerFilterFuncParams: {field: 'lv_kurzbz'},
+						headerFilter: true,
+						formatter: (cell, formatterParams) => {
+							const rowData = cell.getRow().getData();
+							const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
+
+							const span = document.createElement('span');
+							span.classList.add('lv_table_icon', `icon-${iconKey}`);
+							span.title = iconKey || 'LV-Teil';
+							return span;
+						},
+
+						cellClick: (e, cell) => {
+							cell.getRow().treeToggle();
+						}
+					},
+					{
+						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);
+								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: this.$p.t('lehre', 'lehrveranstaltung_id'),
+						field: "lehrveranstaltung_id",
+						headerFilterFuncParams: {field: 'lehrveranstaltung_id'},
+						headerFilter: true
+					},
+					{title: this.$p.t('ui', 'bezeichnung'), field: "lv_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung'}},
+					{title: this.$p.t('lehre', 'bezeichnungeng'), field: "lv_bezeichnung_english", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung_english'}},
+					{
+						title: this.$p.t('lehre', 'studiengangskennzahlLehre'),
+						field: "lv_studiengang_kz",
+						headerFilter: true,
+						headerFilterFuncParams: {field: 'lv_studiengang_kz'}
+					},
+					{title: this.$p.t('lehre', 'studiengang'), field: "studiengang", headerFilter: true, headerFilterFuncParams: {field: 'studiengang'}},
+					{title: this.$p.t('lehre', 'semester'), field: "semester", headerFilter: true, headerFilterFuncParams: {field: 'semester'}},
+					{title: this.$p.t('global', 'sprache'), field: "sprache", headerFilter: true, headerFilterFuncParams: {field: 'sprache'}},
+					{title: this.$p.t('lehre', 'ects'), field: "lv_ects", headerFilter: true, headerFilterFuncParams: {field: 'lv_ects'}},
+					{title: this.$p.t('lehre', 'semesterstunden'), field: "semesterstunden", headerFilter: true, headerFilterFuncParams: {field: 'semesterstunden'}},
+					{title: this.$p.t('global', 'anmerkung'), field: "anmerkung", headerFilter: true, headerFilterFuncParams: {field: 'anmerkung'}},
+					{title: this.$p.t('lehre', 'lehre'), field: "lehre", headerFilter: true, headerFilterFuncParams: {field: 'lehre'}},
+					{title: "Lehreverzeichnis", field: "lehreverzeichnis", headerFilter: true, headerFilterFuncParams: {field: 'lehreverzeichnis'}},
+					{title: this.$p.t('person', 'aktiv'), field: "aktiv", headerFilter: true, headerFilterFuncParams: {field: 'aktiv'}},
+					{title: "Planfaktor", field: "planfaktor", headerFilter: true, headerFilterFuncParams: {field: 'planfaktor'}},
+					{title: "Planlektoren", field: "planlektoren", headerFilter: true, headerFilterFuncParams: {field: 'planlektoren'}},
+					{title: "planpersonalkosten", field: "planpersonalkosten", headerFilter: true, headerFilterFuncParams: {field: 'planpersonalkosten'}},
+					{title: "plankostenprolektor", field: "plankostenprolektor", headerFilter: true, headerFilterFuncParams: {field: 'plankostenprolektor'}},
+					{title: this.$p.t('ui', 'organisationsform'), field: "orgform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'orgform_kurzbz'}},
+					{title: this.$p.t('ui', 'studienplan_id'), field: "studienplan_id", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_id'}},
+					{title: "studienplan_bezeichnung", field: "studienplan_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_bezeichnung'}},
+					{title: "lehrtyp_kurzbz", field: "lehrtyp_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrtyp_kurzbz'}},
+					{title: this.$p.t('lehre', 'lehrform'), field: "lehrform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrform_kurzbz'}},
+					{title: this.$p.t('lehre', 'leplanstunden'), field: "le_planstunden", headerFilter: true, headerFilterFuncParams: {field: 'le_planstunden'}},
+					{title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}},
+					{title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}},
+					{title: this.$p.t('lehre', 'wochenrhytmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}},
+					{title: this.$p.t('lehre', 'startkw'), field: "startkw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}},
+					{title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}},
+					{title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}},
+					{title: this.$p.t('lehre', 'gruppen'), field: "gruppen", headerFilter: true, headerFilterFuncParams: {field: 'gruppen'}},
+					{title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: 'lektoren'}},
+				],
+			}
+
+		}
+	},
+
+	mounted() {
+		if (this.shouldAutoLoad())
+		{
+			this.reload();
+		}
+	},
+	methods: {
+		shouldAutoLoad() {
+			return this.filter && this.filter.activeFilter;
+		},
+		async reload()
+		{
+
+			if (this.shouldAutoLoad)
+			{
+				this.$refs.table.reloadTable();
+			}
+		},
+		rowSelectionChanged(data) {
+			this.selectedRows = this.$refs.table.tabulator.getSelectedRows();
+			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().lehreinheit_id !== undefined).map(row => row.getData().lehreinheit_id);
+
+			if (data[0]?.lehreinheit_id !== undefined && this.selectedColumnValues.length === 1)
+			{
+				this.$emit('update:selected', [data[0]]);
+				this.lv_info = false
+			}
+			else if (data[0]?.lehrveranstaltung_id)
+			{
+				this.$emit('update:selected', {});
+				this.getLVInfos(data[0]);
+			}
+		},
+		getLVInfos(data)
+		{
+			this.$api.call(ApiLv.getByLV(data.lehrveranstaltung_id))
+				.then(result => {
+
+					if (result.data?.lehrfach_id === undefined
+						&& Array.isArray(result.data?.lehrfaecher))
+					{
+						const match = result.data.lehrfaecher?.find(
+							lf => lf.lehrfach?.startsWith(result.data.lvbezeichnung)
+						);
+						if (match)
+						{
+							result.data.lehrfach_id = match.lehrveranstaltung_id;
+						}
+					}
+					this.lv_info = {...this.lv_info_default, ...result.data};
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		buildApiUrl()
+		{
+			if (this.filter.activeFilter === 'employee' && this.filter.emp)
+			{
+				return this.$api.getUri(ApiLv.getByEmpStg(
+					this.filter.emp,
+					this.filter.stg
+				));
+			}
+
+			if (this.filter.activeFilter === 'verband' && this.filter.stg)
+			{
+				return this.$api.getUri(ApiLv.getByStg(
+					this.filter.stg,
+					this.filter.semester
+				));
+			}
+		},
+		resetEmployeeFilter()
+		{
+			const newFilter = { ...this.filter };
+			delete newFilter.emp;
+			newFilter.activeFilter = 'verband';
+		},
+		buildParams()
+		{
+			const params = {};
+			for (const [key, value] of Object.entries(this.filter)) {
+				if (value !== undefined && value !== null) {
+					params[key] = value;
+				}
+			}
+			return params;
+		},
+		showLehreinheitModal() {
+			this.resetModal();
+			this.$refs.lehreinheitModal.show();
+		},
+		addNewLehreinheit()
+		{
+			return this.$api.call(ApiLehreinheit.add(this.lv_info))
+				.then(result => {
+					this.$refs.lehreinheitModal.hide()
+					this.reload()
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		resetModal()
+		{
+			this.lv_info_default = {
+				stundenblockung: 2,
+				wochenrythmus: 1,
+				studiensemester_kurzbz: this.currentSemester,
+				lehrform_kurzbz: 'UE',
+				anmerkung: this.lehreinheitAnmerkungDefault.replace("'","\'"),
+				raumtyp: this.lehreinheitRaumtypDefault,
+				raumtypalternativ: this.lehreinheitRaumtypAlternativeDefault,
+				lehrfach_id: ''
+			}
+		},
+		addedTag(addedTag)
+		{
+			const table = this.$refs.table.tabulator;
+
+			this.selectedRows.forEach(row =>
+			{
+				if (Array.isArray(addedTag.response))
+				{
+					addedTag.response.forEach(tag => {
+
+						const all = this.getAllRows(table.getRows());
+						const targetRow = all.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.push({ ...addedTag });
+								targetRow.update({ tags: JSON.stringify(tags) });
+								targetRow.reformat();
+							}
+						}
+					});
+				}
+			});
+		},
+		deletedTag(deletedTag) {
+			const table = this.$refs.table.tabulator;
+			const all = this.getAllRows(table.getRows());
+
+			const targetRow = all.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 table = this.$refs.table.tabulator;
+			const all = this.getAllRows(table.getRows());
+
+			const targetRow = all.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();
+				}
+			}
+		},
+		async copyLehreinheit(row, art)
+		{
+			let data = {
+				lehreinheit_id: row.getData().lehreinheit_id,
+				art: art
+			}
+
+			return this.$api.call(ApiLehreinheit.copy(data))
+				.then(result => {
+					this.reload()
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+		},
+
+		async getExpandedRows() {
+			this.expanded = [];
+			let rows = this.$refs.table.tabulator.getRows();
+			let allRows = this.getAllRows(rows);
+			allRows.forEach(row => {
+				if (row.getTreeChildren().length > 0 && row.isTreeExpanded())
+				{
+					this.expanded.push(row.getData().uniqueindex);
+				}
+			});
+		},
+		reexpandRows() {
+			const all = this.getAllRows(this.$refs.table.tabulator.getRows());
+
+			const matchingRows = all.filter(row =>
+				this.expanded.includes(row.getData().uniqueindex)
+			);
+
+			matchingRows.forEach((row, index) => {
+				row._row.modules.dataTree.open = true;
+
+				if (index === matchingRows.length - 1)
+				{
+					row.treeExpand();
+				}
+			});
+		},
+		deleteLehreinheit(row)
+		{
+			let deleteData = {
+				lehreinheit_id: row.getData().lehreinheit_id,
+			}
+			return this.$api.call(ApiLehreinheit.delete(deleteData))
+				.then(result => {
+					this.reload()
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		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;
+		},
+	},
+	template: `
+	<core-filter-cmpt
+		ref="table"
+		:tabulator-options="tabulatorOptions"
+		:tabulator-events="tabulatorEvents"
+		table-only
+		:side-menu="false"
+		:reload=true
+		new-btn-label="LV-Teil hinzufügen"
+		new-btn-show
+		:new-btn-disabled="!lv_info"
+		@click:new="showLehreinheitModal">
+		
+		<template #actions>
+			<core-tag ref="tagComponent"
+				:endpoint="tagEndpoint"
+				:values="selectedColumnValues"
+				@added="addedTag"
+				@deleted="deletedTag"
+				@updated="updatedTag"
+				zuordnung_typ="lehreinheit_id"
+			></core-tag>
+		</template>
+		<template #search>
+			<slot name="filterzuruecksetzen"></slot>
+		</template>
+	</core-filter-cmpt>
+		<bs-modal ref="lehreinheitModal" dialogClass="modal-lg">
+			<template #title>
+				<p class="fw-bold mt-3">{{$p.t('lehre', 'newlehreinheit')}}</p>
+			</template>
+			
+			<template v-if="lv_info">
+				<details-form :data="lv_info"/>
+			</template>
+			
+			<template #footer>
+				<button type="button" class="btn btn-primary" @click="addNewLehreinheit">{{$p.t('ui', 'speichern')}}</button>
+			</template>
+		</bs-modal>
+
+`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Setup/Tabs.js b/public/js/components/LVVerwaltung/Setup/Tabs.js
new file mode 100644
index 000000000..af14fbf32
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Setup/Tabs.js
@@ -0,0 +1,62 @@
+import FhcTabs from "../../Tabs.js";
+import Setup from "../../../api/lehrveranstaltung/setup.js";
+
+export default {
+	name: "LVVerwaltungTabs",
+	components: {
+		FhcTabs
+	},
+	data() {
+		return {
+			configLVTabs: {},
+		};
+	},
+	props: {
+		lv: Object
+	},
+	computed: {
+		config() {
+			if (!this.lv || !this.lv.length)
+				return {};
+
+			return this.configLVTabs;
+		}
+	},
+	methods: {
+		reload() {
+			if (this.$refs.tabs?.$refs?.current?.reload)
+			{
+				this.$refs.tabs.$refs.current.reload();
+			}
+		}
+	},
+	created() {
+		this.$api.call(Setup.getTabs())
+			.then(result => {
+				this.configLVTabs = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+		<div class="stv-details h-100 pb-3 d-flex flex-column">
+			<div v-if="!lv?.length" class="justify-content-center d-flex h-100 align-items-center">
+				Bitte eine Lehreinheit auswählen!
+			</div>
+			<div v-else-if="configLVTabs" class="d-flex flex-column h-100 pb-3">
+				<fhc-tabs 
+					v-if="lv.length === 1"
+					ref="tabs"
+					:modelValue="lv[0]"
+					:config="configLVTabs"
+					:default="$route.params.tab"
+					style="flex: 1 1 0%; height: 0%"
+					@changed="reload"
+				/>
+			</div>
+			<div v-else>
+				Loading...
+			</div>
+		</div>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Details.js b/public/js/components/LVVerwaltung/Tabs/Details.js
new file mode 100644
index 000000000..ce0102177
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Details.js
@@ -0,0 +1,133 @@
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import GruppenTable from '../Details/Gruppen.js';
+import GruppenDirektTable from '../Details/Direktinskription.js';
+import DetailsForm from '../Details/Form.js'
+import ApiLehreinheit from "../../../api/lehrveranstaltung/lehreinheit.js";
+
+export default {
+	name: "LVTabDetails",
+	components: {
+		CoreForm,
+		FormInput,
+		GruppenTable,
+		GruppenDirektTable,
+		DetailsForm
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		},
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		}
+	},
+	watch: {
+		modelValue(newValue)
+		{
+			this.updateLE(newValue)
+		},
+		data: {
+			handler(newValue) {
+				if (newValue === null)
+				{
+					this.changed = {}
+					return
+				}
+				let changed = {};
+
+				let keys = Object.keys(this.original);
+
+				for (let key of keys) {
+					if (this.original[key] !== newValue[key])
+					{
+						changed[key] = newValue[key];
+					}
+				}
+				this.changed = changed;
+			},
+			deep: true
+		}
+	},
+	data() {
+		return {
+			original: null,
+			data: null,
+			changed: {}
+		}
+	},
+	computed: {
+		changedLength() {
+			return Object.keys(this.changed).length;
+		}
+	},
+
+	methods: {
+		updateLE(le) {
+			if (le?.lehreinheit_id === undefined)
+			{
+				this.data = null;
+				return;
+			}
+			return this.$api.call(ApiLehreinheit.get(le.lehreinheit_id))
+				.then(result => {
+					this.data = result.data;
+					this.original = {...(this.original || {}), ...this.data};
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		save() {
+			if (!this.changedLength)
+				return;
+			this.$refs.form.clearValidation();
+
+			let updatedData = {
+				lehreinheit_id: this.modelValue.lehreinheit_id,
+				formData: this.changed
+			}
+			return this.$refs.form.call(ApiLehreinheit.update(updatedData))
+				.then(result => {
+					this.original = {...this.data};
+					this.changed = {};
+					this.$refs.form.setFeedback(true, result.data);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+		},
+		reload(){
+			this.updateLE(this.modelValue);
+		}
+	},
+	created() {
+		this.updateLE(this.modelValue);
+	},
+	template: `
+	<core-form ref="form" @submit.prevent="save">
+		<div class="position-sticky top-0 z-1">
+			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">{{$p.t('ui', 'speichern')}}</button>
+		</div>
+		<fieldset class="overflow-hidden">
+			<legend>{{this.$p.t('lehre', 'lehreinheit')}}</legend>
+			<template v-if="data">
+				<details-form :data="data"/>
+			</template>
+		</fieldset>	
+	</core-form>
+	<fieldset class="overflow-hidden">
+		<div class="row">
+			<div class="col-6">
+				<legend>{{this.$p.t('lehre', 'gruppen')}}</legend>
+				<gruppen-table ref="gruppen_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-table>
+			</div>
+			<div class="col-6">
+				<legend>{{this.$p.t('lehre', 'assignedPersons')}}</legend>
+				<gruppen-direkt-table ref="gruppen_direkt_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-direkt-table>
+			</div>
+		</div>
+		
+	</fieldset>`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Lektor.js b/public/js/components/LVVerwaltung/Tabs/Lektor.js
new file mode 100644
index 000000000..99e1edb9e
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Lektor.js
@@ -0,0 +1,70 @@
+import CoreForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import LektorTable from '../Lektor/Table.js'
+import LektorDaten from '../Lektor/Daten.js'
+import LektorVertrag from '../Lektor/Vertrag.js'
+export default {
+	name: "LVTabLektor",
+	components: {
+		CoreForm,
+		FormInput,
+		LektorTable,
+		LektorDaten,
+		LektorVertrag
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		},
+	},
+	data() {
+		return {
+			mitarbeiter_uid: null
+		}
+	},
+	methods: {
+		changedLektor(uid) {
+			const lektorTable = this.$refs.lektor_table;
+			const tabulator = lektorTable.$refs.table.tabulator;
+
+			const selectUID = () => {
+				let row = tabulator.getRows().find(r => r.getData().mitarbeiter_uid === uid);
+				if (row)
+				{
+					row.select();
+				}
+				tabulator.off('dataProcessed', selectUID);
+			};
+			tabulator.on('dataProcessed', selectUID);
+			lektorTable.reload();
+		},
+		changedCosts() {
+			this.$refs.lektor_vertrag?.getLektorVertrag();
+		},
+		canceledVertrag() {
+			this.$refs.lektor_daten?.getLektorData();
+		}
+	},
+	template: `
+	<fieldset class="overflow-hidden">
+		<div class="row">
+			<div class="col-5">
+				<legend>{{ $p.t('lehre', 'lektorInnen')}}</legend>
+				<lektor-table ref="lektor_table" :lehreinheit_id="modelValue.lehreinheit_id" v-model:selected="mitarbeiter_uid"></lektor-table>
+			</div>
+			<div class="col-5">
+				<lektor-daten ref="lektor_daten" :lehreinheit_id="modelValue.lehreinheit_id" :mitarbeiter_uid="mitarbeiter_uid" @changedLektor="changedLektor" @changedCosts="changedCosts"></lektor-daten>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-5">
+			</div>
+			<div class="col-5">
+				<lektor-vertrag ref="lektor_vertrag" :lehreinheit_id="modelValue.lehreinheit_id" :mitarbeiter_uid="mitarbeiter_uid" @canceledVertrag="canceledVertrag"></lektor-vertrag>
+			</div>
+		</div>
+	</fieldset>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Notiz.js b/public/js/components/LVVerwaltung/Tabs/Notiz.js
new file mode 100644
index 000000000..6bccf5c52
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Notiz.js
@@ -0,0 +1,33 @@
+import CoreNotiz from "../../Notiz/Notiz.js";
+import ApiNotizLehreinheit from '../../../api/factory/notiz/lehreinheit.js';
+export default {
+	name: "LVTabNotiz",
+	components: {
+		CoreNotiz
+	},
+	props: {
+		modelValue: Object
+	},
+	data() {
+		return {
+			endpoint: ApiNotizLehreinheit
+		};
+	},
+	template: `
+	<div class="stv-details-notizen h-100 pb-3">
+		<core-notiz
+			class="overflow-hidden"
+			:endpoint="endpoint"
+			ref="formc"
+			notiz-layout="twoColumnsFormLeft"
+			type-id="lehreinheit_id"
+			:id="modelValue.lehreinheit_id"
+			show-document
+			show-tiny-mce
+			showErweitert
+			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
+			>
+		</core-notiz>
+	</div>
+	`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 248cfd55c..cc224480f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -24,6 +24,7 @@ import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
 
 import ApiSearchbar from "../../api/factory/searchbar.js";
 import ApiStv from "../../api/factory/stv.js";
+import ApiStvVerband from '../../api/factory/stv/verband.js';
 
 
 export default {
@@ -70,6 +71,7 @@ export default {
 	},
 	data() {
 		return {
+			endpoint: ApiStvVerband,
 			selected: [],
 			searchbaroptions: {
 				cssclass: "position-relative",
@@ -220,7 +222,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%" :endpoint="endpoint"></stv-verband>
 					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ae2b6b40..c60242511 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -5,8 +5,6 @@ import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tr
 import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
 import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
 
-import ApiStvVerband from '../../../api/factory/stv/verband.js';
-
 export default {
 	components: {
 		PvTree,
@@ -16,11 +14,22 @@ export default {
 	emits: [
 		'selectVerband'
 	],
+	props: {
+		endpoint: {
+			type: Object,
+			required: true,
+		},
+		preselectedKey: {
+			type: String,
+			default: null
+		}
+	},
 	data() {
 		return {
 			loading: true,
 			nodes: [],
 			selectedKey: [],
+			expandedKeys: {},
 			filters: {}, // TODO(chris): filter only 1st level?
 			favnodes: [],
 			favorites: {on: false, list: []}
@@ -44,7 +53,7 @@ export default {
 				return res.pop();
 			return null;
 		},
-		onExpandTreeNode(node) {
+		async onExpandTreeNode(node) {
 			if (!node.children) {
 				if (node.data.link) {
 					let activeEl = null;
@@ -55,8 +64,8 @@ export default {
 					});
 					this.loading = true;
 					
-					this.$api
-						.call(ApiStvVerband.get(node.data.link))
+					return this.$api
+						.call(this.endpoint.get(node.data.link))
 						.then(result => result.data)
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
@@ -68,7 +77,7 @@ export default {
 
 							let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
 							treeitem = treeitem.closest('[role="row"]');
-							
+
 							this.$nextTick(() => {
 								if (activeEl == document.activeElement)
 									treeitem.dispatchEvent(new KeyboardEvent('keydown', {
@@ -108,7 +117,7 @@ export default {
 			}
 			this.favorites.on = !this.favorites.on;
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 			this.loading = false;
@@ -135,7 +144,7 @@ export default {
 			for (let parent in sortedInParents)
 				promises.push(
 					this.$api
-						.call(ApiStvVerband.get(parent == '_' ? '' : parent))
+						.call(this.endpoint.get(parent == '_' ? '' : parent))
 						.then(res => res.data)
 						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
 				);
@@ -160,9 +169,9 @@ export default {
 					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
 				this.favorites.list.push(key.data.link + '');
 			}
-			
+
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 		},
@@ -181,19 +190,54 @@ export default {
 				let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
 				items.forEach(el => el.tabIndex = 0);
 			}
+		},
+		async setPreselection()
+		{
+			if (!this.preselectedKey)
+				return;
+
+			let rawKey = this.preselectedKey
+
+			if (!rawKey || typeof rawKey !== 'string')
+				return;
+
+			const parts = this.preselectedKey.split('/');
+			let currentKey = parts[0];
+			let currentNode = this.findNodeByKey(currentKey);
+
+			if (!currentNode)
+				return;
+
+			for (let i = 1; i < parts.length; i++)
+			{
+				this.expandedKeys[currentNode.key] = true;
+
+				await this.onExpandTreeNode(currentNode);
+
+				currentKey += '-' + parts[i];
+				currentNode = this.findNodeByKey(currentKey);
+
+				if (!currentNode)
+				{
+					return;
+				}
+			}
+
+			this.selectedKey = { [currentNode.key]: true };
 		}
 	},
 	mounted() {
 		this.$api
-			.call(ApiStvVerband.get())
+			.call(this.endpoint.get())
 			.then(result => {
 				this.nodes = result.data.map(this.mapResultToTreeData);
+				this.setPreselection();
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiStvVerband.favorites.get())
+			.call(this.endpoint.favorites.get())
 			.then(result => {
 				if (result.data) {
 					let f = JSON.parse(result.data);
@@ -218,6 +262,7 @@ export default {
 			:value="filteredNodes"
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
+			v-model:expanded-keys="expandedKeys"
 			v-model:selection-keys="selectedKey"
 			@node-select="onSelectTreeNode"
 			scrollable
diff --git a/public/js/components/Tag/Tag.js b/public/js/components/Tag/Tag.js
index c7552a5a9..a3243ed47 100644
--- a/public/js/components/Tag/Tag.js
+++ b/public/js/components/Tag/Tag.js
@@ -57,7 +57,7 @@ export default {
 		init() {
 			if (!this.endpoint)
 				return;
-			this.endpoint.getTags()
+			this.$api.call(this.endpoint.getTags())
 				.then(response => response.data)
 				.then(response => {
 					this.tags = response
@@ -71,7 +71,7 @@ export default {
 				'id': tag_id
 			};
 
-			this.endpoint.getTag(getData)
+			this.$api.call(this.endpoint.getTag(getData))
 				.then(result => result.data)
 				.then(result => this.openModal(result))
 		},
@@ -118,7 +118,7 @@ export default {
 			{
 				postData.id = this.selectedTagId;
 				this.tagData.id = this.selectedTagId;
-				this.endpoint.updateTag(postData);
+				this.$api.call(this.endpoint.updateTag(postData));
 				this.$emit("updated", this.tagData);
 				this.$refs.tagModal.hide();
 			}
@@ -130,7 +130,7 @@ export default {
 						return;
 				}
 
-				this.endpoint.addTag(postData)
+				this.$api.call(this.endpoint.addTag(postData))
 					.then(response => response.data)
 					.then(response => {
 						if (typeof response === 'number') {
@@ -156,7 +156,7 @@ export default {
 				id: this.selectedTagId,
 				done: !this.tagData.done
 			}
-			this.endpoint.doneTag(postData)
+			this.$api.call(this.endpoint.doneTag(postData))
 			this.$emit("updated", this.tagData);
 			this.$refs.tagModal.hide();
 		},
@@ -165,7 +165,7 @@ export default {
 			let postData = {
 				id: this.selectedTagId
 			}
-			this.endpoint.deleteTag(postData)
+			this.$api.call(this.endpoint.deleteTag(postData))
 			this.$emit("deleted", this.selectedTagId)
 			this.$refs.tagModal.hide();
 		},
diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index e15f8d9ac..5dfcce205 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -39,7 +39,7 @@ function parseFilterExpression(expression)
 	return collections;
 }
 
-export function extendedHeaderFilter(headerValue, rowValue)
+export function extendedHeaderFilter(headerValue, rowValue, rowData, filterParams)
 {
 	if (typeof headerValue === 'boolean')
 	{
@@ -48,52 +48,79 @@ export function extendedHeaderFilter(headerValue, rowValue)
 
 	const collections = parseFilterExpression(headerValue);
 
-	try {
+	function matchValue(value)
+	{
+		try {
+			return collections.some(collection => {
 
-		return collections.some(collection => {
+				let positives = collection.positives.length === 0 || collection.positives.every(condition => {
 
-			let positives = collection.positives.length === 0 || collection.positives.every(condition => {
+					if (condition.type === 'comparison')
+					{
+						let value = parseFloat(rowValue);
+						if (isNaN(value)) return false;
 
-				if (condition.type === 'comparison')
-				{
-					let value = parseFloat(rowValue);
-					if (isNaN(value)) return false;
-
-					switch (condition.operator) {
-						case '<':
-							return value < condition.number;
-						case '>':
-							return value > condition.number;
-						case '<=':
-							return value <= condition.number;
-						case '>=':
-							return value >= condition.number;
-						case '=':
-							return value === condition.number;
-						case '!=':
-							return value !== condition.number;
-						default:
-							return false;
+						switch (condition.operator) {
+							case '<':
+								return value < condition.number;
+							case '>':
+								return value > condition.number;
+							case '<=':
+								return value <= condition.number;
+							case '>=':
+								return value >= condition.number;
+							case '=':
+								return value === condition.number;
+							case '!=':
+								return value !== condition.number;
+							default:
+								return false;
+						}
 					}
-				}
-				else if (condition.type === 'regex')
-				{
-					return condition.regex.test(rowValue);
-				}
-				return false;
+					else if (condition.type === 'regex')
+					{
+						return condition.regex.test(rowValue);
+					}
+					return false;
+				});
+
+				let negatives = collection.negatives.every(condition => {
+					return !condition.regex.test(rowValue);
+				});
+
+				return positives && negatives;
 			});
+		} catch (e) {
 
-			let negatives = collection.negatives.every(condition => {
-				return !condition.regex.test(rowValue);
-			});
-
-			return positives && negatives;
-		});
-	} catch (e) {
-
+		}
 	}
+
+	if (matchValue(rowValue))
+		return true;
+
+	if (rowData && filterParams)
+	{
+		const childrenField = filterParams?.children || '_children';
+		const field = filterParams?.field;
+
+		const children = rowData[childrenField];
+		if (Array.isArray(children))
+		{
+			for (let child of children)
+			{
+				let childValue = child[field];
+				if (extendedHeaderFilter(headerValue, childValue, child, filterParams))
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
 }
-export function tagHeaderFilter(headerValue, rowValue) {
+export function tagHeaderFilter(headerValue, rowValue, rowData, filterParams)
+{
 
 	let data;
 
@@ -120,6 +147,5 @@ export function tagHeaderFilter(headerValue, rowValue) {
 		combinedText = String(data);
 	}
 
-	return extendedHeaderFilter(headerValue, combinedText)
-}
-
+	return extendedHeaderFilter(headerValue, combinedText, rowData, filterParams)
+}
\ No newline at end of file
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 0e2b4e7c6..fbdc1f4ae 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,7 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php b/system/dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php
new file mode 100644
index 000000000..55fb55b80
--- /dev/null
+++ b/system/dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php
@@ -0,0 +1,16 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add new name type in public.tbl_variablenname
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'lv_favorites';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('lv_favorites', null);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_variablenname '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'public.tbl_variablenname: Added name "lv_favorites"<br>';
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..c158e3971 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,729 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'gewicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gewicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Weight',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'newlehreinheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuer LV-Teil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bezeichnungeng',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung Englisch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'title english',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'detailanmerkung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Info an LV-Planung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Info to LV Planning',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'unr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'UNR',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'UNR',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'las',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftragsstunden (LAS)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching hours (LAS)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehre',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'raumtyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raumtyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Room',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'lecturers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'raumtypalternativ',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raumtyp Alternativ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Room Alternative',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'startkw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Start KW',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start CW',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stundenblockung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stunden Block',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Hours Block',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'wochenrhythmus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wochenrhythmus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Weekly rhythm',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrfunktion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrfunktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'anmerkung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Info an DepL/KFL',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Info to DepL/KFL',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'planstunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Plan Stunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course-Plan Hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'leplanstunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Planstunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Plan Hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'default',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Default',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Default',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stundensatz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stundensatz',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Hourly Rate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bismelden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BIS-Melden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Report BIS',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'gesamtkosten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtkosten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Total costs',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'daten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Daten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'verplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verplant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Planned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'addLektor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LektorIn hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add lector',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'gruppen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'addGroup',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add group',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'assignPerson',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person zuordnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assign person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'assignedPersons',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Direkt zugeordnete Personen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Directly assigned persons',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'geaendert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<b>Geändert</b>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<b>Changed</b>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'vertragurfassung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdetails lt. Urfassung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract details as per original version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'vertragsdetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdetails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'semesterstunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Semesterstunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'vertragsstatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'auslvplanentfernen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stunden aus LV-Plan entfernen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Remove hours from course plan',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrfach',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrfach',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 

From bbf0d044fd29aeb241c8c75befde96196b766d8a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 08:20:33 +0200
Subject: [PATCH 0215/1357] use existing phrasename

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

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 92af856b0..813edad10 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -84,7 +84,7 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
 		$result['documents'] = [
-			'title' => $this->p->t('stv', 'tab_dokumente'),
+			'title' => $this->p->t('stv', 'tab_documents'),
 			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
 		];
 		$result['banking'] = [

From c9b555db772008bb2544d4869fa543e6a97d47e3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 08:22:22 +0200
Subject: [PATCH 0216/1357] swap div and form-input end-tag

---
 .../Stv/Studentenverwaltung/Details/Archiv/Edit.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index e819eb252..6e271b4d0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -93,15 +93,15 @@ export default {
 						v-model="data.signiert"
 					>
 					</form-input>
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="stud_selfservice"
-							:label="'Selfservice'"
-							v-model="data.stud_selfservice"
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="stud_selfservice"
+						:label="'Selfservice'"
+						v-model="data.stud_selfservice"
 					>
+					</form-input>
 				</div>
-				</form-input>
 			</fieldset>
 
 			<template #title>

From a756881a48974367df9551ee1d7b15caed2d5900 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 28 May 2025 09:14:49 +0200
Subject: [PATCH 0217/1357] refactor delete refactor validation backend add
 permission check for studiengang backend

---
 .../api/frontend/v1/stv/Mobility.php          | 137 ++++++++++++------
 public/js/api/factory/stv/mobility.js         |   7 +-
 .../Details/Mobility/Mobility.js              |  34 +++--
 system/phrasesupdate.php                      |  22 ++-
 4 files changed, 137 insertions(+), 63 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php
index 2ab0ac682..58b71f008 100644
--- a/application/controllers/api/frontend/v1/stv/Mobility.php
+++ b/application/controllers/api/frontend/v1/stv/Mobility.php
@@ -40,13 +40,54 @@ class Mobility extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('codex/Bisio_model', 'BisioModel');
+
+		//Permission checks for Studiengangsarray
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+		if ($this->router->method == 'insertMobility' || $this->router->method == 'updateMobility')
+		{
+			$student_uid = $this->input->post('uid');
+			if(!$student_uid)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteMobility') {
+			$bisio_id = $this->input->post('bisio_id');
+			if(!$bisio_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bisio ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$result = $this->BisioModel->load(
+				array('bisio_id' => $bisio_id)
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+			$student_uid = current($data)->student_uid;
+
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+	}
+
+	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 $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		}
 	}
 
 	public function getMobilitaeten($student_uid)
 	{
 		$this->BisioModel->addSelect("*");
 		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)', 'LEFT');
 		$this->BisioModel->addOrder('von', 'DESC');
 		$this->BisioModel->addOrder('bis', 'DESC');
 		$this->BisioModel->addOrder('bisio_id', 'DESC');
@@ -83,14 +124,20 @@ class Mobility extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
+		$nation_code = $formData['nation_code'] ?? null;
+		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
+		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;
+		$ects_erworben = $formData['ects_erworben'] ?? null;
+		$ects_angerechnet = $formData['ects_angerechnet'] ?? null;
+		$lehreinheit_id = $formData['lehreinheit_id'] ?? null;
+		$ort = $formData['ort'] ?? null;
+		$universitaet = $formData['universitaet'] ?? null;
+		$localPurposes = $formData['localPurposes'] ?? null;
+		$localSupports = $formData['localSupports'] ?? null;
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
@@ -126,23 +173,18 @@ class Mobility extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
-		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
-		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
-		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
-
 		$result = $this->BisioModel->insert([
 			'student_uid' => $student_uid,
-			'von' => $_POST['von'],
-			'bis' => $_POST['bis'],
-			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-			'nation_code' => $_POST['nation_code'],
-			'herkunftsland_code' => $_POST['herkunftsland_code'],
-			'lehreinheit_id' => $_POST['lehreinheit_id'],
+			'von' => $von,
+			'bis' => $bis,
+			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+			'nation_code' => $nation_code,
+			'herkunftsland_code' => $herkunftsland_code,
+			'lehreinheit_id' => $lehreinheit_id,
 			'ort' => $ort,
 			'universitaet' => $universitaet,
-			'ects_erworben' => $_POST['ects_erworben'] ,
-			'ects_angerechnet' => $_POST['ects_angerechnet'],
+			'ects_erworben' => $ects_erworben ,
+			'ects_angerechnet' => $ects_angerechnet,
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
@@ -171,7 +213,7 @@ class Mobility extends FHCAPI_Controller
 	{
 		$this->BisioModel->addSelect("*");
 		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)', 'LEFT');
 		$result = $this->BisioModel->loadWhere(
 			array('bisio_id' => $bisio_id)
 		);
@@ -194,14 +236,18 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
+		$nation_code = $formData['nation_code'] ?? null;
+		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
+		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;
+		$ects_erworben = $formData['ects_erworben'] ?? null;
+		$ects_angerechnet = $formData['ects_angerechnet'] ?? null;
+		$lehreinheit_id = $formData['lehreinheit_id'] ?? null;
+		$ort = $formData['ort'] ?? null;
+		$universitaet = $formData['universitaet'] ?? null;
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
@@ -209,6 +255,7 @@ class Mobility extends FHCAPI_Controller
 		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
 		]);
+
 		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
 		]);
@@ -243,16 +290,17 @@ class Mobility extends FHCAPI_Controller
 			],
 			[
 				'student_uid' => $student_uid,
-				'von' => $_POST['von'],
-				'bis' => $_POST['bis'],
-				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-				'nation_code' => $_POST['nation_code'],
-				'herkunftsland_code' => $_POST['herkunftsland_code'],
-				'lehreinheit_id' => $_POST['lehreinheit_id'],
-				'ort' => $formData['ort'],
-				'universitaet' => $formData['universitaet'],
-				'ects_erworben' => $_POST['ects_erworben'] ,
-				'ects_angerechnet' => $_POST['ects_angerechnet'],
+
+				'von' => $von,
+				'bis' => $bis,
+				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+				'nation_code' => $nation_code,
+				'herkunftsland_code' => $herkunftsland_code,
+				'lehreinheit_id' => $lehreinheit_id,
+				'ort' => $ort,
+				'universitaet' => $universitaet,
+				'ects_erworben' => $ects_erworben ,
+				'ects_angerechnet' => $ects_angerechnet,
 				'updateamum' => date('c'),
 				'updatevon' => $authUID,
 			]
@@ -263,12 +311,14 @@ class Mobility extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
-	public function deleteMobility($bisio_id)
+	public function deleteMobility()
 	{
-		//check if extension table exists
+		$bisio_id = $this->input->post('bisio_id');
+
 		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
 		$data = $this->getDataOrTerminateWithError($result);
 
+
 		//if table exists check if existing entry
 		if(!empty($data))
 		{
@@ -475,7 +525,6 @@ class Mobility extends FHCAPI_Controller
 		if($local_support){
 			$aufenthaltfoerderung_code = $local_support;
 		}
-
 		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
 
 		if(!$local_support)
diff --git a/public/js/api/factory/stv/mobility.js b/public/js/api/factory/stv/mobility.js
index 262dbcf55..fc4fd17b4 100644
--- a/public/js/api/factory/stv/mobility.js
+++ b/public/js/api/factory/stv/mobility.js
@@ -51,7 +51,8 @@ export default {
 	deleteMobility(bisio_id) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/mobility/deleteMobility/' + bisio_id
+			url: 'api/frontend/v1/stv/mobility/deleteMobility/',
+			params: { bisio_id }
 		};
 	},
 	getLVList(studiengang_kz) {
@@ -100,7 +101,7 @@ export default {
 	deleteMobilityPurpose(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/' + params.bisio_id,
+			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/',
 			params
 		};
 	},
@@ -108,7 +109,7 @@ export default {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/mobility/addMobilityPurpose/' + params.bisio_id,
-			params
+			params: params
 		};
 	},
 	deleteMobilitySupport(params) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index a56987318..44f6b72fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -27,6 +27,10 @@ export default {
 		currentSemester: {
 			from: 'currentSemester',
 		},
+		hasAssistenzPermissionForStgs: {
+			from: 'hasAssistenzPermissionForStgs',
+			default: false
+		},
 	},
 	props: {
 		student: Object
@@ -160,8 +164,8 @@ export default {
 				bisio_id: null,
 				localPurposes: [],
 				localSupports: [],
-				lehrveranstaltung_id: '',
-				lehreinheit_id: ''
+				lehrveranstaltung_id: null,
+				lehreinheit_id: null
 			},
 			statusNew: true,
 			programsMobility: [],
@@ -184,6 +188,10 @@ export default {
 		lv_teile(){
 			return this.listLvsAndLes.filter(lv => lv.lehreinheit_id == this.formData.lehreinheit_id);
 		},
+		isBerechtigtForStudiengang(){
+			const currentKz = this.student.studiengang_kz.toString();
+			return this.hasAssistenzPermissionForStgs.includes(currentKz);
+		}
 	},
 	methods: {
 		actionNewMobility() {
@@ -239,7 +247,7 @@ export default {
 			this.loadItems();
 		},
 		resetLehreinheit(){
-			this.formData.lehreinheit_id = '';
+			this.formData.lehreinheit_id = null;
 		},
 		getLehreinheiten(lv_id, studiensemester_kurzbz) {
 			const data = {
@@ -264,12 +272,7 @@ export default {
 				.call(ApiStvMobility.loadMobility(bisio_id))
 				.then(result => {
 					this.formData = result.data;
-					if(this.formData.lehrveranstaltung_id === null) {
-						this.formData.lehrveranstaltung_id = '';
-					}
-					if(this.formData.lehreinheit_id === null) {
-						this.formData.lehreinheit_id = '';
-					}
+
 					if(this.formData.lehrveranstaltung_id > 0 ) {
 						this.loadItems();
 					}
@@ -291,6 +294,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					this.reload();
+					this.$refs.purposes.resetLocalData();
+					this.$refs.supports.resetLocalData();
 				});
 		},
 		deleteMobility(bisio_id) {
@@ -314,8 +319,8 @@ export default {
 			this.formData.bisio_id = null;
 			this.formData.localPurposes = [];
 			this.formData.localSupports = [];
-			this.formData.lehrveranstaltung_id = '',
-			this.formData.lehreinheit_id = '',
+			this.formData.lehrveranstaltung_id = null,
+			this.formData.lehreinheit_id = null,
 			this.statusNew = true;
 			this.listLes = [];
 		},
@@ -444,14 +449,13 @@ export default {
 				<p v-else class="fw-bold mt-3">{{$p.t('mobility', 'mobility_bearbeiten')}}</p>
 			</template>
 
-
 			<form-form v-if="!this.student.length" ref="formMobility" @submit.prevent>
 
 				<div class="row my-3">
 					<legend class="col-6">BIS</legend>
 					<legend class="col-6">Outgoing</legend>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						container-class="col-6 stv-details-mobility-von"
@@ -474,7 +478,7 @@ export default {
 						name="lehrveranstaltung_id"
 						@change="handleLVchanged"
 						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
 						<option
 							v-for="lv in listLvs"
 							:key="lv.lehrveranstaltung_id"
@@ -507,7 +511,7 @@ export default {
 						name="lehreinheit_id"
 						:disabled="listLes.length > 0 ? false : true"
 						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
 						<option
 							v-for="le in listLes"
 							:key="le.lehreinheit_id"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..4e8bde26f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,28 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_keineBerechtigungStg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie haben keine Berechtigung, für diesen Studiengang Daten zu ändern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You do not have permission to change data for this study program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From a5bb72baf6fe2337614453761f2561620ff2eb9b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 28 May 2025 12:30:38 +0200
Subject: [PATCH 0218/1357] feature(Stundenplan Moodle Events Dependency
 Injection): injects moodle components dependency to the Stundenplan

---
 .../api/frontend/v1/RendererLoader.php        | 72 +++++++++++++++
 public/css/components/calendar.css            | 75 ++++++++++++++++
 public/js/api/factory/renderers.js            | 12 +++
 public/js/apps/Dashboard/Fhc.js               | 16 +++-
 .../EventTypes/lehreinheitEvent.js            | 30 +++++++
 .../components/Cis/Stundenplan/Stundenplan.js | 89 +++++--------------
 public/js/helpers/moodleSVG.js                |  5 --
 7 files changed, 226 insertions(+), 73 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/RendererLoader.php
 create mode 100644 public/js/api/factory/renderers.js
 create mode 100644 public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
 delete mode 100644 public/js/helpers/moodleSVG.js

diff --git a/application/controllers/api/frontend/v1/RendererLoader.php b/application/controllers/api/frontend/v1/RendererLoader.php
new file mode 100644
index 000000000..dc16bb3fc
--- /dev/null
+++ b/application/controllers/api/frontend/v1/RendererLoader.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class RendererLoader extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+
+		parent::__construct([
+			'GetRenderers' => self::PERM_LOGGED,
+           
+		]);
+
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	 /**
+     * fetches Stundenplan and Moodle events together
+     * @access public
+     *
+     */
+	public function GetRenderers(){
+		$renderer_paths = [];
+		Events::trigger(
+				'loadRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+		$this->terminateWithSuccess($renderer_paths);
+	}
+
+	
+	
+
+}
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1de5e575b..202768d90 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -320,4 +320,79 @@
 .selectedEvent {
 	background-color: #00649c !important;
 	color: white;
+}
+
+
+.dayPageContainer, .weekPageContainer{
+	container-type: inline-size;
+}
+
+.dayPageContainer .lehreinheitEventContent,
+.weekPageContainer .lehreinheitEventContent {
+	display: flex;
+	flex-direction: column;
+}
+
+.dayPageContainer .moodleEventContent,
+.weekPageContainer .moodleEventContent{
+	display: flex;
+	flex-direction: row;
+}
+
+.dayPageContainer .lehreinheitEventContent{
+	flex-grow:1;
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height:1.25;
+}
+
+.dayPageContainer .lehreinheitEventHeader {
+	display: flex;
+	flex-direction: column;
+	padding: 1rem;
+	border-right: 1px solid gray;
+}
+
+.dayPageContainer .moodleEventContent {
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+	width:100%;
+}
+
+.weekPageContainer .moodleEventContent {
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+	width: 100%;
+}
+
+.weekPageContainer .lehreinheitEventHeader {
+	display: flex;
+	flex-direction: column;
+	padding: 1rem;
+	border-right: 1px solid gray;
+}
+
+.weekPageContainer .lehreinheitEventContent {
+	flex-grow: 1;
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+}
+
+
+@container( min-width: 500px){
+	.dayPageContainer .lehreinheitEventContent,
+	.weekPageContainer .lehreinheitEventContent {
+		flex-direction: row;
+	}
+
+	.dayPageContainer .lehreinheitEventContent{
+		justify-content: space-evenly;
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/factory/renderers.js b/public/js/api/factory/renderers.js
new file mode 100644
index 000000000..fee81e4df
--- /dev/null
+++ b/public/js/api/factory/renderers.js
@@ -0,0 +1,12 @@
+
+export default {
+		
+	loadRenderers() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/RendererLoader/GetRenderers',
+			params: {
+			}
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index fc25fbdfe..cdd69362c 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -15,6 +15,8 @@ import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMit
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 const router = VueRouter.createRouter({
@@ -234,7 +236,8 @@ const router = VueRouter.createRouter({
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
-		appSideMenuEntries: {}
+		appSideMenuEntries: {},
+		renderers: {},
 	}),
 	components: {},
 	computed: {
@@ -244,7 +247,8 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return { // provide injectable & watchable language property
-			language: Vue.computed(() => this.$p.user_language)
+			language: Vue.computed(() => this.$p.user_language),
+			renderers: Vue.computed(() => this.renderers),
 		}	
 	},
 	methods: {
@@ -282,6 +286,14 @@ const app = Vue.createApp({
 			}
 		}
 	},
+	async created(){
+		await this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => res.data)
+			.then(data => {
+				this.renderers = data;
+			});
+	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);
 	},
diff --git a/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js b/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
new file mode 100644
index 000000000..088fb42f9
--- /dev/null
+++ b/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
@@ -0,0 +1,30 @@
+export default {
+	methods:{
+		convertTime: function ([hour, minute]) {
+			let date = new Date();
+			date.setHours(hour);
+			date.setMinutes(minute);
+			// returns date string as hh:mm
+			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
+
+		},
+	},
+	props:{
+		event: {
+			type:Object,
+			required:true,
+		},
+	},
+	template: `
+	<div class="lehreinheitEventHeader" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+		<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+		<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	</div>
+	<div class="lehreinheitEventContent">
+		<span>{{event.topic}}</span>
+		<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+		<span>{{event.ort_kurzbz}}</span>
+	</div>
+	
+	`,
+}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index efb8c06ea..5b42d54f8 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -3,11 +3,12 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
-import moodleSvg from "../../../helpers/moodleSVG.js"
+import lehreinheitEvent from "./EventTypes/lehreinheitEvent.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
+
 export const DEFAULT_MODE_STUNDENPLAN = 'Week'
 
 const Stundenplan = {
@@ -46,6 +47,7 @@ const Stundenplan = {
 			eventMaxHeight: this.eventMaxHeight
 		}	
 	},
+	inject:["renderers"],
 	watch: {
 		weekFirstDay: {
 			handler: async function (newValue) {
@@ -69,7 +71,7 @@ const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo, moodleSvg
+		FhcCalendar, LvModal, LvMenu, LvInfo, lehreinheitEvent, 
 	},
 	computed:{
 		downloadLinks: function(){
@@ -105,17 +107,16 @@ const Stundenplan = {
 		},
 	},
 	methods:{
+		renderComponent(name){
+			switch(name){
+				case 'lehreinheitEvent': return lehreinheitEvent;
+				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
+			}
+		},
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
-		convertTime: function([hour,minute]){
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12:false}); 
-
-		},
+		
 		setSelectedEvent: function (event) {
 			this.currentlySelectedEvent = event;
 		},
@@ -248,6 +249,7 @@ const Stundenplan = {
 			.then(data => {
 				this.uid = data.uid;
 			});
+		
 		// this.loadEvents();
 	},
 	beforeUnmount() {
@@ -285,68 +287,23 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
-				<div class="d-flex small w-100" >
-					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-				</div>
-			</div>
-			<div v-else @click="showModal(event)" class="p-1">
-				<span>{{event.topic}}</span>
+			<div @click="showModal(event)" class="p-1">
+				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event)" type="button"
-			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
-			:class="{'p-1':event.allDayEvent}"
-			style="overflow: auto;">
-				<div v-if="!event.allDayEvent && event?.beginn && event?.ende" class="d-none d-xl-block" >
-					<div class="d-flex flex-column p-4 p-xl-2 border-end border-secondary">
-						<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.ende.split(":"))}}</span>
-					</div>
-				</div>
-				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-				</div>
-				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
-					<span>{{event.topic}}</span>
-					<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event.ort_kurzbz}}</span>
-				</div>
+			<div @click="showModal(event)" type = "button"
+				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+				:class="{'p-1':event.allDayEvent}"
+				style = "overflow: auto;" >
+				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
-				<template v-if="event.type=='moodle'">
-					<div class="d-flex small align-items-center w-100 p-1" >
-						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-					</div>
-				</template>
-				<template v-else>
-					<div class="row justify-content-center align-items-center">
-						<div class="col-auto" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-							<div class="d-flex flex-column p-4 border-end border-secondary">
-								<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-								<span class="small">{{convertTime(event.ende.split(":"))}}</span>
-							</div>
-						</div>
-						<div class="col">
-							<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-							<p class="m-0">{{event?.topic}}</p>
-						</div>
-						<div class="col" :style="'max-height: ' + eventMaxHeight + '; overflow: auto;'">
-							<p>{{ $p.t('lehre/lektor') }}:</p>
-							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
-						</div>
-						<div class="col">
-							<p>{{ $p.t('profil/Ort') }}: </p>
-							<p class="m-0">{{event?.ort_kurzbz}}</p>
-						</div>
-					</div>
-				</template>
+			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
+				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
+					<component :is="renderComponent(event.type+'Event')" :event="event"></component>
+				</div>
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
diff --git a/public/js/helpers/moodleSVG.js b/public/js/helpers/moodleSVG.js
deleted file mode 100644
index 679c9b1a6..000000000
--- a/public/js/helpers/moodleSVG.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	template:`
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 20 130 90" style="height:1.5em" ><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40" /><stop offset=".043" stop-color="#F9A538" /><stop offset=".112" stop-color="#F89D31" /><stop offset=".227" stop-color="#F89A2F" /><stop offset=".528" stop-color="#F7922D" /><stop offset="1" stop-color="#F37B28" /></radialGradient><path fill="white" stroke="black" stroke-width="1" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z" /><path fill="black" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951" /><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574" /><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20" /><stop offset="1" stop-color="#231F20" stop-opacity="0" /></linearGradient><path fill="none" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166" /><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M83.812 22.246L51.667 45.545" /><path opacity=".23" fill="black" d="M45.545 34.66c.34 3.744-.511-3.572 0 0" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M2.178 47.08l49.489-1.535" /><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none" /><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596" /><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z" /></svg> 
-	`
-}

From cfa391677e6c27bfc12425a0cb549b9fd0eaa940 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 13:22:27 +0200
Subject: [PATCH 0219/1357] remove duplicate tabulatorEvents in computed

---
 .../Details/Anrechnungen/Anrechnungen.js           |  3 ++-
 .../Details/Dokumente/List/Accepted.js             | 13 -------------
 .../Details/Dokumente/List/Unaccepted.js           | 14 --------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 1d6bd20df..23e3819ff 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -299,7 +299,7 @@ export default {
 
 	},
 	template: `
-					<div class="stv-details-tab_exemptions h-100 pb-3">
+				<div class="stv-details-tab_exemptions h-100 pb-3">
 					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
 					
 					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
@@ -438,5 +438,6 @@ export default {
 						</template>
 								
 					</bs-modal>
+				</div>
 	`
 }
\ No newline at end of file
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 7790e12f8..60456225d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -203,19 +203,6 @@ export default {
 			]
 		}
 	},
-	computed: {
-		tabulatorEvents() {
-			const events = [
-				{
-					event: "rowDblClick",
-					handler: (e, row) => {
-						this.actionDownloadFile(row.getData().akte_id);
-					}
-				}
-			];
-			return events;
-		}
-	},
 	methods: {
 		actionDownloadFile(akte_id){
 			window.open(
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 6cc25cb6f..68f2b2100 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -211,20 +211,6 @@ export default {
 			]
 		}
 	},
-	computed: {
-		tabulatorEvents() {
-			const events = [
-				{
-					event: "rowDblClick",
-					handler: (e, row) => {
-						this.actionDownloadFile(row.getData().akte_id);
-					}
-				}
-			];
-
-			return events;
-			}
-	},
 	methods: {
 		actionDownloadFile(akte_id){
 			window.open(

From 4d3d06e1d6a791dd4dba7f1753e6bc52b00735b5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 16:36:56 +0200
Subject: [PATCH 0220/1357] add function to output a file

---
 application/core/FHCAPI_Controller.php | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index c1e57a0f2..e1323f80d 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -223,6 +223,39 @@ class FHCAPI_Controller extends Auth_Controller
 		return $result->retval;
 	}
 
+	protected function terminateWithFileOutput($contenttype, $content, $filename=null)
+	{
+		$this->clearOutputBuffering();
+		$this->output->set_status_header(200)
+			->set_content_type($contenttype)
+			->set_header('Expires: 0')
+			->set_header('Cache-Control: no-store, no-cache, must-revalidate')
+			->set_header('Pragma: public')
+			->set_header('Content-Length: ' . strlen($content));
+
+		if($filename)
+		{
+			$cleanedfilename = preg_replace('/[^a-zA-Z0-9\-_.]/', '_', $filename);
+			$this->output->set_header('Content-Disposition: attachment; filename="'
+				. $cleanedfilename . '"');
+		}
+		else
+		{
+			$this->output->set_header('Content-Disposition: inline');
+		}
+
+		$this->output->set_output($content)
+			->_display();
+		exit();
+	}
+
+	private function clearOutputBuffering()
+	{
+		while(ob_get_level() > 0)
+		{
+			ob_end_clean();
+		}
+	}
 
 	// ---------------------------------------------------------------
 	// Security

From 8bcf01d1bb9721de7c28ba484acd42ebd59fa58c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 16:38:26 +0200
Subject: [PATCH 0221/1357] alter document download to use dmslib and new
 terminateWithFileOutput funtion of FHCAPI_Controller, render download button
 as link

---
 .../api/frontend/v1/stv/Dokumente.php         | 40 ++++++++++++-------
 .../Details/Dokumente/List/Accepted.js        | 17 ++++----
 .../Details/Dokumente/List/Unaccepted.js      | 17 ++++----
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 2923f7204..eca3d02ad 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -24,6 +24,7 @@ class Dokumente extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
+		$this->load->library('DmsLib', array('who' => getAuthUID()));
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -417,26 +418,35 @@ class Dokumente extends FHCAPI_Controller
 
 
 		$result = $this->AkteModel->load($akte_id);
-
 		if (!hasData($result)) $this->terminateWithError('Akte not found');
-
 		$data = getData($result)[0];
 
-		header('Content-Description: File Transfer');
-		header('Content-Type: '. $data->mimetype);
-		header('Content-Disposition: attachment; filename="'.$data->titel.'"');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate');
-		header('Pragma: public');
-		if (isset($data->inhalt) && !empty($data->inhalt)) {
-			$decodedContent = base64_decode($data->inhalt, true);
+		$mimetype = $data->mimetype;
+		$filecontentbase64 = $data->inhalt;
+		$filename = $data->titel;
 
-			if ($decodedContent === false) {
-				die('Error: Base64-Dekodierung failed.');
-			}
-			echo $decodedContent;
+		if(intval($data->dms_id) > 0)
+		{
+			$dmsdokres = $this->dmslib->read($data->dms_id);
+			if (!hasData($dmsdokres)) $this->terminateWithError('DMS File not found');
+			$dmsdok = getData($dmsdokres)[0];
+
+			$mimetype = $dmsdok->mimetype;
+			$filecontentbase64 = $dmsdok->file_content;
+			$filename = $dmsdok->name;
 		}
-		die();
+
+		$filecontent = '';
+
+		if (!empty($filecontentbase64)) {
+			$filecontent = base64_decode($filecontentbase64, true);
+
+			if ($filecontent === false) {
+				$this->terminateWithError('Base64-Dekodierung failed.');
+			}
+		}
+
+		$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 	}
 
 	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
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 60456225d..eea3c3b48 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -101,13 +101,13 @@ export default {
 							container.className = "d-flex gap-2";
 
 							if(cell.getData().vorhanden){
-								let button = document.createElement('button');
+								let button = document.createElement('a');
 								button.className = 'btn btn-outline-secondary btn-action';
 								button.innerHTML = '<i class="fa fa-download"></i>';
 								button.title = this.$p.t('ui', 'downloadDok');
-								button.addEventListener('click', (event) =>
-									this.actionDownloadFile(cell.getData().akte_id)
-								);
+								button.href = this.actionDownloadFile(cell.getData().akte_id);
+								button.role = 'button';
+								button.target = '_blank';
 								container.append(button);
 
 								button = document.createElement('button');
@@ -205,11 +205,10 @@ export default {
 	},
 	methods: {
 		actionDownloadFile(akte_id){
-			window.open(
-				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
-				'_blank'
-			);
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
 			this.$refs.modalUpload.open(this.prestudent_id, 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 68f2b2100..3ca9bc136 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -118,13 +118,13 @@ export default {
 							container.className = "d-flex gap-2";
 
 							if(cell.getData().akte_id){
-								let button = document.createElement('button');
+								let button = document.createElement('a');
 								button.className = 'btn btn-outline-secondary btn-action';
 								button.innerHTML = '<i class="fa fa-download"></i>';
 								button.title = this.$p.t('ui', 'downloadDok');
-								button.addEventListener('click', (event) =>
-									this.actionDownloadFile(cell.getData().akte_id)
-								);
+								button.href = this.actionDownloadFile(cell.getData().akte_id);
+								button.role = 'button';
+								button.target = '_blank';
 								container.append(button);
 
 								button = document.createElement('button');
@@ -213,11 +213,10 @@ export default {
 	},
 	methods: {
 		actionDownloadFile(akte_id){
-			window.open(
-				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
-				'_blank'
-			);
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
 			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);

From 3cebbc9fbab6705c190481d9ef6976afea5d073d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 28 May 2025 17:04:07 +0200
Subject: [PATCH 0222/1357] modal optional expand to full size button - used
 for qr window; added missing phrase editEntschuldigung;

---
 public/js/components/Bootstrap/Modal.js | 26 ++++++--
 system/phrasesupdate.php                | 80 +++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 2b3223ff7..ee4495278 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -3,7 +3,8 @@
 export default {
 	name: 'BootstrapModal',
 	data: () => ({
-		modal: null
+		modal: null,
+		fullscreen: false
 	}),
 	props: {
 		backdrop: {
@@ -26,6 +27,10 @@ export default {
 		bodyClass: {
 			type: [String,Array,Object],
 			default: 'px-4 py-5'
+		},
+		allowFullscreenExpand: {
+			type: Boolean,
+			default: false
 		}
 	},
 	emits: [
@@ -50,6 +55,9 @@ export default {
 		},
 		toggle() {
 			return this.modal.toggle();
+		},
+		toggleFullscreen() {
+			this.fullscreen = !this.fullscreen
 		}
 	},
 	mounted() {
@@ -115,12 +123,20 @@ export default {
 		});
 	},
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
-		<div class="modal-dialog" :class="dialogClass">
+		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
-				<div v-if="$slots.title" class="modal-header">
+				<div v-if="$slots.title" class="modal-header d-flex align-items-center">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<slot name="popoutButton"></slot>
-					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<div class="d-flex align-items-center ms-auto">
+						<slot name="popoutButton"></slot>
+					
+						<button type="button" class="btn ms-2" v-if="allowFullscreenExpand" @click="toggleFullscreen">
+						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+						  <i v-else class="fa-solid fa-compress"></i>
+						</button>
+					
+						<button v-if="!noCloseBtn" type="button" class="btn-close ms-2" data-bs-dismiss="modal" aria-label="Close"></button>
+					  </div>
 				</div>
 				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..9a461650b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30004,6 +30004,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32420,6 +32440,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleDatumOutOfRange',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum liegt außerhalb der erlaubten Kontrollspanne!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date is outside the permitted control range!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'alertBetreuungSelected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der ausgewählte LV-Teil hat die Lehrform Betreuung! Bitte überprüfen sie die korrekte Auswahl des LV-Teils um fehlerhafte Kontrollen zu vermeiden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The selected course component is taught in a supervised format! Please check that you have selected the correct course component to avoid incorrect assessments!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 9d48b6ac5713d07307cad56162c254dec3c77fea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:29:02 +0200
Subject: [PATCH 0223/1357] use popupModal layout of notiz component

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 03376231f..d5f9174d2 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 cb1f6e2e5fa4b44389017972c93dbc4822f88842 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:29:54 +0200
Subject: [PATCH 0224/1357] allow description to be html instead of plain text

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

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cf02dccf5..45fb2eca2 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -664,7 +664,7 @@ export const CoreFilterCmpt = {
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
-					<span v-else-if="description">{{ description }}</span>
+					<span v-else-if="description" v-html="description"></span>
 					<a v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>

From 42b750e120013770c7fb300c0708493ed8f54e2d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:31:24 +0200
Subject: [PATCH 0225/1357] add selectedcount add phrases for counts label

---
 .../Stv/Studentenverwaltung/List.js           | 23 ++++++-
 system/phrasesupdate.php                      | 62 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c5e029b7a..ed81f8e91 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -154,7 +154,8 @@ export default {
 			filterKontoCount0: undefined,
 			filterKontoMissingCounter: undefined,
 			count: 0,
-			filteredcount: 0
+			filteredcount: 0,
+			selectedcount: 0
 		}
 	},
 	methods: {
@@ -165,6 +166,7 @@ export default {
 			this.$refs.new.open();
 		},
 		rowSelectionChanged(data) {
+			this.selectedcount = data.length;
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
 		},
@@ -279,6 +281,23 @@ export default {
 			}
 		}
 	},
+	computed: {
+		countsToHTML: function() {
+			return this.$p.t('global/anzahl')
+				+ ' ('
+				+ this.$p.t('global/ausgewaehlt')
+				+ ' / '
+				+ this.$p.t('global/gefiltert')
+				+ ' / '
+				+ this.$p.t('global/gesamt')
+				+ '): '
+				+ '<strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' / '
+				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
+				+ ' / '
+				+ '<strong>' + (this.count || 0) + '</strong>';
+		}
+	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
@@ -286,7 +305,7 @@ export default {
 		<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"
-				:description="$p.t('global/anzahl') + ': ' + (filteredcount || 0) + ' / ' + (count || 0)"
+				:description="countsToHTML"
 				:tabulator-options="tabulatorOptions"
 				:tabulator-events="tabulatorEvents"
 				table-only
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6ac891fb6..1c7b5432b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44130,6 +44130,68 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
+	// FHC4 STUDIERENDENVERWALTUNG ANZAHL START	 ---------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ausgewaehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ausgewählt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'selected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gefiltert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gefiltert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'filtered',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gesamt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gesamt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'total',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 STUDIERENDENVERWALTUNG ANZAHL ENDE	 ---------------------------------------------------------------
 );
 
 

From b885a8c72dd933ca7f8fe625e1306658c099dca4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:34:18 +0200
Subject: [PATCH 0226/1357] fix  getting set to null if e.g. base64 images is
 sent in request json

---
 application/core/FHCAPI_Controller.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index e1323f80d..6697953bc 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -81,8 +81,11 @@ class FHCAPI_Controller extends Auth_Controller
 		
 		// For JSON Requests (as opposed to multipart/form-data) get the $_POST variable from the input stream instead
 		if ($this->input->get_request_header('Content-Type', true) == 'application/json')
-			$_POST = json_decode($this->security->xss_clean($this->input->raw_input_stream), true);
-		elseif (isset($_POST['_jsondata'])) {
+		{
+			$_POST = json_decode($this->input->raw_input_stream, true);
+		}
+		elseif (isset($_POST['_jsondata']))
+		{
 			$_POST = array_merge($_POST, json_decode($_POST['_jsondata'], true));
 			unset($_POST['_jsondata']);
 		}

From 0da195810b481ad51e1cc3de95205d95bd640bcf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:35:48 +0200
Subject: [PATCH 0227/1357] set updateamum and updatevon, store verband,
 semester, gruppe in tbl_student if selected semester is current semester

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f24ef62bb..ce2e2df8d 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -117,6 +117,19 @@ class Student extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($student));
 	}
 
+	protected function isLaufendesSemester($selectedSemester)
+	{
+		$laufendesStudiensemester = '';
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$result = $this->StudiensemesterModel->getNearest();
+		if(hasData($result)) {
+			$laufendesStudiensemester = (getData($result))[0]->studiensemester_kurzbz;
+		}
+
+		$islaufendesSemester = $selectedSemester === $laufendesStudiensemester;
+		return $islaufendesSemester;
+	}
+
 	/**
 	 * Saves data to a prestudent
 	 *
@@ -125,8 +138,6 @@ class Student extends FHCAPI_Controller
 	 */
 	public function save($prestudent_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -134,6 +145,11 @@ class Student extends FHCAPI_Controller
 
 		$this->load->library('form_validation');
 
+		$authuid = getAuthUID();
+		$now = date('c');
+
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
 		$this->form_validation->set_rules('semester', 'Semester', 'integer');
@@ -215,6 +231,12 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
+		$this->addMeta('bhtest1', $this->isLaufendesSemester($studiensemester_kurzbz));
+		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
+		{
+			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
+			$this->addMeta('bhtest2', $array_allowed_props_student);
+		}
 		$update_student = array();
 		foreach ($array_allowed_props_student as $prop) {
 			$val = $this->input->post($prop);
@@ -240,6 +262,8 @@ class Student extends FHCAPI_Controller
 
 			if(hasData($curstudlvb) && count(getData($curstudlvb)) > 0 )
 			{
+				$update_lehrverband['updatevon'] = $authuid;
+				$update_lehrverband['updateamum'] = $now;
 				$result = $this->StudentlehrverbandModel->update([
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'student_uid' => $uid
@@ -247,6 +271,8 @@ class Student extends FHCAPI_Controller
 			}
 			else
 			{
+				$update_lehrverband['insertvon'] = $authuid;
+				$update_lehrverband['insertamum'] = $now;
 				$result = $this->StudentlehrverbandModel->insert(array_merge([
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'student_uid' => $uid,
@@ -258,6 +284,8 @@ class Student extends FHCAPI_Controller
 		}
 
 		if (count($update_person)) {
+			$update_person['updatevon'] = $authuid;
+			$update_person['updateamum'] = $now;
 			$result = $this->PersonModel->update(
 				$person_id,
 				$update_person
@@ -267,6 +295,8 @@ class Student extends FHCAPI_Controller
 
 
 		if (count($update_student)) {
+			$update_student['updatevon'] = $authuid;
+			$update_student['updateamum'] = $now;
 			$result = $this->StudentModel->update(
 				[$uid],
 				$update_student

From ba1ef83ba63fdf57fa19344050a868d6440077eb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:38:35 +0200
Subject: [PATCH 0228/1357] delete entry in tbl_studentlehrverband only if last
 prestudent status for the semester is deleted, update possibly existing entry
 in tbl_studentlehrverband when advancing prestudentstatus

---
 .../api/frontend/v1/stv/Status.php            | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8167bd90f..fcc8007cd 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -739,8 +739,12 @@ class Status extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_begin();
 
+		//Delete Studentlehrverband if no Status left in this semester
+		$cilsresult = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
+		$isLastPrestudentStatusForSemester = $this->getDataOrTerminateWithError($cilsresult);
+
 		//Delete Status
-		$result = $this->PrestudentstatusModel->delete(
+		$delpsresult = $this->PrestudentstatusModel->delete(
 			[
 				'prestudent_id' => $prestudent_id,
 				'status_kurzbz' => $status_kurzbz,
@@ -748,14 +752,9 @@ class Status extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
 			]
 		);
+		$this->getDataOrTerminateWithError($delpsresult);
 
-		$this->getDataOrTerminateWithError($result);
-
-		//Delete Studentlehrverband if no Status left in this semester
-		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
-
-		$result = $this->getDataOrTerminateWithError($result);
-		if ($result)
+		if ($isLastPrestudentStatusForSemester)
 		{
 			//get student_uid
 			$this->load->model('crm/Student_model', 'StudentModel');
@@ -1529,9 +1528,32 @@ class Status extends FHCAPI_Controller
 			$newStudentlvb['semester'] = $ausbildungssemester;
 		} // If there is no lehrverband just use the same as in the previous studiensemester
 
-
-		//add studentlehrverband
-		$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+		$checkres = $this->StudentlehrverbandModel->load(array(
+			'student_uid' => $studentlvb->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+		if(hasData($checkres)) 
+		{
+			$result = $this->StudentlehrverbandModel->update(
+				array(
+					'student_uid' => $studentlvb->student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				),
+				array(
+					'studiengang_kz' => $studentlvb->studiengang_kz,
+					'semester' => $studentlvb->semester,
+					'verband' => $studentlvb->verband,
+					'gruppe' => $studentlvb->gruppe,
+					'updateamum' => $now,
+					'updatevon' => $authUID
+				)
+			);
+		}
+		else
+		{
+			//add studentlehrverband
+			$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+		}
 
 		$this->getDataOrTerminateWithError($result);
 

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

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

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

From 8810657a619bb98842a0e7b6715265797953fb1d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 18:22:53 +0200
Subject: [PATCH 0230/1357] adapt styling message modal, message newdiv,
 counter display in studentslist

---
 .../Messages/Details/NewMessage/Modal.js      | 86 ++++++++-----------
 .../Messages/Details/NewMessage/NewDiv.js     | 78 ++++++++---------
 .../Studentenverwaltung/Details/Messages.js   | 37 --------
 .../Stv/Studentenverwaltung/List.js           | 18 ++--
 .../VorlagenDropdown/VorlagenDropdown.js      |  8 --
 5 files changed, 81 insertions(+), 146 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index d44d0faeb..85d9d2763 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -341,7 +341,8 @@ export default {
 		<bs-modal
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
-			dialog-class="modal-xl"
+			dialog-class=" modal-dialog-scrollable modal-xl"
+			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
 
@@ -350,10 +351,6 @@ export default {
 			</template>
 
 			<form-form ref="formNewMassage">
-
-				<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
-
-
 				<div class="row">
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
@@ -410,60 +407,56 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 					</div>
@@ -508,9 +501,6 @@ export default {
 					</div>
 
 				</div>
-
-			</div>
-
 			</form-form>
 
 			<template #footer>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index fbf7bd9d7..d070ff379 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -402,21 +402,19 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
@@ -424,41 +422,37 @@ export default {
 
 						<div v-if="this.fieldsPerson.length > 0" class="mt-3">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 0c46a6333..49600fe20 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -11,42 +11,6 @@ export default {
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
-	<!--TODO(Manu) Delete Testdata-->
-	
-<!--		<h3>Test Dominik Schneider</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0130"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test Person fields</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0158"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="newTab"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test no table</h3>
-		<core-messages
-			ref="form2"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="prestudent_id"
-			:id="modelValue.prestudent_id"
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
@@ -63,7 +27,6 @@ export default {
 		 <h3><strong>No valid prestudent_id!</strong></h3>
 		 <p>{{modelValue.anmerkungen}}</p>
 	</template>
-	
 
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index ed81f8e91..bdb9732fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -283,19 +283,15 @@ export default {
 	},
 	computed: {
 		countsToHTML: function() {
-			return this.$p.t('global/anzahl')
-				+ ' ('
-				+ this.$p.t('global/ausgewaehlt')
-				+ ' / '
+			return this.$p.t('global/ausgewaehlt')
+				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' | '
 				+ this.$p.t('global/gefiltert')
-				+ ' / '
-				+ this.$p.t('global/gesamt')
-				+ '): '
-				+ '<strong>' + (this.selectedcount || 0) + '</strong>'
-				+ ' / '
+				+ ': '
 				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
-				+ ' / '
-				+ '<strong>' + (this.count || 0) + '</strong>';
+				+ ' | '
+				+ this.$p.t('global/gesamt')
+				+ ': <strong>' + (this.count || 0) + '</strong>';
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index 03d8564d6..b9869270a 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -13,14 +13,6 @@ export default {
 			type: String,
 			required: true
 		},
-		modelValue: {
-			type: String,
-			required: true
-		},
-/*		oe: {
-			type: Array,
-			required: false
-		}, */
 		isAdmin: {
 			type: Boolean,
 			required: false

From c62b5872999ba37fa9bd5c577aaff51baac0b420 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 2 Jun 2025 09:23:14 +0200
Subject: [PATCH 0231/1357] refactor(moodle Event Info):adds the component for
 moodle event information to the rendered components from the moodle Event

---
 public/js/components/Cis/Mylv/LvInfo.js       | 51 -------------------
 public/js/components/Cis/Mylv/LvModal.js      |  2 +-
 .../components/Cis/Stundenplan/Stundenplan.js | 12 ++++-
 3 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index a17eb4b67..145fc1c19 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -10,13 +10,6 @@ export default {
 		}
 	},
 	computed: {
-		LV_TYPES: function () {
-			return {
-				lehreinheit: "lehreinheit",
-				reservierung: "reservierung",
-				moodle: "moodle",
-			};
-		},
 		lektorenLinks: function () {
 			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
 
@@ -56,49 +49,6 @@ export default {
 	},
 	template:/*html*/`
 		<table class="table table-hover mb-4">
-			<template v-if="event.type == LV_TYPES.moodle">
-				<tbody>
-					<tr>
-						<th>{{
-							$p.t('global','datum')?
-							$p.t('global','datum')+':'
-							:''
-						}}</th>
-						<td>{{methodFormatDate(event.datum)}}</td>
-					</tr>
-					<tr>
-						<th>{{$p.t('global','aktivitaet')}}:</th>
-						<td v-html="event?.assignment"></td>
-					</tr>
-					<tr>
-						<th>{{$p.t('global','typ')}}:</th>
-						<td><img v-if="event?.activityIcon" class="me-1" :src="event?.activityIcon" />{{event?.purpose}}</td>
-					</tr>
-					<tr>
-						<th>{{$p.t('fristenmanagement','frist')}}:</th>
-						<td>{{start_time}}</td>
-					</tr>
-					<tr v-if="event?.actionname">
-						<th>{{$p.t('lvinfo','actionname')}}:</th>
-						<td>
-							{{event?.actionname}}
-						</td>
-					</tr>
-					<tr v-if="event?.overdue">
-						<th>{{$p.t('lvinfo','overdue')}}:</th>
-						<td>
-							{{$p.t('lvinfo','overdueEvent')}}
-						</td>
-					</tr>
-					<tr >
-				    	<th>{{$p.t('lvinfo','moodleLink')}}</th>
-						<td>
-							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
-						</td>
-					</tr>
-				</tbody>
-			</template>
-			<template v-else>
 				<tbody>
 					<tr>
 						<th>{{
@@ -157,7 +107,6 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-			</template>
 		</table>
 	`
 }
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 19c444a21..6509e4dfc 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -89,7 +89,7 @@ export default {
 					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
 				</template>
 			</h3>
-			<lv-info :event="event"></lv-info>
+			<slot name="info"></slot>
 			<template v-if="showMenu && this.menu">
 				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 				<lv-menu :menu="menu"></lv-menu>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 5b42d54f8..76bd788cd 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -113,6 +113,12 @@ const Stundenplan = {
 				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
 			}
 		},
+		renderComponentInfo(name) {
+			switch (name) {
+				case 'moodleEvent': return !this.renderers? null: Vue.defineAsyncComponent(() => import(this.renderers[name]));
+				default: return LvInfo;
+			}
+		},
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
@@ -262,7 +268,11 @@ const Stundenplan = {
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
 	</h2>
 	<hr>
-	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
+	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
+		<template #info>
+			<component :is="renderComponentInfo(currentlySelectedEvent.type+'Event')" :event="currentlySelectedEvent" ></component>
+		</template>
+	</lv-modal>
 	<fhc-calendar
 		ref="calendar"
 		@selectedEvent="setSelectedEvent"

From f233b33093459af20ca5b9f19f342765fe5b8f53 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Jun 2025 10:29:14 +0200
Subject: [PATCH 0232/1357] add information to header

---
 .../Stv/Studentenverwaltung/Details.js        | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 483b6ca7d..a56c59e7f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -63,11 +63,53 @@ export default {
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
 			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
 				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
+	
+
+					
 				<div v-if="students.length == 1">
-					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
+					<h2 class="h4">
+						{{students[0].titelpre}}
+						{{students[0].vorname}}
+						{{students[0].nachname}}
+						{{students[0].titelpost}}
+					</h2>
+					<h5 class="h6">
+						<strong class="text-muted">Studiengang </strong>
+						 {{students[0].studiengang}}
+						<strong v-if="students[0].semester" class="text-muted"> | Semester </strong>
+						  {{students[0].semester}}
+						<strong v-if="students[0].verband" class="text-muted"> | Verband </strong>
+						{{students[0].verband}}
+						<strong v-if="students[0].gruppe" class="text-muted"> | Gruppe </strong>
+						{{students[0].gruppe}}
+					  </h5>
+					  <h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+students[0]?.mail_intern">{{students[0].mail_intern}}</a>
+						</span>
+						<strong class="text-muted"> | Status </strong>
+						 {{students[0].status}}
+						<strong class="text-muted"> | MatrNr </strong>
+						  {{students[0].matr_nr}}
+						<strong class="text-muted"> | UID </strong>
+						{{students[0].uid}}
+						<strong class="text-muted"> | Person ID </strong>
+						{{students[0].person_id}}
+					  </h5>
+
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs
+				v-if="students.length == 1"
+				ref="tabs"
+				:modelValue="students[0]"
+				:config="config"
+				:default="$route.params.tab"
+				style="flex: 1 1 0%; height: 0%"
+				@changed="reload"
+				>
+				</fhc-tabs>
 			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 		<div v-else>

From 96fcff3adef93e6c82f30b2e24049b171e610bc3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Jun 2025 13:47:49 +0200
Subject: [PATCH 0233/1357] add Event mobility_delete

---
 .../api/frontend/v1/stv/Mobility.php          | 26 +++----------------
 application/models/codex/Bisio_model.php      | 23 ----------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php
index 58b71f008..f61816086 100644
--- a/application/controllers/api/frontend/v1/stv/Mobility.php
+++ b/application/controllers/api/frontend/v1/stv/Mobility.php
@@ -3,6 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
+use CI3_Events as Events;
 
 class Mobility extends FHCAPI_Controller
 {
@@ -315,28 +316,8 @@ class Mobility extends FHCAPI_Controller
 	{
 		$bisio_id = $this->input->post('bisio_id');
 
-		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
-		$data = $this->getDataOrTerminateWithError($result);
-
-
-		//if table exists check if existing entry
-		if(!empty($data))
-		{
-			$this->BisioModel->addSelect("count(*)");
-			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.bisio_id = bis.tbl_bisio.bisio_id)', 'LEFT');
-
-			$resultCheckMo = $this->BisioModel->loadWhere(
-				array('mo.bisio_id' => $bisio_id)
-			);
-
-			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
-			$count = current($resultCheckMo)->count;
-
-			$existsInExtension = $count > 0 ? true : false;
-
-			if($existsInExtension)
-				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
-		}
+		//check if entry in MobilityOnline extension exists
+		Events::trigger('mobility_delete', $bisio_id);
 
 		$result = $this->BisioModel->delete(
 			array('bisio_id' => $bisio_id)
@@ -344,6 +325,7 @@ class Mobility extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
+
 	}
 
 	public function getLVList($studiengang_kz)
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
index 5ecd4bb51..1cff1dc54 100644
--- a/application/models/codex/Bisio_model.php
+++ b/application/models/codex/Bisio_model.php
@@ -44,27 +44,4 @@ class Bisio_model extends DB_Model
 		else
 			return success("Bisio not found");
 	}
-
-	/**
-	 * checks, if an (extension) table exists to avoid later errors
-	 * @param String $schema like 'extension'
-	 * @param String $table like 'tbl_mo_bisiozuordnung'
-	 * @return boolean
-	 */
-	public function tableExists($schema, $table)
-	{
-		$params = array($schema, $table);
-
-		$qry = "SELECT
-				  1
-				FROM
-				  information_schema.role_table_grants
-				WHERE
-				    table_schema = ?
-				AND table_name = ?";
-
-		$result =  $this->execQuery($qry, $params);
-
-		return $result;
-	}
 }

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

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

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

From 3ff0f55cc099c98b33534c75bd2b7ff04e7ce8f4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Jun 2025 08:05:38 +0200
Subject: [PATCH 0235/1357] tune layout of new message modal

---
 public/css/Fhc.css                            |  7 +++
 .../Messages/Details/NewMessage/Modal.js      | 57 +++++++++++++------
 .../VorlagenDropdown/VorlagenDropdown.js      |  4 +-
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 376206f6e..5e810da66 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -98,3 +98,10 @@
   padding-right: .375rem;
   background-image: none;
 }
+
+.modal-msg {
+	max-width: 1378px;
+}
+.modal-msg .modal-content {
+	height: 95vh;
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 85d9d2763..ab56f4a38 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -341,7 +341,7 @@ export default {
 		<bs-modal
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
-			dialog-class=" modal-dialog-scrollable modal-xl"
+			dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
 			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
@@ -350,7 +350,20 @@ export default {
 				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
+			<ul class="nav nav-tabs" id="msg_preview" role="tablist">
+				<li class="nav-item" role="presentation">
+					<button class="nav-link active" id="msg-tab" data-bs-toggle="tab" data-bs-target="#msg" type="button" role="tab" aria-controls="msg" aria-selected="true">Nachricht</button>
+				</li>
+				<li class="nav-item" role="presentation">
+					<button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false">Vorschau</button>
+				</li>
+			</ul>
+
 			<form-form ref="formNewMassage">
+
+			<div class="tab-content" id="msg_preview_content">
+				<div class="tab-pane fade show active" id="msg" role="tabpanel" aria-labelledby="msg-tab">
+
 				<div class="row">
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
@@ -385,34 +398,35 @@ export default {
 									type="textarea"
 									v-model="formData.body"
 									name="body"
-									rows="15"
+									rows="35"
 									cols="75"
 									>
 								</form-input>
 							</div>
 
-							<div class="row">
-								<dropdown-component
-									ref="dropdownComp"
-									:label="$p.t('global/vorlage')"
-									@change="handleSelectedVorlage"
-									useLoggedInUserOe
-								>
-								</dropdown-component>
-							</div>
-
 						</form-form>
 					</div>
 
 					<div class="col-sm-4">
+
+						<div class="row">
+							<dropdown-component
+								ref="dropdownComp"
+								:label="$p.t('global/vorlage')"
+								@change="handleSelectedVorlage"
+								useLoggedInUserOe
+							>
+							</dropdown-component>
+						</div>
+
 						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
+							<div class="mt-2"><strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong></div>
 
 							<list-box
 								v-model="selectedFieldPrestudent"
 								:options="itemsPrestudent"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 							  <template #option="slotProps">
 								<div @dblclick="insertVariable(slotProps.option)">
@@ -424,13 +438,13 @@ export default {
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
-							<strong>Felder Person</strong>
+							<div class="mt-2"><strong>Felder Person</strong></div>
 
 							<list-box
 								v-model="selectedFieldPerson"
 								:options="itemsPerson"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 								<template #option="slotProps">
 									<div @dblclick="insertVariable(slotProps.option)">
@@ -442,13 +456,13 @@ export default {
 						</div>
 
 						<div>
-							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
+							<div class="mt-2"><strong>{{$p.t('messages', 'meineFelder')}}</strong></div>
 
 							<list-box
 								v-model="selectedFieldUser"
 								:options="itemsUser"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 								<template #option="slotProps">
 									<div @dblclick="insertVariable(slotProps.option)">
@@ -463,6 +477,9 @@ export default {
 
 				</div>
 
+				</div>
+				<div class="tab-pane fade" id="preview" role="tabpanel" aria-labelledby="preview-tab">
+
 				<div class="row mt-4">
 
 					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
@@ -501,6 +518,10 @@ export default {
 					</div>
 
 				</div>
+
+				</div>
+			</div>
+
 			</form-form>
 
 			<template #footer>
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index b9869270a..0071d4a1d 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -57,7 +57,7 @@ export default {
 	},
 template: `
 	<div class="core-vorlagen-dropdown">
-		<div v-if="isAdmin" class="col-sm-8 pt-3">
+		<div v-if="isAdmin" class="col-sm-12 pt-2">
 			<form-input
 				ref="dropdown"
 				type="select"
@@ -75,7 +75,7 @@ template: `
 			</form-input>
 		</div>
 		
-		<div v-if="useLoggedInUserOe" class="col-sm-8 pt-3">
+		<div v-if="useLoggedInUserOe" class="col-sm-12 pt-2">
 			<form-input
 				ref="dropdown"
 				type="select"

From 3e3fa9c1eb286a960df67ce613e3ee82a02d0e12 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 3 Jun 2025 08:57:28 +0200
Subject: [PATCH 0236/1357] svnr aus dem fas entfernt

---
 .../api/frontend/v1/stv/Student.php           |  1 -
 .../api/frontend/v1/stv/Students.php          |  1 -
 cis/infoterminal/index.php                    |  1 -
 content/dokumentenakt.pdf.php                 |  3 -
 .../statistik/studentenexportextended.xls.php |  9 +--
 content/student/studentDBDML.php              |  2 -
 content/student/studentdetailoverlay.xul.php  |  3 +-
 content/student/studentenoverlay.xul.php      |  5 --
 content/student/studentoverlay.js.php         |  6 --
 include/prestudent.class.php                  |  1 -
 include/student.class.php                     |  4 +-
 .../Studentenverwaltung/Details/Details.js    | 10 ---
 .../Stv/Studentenverwaltung/List.js           |  1 -
 public/js/infocenter/stammdaten.js            |  1 -
 rdf/ausbildungsvertrag.xml.php                |  6 --
 rdf/student.rdf.php                           |  9 +--
 rdf/studienblatt.xml.php                      |  4 -
 .../personen/import/interessentenimport.php   |  3 +-
 vilesci/personen/personen_details.php         | 33 +++++++--
 vilesci/personen/preinteressent_anlegen.php   | 73 +++++++------------
 vilesci/personen/preinteressent_detail.php    |  3 -
 vilesci/statistik/oehwaehlerverzeichnis.php   |  1 -
 vilesci/statistik/studierendenliste_oeh.php   |  1 -
 23 files changed, 59 insertions(+), 122 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f24ef62bb..817d5adbc 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -186,7 +186,6 @@ class Student extends FHCAPI_Controller
 			'gebdatum',
 			'gebort',
 			'geburtsnation',
-			'svnr',
 			'ersatzkennzeichen',
 			'staatsbuergerschaft',
 			'matr_nr',
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 5fb7b592c..c843eddd2 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -618,7 +618,6 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('wahlname');
 		$this->PrestudentModel->addSelect('vornamen');
 		$this->PrestudentModel->addSelect('titelpost');
-		$this->PrestudentModel->addSelect('svnr');
 		$this->PrestudentModel->addSelect('ersatzkennzeichen');
 		$this->PrestudentModel->addSelect('gebdatum');
 		$this->PrestudentModel->addSelect('geschlecht');
diff --git a/cis/infoterminal/index.php b/cis/infoterminal/index.php
index 1b4c7d637..04c591ee1 100644
--- a/cis/infoterminal/index.php
+++ b/cis/infoterminal/index.php
@@ -843,7 +843,6 @@ function meine_uid_informationen_detail($db,$uid,$count=0)
 
 		$aktiv=$db->db_result($erg,0,"aktiv");
 
-		$svnr=$db->db_result($erg,0,"svnr");
 
 		$titelpre=$db->db_result($erg,0,"titelpre");
 		$titelpost=$db->db_result($erg,0,"titelpost");
diff --git a/content/dokumentenakt.pdf.php b/content/dokumentenakt.pdf.php
index a27b8d562..a737ee72d 100644
--- a/content/dokumentenakt.pdf.php
+++ b/content/dokumentenakt.pdf.php
@@ -307,8 +307,6 @@ foreach($prestudent_ids as $pid)
 		$nation->load($prestudent->zgvnation);
 		$zgvnation = $nation->kurztext;
 
-		$svnr = ($prestudent->svnr == '')?($prestudent->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$prestudent->ersatzkennzeichen:''):$prestudent->svnr;
-
 		foreach($adresse->result as $row_adresse)
 		{
 			if($row_adresse->heimatadresse)
@@ -439,7 +437,6 @@ foreach($prestudent_ids as $pid)
 				'zustell_ort' => $zustellOrt,
 				'zustell_bundesland' => $zustellBundesland,
 				'geburtsnation' => $geburtsnation,
-				'svnr' => $svnr,
 				'staatsbuergerschaft' => $staatsbuergerschaft,
 				'geschlecht' => $prestudent->geschlecht,
 				'telefonnummer' => $telefonnummer,
diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php
index 89acbe18f..5ab34d026 100644
--- a/content/statistik/studentenexportextended.xls.php
+++ b/content/statistik/studentenexportextended.xls.php
@@ -125,8 +125,6 @@ $worksheet->write($zeile, ++$i, "PERSONENKENNZEICHEN", $format_bold);
 $maxlength[$i] = 19;
 $worksheet->write($zeile, ++$i, "STAATSBÜRGERSCHAFT", $format_bold);
 $maxlength[$i] = 16;
-$worksheet->write($zeile, ++$i, "SVNR", $format_bold);
-$maxlength[$i] = 4;
 $worksheet->write($zeile, ++$i, "PERSON_ID", $format_bold);
 $maxlength[$i] = 6;
 $worksheet->write($zeile, ++$i, "ERSATZKENNZEICHEN", $format_bold);
@@ -396,12 +394,7 @@ function draw_content($row)
 	$worksheet->write($zeile, $i, $row->staatsbuergerschaft);
 	$i++;
 
-	//SVNR
-	if (mb_strlen($row->svnr) > $maxlength[$i])
-		$maxlength[$i] = mb_strlen($row->svnr);
-	$worksheet->write($zeile, $i, $row->svnr);
-	$i++;
-	
+
 	//Person_id
 	if (mb_strlen($row->person_id) > $maxlength[$i])
 		$maxlength[$i] = mb_strlen($row->person_id);
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index e1bcffd84..041af9c20 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -594,7 +594,6 @@ if(!$error)
 				$student->anmerkungen = $_POST['anmerkung'];
 				$student->homepage = $_POST['homepage'];
 				$student->matr_nr = $_POST['matr_nr'];
-				$student->svnr = $_POST['svnr'];
 				$student->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 				$student->familienstand = $_POST['familienstand'];
 				$student->geschlecht = $_POST['geschlecht'];
@@ -746,7 +745,6 @@ if(!$error)
 				$person->gebzeit = $_POST['geburtszeit'];
 				$person->anmerkungen = $_POST['anmerkung'];
 				$person->homepage = $_POST['homepage'];
-				$person->svnr = $_POST['svnr'];
 				$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 				$person->familienstand = $_POST['familienstand'];
 				$person->geschlecht = $_POST['geschlecht'];
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 132667395..36740d209 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -134,8 +134,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 
 						</row>
 						<row>
-							<label value="SVNR" control="student-detail-textbox-svnr"/>
-							<hbox><textbox id="student-detail-textbox-svnr" disabled="true" maxlength="16" size="10"/></hbox>
+
 							<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
 							<hbox><textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10" size="15"/></hbox>
 							<label value="Geburtszeit" control="student-detail-textbox-geburtszeit" hidden="true"/>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 739cde39c..809055c2e 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -284,10 +284,6 @@ else
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#titelpost" onclick="StudentTreeSort()"/>
 	    				<splitter class="tree-splitter"/>
-	    				<treecol id="student-treecol-svnr" label="SVNR" flex="1" hidden="false" persist="hidden, width, ordinal"
-	    					class="sortDirectionIndicator"
-	    					sort="rdf:http://www.technikum-wien.at/student/rdf#svnr" onclick="StudentTreeSort()"/>
-	    				<splitter class="tree-splitter"/>
 	    				<treecol id="student-treecol-ersatzkennzeichen" label="Ersatzkennzeichen" flex="1" hidden="false" persist="hidden, width, ordinal"
 	    					class="sortDirectionIndicator"
 	    					sort="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" onclick="StudentTreeSort()"/>
@@ -445,7 +441,6 @@ else
 													<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#wahlname" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#vornamen" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#titelpost" />
-	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#svnr" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#ersatzkennzeichen" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geburtsdatum" />
 	           							<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/student/rdf#aktiv" label="rdf:http://www.technikum-wien.at/student/rdf#geschlecht" />
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d2030f493..d16fb9209 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -786,7 +786,6 @@ function StudentDetailReset()
 	document.getElementById('student-detail-textbox-geburtszeit').value='';
 	document.getElementById('student-detail-textbox-anmerkung').value='';
 	document.getElementById('student-detail-textbox-homepage').value='';
-	document.getElementById('student-detail-textbox-svnr').value='';
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').value='';
 	document.getElementById('student-detail-menulist-familienstand').value='l';
 	document.getElementById('student-detail-menulist-geschlecht').value='m';
@@ -819,7 +818,6 @@ function StudentDetailDisableFields(val)
 	document.getElementById('student-detail-textbox-geburtszeit').disabled=val;
 	document.getElementById('student-detail-textbox-anmerkung').disabled=val;
 	document.getElementById('student-detail-textbox-homepage').disabled=val;
-	document.getElementById('student-detail-textbox-svnr').disabled=val;
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').disabled=val;
 	document.getElementById('student-detail-menulist-familienstand').disabled=val;
 	document.getElementById('student-detail-menulist-geschlecht').disabled=val;
@@ -860,7 +858,6 @@ function StudentDetailSave()
 	geburtszeit = document.getElementById('student-detail-textbox-geburtszeit').value;
 	anmerkung = document.getElementById('student-detail-textbox-anmerkung').value;
 	homepage = document.getElementById('student-detail-textbox-homepage').value;
-	svnr = document.getElementById('student-detail-textbox-svnr').value;
 	ersatzkennzeichen = document.getElementById('student-detail-textbox-ersatzkennzeichen').value;
 	familienstand = document.getElementById('student-detail-menulist-familienstand').value;
 	geschlecht = document.getElementById('student-detail-menulist-geschlecht').value;
@@ -919,7 +916,6 @@ function StudentDetailSave()
 	req.add('geburtszeit', geburtszeit);
 	req.add('anmerkung', anmerkung);
 	req.add('homepage', homepage);
-	req.add('svnr', svnr);
 	req.add('ersatzkennzeichen', ersatzkennzeichen);
 	req.add('familienstand', familienstand);
 	req.add('geschlecht', geschlecht);
@@ -1167,7 +1163,6 @@ function StudentAuswahl()
 	geburtszeit=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gebzeit" ));
 	anmerkung=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkungen" ));
 	homepage=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#homepage" ));
-	svnr=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#svnr" ));
 	ersatzkennzeichen=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ersatzkennzeichen" ));
 	familienstand=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#familienstand" ));
 	geschlecht=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#geschlecht" ));
@@ -1211,7 +1206,6 @@ function StudentAuswahl()
 	document.getElementById('student-detail-textbox-geburtszeit').value=geburtszeit;
 	document.getElementById('student-detail-textbox-anmerkung').value=anmerkung;
 	document.getElementById('student-detail-textbox-homepage').value=homepage;
-	document.getElementById('student-detail-textbox-svnr').value=svnr;
 	document.getElementById('student-detail-textbox-ersatzkennzeichen').value=ersatzkennzeichen;
 	document.getElementById('student-detail-menulist-familienstand').value=familienstand;
 
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 06b974b1a..7317572ba 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -1051,7 +1051,6 @@ class prestudent extends person
 				//$ps->foto = $row->foto;
 				$ps->anmerkungen = $row->anmerkungen;
 				$ps->homepage = $row->homepage;
-				$ps->svnr = $row->svnr;
 				$ps->ersatzkennzeichen = $row->ersatzkennzeichen;
 				$ps->familienstand = $row->familienstand;
 				$ps->geschlecht = $row->geschlecht;
diff --git a/include/student.class.php b/include/student.class.php
index cfea879a9..66154c3ca 100644
--- a/include/student.class.php
+++ b/include/student.class.php
@@ -294,7 +294,6 @@ class student extends benutzer
 			$l->gebort=$row->gebort;
 			$l->gebzeit=$row->gebzeit;
 			$l->familienstand = $row->familienstand;
-			$l->svnr=$row->svnr;
 			$l->foto=$row->foto;
 			$l->anmerkungen=$row->anmerkung;
 			$l->aktiv=$this->db_parse_bool($row->aktiv);
@@ -649,7 +648,7 @@ class student extends benutzer
 	{
 		$sql_query = "SELECT
 						person_id, staatsbuergerschaft, geburtsnation, sprache, anrede, titelpost, titelpre,
-						nachname, vorname, vornamen, gebdatum, gebort, gebzeit, anmerkung, homepage, svnr,
+						nachname, vorname, vornamen, gebdatum, gebort, gebzeit, anmerkung, homepage,
 						ersatzkennzeichen, familienstand, geschlecht, anzahlkinder, tbl_person.aktiv, kurzbeschreibung,
 						tbl_benutzer.aktiv as bnaktiv, tbl_student.studiengang_kz, tbl_student.semester, tbl_student.verband,
 						tbl_student.gruppe, tbl_student.prestudent_id, tbl_benutzer.uid
@@ -691,7 +690,6 @@ class student extends benutzer
 				$l->gebzeit = $row->gebzeit;
 				$l->anmerkungen = $row->anmerkung;
 				$l->homepage = $row->homepage;
-				$l->svnr = $row->svnr;
 				$l->ersatzkennzeichen = $row->ersatzkennzeichen;
 				$l->familienstand = $row->familienstand;
 				$l->geschlecht = $row->geschlecht;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index a344fc951..49c7b46a4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -284,16 +284,6 @@ export default {
 					</form-input>
 				</div>
 				<div class="row mb-3">
-					<form-input
-						v-if="!config.hiddenFields.includes('svnr')"
-						container-class="col-4 stv-details-details-svnr"
-						:label="$p.t('person', 'svnr')"
-						type="text"
-						v-model="data.svnr"
-						name="svnr"
-						maxlength="16"
- 						>
-					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('ersatzkennzeichen')"
 						container-class="col-4 stv-details-details-ersatzkennzeichen"
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c5e029b7a..d9922eaa7 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -43,7 +43,6 @@ export default {
 					{title:"Wahlname", field:"wahlname", visible:false, headerFilter: true},
 					{title:"Vornamen", field:"vornamen", visible:false, headerFilter: true},
 					{title:"TitelPost", field:"titelpost", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
-					{title:"SVNR", field:"svnr", headerFilter: true},
 					{title:"Ersatzkennzeichen", field:"ersatzkennzeichen", headerFilter: true},
 					{title:"Geburtsdatum", field:"gebdatum", formatter:dateFormatter, 
 						headerFilter: true, headerFilterFunc: function(headerValue, rowValue, rowData, filterParams) {
diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js
index c7600f677..8e34996cd 100644
--- a/public/js/infocenter/stammdaten.js
+++ b/public/js/infocenter/stammdaten.js
@@ -44,7 +44,6 @@ $(document).ready(function ()
 			"nachname" : $('#nachname_input').val(),
 			"titelpost" : $('#titelpost_input').val(),
 			"gebdatum" : $('#gebdatum_input').val(),
-			"svnr" : $('#svnr_input').val(),
 			"buergerschaft" : $('#buergerschaft').val(),
 			"geschlecht" : $('#geschlecht').val(),
 			"gebnation" : $('#gebnation').val(),
diff --git a/rdf/ausbildungsvertrag.xml.php b/rdf/ausbildungsvertrag.xml.php
index 293ee7959..56dfd95a4 100644
--- a/rdf/ausbildungsvertrag.xml.php
+++ b/rdf/ausbildungsvertrag.xml.php
@@ -123,8 +123,6 @@ foreach($uid_arr as $uid)
 		$studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung;
 		$studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch;
 
-		$svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
-
 		//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
 		if ($studiengang->studiengang_kz<0)
 		{
@@ -146,7 +144,6 @@ foreach($uid_arr as $uid)
 		echo "\t\t<gebdatum>".$gebdatum."</gebdatum>\n";
 		echo "\t\t<gebort>".$student->gebort."</gebort>\n";
 		echo "\t\t<staatsbuergerschaft>".$staatsbuergerschaft->langtext."</staatsbuergerschaft>\n";
-		echo "\t\t<svnr>".$svnr."</svnr>\n";
 		echo "\t\t<matrikelnr>".trim($student->matrikelnr)."</matrikelnr>\n";
 		echo "\t\t<studiengang>".$db->convert_html_chars($studiengang_bezeichnung)."</studiengang>\n";
 		echo "\t\t<studiengang_englisch>".$db->convert_html_chars($studiengang_bezeichnung_englisch)."</studiengang_englisch>\n";
@@ -340,8 +337,6 @@ foreach($prestudent_arr as $prest_id)
 				$studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung;
 				$studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch;
 
-				$svnr = ($person->svnr == '')?($person->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$person->ersatzkennzeichen:''):$person->svnr;
-
 				//Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen
 				if ($studiengang->studiengang_kz<0)
 				{
@@ -363,7 +358,6 @@ foreach($prestudent_arr as $prest_id)
 					echo "\t\t<gebdatum>".$gebdatum."</gebdatum>\n";
 					echo "\t\t<gebort>".$person->gebort."</gebort>\n";
 					echo "\t\t<staatsbuergerschaft>".$staatsbuergerschaft->langtext."</staatsbuergerschaft>\n";
-					echo "\t\t<svnr>".$svnr."</svnr>\n";
 					echo "\t\t<studiengang>".$db->convert_html_chars($studiengang_bezeichnung)."</studiengang>\n";
 					echo "\t\t<studiengang_englisch>".$db->convert_html_chars($studiengang_bezeichnung_englisch)."</studiengang_englisch>\n";
 					echo "\t\t<studiengang_kurzbz>".$studiengang->kurzbzlang."</studiengang_kurzbz>\n";
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 61c903bd6..439ded6ec 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -235,7 +235,6 @@ function draw_content_liste($row)
 			<STUDENT:vorname><![CDATA['.$row->vorname.']]></STUDENT:vorname>
 			<STUDENT:nachname><![CDATA['.$row->nachname.']]></STUDENT:nachname>
 			<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
-			<STUDENT:svnr>'.($row->svnr==''?'&#xA0;':'<![CDATA['.$row->svnr.']]>').'</STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen>'.($row->ersatzkennzeichen==''?'&#xA0;':'<![CDATA['.$row->ersatzkennzeichen.']]>').'</STUDENT:ersatzkennzeichen>
 			<STUDENT:geburtsdatum><![CDATA['.$datum_obj->convertISODate($row->gebdatum).']]></STUDENT:geburtsdatum>
 			<STUDENT:geburtsdatum_iso><![CDATA['.$row->gebdatum.']]></STUDENT:geburtsdatum_iso>
@@ -349,7 +348,6 @@ function draw_content($row)
 			<STUDENT:gebzeit><![CDATA['.$row->gebzeit.']]></STUDENT:gebzeit>
 			<STUDENT:anmerkungen>'.($row->anmerkungen==''?'&#xA0;':'<![CDATA['.$row->anmerkungen.']]>').'</STUDENT:anmerkungen>
 			<STUDENT:anrede><![CDATA['.$row->anrede.']]></STUDENT:anrede>
-			<STUDENT:svnr><![CDATA['.$row->svnr.']]></STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen><![CDATA['.$row->ersatzkennzeichen.']]></STUDENT:ersatzkennzeichen>
 			<STUDENT:familienstand><![CDATA['.$row->familienstand.']]></STUDENT:familienstand>
 			<STUDENT:geschlecht><![CDATA['.$row->geschlecht.']]></STUDENT:geschlecht>
@@ -470,7 +468,6 @@ function draw_empty_content()
 			<STUDENT:gebzeit><![CDATA[]]></STUDENT:gebzeit>
 			<STUDENT:anmerkungen><![CDATA[]]></STUDENT:anmerkungen>
 			<STUDENT:anrede><![CDATA[]]></STUDENT:anrede>
-			<STUDENT:svnr><![CDATA[]]></STUDENT:svnr>
 			<STUDENT:ersatzkennzeichen><![CDATA[]]></STUDENT:ersatzkennzeichen>
 			<STUDENT:familienstand><![CDATA[]]></STUDENT:familienstand>
 			<STUDENT:geschlecht><![CDATA[]]></STUDENT:geschlecht>
@@ -647,7 +644,7 @@ if($xmlformat=='rdf')
 		$sql_query="
 		SELECT
 			p.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,vorname, wahlname, vornamen, geschlecht,
-			nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
+			nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen, tbl_student.matrikelnr, p.anmerkung as anmerkungen,
 			tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
 			tbl_student.studiengang_kz, aufmerksamdurch_kurzbz, mentor, public.tbl_benutzer.aktiv AS bnaktiv,
 			(	SELECT kontakt
@@ -985,8 +982,7 @@ if($xmlformat=='rdf')
 						$qry .= "	prestudent_id = ".$db->db_add_param($searchItems_string_orig).";";
 					else
 						$qry .= "	matrikelnr = ".$db->db_add_param($searchItems_string_orig)." OR
-									matr_nr = ".$db->db_add_param($searchItems_string_orig)." OR
-									svnr = ".$db->db_add_param($searchItems_string_orig).";";
+									matr_nr = ".$db->db_add_param($searchItems_string_orig).";";
 				}
 				if($result = $db->db_query($qry))
 				{
@@ -1282,7 +1278,6 @@ else
 				<lv_studiengang_art><![CDATA['.$lv_studiengang_art.']]></lv_studiengang_art>
 				<anrede><![CDATA['.$student->anrede.']]></anrede>
 				<geschlecht><![CDATA['.$student->geschlecht.']]></geschlecht>
-				<svnr><![CDATA['.$student->svnr.']]></svnr>
 				<ersatzkennzeichen><![CDATA['.$student->ersatzkennzeichen.']]></ersatzkennzeichen>
 				<familienstand><![CDATA['.$student->familienstand.']]></familienstand>
 				<rektor><![CDATA['.$rektor.']]></rektor>
diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
index 3ee805c04..a9b78d968 100644
--- a/rdf/studienblatt.xml.php
+++ b/rdf/studienblatt.xml.php
@@ -105,9 +105,6 @@ foreach($uid_arr as $uid)
 			$staatsbuergerschaft = new nation();
 			$staatsbuergerschaft->load($student->staatsbuergerschaft);
 
-
-			$svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr;
-
 			$geschlecht_obj = new geschlecht();
 			$geschlecht_obj->load($student->geschlecht);
 
@@ -143,7 +140,6 @@ foreach($uid_arr as $uid)
 			echo "\t\t<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>\n";
 			echo "\t\t<gebort><![CDATA[".$student->gebort."]]></gebort>\n";
 			echo "\t\t<staatsbuergerschaft><![CDATA[".$staatsbuergerschaft->langtext."]]></staatsbuergerschaft>\n";
-			echo "\t\t<svnr><![CDATA[".$svnr."]]></svnr>\n";
 			echo "\t\t<matr_nr><![CDATA[".trim($student->matr_nr)."]]></matr_nr>\n";
 			echo "\t\t<matrikelnr><![CDATA[".trim($student->matrikelnr)."]]></matrikelnr>\n";
 			echo "\t\t<studiengang><![CDATA[".$studienordnung->studiengangbezeichnung."]]></studiengang>\n";
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index d1830eaeb..8734a1353 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -1167,8 +1167,7 @@ if ($where != '')
 				}
 			}
 			$status = mb_substr($status, 0, mb_strlen($status)-2);
-
-			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->wahlname</td><td>$row->vornamen</td><td>$row->gebdatum</td><td>$row->svnr</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
+			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->wahlname</td><td>$row->vornamen</td><td>$row->gebdatum</td><td>".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
 			$qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id=".$db->db_add_param($row->person_id, FHC_INTEGER);
 			if ($result_adr = $db->db_query($qry_adr))
 				while ($row_adr = $db->db_fetch_object($result_adr))
diff --git a/vilesci/personen/personen_details.php b/vilesci/personen/personen_details.php
index d1dcd8815..b274558bd 100644
--- a/vilesci/personen/personen_details.php
+++ b/vilesci/personen/personen_details.php
@@ -125,6 +125,7 @@ $verband = (isset($_POST['verband'])?$_POST['verband']:'');
 $gruppe = (isset($_POST['gruppe'])?$_POST['gruppe']:'');
 $dms_id_lichtbild = '';
 
+$is_mitarbeiter = false;
 if($uid!='')
 {
 	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid=".$db->db_add_param($uid)."
@@ -144,7 +145,17 @@ if($uid!='')
 	else
 		die('Fehler beim Ermitteln der UID');
 }
-
+else if ($person_id !='')
+{
+	$qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE person_id=".$db->db_add_param($person_id);
+	if($result = $db->db_query($qry))
+	{
+		if($row = $db->db_fetch_object($result))
+		{
+			$is_mitarbeiter = ($row->mitarbeiter=='t'?true:false);
+		}
+	}
+}
 if(isset($_POST['saveperson']))
 {
 	if(!$rechte->isBerechtigt('student/stammdaten', null, 'su') && !$rechte->isBerechtigt('mitarbeiter/stammdaten', null, 'su'))
@@ -163,7 +174,8 @@ if(isset($_POST['saveperson']))
 	$person->gebdatum = $geburtsdatum;
 	$person->gebort = $geburtsort;
 	$person->geburtsnation = $geburtsnation;
-	$person->svnr = $svnr;
+	if ($is_mitarbeiter)
+		$person->svnr = $svnr;
 	$person->ersatzkennzeichen = $ersatzkennzeichen;
 	$person->gebzeit = $geburtszeit;
 	$person->staatsbuergerschaft = $staatsbuergerschaft;
@@ -332,7 +344,8 @@ if(!$error_person_save)
 	$geburtsdatum = $person->gebdatum;
 	$geburtsort = $person->gebort;
 	$geburtsnation = $person->geburtsnation;
-	$svnr = $person->svnr;
+	if ($is_mitarbeiter)
+		$svnr = $person->svnr;
 	$ersatzkennzeichen = $person->ersatzkennzeichen;
 	$geburtszeit = $person->gebzeit;
 	$staatsbuergerschaft = $person->staatsbuergerschaft;
@@ -398,10 +411,16 @@ foreach ($nation->nation as $row_nation)
 echo "</SELECT>
 	</td>
 </tr>
-<tr>
-	<td>SVNR</td>
-	<td><input type='text' name='svnr' value='".$svnr."'/></td>
-	<td>Ersatzkennzeichen</td>
+<tr>";
+
+if ($is_mitarbeiter)
+{
+	echo "<td>SVNR</td>
+	<td><input type='text' name='svnr' value='".$svnr."'/></td>";
+}
+
+echo
+	"<td>Ersatzkennzeichen</td>
 	<td><input type='text' name='ersatzkennzeichen' value='".$ersatzkennzeichen."'/></td>
 	<td>Geburtszeit</td>
 	<td><input type='text' name='geburtszeit' value='".$geburtszeit."'/></td>
diff --git a/vilesci/personen/preinteressent_anlegen.php b/vilesci/personen/preinteressent_anlegen.php
index 3ba5865d2..cc9ecbf53 100644
--- a/vilesci/personen/preinteressent_anlegen.php
+++ b/vilesci/personen/preinteressent_anlegen.php
@@ -140,7 +140,6 @@ function disablefields(obj)
 	document.getElementById('vorname').disabled=val;
 	document.getElementById('geschlecht').disabled=val;
 	document.getElementById('geburtsdatum').disabled=val;
-	document.getElementById('svnr').disabled=val;
 	document.getElementById('ersatzkennzeichen').disabled=val;
 	//document.getElementById('adresse').disabled=val;
 	//document.getElementById('plz').disabled=val;
@@ -159,21 +158,6 @@ function disablefields(obj)
 	}
 }
 
-function GeburtsdatumEintragen()
-{
-	svnr = document.getElementById('svnr').value;
-	gebdat = document.getElementById('geburtsdatum');
-	
-	if(svnr.length==10 && gebdat.value=='')
-	{
-		var tag = svnr.substr(4,2);
-		var monat = svnr.substr(6,2);
-		var jahr = svnr.substr(8,2);
-		
-		gebdat.value='19'+jahr+'-'+monat+'-'+tag;
-	}
-}
-
 function disablefields2(val)
 {
 	document.getElementById('adresse').disabled=val;
@@ -368,7 +352,6 @@ $email = (isset($_REQUEST['email'])?$_REQUEST['email']:'');
 $telefon = (isset($_REQUEST['telefon'])?$_REQUEST['telefon']:'');
 $mobil = (isset($_REQUEST['mobil'])?$_REQUEST['mobil']:'');
 $person_id = (isset($_REQUEST['person_id'])?$_REQUEST['person_id']:'');
-$svnr = (isset($_REQUEST['svnr'])?$_REQUEST['svnr']:'');
 $ersatzkennzeichen = (isset($_REQUEST['ersatzkennzeichen'])?$_REQUEST['ersatzkennzeichen']:'');
 $ueberschreiben = (isset($_REQUEST['ueberschreiben'])?$_REQUEST['ueberschreiben']:'');
 
@@ -413,7 +396,6 @@ if(isset($_POST['save']))
 		$person->geschlecht = $geschlecht;
 		$person->gebdatum = $datum_obj->formatDatum($geburtsdatum,'Y-m-d');
 		$person->staatsbuergerschaft = $nation;
-		$person->svnr = $svnr;
 		$person->ersatzkennzeichen = $ersatzkennzeichen;
 		$person->aktiv = true;
 		$person->insertamum = date('Y-m-d H:i:s');
@@ -689,39 +671,38 @@ if($result = $db->db_query($qry))
 }
 echo '</SELECT>';
 echo '</td></tr>';
-echo '<tr><td>SVNR</td><td><input type="text" id="svnr" size="10" maxlength="10" name="svnr" value="'.$svnr.'" onblur="GeburtsdatumEintragen()" /></td></tr>';
 echo '<tr><td>Ersatzkennzeichen</td><td><input type="text" id="ersatzkennzeichen" size="10" maxlength="10" name="ersatzkennzeichen" value="'.$ersatzkennzeichen.'" /></td></tr>';
 echo '<tr><td>Geburtsdatum</td><td><input type="text" id="geburtsdatum" size="10" maxlength="10" name="geburtsdatum" value="'.$geburtsdatum.'" /> (Format dd.mm.JJJJ)</td></tr>';
 echo '<tr><td>Geburtsort</td><td><input type="text" id="gebort" size="30" maxlength="255" name="gebort" value="'.$gebort.'" /></td></tr>';
-echo '<tr><td>Geburtsnation</td><td><SELECT name="geburtsnation">';
-$qry = "SELECT nation_code, kurztext FROM bis.tbl_nation ORDER BY kurztext";
-if($result = $db->db_query($qry))
-{
-	while($row = $db->db_fetch_object($result))
-	{
-		if($row->nation_code==$geburtsnation)
-			$selected='selected';
-		else
-			$selected='';
-
-		echo "<option value='$row->nation_code' $selected>$row->kurztext</option>";
-	}
-}
-echo '</SELECT>';
+echo '<tr><td>Geburtsnation</td><td><SELECT name="geburtsnation">';
+$qry = "SELECT nation_code, kurztext FROM bis.tbl_nation ORDER BY kurztext";
+if($result = $db->db_query($qry))
+{
+	while($row = $db->db_fetch_object($result))
+	{
+		if($row->nation_code==$geburtsnation)
+			$selected='selected';
+		else
+			$selected='';
+
+		echo "<option value='$row->nation_code' $selected>$row->kurztext</option>";
+	}
+}
+echo '</SELECT>';
 echo '</td></tr>';
-echo '<tr><td>Sprache</td><td><SELECT name="sprache">';
+echo '<tr><td>Sprache</td><td><SELECT name="sprache">';
 $sprache_obj = new sprache();
 $sprache_obj->getAll();
 foreach($sprache_obj->result as $row)
-{
-	if($row->sprache==$sprache)
-		$selected='selected';
-	else
-		$selected='';
-
-	echo "<option value='$row->sprache' $selected>".$row->bezeichnung_arr['German']."</option>";
-}
-echo '</SELECT>';
+{
+	if($row->sprache==$sprache)
+		$selected='selected';
+	else
+		$selected='';
+
+	echo "<option value='$row->sprache' $selected>".$row->bezeichnung_arr['German']."</option>";
+}
+echo '</SELECT>';
 echo '</td></tr>';
 echo '<tr><td colspan="2"><fieldset><legend>Adresse</legend><table>';
 echo '<tr><td>Nation</td><td><SELECT name="adresse_nation" id="adresse_nation" onchange="loadGemeindeData()">';
@@ -884,7 +865,7 @@ if($where!='')
 		$stg_obj = new studiengang();
 		$stg_obj->getAll('typ, kurzbz', false);
 		
-		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>SVNR</th><th>Geschlecht</th><th>Adresse</th><th>Status</th><th>Details</th></tr>';
+		echo '<table><tr><th></th><th>Nachname</th><th>Vorname</th><th>GebDatum</th><th>Geschlecht</th><th>Adresse</th><th>Status</th><th>Details</th></tr>';
 		while($row = $db->db_fetch_object($result))
 		{
 			$status = '';
@@ -905,7 +886,7 @@ if($where!='')
 			}
 			$status = mb_substr($status, 0, mb_strlen($status)-2);
 			
-			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>$row->svnr</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
+			echo '<tr valign="top"><td><input type="radio" name="person_id" value="'.$row->person_id.'" onclick="disablefields(this)"></td><td>'."$row->nachname</td><td>$row->vorname</td><td>$row->gebdatum</td><td>".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."</td><td>".($row->geschlecht=='m'?'männlich':'weiblich')."</td><td>";
 			$qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id'";
 			if($result_adr = $db->db_query($qry_adr))
 				while($row_adr=$db->db_fetch_object($result_adr))
diff --git a/vilesci/personen/preinteressent_detail.php b/vilesci/personen/preinteressent_detail.php
index 5f86e7369..a49c1a0c6 100644
--- a/vilesci/personen/preinteressent_detail.php
+++ b/vilesci/personen/preinteressent_detail.php
@@ -338,7 +338,6 @@ if(isset($_POST['saveperson']))
 	$person->gebzeit = $_POST['gebzeit'];
 	$person->anmerkungen = $_POST['anmerkungen'];
 	$person->homepage = $_POST['homepage'];
-	$person->svnr = $_POST['svnr'];
 	$person->ersatzkennzeichen = $_POST['ersatzkennzeichen'];
 	$person->familienstand = $_POST['familienstand'];
 	$person->geschlecht = $_POST['geschlecht'];
@@ -606,8 +605,6 @@ if($result = $db->db_query($qry))
 }
 echo '</SELECT></td>';
 echo '</tr><tr>';
-//SVNR
-echo "<td>SVNR:</td><td><input type='text' name='svnr' ".($disabled?'disabled':'')." value='".$person->svnr."'></td>";
 //Ersatzkennzeichen
 echo "<td>Ersatzkennzeichen</td><td><input type='text' name='ersatzkennzeichen' ".($disabled?'disabled':'')." value='".$person->ersatzkennzeichen."'></td>";
 //Geschlecht
diff --git a/vilesci/statistik/oehwaehlerverzeichnis.php b/vilesci/statistik/oehwaehlerverzeichnis.php
index f7ea9447e..d94301f99 100644
--- a/vilesci/statistik/oehwaehlerverzeichnis.php
+++ b/vilesci/statistik/oehwaehlerverzeichnis.php
@@ -61,7 +61,6 @@ header( 'Content-Disposition: attachment;filename='.$filename);
 $qry="
 SELECT * FROM (
 SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
-	tbl_person.svnr,
 	tbl_person.ersatzkennzeichen,
 	tbl_person.gebdatum,
 	tbl_person.nachname,
diff --git a/vilesci/statistik/studierendenliste_oeh.php b/vilesci/statistik/studierendenliste_oeh.php
index 3480e76cd..a99cbde54 100644
--- a/vilesci/statistik/studierendenliste_oeh.php
+++ b/vilesci/statistik/studierendenliste_oeh.php
@@ -60,7 +60,6 @@ header( 'Content-Disposition: attachment;filename='.$filename);
 $qry="
 SELECT * FROM (
 SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen,
-	tbl_person.svnr,
 	tbl_person.ersatzkennzeichen,
 	tbl_person.gebdatum,
 	tbl_person.nachname,

From a2dee4d6ba8e459e368335dbfbc311ced7be06c1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Jun 2025 09:24:54 +0200
Subject: [PATCH 0237/1357] feature(FHC Core Renderer Event): adds the FHC Core
 renderer Event to the loadRenderer Event

---
 application/core/CI3_Events.php |  3 +++
 application/core/Events.php     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 application/core/Events.php

diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 37f6c3f21..e283230c9 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -49,6 +49,9 @@ require_once(APPPATH.'config/Events.php');
 
 $active_addons_array = explode(";", ACTIVE_ADDONS);
 
+// Load Events from FHC core
+require_once APPPATH.'core/Events.php';
+
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
diff --git a/application/core/Events.php b/application/core/Events.php
new file mode 100644
index 000000000..cc61cd509
--- /dev/null
+++ b/application/core/Events.php
@@ -0,0 +1,15 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+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/Stundenplan/EventTypes/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
+	);
+});
+
+

From 7e90771f89aac9bbc46ed85cf1bc332ae6b0dc33 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Jun 2025 09:30:10 +0200
Subject: [PATCH 0238/1357] refactor(Moodle Events DependencyInjection):
 changes the lazy loading for the moodle events in Stundenplan

---
 public/js/apps/Dashboard/Fhc.js               | 18 ++++++-
 public/js/components/Cis/Mylv/LvModal.js      | 22 +++-----
 .../Cis/Mylv/{LvInfo.js => modalContent.js}   | 22 ++++----
 public/js/components/Cis/Mylv/modalTitle.js   | 12 +++++
 .../{lehreinheitEvent.js => calendarEvent.js} |  0
 .../components/Cis/Stundenplan/Stundenplan.js | 54 ++++++++++++-------
 6 files changed, 80 insertions(+), 48 deletions(-)
 rename public/js/components/Cis/Mylv/{LvInfo.js => modalContent.js} (95%)
 create mode 100644 public/js/components/Cis/Mylv/modalTitle.js
 rename public/js/components/Cis/Stundenplan/EventTypes/{lehreinheitEvent.js => calendarEvent.js} (100%)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index cdd69362c..830bd2ec3 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -237,7 +237,7 @@ const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
 		appSideMenuEntries: {},
-		renderers: {},
+		renderers: null,
 	}),
 	components: {},
 	computed: {
@@ -291,7 +291,21 @@ const app = Vue.createApp({
 			.call(ApiRenderers.loadRenderers())
 			.then(res => res.data)
 			.then(data => {
-				this.renderers = data;
+				for (let rendertype of Object.keys(data)) {
+					
+					let modalTitel = Vue.defineAsyncComponent(() => import(data[rendertype].modalTitel));
+					let modalContent = Vue.defineAsyncComponent(() => import(data[rendertype].modalContent));
+					let calendarEvent = Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent));
+					if(this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitel = modalTitel;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
 			});
 	},
 	mounted() {
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 6509e4dfc..969035711 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -1,7 +1,6 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
-import LvInfo from "./LvInfo.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAddons from '../../../api/factory/addons.js';
@@ -11,7 +10,6 @@ export default {
 		BsModal,
 		Alert,
 		LvMenu,
-		LvInfo,
 	},
 	mixins: [BsModal],
 	props: {
@@ -44,6 +42,9 @@ export default {
 		};
 	},
 	methods:{
+		onHideModal: function(){
+			this.menu = null;
+		},
 		onModalShow: function()
 		{
 			// do not load the menu if the menu is not getting rendered
@@ -74,22 +75,13 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event?.type=='moodle'"><strong v-html="event.titel"></strong></template>
-			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
-			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
+			<slot name="modalTitle"></slot>
 		</template>
 		<template v-slot:default>
-			<h3>
-				<template v-if="event?.type =='moodle'">
-					{{$p.t('lvinfo','Moodleinformationen')}}
-				</template>
-				<template v-else>
-					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-				</template>
-			</h3>
-			<slot name="info"></slot>
+			<slot name="modalContent"></slot>
+			
 			<template v-if="showMenu && this.menu">
 				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 				<lv-menu :menu="menu"></lv-menu>
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/modalContent.js
similarity index 95%
rename from public/js/components/Cis/Mylv/LvInfo.js
rename to public/js/components/Cis/Mylv/modalContent.js
index 145fc1c19..c0050e9cc 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/modalContent.js
@@ -1,12 +1,11 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
 
-export default {
-	props: {
-		event: Object,
-	},
-	data() {
-		return {
 
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
 		}
 	},
 	computed: {
@@ -47,7 +46,10 @@ export default {
 			return formatDate(d);
 		},
 	},
-	template:/*html*/`
+	template: `
+		<h3>
+			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+		</h3>
 		<table class="table table-hover mb-4">
 				<tbody>
 					<tr>
@@ -107,7 +109,5 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-		</table>
-	`
-}
-
+		</table>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/modalTitle.js b/public/js/components/Cis/Mylv/modalTitle.js
new file mode 100644
index 000000000..4acb90248
--- /dev/null
+++ b/public/js/components/Cis/Mylv/modalTitle.js
@@ -0,0 +1,12 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+			<div v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js b/public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
similarity index 100%
rename from public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
rename to public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 76bd788cd..4ca8bdc13 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -1,9 +1,8 @@
 import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
-import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "./EventTypes/lehreinheitEvent.js"
+import lehreinheitEvent from "./EventTypes/calendarEvent.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
@@ -26,7 +25,8 @@ const Stundenplan = {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			renderComponents: {}
 		}
 	},
 	props: {
@@ -49,6 +49,7 @@ const Stundenplan = {
 	},
 	inject:["renderers"],
 	watch: {
+		
 		weekFirstDay: {
 			handler: async function (newValue) {
 				let data = await this.fetchStudiensemesterDetails(newValue);
@@ -71,9 +72,10 @@ const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo, lehreinheitEvent, 
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, 
 	},
 	computed:{
+		
 		downloadLinks: function(){
 			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
 			let start = new Date(this.studiensemester_start);
@@ -107,18 +109,18 @@ const Stundenplan = {
 		},
 	},
 	methods:{
-		renderComponent(name){
-			switch(name){
-				case 'lehreinheitEvent': return lehreinheitEvent;
-				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
-			}
+		// component renderers fetches from different addons
+		modalTitleComponent(type){
+			return this.renderers[type].modalTitel;
 		},
-		renderComponentInfo(name) {
-			switch (name) {
-				case 'moodleEvent': return !this.renderers? null: Vue.defineAsyncComponent(() => import(this.renderers[name]));
-				default: return LvInfo;
-			}
+		modalContentComponent(type) {
+			return this.renderers[type].modalContent;
 		},
+		calendarEventComponent(type){
+			return this.renderers[type].calendarEvent;
+		},
+		
+
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
@@ -249,6 +251,8 @@ const Stundenplan = {
 		},
 	},
 	created() {
+		
+
 		this.$api
 			.call(ApiAuthinfo.getAuthUID())
 			.then(res => res.data)
@@ -262,6 +266,7 @@ const Stundenplan = {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
 	},
 	template:/*html*/`
+	<template v-if="renderers">
 	<h2>
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
@@ -269,10 +274,18 @@ const Stundenplan = {
 	</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
-		<template #info>
-			<component :is="renderComponentInfo(currentlySelectedEvent.type+'Event')" :event="currentlySelectedEvent" ></component>
+		<template #modalTitle>
+			<Suspense>
+				<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+			</Suspense>
+			</template>
+		<template #modalContent>
+			<Suspense>
+				<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+			</Suspense>
 		</template>
 	</lv-modal>
+
 	<fhc-calendar
 		ref="calendar"
 		@selectedEvent="setSelectedEvent"
@@ -298,7 +311,7 @@ const Stundenplan = {
 		</template>
 		<template #monthPage="{event,day}">
 			<div @click="showModal(event)" class="p-1">
-				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
+				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
@@ -306,13 +319,13 @@ const Stundenplan = {
 				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
-				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
+				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
 				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
-					<component :is="renderComponent(event.type+'Event')" :event="event"></component>
+					<component :is="calendarEventComponent(event.type)" :event="event"></component>
 				</div>
 			</div>
 		</template>
@@ -329,7 +342,8 @@ const Stundenplan = {
 		<template #pageMobilContentEmpty >
 			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
 		</template>
-	</fhc-calendar>`
+	</fhc-calendar>
+	</template>`
 }
 
 export default Stundenplan
\ No newline at end of file

From 02dd466cc396dbc18978c1d2b76f9d6062baff99 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Jun 2025 09:44:03 +0200
Subject: [PATCH 0239/1357] use green and red as for marking the datepickers

---
 public/css/Fhc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index b7110943d..06dc5096e 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -145,9 +145,9 @@
 }
 
 .fhc-bullet-red::before {
-  color: #ff001e;
+  color: green;
 }
 
 .fhc-bullet-green::before {
-  color: #00ff26;
+  color: red;
 }
\ No newline at end of file

From 7da8a9ed79cb00c02ec1ef207f2ae6fd3c64808f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 3 Jun 2025 10:39:22 +0200
Subject: [PATCH 0240/1357] refactor header as component, show uid under
 profilpicture

---
 .../components/DetailHeader/DetailHeader.js   | 100 ++++++++++++++++++
 .../Stv/Studentenverwaltung/Details.js        |  48 ++-------
 2 files changed, 108 insertions(+), 40 deletions(-)
 create mode 100644 public/js/components/DetailHeader/DetailHeader.js

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
new file mode 100644
index 000000000..49cbfbad8
--- /dev/null
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -0,0 +1,100 @@
+export default {
+	name: 'DetailHeader',
+	props: {
+		headerData: {
+			type: Object,
+			required: true
+		},
+		typeHeader: {
+			type: String,
+			default: 'student',
+			validator(value) {
+				return [
+					'student',
+					'mitarbeiter',
+				].includes(value)
+			}
+		}
+	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		},
+	},
+	data(){
+		return{};
+	},
+	methods: {
+		//TODO(Manu) finish for Vertragsverwaltung
+		getVorgesetzer(){},
+	},
+	template: `
+		<div class="core-header d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
+
+			<div
+				v-for="person in headerData"
+				:key="person.person_id"
+				class="d-flex flex-column align-items-center h-100"
+			>
+				<img
+				  class="d-block h-100 rounded"
+				  :alt="'Profilbild ' + person.uid"
+				  :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person.person_id"
+				/>
+				<small>{{person.uid}}</small>
+			</div>
+
+			<div v-if="headerData.length == 1">
+				<h2 class="h4">
+					{{headerData[0].titelpre}}
+					{{headerData[0].vorname}}
+					{{headerData[0].nachname}}
+					{{headerData[0].titelpost}}
+				</h2>
+
+				<h5 v-if="typeHeader==='student'" class="h6">
+					<strong class="text-muted">Studiengang </strong>
+					 {{headerData[0].studiengang}}
+					<strong v-if="headerData[0].semester" class="text-muted"> | Semester </strong>
+					  {{headerData[0].semester}}
+					<strong v-if="headerData[0].verband" class="text-muted"> | Verband </strong>
+					{{headerData[0].verband}}
+					<strong v-if="headerData[0].gruppe" class="text-muted"> | Gruppe </strong>
+					{{headerData[0].gruppe}}
+				 </h5>
+				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Team </strong>
+				 {{headerData[0].studiengang}}
+				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
+				  {{headerData[0].semester}}
+			  </h5>
+
+			  <h5 v-if="typeHeader==='student'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | Status </strong>
+				 {{headerData[0].status}}
+				<strong class="text-muted"> | MatrNr </strong>
+				  {{headerData[0].matr_nr}}
+				<strong class="text-muted"> | UID </strong>
+				{{headerData[0].uid}}
+				<strong class="text-muted"> | Person ID </strong>
+				{{headerData[0].person_id}}
+			  </h5>
+			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | Durchwahl </strong>
+				 {{headerData[0].status}}
+			  </h5>
+
+			</div>
+
+		</div>
+
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index a56c59e7f..3cfcc2061 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,4 +1,5 @@
 import FhcTabs from "../../Tabs.js";
+import FhcHeader from "../../DetailHeader/DetailHeader.js";
 
 import ApiStvApp from '../../../api/factory/stv/app.js';
 
@@ -8,7 +9,8 @@ import ApiStvApp from '../../../api/factory/stv/app.js';
 export default {
 	name: "DetailsPrestudent",
 	components: {
-		FhcTabs
+		FhcTabs,
+		FhcHeader
 	},
 	data() {
 		return {
@@ -61,45 +63,11 @@ export default {
 			Bitte StudentIn auswählen!
 		</div>
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
-			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
-				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
-	
-
-					
-				<div v-if="students.length == 1">
-					<h2 class="h4">
-						{{students[0].titelpre}}
-						{{students[0].vorname}}
-						{{students[0].nachname}}
-						{{students[0].titelpost}}
-					</h2>
-					<h5 class="h6">
-						<strong class="text-muted">Studiengang </strong>
-						 {{students[0].studiengang}}
-						<strong v-if="students[0].semester" class="text-muted"> | Semester </strong>
-						  {{students[0].semester}}
-						<strong v-if="students[0].verband" class="text-muted"> | Verband </strong>
-						{{students[0].verband}}
-						<strong v-if="students[0].gruppe" class="text-muted"> | Gruppe </strong>
-						{{students[0].gruppe}}
-					  </h5>
-					  <h5 class="h6">
-						<strong class="text-muted">Email </strong>
-						<span>
-							<a :href="'mailto:'+students[0]?.mail_intern">{{students[0].mail_intern}}</a>
-						</span>
-						<strong class="text-muted"> | Status </strong>
-						 {{students[0].status}}
-						<strong class="text-muted"> | MatrNr </strong>
-						  {{students[0].matr_nr}}
-						<strong class="text-muted"> | UID </strong>
-						{{students[0].uid}}
-						<strong class="text-muted"> | Person ID </strong>
-						{{students[0].person_id}}
-					  </h5>
-
-				</div>
-			</div>
+			<fhc-header
+				:headerData="students"
+				typeHeader="student"
+			>
+			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"
 				ref="tabs"

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

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

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

From e89233d6ac39f41de538b1b3d259725a48d6a764 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 4 Jun 2025 09:41:33 +0200
Subject: [PATCH 0242/1357] update(LvInfo): adds the file LvInfo again because
 it is used in a different component

---
 public/js/components/Cis/Mylv/LvInfo.js | 113 ++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 public/js/components/Cis/Mylv/LvInfo.js

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
new file mode 100644
index 000000000..145fc1c19
--- /dev/null
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -0,0 +1,113 @@
+import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
+
+export default {
+	props: {
+		event: Object,
+	},
+	data() {
+		return {
+
+		}
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date) {
+				return this.event.start;
+			}
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template:/*html*/`
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lehrveranstaltung')?
+							$p.t('lehre','lehrveranstaltung')+':'
+							:''
+						}}</th>
+						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','organisationseinheit')?
+							$p.t('lehre','organisationseinheit')+':'
+							:''
+						}}</th>
+						<td>{{event.organisationseinheit}}</td>
+					</tr>
+				</tbody>
+		</table>
+	`
+}
+

From 826dd5245069ff1d13f811de28dc85a6cc8ad40c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 4 Jun 2025 13:59:00 +0200
Subject: [PATCH 0243/1357] - show Profilpicture with lock symbol if
 foto_sperre - enable scrolling for multi view - show uid beneath profile
 picture - use phrases in detail header

---
 .../api/frontend/v1/stv/Students.php          |  5 ++-
 .../components/DetailHeader/DetailHeader.js   | 38 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 5fb7b592c..b2044a6d5 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -622,6 +622,8 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('ersatzkennzeichen');
 		$this->PrestudentModel->addSelect('gebdatum');
 		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('foto');
+		$this->PrestudentModel->addSelect('foto_sperre');
 
 		// semester
 		// verband
@@ -629,6 +631,7 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
 		$this->PrestudentModel->addSelect("s.matrikelnr");
 		$this->PrestudentModel->addSelect('p.person_id');
 		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
@@ -640,7 +643,7 @@ class Students extends FHCAPI_Controller
 		);
 		$this->PrestudentModel->addSelect("
 			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . " 
+			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
 			ELSE '' END AS mail_intern", false);
 		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
 		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 49cbfbad8..a50b39e8c 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -29,19 +29,27 @@ export default {
 		getVorgesetzer(){},
 	},
 	template: `
-		<div class="core-header d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
+		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<div
 				v-for="person in headerData"
 				:key="person.person_id"
 				class="d-flex flex-column align-items-center h-100"
+				class="position-relative d-inline-block"
 			>
 				<img
 				  class="d-block h-100 rounded"
-				  :alt="'Profilbild ' + person.uid"
-				  :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person.person_id"
+				  alt="Profilbild"
+				  :src="'data:image/jpeg;base64,' + person.foto"
 				/>
-				<small>{{person.uid}}</small>
+
+				<template v-if="person.foto_sperre">
+					<i
+					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+					></i>
+				</template>
+			<small class="text-muted">{{person.uid}}</small>
 			</div>
 
 			<div v-if="headerData.length == 1">
@@ -53,17 +61,19 @@ export default {
 				</h2>
 
 				<h5 v-if="typeHeader==='student'" class="h6">
-					<strong class="text-muted">Studiengang </strong>
-					 {{headerData[0].studiengang}}
-					<strong v-if="headerData[0].semester" class="text-muted"> | Semester </strong>
+				 <strong class="text-muted">Person ID </strong>
+				{{headerData[0].person_id}}
+					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
 					  {{headerData[0].semester}}
-					<strong v-if="headerData[0].verband" class="text-muted"> | Verband </strong>
+					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
 					{{headerData[0].verband}}
-					<strong v-if="headerData[0].gruppe" class="text-muted"> | Gruppe </strong>
+					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
 					{{headerData[0].gruppe}}
 				 </h5>
 				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Team </strong>
+				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
 				 {{headerData[0].studiengang}}
 				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
 				  {{headerData[0].semester}}
@@ -76,19 +86,15 @@ export default {
 				</span>
 				<strong class="text-muted"> | Status </strong>
 				 {{headerData[0].status}}
-				<strong class="text-muted"> | MatrNr </strong>
+				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
 				  {{headerData[0].matr_nr}}
-				<strong class="text-muted"> | UID </strong>
-				{{headerData[0].uid}}
-				<strong class="text-muted"> | Person ID </strong>
-				{{headerData[0].person_id}}
 			  </h5>
 			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
 				<strong class="text-muted">Email </strong>
 				<span>
 					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
 				</span>
-				<strong class="text-muted"> | Durchwahl </strong>
+				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
 				 {{headerData[0].status}}
 			  </h5>
 

From 68b6402981b42b8348866635783454a438ea6766 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Jun 2025 11:28:37 +0200
Subject: [PATCH 0244/1357] fix height of calender exceeding viewport height

---
 public/css/components/calendar.css    | 4 ++++
 public/js/components/Calendar/Pane.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 733fd2bdc..580e0becf 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -20,6 +20,10 @@
 	--calendar-past: var(--fhc-beige-20);
 }
 
+.fhc-calendar-pane {
+	height: var(--calendar-pane-height);
+}
+
 .fhc-calendar-hour-indicator{
 	border-top: 1px solid var(--calendar-border);
 }
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index abcf03744..6bc00752b 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -85,8 +85,8 @@ export default {
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
-			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item" style="height:var(--fhc-calendar-pane-height);">
+		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner fhc-calendar-pane">
+			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item fhc-calendar-pane">
 				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
 			</div>
 		</div>

From 2821339c0a32307ecfb7ba785cf0675cc332352a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 5 Jun 2025 11:42:21 +0200
Subject: [PATCH 0245/1357] refactor(Dashboard dragging): removes dragging flag
 from the draggable state

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

diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 37bce4acf..bd256a1fb 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -82,7 +82,7 @@ export default {
 		@drag="$emit('dragging',$event)"
 		@touchmove="touchMove"
 		@dragend="$emit('endDrag', $event); dragging = false"
-		:draggable="active && !item.placeholder && dragging">
+		:draggable="active && !item.placeholder">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 970e950894e72b627e427b888fc52c261852f81a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Jun 2025 17:06:55 +0200
Subject: [PATCH 0246/1357] tune layout of new message modal, fix pagination of
 message table

---
 application/models/system/Message_model.php         |  2 +-
 public/css/Studentenverwaltung.css                  | 12 ++++++++++++
 public/js/components/Bootstrap/Modal.js             | 13 +++++++++++--
 .../components/Messages/Details/NewMessage/Modal.js |  9 ++++++---
 .../js/components/Messages/Details/TableMessages.js | 13 +++++--------
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index acbe3a44c..e0a185f9b 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -292,7 +292,7 @@ class Message_model extends DB_Model
 		if (isError($count))
 			return $count;
 
-		$count = floor(current(getData($count))->count/$limit);
+		$count = ceil(current(getData($count))->count/$limit);
 		$sql = "
 			SELECT * FROM (
 				" . $sql_base . "
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 4c359030c..d39cfc9b1 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -145,4 +145,16 @@ html {
 }
 .override_filtercmpt_actions_style div.d-flex.align-items-baseline {
 	align-items: end !important;
+}
+
+.stv-details-details-foto img {
+	max-width: 150px;
+}
+
+.msg_preview {
+	margin-bottom: -1px;
+}
+
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 2b3223ff7..af81e469f 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -23,9 +23,17 @@ export default {
 		},
 		noCloseBtn: Boolean,
 		dialogClass: [String,Array,Object],
+		headerClass: {
+			type: [String,Array,Object],
+			default: ''
+		},
 		bodyClass: {
 			type: [String,Array,Object],
 			default: 'px-4 py-5'
+		},
+		footerClass: {
+			type: [String,Array,Object],
+			default: ''
 		}
 	},
 	emits: [
@@ -117,15 +125,16 @@ export default {
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
 		<div class="modal-dialog" :class="dialogClass">
 			<div class="modal-content">
-				<div v-if="$slots.title" class="modal-header">
+				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<slot name="popoutButton"></slot>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
 				</div>
-				<div v-if="$slots.footer" class="modal-footer">
+				<div v-if="$slots.footer" class="modal-footer" :class="footerClass">
 					<slot name="footer"/>
 				</div>
 			</div>
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index ab56f4a38..3503cbeb9 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -342,6 +342,7 @@ export default {
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
 			dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
+			header-class="flex-wrap pb-0"
 			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
@@ -350,7 +351,8 @@ export default {
 				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
-			<ul class="nav nav-tabs" id="msg_preview" role="tablist">
+			<template #modal-header-content>
+			<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="msg_preview" role="tablist">
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="msg-tab" data-bs-toggle="tab" data-bs-target="#msg" type="button" role="tab" aria-controls="msg" aria-selected="true">Nachricht</button>
 				</li>
@@ -358,6 +360,7 @@ export default {
 					<button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false">Vorschau</button>
 				</li>
 			</ul>
+			</template>
 
 			<form-form ref="formNewMassage">
 
@@ -366,7 +369,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -391,7 +394,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index ac3d616ec..878cdbfbb 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -207,12 +207,14 @@ export default {
 							this.previewBody = body;
 					}
 				},
+/*
 				{
 					event: 'pageLoaded',
 					handler: (pageno) => {
 						this.pageNo = pageno+1;
 					}
 				}
+*/
 			],
 			previewBody: "",
 			open: false,
@@ -288,16 +290,11 @@ export default {
 			// to avoid endless loop
 			if (iteration > messages.length) break;
 			}
-		return {data: messageNested, last_page};
+		return {data: messageNested, last_page: last_page};
 		},
-		loadAjaxCall(params){
+		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				ApiMessages.getMessages({
-					id: this.id,
-					type: this.typeId,
-					size: this.tabulatorOptions.paginationSize,
-					page: this.pageNo
-				})
+				ApiMessages.getMessages(params)
 			);
 		}
 	},

From 6d7f8522f3d94e7edf448cfa44fd77231d4b2dc5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Jun 2025 09:57:59 +0200
Subject: [PATCH 0247/1357] refactor(Moodle Events DependencyInjection):
 resolves lazy loading bug

---
 public/js/apps/Dashboard/Fhc.js               |  8 ++--
 .../components/Cis/Stundenplan/Stundenplan.js | 41 +++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 830bd2ec3..720bcd0b3 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -293,16 +293,16 @@ const app = Vue.createApp({
 			.then(data => {
 				for (let rendertype of Object.keys(data)) {
 					
-					let modalTitel = Vue.defineAsyncComponent(() => import(data[rendertype].modalTitel));
-					let modalContent = Vue.defineAsyncComponent(() => import(data[rendertype].modalContent));
-					let calendarEvent = Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent));
+					let modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					let modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					let calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
 					if(this.renderers === null) {
 						this.renderers = {};
 					}
 					if (!this.renderers[rendertype]) {
 						this.renderers[rendertype] = {}
 					}
-					this.renderers[rendertype].modalTitel = modalTitel;
+					this.renderers[rendertype].modalTitle = modalTitle;
 					this.renderers[rendertype].modalContent = modalContent;
 					this.renderers[rendertype].calendarEvent = calendarEvent;
 				}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4ca8bdc13..700d8b463 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -26,7 +26,9 @@ const Stundenplan = {
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			renderComponents: {}
+			renderComponents: {},
+			isModalContentResolved: false,
+			isModalTitleResolved: false,
 		}
 	},
 	props: {
@@ -109,9 +111,25 @@ const Stundenplan = {
 		},
 	},
 	methods:{
+		modalTitleResolved: function () {
+			this.isModalTitleResolved = true;
+			if(this.isModalContentResolved && this.isModalTitleResolved)
+				Vue.nextTick(() => {
+					if(this.$refs.lvmodal) 
+						this.$refs.lvmodal.show();
+				});
+		},
+		modalContentResolved: function () {
+			this.isModalContentResolved = true;
+			if (this.isModalContentResolved && this.isModalTitleResolved)
+				Vue.nextTick(() => {
+					if (this.$refs.lvmodal)
+						this.$refs.lvmodal.show();
+				});
+		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
-			return this.renderers[type].modalTitel;
+			return this.renderers[type].modalTitle;
 		},
 		modalContentComponent(type) {
 			return this.renderers[type].modalContent;
@@ -186,9 +204,8 @@ const Stundenplan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				this.$refs.lvmodal.show();
-			});
+			this.isModalTitleResolved = false;
+			this.isModalContentResolved = false;
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
@@ -275,14 +292,14 @@ const Stundenplan = {
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
 		<template #modalTitle>
-			<Suspense>
-				<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-			</Suspense>
-			</template>
+		<Suspense @resolve="modalTitleResolved">
+			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+		</Suspense>
+		</template>
 		<template #modalContent>
-			<Suspense>
-				<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-			</Suspense>
+		<Suspense @resolve="modalContentResolved">
+			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+		</Suspense>
 		</template>
 	</lv-modal>
 

From 9faccfa32804cd879b677c2aa4ca491ef8cb3dfa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Jun 2025 11:27:17 +0200
Subject: [PATCH 0248/1357] update(Url Dashboard widget): makes edit buttons
 always available

---
 public/js/components/DashboardWidget/Url.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 0190b1479..1fcf01874 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,7 +161,7 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
             <template v-if="shared">
 
@@ -173,11 +173,11 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="openEditModal(link)" >
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)">
 								<i class="fa fa-regular fa-trash-can"></i>
 							</a>
 						</div>
@@ -198,7 +198,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="editForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -216,7 +216,7 @@ export default {
 	</core-form>
 
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="createForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag"  ref="createForm">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>

From a786dec9c1a73ae703df2b30ee541422f07e7de4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 10:23:28 +0200
Subject: [PATCH 0249/1357] fix(Dashboard grid):emit dragged item on resize and
 adjust z-index for overlay and dragged item

---
 public/css/components/dashboard.css | 15 +++++++--------
 public/js/components/Drop/Grid.js   |  3 ++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index b4c82254f..beb5b649c 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -38,13 +38,6 @@
 	cursor:pointer;
 }
 
-.draggedItem {
-	height: 100%;
-	width: 100%;
-	background-color:white;
-	position:relative;
-}
-
 .dashboard-section > .newGridRow{
 	position:absolute;
 	width:20px;
@@ -128,6 +121,13 @@
 	cursor: move;
 }
 
+.draggedItem {
+	height: 100%;
+	width: 100%;
+	background-color: white;
+	position: relative;
+}
+
 .dashboard-item-overlay::before{
 	position:absolute;
 	content:"";
@@ -137,7 +137,6 @@
 	bottom:0;
 	background-color:rgba(0, 100, 156);
 	border:4px dashed lightgray;
-	z-index: 2;
 	opacity: 0.5;
 }
 
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1ecdd29ae..00ffe7c52 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -425,6 +425,7 @@ export default {
 				return;
 			this.mode = MODE_RESIZE;
 			this.draggedItem = item;
+			this.$emit('draggedItem', item);
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
@@ -627,7 +628,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
-					zIndex: item.resizeOverlay ? -5 : 'auto',
+					zIndex: item.resizeOverlay ? 1 : 2,
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',

From c080d1abb24b6af2143859577c4b87409754f48a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 11:46:19 +0200
Subject: [PATCH 0250/1357] refactor(Rename Stundenplan to LvPlan):renames all
 methods and files from Stundenplan to LvPlan

---
 application/config/routes.php                 |  2 +-
 .../Cis/{Stundenplan.php => LvPlan.php}       |  4 +-
 .../v1/{Stundenplan.php => LvPlan.php}        | 42 ++++++-------
 .../controllers/api/frontend/v1/Studium.php   | 10 +--
 .../ressource/{Stundenplan.php => LvPlan.php} | 24 +++----
 .../{Stundenplandev.php => LvPlandev.php}     | 24 +++----
 .../Cis/{Stundenplan.php => LvPlan.php}       |  8 +--
 application/controllers/jobs/LVPlanJob.php    |  8 +--
 .../{StundenplanLib.php => LvPlanLib.php}     | 62 +++++++++----------
 .../models/ressource/Reservierung_model.php   |  6 +-
 .../models/ressource/Stundenplan_model.php    | 20 +++---
 .../models/ressource/Stundenplandev_model.php |  4 +-
 .../api/factory/{stundenplan.js => lvPlan.js} | 22 +++----
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/{stundenplan.js => lvPlan.js}   | 18 +++---
 public/js/api/studium.js                      |  4 +-
 public/js/apps/Dashboard/Fhc.js               | 26 ++++----
 public/js/components/Calendar/Calendar.js     |  2 +-
 public/js/components/Calendar/Day/Page.js     |  4 +-
 .../Stundenplan.js => LvPlan/LvPlan.js}       | 26 ++++----
 public/js/components/Cis/Mylv/LvMenu.js       |  4 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 public/js/components/Cis/Mylv/LvUebersicht.js | 12 ++--
 .../js/components/Cis/Mylv/RoomInformation.js |  4 +-
 public/js/components/Cis/Studium/Studium.js   |  2 +-
 .../{Stundenplan.js => LvPlan.js}             | 10 +--
 26 files changed, 178 insertions(+), 178 deletions(-)
 rename application/controllers/Cis/{Stundenplan.php => LvPlan.php} (85%)
 rename application/controllers/api/frontend/v1/{Stundenplan.php => LvPlan.php} (82%)
 rename application/controllers/api/v1/ressource/{Stundenplan.php => LvPlan.php} (59%)
 rename application/controllers/api/v1/ressource/{Stundenplandev.php => LvPlandev.php} (58%)
 rename application/controllers/components/Cis/{Stundenplan.php => LvPlan.php} (80%)
 rename application/libraries/{StundenplanLib.php => LvPlanLib.php} (90%)
 rename public/js/api/factory/{stundenplan.js => lvPlan.js} (70%)
 rename public/js/api/{stundenplan.js => lvPlan.js} (55%)
 rename public/js/components/Cis/{Stundenplan/Stundenplan.js => LvPlan/LvPlan.js} (94%)
 rename public/js/components/DashboardWidget/{Stundenplan.js => LvPlan.js} (95%)

diff --git a/application/config/routes.php b/application/config/routes.php
index eb4c267ce..798d29ad0 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,7 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
+$route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/LvPlan.php
similarity index 85%
rename from application/controllers/Cis/Stundenplan.php
rename to application/controllers/Cis/LvPlan.php
index 71e01be8b..ea48f09f0 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/LvPlan.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Stundenplan extends Auth_Controller
+class LvPlan extends Auth_Controller
 {
 	/**
 	 * Constructor
@@ -30,6 +30,6 @@ class Stundenplan extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Stundenplan']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/LvPlan.php
similarity index 82%
rename from application/controllers/api/frontend/v1/Stundenplan.php
rename to application/controllers/api/frontend/v1/LvPlan.php
index 11a8a7034..55b59db37 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -20,7 +20,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-class Stundenplan extends FHCAPI_Controller
+class LvPlan extends FHCAPI_Controller
 {
 
 	/**
@@ -33,10 +33,10 @@ class Stundenplan extends FHCAPI_Controller
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
-			'StundenplanEvents' => self::PERM_LOGGED,
+			'LvPlanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
-			'getLvStundenplanForStudiensemester' => self::PERM_LOGGED,
+			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -51,7 +51,7 @@ class Stundenplan extends FHCAPI_Controller
         $this->load->library('form_validation');
 
 		//load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
 
 
@@ -61,12 +61,12 @@ class Stundenplan extends FHCAPI_Controller
 	// Public methods
 
 	 /**
-     * fetches Stundenplan and Moodle events together
+     * fetches LvPlan and Moodle events together
      * @access public
      *
      */
-	public function StundenplanEvents(){
-		$this->load->library('StundenplanLib');
+	public function LvPlanEvents(){
+		$this->load->library('LvPlanLib');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -81,10 +81,10 @@ class Stundenplan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
+		$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
-			$stundenplan_events = array();
+			$lvplan_events = array();
 		}
 		// fetching moodle events
 		$moodle_events = [];
@@ -101,7 +101,7 @@ class Stundenplan extends FHCAPI_Controller
 			]
 		);
 		
-		$result = array_merge($stundenplan_events,$moodle_events);
+		$result = array_merge($lvplan_events,$moodle_events);
 		// sort array with moodle events first
 		usort($result, function($a, $b){
 			if ($a->type === 'moodle' && $b->type !== 'moodle') {
@@ -123,16 +123,16 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($studiensemester);
 	}
 
-	public function getLvStundenplanForStudiensemester($studiensemester,$lvid){
-		$this->load->library('StundenplanLib');
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
+		$this->load->library('LvPlanLib');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$stundenplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
-		$this->terminateWithSuccess($stundenplan);
+		$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$this->terminateWithSuccess($lvplan);
 		
 	}
 		
@@ -160,7 +160,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-		$this->load->library('StundenplanLib');
+		$this->load->library('LvPlanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -174,19 +174,19 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
+		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->stundenplanlib->expand_object_information($roomplan_data);
+		$this->lvplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
 	}
 	
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('StundenplanLib');
+		$this->load->library('LvPlanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -200,7 +200,7 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index b0be3cf41..116217a84 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,7 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
 		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('organisation/Studienplan_model', 'LvPlanModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
@@ -143,8 +143,8 @@ class Studium extends FHCAPI_Controller
 		if(!$aktuelles_studienplan){
 			$aktuelles_studienplan = null;
 		}
-		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
-			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($lvplan) use($parameter_studienplan){
+			return $lvplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
 	}
 
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
-		$this->load->library('StundenplanLib');
-		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		$this->load->library('LvPlanLib');
+		$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
 		if(!$lektoren){
 			return [];
 		}
diff --git a/application/controllers/api/v1/ressource/Stundenplan.php b/application/controllers/api/v1/ressource/LvPlan.php
similarity index 59%
rename from application/controllers/api/v1/ressource/Stundenplan.php
rename to application/controllers/api/v1/ressource/LvPlan.php
index 9a6614f21..06672c90b 100644
--- a/application/controllers/api/v1/ressource/Stundenplan.php
+++ b/application/controllers/api/v1/ressource/LvPlan.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Stundenplan extends API_Controller
+class LvPlan extends API_Controller
 {
 	/**
-	 * Stundenplan API constructor.
+	 * LvPlan API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplan' => 'basis/stundenplan:rw'));
-		// Load model StundenplanModel
-		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		// Load model LvPlanModel
+		$this->load->model('ressource/stundenplan_model', 'LvPlanModel');
 
 
 	}
@@ -31,13 +31,13 @@ class Stundenplan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getStundenplan()
+	public function getLvPlan()
 	{
-		$stundenplanID = $this->get('stundenplan_id');
+		$lvPlanID = $this->get('stundenplan_id');
 
-		if (isset($stundenplanID))
+		if (isset($lvPlanID))
 		{
-			$result = $this->StundenplanModel->load($stundenplanID);
+			$result = $this->LvPlanModel->load($lvPlanID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class Stundenplan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postStundenplan()
+	public function postLvPlan()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplan_id']))
 			{
-				$result = $this->StundenplanModel->update($this->post()['stundenplan_id'], $this->post());
+				$result = $this->LvPlanModel->update($this->post()['stundenplan_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->StundenplanModel->insert($this->post());
+				$result = $this->LvPlanModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplan extends API_Controller
 		}
 	}
 
-	private function _validate($stundenplan = NULL)
+	private function _validate($lvplan = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/api/v1/ressource/Stundenplandev.php b/application/controllers/api/v1/ressource/LvPlandev.php
similarity index 58%
rename from application/controllers/api/v1/ressource/Stundenplandev.php
rename to application/controllers/api/v1/ressource/LvPlandev.php
index fa6e788c3..625e6038d 100644
--- a/application/controllers/api/v1/ressource/Stundenplandev.php
+++ b/application/controllers/api/v1/ressource/LvPlandev.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Stundenplandev extends API_Controller
+class LvPlandev extends API_Controller
 {
 	/**
-	 * Stundenplandev API constructor.
+	 * LvPlandev API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplandev' => 'basis/stundenplandev:rw'));
-		// Load model StundenplandevModel
-		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		// Load model LvPlandevModel
+		$this->load->model('ressource/stundenplandev_model', 'LvPlandevModel');
 
 
 	}
@@ -31,13 +31,13 @@ class Stundenplandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getStundenplandev()
+	public function getLvPlandev()
 	{
-		$stundenplandevID = $this->get('stundenplandev_id');
+		$lvplandevID = $this->get('stundenplandev_id');
 
-		if (isset($stundenplandevID))
+		if (isset($lvplandevID))
 		{
-			$result = $this->StundenplandevModel->load($stundenplandevID);
+			$result = $this->LvPlandevModel->load($lvplandevID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class Stundenplandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postStundenplandev()
+	public function postLvPlandev()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplandev_id']))
 			{
-				$result = $this->StundenplandevModel->update($this->post()['stundenplandev_id'], $this->post());
+				$result = $this->LvPlandevModel->update($this->post()['stundenplandev_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->StundenplandevModel->insert($this->post());
+				$result = $this->LvPlandevModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplandev extends API_Controller
 		}
 	}
 
-	private function _validate($stundenplandev = NULL)
+	private function _validate($lvplandev = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/LvPlan.php
similarity index 80%
rename from application/controllers/components/Cis/Stundenplan.php
rename to application/controllers/components/Cis/LvPlan.php
index a9f35c651..083cde03e 100644
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/LvPlan.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * 
  */
-class Stundenplan extends Auth_Controller
+class LvPlan extends Auth_Controller
 {
 
 	/**
@@ -27,14 +27,14 @@ class Stundenplan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 
-		/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
+		/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  		*/
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID())); 
+		$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID())); 
 		
 		$res = getData($res);
 		
diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
index c3fe5495a..14ed473fb 100644
--- a/application/controllers/jobs/LVPlanJob.php
+++ b/application/controllers/jobs/LVPlanJob.php
@@ -39,7 +39,7 @@ class LVPlanJob extends JOB_Controller
 		$studiensemester_arr = array();
 
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
+		$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 
@@ -70,7 +70,7 @@ class LVPlanJob extends JOB_Controller
 			$fail = 0;
 
 			// get all schedule entries where group is missing
-			$result = $this->StundenplandevModel->getMissingDirectGroups($studiensemester);
+			$result = $this->LvPlandevModel->getMissingDirectGroups($studiensemester);
 			if(hasData($result))
 			{
 				foreach($result->retval as $row)
@@ -112,7 +112,7 @@ class LVPlanJob extends JOB_Controller
 					}
 
 					// add group to schedule
-					$result = $this->StundenplandevModel->insert(
+					$result = $this->LvPlandevModel->insert(
 						array(
 							'lehreinheit_id' => $row->lehreinheit_id,
 							'unr' => $unr,
@@ -159,7 +159,7 @@ class LVPlanJob extends JOB_Controller
     public function mailUpdatedZeitwuensche()
     {
         // Load models
-        $this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
+        $this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
         $this->load->model('organisation/Studiensemester_model', 'StundiensemesterModel');
         $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
         $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/LvPlanLib.php
similarity index 90%
rename from application/libraries/StundenplanLib.php
rename to application/libraries/LvPlanLib.php
index b64fd226e..709762ddc 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/LvPlanLib.php
@@ -3,17 +3,17 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class StundenplanLib{
+class LvPlanLib{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches stundenplan events from a UID and start/end date
+	 * fetches LvPlan events from a UID and start/end date
 	 * @access public
 	 *
 	 */
-	public function getStundenplan($start_date, $end_date, $lv_id = null){
+	public function getLvPlan($start_date, $end_date, $lv_id = null){
 		
 		$this->_ci =& get_instance();
 
@@ -21,7 +21,7 @@ class StundenplanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		
 
 		$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class StundenplanLib{
 			return $function_error;
 		}
 		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+		if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
 
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$lvplan_data = getData($lvplan_data) ?? [];
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 
-			// query lv itself in case its Stundenplan is being queried and it has no entries
+			// query lv itself in case its LvPlan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
 			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
@@ -63,7 +63,7 @@ class StundenplanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $stundenplan_data;
+			return $lvplan_data;
 			
 		}
 		
@@ -71,17 +71,17 @@ class StundenplanLib{
 		if($is_mitarbeiter)
 		{
 			
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$lvplan_data = getData($lvplan_data) ?? [];
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
-			return $stundenplan_data;
+			return $lvplan_data;
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class StundenplanLib{
 			}
 			$student_lehrverband = getData($student_lehrverband);
 			
-			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
+			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$lvplan_query)
 			{
 				return [];
 			}
 			
 			
-			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$lvplan_data = getData($lvplan_data) ?? [];
 
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 			
-			return success($stundenplan_data);
+			return success($lvplan_data);
 		}
 		
 	}
@@ -147,7 +147,7 @@ class StundenplanLib{
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class StundenplanLib{
 			return error(getData($studiensemester));
 		}
 		$studiensemester = current(getData($studiensemester));
-		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
+		$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
 		SELECT DISTINCT uid 
 		FROM campus.vw_stundenplan
 		WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class StundenplanLib{
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor)
 			{
-				$this->_ci->StundenplanModel->addLimit(1);
-				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				$this->_ci->LvPlanModel->addLimit(1);
+				$lektor_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
 				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
 				FROM public.tbl_mitarbeiter
 				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
@@ -233,7 +233,7 @@ class StundenplanLib{
 			
 			if($item->ort_kurzbz) {
 
-				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
 				SELECT content_id
 				FROM public.tbl_ort
 				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index f635d0cb1..789ff3d9c 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -21,7 +21,7 @@ class Reservierung_model extends DB_Model
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
 		
-		$stundenplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -46,7 +46,7 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		
 		$query_result= $this->execReadOnlyQuery("
 		SELECT 
@@ -89,7 +89,7 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.uid = ? AND datum >= ? AND datum <= ?";
 
-//		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+//		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		$subquery = $raum_reservierungen_query;
 
 		
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..92a42a1df 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
 		*/
 
 
-		$raum_stundenplan= $this->execReadOnlyQuery("
+		$raum_lvplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_stundenplan;
+		return $raum_lvplan;
 	}
 
 	/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
-	 * @param string $stundenplanViewQuery the subquery used to group the result
+	 * @param string $lvplanViewQuery the subquery used to group the result
 	 *
 	 * @return stdClass
 	 */
-	public function stundenplanGruppierung($stundenplanViewQuery)
+	public function lvPlanGruppierung($lvplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
 		SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
 			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
-			FROM (".$stundenplanViewQuery.") sp
+			FROM (".$lvplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
+	 * queries LvPlan but for a whole lva, irrespective of who is requesting it
 	 * 
 	 * @return void
 	 */
-	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
+	public function getLvPlanLVA($start_date, $end_date, $lv_id) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
+	 * queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *
 	 * @return void
 	 */
-	public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
+	public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+	public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
 		
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 800540d60..1a74c6aa8 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
 	}
 
     /**
-     * Get Stundenplan data.
+     * Get LvPlan data.
      *
      * @param null $lehrveranstaltung_id
      * @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
      * @param false $nurBevorstehende If true, only future data is retrieved.
      * @return array|false|stdClass|null
      */
-    public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
+    public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
     {
         $params = array();
 
diff --git a/public/js/api/factory/stundenplan.js b/public/js/api/factory/lvPlan.js
similarity index 70%
rename from public/js/api/factory/stundenplan.js
rename to public/js/api/factory/lvPlan.js
index c22071955..d8cad1c01 100644
--- a/public/js/api/factory/stundenplan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -19,14 +19,14 @@ export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/getRoomplan',
+			url: '/api/frontend/v1/LvPlan/getRoomplan',
 			params: { ort_kurzbz, start_date, end_date }
 		};
 	},
-	getStundenplan(start_date, end_date, lv_id) {
+	getLvPlan(start_date, end_date, lv_id) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/getStundenplan',
+			url: '/api/frontend/v1/LvPlan/getLvPlan',
 			params: { start_date, end_date, lv_id }
 		};
 	},
@@ -34,39 +34,39 @@ export default {
 		// TODO(chris): seems to be called from nowhere?
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/Stunden'
+			url: '/api/frontend/v1/LvPlan/Stunden'
 		};
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			url: `/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
 			params: { start_date, end_date }
 		};
 	},
-	getStundenplanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/Reservierungen',
+			url: '/api/frontend/v1/LvPlan/Reservierungen',
 			params: { start_date, end_date }
 		};
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/getLehreinheitStudiensemester/${lehreinheit_id}`
+			url: `/api/frontend/v1/LvPlan/getLehreinheitStudiensemester/${lehreinheit_id}`
 		};
 	},
 	studiensemesterDateInterval(date) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`
+			url: `/api/frontend/v1/LvPlan/studiensemesterDateInterval/${date}`
 		};
 	},
-	StundenplanEvents(start_date, end_date, lv_id) {
+	LvPlanEvents(start_date, end_date, lv_id) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/StundenplanEvents',
+			url: '/api/frontend/v1/LvPlan/LvPlanEvents',
 			params: { 
 				start_date: start_date, 
 				end_date: end_date, 
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 0b7b6631c..1b34cd258 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,7 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
-import stundenplan from "./stundenplan.js";
+import lvPlan from "./lvPlan.js";
 import bookmark from "./bookmark.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
@@ -48,7 +48,7 @@ export default {
     studstatus,
     profil,
     profilUpdate,
-    stundenplan,
+    lvPlan,
     bookmark,
     stv,
     notiz,
diff --git a/public/js/api/stundenplan.js b/public/js/api/lvPlan.js
similarity index 55%
rename from public/js/api/stundenplan.js
rename to public/js/api/lvPlan.js
index 9b831b77e..a1d34b37c 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/lvPlan.js
@@ -2,43 +2,43 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/getRoomplan',
+			'/api/frontend/v1/LvPlan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
 	getStunden() {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/Stunden',
+			'/api/frontend/v1/LvPlan/Stunden',
 			{}
 		);
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			`/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
 			{ start_date, end_date}
 		);
 	},
-	getStundenplanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/Reservierungen',
+			'/api/frontend/v1/LvPlan/Reservierungen',
 			{ start_date, end_date }
 		);
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/getLehreinheitStudiensemester/${lehreinheit_id}`,
+			`/api/frontend/v1/LvPlan/getLehreinheitStudiensemester/${lehreinheit_id}`,
 			{}
 		);
 	},
 	studiensemesterDateInterval(date) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`,
+			`/api/frontend/v1/LvPlan/studiensemesterDateInterval/${date}`,
 			{}
 		);
 	},
-	StundenplanEvents(start_date, end_date, lv_id) {
+	LvPlanEvents(start_date, end_date, lv_id) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/StundenplanEvents',
+			'/api/frontend/v1/LvPlan/LvPlanEvents',
 			{ start_date, end_date, lv_id }
 		);
 	},
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index 92bb58698..f15ffdcf3 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -29,9 +29,9 @@ export default {
 			}
 		);
 	},
-	getLvStundenplanForStudiensemester: function (studiensemester, lvid) {
+	getLvPlanForStudiensemester: function (studiensemester, lvid) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/getLvStundenplanForStudiensemester/${studiensemester}/${lvid}`,
+			`/api/frontend/v1/LvPlan/getLvPlanForStudiensemester/${studiensemester}/${lvid}`,
 			{
 			}
 		);
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a7c88874e..ebed7cdf4 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,7 +3,7 @@ import PluginsPhrasen from '../../plugins/Phrasen.js';
 import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
+import LvPlan, {DEFAULT_MODE_LVPLAN} from "../../components/Cis/LvPlan/LvPlan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
@@ -148,13 +148,13 @@ const router = VueRouter.createRouter({
 		},
 		// Redirect old links to new format
 		{
-			// only trigger on first param being numeric to avoid paths like "Stundenplan/Month" entering here
-			path: "/Cis/Stundenplan/:lv_id(\\d+)", 
-			name: "StundenplanOld",
-			component: Stundenplan,
+			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
+			path: "/Cis/LvPlan/:lv_id(\\d+)", 
+			name: "LvPlanOld",
+			component: LvPlan,
 			redirect: (to) => {
-				return { // redirect to longer Stundenplan url and map params
-					name: "Stundenplan",
+				return { // redirect to longer LvPlan url and map params
+					name: "LvPlan",
 					params: {
 						lv_id: to.params.lv_id
 					},
@@ -162,9 +162,9 @@ const router = VueRouter.createRouter({
 			},
 		},
 		{
-			path: `/Cis/Stundenplan/:mode?/:focus_date?/:lv_id?`,
-			name: 'Stundenplan',
-			component: Stundenplan,
+			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
+			name: 'LvPlan',
+			component: LvPlan,
 			props: (route) => { // validate and set mode/focus date if for some reason missing
 				const validModes = ["Month", "Week", "Day"];
 
@@ -172,7 +172,7 @@ const router = VueRouter.createRouter({
 				const mode = route.params.mode &&
 					validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
 						? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-						: DEFAULT_MODE_STUNDENPLAN;
+						: DEFAULT_MODE_LVPLAN;
 
 				// default to today date if not provided or string forms invalid date
 				const d = new Date(route.params.focus_date)
@@ -191,9 +191,9 @@ const router = VueRouter.createRouter({
 				//  missing mode or focus_date -> set defaults
 				if (!to.params.mode || !to.params.focus_date) {
 					next({
-						name: "Stundenplan",
+						name: "LvPlan",
 						params: {
-							mode: to.params.mode || DEFAULT_MODE_STUNDENPLAN,
+							mode: to.params.mode || DEFAULT_MODE_LVPLAN,
 							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
 							lv_id: to.params.lv_id
 						}
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 5c2dc8bb0..0f53d5c04 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -78,7 +78,7 @@ export default {
 			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
 				return;
 			}
-			// scroll the Stundenplan to the closest event
+			// scroll the LvPlan to the closest event
 			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
 			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
 			if (previousScrollAnchor) {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 0e730a1ec..ef2c6ada7 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -1,7 +1,7 @@
 import CalendarDate from '../../../composables/CalendarDate.js';
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAddons from '../../../api/factory/addons.js';
 
 function ggt(m, n) {
@@ -279,7 +279,7 @@ export default {
 		fetchLvMenu(event) {
 			if (event && event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
+					.call(ApiLvPlan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/LvPlan/LvPlan.js
similarity index 94%
rename from public/js/components/Cis/Stundenplan/Stundenplan.js
rename to public/js/components/Cis/LvPlan/LvPlan.js
index efb8c06ea..871c2e10f 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -5,17 +5,17 @@ import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
 import moodleSvg from "../../../helpers/moodleSVG.js"
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-export const DEFAULT_MODE_STUNDENPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN = 'Week'
 
-const Stundenplan = {
-	name: 'Stundenplan',
+const LvPlan = {
+	name: 'LvPlan',
 	data() {
 		return {
 			events: null,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_STUNDENPLAN,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -57,7 +57,7 @@ const Stundenplan = {
 			},
 			immediate: true,
 		},
-		// forward/backward on history entries happening in stundenplan
+		// forward/backward on history entries happening in lvplan
 		'propsViewData.lv_id'(newVal) {
 			// relevant if lv_id can be changed from within this component
 		},
@@ -106,7 +106,7 @@ const Stundenplan = {
 	},
 	methods:{
 		fetchStudiensemesterDetails: async function (date) {
-			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
+			return this.$api.call(ApiLvPlan.studiensemesterDateInterval(date));
 		},
 		convertTime: function([hour,minute]){
 			let date = new Date();
@@ -126,7 +126,7 @@ const Stundenplan = {
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: capitalizedMode,
 					focus_date: date,
@@ -148,7 +148,7 @@ const Stundenplan = {
 				String(this.currentDay.getDate()).padStart(2, "0");
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
 					focus_date: date,
@@ -166,7 +166,7 @@ const Stundenplan = {
 			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
 			
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: m,
 					focus_date: date,
@@ -208,8 +208,8 @@ const Stundenplan = {
 		},
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
-				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
+				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -365,4 +365,4 @@ const Stundenplan = {
 	</fhc-calendar>`
 }
 
-export default Stundenplan
\ No newline at end of file
+export default LvPlan;
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index e7a96f6d8..5f25bff5d 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -7,7 +7,7 @@ export default {
 		},
 		containerStyles: Array,
 		rowStyles: Array,
-		hasLvStundenplanEintraege: {
+		hasLvPlanEintraege: {
 			required:false,
 			default:true,
 			type:Boolean,
@@ -23,7 +23,7 @@ export default {
 			if (!this.c4_link(menuItem) && !menuItem.c4_moodle_links?.length) {
 				return true;
 			}
-			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvStundenplanEintraege){
+			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvPlanEintraege){
 				return true;
 			}
 			return null;
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 435caa97c..17244bc3d 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -3,7 +3,7 @@ import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
 import LvInfo from "./LvInfo.js"
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAddons from '../../../api/factory/addons.js';
 
 export default {
@@ -51,7 +51,7 @@ export default {
 
 			if (this.event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
+					.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index e5162730c..1ec93590f 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -33,7 +33,7 @@ export default  {
             result: false,
             menu: [],
 			isMenuSelected:false,
-			hasLvStundenplanEintraege: true,
+			hasLvPlanEintraege: true,
 			lvEvaluierungMessage: "",
         }
     },
@@ -70,15 +70,15 @@ export default  {
 					})
 			}
 
-			// check if the lv has stundenplan entries for this studiensemester
+			// check if the lv has lvplan entries for this studiensemester
 			if (this.studiensemester && this.event) {
-				return this.$fhcApi.factory.studium.getLvStundenplanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+				return this.$fhcApi.factory.studium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
 					.then(data => data.data)
 					.then(res => {
 						if (Array.isArray(res) && res.length > 0) {
-							this.hasLvStundenplanEintraege = true;
+							this.hasLvPlanEintraege = true;
 						} else {
-							this.hasLvStundenplanEintraege = false;
+							this.hasLvPlanEintraege = false;
 						}
 					});
 			}
@@ -107,7 +107,7 @@ export default  {
         <template #default>
 			<div class="mb-4" v-if="lvEvaluierungMessage" v-html="lvEvaluierungMessage"></div>
 			<slot name="content"></slot>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvStundenplanEintraege="hasLvStundenplanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvPlanEintraege="hasLvPlanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 3960b1d28..6a9a7dbcd 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -3,7 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
-import ApiStudenplan from '../../../api/factory/stundenplan.js';
+import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
@@ -107,7 +107,7 @@ const RoomInformation = {
 				String(this.currentDay.getDate()).padStart(2, "0");
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: this.calendarMode,
 					focus_date: date,
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index a53f9a4e4..7ead07ffe 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -126,7 +126,7 @@ export default {
 		},
 		openLvUebersicht(lehrveranstaltung) {
 			this.selectedLehrveranstaltung = lehrveranstaltung;
-			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
+			//convert lehrveranstaltung properties for compatibility with LvPlan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
 			if(this.selectedLehrveranstaltung){
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/LvPlan.js
similarity index 95%
rename from public/js/components/DashboardWidget/Stundenplan.js
rename to public/js/components/DashboardWidget/LvPlan.js
index 1fc3a6a19..94e79328a 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -6,11 +6,11 @@ import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
 import moodleSvg from "../../helpers/moodleSVG.js"
 
-import ApiStundenplan from '../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../api/factory/lvPlan.js';
 import ApiOrt from '../../api/factory/ort.js';
 
 export default {
-	name: "WidgetsStundenplan",
+	name: "LvPlanWidget",
 	mixins: [
 		Phrasen,
 		AbstractWidget
@@ -128,8 +128,8 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
+				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -170,7 +170,7 @@ export default {
 		this.loadEvents();
 	},
 	template: /*html*/`
-	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
+	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >

From 6f60d7c99ece06986717a0ecb3751dcef8204cc1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 10 Jun 2025 11:57:43 +0200
Subject: [PATCH 0251/1357] API Refactoring, some other minor fixes

---
 .../api/frontend/v1/vertraege/Config.php      |   1 +
 .../api/frontend/v1/vertraege/Vertraege.php   |  24 +--
 public/js/api/factory/vertraege/vertraege.js  | 158 ++++++++++++++++++
 .../js/components/Vertraege/List/Details.js   |  14 +-
 public/js/components/Vertraege/List/Status.js |  15 +-
 .../components/Vertraege/List/Unassigned.js   |   9 +-
 .../components/Vertraege/MitarbeiterHeader.js |  18 +-
 public/js/components/Vertraege/Vertraege.js   |  78 ++++-----
 .../Vertraege/Vertragsverwaltung.js           |   9 +-
 9 files changed, 246 insertions(+), 80 deletions(-)
 create mode 100644 public/js/api/factory/vertraege/vertraege.js

diff --git a/application/controllers/api/frontend/v1/vertraege/Config.php b/application/controllers/api/frontend/v1/vertraege/Config.php
index 8ff241914..72d38e93e 100644
--- a/application/controllers/api/frontend/v1/vertraege/Config.php
+++ b/application/controllers/api/frontend/v1/vertraege/Config.php
@@ -47,6 +47,7 @@ class Config extends FHCAPI_Controller
 			$params
 		);
 
+		//TODO(Manu) check warning
 		$this->terminateWithSuccess($menu[0]);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index d1376c484..579883c8d 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -467,7 +467,7 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function insertContractStatus($vertrag_id)
+	public function insertContractStatus()
 	{
 		$this->load->library('form_validation');
 
@@ -486,7 +486,7 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->VertragvertragsstatusModel->loadWhere(
             array(
-                'vertrag_id' => $vertrag_id,
+                'vertrag_id' => $this->input->post('vertrag_id'),
                 'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
             )
         );
@@ -497,7 +497,7 @@ class Vertraege extends FHCAPI_Controller
         }
 
 		$status_result = $this->VertragvertragsstatusModel->insert([
-			'vertrag_id' => $vertrag_id,
+			'vertrag_id' => $this->input->post('vertrag_id'),
 			'uid' => getAuthUID(),
 			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz'),
 			'insertamum' => date('c'),
@@ -512,9 +512,10 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 
-	public function deleteContractStatus($vertrag_id)
+	public function deleteContractStatus()
 	{
 		$status = $this->input->post('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id');
 
 		$result = $this->VertragvertragsstatusModel->delete(
 			array(
@@ -534,9 +535,10 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function loadContractStatus($vertrag_id)
+	public function loadContractStatus()
 	{
-		$status = $this->input->post('vertragsstatus_kurzbz');
+		$status = $this->input->get('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->get('vertrag_id');
 
 		$result = $this->VertragvertragsstatusModel->loadWhere(
 			array(
@@ -550,7 +552,7 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function updateContractStatus($vertrag_id)
+	public function updateContractStatus()
 	{
 		$this->load->library('form_validation');
 
@@ -569,7 +571,7 @@ class Vertraege extends FHCAPI_Controller
 
 		$status_result = $this->VertragvertragsstatusModel->update(
 			[
-			'vertrag_id' => $vertrag_id,
+			'vertrag_id' => $this->input->post('vertrag_id'),
 			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')],
 			[
 			'uid' => getAuthUID(),
@@ -586,10 +588,11 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($status_result)));
 	}
 
-	public function deleteLehrauftrag($vertrag_id)
+	public function deleteLehrauftrag()
 	{
 		$lehreinheit_id = $this->input->post('lehreinheit_id');
 		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+		$vertrag_id = $this->input->post('vertrag_id ');
 
 		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
 
@@ -616,11 +619,12 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)));
 	}
 
-	public function deleteBetreuung($vertrag_id)
+	public function deleteBetreuung()
 	{
 		$person_id= $this->input->post('person_id');
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
 		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id ');
 
 		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
 
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
new file mode 100644
index 000000000..8d39a24c9
--- /dev/null
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -0,0 +1,158 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAllVertraege(person_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getAllVertraege/' + person_id
+		};
+	},
+/*	getAllContractsNotAssigned2(person_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsNotAssigned/' + person_id
+		};
+	},*/
+	getAllContractsNotAssigned(person_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsNotAssigned/' + person_id
+		};
+	},
+	getAllContractsAssigned(person_id, vertrag_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsAssigned/' + person_id + '/' + vertrag_id + ''
+		};
+	},
+	getAllContractTypes() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractTypes/'
+		};
+	},
+	getStatiOfContract(vertrag_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Vertraege/getStatiOfContract/' + vertrag_id
+		};
+	},
+	configPrintDocument() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/Config/printDocument/'
+		};
+	},
+	getAllContractStati() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getAllContractStati/'
+		};
+	},
+	deleteContract(vertrag_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id
+		};
+	},
+	addNewContract(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/addNewContract/',
+			params
+		};
+	},
+	loadContract(vertrag_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id
+		};
+	},
+	updateContract(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/updateContract/',
+			params
+		};
+	},
+	loadContractStatus(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/loadContractStatus/',
+			params
+		};
+	},
+	insertContractStatus(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/insertContractStatus/',
+			params
+		};
+	},
+	updateContractStatus(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/updateContractStatus/',
+			params
+		};
+	},
+	deleteContractStatus(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/deleteContractStatus/',
+			params
+		};
+	},
+	deleteLehrauftrag(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/',
+			params
+		};
+	},
+	deleteBetreuung(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/deleteBetreuung/',
+			params
+		};
+	},
+	getMitarbeiter(){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiter/',
+		};
+		//return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getMitarbeiter/');
+	},
+	getHeader(person_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getHeader/' + person_id);
+	},
+	getPersonAbteilung(person_id){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id);
+	},
+	getLeitungOrg(oekurzbz){
+		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
+	},
+	getMitarbeiterUid(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id
+		};
+	//	return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id);
+	},
+};
\ No newline at end of file
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index 60ec5110e..47eb629a3 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -26,19 +26,19 @@ export default {
 			type: [Number],
 			required: true
 		},
+		endpoint: {
+			type: Object,
+			required: true
+		},
 	},
 	data() {
 		return {
 			//tableData: [],
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllContractsAssigned,
-				ajaxParams: () => {
-					return {
-						person_id: this.person_id,
-						vertrag_id: this.vertrag_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					this.endpoint.getAllContractsAssigned(this.person_id, this.vertrag_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Typ", field: "type"},
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 60475d3e2..11410bfff 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -29,18 +29,19 @@ export default {
 		formDataParent: {
 			type: Object,
 			required: true
-		}
+		},
+		endpoint: {
+			type: Object,
+			required: true
+		},
 	},
 	data() {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getStatiOfContract,
-				ajaxParams: () => {
-					return {
-						vertrag_id: this.vertrag_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					this.endpoint.getStatiOfContract(this.vertrag_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Status", field: "bezeichnung"},
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 9ffb1c3c8..4b0d20bb8 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -25,12 +25,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllContractsNotAssigned,
-				ajaxParams: () => {
-					return {
-						person_id: this.person_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					this.endpoint.getAllContractsNotAssigned(this.person_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Typ", field: "type", width: 100},
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index ff361eaea..175c61006 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -6,15 +6,19 @@ export default {
 		CoreFilterCmpt,
 		FormInput
 	},
-	inject: {
+/*	inject: {
 		cisRoot: {
 			from: 'cisRoot'
 		},
-	},
+	},*/
 	emits: [
 		"selectedPerson"
 	],
 	props: {
+		endpoint: {
+			type: Object,
+			required: true
+		},
 		// maybe later nur fixe oder alle Mitarbeiter: gleich funktionsaufruf
 		//oder Mitarbeiter mit Verträgen
 /*		filterMa: {
@@ -41,12 +45,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getMitarbeiter,
-				ajaxParams: () => {
-					return {
-						fix: this.filterMa
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					this.endpoint.getMitarbeiter()
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "UID", field: "uid", headerFilter:"input"},
@@ -148,6 +149,7 @@ export default {
 	<div class="core-mitarbeiter-header">
 		<h4>{{$p.t('vertrag', 'vertragsverwaltung')}}</h4>
 		
+	
 <!--	filter: show only active employees-->
 		<div class="justify-content-end py-3">
 			<form-input
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index a3d92fa14..f3afc843e 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -7,6 +7,7 @@ import ListUnassigned from './List/Unassigned.js';
 import ContractDetails from './List/Details.js';
 import ContractStati from './List/Status.js';
 
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -18,9 +19,9 @@ export default {
 		ContractStati
 	},
 	inject: {
-		cisRoot: {
+/*		cisRoot: {
 			from: 'cisRoot'
-		},
+		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -45,12 +46,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.vertraege.person.getAllVertraege,
-				ajaxParams: () => {
-					return {
-						person_id: this.person_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					this.endpoint.getAllVertraege(this.person_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Bezeichnung", field: "bezeichnung", width: 150},
@@ -176,9 +174,9 @@ export default {
 						cm.getColumnByField('isabgerechnet').component.updateDefinition({
 							title: this.$p.t('vertrag', 'abgerechnet')
 						});
-						cm.getColumnByField('actions').component.updateDefinition({
+/*						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
-						});
+						});*/
 					}
 				},
 				{
@@ -242,7 +240,9 @@ export default {
 				.then(result => result
 					? vertrag_id
 					: Promise.reject({handled: true}))
-				.then(this.endpoint.deleteContract)
+				.then(vertrag_id => this.$api.call(
+					this.endpoint.deleteContract(vertrag_id))
+				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					//window.scrollTo(0, 0);
@@ -258,9 +258,8 @@ export default {
 				formData: this.formData,
 				clickedRows: this.childData, //all data needed, maybe smaller array?
 			};
-
-			return this.endpoint
-				.addNewContract(this.$refs.contractData, dataToSend)
+			return this.$refs.contractData
+				.call(this.endpoint.addNewContract(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
@@ -280,9 +279,8 @@ export default {
 				formData: this.formData,
 				clickedRows: this.childData,
 			};
-
-			return this.endpoint
-				.updateContract(this.$refs.contractData, dataToSend)
+			return this.$refs.contractData
+				.call(this.endpoint.updateContract(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
@@ -296,8 +294,8 @@ export default {
 		loadContract(vertrag_id) {
 			this.resetModal();
 			this.statusNew = false;
-			return this.endpoint
-				.loadContract(vertrag_id)
+			return this.$api
+				.call(this.endpoint.loadContract(vertrag_id))
 				.then(result => {
 					this.formData = result.data;
 				})
@@ -322,8 +320,8 @@ export default {
 				datum: formattedDate
 			};
 
-			return this.endpoint
-				.insertContractStatus(this.$refs.contractstati.$refs.statusData, params)
+			return this.$refs.contractstati.$refs.statusData
+				.call(this.endpoint.insertContractStatus(params))
 				.then(response => {
 					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
@@ -338,8 +336,8 @@ export default {
 				vertrag_id : vertrag_id,
 				vertragsstatus_kurzbz: status
 			};
-			return this.endpoint
-				.deleteContractStatus(params)
+			return this.$api
+				.call(this.endpoint.deleteContractStatus(params))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
@@ -364,8 +362,8 @@ export default {
 				datum : formattedDate,
 				vertragsstatus_kurzbz: status
 			};
-			return this.endpoint
-				.updateContractStatus(this.$refs.contractstati.$refs.statusData, params)
+			return this.$refs.contractstati.$refs.statusData
+				.call(this.endpoint.updateContractStatus(params))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractstati.closeModal();
@@ -379,8 +377,8 @@ export default {
 				vertrag_id : vertrag_id,
 				vertragsstatus_kurzbz: status
 			};
-			return this.endpoint
-				.loadContractStatus(params)
+			return this.$api
+				.call(this.endpoint.loadContractStatus(params))
 				.then(response => {
 					this.contractFormData = response.data;
 					this.$refs.contractstati.openModal();
@@ -394,8 +392,8 @@ export default {
 				lehreinheit_id: lehreinheit_id,
 				mitarbeiter_uid: mitarbeiter_uid
 			};
-			return this.endpoint
-				.deleteLehrauftrag(params)
+			return this.$api
+				.call(this.endpoint.deleteLehrauftrag(params))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.resetModal();
@@ -411,8 +409,8 @@ export default {
 				projektarbeit_id: projektarbeit_id,
 				betreuerart_kurzbz: betreuerart_kurzbz
 			};
-			return this.endpoint
-				.deleteBetreuung(params)
+			return this.$api
+				.call(this.endpoint.deleteBetreuung(params))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.$refs.contractdetails.reload();
@@ -437,7 +435,7 @@ export default {
 			this.statusNew = true;
 
 			//this.childData = {};
-			//gefährlich, immer null??
+			//always null??
 			//TODO(Manu) check if this.childData = {},
 		},
 		updateBetrag(sumBetrag){
@@ -488,8 +486,8 @@ export default {
 				});
 		},
 		getMitarbeiterUid(){
-			return this.endpoint
-				.getMitarbeiterUid(this.person_id)
+			return this.$api
+				.call(this.endpoint.getMitarbeiterUid(this.person_id))
 				.then(response => {
 					this.ma_uid = response.data;
 				})
@@ -511,10 +509,10 @@ export default {
 	},
 	created() {
 		Promise.all([
-			this.endpoint.getAllContractTypes(),
-			this.endpoint.getAllContractsNotAssigned2(this.person_id),
-			this.endpoint.getAllContractStati(),
-			this.$fhcApi.factory.vertraege.configPrintDocument()
+			this.$api.call(this.endpoint.getAllContractTypes()),
+			this.$api.call(this.endpoint.getAllContractsNotAssigned(this.person_id)),
+			this.$api.call(this.endpoint.getAllContractStati()),
+			this.$api.call(this.endpoint.configPrintDocument())
 		])
 			.then(([result1, result2, result3, result4]) => {
 				this.listContractTypes = result1.data;
@@ -591,6 +589,7 @@ export default {
 					<contract-details
 						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"
+						:endpoint="endpoint"
 						@deleteLehrauftrag="deleteLehrauftrag"
 						@deleteBetreuung="deleteBetreuung"
 						ref="contractdetails"
@@ -604,6 +603,7 @@ export default {
 						:vertrag_id="contractSelected.vertrag_id"
 						:listContractStati="listContractStati"
 						:formDataParent="contractFormData"
+						:endpoint="endpoint"
 						@setContractStatus="addNewContractStatus"
 						@deleteContractStatus="deleteContractStatus"
 						@updateContractStatus="updateContractStatus"
@@ -622,8 +622,8 @@ export default {
 				</template>
 				
 					<list-unassigned
-						:endpoint="$fhcApi.factory.vertraege.person"
 						:person_id="person_id"
+						:endpoint="endpoint"
 						ref="unassignedLehrauftraege"
 						@saveClickedRows="saveClickedRows"
 						@sum-updated="updateBetrag"
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 1a6100913..def5fa9e6 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -2,6 +2,8 @@ import MitarbeiterHeader from "./MitarbeiterHeader.js";
 import MitarbeiterDetails from "./MitarbeiterDetails.js";
 import VertraegeMitarbeiter from "./Vertraege.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
+import ApiCoreVertraege from '../../api/factory/vertraege/vertraege.js';
+
 
 export default {
 	components: {
@@ -23,6 +25,7 @@ export default {
 	data() {
 		return {
 			person_id: null,
+			endpoint: ApiCoreVertraege
 		}
 	},
 	methods: {
@@ -37,15 +40,15 @@ export default {
 				<vertical-split ref="vsplit">
 					<template #top>	
 						<div class="d-flex flex-column" style="height: 100%;">
-							<mitarbeiter-header :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
+							<mitarbeiter-header  :endpoint="endpoint" @selectedPerson="selectPerson" />
 						</div>
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">
 							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
-							<vertraege-mitarbeiter :endpoint="$fhcApi.factory.vertraege.person" :person_id="this.person_id"/>
+							<vertraege-mitarbeiter :endpoint="endpoint" :person_id="this.person_id"/>
 						</div>
-					<template>
+					</template>
 				</vertical-split>
 			</main>	
 		</div>

From a8f47fad452dc2dae63bb8f2b3a836290e2bad19 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 10 Jun 2025 13:10:26 +0200
Subject: [PATCH 0252/1357] copy Component DetailHeader into Vertragsverwaltung

---
 .../components/DetailHeader/DetailHeader.js   | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 public/js/components/DetailHeader/DetailHeader.js

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
new file mode 100644
index 000000000..a50b39e8c
--- /dev/null
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -0,0 +1,106 @@
+export default {
+	name: 'DetailHeader',
+	props: {
+		headerData: {
+			type: Object,
+			required: true
+		},
+		typeHeader: {
+			type: String,
+			default: 'student',
+			validator(value) {
+				return [
+					'student',
+					'mitarbeiter',
+				].includes(value)
+			}
+		}
+	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		},
+	},
+	data(){
+		return{};
+	},
+	methods: {
+		//TODO(Manu) finish for Vertragsverwaltung
+		getVorgesetzer(){},
+	},
+	template: `
+		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+
+			<div
+				v-for="person in headerData"
+				:key="person.person_id"
+				class="d-flex flex-column align-items-center h-100"
+				class="position-relative d-inline-block"
+			>
+				<img
+				  class="d-block h-100 rounded"
+				  alt="Profilbild"
+				  :src="'data:image/jpeg;base64,' + person.foto"
+				/>
+
+				<template v-if="person.foto_sperre">
+					<i
+					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+					></i>
+				</template>
+			<small class="text-muted">{{person.uid}}</small>
+			</div>
+
+			<div v-if="headerData.length == 1">
+				<h2 class="h4">
+					{{headerData[0].titelpre}}
+					{{headerData[0].vorname}}
+					{{headerData[0].nachname}}
+					{{headerData[0].titelpost}}
+				</h2>
+
+				<h5 v-if="typeHeader==='student'" class="h6">
+				 <strong class="text-muted">Person ID </strong>
+				{{headerData[0].person_id}}
+					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+					  {{headerData[0].semester}}
+					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+					{{headerData[0].verband}}
+					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+					{{headerData[0].gruppe}}
+				 </h5>
+				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
+				 {{headerData[0].studiengang}}
+				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
+				  {{headerData[0].semester}}
+			  </h5>
+
+			  <h5 v-if="typeHeader==='student'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | Status </strong>
+				 {{headerData[0].status}}
+				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
+				  {{headerData[0].matr_nr}}
+			  </h5>
+			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
+				 {{headerData[0].status}}
+			  </h5>
+
+			</div>
+
+		</div>
+
+	`
+}
\ No newline at end of file

From 83d3f515de44124e99f14ab788533a350bfe02f7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 13:18:31 +0200
Subject: [PATCH 0253/1357] refactor(Modals and z-index): ensures dashboard
 modals are in the forground

---
 application/controllers/api/frontend/v1/LvPlan.php |  2 +-
 public/js/components/DashboardWidget/Url.js        | 10 +++++-----
 public/js/components/Drop/Grid.js                  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 55b59db37..b5ce2a737 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$lvplan_events = $this->getDataOrTerminateWithError($this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id));
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
 			$lvplan_events = array();
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 1fcf01874..796726f04 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -198,7 +198,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -213,10 +213,9 @@ export default {
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>
-
+	</teleport>
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag"  ref="createForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
@@ -231,7 +230,8 @@ export default {
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>`,
+	</teleport>
+	`,
 };
 
 /*
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 00ffe7c52..6955107e3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -429,7 +429,7 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
-			if ((this.y + 1) > this.rows && this.mode == MODE_MOVE) {
+			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
 				this.positionUpdates = this.positionUpdates?.filter(item => {
 					return item.widgetid == this.draggedItem.data.widgetid;
 				})
@@ -628,7 +628,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
-					zIndex: item.resizeOverlay ? 1 : 2,
+					zIndex: item.resizeOverlay ? 1 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',

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

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

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

From d2e85056897655c7c37e331a9f44ee9d7f936070 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 14:49:30 +0200
Subject: [PATCH 0255/1357] refactor(Profil alias): checks if user has alias,
 creates extern alias email if available otherwise not

---
 .../controllers/api/frontend/v1/Profil.php    |  5 ++--
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  2 ++
 .../Profil/ProfilComponents/ProfilEmails.js   | 24 ++++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c52d8bae5..d8e22ec29 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -232,7 +232,8 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+
+		$extern_email["email"] = $benutzer_res->alias? ($benutzer_res->alias. "@" . DOMAIN) : null;
 		$res->emails = array($intern_email, $extern_email);
 
 		$res->funktionen = $benutzer_funktion_res;
@@ -345,7 +346,7 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) :null;
 		$res->emails = [$intern_email, $extern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 3d703f6b6..6dd6edeb4 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -12,6 +12,7 @@ export default{
 
     }, 
     template:/*html*/`
+	<template v-if="data.kontakt">
     <div class="gy-2 row align-items-center justify-content-center">
         <div class="col-1 text-center" >
             <i class="fa-solid fhc-link-color" :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" ></i>
@@ -35,5 +36,6 @@ export default{
             <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
         </div>
     </div>
+	</template>
 `,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 1342aed8e..b5fc345ee 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -20,17 +20,19 @@ export default {
         <!-- HIER SIND DIE EMAILS -->
         <div  class="gy-3 row justify-content-center ">
             <div v-for="email in data" class="col-12 ">
-                <div class="row align-items-center">
-                    <div class="col-1 text-center">
-                        <i class="fa-solid fa-envelope fhc-link-color" ></i>
-                    </div>
-                    <div class="col-11">
-                        <div class="form-underline">
-                            <div class="form-underline-titel">{{email.type}}</div>
-                            <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
-                        </div>
-                    </div>
-                </div>
+				<template v-if="email.email">
+					<div class="row align-items-center">
+						<div class="col-1 text-center">
+							<i class="fa-solid fa-envelope fhc-link-color" ></i>
+						</div>
+						<div class="col-11">
+							<div class="form-underline">
+								<div class="form-underline-titel">{{email?.type}}</div>
+								<a :href="'mailto:'+email?.email" class="form-underline-content">{{email?.email}} </a>
+							</div>
+						</div>
+					</div>
+				</template>
             </div>
         </div>
     </div>

From 49c510537a6b5d52fdfbf0691ee44a26d3b70cc3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Jun 2025 11:06:35 +0200
Subject: [PATCH 0256/1357] fix(Profil Mailverteiler): adds safeguards and
 checks on the return value of the Mailverteiler of a person

---
 .../controllers/api/frontend/v1/Profil.php    | 113 ++++++------------
 .../Profil/ProfilComponents/Mailverteiler.js  |   8 +-
 2 files changed, 39 insertions(+), 82 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c52d8bae5..7e5a69255 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -75,10 +75,7 @@ class Profil extends FHCAPI_Controller
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
 		if ($uid == "Profil" || $uid == $this->uid) {
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
-			}
-			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
@@ -95,18 +92,13 @@ class Profil extends FHCAPI_Controller
 		else {
 			$this->PersonModel->addSelect(["person_id"]);
 			$pid = $this->PersonModel->getByUid($uid);
-			if (isError($pid)) {
-				show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
-			}
-			$pid = hasData($pid) ? getData($pid)[0] : null;
+			$pid = $this->getDataOrTerminateWithError($pid);
+			$pid = $pid ? $pid[0] : null;
 			if (!$pid) {
-				show_error("Person with UID: " . $uid . " does not exist");
+				$this->terminateWithError("Person with UID: " . $uid . " does not exist");
 			}
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
-			}
-			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "ViewMitarbeiterProfil";
 				$res->data = $this->viewMitarbeiterProfil($uid);
@@ -134,14 +126,11 @@ class Profil extends FHCAPI_Controller
 
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
-			show_error("error while trying to update table public.tbl_person");
+			$this->terminateWithError("error while trying to update table public.tbl_person");
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-		if (isError($res)) {
-			show_error("error while trying to query table public.tbl_person");
-		}
-
+		
         $res = $this->getDataOrTerminateWithError($res);
 		
         $this->terminateWithSuccess(current($res));
@@ -418,10 +407,8 @@ class Profil extends FHCAPI_Controller
 		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
 
 		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-		if (isError($mailverteiler_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
-		}
-		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+		$mailverteiler_res = $this->getDataOrTerminateWithError($mailverteiler_res);
+		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
 		$mailverteiler_res = array_map(function ($element) {
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
@@ -441,10 +428,7 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
 
 		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-		if (isError($benutzer_funktion_res)) {
-			show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
-		}
-		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+		$benutzer_funktion_res = $this->getDataOrTerminateWithError($benutzer_funktion_res);
 		return $benutzer_funktion_res;
 	}
 
@@ -460,10 +444,7 @@ class Profil extends FHCAPI_Controller
 
 		//? betriebsmittel are not needed in a view
 		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
-		if (isError($betriebsmittelperson_res)) {
-			show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
-		}
-		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+		$betriebsmittelperson_res = $this->getDataOrTerminateWithError($betriebsmittelperson_res);
 		return $betriebsmittelperson_res;
 	}
 
@@ -477,12 +458,9 @@ class Profil extends FHCAPI_Controller
 	{
 		$this->BenutzerModel->addSelect(["alias"]);
 		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		if (isError($benutzer_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
-		} else {
-			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
-		}
-
+		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
+			
 		return $benutzer_res;
 	}
 
@@ -505,11 +483,8 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
 
 		$person_res = $this->BenutzerModel->load([$uid]);
-		if (isError($person_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
-		} else {
-			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-		}
+		$person_res = $this->getDataOrTerminateWithError($person_res);
+		$person_res = $person_res ? current($person_res) : null;
 
 		if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
 		{
@@ -531,11 +506,8 @@ class Profil extends FHCAPI_Controller
 		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
 		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
 		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-		if (isError($mitarbeiter_res)) {
-			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
-		} else {
-			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
-		}
+		$mitarbeiter_res = $this->getDataOrTerminateWithError($mitarbeiter_res);
+		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
 
 		return $mitarbeiter_res;
 	}
@@ -552,10 +524,8 @@ class Profil extends FHCAPI_Controller
 		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
 		$this->MitarbeiterModel->addLimit(1);
 		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-		if (isError($telefon_res)) {
-			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
-		}
-		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+		$telefon_res = $this->getDataOrTerminateWithError($telefon_res);
+		$telefon_res = $telefon_res ? current($telefon_res) : null;
 		return $telefon_res;
 	}
 
@@ -571,10 +541,9 @@ class Profil extends FHCAPI_Controller
 		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
 
 		$student_res = $this->StudentModel->load([$uid]);
-		if (isError($student_res)) {
-			show_error("was not able to query the table public.tbl_student:" . getData($student_res));
-		}
-		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+		
+		$student_res = $this->getDataOrTerminateWithError($student_res);
+		$student_res = $student_res ? current($student_res) : null;
 		return $student_res;
 	}
 
@@ -587,10 +556,7 @@ class Profil extends FHCAPI_Controller
 	private function getProfilUpdates($uid)
 	{
 		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
-		if (isError($profilUpdates)) {
-			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
-		}
-		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+		$profilUpdates = $this->getDataOrTerminateWithError($profilUpdates);
 		return $profilUpdates;
 	}
 
@@ -606,10 +572,9 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
 
 		$matr_res = $this->BenutzerModel->load([$uid]);
-		if (isError($matr_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
-		}
-		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+		
+		$matr_res = $this->getDataOrTerminateWithError($matr_res);
+		$matr_res = $matr_res ? current($matr_res) : [];
 		return $matr_res;
 	}
 
@@ -625,10 +590,7 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
 
 		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
-		if (isError($zutrittsgruppe_res)) {
-			show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
-		}
-		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+		$zutrittsgruppe_res = $this->getDataOrTerminateWithError($zutrittsgruppe_res);
 		return $zutrittsgruppe_res;
 	}
 
@@ -645,10 +607,7 @@ class Profil extends FHCAPI_Controller
 		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 
 		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
-		if (isError($adresse_res)) {
-			show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
-		}
-		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+		$adresse_res = $this->getDataOrTerminateWithError($adresse_res);
 		return $adresse_res;
 	}
 
@@ -666,10 +625,7 @@ class Profil extends FHCAPI_Controller
 		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
 
 		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
-		if (isError($kontakte_res)) {
-			show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
-		}
-		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+		$kontakte_res = $this->getDataOrTerminateWithError($kontakte_res);
 		return $kontakte_res;
 	}
 
@@ -682,11 +638,10 @@ class Profil extends FHCAPI_Controller
 	private function getZutrittskarteDatum($uid)
 	{
 		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
-		if (isError($zutrittskarte_ausgegebenam)) {
-			show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
-		}
-		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-
+		
+		$zutrittskarte_ausgegebenam = $this->getDataOrTerminateWithError($zutrittskarte_ausgegebenam);
+		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
+		
 		//? formats date from 01-01-2000 to 01.01.2000
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 82b0aad57..4b85bbf63 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -10,6 +10,7 @@ export default {
 
     },
     template: /*html*/`
+	<template v-if="Array.isArray(data) && data.length >0">
     <div class="card">
         <div class="card-header">
             {{title}}
@@ -18,7 +19,7 @@ export default {
             <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
             <div class="card-text row text-break mb-2" v-for="verteiler in data">
                 <div class="col-12 ">
-                    <div class="row">  
+                    <div class="row">
                         <div class="col-1 ">
                             <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
                         </div>
@@ -26,9 +27,10 @@ export default {
                             <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                         </div>
                     </div>
-                </div> 
+                </div>
                 <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
             </div>
         </div>
-    </div>`,
+    </div>
+	</template>`,
 };

From 29f968f308bdfde9d442b8680e627b761f966291 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Jun 2025 11:24:18 +0200
Subject: [PATCH 0257/1357] fix(Profil email extern):Profil endpoint does not
 provide the extern alias email if the benutzer has no alias defined

---
 application/controllers/api/frontend/v1/Profil.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 7e5a69255..f234fc30e 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -221,8 +221,9 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
-		$res->emails = array($intern_email, $extern_email);
+		
+		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
 		$res->mailverteiler = $mailverteiler_res;
@@ -334,8 +335,9 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
-		$res->emails = [$intern_email, $extern_email];
+		
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
 		$res->standort_telefon = $telefon_res;

From a56a80469298533b2431150488a36a82af0e9628 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 13:46:23 +0200
Subject: [PATCH 0258/1357] - fix error with Event
 'multiActionPrintHonorarvertrag' - Naming components Vertragsverwaltung,
 MitarbeiterHeader, CoreListMitarbeiter - link to Vorgesetzter, show
 Vorgesetzter without postTitel - Foto: if foto_sperre: show foto with lock

---
 .../api/frontend/v1/vertraege/Config.php      |  13 +-
 public/js/api/factory/vertraege/vertraege.js  |  25 +-
 .../components/DetailHeader/DetailHeader.js   | 242 +++++++++++++-----
 .../Vertraege/MitarbeiterDetails.js           | 110 --------
 .../components/Vertraege/MitarbeiterHeader.js |  27 +-
 public/js/components/Vertraege/Vertraege.js   |   1 +
 .../Vertraege/Vertragsverwaltung.js           |  19 +-
 7 files changed, 213 insertions(+), 224 deletions(-)
 delete mode 100644 public/js/components/Vertraege/MitarbeiterDetails.js

diff --git a/application/controllers/api/frontend/v1/vertraege/Config.php b/application/controllers/api/frontend/v1/vertraege/Config.php
index 72d38e93e..a4ebd8c48 100644
--- a/application/controllers/api/frontend/v1/vertraege/Config.php
+++ b/application/controllers/api/frontend/v1/vertraege/Config.php
@@ -37,6 +37,7 @@ class Config extends FHCAPI_Controller
 	public function printDocument()
 	{
 		$params = [];
+		$menu = [];
 
 		Events::trigger(
 			'multiActionPrintHonorarvertrag',
@@ -47,7 +48,15 @@ class Config extends FHCAPI_Controller
 			$params
 		);
 
-		//TODO(Manu) check warning
-		$this->terminateWithSuccess($menu[0]);
+		if (is_array($menu) && isset($menu[0]))
+		{
+			$this->terminateWithSuccess($menu[0]);
+		}
+		else
+		{
+		//	$this->terminateWithError('Error with Event 'multiActionPrintHonorarvertrag');
+			$this->terminateWithSuccess();
+
+		}
 	}
 }
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
index 8d39a24c9..c442bd8c3 100644
--- a/public/js/api/factory/vertraege/vertraege.js
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -22,12 +22,6 @@ export default {
 			url: 'api/frontend/v1/vertraege/Vertraege/getAllVertraege/' + person_id
 		};
 	},
-/*	getAllContractsNotAssigned2(person_id) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsNotAssigned/' + person_id
-		};
-	},*/
 	getAllContractsNotAssigned(person_id) {
 		return {
 			method: 'get',
@@ -134,25 +128,32 @@ export default {
 	},
 	getMitarbeiter(){
 		return {
-			method: 'post',
+			method: 'get',
 			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiter/',
 		};
-		//return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getMitarbeiter/');
 	},
 	getHeader(person_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getHeader/' + person_id);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
+		};
 	},
 	getPersonAbteilung(person_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+		};
 	},
 	getLeitungOrg(oekurzbz){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
+		};
 	},
 	getMitarbeiterUid(person_id){
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id
 		};
-	//	return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id);
 	},
 };
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index a50b39e8c..8bed35beb 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,9 +1,21 @@
+import ApiCoreVertraege from "../../api/factory/vertraege/vertraege.js";
+
 export default {
 	name: 'DetailHeader',
+	inject: {
+		domain: {
+			from: 'configDomain',
+			default: 'technikum-wien.at'
+		},
+	},
 	props: {
 		headerData: {
 			type: Object,
-			required: true
+			required: false
+		},
+		person_id: {
+			type: Number,
+			required: false
 		},
 		typeHeader: {
 			type: String,
@@ -20,87 +32,177 @@ export default {
 		appRoot() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
 		},
+		validatedHeaderData() {
+			if (this.typeHeader === 'student') return this.headerData;
+			if (this.typeHeader === 'mitarbeiter') return this.person_id;
+			return null;
+		}
+	},
+	created(){
+		if(this.person_id) {
+			this.getHeader(this.person_id);
+
+			this.loadDepartmentData(this.person_id)
+				.then(() => {
+					// Call getLeitungOrg only after departmentData is loaded
+					this.getLeitungOrg(this.departmentData.oe_kurzbz);
+				})
+				.catch((error) => {
+					console.error("Error loading department data:", error);
+				});
+		}
+	},
+	watch: {
+		person_id: {
+			handler(newVal) {
+				if (newVal) {
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.person_id).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
+				}
+			},
+			deep: true,
+		},
 	},
 	data(){
-		return{};
+		return{
+			headerDataMa: {},
+			departmentData: {},
+			leitungData: {},
+		};
 	},
 	methods: {
-		//TODO(Manu) finish for Vertragsverwaltung
-		getVorgesetzer(){},
+		getHeader(person_id) {
+			return this.$api
+				.call(ApiCoreVertraege.getHeader(person_id))
+				.then(result => {
+					this.headerDataMa = result.data;
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadDepartmentData(person_id) {
+			return this.$api
+				.call(ApiCoreVertraege.getPersonAbteilung(person_id))
+				.then(result => {
+					this.departmentData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLeitungOrg(oekurzbz){
+			return this.$api
+				.call(ApiCoreVertraege.getLeitungOrg(oekurzbz))
+				.then(result => {
+					this.leitungData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		redirectToLeitung(){
+			this.$emit('redirectToLeitung', {
+				person_id: this.leitungData.person_id});
+		}
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+			<template v-if="typeHeader==='student'">
+					<div
+						v-for="person in headerData"
+						:key="person.person_id"
+						class="d-flex flex-column align-items-center h-100"
+						class="position-relative d-inline-block"
+					>
+						<img
+						  class="d-block h-100 rounded"
+						  alt="Profilbild"
+						  :src="'data:image/jpeg;base64,' + person.foto"
+						/>
 
-			<div
-				v-for="person in headerData"
-				:key="person.person_id"
-				class="d-flex flex-column align-items-center h-100"
-				class="position-relative d-inline-block"
-			>
-				<img
-				  class="d-block h-100 rounded"
-				  alt="Profilbild"
-				  :src="'data:image/jpeg;base64,' + person.foto"
-				/>
+						<template v-if="person.foto_sperre">
+							<i
+							  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+							  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+							></i>
+						</template>
+					<small class="text-muted">{{person.uid}}</small>
+					</div>
 
-				<template v-if="person.foto_sperre">
-					<i
-					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-					></i>
-				</template>
-			<small class="text-muted">{{person.uid}}</small>
-			</div>
+					<div v-if="headerData.length == 1">
+						<h2 class="h4">
+							{{headerData[0].titelpre}}
+							{{headerData[0].vorname}}
+							{{headerData[0].nachname}},
+							{{headerData[0].titelpost}}
+						</h2>
 
-			<div v-if="headerData.length == 1">
-				<h2 class="h4">
-					{{headerData[0].titelpre}}
-					{{headerData[0].vorname}}
-					{{headerData[0].nachname}}
-					{{headerData[0].titelpost}}
-				</h2>
+						<h5 class="h6">
+						 <strong class="text-muted">Person ID </strong>
+							{{headerData[0].person_id}}
+							<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+							 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+							<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+							  {{headerData[0].semester}}
+							<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+							{{headerData[0].verband}}
+							<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+							{{headerData[0].gruppe}}
+						 </h5>
 
-				<h5 v-if="typeHeader==='student'" class="h6">
-				 <strong class="text-muted">Person ID </strong>
-				{{headerData[0].person_id}}
-					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
-					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-					  {{headerData[0].semester}}
-					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-					{{headerData[0].verband}}
-					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-					{{headerData[0].gruppe}}
-				 </h5>
-				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
-				 {{headerData[0].studiengang}}
-				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
-				  {{headerData[0].semester}}
-			  </h5>
+					  <h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+						</span>
+						<strong class="text-muted"> | Status </strong>
+						 {{headerData[0].status}}
+						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
+						  {{headerData[0].matr_nr}}
+					  </h5>
 
-			  <h5 v-if="typeHeader==='student'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | Status </strong>
-				 {{headerData[0].status}}
-				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
-				  {{headerData[0].matr_nr}}
-			  </h5>
-			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
-				 {{headerData[0].status}}
-			  </h5>
+					</div>
+				</div>
+		</template>
 
-			</div>
-
-		</div>
+		<template v-if="typeHeader==='mitarbeiter'">
+			<div class="row">
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
+						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+					<img
+					  class="d-block h-100 rounded"
+					  alt="Profilbild"
+					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
+					/>
+					<template v-if="headerDataMa.foto_sperre">
+						<i
+						  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+						></i>
+					</template>
+				</div>
 
+				<!--show Ma-Details-->
+				<div class="col-md-10">
+					<h5>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}
+					</h5>
+					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
+						{{departmentData.bezeichnung}}
+					<span v-if="leitungData.uid"> | </span>
+					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
+					<a href="#" @click.prevent="redirectToLeitung">
+						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
+					</a>
+					<p>
+						<strong class="text-muted">Email </strong>
+						 <span v-if="!headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.uid+'@'+domain">{{headerDataMa.uid}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
+					</p>
+				</div>
+		</template>
 	`
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Vertraege/MitarbeiterDetails.js b/public/js/components/Vertraege/MitarbeiterDetails.js
deleted file mode 100644
index 26f95d2bf..000000000
--- a/public/js/components/Vertraege/MitarbeiterDetails.js
+++ /dev/null
@@ -1,110 +0,0 @@
-export default {
-	data() {
-		return {
-			headerData: {},
-			departmentData: {},
-			leitungData: {},
-		};
-	},
-	inject: {
-		domain: {
-			from: 'configDomain',
-			default: 'technikum-wien.at'
-		},
-	},
-	props: {
-		person_id: Number
-	},
-	computed: {
-		appRoot() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
-		},
-	},
-	created(){
-		this.getHeader(this.person_id);
-
-		// Ensure loadDepartmentData is awaited
-		this.loadDepartmentData(this.person_id)
-			.then(() => {
-				// Call getLeitungOrg only after departmentData is loaded
-				this.getLeitungOrg(this.departmentData.oe_kurzbz);
-			})
-			.catch((error) => {
-				console.error("Error loading department data:", error);
-			});
-	},
-	watch: {
-		person_id: {
-			handler(newVal) {
-				if (newVal) {
-					this.getHeader(this.person_id);
-					this.loadDepartmentData(this.person_id).
-					then(() => {
-						this.getLeitungOrg(this.departmentData.oe_kurzbz);
-					});
-				}
-			},
-			deep: true,
-		},
-	},
-	methods: {
-		getHeader(person_id) {
-			return this.$fhcApi.factory.vertraege.person
-				.getHeader(person_id)
-				.then(result => {
-					this.headerData = result.data;
-
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		loadDepartmentData(person_id) {
-			return this.$fhcApi.factory.vertraege.person
-				.getPersonAbteilung(person_id)
-				.then(result => {
-					this.departmentData = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		getLeitungOrg(oekurzbz){
-			return this.$fhcApi.factory.vertraege.person
-				.getLeitungOrg(oekurzbz)
-				.then(result => {
-					this.leitungData = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	template: `
-		<div class="core-mitarbeiter-details">
-			<!--show Picture-->
-			<div class="row">
-				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3" 
-						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
-					<img 
-						class="d-block h-100 rounded" 
-						alt="profilepicture" 
-						style="object-fit: cover; max-width: 100%;" 
-						:src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person_id">
-				</div>
-			
-				<!--show Ma-Details-->
-				<div class="col-md-10">
-					<h5>{{headerData.titelpre}} {{headerData.vorname}} {{headerData.nachname}} {{headerData.titelpost}} </h5>
-					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong> {{departmentData.bezeichnung}} <span v-if="leitungData.uid"> | </span><strong v-if="leitungData.uid" class="text-muted">Vorgesetzte/e </strong>{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}} {{leitungData.titelpost}}  
-					<p>
-						<strong class="text-muted">Email </strong>
-						 <span v-if="!headerData?.alias">
-							<a :href="'mailto:'+headerData?.uid+'@'+domain">{{headerData.uid}}@{{domain}}</a>
-						</span>
-						<span v-if="headerData?.alias">
-							<a :href="'mailto:'+headerData?.alias+'@'+domain">{{headerData.alias}}@{{domain}}</a>
-						</span>
-						<span v-if="headerData?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerData?.telefonklappe}}</span>
-					</p>
-		
-				</div>
-			</div>
-		</div>
-
-`
-};
\ No newline at end of file
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 175c61006..b49e069af 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -2,15 +2,11 @@ import {CoreFilterCmpt} from "../filter/Filter.js";
 import FormInput from '../Form/Input.js';
 
 export default {
+	name: 'CoreListMitarbeiter',
 	components: {
 		CoreFilterCmpt,
 		FormInput
 	},
-/*	inject: {
-		cisRoot: {
-			from: 'cisRoot'
-		},
-	},*/
 	emits: [
 		"selectedPerson"
 	],
@@ -19,27 +15,6 @@ export default {
 			type: Object,
 			required: true
 		},
-		// maybe later nur fixe oder alle Mitarbeiter: gleich funktionsaufruf
-		//oder Mitarbeiter mit Verträgen
-/*		filterMa: {
-			type: Object,
-			required: true,
-			default: function () {
-				return {
-					active: true,
-					hasVertraege: false
-				};
-			},
-		},*/
-/*		vertragsarten: {
-			type: Array,
-			required: false,
-			default: function (){
-				return {
-					['echterdv']
-				}
-			}
-		}*/
 	},
 	data() {
 		return {
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index f3afc843e..202f517f3 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -9,6 +9,7 @@ import ContractStati from './List/Status.js';
 
 
 export default {
+	name:'CoreVertraege',
 	components: {
 		CoreFilterCmpt,
 		BsModal,
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index def5fa9e6..300b7a49e 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -1,15 +1,16 @@
 import MitarbeiterHeader from "./MitarbeiterHeader.js";
-import MitarbeiterDetails from "./MitarbeiterDetails.js";
+import FhcHeader from "../DetailHeader/DetailHeader.js";
 import VertraegeMitarbeiter from "./Vertraege.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
 import ApiCoreVertraege from '../../api/factory/vertraege/vertraege.js';
 
 
 export default {
+	name: 'Vertragsverwaltung',
 	components: {
 		VerticalSplit,
 		MitarbeiterHeader,
-		MitarbeiterDetails,
+		FhcHeader,
 		VertraegeMitarbeiter
 	},
 	props: {
@@ -26,11 +27,15 @@ export default {
 		return {
 			person_id: null,
 			endpoint: ApiCoreVertraege
+				//<mitarbeiter-details-old :person_id="person_id"></mitarbeiter-details-old>
 		}
 	},
 	methods: {
 		selectPerson(selected){
 			this.person_id = selected;
+		},
+		redirectToLeitung(leitung){
+			this.person_id = leitung.person_id;
 		}
 	},
 	template: `
@@ -40,12 +45,18 @@ export default {
 				<vertical-split ref="vsplit">
 					<template #top>	
 						<div class="d-flex flex-column" style="height: 100%;">
-							<mitarbeiter-header  :endpoint="endpoint" @selectedPerson="selectPerson" />
+							<mitarbeiter-header
+								:endpoint="endpoint"
+								@selectedPerson="selectPerson"/>
 						</div>
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">
-							<mitarbeiter-details :person_id="person_id"></mitarbeiter-details>
+							<fhc-header
+								:person_id="person_id"
+								typeHeader="mitarbeiter"
+								@redirectToLeitung="redirectToLeitung"
+							></fhc-header>
 							<vertraege-mitarbeiter :endpoint="endpoint" :person_id="this.person_id"/>
 						</div>
 					</template>

From 2eef05e593fa5254d97575c23e346ec3b3c8c931 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:02:31 +0200
Subject: [PATCH 0259/1357] - refactore POST_Variablen with
 form_validation->set_data - add phrase: Vertragsstatus bearbeiten -
 filterActive: bugfix

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 75 ++++++++-----------
 public/js/apps/Vertragsverwaltung.js          |  6 +-
 .../components/DetailHeader/DetailHeader.js   |  2 +
 public/js/components/Vertraege/List/Status.js |  3 +-
 .../components/Vertraege/MitarbeiterHeader.js |  2 +-
 .../Vertraege/Vertragsverwaltung.js           |  1 -
 6 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 579883c8d..0d4b06a30 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -117,22 +117,15 @@ class Vertraege extends FHCAPI_Controller
 		}
 
 		$formData = $this->input->post('formData');
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
 
-		//Manually rewrite to postparameter for form validation
-		$_POST['vertragstyp_kurzbz'] = $formData['vertragstyp_kurzbz'];
-		$_POST['vertragsdatum']= $formData['vertragsdatum'];
-		$_POST['bezeichnung']= $formData['bezeichnung'];
-		$_POST['betrag'] = $formData['betrag'];
-		$_POST['vertragsstunden'] =
-			isset($formData['vertragsstunden'])
-			? $formData['vertragsstunden']
-			: null;
-		$_POST['vertragsstunden_studiensemester_kurzbz'] =
-			isset($formData['vertragsstunden_studiensemester_kurzbz'])
-				? $formData['vertragsstunden_studiensemester_kurzbz']
-				: null;
-		$_POST['anmerkung'] = isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
-
+		$this->form_validation->set_data($formData);
 		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
 		]);
@@ -163,13 +156,13 @@ class Vertraege extends FHCAPI_Controller
 
 		$result = $this->VertragModel->insert([
 			'person_id' => $person_id,
-			'vertragsdatum' => $this->input->post('vertragsdatum'),
-			'bezeichnung' => $this->input->post('bezeichnung'),
-			'vertragstyp_kurzbz' => $this->input->post('vertragstyp_kurzbz'),
-			'betrag' => $this->input->post('betrag'),
-			'vertragsstunden' => $this->input->post('vertragsstunden'),
-			'vertragsstunden_studiensemester_kurzbz' => $this->input->post('vertragsstunden_studiensemester_kurzbz'),
-			'anmerkung' => $this->input->post('anmerkung'),
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 		]);
@@ -236,7 +229,6 @@ class Vertraege extends FHCAPI_Controller
 				}
 			}
 		}
-
 		$this->db->trans_complete();
 		$this->terminateWithSuccess(true);
 	}
@@ -250,21 +242,16 @@ class Vertraege extends FHCAPI_Controller
 		$formData = $this->input->post('formData');
 		$lehrauftraege = $this->input->post('clickedRows');
 
-		//Manually rewrite to postparameter for form validation
-		$_POST['vertragstyp_kurzbz'] = $formData['vertragstyp_kurzbz'];
-		$_POST['vertragsdatum']= $formData['vertragsdatum'];
-		$_POST['bezeichnung']= $formData['bezeichnung'];
-		$_POST['betrag'] = $formData['betrag'];
-		$_POST['vertragsstunden'] =
-			isset($formData['vertragsstunden'])
-				? $formData['vertragsstunden']
-				: null;
-		$_POST['vertragsstunden_studiensemester_kurzbz']=
-			isset($formData['vertragsstunden_studiensemester_kurzbz'])
-				? $formData['vertragsstunden_studiensemester_kurzbz']
-				: null;
-		$_POST['anmerkung']= isset($formData['anmerkung']) ? $formData['anmerkung'] : null;
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
 
+
+		$this->form_validation->set_data($formData);
 		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
 		]);
@@ -295,13 +282,13 @@ class Vertraege extends FHCAPI_Controller
 			$vertrag_id,
 			[
 				'person_id' => $person_id,
-				'vertragsdatum' => $this->input->post('vertragsdatum'),
-				'bezeichnung' => $this->input->post('bezeichnung'),
-				'vertragstyp_kurzbz' => $this->input->post('vertragstyp_kurzbz'),
-				'betrag' => $this->input->post('betrag'),
-				'vertragsstunden' => $this->input->post('vertragsstunden'),
-				'vertragsstunden_studiensemester_kurzbz' => $this->input->post('vertragsstunden_studiensemester_kurzbz'),
-				'anmerkung' => $this->input->post('anmerkung'),
+				'vertragsdatum' => $vertragsdatum,
+				'bezeichnung' => $bezeichnung,
+				'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+				'betrag' => $betrag,
+				'vertragsstunden' => $vertragsstunden,
+				'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+				'anmerkung' => $anmerkung,
 				'updateamum' => date('c'),
 				'updatevon' => getAuthUID()
 			]
diff --git a/public/js/apps/Vertragsverwaltung.js b/public/js/apps/Vertragsverwaltung.js
index 1918345c0..3f8e47d3d 100644
--- a/public/js/apps/Vertragsverwaltung.js
+++ b/public/js/apps/Vertragsverwaltung.js
@@ -1,7 +1,5 @@
 import Vertragsverwaltung from "../components/Vertraege/Vertragsverwaltung.js";
-import fhcapifactory from "./api/fhcapifactory.js";
-
-import Phrasen from "../plugin/Phrasen.js";
+import Phrasen from "../plugins/Phrasen.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -12,12 +10,10 @@ const router = VueRouter.createRouter({
 	]
 });
 
-
 const app = Vue.createApp();
 
 app
 	.use(router)
-	//.use(fhcapifactory)  //nicht nötig
 	.use(primevue.config.default, {
 		zIndex: {
 			overlay: 1100
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 8bed35beb..6f40c0972 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -203,6 +203,8 @@ export default {
 						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
 					</p>
 				</div>
+			</div>
 		</template>
+	</div>
 	`
 }
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 11410bfff..fd3b9afd7 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -282,7 +282,8 @@ export default {
 		<div >
 			<bs-modal ref="contractStatus">
 				<template #title>
-					<p class="fw-bold mt-3">{{$p.t('vertrag', 'addStatus')}}</p>
+					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('vertrag', 'addStatus')}}</p>
+					<p v-else class="fw-bold mt-3">{{$p.t('vertrag', 'editStatus')}}</p>
 
 				</template>
 
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index b49e069af..98f987a44 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -116,7 +116,7 @@ export default {
 				this.$refs.table.tabulator.setFilter("aktiv", "=", true);
 			}
 			else {
-				this.$refs.table.tabulator.clearFilter("aktiv");
+				this.$refs.table.tabulator.clearFilter();
 			}
 		},
 	},
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 300b7a49e..5e27a6d77 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -27,7 +27,6 @@ export default {
 		return {
 			person_id: null,
 			endpoint: ApiCoreVertraege
-				//<mitarbeiter-details-old :person_id="person_id"></mitarbeiter-details-old>
 		}
 	},
 	methods: {

From 8c69bc1682f42a3994d2f9d6efc457722483729f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:28:19 +0200
Subject: [PATCH 0260/1357] Headerfunctions in headerAPI auslagern

---
 public/js/api/factory/detailHeader.js         | 37 +++++++++++++++++++
 public/js/api/factory/vertraege/vertraege.js  | 18 ---------
 .../components/DetailHeader/DetailHeader.js   |  8 ++--
 3 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 public/js/api/factory/detailHeader.js

diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
new file mode 100644
index 000000000..f9f368bc7
--- /dev/null
+++ b/public/js/api/factory/detailHeader.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getHeader(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
+		};
+	},
+	getPersonAbteilung(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+		};
+	},
+	getLeitungOrg(oekurzbz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
index c442bd8c3..714856cfe 100644
--- a/public/js/api/factory/vertraege/vertraege.js
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -132,24 +132,6 @@ export default {
 			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiter/',
 		};
 	},
-	getHeader(person_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
-		};
-	},
-	getPersonAbteilung(person_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
-		};
-	},
-	getLeitungOrg(oekurzbz){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
-		};
-	},
 	getMitarbeiterUid(person_id){
 		return {
 			method: 'get',
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 6f40c0972..0b50c5153 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,4 +1,4 @@
-import ApiCoreVertraege from "../../api/factory/vertraege/vertraege.js";
+import ApiDetailHeader from "../../api/factory/detailHeader.js";
 
 export default {
 	name: 'DetailHeader',
@@ -76,7 +76,7 @@ export default {
 	methods: {
 		getHeader(person_id) {
 			return this.$api
-				.call(ApiCoreVertraege.getHeader(person_id))
+				.call(ApiDetailHeader.getHeader(person_id))
 				.then(result => {
 					this.headerDataMa = result.data;
 
@@ -85,7 +85,7 @@ export default {
 		},
 		loadDepartmentData(person_id) {
 			return this.$api
-				.call(ApiCoreVertraege.getPersonAbteilung(person_id))
+				.call(ApiDetailHeader.getPersonAbteilung(person_id))
 				.then(result => {
 					this.departmentData = result.data;
 				})
@@ -93,7 +93,7 @@ export default {
 		},
 		getLeitungOrg(oekurzbz){
 			return this.$api
-				.call(ApiCoreVertraege.getLeitungOrg(oekurzbz))
+				.call(ApiDetailHeader.getLeitungOrg(oekurzbz))
 				.then(result => {
 					this.leitungData = result.data;
 				})

From ab059e9099b9c52406aa5b6eb629bbe6e40fd697 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:29:54 +0200
Subject: [PATCH 0261/1357] refactored detailFilter for Mitarbeiter

---
 .../api/frontend/v1/stv/Config.php            |   7 +-
 public/js/api/factory/detailHeader.js         |  37 +++
 .../components/DetailHeader/DetailHeader.js   | 252 +++++++++++++-----
 3 files changed, 220 insertions(+), 76 deletions(-)
 create mode 100644 public/js/api/factory/detailHeader.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..138bdec67 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -29,6 +29,8 @@ class Config extends FHCAPI_Controller
 {
 
 
+	private $arr;
+
 	public function __construct()
 	{
 		// TODO(chris): permissions
@@ -162,11 +164,12 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
-		$result['finalexam'] = [
-			'title' =>  $this->p->t('stv', 'tab_finalexam'),
+		$this->arr = [
+			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
+		$result['finalexam'] = $this->arr;
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
new file mode 100644
index 000000000..f9f368bc7
--- /dev/null
+++ b/public/js/api/factory/detailHeader.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getHeader(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
+		};
+	},
+	getPersonAbteilung(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+		};
+	},
+	getLeitungOrg(oekurzbz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index a50b39e8c..0b50c5153 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,9 +1,21 @@
+import ApiDetailHeader from "../../api/factory/detailHeader.js";
+
 export default {
 	name: 'DetailHeader',
+	inject: {
+		domain: {
+			from: 'configDomain',
+			default: 'technikum-wien.at'
+		},
+	},
 	props: {
 		headerData: {
 			type: Object,
-			required: true
+			required: false
+		},
+		person_id: {
+			type: Number,
+			required: false
 		},
 		typeHeader: {
 			type: String,
@@ -20,87 +32,179 @@ export default {
 		appRoot() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
 		},
+		validatedHeaderData() {
+			if (this.typeHeader === 'student') return this.headerData;
+			if (this.typeHeader === 'mitarbeiter') return this.person_id;
+			return null;
+		}
+	},
+	created(){
+		if(this.person_id) {
+			this.getHeader(this.person_id);
+
+			this.loadDepartmentData(this.person_id)
+				.then(() => {
+					// Call getLeitungOrg only after departmentData is loaded
+					this.getLeitungOrg(this.departmentData.oe_kurzbz);
+				})
+				.catch((error) => {
+					console.error("Error loading department data:", error);
+				});
+		}
+	},
+	watch: {
+		person_id: {
+			handler(newVal) {
+				if (newVal) {
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.person_id).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
+				}
+			},
+			deep: true,
+		},
 	},
 	data(){
-		return{};
+		return{
+			headerDataMa: {},
+			departmentData: {},
+			leitungData: {},
+		};
 	},
 	methods: {
-		//TODO(Manu) finish for Vertragsverwaltung
-		getVorgesetzer(){},
+		getHeader(person_id) {
+			return this.$api
+				.call(ApiDetailHeader.getHeader(person_id))
+				.then(result => {
+					this.headerDataMa = result.data;
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadDepartmentData(person_id) {
+			return this.$api
+				.call(ApiDetailHeader.getPersonAbteilung(person_id))
+				.then(result => {
+					this.departmentData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLeitungOrg(oekurzbz){
+			return this.$api
+				.call(ApiDetailHeader.getLeitungOrg(oekurzbz))
+				.then(result => {
+					this.leitungData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		redirectToLeitung(){
+			this.$emit('redirectToLeitung', {
+				person_id: this.leitungData.person_id});
+		}
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+			<template v-if="typeHeader==='student'">
+					<div
+						v-for="person in headerData"
+						:key="person.person_id"
+						class="d-flex flex-column align-items-center h-100"
+						class="position-relative d-inline-block"
+					>
+						<img
+						  class="d-block h-100 rounded"
+						  alt="Profilbild"
+						  :src="'data:image/jpeg;base64,' + person.foto"
+						/>
 
-			<div
-				v-for="person in headerData"
-				:key="person.person_id"
-				class="d-flex flex-column align-items-center h-100"
-				class="position-relative d-inline-block"
-			>
-				<img
-				  class="d-block h-100 rounded"
-				  alt="Profilbild"
-				  :src="'data:image/jpeg;base64,' + person.foto"
-				/>
+						<template v-if="person.foto_sperre">
+							<i
+							  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+							  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+							></i>
+						</template>
+					<small class="text-muted">{{person.uid}}</small>
+					</div>
 
-				<template v-if="person.foto_sperre">
-					<i
-					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-					></i>
-				</template>
-			<small class="text-muted">{{person.uid}}</small>
+					<div v-if="headerData.length == 1">
+						<h2 class="h4">
+							{{headerData[0].titelpre}}
+							{{headerData[0].vorname}}
+							{{headerData[0].nachname}},
+							{{headerData[0].titelpost}}
+						</h2>
+
+						<h5 class="h6">
+						 <strong class="text-muted">Person ID </strong>
+							{{headerData[0].person_id}}
+							<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+							 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+							<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+							  {{headerData[0].semester}}
+							<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+							{{headerData[0].verband}}
+							<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+							{{headerData[0].gruppe}}
+						 </h5>
+
+					  <h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+						</span>
+						<strong class="text-muted"> | Status </strong>
+						 {{headerData[0].status}}
+						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
+						  {{headerData[0].matr_nr}}
+					  </h5>
+
+					</div>
+				</div>
+		</template>
+
+		<template v-if="typeHeader==='mitarbeiter'">
+			<div class="row">
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
+						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+					<img
+					  class="d-block h-100 rounded"
+					  alt="Profilbild"
+					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
+					/>
+					<template v-if="headerDataMa.foto_sperre">
+						<i
+						  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+						></i>
+					</template>
+				</div>
+
+				<!--show Ma-Details-->
+				<div class="col-md-10">
+					<h5>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}
+					</h5>
+					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
+						{{departmentData.bezeichnung}}
+					<span v-if="leitungData.uid"> | </span>
+					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
+					<a href="#" @click.prevent="redirectToLeitung">
+						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
+					</a>
+					<p>
+						<strong class="text-muted">Email </strong>
+						 <span v-if="!headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.uid+'@'+domain">{{headerDataMa.uid}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
+					</p>
+				</div>
 			</div>
-
-			<div v-if="headerData.length == 1">
-				<h2 class="h4">
-					{{headerData[0].titelpre}}
-					{{headerData[0].vorname}}
-					{{headerData[0].nachname}}
-					{{headerData[0].titelpost}}
-				</h2>
-
-				<h5 v-if="typeHeader==='student'" class="h6">
-				 <strong class="text-muted">Person ID </strong>
-				{{headerData[0].person_id}}
-					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
-					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-					  {{headerData[0].semester}}
-					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-					{{headerData[0].verband}}
-					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-					{{headerData[0].gruppe}}
-				 </h5>
-				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
-				 {{headerData[0].studiengang}}
-				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
-				  {{headerData[0].semester}}
-			  </h5>
-
-			  <h5 v-if="typeHeader==='student'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | Status </strong>
-				 {{headerData[0].status}}
-				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
-				  {{headerData[0].matr_nr}}
-			  </h5>
-			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
-				 {{headerData[0].status}}
-			  </h5>
-
-			</div>
-
-		</div>
-
+		</template>
+	</div>
 	`
-}
\ No newline at end of file
+}

From dc4f8bc6403527a5d9859831b4a289ec523b357d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:38:01 +0200
Subject: [PATCH 0262/1357] rename Stundenplan/EventTypes/calendarEvent.js ->
 LvPlan/EventTypes/calendarEvent.js

---
 .../Cis/{Stundenplan => LvPlan}/EventTypes/calendarEvent.js       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename public/js/components/Cis/{Stundenplan => LvPlan}/EventTypes/calendarEvent.js (100%)

diff --git a/public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
similarity index 100%
rename from public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
rename to public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js

From 0f9c98ddedf88b5274153b62085f0f51875fff92 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Jun 2025 16:56:58 +0200
Subject: [PATCH 0263/1357] messages add translation for tabulator pagination
 buttons, Tabs component add alternative rendering with primevue tabs and use
 it in stv details component

---
 .../Messages/Details/TableMessages.js         | 22 ++++++++-
 .../Stv/Studentenverwaltung/Details.js        |  4 +-
 public/js/components/Tabs.js                  | 45 +++++++++++++++++--
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 878cdbfbb..05355b96c 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -145,7 +145,27 @@ export default {
 				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
 				dataTreeChildIndent: 15,
 				dataTreeStartExpanded: false,
-				persistenceID: 'core-message'
+				persistenceID: 'core-message',
+				locale: 'de',
+				"langs": {
+					"de":{ //German language definition
+						"data":{
+							"loading":"Lädt", //data loader text
+							"error":"Fehler", //data error text
+						},
+						"pagination":{
+							"first":"Erste",
+							"first_title":"Erste Seite",
+							"last":"Letzte",
+							"last_title":"Letzte Seite",
+							"prev":"Vorige",
+							"prev_title":"Vorige Seite",
+							"next":"Nächste",
+							"next_title":"Nächste Seite",
+							"all":"Alle"
+						},
+					},
+				}
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 483b6ca7d..dd046de63 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -67,8 +67,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :useprimevue="true" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :useprimevue="true" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 		<div v-else>
 			Loading...
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index bd81f44f5..850bdacae 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -1,6 +1,13 @@
 import accessibility from "../directives/accessibility.js";
 
+import TabView from '../../../index.ci.php/public/js/components/primevue/tabview/tabview.esm.min.js';
+import TabPanel from '../../../index.ci.php/public/js/components/primevue/tabpanel/tabpanel.esm.min.js';
+
 export default {
+	components: {
+		tabview: TabView,
+		tabpanel: TabPanel
+	},
 	directives: {
 		accessibility
 	},
@@ -17,7 +24,11 @@ export default {
 		default: String,
 		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol],
 		vertical: Boolean,
-		border: Boolean
+		border: Boolean,
+		useprimevue: {
+			type: Boolean,
+			default: false
+		}
 	},
 	data() {
 		return {
@@ -47,6 +58,10 @@ export default {
 		}
 	},
 	methods: {
+		handleTabClick: function(index) {
+			let keys = Object.keys(this.tabs);
+			this.change(key[index]);
+		},
 		change(key) {
 			this.$emit("change", key)
 			this.current = key;
@@ -77,7 +92,8 @@ export default {
 					component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
-					key
+					key,
+					value: {}
 				}
 			}
 
@@ -99,6 +115,27 @@ export default {
 		this.initConfig(this.config);
 	},
 	template: `
+	<template v-if="useprimevue">
+
+	<tabview 
+		:scrollable="true" 
+		:lazy="true"
+		@tab-click="handleTabClick"
+	>
+		<tabpanel 
+			v-for="tab in tabs" 
+			:key="tab.key" 
+			:header="tab.title"
+		>
+			<keep-alive>
+				<component :is="tab.component" v-model="value" :config="tab.config"></component>
+			</keep-alive>
+		</tabpanel>
+	</tabview>
+
+	</template>
+	<template v-else="">
+
 	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch gap-3' : (border ? 'flex-column' : 'flex-column gap-3')" v-if="Object.keys(tabs).length">
 		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
 			<div
@@ -118,5 +155,7 @@ export default {
 				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
 			</keep-alive>
 		</div>
-	</div>`
+	</div>
+
+	</template>`
 };

From 074403abf5bd6c4b61c1630e5b418cb05e97fe60 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 17:27:33 +0200
Subject: [PATCH 0264/1357] Tab Notizen: show Name of verfasser and bearbeiter

---
 application/models/person/Notiz_model.php | 29 ++++++++++++++++++++---
 public/js/components/Notiz/Notiz.js       | 10 ++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 2e99d1cdd..1835296fe 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,8 +154,21 @@ class Notiz_model extends DB_Model
 	public function getNotizWithDocEntries($id, $type)
 	{
 			$qry = "
-				SELECT 
-						n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
+				SELECT
+						n.*, 
+						  CASE
+							WHEN person_verfasser.vorname IS NOT NULL AND person_verfasser.vorname != ''
+							  OR person_verfasser.nachname IS NOT NULL AND person_verfasser.nachname != ''
+							THEN CONCAT(person_verfasser.vorname, ' ', person_verfasser.nachname)
+							ELSE NULL
+						  END AS verfasser,
+						  CASE
+							WHEN person_bearbeiter.vorname IS NOT NULL AND person_bearbeiter.vorname != ''
+							  OR person_bearbeiter.nachname IS NOT NULL AND person_bearbeiter.nachname != ''
+							THEN CONCAT(person_bearbeiter.vorname, ' ', person_bearbeiter.nachname)
+							ELSE NULL
+						  END AS bearbeiter,
+						count(dms_id) as countDoc, z.notizzuordnung_id,
 						(CASE
 							WHEN n.updateamum >= n.insertamum THEN n.updateamum 
 							ELSE n.insertamum
@@ -173,10 +186,20 @@ class Notiz_model extends DB_Model
 							public.tbl_notiz_dokument dok USING (notiz_id)
 				LEFT JOIN 
 							campus.tbl_dms_version USING (dms_id)
+				LEFT JOIN 
+						      public.tbl_benutzer p_verfasser ON (p_verfasser.uid = n.verfasser_uid)
+  				LEFT JOIN 
+						      public.tbl_person person_verfasser ON (person_verfasser.person_id = p_verfasser.person_id)
+  				LEFT JOIN 
+						      public.tbl_benutzer p_bearbeiter ON (p_bearbeiter.uid = n.bearbeiter_uid)
+				LEFT JOIN 
+						      public.tbl_person person_bearbeiter ON (person_bearbeiter.person_id = p_bearbeiter.person_id)
 				WHERE 
 				   z.$type  = ?
 				GROUP BY 
-					notiz_id, z.notizzuordnung_id
+					notiz_id, z.notizzuordnung_id,
+ 					person_verfasser.vorname, person_verfasser.nachname,
+					person_bearbeiter.vorname, person_bearbeiter.nachname
 			";
 
 		return $this->execQuery($qry, array($type, $id));
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 13e969c50..2e516514f 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -95,8 +95,10 @@ export default {
 							return el;
 						},
 					},
-					{title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false},
-					{title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false},
+					{title: "VerfasserIn", field: "verfasser", width: 124},
+					{title: "BearbeiterIn", field: "bearbeiter", width: 126},
+					{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},
@@ -187,7 +189,7 @@ export default {
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('verfasser_uid').component.updateDefinition({
+						cm.getColumnByField('verfasser').component.updateDefinition({
 							title: this.$p.t('notiz', 'verfasser'),
 							visible: this.showVariables.showVerfasser
 						});
@@ -199,7 +201,7 @@ export default {
 							title: this.$p.t('global', 'text'),
 							//visible: this.showVariables.showText
 						});
-						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+						cm.getColumnByField('bearbeiter').component.updateDefinition({
 							title: this.$p.t('notiz', 'bearbeiter'),
 							visible: this.showVariables.showBearbeiter
 						});

From bd5925e1d694ec730236cacd9086925b64f1db60 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 10:58:43 +0200
Subject: [PATCH 0265/1357] phrases for author and editor UID

---
 public/js/components/Notiz/Notiz.js |  6 +++++
 system/phrasesupdate.php            | 40 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 2e516514f..44cc56374 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -193,6 +193,9 @@ export default {
 							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
@@ -205,6 +208,9 @@ export default {
 							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
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1c7b5432b..2fc8ff900 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24911,6 +24911,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'verfasser_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfasser*in UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'author UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bearbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeiter*in UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'editor UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',

From 7d9197670411601b37a629197bee38e8e9026019 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:18:54 +0200
Subject: [PATCH 0266/1357] remove use of component moodleSVG

---
 public/js/components/DashboardWidget/LvPlan.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 94e79328a..f180c47e6 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -4,7 +4,6 @@ import FhcCalendar from '../Calendar/Calendar.js';
 import LvModal from '../Cis/Mylv/LvModal.js';
 import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
-import moodleSvg from "../../helpers/moodleSVG.js"
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 import ApiOrt from '../../api/factory/ort.js';
@@ -18,8 +17,7 @@ export default {
 	components: {
 		FhcCalendar,
 		LvModal,
-		ContentModal,
-		moodleSvg
+		ContentModal
 	},
 	
 	data() {

From eb357012803400eac5518c9e609ba42ffe3eb9f4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:32:31 +0200
Subject: [PATCH 0267/1357] Tab Gruppen: rewrite inital filter and watcher for
 working in firefox

---
 .../Details/Gruppen/Gruppen.js                | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 67f422efb..4ecf26d6e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -23,13 +23,19 @@ export default {
 					ApiStvGroups.getGruppen(this.student.uid)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				initialFilter: [
-					{field: "uid", type: "=", value: this.student.uid},
-					[
-						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
-						{field: "studiensemester_kurzbz", type: "=", value: null}
+				initialFilter: {
+					logic: "and",
+					filters: [
+						{ field: "uid", operator: "eq", value: this.student.uid },
+						{
+							logic: "or",
+							filters: [
+								{ field: "studiensemester_kurzbz", operator: "eq", value: null },
+								{ field: "studiensemester_kurzbz", operator: "eq", value: this.currentSemester }
+							]
+						}
 					]
-				],
+				},
 				columns: [
 					{title: "Gruppe", field: "gruppe_kurzbz"},
 					{title: "Bezeichnung", field: "bezeichnung"},
@@ -146,18 +152,17 @@ export default {
 	watch: {
 		currentSemester(newVal) {
 			if (newVal) {
-
 				this.$refs.table.tabulator.clearFilter(); // Clear old filters
 
-				this.$refs.table.tabulator.setFilter([
-					{field: "uid", type: "=", value: this.student.uid},
-					[
-						{field: "studiensemester_kurzbz", type: "=", value: newVal},
-						{field: "studiensemester_kurzbz", type: "=", value: null}
-					]
-				]);
-
-
+				this.$refs.table.tabulator.setFilter((data) => {
+					return (
+						data.uid === this.student.uid &&
+						(
+							data.studiensemester_kurzbz === newVal ||
+							data.studiensemester_kurzbz === null
+						)
+					);
+				});
 			}
 		},
 		student() {

From 57d71be7924c95a5aedc051b4e74e827b7a71c29 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:39:23 +0200
Subject: [PATCH 0268/1357] revert change of loaded StudienplanModel name

---
 application/controllers/api/frontend/v1/Studium.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 116217a84..e73fa6d85 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,7 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
 		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
-		$this->load->model('organisation/Studienplan_model', 'LvPlanModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
@@ -143,8 +143,8 @@ class Studium extends FHCAPI_Controller
 		if(!$aktuelles_studienplan){
 			$aktuelles_studienplan = null;
 		}
-		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($lvplan) use($parameter_studienplan){
-			return $lvplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($studienplan) use($parameter_studienplan){
+			return $studienplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}

From 44b538885f6a642c36a98eef9dbd9c4b2fd42c58 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:40:24 +0200
Subject: [PATCH 0269/1357] use additional result variable

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

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 00183cce8..63da7892c 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -81,7 +81,8 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$lvplan_events = $this->getDataOrTerminateWithError($this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id));
+		$res_lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
 			$lvplan_events = array();

From 43c868000cd85618d5f2a2b92cf36e90432a920b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 12:05:17 +0200
Subject: [PATCH 0270/1357] LvPlanLib getLvPlan use success or error object for
 all returns

---
 application/libraries/LvPlanLib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/LvPlanLib.php b/application/libraries/LvPlanLib.php
index 709762ddc..ef0ad0920 100644
--- a/application/libraries/LvPlanLib.php
+++ b/application/libraries/LvPlanLib.php
@@ -79,9 +79,9 @@ class LvPlanLib{
 			$lvplan_data = getData($lvplan_data) ?? [];
 			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
-				return $function_error;
+				return error($function_error);
 			}
-			return $lvplan_data;
+			return success($lvplan_data);
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -102,7 +102,7 @@ class LvPlanLib{
 			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
 			if(!$lvplan_query)
 			{
-				return [];
+				return error([]);
 			}
 			
 			

From f017f096f11b413c1814a5f0608b186306b8c86d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 12:13:08 +0200
Subject: [PATCH 0271/1357] add missing component lvinfo, change path
 Stundenplan to LvPlan

---
 application/core/Events.php               | 2 +-
 public/js/components/Cis/LvPlan/LvPlan.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/core/Events.php b/application/core/Events.php
index cc61cd509..037ce90da 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -6,7 +6,7 @@ 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/Stundenplan/EventTypes/calendarEvent.js',
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js',
 		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
 		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
 	);
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 3ddeaaa6f..b6d61fcb9 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -3,7 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import lehreinheitEvent from "./EventTypes/calendarEvent.js"
-
+import LvInfo from '../Mylv/LvInfo.js';
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -73,7 +73,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, 
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
 	},
 	computed:{
 		

From e133f67de25d379b5f5a5165bdb1c235969f4f84 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 12:32:48 +0200
Subject: [PATCH 0272/1357] fix(LvPlan calendarComponent renderer async modal):
 updates the logic to display the modal for the lv information

---
 public/js/components/Cis/LvPlan/LvPlan.js | 41 ++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index b6d61fcb9..575604d4c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -28,6 +28,7 @@ const LvPlan = {
 			renderComponents: {},
 			isModalContentResolved: false,
 			isModalTitleResolved: false,
+			isShowModal: false,
 		}
 	},
 	props: {
@@ -50,7 +51,17 @@ const LvPlan = {
 	},
 	inject:["renderers"],
 	watch: {
-		
+		modalLoaded:{
+			handler: function (newValue) {
+				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
+					this.$nextTick(() => {
+						if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+						this.isShowModal = false;
+					});
+				}
+			}, 
+			immediate: true
+		},
 		weekFirstDay: {
 			handler: async function (newValue) {
 				let data = await this.fetchStudiensemesterDetails(newValue);
@@ -76,6 +87,9 @@ const LvPlan = {
 		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
 	},
 	computed:{
+		modalLoaded: function(){
+			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved:this.isModalTitleResolved};
+		},
 		
 		downloadLinks: function(){
 			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
@@ -112,19 +126,11 @@ const LvPlan = {
 	methods:{
 		modalTitleResolved: function () {
 			this.isModalTitleResolved = true;
-			if(this.isModalContentResolved && this.isModalTitleResolved)
-				Vue.nextTick(() => {
-					if(this.$refs.lvmodal) 
-						this.$refs.lvmodal.show();
-				});
+			
 		},
 		modalContentResolved: function () {
 			this.isModalContentResolved = true;
-			if (this.isModalContentResolved && this.isModalTitleResolved)
-				Vue.nextTick(() => {
-					if (this.$refs.lvmodal)
-						this.$refs.lvmodal.show();
-				});
+			
 		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
@@ -203,8 +209,12 @@ const LvPlan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			this.isModalTitleResolved = false;
-			this.isModalContentResolved = false;
+			if(this.isModalContentResolved && this.isModalTitleResolved){
+				if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+			} 
+			else{
+				this.isShowModal = true;
+			} 
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
@@ -284,6 +294,7 @@ const LvPlan = {
 	template:/*html*/`
 	<template v-if="renderers">
 	<h2>
+		{{JSON.stringify(isShowModal,null,2)}}
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
@@ -291,12 +302,12 @@ const LvPlan = {
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
 		<template #modalTitle>
-		<Suspense @resolve="modalTitleResolved">
+		<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
 			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
 		</Suspense>
 		</template>
 		<template #modalContent>
-		<Suspense @resolve="modalContentResolved">
+		<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
 			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
 		</Suspense>
 		</template>

From aed293f93d143373289edd90c5b4a615a47e3b5d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 13:55:50 +0200
Subject: [PATCH 0273/1357] fix(removes debug print in LvPlan): removes debug
 prints and changes parameter for the showModal function in LvPlan Day View

---
 public/js/components/Calendar/Day/Page.js | 2 +-
 public/js/components/Cis/LvPlan/LvPlan.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index ef2c6ada7..91af3e48a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -283,7 +283,7 @@ export default {
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
-							event.lehreinheit_id,
+							event.lehrveranstaltung_id,
 							studiensemester_kurzbz
 						)
 					))
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 575604d4c..c4dca0e5f 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -294,7 +294,6 @@ const LvPlan = {
 	template:/*html*/`
 	<template v-if="renderers">
 	<h2>
-		{{JSON.stringify(isShowModal,null,2)}}
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>

From 06c822fd84cc56a8e9e05f7deae5748c4af83c34 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 14:01:27 +0200
Subject: [PATCH 0274/1357] fix(foto for Studiengang information widget): adds
 foto property for studiengangs personen that are displayed with a foto

---
 application/models/organisation/Studiengang_model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 7ea8a901c..0195c056f 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -716,13 +716,15 @@ class Studiengang_model extends DB_Model
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
 		$addEmailProperty($gf_ltg);
+		$addFotoProperty($stg_ltg);
 
 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
 		$addEmailProperty($stv_ltg);
-		
+		$addFotoProperty($stg_ltg);
+
 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))
 			return $ass;

From 565925abb29a73119bf8b7be29066f6d33fb94da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 14:03:32 +0200
Subject: [PATCH 0275/1357] fix(typo)

---
 application/models/organisation/Studiengang_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 0195c056f..3afdb493e 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -716,14 +716,14 @@ class Studiengang_model extends DB_Model
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
 		$addEmailProperty($gf_ltg);
-		$addFotoProperty($stg_ltg);
+		$addFotoProperty($gf_ltg);
 
 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
 		$addEmailProperty($stv_ltg);
-		$addFotoProperty($stg_ltg);
+		$addFotoProperty($stv_ltg);
 
 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))

From 982373d03b0633d019667c2fb1bf6ec1f649a450 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 15:53:35 +0200
Subject: [PATCH 0276/1357] style StudiengangInformation

---
 public/css/Cis4/Cis.css                       |  6 +++
 .../StudiengangInformation.js                 |  2 +-
 .../StudiengangPerson.js                      | 40 +++++++------------
 .../StudiengangVertretung.js                  |  2 +-
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 61f70b68c..80948023c 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -774,4 +774,10 @@ html {
 
 .abgabe-zieldatum-border-green .abgabe-zieldatum-overlay {
 	color: green;
+}
+
+.stgkontaktinfo {
+	display: grid;
+	grid-template-columns: 25px auto;
+	word-wrap: anywhere;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 5c3a80875..aa2438044 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -30,7 +30,7 @@ components:{
 template:/*html*/`
 		<div id="fhc-studiengang-informationen">
 		<template v-if="studiengang?.bezeichnung && semester">
-			<div class="card card-body mb-3">
+			<div class="card card-body mb-3 border-0">
 				<div class="mb-1">
 					<h2 class="h4 mb-1 pb-0">{{$p.t('lehre','studiengang')}}:</h2>
 					<span class="mb-1">{{studiengang?.bezeichnung}}</span>
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 3b9481013..4e15e0a42 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -15,37 +15,27 @@ export default {
 		}
 	},
 	template:/*html*/`
-	<div class="card" :style="{'width':displayWidget?'12rem':'15rem'}">
-		<div class="bg-dark d-flex justify-content-center">
+	<div class="card border-0" :style="{'width':displayWidget?'12rem':'15rem'}">
+		<div class="d-flex justify-content-center">
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
-		<div class="card-body">
+		<div class="card-body p-2 flex-grow-0" style="min-height: 50px;">
 			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
 		</div>
 		<hr class="my-0">
-		<div class="card-body">
+		<div class="card-body p-2">
+
+			<dl class="stgkontaktinfo">
+				<dt><i class="fa fa-phone me-2"></i></dt>
+				<dd class="mb-3"><a class="fhc-link-color" :href="phone.link">{{phone.number}}</a></dd>
+
+				<dt><i class="fa fa-home me-2"></i></dt>
+				<dd class="mb-3">{{ort}}</dd>
+
+				<dt><i class="fa-regular fa-envelope me-2"></i></dt>
+				<dd class="mb-3"><a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a></dd>
+			</dl>
 
-			<div class="flex flex-column gap-3">
-			<div class="mb-3">
-				<span>
-					<i class="fa fa-phone me-2"></i>
-					<a class="fhc-link-color" :href="phone.link">{{phone.number}}</a>
-				</span>
-			</div>
-			<div class="mb-3">
-				<span>
-					<i class="fa fa-home me-2"></i>
-					{{ort}}
-				</span>
-			</div>
-			<div>
-				<span>
-					<i class="fa-regular fa-envelope me-2"></i>
-					<a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a>
-				</span>
-			</div>
-			
-			</div>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index 142050e9e..5fb86bba7 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -5,7 +5,7 @@ export default {
 		showBezeichnung:Boolean,
 	},
 	template:/*html*/`
-	<div class="card mb-3">
+	<div class="card mb-3 border-0">
 		<div class="card-header">
 			<span>{{title}}</span>
 		</div>

From 3adaf8a52847373467ddcc999cbbd9ab44a02a8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 16:57:27 +0200
Subject: [PATCH 0277/1357] make logo configurable in theme, add fhcomplete
 logo as default

---
 application/config/theme.php                  |  1 +
 application/views/templates/CISVUE-Header.php |  2 +-
 public/css/Cis4/Cis.css                       |  4 ++++
 public/css/theme/default.css                  | 14 +++++++-------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/config/theme.php b/application/config/theme.php
index f16482bea..715c4e39c 100644
--- a/application/config/theme.php
+++ b/application/config/theme.php
@@ -7,4 +7,5 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['theme_name']='default';
 $config['theme_css']= "public/css/theme/default.css";
+$config['theme_logo']= "public/images/logo_fh-complete_300x46.png";
 $config['theme_modes']=['light','dark'];
\ No newline at end of file
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 2f7a3877c..358fc75c9 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -28,7 +28,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 <header id="cis-header" class="navbar-dark">
 	<cis-menu 
 		root-url="<?= site_url(''); ?>" 
-		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
+		logo-url="<?= base_url($this->config->item('theme_logo')); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:searchbaroptions="searchbaroptions" 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 80948023c..57617ec8d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -780,4 +780,8 @@ html {
 	display: grid;
 	grid-template-columns: 25px auto;
 	word-wrap: anywhere;
+}
+
+.mylv-semester-studiengang-lv .card-header {
+	min-height: 55px;
 }
\ No newline at end of file
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 7f39cff54..fe05d8d8a 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -35,8 +35,8 @@
 	--fhc-blue-40: #61aed8;
 	--fhc-blue-50: #00507e;
 
-	--fhc-blue-primary: #00649c;
-	--fhc-blue-primary-highlight: #005585;
+	--fhc-blue-primary: #006095;
+	--fhc-blue-primary-highlight: #0086CB;
 
 	--fhc-red-10: #842029;
 	--fhc-red-20: #800000;
@@ -54,8 +54,8 @@
 
 
 	/* fhc base colors */
-	--fhc-primary: var(--fhc-blue-20);
-	--fhc-primary-highlight: var(--fhc-blue-40);
+	--fhc-primary: var(--fhc-blue-primary);
+	--fhc-primary-highlight: var(--fhc-blue-primary-highlight);
 
 	--fhc-secondary: var(--fhc-white-20);
 	--fhc-secondary-highlight: var(--fhc-white-40);
@@ -97,14 +97,14 @@
 	--fhc-dark: var(--fhc-black-30);
 	--fhc-light: var(--fhc-white-50);
 
-
+	--fhc-cis-menu-lvl-1-color: var(--fhc-white-50);
 }
 
 :root.dark {
 
 	/* fhc base colors */
-	--fhc-primary: var(--fhc-blue-primary-highlight);
-	--fhc-primary-highlight: var(--fhc-blue-primary);
+	--fhc-primary: var(--fhc-blue-primary);
+	--fhc-primary-highlight: var(--fhc-blue-primary-highlight);
 
 	--fhc-secondary: var(--fhc-black-50);
 	--fhc-secondary-highlight: var(--fhc-black-70);

From fce55e38aeb132123a2758367ac4e05f99b7a6d3 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Jun 2025 17:18:52 +0200
Subject: [PATCH 0278/1357] more & better anw phrasen

---
 system/phrasesupdate.php | 114 +++++++++++++++++++++++++++++++++++----
 1 file changed, 105 insertions(+), 9 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9a461650b..ad0f7e347 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30087,18 +30087,58 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'entschuldigungAutoEmailBetreff',
+		'phrase' => 'entFullEmailBetreff',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
+				'text' => 'New Excuse note for digital attendances - a new document has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entNewEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wird nachgereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Excuse note for digital attendances - Document will be submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entEditEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wurde eingereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances - Document has been submitted',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32004,17 +32044,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
-
-				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.
-
-				Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.',
+				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32500,6 +32536,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseintrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Entry',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'highlightsettings',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datumsmarkierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date Highlighting',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 40a0affed98af637f433c6d4df2087830b933204 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 17:38:17 +0200
Subject: [PATCH 0279/1357] add neutral fhcomplete logo for default theme

---
 public/images/logo_fh-complete_300x46.png | Bin 0 -> 10198 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/logo_fh-complete_300x46.png

diff --git a/public/images/logo_fh-complete_300x46.png b/public/images/logo_fh-complete_300x46.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a96da17fa3de007b2b722237acd9ca41d00a26
GIT binary patch
literal 10198
zcmV;{Cn?y8P)<h;3K|Lk000e1NJLTq00Arj001rs1^@s6lENg)00004XF*Lt006O%
z3;baP00001b5ch_0olnce*gdgAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2k8b34jm#Go2mc+03ZNKL_t(|+U=cpcpFu^|34$iO|s?QojC3(j-7<`UN%5T
z=skhJ!Ub-CrTuo{E-Xt~dR<ruEG%{Dp(i0^lK>&TS0^s99rq^Nk|h^e*39n@$&yCJ
zaT1f8+~|FtJn@Xq%$%7s=R4o`J#P`X@pXyQMU(*$8Ubo8goN3)+jP)Sj$i!Z7r&_f
zSFbK8Kof2UC@lnqc(w_T1!FUGwE0KNFMja@mQ4Z#f$5P!C<WWL<ifjp|CC&IN-lp`
zfh~q^x}{^0H35P(posu=nC)*taqM1dBK&~WACV+bD#0p(aN?&)2~;vUE|dV3f_jsg
zb-Io-_?gIGKfnAR0IZ7=G~9FXD8fU79H1nMB9bH_*@4RS9}-ANh@yQPiB@A5&#owB
zYg@OQnx}%WXd9CX4z+C`uc);reWS0PKY|OUj_7y${Y8~r^6#yV?c0aN@yA6o9ot*>
zm$B%Jo&7r3w~Hr}m!0C6L5p5k!4`ezN#E1Vs1R<RHH`f1Wa47Ni3n2@pi&}=62^`$
z48{%`bOtu>KgxaUiuyd)?=z!WI6If&8Og-QXi+K@4h-xxcT-i@%(jC^d1lo?4tHAm
z)xT$EWOCKqF|vLC`fe*v?WpY6@$X)o&&+W-vVBi|_%r`1Zt`wXP%0>Y;wpjzRR{_N
zN~ID62v8~M=@BuT%{1#x6qeWX@%lo(t~U6*_Sz-0Nl%Wk;hX@YA6|xD?4R{y=l%1E
z(rWtuZhp0im-f^Eu=3_<3`<Kq;di36vVpm8tp{LKcrai8>7wKK-bu`S@*AqUdQNY^
zx^V1Z!b1aPpd?BX$o{s0l(P*;lIYmhssounB9^UNYFy492!ls}D&XXL85m*%I_rr)
z$oNPNY4#VeKcZ`qzs!;9K-uv}Ynu9fuH@Ko$FUNi4p5xb<H%PB@Z6$F%osP6pa9Pg
zfI=w{8Kx#OOwEv_7y?vE@BvuUB7%AL#_3ELnSny#NkIew)WLz|q$QG*mdM4kM)BTv
zTex>^;W7I;Dl5t3nO`t5yWfEIyNSaXln^D`Hzp$vd;pe05J-uSL=b#XsnB5Jqr(}V
zk<3N2Mzdj85li0NK#`XTni3Zw>-+J1W(Oxk6B`-Y@Agrl!9K5hyka(+9e;<Yl*e^0
zQIZH$C^(%(1rQjZaIhr@s}e;UC?UBqEF7##bZsL_1i4Q{O~lEARqw3PghN~NSx<?t
z9vs2TcV0kZY()RTS8wvV|K_Y1p1J)3Vj}uKxxzz3xO>rTQWGM$?4zxHwoQokWX2=2
z2cc02v>$`5T%R6AiW^t~3`vX}m=|BEVAl9yd><dl+$X=K(jxlxtusX>lterD_)z~u
zNt6MV<i@;2*Y>VrF%Mi%)dLGyoA#7YR-^Mxt!r9NyTSThjGEW(y^xrQFxmd5RwMfg
zE2(bKBZ?vlg@VX%HK~bF3{H%pUgv55yF6LTi+@-^c$nI;&nikBD6VANfeK3NS_xDt
zNK1@l+=x_ivr-%kOaLyOGln->j4b(~z-ND>y|4^zXbAUDNac|&NBg|j%ctacH95sa
z_1`>D+t|uq-(5>fXAfzSAq-EAVfr~)WDSmYw8>6QVCkYsEO>v@Z!%`4PBY6^_iZ}Z
zQR-xj%QqCTuejQyP4?h8Cgf!}ws#ejbEv%D^PZcGKCg4MR>#lVi~3XvTf2Ksf4~x5
z0LT@19Ka;XfvOk0Y;4T_zvu<9I@>_Bf<k%nJq-yP&>P=VRLvh&A3meLE-&6PM+R1w
z9xI>!xPx22*+XX^j3q8W{`}PnfoE?!R|ZxshIXEOZw)W)t93iN3YPEZfpb!L@W#1l
zL!B$R*DsjJ=UdD8rNz@8rxXNYBE65<?6H~01gx>SL%gf@G5rUuu5JtO6xqR`vK98#
z!uR`G@%yRFpPuKm1&$xe;7_(v*=-&0G3)N`;im8Q^}GFFHkNta|IS5uGQcV>uV?XB
zdycCw&3e;u_2qOFMK3T}MbQB|Hjok##a_d@DBBh#(f-d4RH75e+#nme+6Shm0YMND
zeAZIo$0w(empw>kZ+P|7pSk|4-F<=;K%+%I5nrA+f{a0Nj_vkNGk3oHofoij%Cozw
zdGL)N=(ae&z?zUC{&ev<Ufa)02qiesX%1-baxTW?<qSfr@V#VrLq;@7v5{VnjgAOK
zqd2+czH2|&gs#;nyN`t<6Y<L#0$5IlC3*oWt0z$Pf|S_X-UeQxH@Aj?bVmpcKWhi-
ziaGhR?XCNc@W-EukNZ4I;KCVsvV9+|+{ULB`ePpZ`k@BaZIiRo3Hj+>+m26*k*OLb
z6;Aa<s|n%038}u-!Kpd)+RY87PT2xSNKhbCV>KuBERCYXk;+EdzLeN-KN_4d49fvN
zPN3>#RlVw;Xjct=0hMHTgYb}c{lN8BeRjT7GowPtPEC-rt8aFk(7Em$nJ6>Z>+~ib
zSXI#P<NvXI4^|gO7abnTO<A5RQJKk6GSzkW;VQX3Zd|6%Yn(H}sSZ}u=+L*x{lKPY
z#hvss?d*1Q&G7qZommXa>IPH}Rwde4l_ZKzpmMc$IrdB50n6M0J(hv#ZE)yW`DR@*
zCKaX9xdK~V-@@mWC-xzjkuPU9`->_ui2aYwTGeQxx?aBcF+MxNqg{fFt;t~OWaZAI
zGLu1W)*!-_o@04aRt!llfV#J+ie`h{tdN=zanjE;K1yz1t7<U#(claaRWD_iTvh^Q
z#&p}#A)+YaZ0q7sDoQff2d~m)gwUvy@2yg0^N#N_4b0v5HBXO$i%}7wJUt_;UzgE_
zg`8A3b5dhv+ed44Cw#87q-fdp!P5HUK1WSsE2&9NR+SRx$$VW|oZi^M*EI%e8e2(;
zx7nt`LqoWCd@7G_IqIek4s|j~QR0g&rOX>ONUpxcpPXyM4H?m74{_S8I=Z^~=s?|X
z!w3`t3)7>0{%-EE@>Qk&luY)(09BuTX>K>Oy1{fN0G8-*6cr^oP|4gJz>80oD0g%4
zChctl16W}5?HT~U`mf8TapT2PeExp>OW*SEBffzlKYI}Q*@I5WAVr7EZ8nX~CvF!E
z*Q#aPm3=IO`;x{M`STA`2YCXzOP||}HkEE)VWkXgW{=I30hR(7Gu+7lD{6JDtT&Qb
z(<*0g(b|&&t7n(YL*>F)H}5T>#$x?V#x5dE&BqU4?elk?p`EYp`QVhiM<cUR`s~Z@
zLlvxke&y*8SfYeurO(yF-5sc$p6@n#BDpay-+(occC0WM0C%k5z`lK#1C^(b>KPmy
zDBEu9=sxks=XS2{?&DY2EpEpMZgezKr64NY>4Vj)(tW+Dhzn-qJ6h*w4<cA0&}COi
zZy6d#LX4BG?L1Tgz|ZB)NRs66V2|pjqpLPFgxAg=PFqJeDKTLT&qyRMdyviZ-!4t9
zMjrfRt6$eT(^Nu-bEu2)+yP$n<@xReHGJ7Zdb**z3jzngEg?vKT0FS!9xG-`|D5cC
z162elPuv&H)qVw_R16%LDpksp?vMM2>hknx8H1^_JFdQ4qT`7sy+d8phK6we_*5R>
zYGYZKOmW5yN)mjz$+il*-_(uX*h!?F9Y%$Rk`}C@{1`EBF%e<harI2!Dv;j9pI%?d
z4x{-udrw43lDTDge9Jq#PuV+bv5Iu{@qubLTh0)`lKE2gr2=|!9(DD6@5?CEX&e~9
z8X)iakAB$354(Kl+1gm$w-I*Z?qcRF{kdP)+VRJEjLl6u;lB3t$kmmI&=a?bb-KNj
zapA}R0nmoYk8wAO4^5HVnChCHYUi#)6)c$Hv~SHFm+1hk(ZihTU{ymiU%1$IS`8)#
zU?~*>=M9PC&BDeLd!AO2?FUNvpAR>%p|$HbonZR54x;ZqhRSz}$o&4oO2$6_!~c3e
z28Lnz%+6p_{~W)2VOdTV)(2p97;L$%PI%T@Z0FEb57>+JY1xT~-w3C0fKBc4NtF_R
z;;UpvliVvkGbIWrJ+5=4#L2H;TrJnp)05=(%HldF_<y&#hy^p8K4rOCDX0|!i?U*f
zcd<?FIV2B|ZfI#E-No5;L~1k~1F*Wx7WBq;1VO;uZ9&&+qPU`wPd60teVy^t&9c)4
z2n5dfMRu1}LiY>}eb}kIu`pkLSPs5vu<?AMpHED*+PvgD47Ov<9h|LF=N1b%B>BXF
zzg}lxq|0K#@uo5vr3oZ0#R(i%QDoJD8d;kp7ncUBD6!_K(`f!qv5v=@^bXgBh%hy`
z<|Z&})DW3E`1NMFQ*3Rcobje69DAj(wyBkjhrje2e*O=M!lt|S*ceo=|CQt#j$^Z3
ziM=e$%@@n{ICEbS@1nJD(CH21X|0FqLMYvB`@f~`tOhH9ZHMKoGCCrZM<)$Ap>ypn
zmWSWuq$P6had?hDupo~hmj#Q`sz!cwizSS42~ak5bjeoWBw&x-nBFVX^HRypN_GKg
zJs+0JSzC3J9I)b}wf@<AwgT3wf+qAPvmJyyz1Y3(6P?baR#Bqa)Xkc*W4If%y7~NA
zx}dEI>Pl?@RapQ{m9}smN%D`5UH-nemR2`!@0%~4$l$=^H<&NoQZ6$B2dI=he9feO
z9eZh#mJ4UdLxfgt@br>*4SF^hJ3K6#UvH9U3>cQ4NJ_lZKWJ~EXTGd`N98UiuB(ZD
zIeSC}u+d;)%lAjf4^iQ|nlJS-A6(KT%UF?Z+bl{PGWR2&kg?fjG!F`~fs)1SAAx>|
zMUq&*vxrM(k9M(RMe+T8^H}`qYW8>Ze|4v_+sfuWCCr`V%)UBhbQbSk+|*|z|AK^2
zUb}lfnh>YYRe6n$2i@Ws^Fsp((>NDbn!V)WdbdQ!-(1wftkeYA%IAtLo-vZ^D_iNY
zijLLCsPIr!0`&O5YiA!|0azv2-Ej(X;dGe>&Qtv?lD~Yplc}RKW$YzCXD~lKc`d6p
z9ptl(C9JG>8j{C^1#xL!5>rMF!O-5trT^aI`0a^h+nF#j-H|Fr5Cm?#cnZVP6L@R+
zPTo7>RL4eY0=WPDTrQq9S_VX2W(!Y#@Dp8bOn6RaED9GpWs8sGfqM>DH~`BPtQuR|
zc=NEQF}=)e#bE3p+U|oDst#gmw3=T|QNH=X>HrdaEGk(g`b-<GIEEXF*GwnBl}dGt
zzKEi9W&oC7PH!pbwD7lg*YNZm3uMlp(Gj6sH-93FE|@@Pw}p-_3&DXZ)Ioucm-AqW
z+y?e*YbP&${1bn<`Fw{Hr69n>ybLCc%-|(c2L@9o0V*Z2kzq1NO8~Q_hvz?B%R42W
zkpS*44NZFQ>4lbWDPjKfd{5P{u+pb<Ok+!%1F!&QWXAG~uHuwD|Lw2b?DIE+sgvlt
z-}m}kq*g=MKX2{x+)uy1hDSD){pR;DdT45&eGw&z;rF~pS%<|BSbjNqdG%mDyuO0J
z+%%V1x8!(&AfOHkL>(09IcdT@jp~nYtw5#t5BDsZMVLC+<vg~PyNEFF{#m+KBhP%e
zju-cO&z+UzmZs%sgZC(hw+b71RA=z8MXlO?#OM7tx60XCT4E${Y5=P*XWhP7i(oH;
zaiZrQXm+LOBblZsNgh!Pr<*AJFmUF9*3<_-<*PNjXlgySFHx(pgTrOs1AG6vxtuE>
z{hVKR6w=Yvx5sshp`CBm?PlgfpZWwVfMhoxt+IOW4!DwCEtCP0!Ne>3eV@CkQ4W5C
z6C(XD#91anZ{_DJl0wLg4Mst)b0~I)P}h{mwpXp!dDKzvOM=oC3oDwuQ^{nN!0ZGi
zp#g%+d2vg}j4UL`wVYVD2s>H?j#y3{{jW&YlAGe3Oj}BItUeC=#}sW4bB8%|ftNKJ
z`LMjTU&r2(6-{!KljXd#yN0R(3bwr=BbrG=6N!%sMH3W&C`q(+bW^KqV|z&hpB(L9
zA2WkgEF7IeetJCNVIe4#3Ph`jPH$pcVJ)xiufx(0L(5$w;)x1%8s^{MQ^QdosfTAr
zg)lwK=~LEd=wxZ3?`lMIW7JH^aAt|9Y3bl?7qwIn1RfbT$l)B>YBKXmLBk0>*E@&D
z5fj$G$c!$Fm1lN4ebN3jDhW+c|CN`Yi<?;A+IQKv1@Rij4soue?yGF!o4USj!3hBh
zmW)ZE-&QFJUf5ZM=`^-u3EcR)bmI^W=jO+_WNYXJCb@?@_zvF@MTwOMjjYsp8txw&
z8AME|!XvwbdsYb1^*6V)H6}Csy)=*>{NfkCoUNh)NRJJ+Ie)r=Qm@l!UqIy=o|6`-
z0yn@4RY0^_;Q$~}6zu?oTOCBvtxAvl+-enM1WFWj`%^>u#V=<yV2N%Ob0oLwIZl=(
zIaE5)HIA@%zZdcuDA)kVqw0<*dQ{x$4W@R40=bnQ3lJpyxorL7m$MwO<f@;i`sa)#
zlqdUhXIZ}TVL8>nUa%9r0+mNVwF?syB@z5if`0LfAFz%~{qs?9wHJWAi6}~*b}F$i
zpu#(l`NzvIe(?jAFLltT`e*;GmzB9zfA-3-?CPJqy(m*TT~pNf0y4k&#V>xqax=2a
zt3LOc(9d0^^TL57z$%H*hx+Hrth^cA9oP1AEWh~04_ICk`1wreC;4<e@TC$;R<Zx;
zpKGE(k7N7;<`=*C0n5iKAuh&ruj!Gc-qk$Uq<@|a%R6iGVyAMkkKuM*KU(?4FMhED
zma9EV@<@ejvoX=9N+*fFZCJJla2p_j-QFek!MJ4C9T<j{9H1my8$?8)k~WK#bw0e@
zFHQ(Wlq8lncn0lG&;}71q~ho14$Lm-9IFtRnJAC#TUOJ?IblJhXaZ0O0^6HAsIhx|
zCn^P|Cdk{bs5O$W31Dz|Fw1J%7#^%*c(gN~uiGl}UA=eD<{?2U@*;!T*V;ve+35#2
zH9UyK&>(g<wNvWiZ9Y~LNLoZNW%^EbwcDZ-vV)Z5$7rZEn%UH5MgV5TsEG(v($dw#
zFD^;?E{xaEVG&tp-<KVzBtKTeeqB37X4`cF6#{c(HPm%j*zKjr!}&34!h%$MS<~iF
z^k+o|6Qd4fN27_OF3BJ#X@f`!3u2$Honrg>lT-?(#D~(=V|9#GPLPtk7!7-y+9|Q$
z?~ni`<Kmq6<xR$i2NNBn<QH8BouY(R5I8?6%+W6aSY2ntAWF=M3Lz>afDQFV>aDgG
zleIx4hXpzAe^`);+!)WXn;jWUv^tQI)=u`?1B~az+S-*G%;bAXq`0T4og;3M0%1x8
zGh@`0o4PsJ-p%DnVd%Sh9OE%OSjC8FH3ynID6|*qm>Z*}(<-sCwUarKAw;PIWasR(
zSXtfF&ZS9O*?q68H_~jC9DU!~V4|wWHZ~K(0vV(Yrl7flLtQ<m4zL`Ro%>^_^1-y6
zZViG5#j*jF^B7mg<qaTZDyf@#c%t&+C8M}%-UI}}2G9mm2S02$z@lZl9Bs~v)$rAm
z*CC1$)BpGZTMf2c>X#>LdG@w*Nl%FdLE!tJ_j1XHn;pkZj??hP6W7VEC;WaX|GxWt
zhGp0?X?9zBSi9vA^WWRZtYj@8KekB5LdV?mF89yR<I=ffS$@+}Zl09Jy^H5M+O)KF
zcw_{a85P2dH_u|Ey>wM~kCnl<zfFUEvcG-TJcgzx@!|KIx#63=j^qA%`B*NTHHx)c
z3Yh!WdH^21XcX68FoBJ`ikbG>TEYZ@b<f{O?+2}3r{{_H*0S_)Bmer-CDhcnFy@6-
z09=!w#ACN#$m9Q9$s=1UcyoR(*UlS{RuhaQ!MOY0W0zhYdh+%kFD4~El6zkIhF9!G
zOy9nD0U3khc=Vqud2FjQ&hU-f=aQc@m}RSXaMfo!Y!h%$IPd@UTCAeTA71#HHx4(l
zXmkn>-!`AWE?v&wc2oiI*n*KPzGyOqWwi|Z+qbelyfi0=YtB2z7Jw}Xn7ey;;+@s}
zT2#;HZsR%Yfe-nm(Ztd}%p-e90?)nwA0Ak53)Fsn$y`Pa9n8`%)^o?I0&W;Lm<Mh?
z-*IfKsgtNX-{aZe&tUAx4E7aOGU}NX04%-h0s!7$zMV&xEbw@5A6mMCr*=3K8h(7`
zIb1wzG@6h=EIn4@Z~qrh-7=Txh)}Zr_z|sEkyme+%9Jr#T=3_QxGF!HKU_VX=!h^t
z;<2|^anY1vj2R&>ic+sLFzunwJns9#hd*XTwSj-!aUR1nlKK0`>$rEVEdk>{Zkxl{
z5o!GE>kZtp{J<$>SfX#oQEyDhYdDQ4AxVN)l~8WDcV|xCi(2%$S;&q0CoY0u`*+h5
zpCKp|{MY<3EWBU>4J{__TW1@9>u2O3Nw(<vTW995)t=Dq&kLs#5vJzO7rv&g(}Gp>
zo~-cOwY&J}=R?kG0`*OL?*7M0?z(h5^QMjDlK<>?{QmWScJRsiLI8?<eEpw)Z#CPF
zG}3MLyylyCo=<W@6fb}D6T8Y98K0d%lO3#PM1_!<nt;VBGATa;TmUOB+Q#nkat0yT
z$7o#c5C9U~vMv1h>poWPEaj1#&*ko`rn2<0ulsz?Go#hqeCbp+>?-1o<+~Xi6H0Mg
zm&aiA=JlF4A(K}Q)G;qElr(#;de<xrd740mrYF&36&atG4tBum6{SMK-B(WG&Bwp-
z+MkJe>GW7dGE)<n8>?YWlZ}o2eeO{1x^@;j4wm!iyK69Y^)Nec5C^KAg-MqGw3`ps
z6(9h+b++T8B5W*Z+Ng9`e}tS66+`WL@lzAzf!{BE@E<l8H_&aBWZ&_;?7{qHd@4_D
zcY^XKduurO(7&0To6POk&gSJ0*RZLmp1m%bzzrGETr+PxKm59%57!<bHC9Wj#mbjI
z?d8Fn&gZc?IefgejLD<3*s!aZ4XvGgxo{?Rjji1M>I$?W0TeeF`L(c~sF003cH>Oq
zqO>e|>3h0d80`<g?B(4x2M~ZQ_Daybbtb3gr^DJJQUjF?w||UJWe~d4(_Qot<L6>u
z65Xmn%b8Md@UqeavP4&}c2`i6d^wBC9YzPz=zgHy$j){PU%k49(w7pLJuVCEfHg5M
zoucwOlHwwmGAaY?fEA_HAW0H6`VPLU^_?N1qpO>*+<v!OMZTyqFr&DJDWkK{2B{on
zyV^TF+q;Xdt<!6p+lI!Gla|QmKW^uN^(6p&QRU2xaMO$&1Oc|}EoI86OfF0aW4S%S
zUwlkBhW0MvqO{yPG>%f8iL~TcT8$mD0;pgs3-;=PdKOnVF(@JWn9nymMuSSJz-kp)
zSJy_1mvU*BB!&?jsG_B<gS;GDL5zjdvgtH;qf#nm6JW`VECN(YHtZ^9`Z+mVmlnlG
z<xWs((woRhOXS&^S#-H&oH#E|L&l&u*6%82_V}UPFe8UGU+xCr+VjU!Ro}womw&{r
z**OBmr-cXE$I~Kv_HhA9BD5L|?Olw>N<pI#`0vRXs8mV}rcUCb<ay?sy^LL}v4b#m
zFt=SciNEi(<^B?Yl5Q&{wMIq{v4MMw(ev1}*iaOLfThRE@){#u)wbd!4{t1E@%$F%
zPa8pEOc)A<z{}t5LM;e{X@aSdU{8aQ!<{Z_TWc2&_gJxtlH)p=_LSQlX8C&=qErwa
z5lUNo7sE1=NK`3UGBJ(dzySMwhn+IOQpi>bMOzTFjV+1tT<&5oXxX-{qE%MUQ0(=9
z_h!SgA0s*bIrGB1?(e;h?VtPg#R0u>gD6qk&`Pv@f?kvuMp{ZNoA;Hm=Wrz%gX5SN
zXZvm4_Clf}Liys+g{;4G4$~vO*9Dw8E{6kuzK{)f&T;Gu*Q(ik_gofVIFW-#s`=Pu
zvRyQLG<DA{r1;UxefIPI#dD~8ZXuiQK3BGXOr|Y!L_xXtQdbl6(>YSnz!yIsK%o%0
zZst%MBe8!icNH8(k|Y*P%w*BjY(z<7XTeb-!qf~2c4iug2n*r)Sy>ECPok{)*mVFu
zEzwb0)yVHAjo|Qei+JOL5gu*wQ*C9y_7+x>5FNqdjA+K^4xzldi8fQGEZ5i6Q5jU!
z=y>nPy@143(}&8=wQ+X|Jyww$E}Ve-8*=^h97IXt@z1xQYc(=4FCBpCQ6a=eYAGtO
zbAVNDh>BOv9mb*|POzLeeI#|yEu`#;D+v(bvdm~y3I)3k9Yw1N=H9V`m^vz*>V_7Y
zTG~8vd);^4Z0ep{$d-H0bL=ylE$k{NCnY|LR~C%KYVH4f{qf!!YMb<2I%f=}&s@U`
zv$E~;3s(GkfVAXT=1v;H)_q4<)nKAcl-O~gjFDL>Y<>QEmMt7lSU+-aojWC$y5|;B
z@zm8sC>2~bID!C`k{t!*XhMRxW8x5|k4dMdsg=4WJ+V>Yryj6uAR_tzs$M{Hsifm&
zpD&%wy&{i0fH^_R1*kkgP8@JQtbhO&oo3rtdC`oa^jJlHJy^}wgB2(h3KrWZ`7O&2
zu;ke<*;`n_v@zMde9LU_46D;jv))9DOJPxkATS{>lOvT4OnG{_V}bybRyMGHM-dzM
z_)c24x3GfsJBrwT@Ti;`+h06&aDb;l+s-WZ6jo8yWTL6n$OQXj&DRDIrU|C#Xgzg0
z1G!l#j2n?kS#=W?waq9L0vEZYe3><I1a~i-&5_Cm{@;7Q_W3*|Nx~>fOnB^T-dwgG
zQIxpt${9Q|afqy4PD(UZtH@`+97GV{@~Jtb4~k{yp-LKC+K9C?l?mD)a?%pnS6qd@
z-ArARp0Oi_$gHFWLpz)Iln@uCW%@ap@<o!7X_Qtq5)r7R;7AQ=DY0CZtR=wy>=X)T
zI=G>cA>4KCEar`I7IQ7HYGVD4A~x(Q!74#^k`2t>UA-TxRb=LvbcSUlaiF-G7K4e%
za18-2o!eJfX&bu(&aqP|1)lzVGv@9dF8kdWEXR?`rKGEesSkh7``>LMC@_F~ub;!s
z>S|8_00$09L_t)N;kFOgpI0BI#n6sAIFP@8v(s_Rlvmd9)H^?-YcX=g+_AiI+2~_l
z=V-P4zIPU57A0~A**-9z{8WIY$I8^aA&kgKrl6#T=2j!o5gN3oC<&pecNI@`sA-~1
z#q*~A`E>g9^6)JZK34=qna#@A>Z8-u!72^hL%B3bOImU)Yqr>`zKqXJBT%K}-;Z4D
zV*f~kFKmPVR#6jg75&J82QMPQM~SKJ2amGot37fRz|c-{Wf{}Q=CEXRGSBXErYkNu
zQp@6R_x0J&|7<_Pb6yhW?Jcvho#~^};nz|RW}#FlxMtpXu9-L9VK~1oEs{Y|p$I^Y
z&cwdLO6E?^rN?UJ+jV;=tFtA@%SwuXgSHAs->=)n9iQ)@+Qr7v)!jpIurudXguNnj
zwcW7ZY!zAZLjhmyILeymZXhcq3UE%^gcvP)Qzvg9ZshT11GB~tLm?>mV#^WIlA_2S
zl0agBf?H<h5TH_W$?P#)GJA|uO&lKYDDf@`@YrWtSe~24q`VBLu{a@&^prRh3W0B*
zUhLSvXy!03|9BfMZ6-!$r;rt-qQvZdg{!c<o@-ndWzv$OFk5<9d9<1GnkL5OrlSc7
zV%7Fi=AM(r_>mb*igK<FuG@Kpr*_M0HVO!QS8HVLmICI_$R{``kov~{7xXPRTlxLB
z`?#aHp4a|#IeDouaHs*jRiv`EiR8E_zO9wlv3zJ_8P9Gmr~1|3lbRTH%xe@^G|28d
zGdYSLtH`RdX3DA>88c!CVd`Mk>?~#C@D!#51~4r?l$EETIIRkx(Ihe`Qt(_A^kJuR
zf|`5<uhs0Cw5&rCXzNy>QCYm$seIY0Ji)D7R8lW0Px^)*xM&msDizbt$wF^z=jm^D
za^;|K1}8=H=?~jjzSYKdZoXhNvnCAV>cJ7r8ks^|qy|ZXw3Jvj?I}5~Yu@w0M%HBy
z;{Pq0#p=S(9Q%i7B=X4>wtKq&d+)$CcWefuG7~U$b#v>AgO2_GI9Sh;vRWpM&f?%h
zY8rHUVxz;E^V|w1j7;N5Wdncx*IJuVG&YQ<@4SesrVpduUN(MPMGLL%X68-HL#a^k
z)s_+}+RQvD!4Q|1+A2yiumU(#TFczYBUpXQbPUE$rjN~`wo%Xf#kOR6>;8KdjV*1Y
zCC6atv9fNjJhNzgbT|fMyPbtpao&_%j@If})nMX!oq+(Al9|cjOwLcIqE^SB-&}2T
z9|;fP<@+w>;wd?NvevmO^;2^PKm59%E6yG31g0575haNwPcOr0FA(wKALcVIHx1av
z=c{+}-&f9H?IV}7{Xm&4Pric*rp5Eg6=M*9M^+vnF-D8Ay%W7vV%MPxu0DS}I=zWE
z4mUV*+0V*!veVh;WRRO4PkWbzTUN+d(f<6!cBYKU@|lX-t41IQti5A4wGDcPrYF*A
zw($M#3i%3`n|!x;GF|3wBDHEXAwg`~fArXP$W-TjKmFrD5~8)VwRcfxv9i73DA%VY
zqBnN%`u<wtB5eJik{NgE0Bc#jl|ZFLbci4`w2Kaq>Rs)#`)^7D5`s%OjYNH?k{=D;
zvn>AHq+xVeCxHq#FLsx-G`;N19moK>MS<dOEuANkTBf13oyxjqrjE{{y{nro`^tFg
z>z!;im{~eGlLnoEf37>kdb=-6)P}?4W+pLvWC|fc0gTH{qo>Epnk@zV*C*R$=kDqe
zY0&90nB=Qr&3Y4E-4^zDSa@UE25!A{692OxpU;0Sq(P@AB_WEG1RFSn|5$+D*hzy<
zj|8-Jm}$`I8EH34w;DUa1+W0Fd2uCAUo(MWX^CW~C8BFJGCD?sIyjIYHWu({uMxh=
zz~ZtRlH($1Ywx1EzJ;B-cGfnUxU0O5Zc7heRvAzUP*K~2N-1Ck8gzQ}M$b%`w|=;p
zH${oz8A&LW3QDUQd12XBdL)S;g+P3amSJfLG`F?$*juY)Rd{+$1m)E>aQk6fF{5%)
z*lbse50o`BTc;-{DS|L{5WnmwmfgoqMO7rmgwxq=wLSB8+v@5)U+!X5P6}a~U`(AB
zQWGQDbLc2<6+1JMUb4G{8Ruj%KR%Q@Rvn^A-@zp_a+#E$L3fXpZTn04^<XvKR*43k
zp2XM)677|JUj3;MQIt4RVPm$-HkB}QY_>yHKUCRFgHDfD6GV%lg9e?R-0T#a+S=X)
zD-O_NXh);Av7ZAS7Cv3Ioy%sAlBK#fb#~LB(_`xL%-$Oxq$DXeg3Lj2G_@LeaOnzG
zH8_3qnhos)2FT}NWVo7)lvIozT`c|L7yf7c5tsL~9i@v}Y>^}ybq3;N!il%r<KEd&
z0s@p)+8FmI8;Y4bVHkS~D=|w@P}xF*PES}!;3-iF9VwFi;upX8<#d<-59W~R>DGbk
Q9{>OV07*qoM6N<$f}-}@-T(jq

literal 0
HcmV?d00001


From 3a7e14a95fe5401f20a6514f5934a64b79d2912d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 18:07:03 +0200
Subject: [PATCH 0280/1357] update composer.lock

---
 composer.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2addc074e..70044eb58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f97c6194d4d63e90a855add1cf7d0e86",
+    "content-hash": "1b8a408a43c62cb966fa89af338564a7",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1784,10 +1784,10 @@
         },
         {
             "name": "twbs/bootstrap5",
-            "version": "5.1.3",
+            "version": "5.3.3",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip"
+                "url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.3.zip"
             },
             "type": "library"
         },

From cd26667707c3380a8a00b46c4f6501f1f62d8cda Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 18:40:01 +0200
Subject: [PATCH 0281/1357] refactor backend validierung

---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 93 ++++++++-----------
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 56 +++++------
 .../api/frontend/v1/stv/GemeinsameStudien.php | 32 ++++---
 3 files changed, 87 insertions(+), 94 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index daaf043b5..d7581c3d1 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -224,19 +224,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
-		$_POST['akadgrad_id']= $formData['akadgrad_id'];
-		$_POST['vorsitz'] = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-		$_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
-		$_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
-		$_POST['datum']= $formData['datum'];
-		$_POST['sponsion']= $formData['sponsion'];
-		$_POST['anmerkung'] = $formData['anmerkung'];
-		$_POST['protokoll']= $formData['protokoll'];
-		$_POST['note'] = $formData['note'];
+		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
+		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
@@ -261,19 +254,19 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$result = $this->AbschlusspruefungModel->insert([
 			'student_uid' => $student_uid,
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'akadgrad_id' => $this->input->post('akadgrad_id'),
-			'vorsitz' => $this->input->post('vorsitz'),
-			'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
-			'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
-			'datum' => $this->input->post('datum'), //TODO(Manu) check if minute format like FAS
-			'sponsion' => $this->input->post('sponsion'),
-			'pruefer1' => $this->input->post('pruefer1'),
-			'pruefer2' => $this->input->post('pruefer2'),
-			'pruefer3' => $this->input->post('pruefer3'),
-			'protokoll' => $this->input->post('protokoll'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
+			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+			'akadgrad_id' => $formData['akadgrad_id'],
+			'vorsitz' => $vorsitz,
+			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+			'datum' => $formData['datum'], //TODO(Manu) check if minute format like FAS
+			'sponsion' => $formData['sponsion'],
+			'pruefer1' => $pruefer1,
+			'pruefer2' => $pruefer2,
+			'pruefer3' => $pruefer3,
+			'protokoll' => $formData['protokoll'],
+			'note' => $formData['note'],
+			'anmerkung' => $formData['anmerkung'],
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 		]);
@@ -295,20 +288,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 
 		$formData = $this->input->post('formData');
-		$_POST['student_uid'] = $formData['student_uid'];
-		$_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
-		$_POST['akadgrad_id']= $formData['akadgrad_id'];
-		$_POST['vorsitz'] =  isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-		$_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
-		$_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
-		$_POST['datum']= $formData['datum'];
-		$_POST['sponsion']= $formData['sponsion'];
-		$_POST['anmerkung'] = $formData['anmerkung'];
-		$_POST['protokoll']= $formData['protokoll'];
-		$_POST['note'] = $formData['note'];
+		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
+		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
@@ -337,20 +322,20 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'abschlusspruefung_id' => $abschlusspruefung_id
 			],
 			[
-			'student_uid' => $this->input->post('student_uid'),
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'akadgrad_id' => $this->input->post('akadgrad_id'),
-			'vorsitz' => $this->input->post('vorsitz'),
-			'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
-			'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
-			'datum' => $this->input->post('datum'),
-			'sponsion' => $this->input->post('sponsion'),
-			'pruefer1' => $this->input->post('pruefer1'),
-			'pruefer2' => $this->input->post('pruefer2'),
-			'pruefer3' => $this->input->post('pruefer3'),
-			'protokoll' => $this->input->post('protokoll'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
+			'student_uid' => $formData['student_uid'],
+			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+			'akadgrad_id' => $formData['akadgrad_id'],
+			'vorsitz' => $vorsitz,
+			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+			'datum' => $formData['datum'],
+			'sponsion' => $formData['sponsion'],
+			'pruefer1' => $pruefer1,
+			'pruefer2' => $pruefer2,
+			'pruefer3' => $pruefer3,
+			'protokoll' => $formData['protokoll'],
+			'note' => $formData['note'],
+			'anmerkung' => $formData['anmerkung'],
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 			]
diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 538626789..b787ea225 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -61,12 +61,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 		}
 
 
+		$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;
+		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
-		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
-		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
-		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
-		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
-		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
@@ -90,11 +91,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 		$result = $this->RtPersonModel->insert([
 			'person_id' => $person_id,
-			'rt_id' => $_POST['rt_id'],
-			'anmeldedatum' => $_POST['anmeldedatum'],
-			'teilgenommen' => $_POST['teilgenommen'],
-			'studienplan_id' => $_POST['studienplan_id'],
-			'punkte' => $_POST['punkte'],
+			'rt_id' => $rt_id,
+			'anmeldedatum' => $anmeldedatum,
+			'teilgenommen' => $teilgenommen,
+			'studienplan_id' => $studienplan_id,
+			'punkte' => $punkte,
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
@@ -133,12 +134,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'RT_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;
+		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
-		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
-		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
-		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
-		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
-		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
@@ -166,11 +168,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'person_id' => $person_id,
 			],
 			[
-				'rt_id' => $_POST['rt_id'],
-				'anmeldedatum' => $_POST['anmeldedatum'],
-				'teilgenommen' => $_POST['teilgenommen'],
-				'studienplan_id' => $_POST['studienplan_id'],
-				'punkte' => $_POST['punkte'],
+				'rt_id' => $rt_id,
+				'anmeldedatum' => $anmeldedatum,
+				'teilgenommen' => $teilgenommen,
+				'studienplan_id' => $studienplan_id,
+				'punkte' => $punkte,
 				'insertamum' => date('c'),
 				'insertvon' => $authUID,
 			]
@@ -280,19 +282,21 @@ class Aufnahmetermine extends FHCAPI_Controller
 		{
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
 		}
-		$_POST['rt_gesamtpunkte'] =
+		$rt_gesamtpunkte =
 			(isset($formData['rt_gesamtpunkte']) && !empty($formData['rt_gesamtpunkte']))
 				? $formData['rt_gesamtpunkte']
 				: null;
-		$_POST['reihungstestangetreten'] =
+		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
 				: null;
-		$_POST['aufnahmegruppe_kurzbz'] =
+		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']
 				: null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('rt_gesamtpunkte', 'Rt_gesamtpunkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Rt_gesamtpunkte'])
 		]);
@@ -309,9 +313,9 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'prestudent_id' => $prestudent_id,
 			],
 			[
-				'reihungstestangetreten' => $_POST['reihungstestangetreten'],
-				'rt_gesamtpunkte' => $_POST['rt_gesamtpunkte'],
-				'aufnahmegruppe_kurzbz' => $_POST['aufnahmegruppe_kurzbz'],
+				'reihungstestangetreten' => $reihungstestangetreten,
+				'rt_gesamtpunkte' => $rt_gesamtpunkte,
+				'aufnahmegruppe_kurzbz' => $aufnahmegruppe_kurzbz,
 				'updateamum' => date('c'),
 				'updatevon' => $authUID,
 			]
diff --git a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
index dbf9efce1..97dad48fd 100644
--- a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
+++ b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
@@ -137,15 +137,17 @@ class GemeinsameStudien extends FHCAPI_Controller
 		}
 
 		$formData = $this->input->post('formData');
-		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+		$ausbildungssemester = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
 			? $formData['ausbildungssemester']
 			: null;
-		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+		$mobilitaetstyp_kurzbz = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
 			? $formData['mobilitaetstyp_kurzbz']
 			: null;
-		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+		$studiensemester_kurzbz = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
 			? $formData['studiensemester_kurzbz'] : null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
@@ -177,13 +179,13 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$result = $this->MobilitaetModel->insert([
 			'prestudent_id' => $prestudent_id,
-			'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+			'mobilitaetstyp_kurzbz' =>$mobilitaetstyp_kurzbz,
 			'status_kurzbz' => $status_kurzbz,
-			'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+			'studiensemester_kurzbz' =>$studiensemester_kurzbz,
 			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
 			'gsprogramm_id' => $gsprogramm_id,
 			'firma_id' => $firma_id,
-			'ausbildungssemester' => $_POST['ausbildungssemester'],
+			'ausbildungssemester' =>$ausbildungssemester,
 			'insertvon' => $authUID,
 			'insertamum' => date('c'),
 		]);
@@ -205,19 +207,21 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['mobilitaet_id'] = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
+		$mobilitaet_id = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
 			? $formData['mobilitaet_id'] :
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilitaet ID']), self::ERROR_TYPE_GENERAL);
-		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+		$ausbildungssemester = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
 			? $formData['ausbildungssemester']
 			: null;
-		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+		$mobilitaetstyp_kurzbz = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
 			? $formData['mobilitaetstyp_kurzbz']
 			: null;
-		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+		$studiensemester_kurzbz = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
 			? $formData['studiensemester_kurzbz']
 			: null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
@@ -247,17 +251,17 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$result = $this->MobilitaetModel->update(
 			[
-				'mobilitaet_id' => $_POST['mobilitaet_id'],
+				'mobilitaet_id' => $mobilitaet_id,
 			],
 			[
 				'prestudent_id' => $prestudent_id,
-				'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+				'mobilitaetstyp_kurzbz' => $mobilitaetstyp_kurzbz,
 				'status_kurzbz' => $status_kurzbz,
-				'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
 				'gsprogramm_id' => $gsprogramm_id,
 				'firma_id' => $firma_id,
-				'ausbildungssemester' => $_POST['ausbildungssemester'],
+				'ausbildungssemester' => $ausbildungssemester,
 				'updatevon' => $authUID,
 				'updateamum' => date('c'),
 			]

From 44c5b1dd5e19b8ef538ae5713a5dcb4a305ee6bc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 19:29:06 +0200
Subject: [PATCH 0282/1357] Tab Kontakt: refactor displaying of kontakttyp, add
 updateamum, updatevon, filter kontakttyp hidden

---
 application/controllers/api/frontend/v1/stv/Kontakt.php  | 7 +++++--
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js   | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index bcd38853c..b344baf85 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -46,6 +46,7 @@ class Kontakt extends FHCAPI_Controller
 		$this->load->model('organisation/standort_model', 'StandortModel');
 		$this->load->model('ressource/firma_model', 'FirmaModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
 
 		// Extra Permissionchecks
 		$permsMa = [];
@@ -443,8 +444,10 @@ class Kontakt extends FHCAPI_Controller
 				THEN public.tbl_kontakt.updateamum
 				ELSE public.tbl_kontakt.insertamum
 			END) AS lastUpdate, st.bezeichnung, f.name");
+		$this->KontakttypModel->addSelect("kt.beschreibung as kontakttypbeschreibung");
 		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
 		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+		$this->KontakttypModel->addJoin('public.tbl_kontakttyp kt', 'ON (public.tbl_kontakt.kontakttyp = kt.kontakttyp)');
 		$result = $this->KontaktModel->loadWhere(
 			array('person_id' => $person_id)
 		);
@@ -594,8 +597,8 @@ class Kontakt extends FHCAPI_Controller
 				'anmerkung' => $anmerkung,
 				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
-				'insertvon' => 	$uid,
-				'insertamum' => date('c'),
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
 				'standort_id' => $standort_id,
 				'ext_id' => $ext_id
 			]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index e5bb76461..42896c8b7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -26,7 +26,7 @@ export default{
 				ajaxRequestFunc: () => this.$api.call(ApiStvContact.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
 				columns:[
-					{title:"Typ", field:"kontakttyp"},
+					{title:"Typ", field:"kontakttypbeschreibung"},
 					{title:"Kontakt", field:"kontakt"},
 					{
 						title:"Zustellung",
@@ -109,7 +109,7 @@ export default{
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('kontakttyp').component.updateDefinition({
+						cm.getColumnByField('kontakttypbeschreibung').component.updateDefinition({
 							title: this.$p.t('global', 'typ')
 						});
 						cm.getColumnByField('kontakt').component.updateDefinition({
@@ -303,7 +303,8 @@ export default{
 		this.$api
 			.call(ApiStvContact.getTypes())
 			.then(result => {
-				this.kontakttypen = result.data;
+				//this.kontakttypen = result.data;
+				this.kontakttypen = result.data.filter(item => item.kontakttyp !== 'hidden');
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -328,7 +329,7 @@ export default{
 						v-model="contactData.kontakttyp">
 					>
 						<option value="">keine Auswahl</option>
-						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.beschreibung}}</option>
 					</form-input>
 				</div>
 				

From e4100f5fb0bb945b0cdd964252c8b5688385725d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Jun 2025 12:04:31 +0200
Subject: [PATCH 0283/1357] refactor(Calendar Events Layout): changes the
 layout of the calendar events adjusting to different renderer components

---
 application/core/Events.php                   |  3 +-
 public/css/Cis4/CoreCalendarEvents.css        | 75 +++++++++++++++++++
 public/css/components/calendar.css            | 74 +-----------------
 public/js/apps/Dashboard/Fhc.js               | 24 +++++-
 .../Cis/LvPlan/EventTypes/calendarEvent.js    | 19 ++---
 public/js/components/Cis/LvPlan/LvPlan.js     |  8 +-
 6 files changed, 112 insertions(+), 91 deletions(-)
 create mode 100644 public/css/Cis4/CoreCalendarEvents.css

diff --git a/application/core/Events.php b/application/core/Events.php
index 037ce90da..a7d4754cc 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -8,7 +8,8 @@ Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers["lehreinheit"] = array(
 		'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js',
 		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
 
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
new file mode 100644
index 000000000..5efe8b608
--- /dev/null
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -0,0 +1,75 @@
+/* Moodle Events in Month Page */
+.monthPageContainer .lehreinheitEventContent{
+	display: grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: 1fr;
+	border-bottom: 1px solid var(--bs-border-color);
+	
+}
+
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display:grid;
+	padding: .25rem .5rem .25rem .25rem;
+	margin-right: .25rem;
+	align-content: center;
+}
+
+
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-wrap: wrap;
+	column-gap: 5px;
+	font-size: .875em;
+	align-items:center;
+	justify-content: space-evenly;
+	
+}
+
+/* Moodle Events in Week Page */
+.weekPageContainer .lehreinheitEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: 1fr;
+
+}
+
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display: grid;
+	padding: .25rem .5rem .25rem .25rem;
+	margin-right: .25rem;
+	align-content: center;
+}
+
+
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-wrap: wrap;
+	column-gap: 5px;
+	align-items: center;
+	justify-content: space-evenly;
+
+}
+
+/* Moodle Events in Day Page */
+.dayPageContainer .lehreinheitEventContent {
+	display: flex;
+	padding-left:4rem;
+	justify-content: space-evenly;
+	align-items: center;
+
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display:grid;
+	align-content: center;
+	border-right: 1px solid var(--bs-border-color);
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: contents;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText *{
+	font-weight: 500;
+}
+
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 7eb6487dc..4d082fa5a 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -413,77 +413,7 @@
 	opacity: 0.5;
 }
 
-
-.dayPageContainer, .weekPageContainer{
+.dayPageContainer,
+.weekPageContainer {
 	container-type: inline-size;
 }
-
-.dayPageContainer .lehreinheitEventContent,
-.weekPageContainer .lehreinheitEventContent {
-	display: flex;
-	flex-direction: column;
-}
-
-.dayPageContainer .moodleEventContent,
-.weekPageContainer .moodleEventContent{
-	display: flex;
-	flex-direction: row;
-}
-
-.dayPageContainer .lehreinheitEventContent{
-	flex-grow:1;
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height:1.25;
-}
-
-.dayPageContainer .lehreinheitEventHeader {
-	display: flex;
-	flex-direction: column;
-	padding: 1rem;
-	border-right: 1px solid gray;
-}
-
-.dayPageContainer .moodleEventContent {
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-	width:100%;
-}
-
-.weekPageContainer .moodleEventContent {
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-	width: 100%;
-}
-
-.weekPageContainer .lehreinheitEventHeader {
-	display: flex;
-	flex-direction: column;
-	padding: 1rem;
-	border-right: 1px solid gray;
-}
-
-.weekPageContainer .lehreinheitEventContent {
-	flex-grow: 1;
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-}
-
-
-@container( min-width: 500px){
-	.dayPageContainer .lehreinheitEventContent,
-	.weekPageContainer .lehreinheitEventContent {
-		flex-direction: row;
-	}
-
-	.dayPageContainer .lehreinheitEventContent{
-		justify-content: space-evenly;
-	}
-}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a40d28193..637e08cce 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -293,10 +293,26 @@ const app = Vue.createApp({
 			.then(res => res.data)
 			.then(data => {
 				for (let rendertype of Object.keys(data)) {
-					
-					let modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
-					let modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
-					let calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					if (data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					if (data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+
+					if (data[rendertype].calendarEventStyles){
+						console.log(data[rendertype].calendarEventStyles)
+						var head = document.head;
+						var link = document.createElement("link");
+						link.type = "text/css";
+						link.rel = "stylesheet";
+						link.href = data[rendertype].calendarEventStyles;
+						head.appendChild(link);
+					}
+
 					if(this.renderers === null) {
 						this.renderers = {};
 					}
diff --git a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
index 088fb42f9..6fa957d91 100644
--- a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
+++ b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
@@ -16,15 +16,16 @@ export default {
 		},
 	},
 	template: `
-	<div class="lehreinheitEventHeader" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-		<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-		<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	<div class="lehreinheitEventContent h-100 w-100 p-1" >
+		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+		</div>
+		<div id="lehreinheitEventText">
+			<span>{{event.topic}}</span>
+			<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+			<span>{{event.ort_kurzbz}}</span>
+		</div>
 	</div>
-	<div class="lehreinheitEventContent">
-		<span>{{event.topic}}</span>
-		<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-		<span>{{event.ort_kurzbz}}</span>
-	</div>
-	
 	`,
 }
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index c4dca0e5f..49fa88a60 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -336,13 +336,13 @@ const LvPlan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div @click="showModal(event)" class="p-1">
+			<div @click="showModal(event)" class="monthPageContainer " >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+				class="weekPageContainer position-relative border border-secondary border  h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
@@ -350,9 +350,7 @@ const LvPlan = {
 		</template>
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
-				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
-					<component :is="calendarEventComponent(event.type)" :event="event"></component>
-				</div>
+				<component :is="calendarEventComponent(event.type)" :event="event"></component>
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">

From 7b5b6992c7b16d55592df6062bd2959711559a1d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 13 Jun 2025 13:02:26 +0200
Subject: [PATCH 0284/1357] Tab Kontakt: Adresse: use Autocomplete and Dropdown
 for Firma, Bankverbindung: use authUID

---
 .../api/frontend/v1/stv/Kontakt.php           |  27 ++++-
 public/js/api/factory/stv/kontakt/address.js  |   6 +
 .../Details/Kontakt/Address.js                | 114 ++++++++----------
 3 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index b344baf85..e75802727 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -28,7 +28,8 @@ class Kontakt extends FHCAPI_Controller
 			'getStandorte' => ['admin:r', 'assistenz:r'],
 			'getStandorteByFirma' => ['admin:r', 'assistenz:r'],
 			'getKontakte' => ['admin:r', 'assistenz:r'],
-			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r']
+			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
+			'getAllFirmen' => ['admin:r', 'assistenz:r']
 		]);
 
 		// Load Libraries
@@ -673,6 +674,7 @@ class Kontakt extends FHCAPI_Controller
 		$iban = $this->input->post('iban');
 		$typ = $this->input->post('typ');
 		$verrechnung = $this->input->post('verrechnung');
+		$uid = getAuthUID();
 
 		$result = $this->BankverbindungModel->insert(
 			[
@@ -683,7 +685,7 @@ class Kontakt extends FHCAPI_Controller
 				'iban' => $iban,
 				'blz' => $blz,
 				'kontonr' => $kontonr,
-				'insertvon' => 'uid',
+				'insertvon' =>  $uid,
 				'insertamum' => date('c'),
 				'typ' => $typ,
 				'verrechnung' => $verrechnung,
@@ -800,4 +802,25 @@ class Kontakt extends FHCAPI_Controller
 
 		return $this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']);
 	}
+
+	/*
+	* returns list of all companies
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllFirmen()
+	{
+		$sql = "
+			SELECT
+				f.firma_id, f.name,
+				f.name AS label
+			FROM public.tbl_firma f
+			ORDER BY f.name ASC";
+
+		$result = $this->FirmaModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+
 }
diff --git a/public/js/api/factory/stv/kontakt/address.js b/public/js/api/factory/stv/kontakt/address.js
index 78027835f..4402b50d6 100644
--- a/public/js/api/factory/stv/kontakt/address.js
+++ b/public/js/api/factory/stv/kontakt/address.js
@@ -67,5 +67,11 @@ export default {
 			method: 'get',
 			url: 'api/frontend/v1/stv/address/getNations/'
 		};
+	},
+	getAllFirmen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/kontakt/getAllFirmen/'
+		}
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 9e579351c..a69c34b3f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -208,11 +208,12 @@ export default{
 			nations: [],
 			adressentypen: [],
 			firmen: [],
+			listFirmen: [],
 			filteredFirmen: [],
+			selectedFirma: null,
 			abortController: {
 				suggestions: null,
-				places: null,
-				firmen: null
+				places: null
 			},
 		}
 	},
@@ -231,6 +232,9 @@ export default{
 		uid() {
 			this.reload();
 		},
+		selectedFirma(newVal) {
+			this.addressData.firma_id = newVal?.firma_id || '';
+		}
 	},
 	methods:{
 		actionNewAdress() {
@@ -243,7 +247,7 @@ export default{
 				if(this.addressData.adresse_id)
 				{
 					this.addressData.address.plz = this.addressData.plz;
-				//	delete this.addressData.plz;
+					//	delete this.addressData.plz;
 					this.loadPlaces(this.addressData.address.plz);
 					this.$refs.adressModal.show();
 
@@ -324,18 +328,13 @@ export default{
 					this.places = result.data;
 				});
 		},
-		search(event) {
-			if (this.abortController.firmen) {
-				this.abortController.firmen.abort();
-			}
+		filterFirmen(event) {
+			const query = event?.query?.toLowerCase()?.trim() || "";
 
-			this.abortController.firmen = new AbortController();
-
-			return this.$api
-				.call(ApiStvCompany.get(event.query))
-				.then(result => {
-					this.filteredFirmen = result.data.retval;
-				});
+			this.filteredFirmen = this.listFirmen.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
 		},
 		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
@@ -372,10 +371,17 @@ export default{
 				this.adressentypen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAddress.getAllFirmen())
+			.then(result => {
+				this.listFirmen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="stv-details-kontakt-address h-100 pt-3">
-		
+
 		<!--Modal: AddressModal-->
 		<bs-modal ref="adressModal" dialog-class="modal-dialog-scrollable">
 			<template #title>
@@ -400,7 +406,7 @@ export default{
 						</option>
 						</form-input>
 					</div>
-					
+
 					<div class="row mb-3">
 						<form-input
 							type="text"
@@ -410,7 +416,7 @@ export default{
 						>
 						</form-input>					
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="select"
@@ -428,7 +434,7 @@ export default{
 						</option>
 						</form-input>
 				</div>
-													
+							
 				<div class="row mb-3">
 					<form-input
 						type="text"
@@ -440,7 +446,7 @@ export default{
 					>
 					</form-input>					
 				</div>
-											
+
 				<div class="row mb-3">
 					<form-input
 						v-if="addressData.nation == 'A'"
@@ -457,17 +463,17 @@ export default{
 							>
 							{{gemeinde.name}}
 						</option>
-						</form-input>
-						<form-input
+					</form-input>
+					<form-input
 							v-else
 							type="text"
 							:label="$p.t('person/gemeinde')"
 							name="addressData.gemeinde"
 							v-model="addressData.gemeinde"
 						>	
-						</form-input>
-					</div>
-				
+					</form-input>
+				</div>
+
 				<div class="row mb-3">
 					<form-input
 						v-if="addressData.nation == 'A'" 
@@ -494,7 +500,7 @@ export default{
 						>	
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -507,7 +513,7 @@ export default{
 						</form-input>
 					</div>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -520,7 +526,7 @@ export default{
 						</form-input>
 					</div>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="text"
@@ -530,7 +536,7 @@ export default{
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -543,58 +549,38 @@ export default{
 						</form-input>
 					</div>
 				</div>
-					
-				<div v-if="statusNew" class="row mb-3">
+
+				<div class="row mb-3">
 					<form-input
 						type="autocomplete"
 						:label="$p.t('person/firma')"
 						name="firma_name"
-						v-model="addressData.firma"  
-						optionLabel="name" 
+						v-model="selectedFirma"
+						optionLabel="label"
+						optionValue="firma_id"
+						dropdown
+						forceSelection
 						:suggestions="filteredFirmen" 
-						@complete="search" 
-						:min-length="3"
-					>
-					</form-input>
-				</div>				
-					
-				<div v-else class="row mb-3">
-					<form-input
-						v-if="addressData.firmenname" 
-						type="text"
-						name="name"
-						:label="$p.t('person/firma')"
-						v-model="addressData.firmenname"
-					>
-					</form-input>
-					<form-input
-						v-else 
-						type="autocomplete"
-						:label="$p.t('person/firma')"
-						name="firma_name"
-						v-model="addressData.firma"  
-						optionLabel="name" 
-						:suggestions="filteredFirmen" 
-						@complete="search" 
+						@complete="filterFirmen"
 						:min-length="3"
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="text"
 						name="firma_zusatz"
-						:label="$p.t('person/firma_zusatz')"
+						:label="$p.t('global/name')"
 						v-model="addressData.name"
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 							type="text"
@@ -604,16 +590,16 @@ export default{
 						>
 					</form-input>
 				</div>
-			
+
 			</form-form>
-			
+
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
 				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
 				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</bs-modal>
-			
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -629,3 +615,5 @@ export default{
 	</div>`
 };
 
+
+

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

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

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

From 9e0bad76ac092b3eadfea373d654088598b3254d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 09:30:40 +0200
Subject: [PATCH 0286/1357] refactor(Studium): uses link color that adjusts to
 dark mode and adjusts the button directions next to the select fields of the
 Studium View

---
 public/js/components/Cis/Studium/Studium.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 7ead07ffe..246bbb296 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -272,7 +272,7 @@ export default {
 		<template #content>
 			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
 				<h4>Lektoren:</h4>
-				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
+				<a :href="'mailto:'+lektor?.email" class="fhc-link-color mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
 			<h4>Menu:</h4>
 		</template>
@@ -296,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -311,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -326,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -351,7 +351,7 @@ export default {
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
 					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="link-dark d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
 						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>

From f321e07731f6caffa12cdfecfc927d52bb6f5e75 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jun 2025 10:22:28 +0200
Subject: [PATCH 0287/1357] Move new SearchBarLib to SearchLib

---
 application/libraries/SearchBarLib.php | 1471 ++++++++----------------
 application/libraries/SearchLib.php    | 1080 +++++++++++++++++
 2 files changed, 1572 insertions(+), 979 deletions(-)
 create mode 100644 application/libraries/SearchLib.php

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index a14319bba..13b0efdbb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -32,12 +32,13 @@ class SearchBarLib
 	const ERROR_WRONG_TYPES = 'ERR004';
 	const ERROR_NOT_AUTH = 'ERR005';
 
+	// List of allowed types of search
+	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];
+
+	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
+
 	private $_ci; // Code igniter instance
 
-	private $_searchfunction_priorities = [];
-	private $_numeric_searchfunctions = [];
-	private $_allowed_searchfunctions = [];
-	
 	/**
 	 * Gets the CI instance and loads model
 	 */
@@ -45,22 +46,8 @@ class SearchBarLib
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		// It is loaded only to have the DB functions available
+		// It is loaded only to have the DB_Model available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-
-		// Load Config
-		$this->_ci->load->config('search', true);
-		$this->_ci->load->config('searchfunctions', true);
-
-		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
-
-		// Precompute helper arrays
-		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
-			$this->_searchfunction_priorities[$key] = $arr['priority'];
-			if ($arr['force_integer'] ?? false)
-				$this->_numeric_searchfunctions[] = $key;
-			$this->_allowed_searchfunctions[] = $key;
-		}
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -68,1013 +55,539 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
-	 *
-	 * @param string							$searchstring
-	 * @param array								$types (optional)
-	 *
-	 * @return stdClass		containing an array with the result on index 0
-	 * 						and the overall query time on index 1.
 	 */
-	public function search($searchstring, $types = [])
+	public function search($searchstr, $types)
 	{
-		if (!$types) {
-			$types = $this->_ci->config->item('search');
-		} else {
-			$tmp = [];
-			$missing = [];
-			foreach ($types as $type) {
-				$typeconfig = $this->_ci->config->item($type, 'search');
-				if (!$typeconfig) {
-					$missing[] = $type;
-				} else {
-					$tmp[$type] = $typeconfig;
-				}
-			}
-			if ($missing) {
-				$p = $this->_ci->search_phrases;
-				return error(array_map(function ($type) use ($p) {
-					return $p->t('search', 'error_missing_config', [
-						'type' => $type
-					]);
-				}, $missing));
-			}
-			$types = $tmp;
-		}
+		// Checks if the given parameters are fine
+		$search = $this->_checkParameters($searchstr, $types);
 
+		// If the check was successful then perform the search
+		if (isSuccess($search)) $search = $this->_search($searchstr, $types);
 
-		// Convert searchstring into array
-		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
-
-
-		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
-		if (isError($sql))
-			return $sql;
-		if (!hasData($sql)) {
-			$retval = success([]);
-			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
-			return $retval;
-		}
-
-		$msc = microtime(true);
-		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
-		$msc = microtime(true) - $msc;
-
-		if (isError($result))
-			return $result;
-
-		$retval = success($result->retval);
-		$retval->meta = [
-			'time' => $msc,
-			'searchstring' => $searchstring
-		];
-
-		return $retval;
-	}
-
-	/**
-	 * Generates the search query for the given search string and the
-	 * specified search type.
-	 *
-	 * @param array								$searchArray
-	 * @param string							$table
-	 *
-	 * @return stdClass		containing the query string.
-	 */
-	public function getDynamicSearchSql($searchArray, $table)
-	{
-		$res = $this->checkConfig($table);
-		if (isError($res))
-			return $res;
-		$table_config = getData($res);
-
-		$sql_with = [];
-		
-		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
-
-		if (!$sql_select)
-			return success("");
-
-		$lang = getUserLanguage();
-
-		$output = "WITH";
-		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
-			$output .= " RECURSIVE";
-			array_shift($sql_with);
-		}
-
-		$output .= "
-			lang (index) AS (
-				SELECT index
-				FROM public.tbl_sprache
-				WHERE sprache=" . $this->_ci->db->escape($lang) . "
-				LIMIT 1
-			),
-			auth (uid) AS (
-				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
-			)";
-
-		if ($sql_with) {
-			$sql_with = array_unique($sql_with);
-			$output .= ", " . implode(", ", $sql_with);
-		}
-
-		$other_selects = "";
-		if (isset($table_config['resultfields']))
-			$other_selects = implode(", ", $table_config['resultfields']);
-		if ($other_selects)
-			$other_selects = ", " . $other_selects;
-
-		$output .= "
-			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
-				FROM (" . implode(" UNION ", $sql_select) . ") q
-				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
-			)
-			SELECT
-				" . $this->_ci->db->escape($table) . " AS type,
-				q.rank
-				" . $other_selects . "
-			FROM q
-			" . ($table_config['resultjoin'] ?? "") . "
-			ORDER BY rank DESC
-		";
-
-		return success($output);
-	}
-
-	/**
-	 * Generates the search query for the given search string and the
-	 * specified search types.
-	 *
-	 * @param array								$searchArray
-	 * @param array								$types
-	 *
-	 * @return stdClass		containing the query string.
-	 */
-	public function getDynamicSearchSqls($searchArray, $types)
-	{
-		$with = [];
-		$selects = [];
-		foreach ($types as $type) {
-			$res = $this->checkConfig($type);
-			if (isError($res))
-				return $res;
-			$table_config = getData($res);
-
-			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
-			if (!$select)
-				continue;
-
-			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
-				FROM (" . implode(" UNION ", $select) . ") q
-				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
-			)";
-
-			$selects[] = "
-				SELECT
-					" . $this->_ci->db->escape($type) . " AS type,
-					rank,
-					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
-				FROM final_" . $type  . "
-				" . ($table_config['resultjoin'] ?? "");
-		}
-
-		if (!$selects)
-			return success("");
-
-		$recursive = "";
-		if ($with && $with[0] === "RECURSIVE") {
-			$recursive = "RECURSIVE ";
-			array_shift($with);
-		}
-
-		$with = array_unique($with);
-
-		$lang = getUserLanguage();
-		array_unshift($with, "lang (index) AS (
-			SELECT index
-			FROM public.tbl_sprache
-			WHERE sprache=" . $this->_ci->db->escape($lang) . "
-			LIMIT 1
-		)");
-		array_unshift($with, "auth (uid) AS (
-			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
-		)");
-
-		return success("
-			WITH " . $recursive . implode(", ", $with) . "
-			SELECT *
-			FROM (" . implode(" UNION ", $selects) . ") q
-			ORDER BY rank DESC
-			LIMIT 100
-		");
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Check config
-	 *
-	 * @param string							$name
-	 *
-	 * @return stdClass
-	 */
-	protected function checkConfig($name)
-	{
-		$table_config = $this->_ci->config->item($name, 'search');
-
-		if (!$table_config)
-			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
-				'type' => $name
-			]));
-
-		$errors = [];
-		if (!isset($table_config['table'])
-			|| !is_string($table_config['table'])
-			|| !$table_config['table']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'table'
-			]);
-		}
-		if (!isset($table_config['primarykey'])
-			|| !is_string($table_config['primarykey'])
-			|| !$table_config['primarykey']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'primarykey'
-			]);
-		}
-		if (!isset($table_config['resultfields'])
-			|| !is_array($table_config['resultfields'])
-			|| !$table_config['resultfields']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'resultfields'
-			]);
-		}
-		if (!isset($table_config['searchfields'])
-			|| !is_array($table_config['searchfields'])
-			|| !$table_config['searchfields']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'searchfields'
-			]);
-		} else {
-			foreach ($table_config['searchfields'] as $searchfield => $config) {
-				if (!isset($config['field'])
-					|| !is_string($config['field'])
-					|| !$config['field']
-				) {
-					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
-						'type' => $name,
-						'searchfield' => $searchfield,
-						'field' => 'field'
-					]);
-				}
-				if (!isset($config['comparison'])
-					|| !is_string($config['comparison'])
-					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
-				) {
-					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
-						'type' => $name,
-						'searchfield' => $searchfield,
-						'field' => 'comparison'
-					]);
-				}
-			}
-		}
-
-		if ($errors)
-			return error($errors);
-
-		return success($table_config);
-	}
-
-	/**
-	 * Generates the with statements for the given search string and the
-	 * specified search type.
-	 *
-	 * @param array								&$sqlWith
-	 * @param array								$searchArray
-	 * @param string							$table
-	 *
-	 * @return string	a query string or the name of the prepared select.
-	 */
-	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
-	{
-		$table_config = $this->_ci->config->item($table, 'search');
-
-		$id_offset = count($sqlWith);
-
-
-		$allowed_codes_w_order = ['' => 0, '!' => -1];
-		$max = max($this->_searchfunction_priorities);
-		foreach ($table_config['searchfields'] as $code => $config) {
-			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
-			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
-		}
-
-		$check_order = $this->_searchfunction_priorities;
-		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
-			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
-		});
-
-		$integer_functions = $this->_numeric_searchfunctions;
-		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
-				return in_array($a['comparison'], $integer_functions);
-		}));
-
-		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
-
-		$aliases = [];
-		foreach ($table_config['searchfields'] as $field => $config) {
-			if (isset($config['alias'])) {
-				foreach ($config['alias'] as $alias) {
-					$aliases[$alias] = $field;
-					$aliases['!' . $alias] = '!' . $field;
-				}
-			}
-		}
-
-		$sql_select = [];
-
-		if (isset($table_config['prepare'])) {
-			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
-		}
-
-		foreach ($searchArray as $or_search) {
-			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
-				continue;
-			unset($or_search['-filter']);
-			
-			foreach ($aliases as $alias => $field) {
-				if (isset($or_search[$alias])) {
-					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
-					unset($or_search[$alias]);
-				}
-			}
-
-			// NOTE(chris): early out if not allowed fields are in the search array
-			$used_codes = array_keys($or_search);
-			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
-				continue;
-
-			// NOTE(chris): expand general excludes to all fields
-			if (isset($or_search['!'])) {
-				$not = $or_search['!'];
-				unset($or_search['!']);
-				foreach ($table_config['searchfields'] as $code => $config) {
-					if (isset($or_search['!' . $code]))
-						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
-					else
-						$or_search['!' . $code] = $not;
-				}
-			}
-
-			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
-			if ($only_integer_fields
-				&& isset($or_search[""])
-				&& $this->_hasAtLeastOneNaN($or_search[""])
-			) {
-				continue;
-			}
-
-			$skip = false;
-			foreach ($integer_fields as $code) {
-				// NOTE(chris): filter non integer for integer fields
-				if (isset($or_search['!' . $code])) {
-					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
-						return is_numeric($a);
-					});
-					if (!$or_search['!' . $code])
-						unset($or_search['!' . $code]);
-				}
-				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
-				if (isset($or_search[$code])
-					&& $this->_hasAtLeastOneNaN($or_search[$code])
-				) {
-					$skip = true;
-					break;
-				}
-			}
-			if ($skip)
-				continue;
-
-			// NOTE(chris): sort for performance reasons
-			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
-				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
-			});
-
-			$or_with = [];
-			$or_select = [];
-			$or_prepare = [];
-
-			if (substr(key($or_search), 0, 1) == '!') {
-				// NOTE(chris): only negative searchwords
-				$sql = [];
-				foreach ($or_search as $code => $words) {
-					$code = substr($code, 1);
-					// NOTE(chris): sort for performance reasons
-					usort($words, function ($a, $b) {
-						return strlen($b) - strlen($a);
-					});
-					$field_config = $table_config['searchfields'][$code];
-
-					if (isset($field_config['prepare'])) {
-						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-						$or_prepare[$code] = $field_config['prepare'];
-						unset($table_config['searchfields'][$code]['prepare']);
-						unset($field_config['prepare']);
-					}
-					$field_sql = "
-						SELECT
-							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
-							FROM " . $table_config['table'] . "
-							" . $this->_makeJoin($field_config['join'] ?? '') . "
-							WHERE ";
-					foreach ($words as $word) {
-						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
-					}
-				}
-
-				$or_select[] = "
-					SELECT 
-						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
-						1.0 AS rank
-					FROM " . $table_config['table'] . "
-					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
-			} else {
-				$current_select = false;
-				$count = 0;
-				$skip = false;
-				foreach ($or_search as $code => $words) {
-					// NOTE(chris): sort for performance reasons
-					if ($code && substr($code, 0, 1) == '!') {
-						usort($words, function ($a, $b) {
-							return strlen($a) - strlen($b);
-						});
-					} else {
-						usort($words, function ($a, $b) {
-							return strlen($b) - strlen($a);
-						});
-					}
-					if ($code == '') {
-						foreach ($words as $i => $word) {
-							$field_sql = [];
-							foreach ($table_config['searchfields'] as $c => $field_config) {
-								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
-									continue;
-
-								$word_from = $table_config['table'];
-								$word_join = "";
-								$word_rank = "0";
-								if ($current_select) {
-									$word_from = $current_select;
-									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
-										$word_join .= " " . $this->_makeJoin($table_config);
-									}
-									$word_rank = "rank";
-								}
-								if (isset($field_config['prepare'])) {
-									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-									$or_prepare[$c] = $field_config['prepare'];
-									unset($table_config['searchfields'][$c]['prepare']);
-									unset($field_config['prepare']);
-								}
-								if (isset($field_config['join'])) {
-									$word_join .= " " . $this->_makeJoin($field_config['join']);
-								}
-								$field_sql[] = "
-									SELECT
-										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
-										" . $word_rank . " AS w_rank,
-										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
-										FROM " . $word_from . "
-										" . $word_join . "
-										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
-							}
-							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
-							if (!$field_sql) {
-								$or_with = [];
-								$or_select = [];
-								$count = 0;
-								$skip = true;
-								foreach ($or_prepare as $k => $v)
-									$table_config['searchfields'][$k]['prepare'] = $v;
-								break;
-							}
-
-							$id = "w" . ($id_offset + count($or_with));
-							$or_with[] = "
-								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-								SELECT
-									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
-									(w_rank + 1.0 - CASE " .
-										"WHEN MIN(rank) = 0 THEN 0 " .
-										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
-										"END))) END) AS rank
-									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
-									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
-								)";
-							$current_select = $id;
-						}
-					} else {
-						foreach ($words as $i => $word) {
-							$where = "";
-							$rank = "";
-							$jointype = "";
-							if (substr($code, 0, 1) == '!') {
-								$c = substr($code, 1);
-								$field_config = $table_config['searchfields'][$c];
-								
-								$rank = "1";
-
-								$jointype = "LEFT";
-
-								$where = $field_config['field'] .
-									" IS NULL OR NOT (" .
-									$this->_makeCompareBool(
-										$field_config['comparison'],
-										$field_config['field'],
-										$word
-									) .
-									")";
-								if ($field_config['1-n'] ?? false) {
-									$where = "GROUP BY " .
-										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
-										", rank HAVING MIN(CASE WHEN " .
-										$where .
-										" THEN 1 ELSE 0 END) = 1";
-								} else {
-									$where = "WHERE " . $where;
-								}
-							} else {
-								$field_config = $table_config['searchfields'][$code];
-
-								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
-
-								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
-								$where = "WHERE " . $where;
-							}
-							$word_from = $table_config['table'];
-							$word_join = "";
-							$word_rank = "";
-							if ($current_select) {
-								$word_from = $current_select;
-								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
-									$word_join .= " " . $this->_makeJoin($table_config);
-								}
-								$word_rank = "rank + ";
-							}
-							if (isset($field_config['prepare'])) {
-								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-								$or_prepare[$code] = $field_config['prepare'];
-								unset($table_config['searchfields'][$code]['prepare']);
-								unset($field_config['prepare']);
-							}
-							if (isset($field_config['join'])) {
-								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
-							}
-
-							$id = "w" . ($id_offset + count($or_with));
-							$or_with[] = "
-								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-								SELECT
-									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
-									" . $word_rank . $rank . " AS rank
-									FROM " . $word_from . "
-									" . $word_join . "
-									" . $where . "
-								)";
-							$current_select = $id;
-						}
-					}
-					if ($skip)
-						break;
-					$count += count($words);
-				}
-
-				if (!$count || !$current_select)
-					continue;
-
-				$or_select[] = "
-					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
-			}
-
-			if ($or_with[0] === "RECURSIVE") {
-				if ($sqlWith[0] !== "RECURSIVE")
-					array_unshift($sqlWith, "RECURSIVE");
-				array_shift($or_with);
-			}
-
-			$sqlWith = array_merge($sqlWith, $or_with);
-			$sql_select = array_merge($sql_select, $or_select);
-			$id_offset += count($or_with);
-		}
-
-		return $sql_select;
+		return $search; // return the result
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
 	/**
-	 * Checks if the field is not one of the primarykeys.
-	 *
-	 * @param string							$field
-	 * @param array|string						$primarykeys
-	 *
-	 * @return boolean
+	 * Checks:
+	 * - The given searchstr is a not empty string
+	 * - The given types is a not empty array and contains allowed search types
 	 */
-	private function _needBasicTableJoin($field, $primarykeys)
+	private function _checkParameters($searchstr, $types)
 	{
-		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
-			return $field != $primarykeys;
-		}
-		if (!is_array($primarykeys))
-			$primarykeys = explode(",", $primarykeys);
+		// If searchstr is empty
+		if (isEmptyString($searchstr)) return error(self::ERROR_WRONG_SEARCHSTR);
 
-		foreach ($primarykeys as $key) {
-			if ($field == trim($key))
-				return false;
-		}
-		return true;
+		// If types is not an array or it is empty
+		if (isEmptyArray($types)) return error(self::ERROR_NO_TYPES);
+
+		// If all the elements in types are allowed search types
+		if (!isEmptyArray(array_diff($types, self::ALLOWED_TYPES))) return error(self::ERROR_WRONG_TYPES);
+
+		return success(); // The check is fine!
 	}
 
 	/**
-	 * Returns comma separated primarykeys. Optionally with table prefix
-	 *
-	 * @param array|string						$primarykeys
-	 * @param string							$prefix
-	 *
-	 * @return string
+	 * Loops on types and perform the search of that type using searchstr
+	 * Then it collects all the returned data into an array as property of an object
 	 */
-	private function _formatPrimarykeys($primarykeys, $prefix = "")
+	private function _search($searchstr, $types)
 	{
-		if (is_array($primarykeys)) {
-			if ($prefix)
-				$prefix .= ".";
-			return $prefix . implode(", " . $prefix, $primarykeys);
-		}
-		if (!$prefix)
-			return $primarykeys;
+		// Object to be returned
+		$result = new stdClass();
+		$result->data = array();
 
-		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
+		// For each search type
+		foreach ($types as $type)
+		{
+			// Perform the search and then add the result to data
+			$result->data = array_merge($result->data, $this->{'_'.$type}($searchstr, $type));
+		}
+
+		return $result;
 	}
 
-	/**
-	 * Adds the prepare statement to the sqlWith stack and handles the
-	 * "RECURSIVE" modifier
-	 *
-	 * @param array								&$sqlWith
-	 * @param array								$prepares
-	 *
-	 * @return void
-	 */
-	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
+	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
 	{
-		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
-		if (!is_array($prepares))
-			$prepares = [$prepares];
+		$dbModel = new DB_Model();
+
+		$sql = '
+			SELECT
+				\''.$type.'\' AS type,
+				b.uid AS uid,
+				p.person_id AS person_id,
+				p.vorname || \' \' || p.nachname AS name,
+				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
+				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
+				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
+				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
+				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
+			  FROM public.tbl_mitarbeiter m
+			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) stdkst ON stdkst.uid = b.uid 
+			  JOIN public.tbl_person p USING(person_id)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) org ON org.uid = b.uid 
+		     LEFT JOIN (
+				SELECT kontakt, standort_id
+				  FROM public.tbl_kontakt
+				 WHERE kontakttyp = \'telefon\'
+			) k ON(k.standort_id = m.standort_id)
+			 WHERE 
+				(stdkst.bezeichnung IS NULL 
+				OR org.bezeichnung IS NULL) 
+				AND (
+			' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname'), 
+				$searchstr
+			) .
+			'
+				)
+		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
+		';
+
+		$employees = $dbModel->execReadOnlyQuery($sql);
 		
-		foreach ($prepares as $prep) {
-			$prep = trim($prep);
-			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
-				$recursive = true;
-				$sqlWith[] = substr($prep, 10);
-			} else {
-				$sqlWith[] = $prep;
-			}
-		}
-		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
-			array_unshift($sqlWith, "RECURSIVE");
-		}
+		// If something has been found then return it
+		if (hasData($employees)) return getData($employees);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
+	{
+		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
+		$document			 = implode(' || \' \' || ', $columns);
+		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
+		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
+		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
+
+		$searchclause = <<<EOSC
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
+			OR
+			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
+			OR
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
+	
+EOSC;
+
+		return $searchclause;
 	}
 
 	/**
-	 * Checks if an array has at least on non numeric value.
-	 *
-	 * @param array								$arr
-	 *
-	 * @return boolean
+	 * Search for employees
 	 */
-	private function _hasAtLeastOneNaN($arr)
+	private function _mitarbeiter($searchstr, $type)
 	{
-		foreach ($arr as $value)
-			if (!is_numeric($value))
-				return true;
-		return false;
+		$dbModel = new DB_Model();
+
+		$employees = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				b.uid AS uid,
+				p.person_id AS person_id,
+				p.vorname || \' \' || p.nachname AS name,
+				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
+				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
+				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
+				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
+				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
+			  FROM public.tbl_mitarbeiter m
+			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
+			  JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) stdkst ON stdkst.uid = b.uid 
+			  JOIN public.tbl_person p USING(person_id)
+			  JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) org ON org.uid = b.uid 
+		     LEFT JOIN (
+				SELECT kontakt, standort_id
+				  FROM public.tbl_kontakt
+				 WHERE kontakttyp = \'telefon\'
+			) k ON(k.standort_id = m.standort_id)
+			 WHERE ' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
+				$searchstr
+			) .
+			'
+		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
+		');
+
+		// If something has been found then return it
+		if (hasData($employees)) return getData($employees);
+
+		// Otherwise return an empty array
+		return array();
 	}
 
 	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param array								$join
-	 * @param string							$prefix
-	 *
-	 * @return string
+	 * Seach for organisation units
 	 */
-	private function _makeJoin($join, $prefix = "")
+	private function _organisationunit($searchstr, $type)
 	{
-		if (!is_array($join))
-			return "";
-		if (!isset($join['table'])) {
-			$output = [];
-			foreach ($join as $j)
-				$output[] = trim($this->_makeJoin($j, $prefix));
-			return implode(" ", $output);
-		}
-		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
-			return "";
-		$output = $prefix . " JOIN " . $join['table'];
+		$dbModel = new DB_Model();
 
-		if (isset($join['using']))
-			return $output . " USING (" . $join['using'] . ")";
+		$ous = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				o.oe_kurzbz AS oe_kurzbz,
+				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
+				oParent.oe_kurzbz AS parentoe_kurzbz,
+				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
+				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
+				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
+				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
+				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
+			  FROM public.tbl_organisationseinheit o
+			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
+			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
+		     LEFT JOIN (
+				SELECT benutzerfunktion_id, oe_kurzbz
+				  FROM public.tbl_benutzerfunktion
+				 WHERE funktion_kurzbz = \'oezuordnung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
+		     LEFT JOIN (
+				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_benutzer b USING(uid)
+				  JOIN public.tbl_person p USING(person_id)
+				 WHERE funktion_kurzbz = \'Leitung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND b.aktiv = TRUE
+			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
+			 WHERE 
+				o.aktiv = true
+				AND (' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
+				$searchstr
+			) .
+			') 
+		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
+		');
 
-		if (isset($join['primarykey']))
-			return $output . " USING (" . $join['primarykey'] . ")";
+		// If something has been found
+		if (hasData($ous))
+		{
+			// Loop through the returned dataset
+			foreach (getData($ous) as $ou)
+			{
+				// Create the new property leaders as an empty array
+				$ou->leaders = array();
 
-		return $output . " ON (" . $join['on'] . ")";
-	}
-
-	/**
-	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
-	 *
-	 * @param string							$function
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeFunction($function, $mode, $field, $word)
-	{
-		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
-
-		if (!$searchfunction)
-			return "";
-		$tpl = $searchfunction[$function] ?? "";
-		
-		if (strstr($tpl, '{field}'))
-			$tpl = str_replace('{field}', $field, $tpl);
-
-		if (strstr($tpl, '{word}'))
-			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
-		if (strstr($tpl, '{like:word}'))
-			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
-		
-		return $tpl;
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeRank($mode, $field, $word)
-	{
-		return $this->_makeFunction('rank', $mode, $field, $word);
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeCompare($mode, $field, $word)
-	{
-		return $this->_makeFunction('compare', $mode, $field, $word);
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeCompareBool($mode, $field, $word)
-	{
-		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
-
-		if (!$searchfunction)
-			return "";
-		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
-		return $this->_makeFunction($function, $mode, $field, $word);
-	}
-
-	/**
-	 * Converts the search string to an array.
-	 * First level should be joined with an OR.
-	 * Second level should be joined with an AND or AND NOT.
-	 * It is an associative array where the key is a code for the field
-	 * which the words should be compared with and the value is the array
-	 * of words.
-	 * Use AND NOT if the first letter in the key is "!".
-	 * Use AND if the first letter in the key is not "!".
-	 * E.g:
-	 * If the key is:
-	 * "": the words should be compared to all fields with AND.
-	 * "!": the words should be compared to all fields with AND NOT.
-	 * "somefield": the words should be compared to the field somefield with
-	 * AND.
-	 * "!somefield": the words should be compared to the field somefield with
-	 * AND NOT.
-	 *
-	 * @param string							$searchstring
-	 * @param array								$types
-	 *
-	 * @return array
-	 */
-	private function _convertQuery($searchstring, $types)
-	{
-		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
-		$allowedTypes = array_keys($types);
-
-		$currentArray = [];
-		$outputArray = [];
-		$cleanStrings = [];
-		$cleanSearchstring = '';
-		$filter = ['+' => [], '-' => []];
-		$typeAliases = [];
-
-		$tmp = explode(' ', strtolower($searchstring));
-		while ($tmp) {
-			$chunk = trim(array_shift($tmp));
-			if ($chunk == '')
-				continue;
-
-			if (strpos($chunk, '"') !== false) {
-				$test = explode('"', $chunk);
-				if (count($test) > 2) {
-					$rest = implode('"', array_slice($test, 2));
-					if ($rest) {
-						array_unshift($tmp, $rest);
-						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
-					}
-				}
-				if (count($test) == 2) {
-					while ($tmp && strpos($test[1], '"') === false) {
-						$test[1] .= ' ' . trim(array_shift($tmp));
-					}
-					if (strpos($test[1], '"') === false) {
-						$chunk = implode('"', $test) . '"';
-					} else {
-						$test2 = explode('"', $test[1], 2);
-						$chunk = $test[0] . '"' . $test2[0] . '"';
-						if ($test2[1]) {
-							array_unshift($tmp, $test2[1]);
-						}
-					}
-				}
-				if (strpos($chunk, ' ') === false) {
-					$chunk = str_replace('"', '', $chunk);
-				}
-			}
-
-			if ($chunk == 'or') {
-				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
-				$filter = ['+' => [], '-' => []];
-				if ($currentArray) {
-					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
-					$cleanStrings = [];
-					$outputArray[] = $currentArray;
-					$currentArray = [];
-				}
-				continue;
-			}
-
-			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
-				continue;
-
-			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
-				if (!$typeAliases) {
-					foreach ($types as $type => $config) {
-						$typeAliases[$type] = $type;
-						if (isset($config['alias'])) {
-							foreach ($config['alias'] as $alias) {
-								if (!isset($typeAliases[$alias]))
-									$typeAliases[$alias] = $type;
-							}
-						}
+				// Loop through the found leaders for this organisation unit
+				for ($i = 0; $i < count($ou->leader_uid); $i++)
+				{
+					// If a leader exists for this organisationunit and has a name :D
+					if (!isEmptyString($ou->leader_uid[$i]) && !isEmptyString($ou->leader_name[$i]))
+					{
+						// Empty object that will contains the leader uid and name
+						$leader = new stdClass();
+						// Set the properties name and uid
+						$leader->uid = $ou->leader_uid[$i];
+						$leader->name = $ou->leader_name[$i];
+						// Add the leader object to the leaders array
+						$ou->leaders[] = $leader;
 					}
 				}
 
-				$test = explode(':', $chunk, 2);
-				if (isset($typeAliases[$test[1]]))
-					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
-				elseif ($test[0] == '-')
-					continue;
+				// Remove the not needed properties leader_uid and leader_name
+				unset($ou->leader_uid);
+				unset($ou->leader_name);
 			}
 
-			if (in_array($chunk, $cleanStrings))
-				continue;
-
-			$cleanStrings[] = $chunk;
-
-			$chunk = str_replace('"', '', $chunk);
-			$code = '';
-
-			if ($chunk[0] == '-') {
-				$code = '!';
-				$chunk = substr($chunk, 1);
-			}
-			if (strpos($chunk, ':') !== false) {
-				$chunk = explode(':', $chunk, 2);
-				if (!$chunk[0]) {
-					$filter[$code ? '-' : '+'][] = $chunk[1];
-					continue;
-				}
-				$code .= $chunk[0];
-				$chunk = $chunk[1];
-			}
-
-			if (!isset($currentArray[$code]))
-				$currentArray[$code] = [];
-			
-			$currentArray[$code][] = $chunk;
+			// Returns the changed dataset
+			return getData($ous);
 		}
 
-		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
-		if ($currentArray) {
-			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
-			$outputArray[] = $currentArray;
-		}
-		return [$outputArray, $cleanSearchstring];
+		// Otherwise return an empty array
+		return array();
 	}
 
-	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	/**
+	 * Search for persons
+	 */
+	private function _person($searchstr, $type)
 	{
-		if ($filter['+'] && $filter['-']) {
-			$double = array_intersect($filter['+'], $filter['-']);
-			if ($double) {
-				foreach ($double as $type) {
-					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-				}
-				$filter['+'] = array_diff($filter['+'], $double);
-				$filter['-'] = array_diff($filter['-'], $double);
-			}
-			if (!$filter['+'] && !$filter['-']) {
-				// All filters cancel each other out
-				$currentArray = [];
-				$cleanStrings = [];
-				return;
-			}
-			if ($filter['+']) {
-				foreach ($filter['-'] as $type) {
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-				}
-				$filter['-'] = [];
-			}
-		}
-		if ($filter['+']) {
-			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
-			if (!$cleanFilter) {
-				// All filters are forbidden
-				$currentArray = [];
-				$cleanStrings = [];
-				return;
-			}
-			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
-			foreach ($forbiddenFilter as $type) {
-				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
-			}
-			$filter['+'] = $cleanFilter;
-		} elseif ($filter['-']) {
-			$filter['+'] = array_diff($allowedTypes, $filter['-']);
-			if (!$searchAllTypes) {
-				foreach ($filter['+'] as $type)
-					$cleanStrings[] = ':' . $type;
-				foreach ($filter['-'] as $type)
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-			}
-		} else {
-			if (!$searchAllTypes) {
-				foreach ($allowedTypes as $type)
-					$cleanStrings[] = ':' . $type;
-			}
+		return array();
+	}
+
+	/**
+	 * Search for students
+	 */
+	private function _student($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+		$gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			CASE 
+				when s.student_uid = \''.getAuthUID().'\' then p.foto
+				when p.foto IS NULL then \''.$gesperrtes_foto.'\' 
+				when p.foto_sperre = false then p.foto
+				else \''.$gesperrtes_foto.'\'
+			end as foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.aktiv = TRUE 
+			AND (b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\')
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				email, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	private function _studentStv($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			k.kontakt AS email,
+			p.foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				k.kontakt, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	/**
+	 * Search for prestudents
+	 */
+	private function _prestudent($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$prestudent = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			ps.prestudent_id,
+			ps.studiengang_kz,
+			p.person_id AS person_id,
+			b.uid,
+			p.vorname || \' \' || p.nachname AS name,
+			(
+				SELECT kontakt
+				FROM public.tbl_kontakt
+				WHERE kontakttyp = \'email\'
+				AND person_id = p.person_id
+				LIMIT 1
+			) as email,
+			p.foto,
+			sg.bezeichnung
+			FROM public.tbl_prestudent ps
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
+			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
+			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+			');
+
+		// If something has been found then return it
+		if (hasData($prestudent)) return getData($prestudent);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	/**
+	 * Search for documents
+	 */
+	private function _document($searchstr, $type)
+	{
+		return array();
+	}
+
+	/**
+	 * Search for CMSs
+	 */
+	private function _cms($searchstr, $type)
+	{
+		return array();
+	}
+
+	/**
+	 * Search for rooms
+	 */
+	private function _raum($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$rooms = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
+				COALESCE(ort.gebteil, \'N/A\') as building,
+				COALESCE(ort.ausstattung, \'N/A\') as austattung,
+				COALESCE(CAST(ort.stockwerk AS VARCHAR), \'N/A\') as floor,
+				COALESCE(CAST(ort.dislozierung AS VARCHAR), \'N/A\') as room_number,
+				COALESCE(CAST(ort.content_id AS VARCHAR), \'N/A\') as content_id,
+				
+				CASE
+					WHEN standort.plz IS NULL OR standort.ort IS NULL THEN 
+						CASE
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN \'N/A\'
+									ELSE CONCAT(ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN standort.strasse
+									ELSE CONCAT(standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+					ELSE 
+						CASE 
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort,\' / \',standort.strasse)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+				END as standort,
+				
+				
+				CASE
+					WHEN ort.max_person IS NULL OR ort.arbeitsplaetze IS NULL THEN \'N/A\'
+					ELSE CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\')
+				END as sitzplaetze
+				
+				FROM public.tbl_ort as ort
+				LEFT JOIN (
+					select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort USING(standort_id)
+			 WHERE 
+				ort.aktiv = true 
+				AND 
+				ort.lehre = true
+				AND (' .
+					$this->buildSearchClause(
+						$dbModel, 
+						array('ort.ort_kurzbz', 'ort.bezeichnung'), 
+						$searchstr
+					) . 
+			')' 
+		);
+
+		// If something has been found
+		if (hasData($rooms))
+		{
+			// Returns the dataset
+			return getData($rooms);
 		}
 
-		if ($filter['+']) {
-			$currentArray['-filter'] = $filter['+'];
-		}
+		// Otherwise return an empty array
+		return array();
 	}
 }
+
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
new file mode 100644
index 000000000..f48bf7e2e
--- /dev/null
+++ b/application/libraries/SearchLib.php
@@ -0,0 +1,1080 @@
+<?php
+/**
+ * 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \stdClass as stdClass;
+
+/**
+ * This is a alternative for SearchBarLib for advanced searches
+ */
+class SearchLib
+{
+	// Error constats
+	const ERROR_WRONG_JSON = 'ERR001';
+	const ERROR_WRONG_SEARCHSTR = 'ERR002';
+	const ERROR_NO_TYPES = 'ERR003';
+	const ERROR_WRONG_TYPES = 'ERR004';
+	const ERROR_NOT_AUTH = 'ERR005';
+
+	private $_ci; // Code igniter instance
+
+	private $_searchfunction_priorities = [];
+	private $_numeric_searchfunctions = [];
+	private $_allowed_searchfunctions = [];
+	
+	/**
+	 * Gets the CI instance and loads model
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		// It is loaded only to have the DB functions available
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// Load Config
+		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('searchfunctions', true);
+
+		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
+
+		// Precompute helper arrays
+		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
+			$this->_searchfunction_priorities[$key] = $arr['priority'];
+			if ($arr['force_integer'] ?? false)
+				$this->_numeric_searchfunctions[] = $key;
+			$this->_allowed_searchfunctions[] = $key;
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * It performes the search of the given search string using the specified search types
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types (optional)
+	 *
+	 * @return stdClass		containing an array with the result on index 0
+	 * 						and the overall query time on index 1.
+	 */
+	public function search($searchstring, $types = [])
+	{
+		if (!$types) {
+			$types = $this->_ci->config->item('search');
+		} else {
+			$tmp = [];
+			$missing = [];
+			foreach ($types as $type) {
+				$typeconfig = $this->_ci->config->item($type, 'search');
+				if (!$typeconfig) {
+					$missing[] = $type;
+				} else {
+					$tmp[$type] = $typeconfig;
+				}
+			}
+			if ($missing) {
+				$p = $this->_ci->search_phrases;
+				return error(array_map(function ($type) use ($p) {
+					return $p->t('search', 'error_missing_config', [
+						'type' => $type
+					]);
+				}, $missing));
+			}
+			$types = $tmp;
+		}
+
+
+		// Convert searchstring into array
+		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
+
+
+		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
+		if (isError($sql))
+			return $sql;
+		if (!hasData($sql)) {
+			$retval = success([]);
+			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
+			return $retval;
+		}
+
+		$msc = microtime(true);
+		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
+		$msc = microtime(true) - $msc;
+
+		if (isError($result))
+			return $result;
+
+		$retval = success($result->retval);
+		$retval->meta = [
+			'time' => $msc,
+			'searchstring' => $searchstring
+		];
+
+		return $retval;
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSql($searchArray, $table)
+	{
+		$res = $this->checkConfig($table);
+		if (isError($res))
+			return $res;
+		$table_config = getData($res);
+
+		$sql_with = [];
+		
+		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
+
+		if (!$sql_select)
+			return success("");
+
+		$lang = getUserLanguage();
+
+		$output = "WITH";
+		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
+			$output .= " RECURSIVE";
+			array_shift($sql_with);
+		}
+
+		$output .= "
+			lang (index) AS (
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=" . $this->_ci->db->escape($lang) . "
+				LIMIT 1
+			),
+			auth (uid) AS (
+				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+			)";
+
+		if ($sql_with) {
+			$sql_with = array_unique($sql_with);
+			$output .= ", " . implode(", ", $sql_with);
+		}
+
+		$other_selects = "";
+		if (isset($table_config['resultfields']))
+			$other_selects = implode(", ", $table_config['resultfields']);
+		if ($other_selects)
+			$other_selects = ", " . $other_selects;
+
+		$output .= "
+			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
+				FROM (" . implode(" UNION ", $sql_select) . ") q
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
+			)
+			SELECT
+				" . $this->_ci->db->escape($table) . " AS type,
+				q.rank
+				" . $other_selects . "
+			FROM q
+			" . ($table_config['resultjoin'] ?? "") . "
+			ORDER BY rank DESC
+		";
+
+		return success($output);
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search types.
+	 *
+	 * @param array								$searchArray
+	 * @param array								$types
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSqls($searchArray, $types)
+	{
+		$with = [];
+		$selects = [];
+		foreach ($types as $type) {
+			$res = $this->checkConfig($type);
+			if (isError($res))
+				return $res;
+			$table_config = getData($res);
+
+			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
+			if (!$select)
+				continue;
+
+			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
+				FROM (" . implode(" UNION ", $select) . ") q
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
+			)";
+
+			$selects[] = "
+				SELECT
+					" . $this->_ci->db->escape($type) . " AS type,
+					rank,
+					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
+				FROM final_" . $type  . "
+				" . ($table_config['resultjoin'] ?? "");
+		}
+
+		if (!$selects)
+			return success("");
+
+		$recursive = "";
+		if ($with && $with[0] === "RECURSIVE") {
+			$recursive = "RECURSIVE ";
+			array_shift($with);
+		}
+
+		$with = array_unique($with);
+
+		$lang = getUserLanguage();
+		array_unshift($with, "lang (index) AS (
+			SELECT index
+			FROM public.tbl_sprache
+			WHERE sprache=" . $this->_ci->db->escape($lang) . "
+			LIMIT 1
+		)");
+		array_unshift($with, "auth (uid) AS (
+			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+		)");
+
+		return success("
+			WITH " . $recursive . implode(", ", $with) . "
+			SELECT *
+			FROM (" . implode(" UNION ", $selects) . ") q
+			ORDER BY rank DESC
+			LIMIT 100
+		");
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Check config
+	 *
+	 * @param string							$name
+	 *
+	 * @return stdClass
+	 */
+	protected function checkConfig($name)
+	{
+		$table_config = $this->_ci->config->item($name, 'search');
+
+		if (!$table_config)
+			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
+				'type' => $name
+			]));
+
+		$errors = [];
+		if (!isset($table_config['table'])
+			|| !is_string($table_config['table'])
+			|| !$table_config['table']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'table'
+			]);
+		}
+		if (!isset($table_config['primarykey'])
+			|| !is_string($table_config['primarykey'])
+			|| !$table_config['primarykey']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'primarykey'
+			]);
+		}
+		if (!isset($table_config['resultfields'])
+			|| !is_array($table_config['resultfields'])
+			|| !$table_config['resultfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'resultfields'
+			]);
+		}
+		if (!isset($table_config['searchfields'])
+			|| !is_array($table_config['searchfields'])
+			|| !$table_config['searchfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'searchfields'
+			]);
+		} else {
+			foreach ($table_config['searchfields'] as $searchfield => $config) {
+				if (!isset($config['field'])
+					|| !is_string($config['field'])
+					|| !$config['field']
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'field'
+					]);
+				}
+				if (!isset($config['comparison'])
+					|| !is_string($config['comparison'])
+					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'comparison'
+					]);
+				}
+			}
+		}
+
+		if ($errors)
+			return error($errors);
+
+		return success($table_config);
+	}
+
+	/**
+	 * Generates the with statements for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return string	a query string or the name of the prepared select.
+	 */
+	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
+	{
+		$table_config = $this->_ci->config->item($table, 'search');
+
+		$id_offset = count($sqlWith);
+
+
+		$allowed_codes_w_order = ['' => 0, '!' => -1];
+		$max = max($this->_searchfunction_priorities);
+		foreach ($table_config['searchfields'] as $code => $config) {
+			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
+			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
+		}
+
+		$check_order = $this->_searchfunction_priorities;
+		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
+			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
+		});
+
+		$integer_functions = $this->_numeric_searchfunctions;
+		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
+				return in_array($a['comparison'], $integer_functions);
+		}));
+
+		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
+
+		$aliases = [];
+		foreach ($table_config['searchfields'] as $field => $config) {
+			if (isset($config['alias'])) {
+				foreach ($config['alias'] as $alias) {
+					$aliases[$alias] = $field;
+					$aliases['!' . $alias] = '!' . $field;
+				}
+			}
+		}
+
+		$sql_select = [];
+
+		if (isset($table_config['prepare'])) {
+			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
+		}
+
+		foreach ($searchArray as $or_search) {
+			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
+				continue;
+			unset($or_search['-filter']);
+			
+			foreach ($aliases as $alias => $field) {
+				if (isset($or_search[$alias])) {
+					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
+					unset($or_search[$alias]);
+				}
+			}
+
+			// NOTE(chris): early out if not allowed fields are in the search array
+			$used_codes = array_keys($or_search);
+			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
+				continue;
+
+			// NOTE(chris): expand general excludes to all fields
+			if (isset($or_search['!'])) {
+				$not = $or_search['!'];
+				unset($or_search['!']);
+				foreach ($table_config['searchfields'] as $code => $config) {
+					if (isset($or_search['!' . $code]))
+						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
+					else
+						$or_search['!' . $code] = $not;
+				}
+			}
+
+			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
+			if ($only_integer_fields
+				&& isset($or_search[""])
+				&& $this->_hasAtLeastOneNaN($or_search[""])
+			) {
+				continue;
+			}
+
+			$skip = false;
+			foreach ($integer_fields as $code) {
+				// NOTE(chris): filter non integer for integer fields
+				if (isset($or_search['!' . $code])) {
+					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
+						return is_numeric($a);
+					});
+					if (!$or_search['!' . $code])
+						unset($or_search['!' . $code]);
+				}
+				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
+				if (isset($or_search[$code])
+					&& $this->_hasAtLeastOneNaN($or_search[$code])
+				) {
+					$skip = true;
+					break;
+				}
+			}
+			if ($skip)
+				continue;
+
+			// NOTE(chris): sort for performance reasons
+			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
+				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
+			});
+
+			$or_with = [];
+			$or_select = [];
+			$or_prepare = [];
+
+			if (substr(key($or_search), 0, 1) == '!') {
+				// NOTE(chris): only negative searchwords
+				$sql = [];
+				foreach ($or_search as $code => $words) {
+					$code = substr($code, 1);
+					// NOTE(chris): sort for performance reasons
+					usort($words, function ($a, $b) {
+						return strlen($b) - strlen($a);
+					});
+					$field_config = $table_config['searchfields'][$code];
+
+					if (isset($field_config['prepare'])) {
+						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+						$or_prepare[$code] = $field_config['prepare'];
+						unset($table_config['searchfields'][$code]['prepare']);
+						unset($field_config['prepare']);
+					}
+					$field_sql = "
+						SELECT
+							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
+							FROM " . $table_config['table'] . "
+							" . $this->_makeJoin($field_config['join'] ?? '') . "
+							WHERE ";
+					foreach ($words as $word) {
+						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
+					}
+				}
+
+				$or_select[] = "
+					SELECT 
+						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
+						1.0 AS rank
+					FROM " . $table_config['table'] . "
+					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
+			} else {
+				$current_select = false;
+				$count = 0;
+				$skip = false;
+				foreach ($or_search as $code => $words) {
+					// NOTE(chris): sort for performance reasons
+					if ($code && substr($code, 0, 1) == '!') {
+						usort($words, function ($a, $b) {
+							return strlen($a) - strlen($b);
+						});
+					} else {
+						usort($words, function ($a, $b) {
+							return strlen($b) - strlen($a);
+						});
+					}
+					if ($code == '') {
+						foreach ($words as $i => $word) {
+							$field_sql = [];
+							foreach ($table_config['searchfields'] as $c => $field_config) {
+								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
+									continue;
+
+								$word_from = $table_config['table'];
+								$word_join = "";
+								$word_rank = "0";
+								if ($current_select) {
+									$word_from = $current_select;
+									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
+										$word_join .= " " . $this->_makeJoin($table_config);
+									}
+									$word_rank = "rank";
+								}
+								if (isset($field_config['prepare'])) {
+									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+									$or_prepare[$c] = $field_config['prepare'];
+									unset($table_config['searchfields'][$c]['prepare']);
+									unset($field_config['prepare']);
+								}
+								if (isset($field_config['join'])) {
+									$word_join .= " " . $this->_makeJoin($field_config['join']);
+								}
+								$field_sql[] = "
+									SELECT
+										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
+										" . $word_rank . " AS w_rank,
+										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
+										FROM " . $word_from . "
+										" . $word_join . "
+										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+							}
+							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
+							if (!$field_sql) {
+								$or_with = [];
+								$or_select = [];
+								$count = 0;
+								$skip = true;
+								foreach ($or_prepare as $k => $v)
+									$table_config['searchfields'][$k]['prepare'] = $v;
+								break;
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+								SELECT
+									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
+									(w_rank + 1.0 - CASE " .
+										"WHEN MIN(rank) = 0 THEN 0 " .
+										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
+										"END))) END) AS rank
+									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
+									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
+								)";
+							$current_select = $id;
+						}
+					} else {
+						foreach ($words as $i => $word) {
+							$where = "";
+							$rank = "";
+							$jointype = "";
+							if (substr($code, 0, 1) == '!') {
+								$c = substr($code, 1);
+								$field_config = $table_config['searchfields'][$c];
+								
+								$rank = "1";
+
+								$jointype = "LEFT";
+
+								$where = $field_config['field'] .
+									" IS NULL OR NOT (" .
+									$this->_makeCompareBool(
+										$field_config['comparison'],
+										$field_config['field'],
+										$word
+									) .
+									")";
+								if ($field_config['1-n'] ?? false) {
+									$where = "GROUP BY " .
+										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
+										", rank HAVING MIN(CASE WHEN " .
+										$where .
+										" THEN 1 ELSE 0 END) = 1";
+								} else {
+									$where = "WHERE " . $where;
+								}
+							} else {
+								$field_config = $table_config['searchfields'][$code];
+
+								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
+
+								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+								$where = "WHERE " . $where;
+							}
+							$word_from = $table_config['table'];
+							$word_join = "";
+							$word_rank = "";
+							if ($current_select) {
+								$word_from = $current_select;
+								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
+									$word_join .= " " . $this->_makeJoin($table_config);
+								}
+								$word_rank = "rank + ";
+							}
+							if (isset($field_config['prepare'])) {
+								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+								$or_prepare[$code] = $field_config['prepare'];
+								unset($table_config['searchfields'][$code]['prepare']);
+								unset($field_config['prepare']);
+							}
+							if (isset($field_config['join'])) {
+								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+								SELECT
+									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
+									" . $word_rank . $rank . " AS rank
+									FROM " . $word_from . "
+									" . $word_join . "
+									" . $where . "
+								)";
+							$current_select = $id;
+						}
+					}
+					if ($skip)
+						break;
+					$count += count($words);
+				}
+
+				if (!$count || !$current_select)
+					continue;
+
+				$or_select[] = "
+					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
+			}
+
+			if ($or_with[0] === "RECURSIVE") {
+				if ($sqlWith[0] !== "RECURSIVE")
+					array_unshift($sqlWith, "RECURSIVE");
+				array_shift($or_with);
+			}
+
+			$sqlWith = array_merge($sqlWith, $or_with);
+			$sql_select = array_merge($sql_select, $or_select);
+			$id_offset += count($or_with);
+		}
+
+		return $sql_select;
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Checks if the field is not one of the primarykeys.
+	 *
+	 * @param string							$field
+	 * @param array|string						$primarykeys
+	 *
+	 * @return boolean
+	 */
+	private function _needBasicTableJoin($field, $primarykeys)
+	{
+		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
+			return $field != $primarykeys;
+		}
+		if (!is_array($primarykeys))
+			$primarykeys = explode(",", $primarykeys);
+
+		foreach ($primarykeys as $key) {
+			if ($field == trim($key))
+				return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns comma separated primarykeys. Optionally with table prefix
+	 *
+	 * @param array|string						$primarykeys
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _formatPrimarykeys($primarykeys, $prefix = "")
+	{
+		if (is_array($primarykeys)) {
+			if ($prefix)
+				$prefix .= ".";
+			return $prefix . implode(", " . $prefix, $primarykeys);
+		}
+		if (!$prefix)
+			return $primarykeys;
+
+		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
+	}
+
+	/**
+	 * Adds the prepare statement to the sqlWith stack and handles the
+	 * "RECURSIVE" modifier
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$prepares
+	 *
+	 * @return void
+	 */
+	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
+	{
+		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
+		if (!is_array($prepares))
+			$prepares = [$prepares];
+		
+		foreach ($prepares as $prep) {
+			$prep = trim($prep);
+			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
+				$recursive = true;
+				$sqlWith[] = substr($prep, 10);
+			} else {
+				$sqlWith[] = $prep;
+			}
+		}
+		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
+			array_unshift($sqlWith, "RECURSIVE");
+		}
+	}
+
+	/**
+	 * Checks if an array has at least on non numeric value.
+	 *
+	 * @param array								$arr
+	 *
+	 * @return boolean
+	 */
+	private function _hasAtLeastOneNaN($arr)
+	{
+		foreach ($arr as $value)
+			if (!is_numeric($value))
+				return true;
+		return false;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param array								$join
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _makeJoin($join, $prefix = "")
+	{
+		if (!is_array($join))
+			return "";
+		if (!isset($join['table'])) {
+			$output = [];
+			foreach ($join as $j)
+				$output[] = trim($this->_makeJoin($j, $prefix));
+			return implode(" ", $output);
+		}
+		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
+			return "";
+		$output = $prefix . " JOIN " . $join['table'];
+
+		if (isset($join['using']))
+			return $output . " USING (" . $join['using'] . ")";
+
+		if (isset($join['primarykey']))
+			return $output . " USING (" . $join['primarykey'] . ")";
+
+		return $output . " ON (" . $join['on'] . ")";
+	}
+
+	/**
+	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
+	 *
+	 * @param string							$function
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeFunction($function, $mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$tpl = $searchfunction[$function] ?? "";
+		
+		if (strstr($tpl, '{field}'))
+			$tpl = str_replace('{field}', $field, $tpl);
+
+		if (strstr($tpl, '{word}'))
+			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
+		if (strstr($tpl, '{like:word}'))
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
+		
+		return $tpl;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeRank($mode, $field, $word)
+	{
+		return $this->_makeFunction('rank', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompare($mode, $field, $word)
+	{
+		return $this->_makeFunction('compare', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompareBool($mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
+		return $this->_makeFunction($function, $mode, $field, $word);
+	}
+
+	/**
+	 * Converts the search string to an array.
+	 * First level should be joined with an OR.
+	 * Second level should be joined with an AND or AND NOT.
+	 * It is an associative array where the key is a code for the field
+	 * which the words should be compared with and the value is the array
+	 * of words.
+	 * Use AND NOT if the first letter in the key is "!".
+	 * Use AND if the first letter in the key is not "!".
+	 * E.g:
+	 * If the key is:
+	 * "": the words should be compared to all fields with AND.
+	 * "!": the words should be compared to all fields with AND NOT.
+	 * "somefield": the words should be compared to the field somefield with
+	 * AND.
+	 * "!somefield": the words should be compared to the field somefield with
+	 * AND NOT.
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types
+	 *
+	 * @return array
+	 */
+	private function _convertQuery($searchstring, $types)
+	{
+		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
+		$allowedTypes = array_keys($types);
+
+		$currentArray = [];
+		$outputArray = [];
+		$cleanStrings = [];
+		$cleanSearchstring = '';
+		$filter = ['+' => [], '-' => []];
+		$typeAliases = [];
+
+		$tmp = explode(' ', strtolower($searchstring));
+		while ($tmp) {
+			$chunk = trim(array_shift($tmp));
+			if ($chunk == '')
+				continue;
+
+			if (strpos($chunk, '"') !== false) {
+				$test = explode('"', $chunk);
+				if (count($test) > 2) {
+					$rest = implode('"', array_slice($test, 2));
+					if ($rest) {
+						array_unshift($tmp, $rest);
+						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
+					}
+				}
+				if (count($test) == 2) {
+					while ($tmp && strpos($test[1], '"') === false) {
+						$test[1] .= ' ' . trim(array_shift($tmp));
+					}
+					if (strpos($test[1], '"') === false) {
+						$chunk = implode('"', $test) . '"';
+					} else {
+						$test2 = explode('"', $test[1], 2);
+						$chunk = $test[0] . '"' . $test2[0] . '"';
+						if ($test2[1]) {
+							array_unshift($tmp, $test2[1]);
+						}
+					}
+				}
+				if (strpos($chunk, ' ') === false) {
+					$chunk = str_replace('"', '', $chunk);
+				}
+			}
+
+			if ($chunk == 'or') {
+				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+				$filter = ['+' => [], '-' => []];
+				if ($currentArray) {
+					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+					$cleanStrings = [];
+					$outputArray[] = $currentArray;
+					$currentArray = [];
+				}
+				continue;
+			}
+
+			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
+				continue;
+
+			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
+				if (!$typeAliases) {
+					foreach ($types as $type => $config) {
+						$typeAliases[$type] = $type;
+						if (isset($config['alias'])) {
+							foreach ($config['alias'] as $alias) {
+								if (!isset($typeAliases[$alias]))
+									$typeAliases[$alias] = $type;
+							}
+						}
+					}
+				}
+
+				$test = explode(':', $chunk, 2);
+				if (isset($typeAliases[$test[1]]))
+					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
+				elseif ($test[0] == '-')
+					continue;
+			}
+
+			if (in_array($chunk, $cleanStrings))
+				continue;
+
+			$cleanStrings[] = $chunk;
+
+			$chunk = str_replace('"', '', $chunk);
+			$code = '';
+
+			if ($chunk[0] == '-') {
+				$code = '!';
+				$chunk = substr($chunk, 1);
+			}
+			if (strpos($chunk, ':') !== false) {
+				$chunk = explode(':', $chunk, 2);
+				if (!$chunk[0]) {
+					$filter[$code ? '-' : '+'][] = $chunk[1];
+					continue;
+				}
+				$code .= $chunk[0];
+				$chunk = $chunk[1];
+			}
+
+			if (!isset($currentArray[$code]))
+				$currentArray[$code] = [];
+			
+			$currentArray[$code][] = $chunk;
+		}
+
+		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+		if ($currentArray) {
+			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+			$outputArray[] = $currentArray;
+		}
+		return [$outputArray, $cleanSearchstring];
+	}
+
+	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	{
+		if ($filter['+'] && $filter['-']) {
+			$double = array_intersect($filter['+'], $filter['-']);
+			if ($double) {
+				foreach ($double as $type) {
+					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['+'] = array_diff($filter['+'], $double);
+				$filter['-'] = array_diff($filter['-'], $double);
+			}
+			if (!$filter['+'] && !$filter['-']) {
+				// All filters cancel each other out
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			if ($filter['+']) {
+				foreach ($filter['-'] as $type) {
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['-'] = [];
+			}
+		}
+		if ($filter['+']) {
+			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
+			if (!$cleanFilter) {
+				// All filters are forbidden
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
+			foreach ($forbiddenFilter as $type) {
+				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+			}
+			$filter['+'] = $cleanFilter;
+		} elseif ($filter['-']) {
+			$filter['+'] = array_diff($allowedTypes, $filter['-']);
+			if (!$searchAllTypes) {
+				foreach ($filter['+'] as $type)
+					$cleanStrings[] = ':' . $type;
+				foreach ($filter['-'] as $type)
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+			}
+		} else {
+			if (!$searchAllTypes) {
+				foreach ($allowedTypes as $type)
+					$cleanStrings[] = ':' . $type;
+			}
+		}
+
+		if ($filter['+']) {
+			$currentArray['-filter'] = $filter['+'];
+		}
+	}
+}

From 2aa3e7704f0521fffaabf2010e4a4c78366a7dfb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 10:57:16 +0200
Subject: [PATCH 0288/1357] fix(style):adds missing border

---
 public/css/Cis4/CoreCalendarEvents.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 5efe8b608..cf88e328c 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -38,6 +38,7 @@
 	padding: .25rem .5rem .25rem .25rem;
 	margin-right: .25rem;
 	align-content: center;
+	border-right: 1px solid var(--bs-secondary);
 }
 
 

From 57b0ae12d536fb92a5fa579fff06ef19fa95261d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 10:58:23 +0200
Subject: [PATCH 0289/1357] update(LvPlan router):changes the route parameters
 when changing the week in the weeks overview

---
 public/js/components/Calendar/Weeks.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 260540adb..bed39d624 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -9,7 +9,8 @@ export default {
 	],
 	inject: [
 		'size',
-		'focusDate'
+		'focusDate',
+		'mode',
 	],
 	props: {
 		header: {
@@ -30,6 +31,20 @@ export default {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
 			this.$emit('updateMode', 'week');
+			Vue.nextTick(()=>{
+				let date = new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
+				date = date.getFullYear() + "-" +
+					String(date.getMonth() + 1).padStart(2, "0") + "-" +
+					String(date.getDate()).padStart(2, "0");
+				this.$router.push({
+					name: "LvPlan",
+					params: {
+						mode: this.mode[0].toUpperCase() + this.mode.slice(1),
+						focus_date: date,
+						lv_id: this.$route.params.lv_id || null
+					}
+				})
+			})
 		},
 		prev(){
 			this.focusDate.y--;

From 9ed68648f648421521571595e0c44c3c02387db9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Jun 2025 11:33:15 +0200
Subject: [PATCH 0290/1357] declare css variables per component file with
 fallback default

---
 public/css/FilterWidget.css                   |   8 +-
 public/css/components/FilterComponent.css     |   6 +-
 public/css/components/FormUnderline.css       |   9 +-
 public/css/components/MyLv.css                |   4 +-
 public/css/components/NavigationComponent.css |  30 ++---
 public/css/components/Profil.css              |  16 +--
 public/css/components/Sprachen.css            |  14 ++-
 public/css/components/calendar.css            | 104 +++++++++---------
 public/css/components/dashboard.css           |  38 ++++---
 public/css/components/dashboard/news.css      |  26 ++---
 public/css/components/searchbar/searchbar.css |  18 +--
 public/css/components/searchbar/switches.css  |   8 +-
 public/css/components/verticalsplit.css       |   6 +-
 13 files changed, 154 insertions(+), 133 deletions(-)

diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
index 5723de69e..98573560f 100644
--- a/public/css/FilterWidget.css
+++ b/public/css/FilterWidget.css
@@ -1,8 +1,8 @@
 :root{
-	--filter-widget-border: var(--fhc-dark);
-	--filter-widget-color: var(--fhc-dark);
-	--filter-widget-primary: var(--fhc-primary);
-	--filter-widget-border-light: var(--fhc-border);
+	--filter-widget-border: var(--fhc-dark, black);
+	--filter-widget-color: var(--fhc-dark, black);
+	--filter-widget-primary: var(--fhc-primary, #428bca);
+	--filter-widget-border-light: var(--fhc-border, #ddd);
 }
 
 .filter-name-title {
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
index b3df05a19..3edf989a6 100644
--- a/public/css/components/FilterComponent.css
+++ b/public/css/components/FilterComponent.css
@@ -1,7 +1,7 @@
 :root{
-	--fhc-filtercomponent-primary: var(--fhc-primary);
-	--fhc-filtercomponent-bg:var(--fhc-background);
-	--fhc-filtercomponent-border:var(--fhc-border);
+	--fhc-filtercomponent-primary: var(--fhc-primary, #428bca);
+	--fhc-filtercomponent-bg:var(--fhc-background, white);
+	--fhc-filtercomponent-border:var(--fhc-border, black);
 }
 
 .filter-header-title {
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index f41883265..0d1fd991f 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -1,5 +1,10 @@
 /* FORM UNDERLINE
 */
+:root {
+	--fhc-formunderline-border: var(--fhc-border, #dee2e6);
+	--fhc-formunderline-link: var(--fhc-link, initial);
+}
+
 .form-underline{
     display: flex;
     flex-direction: column;
@@ -9,12 +14,12 @@
   }
   
   a.form-underline-content{
-	color: var(--fhc-link);
+	color: var(--fhc-formunderline-link);
   }
   
   .form-underline .form-underline-content{
     border-width: 1px;
-    border-color: transparent transparent var(--fhc-border) transparent;
+    border-color: transparent transparent var(--fhc-formunderline-border) transparent;
     border-style: solid;
     padding-bottom: 0.25rem;
     padding-left: 0.5rem;
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index b7176fb35..267e2f45e 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -1,8 +1,8 @@
 :root{
-	--myLv-disabled: var(--fhc-disabled);
+	--fhc-myLv-disabled: var(--fhc-disabled, #565e647f);
 }
 
 .unavailable, .unavailable:hover{
-	color: var(--myLv-disabled) !important;
+	color: var(--fhc-myLv-disabled) !important;
 	cursor: default;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index e922d4812..4799e2f26 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -3,22 +3,22 @@
  */
 
  :root{
-	--nav-component-bg: var(--fhc-tertiary);
-	--nav-component-border: var(--fhc-border);
-	--nav-component-color: var(--fhc-text);
-	--nav-left-component-border: var(--fhc-border);
-	--nav-left-component-bg: var(--fhc-tertiary);
-	--nav-left-component-color: var(--fhc-primary);
-	--nav-left-component-hover: var(--fhc-secondary-highlight);
+	--fhc-nav-component-bg: var(--fhc-tertiary, #f8f8f8);
+	--fhc-nav-component-border: var(--fhc-border, #5e5e5e);
+	--fhc-nav-component-color: var(--fhc-text, #5e5e5e);
+	--fhc-nav-left-component-border: var(--fhc-border, #e7e7e7);
+	--fhc-nav-left-component-bg: var(--fhc-tertiary, #f8f8f8);
+	--fhc-nav-left-component-color: var(--fhc-primary, #23527c);
+	--fhc-nav-left-component-hover: var(--fhc-secondary-highlight, #eee);
  }
 
 .navbar-header {
-	background-color: var(--nav-component-bg);
+	background-color: var(--fhc-nav-component-bg);
 	padding-top: 0px;
 	padding-bottom: 0px;
 	padding-left: 10px;
 	border-style: solid;
-	border-color: var(--nav-component-border);
+	border-color: var(--fhc-nav-component-border);
 	border-width: 0 0 1px;
 }
 
@@ -26,7 +26,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 18px;
 	line-height: 1.42857143;
-	color: var(--nav-component-color) !important;
+	color: var(--fhc-nav-component-color) !important;
 	padding-top: 15px !important;
 	padding-right: 7px !important;
 	padding-left: 7px !important;
@@ -45,8 +45,8 @@
 	z-index: 1;
 	position: absolute;
 	width: 250px;
-	border-right: 1px solid ;
-	background-color:var(--nav-left-component-bg);
+	border-right: 1px solid var(--fhc-nav-left-component-border);
+	background-color:var(--fhc-nav-left-component-bg);
 }
 
 .navbar-left-side ul {
@@ -54,7 +54,7 @@
 }
 
 .navbar-left-side ul li {
-	border-bottom: 1px solid var(--nav-left-component-border);
+	border-bottom: 1px solid var(--fhc-nav-left-component-border);
 }
 
 .left-side-menu-second-level {
@@ -78,7 +78,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 14px;
 	line-height: 1.42857143;
-	color: var(--nav-left-component-color);
+	color: var(--fhc-nav-left-component-color);
 	padding-top: 10px !important;
 	padding-bottom: 10px !important;
 	padding-left: 7px !important;
@@ -87,7 +87,7 @@
 }
 
 .left-side-menu-link-entry:hover {
-	background-color: var(--nav-left-component-hover);
+	background-color: var(--fhc-nav-left-component-hover);
 }
 
 /*
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index de6adbee7..b1ac8d67a 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,14 +1,13 @@
 
 :root{
-	--profil-border: var(--fhc-border);
-	--profil-tabulator-shadow:var(--fhc-shadow-20);
+	--fhc-profil-border: var(--fhc-border, white);
+	--fhc-profil-tabulator-shadow: var(--fhc-shadow-20, rgba(0,0,0,0.1));
 }
 
-
 .image-lock{
   height:22px; 
   width:21px; 
-  background-color:var(--profil-border); 
+  background-color:var(--fhc-profil-border); 
   position:absolute;
   /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
@@ -21,7 +20,7 @@
 
 .tabulator-collapsed-row{
     padding:15px;
-    background-color: var(--profil-tabulator-shadow);
+    background-color: var(--fhc-profil-tabulator-shadow);
 
 }
 
@@ -33,9 +32,6 @@
   padding:0 !important;
 }
 
-
-
-
 .btn-circle {
   width: 30px;
   height: 30px;
@@ -45,7 +41,3 @@
   font-size: 12px;
   line-height: 1.42857;
 }
-
-
-
-
diff --git a/public/css/components/Sprachen.css b/public/css/components/Sprachen.css
index 028b4f2f2..3175bbd1d 100644
--- a/public/css/components/Sprachen.css
+++ b/public/css/components/Sprachen.css
@@ -1,13 +1,21 @@
+
+:root {
+	--fhc-sprachen-color: var(--fhc-text, white);
+	--fhc-sprachen-background: var(--fhc-primary, #005585);
+	--fhc-sprachen-background-highlight: var(--fhc-primary-highlight, #00649c);
+}
+
 .sprachen-entry{
-	background-color: var(--fhc-primary);
+	color: var(--fhc-sprachen-color);
+	background-color: var(--fhc-sprachen-background);
 }
 
 .sprachen-entry:hover {
-	background-color: var(--fhc-primary);
+	background-color: var(--fhc-sprachen-background);
 }
 
 [selected="true"].sprachen-entry {
-	background-color: var(--fhc-primary-highlight);
+	background-color: var(--fhc-sprachen-background-highlight);
 }
 
 .sprachen-entry.btn {
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 4d082fa5a..fe8841867 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,48 +1,50 @@
 :root{
-	--calendar-pane-height: calc(100vh - 220px);
+	--fhc-calendar-pane-height: calc(100vh - 220px);
 	
-	--calendar-primary: var(--fhc-primary);
-	--calendar-border: var(--fhc-border);
-	--calendar-border-highlight: var(--fhc-border-highlight);
-	--calendar-text: var(--fhc-text);
-	--calendar-text-light: var(--fhc-text);
-	--calendar-bg: var(--fhc-background);
-	--calendar-hour-indicator-bg: var(--fhc-background);
-	--calendar-week-page-header-background: var(--fhc-background);
-	--calendar-week-page-header-color: var(--fhc-text);
-	--calendar-week-page-header-border: var(--fhc-border);
-	--calendar-week-page-header-hover-background: var(--fhc-background-highlight);
-	--calendar-all-day-event-background: var(--fhc-background);
-	--calendar-past: var(--fhc-beige-10);
+	--fhc-calendar-primary: var(--fhc-primary, #006095);
+	--fhc-calendar-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+	--fhc-calendar-text: var(--fhc-text, #212529);
+	--fhc-calendar-text-light: var(--fhc-text, #212529);
+	--fhc-calendar-background: var(--fhc-background, #fff);
+	--fhc-calendar-dark: var(--fhc-dark, #212529);
+	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
 }
 
 :root.dark{
-	--calendar-past: var(--fhc-beige-20);
+	--fhc-calendar-past: var(--fhc-beige-20, rgba(172, 153, 125, 0.5));
 }
 
 .fhc-calendar-pane {
-	height: var(--calendar-pane-height);
+	height: var(--fhc-calendar-pane-height);
 }
 
 .fhc-calendar-hour-indicator{
-	border-top: 1px solid var(--calendar-border);
+	border-top: 1px solid var(--fhc-calendar-border);
 }
 
 .fhc-calendar-hour-indicator span{
-	background-color: var(--calendar-hour-indicator-bg) !important;
+	background-color: var(--fhc-calendar-hour-indicator-bg) !important;
 }
 
 .fhc-calendar-week-page-header{
-	color: var(--calendar-text);
-	background-color: var(--calendar-week-page-header-background);
+	color: var(--fhc-calendar-text);
+	background-color: var(--fhc-calendar-week-page-header-background);
 }
 
 .fhc-calendar-week-page-header > div {
-	border-right: 1px solid var(--calendar-border);
+	border-right: 1px solid var(--fhc-calendar-border);
 }
 
 .fhc-calendar-week-page-header > div:hover{
-	background-color: var(--calendar-week-page-header-hover-background);
+	background-color: var(--fhc-calendar-week-page-header-hover-background);
 }
 
 .fhc-calendar-months .col-4,
@@ -104,7 +106,7 @@
 }
 
 .fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-week-page .all-day-event {
@@ -120,7 +122,7 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
-	background-color:var(--calendar-all-day-event-background);
+	background-color:var(--fhc-calendar-all-day-event-background);
 }
 
 .fhc-calendar-week-page .all-day-event-container::before {
@@ -130,12 +132,12 @@
 	bottom: 0;
 	left: -3em;
 	right: 100%;
-	background-color: var(--calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	background-color: var(--fhc-calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px var(--fhc-box-shadow);
+	box-shadow: 0 0 0 1px var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -151,13 +153,13 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
-	background-color:var(--calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	background-color:var(--fhc-calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
-	box-shadow: 0 0 0 1px var(--calendar-border) !important;
+	box-shadow: 0 0 0 1px var(--fhc-calendar-border) !important;
 }
 
 .fhc-calendar-no-events-overlay{
@@ -172,7 +174,7 @@
 	margin:auto;
 	width: 100%;
 	height: 100%;
-	background-image: linear-gradient(120deg, var(--fhc-background), var(--fhc-dark) );
+	background-image: linear-gradient(120deg, var(--fhc-calendar-background), var(--fhc-calendar-dark) );
 	opacity: .7;
 }
 .fhc-calendar-day-page {
@@ -198,18 +200,18 @@
 }
 
 .fhc-calendar-month-page-day{
-	color: var(--calendar-text) !important;
+	color: var(--fhc-calendar-text) !important;
 }
 
 .fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
-	color: var(--fhc-text) !important;
+	color: var(--fhc-calendar-text) !important;
 }
 
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-lg .fhc-calendar-month-page-weekday,
 .fhc-calendar-md .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-weekday {
-  border: solid 1px var(--calendar-border);
+  border: solid 1px var(--fhc-calendar-border);
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
@@ -219,7 +221,7 @@
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day.active,
 .fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--calendar-border-highlight);
+  border-color: var(--fhc-calendar-border-highlight);
 }
 /*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
 /*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
@@ -264,8 +266,8 @@
 }
 
 .fhc-calendar-month-page-weekday:hover {
-	background-color:var(--calendar-primary);
-	color:var(--calendar-text-light);
+	background-color:var(--fhc-calendar-primary);
+	color:var(--fhc-calendar-text-light);
 	
 }
 
@@ -278,14 +280,14 @@
 
 
 .fhc-calendar-past {
-	background-color: var(--calendar-past);
-	border-color: var(--calendar-border);
+	background-color: var(--fhc-calendar-past);
+	border-color: var(--fhc-calendar-border);
 	opacity: 0.5;
 }
 
 .fhc-calendar-month-page-day-focusday {
-	border-color: var(--calendar-border-highlight) !important;
-	background-color: var(--calendar-bg);
+	border-color: var(--fhc-calendar-border-highlight) !important;
+	background-color: var(--fhc-calendar-background);
 	position: relative;
 	animation: dash-animation 2.5s linear infinite;
 }
@@ -317,20 +319,20 @@
 	bottom:0;
 	left:0;
 	right:0;
-	box-shadow: inset 0 0 0 2px var(--calendar-border) !important;
+	box-shadow: inset 0 0 0 2px var(--fhc-calendar-border) !important;
 	pointer-events: none;
 	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: var(--calendar-primary);
+  background-color: var(--fhc-calendar-primary);
   border-radius: 50%;
   font-weight: bold;
 }
 .fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: var(--calendar-primary);
+  background-color: var(--fhc-calendar-primary);
   border-radius: 50%;
 }
 /*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
@@ -358,8 +360,8 @@
 }
 
 .selectedEvent {
-	background-color: var(--calendar-primary) !important;
-	color: var(--calendar-text-light);
+	background-color: var(--fhc-calendar-primary) !important;
+	color: var(--fhc-calendar-text-light);
 }
 
 .fhc-calendar-day-page .curTimeIndicator{
@@ -370,7 +372,7 @@
 	padding-left: 7rem;
 	margin-top: -1px;
 	z-index: 2;
-	border-color: var(--calendar-border)!important;
+	border-color: var(--fhc-calendar-border)!important;
 }
 
 .fhc-calendar-week-page .curTimeIndicator {
@@ -381,12 +383,12 @@
 	padding-left: 1rem;
 	margin-top: -1px;
 	z-index: 2;
-	border-color: var(--calendar-border) !important;
+	border-color: var(--fhc-calendar-border) !important;
 }
 
 .fhc-calendar-week-page .past::before{
 	content:"";
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
@@ -398,7 +400,7 @@
 }
 
 .fhc-calendar-week-page .overlay {
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
@@ -406,7 +408,7 @@
 }
 
 .fhc-calendar-day-page .overlay {
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index beb5b649c..78567be2b 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -2,8 +2,18 @@
 @import './dashboard/news.css';
 
 :root{
-	--dashboard-danger: var(--fhc-danger);
+	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
+	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
+	--fhc-dashboard-gridrow-background: var(--fhc-background, white);
+	--fhc-dashboard-gridrow-background-highlight: var(--fhc-background-highlight, #6c757d);
+	--fhc-dashboard-draggeditem-background: var(--fhc-background, white);
+	--fhc-dashboard-item-overlay-background: var(--fhc-background-highlight, rgba(0, 100, 156, 1));
+	--fhc-dashboard-item-overly-border-color: var(--fhc-border, lightgray);
+	--fhc-dashboard-denied-dragging-animation-color: var(--fhc-danger, red);
+	--fhc-dashboard-pin-pinned-hover-color: var(--fhc-fifth-highlight, rgb(153, 116, 116));
+	--fhc-dashboard-section-info-color: var(--fhc-primary, #00649c);
+	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
 @media(max-width: 577px) {
@@ -13,7 +23,7 @@
 }
 
 .core-dashboard a{
-	color: var(--fhc-link);
+	color: var(--fhc-dashboard-link);
 }
 
 @media (max-width: 576px){
@@ -46,12 +56,12 @@
 	bottom:0;
 	left:50%;
 	transform:translate(-50%, 50%);
-	background-color:white;
+	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
 	color:white;
-	background-color:#6c757d;
+	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .empty-tile-hover:hover {
@@ -59,8 +69,8 @@
 }
 
 .alert-danger .form-check-input:checked {
-	border-color: var(--dashboard-danger);
-	background-color: var(--dashboard-danger);
+	border-color: var(--fhc-dashboard-danger);
+	background-color: var(--fhc-dashboard-danger);
 }
 
 :root {
@@ -124,7 +134,7 @@
 .draggedItem {
 	height: 100%;
 	width: 100%;
-	background-color: white;
+	background-color: var(--fhc-dashboard-draggeditem-background);
 	position: relative;
 }
 
@@ -135,13 +145,13 @@
 	left:0;
 	right:0;
 	bottom:0;
-	background-color:rgba(0, 100, 156);
-	border:4px dashed lightgray;
+	background-color:var(--fhc-dashboard-item-overlay-background);
+	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
 	opacity: 0.5;
 }
 
 #deleteBookmark i{
-	color: var(--fhc-danger);
+	color: var(--fhc-dashboard-danger);
 }
 
 .pin:hover{
@@ -149,21 +159,21 @@
 }
 
 .pin[pinned]:hover{
-	color:rgb(153, 116, 116);
+	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
 .section-info{
-	color: #00649c;
+	color: var(--fhc-dashboard-section-info-color);
 	cursor:pointer;
 }
 
 .section-info:hover {
-	color: #005585;
+	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
 .denied-dragging-animation {
 	animation: wiggle 0.5s linear;
-	color:red !important;
+	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
 
 @keyframes wiggle {
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index d65b51592..ca584c235 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -1,10 +1,10 @@
 :root{
-    --news-widget-height: 1;
-	--news-widget-bg: var(--fhc-primary);
-	--news-widget-highlight-color: var(--fhc-primary-highlight);
-	--news-widget-border: var(--fhc-border);
-	--news-widget-border-highlight: var(--fhc-border-highlight);
-	--news-widget-text-light: var(--fhc-text);
+    --fhc-news-widget-height: 1;
+	--fhc-news-widget-bg: var(--fhc-primary);
+	--fhc-news-widget-highlight-color: var(--fhc-primary-highlight);
+	--fhc-news-widget-border: var(--fhc-border);
+	--fhc-news-widget-border-highlight: var(--fhc-border-highlight);
+	--fhc-news-widget-text-light: var(--fhc-text);
 }
 
 
@@ -53,26 +53,26 @@
 
 .fhc-news-menu-item {
     padding: 0.375rem;
-    color: var(--news-widget-text-light);
+    color: var(--fhc-news-widget-text-light);
     min-height: 5%;
     max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
-    background-color: var(--news-widget-bg);
-    border: 1px solid var(--news-widget-border);
+    background-color: var(--fhc-news-widget-bg);
+    border: 1px solid var(--fhc-news-widget-border);
     cursor: pointer;
     transition: background-color 0.2s ease, border-color 0.2s ease; /* Smooth transition */
 }
 
 .fhc-news-menu-item:hover {
-    background-color: var(--news-widget-highlight-color);
-    border-color: var(--news-widget-border-highlight);
+    background-color: var(--fhc-news-widget-highlight-color);
+    border-color: var(--fhc-news-widget-border-highlight);
 }
 
 .fhc-news-menu-item.selected {
-    background-color: var(--news-widget-highlight-color);
-    border: 2px solid var(--news-widget-border-highlight);
+    background-color: var(--fhc-news-widget-highlight-color);
+    border: 2px solid var(--fhc-news-widget-border-highlight);
     
 }
 
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 6aa84c716..603f2046a 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -6,20 +6,20 @@
 @import url(./switches.css);
 
 :root{
-	--searchbar-shadow: var(--fhc-shadow-40);
+	--searchbar-shadow: var(--fhc-shadow-40, #ced4da);
 }
 
 .searchbar_settings {
 	position: absolute; 
     z-index: 9999; 
-    background-color: var(--fhc-dark);
+    background-color: var(--fhc-dark, #343a40);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: var(--fhc-background); 
-    border: 1px solid var(--fhc-border);
+    background-color: var(--fhc-background, #fff); 
+    border: 1px solid var(--fhc-border, lightgrey);
     padding: .5rem;
     top: 100%;
     width: 100%;
@@ -29,12 +29,16 @@
 }
 
 .searchbar_results a{
-	color: var(--fhc-link);
+	color: var(--fhc-link, #0d6efd);
 }
-
+/*
 .searchbar_results a:not(a~i) {
 	color: inherit;
 }
+*/
+.searchbar_results a.btn {
+	color: var(--bs-btn-color, white);
+}
 
 .searchbar_results_scroller {
     overflow-y: auto;
@@ -42,7 +46,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid var(--fhc-border);
+    border-bottom: 1px solid var(--fhc-border, lightgrey);
     margin-bottom: 1rem;
 }
 
diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css
index 64da02ce8..c10d63d00 100644
--- a/public/css/components/searchbar/switches.css
+++ b/public/css/components/searchbar/switches.css
@@ -1,7 +1,7 @@
 :root{
-	--fhc-switches-checked-bg: var(--fhc-light);
-	--fhc-switches-unchecked-bg: var(--fhc-disabled);
-	--fhc-switches-shadow: var(--fhc-shadow-20);
+	--fhc-switches-checked-bg: var(--fhc-light, white);
+	--fhc-switches-unchecked-bg: var(--fhc-disabled, var(--bs-gray-600));
+	--fhc-switches-shadow: var(--fhc-shadow-20, rgba(108, 117, 125,.25));
 }
 
 .fhc-switches:checked  {
@@ -15,7 +15,7 @@
     background-color: var(--fhc-switches-unchecked-bg) !important;
     border-color: transparent;
     background-position: left center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%236b747a'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches:focus  {
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
index 1d5a56788..e0e2599e8 100644
--- a/public/css/components/verticalsplit.css
+++ b/public/css/components/verticalsplit.css
@@ -3,9 +3,9 @@
     Author     : bambi
 */
 :root {
-    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background);
-    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border);
-    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark);
+    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background, #eee);
+    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border, #eee);
+    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark, #000);
 }
 
 .verticalsplitted {

From 02df06288e7590e04c4fed0799651687d19cb05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Jun 2025 11:37:04 +0200
Subject: [PATCH 0291/1357] =?UTF-8?q?Bugfix=20R=C3=BCckstellgrund?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/system/infocenter/onboarding.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/system/infocenter/onboarding.php b/application/views/system/infocenter/onboarding.php
index a600364d9..1f5bae847 100644
--- a/application/views/system/infocenter/onboarding.php
+++ b/application/views/system/infocenter/onboarding.php
@@ -19,7 +19,7 @@
 				'ui' => array('bitteEintragWaehlen')
 			),
 			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
-			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/rueckstellung.js', 'public/js/infocenter/infocenterPersonDataset.js')
 		)
 	);
 ?>

From 688f87e2ba95ee56fd76644eda2144573910fa8e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jun 2025 11:57:27 +0200
Subject: [PATCH 0292/1357] New Endpoint for advanced search

---
 .../controllers/api/frontend/v1/Searchbar.php | 30 +++++++++++++++----
 public/js/api/search.js                       |  4 +++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index d630d3afd..95ae6a6b3 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -37,9 +37,6 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED
 		]);
-
-		// Load the library SearchBarLib
-		$this->load->library('SearchBarLib');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -50,6 +47,29 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
+		$this->load->library('SearchBarLib');
+		$this->load->library('form_validation');
+
+		// Checks if the searchstr and the types parameters are in the POSTed JSON
+		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
+		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+
+		// Convert to json the result from searchbarlib->search
+		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		if (property_exists($result, 'error'))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($result);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchAdvanced()
+	{
+		$this->load->library('SearchLib');
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
@@ -59,8 +79,8 @@ class Searchbar extends FHCAPI_Controller
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		// Convert to json the result from searchbarlib->search
-		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		// Convert to json the result from searchlib->search
+		$result = $this->searchlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 
 		$data = $this->getDataOrTerminateWithError($result);
 
diff --git a/public/js/api/search.js b/public/js/api/search.js
index c6a5d77a5..76b3fcd9b 100644
--- a/public/js/api/search.js
+++ b/public/js/api/search.js
@@ -20,6 +20,10 @@ export default {
 		const url = '/api/frontend/v1/searchbar/search';
 		return this.$fhcApi.post(url, searchsettings, config);
 	},
+	searchAdvanced(searchsettings, config) {
+		const url = '/api/frontend/v1/searchbar/searchAdvanced';
+		return this.$fhcApi.post(url, searchsettings, config);
+	},
 	searchdummy(searchsettings) {
 		const url = 'public/js/apps/api/dummyapi.php/Search';
 		return this.$fhcApi.post(url, searchsettings);

From 66ccd83b5510dc3232f1902ed82e2df68048670c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 14:14:49 +0200
Subject: [PATCH 0293/1357] refactor(LvPlan): changes the lvInfo and lvMenu
 component in the Page View to use the renderer components based on the event
 type

---
 public/css/Cis4/CoreCalendarEvents.css        |  1 -
 public/css/components/searchbar/searchbar.css |  4 +--
 public/js/apps/Dashboard/Fhc.js               |  1 -
 public/js/components/Calendar/Day/Page.js     |  4 +--
 public/js/components/Cis/LvPlan/LvPlan.js     | 29 ++++++++++---------
 public/js/components/Cis/Mylv/modalContent.js | 19 ++++++++++--
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index cf88e328c..79ca36d00 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -63,7 +63,6 @@
 .dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display:grid;
 	align-content: center;
-	border-right: 1px solid var(--bs-border-color);
 }
 
 .dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 603f2046a..bf091eef5 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -6,7 +6,7 @@
 @import url(./switches.css);
 
 :root{
-	--searchbar-shadow: var(--fhc-shadow-40, #ced4da);
+	--fhc-searchbar-shadow: var(--fhc-shadow-40, #ced4da);
 }
 
 .searchbar_settings {
@@ -25,7 +25,7 @@
     width: 100%;
     left: 0;
     right: 0;
-	box-shadow: 2px 2px 4px var(--searchbar-shadow);
+	box-shadow: 2px 2px 4px var(--fhc-searchbar-shadow);
 }
 
 .searchbar_results a{
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 637e08cce..f04d25efc 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -304,7 +304,6 @@ const app = Vue.createApp({
 						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
 
 					if (data[rendertype].calendarEventStyles){
-						console.log(data[rendertype].calendarEventStyles)
 						var head = document.head;
 						var link = document.createElement("link");
 						link.type = "text/css";
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 91af3e48a..180122e6a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -467,8 +467,7 @@ export default {
 				</div>
 			</div>
 			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
-				<div style="z-index:0; max-height: 100%" class="sticky-top d-flex justify-content-center align-items-center flex-column">
-					<div style="max-height: 100%; overflow-y:auto;" class="w-100">
+					<div @wheel.stop style="max-height: 100%; overflow-y:auto;" class="w-100">
 						<template v-if="selectedEvent ">
 							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
 								<p>this is a slot placeholder</p>
@@ -483,7 +482,6 @@ export default {
 							</div>
 						</template>
 					</div>
-				</div>
 			</div>
 		</div>	
 	</div>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 49fa88a60..64f67d8cb 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -3,7 +3,6 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import lehreinheitEvent from "./EventTypes/calendarEvent.js"
-import LvInfo from '../Mylv/LvInfo.js';
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -51,6 +50,17 @@ const LvPlan = {
 	},
 	inject:["renderers"],
 	watch: {
+		/* events:{
+			handler: function(newValue){
+				if(newValue == null)
+					setTimeout(()=>{
+						if(this.events == null){
+							this.loadEvents();
+						}
+					},500);
+			},
+			immediate: true,
+		}, */
 		modalLoaded:{
 			handler: function (newValue) {
 				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
@@ -84,7 +94,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent
 	},
 	computed:{
 		modalLoaded: function(){
@@ -134,13 +144,13 @@ const LvPlan = {
 		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
-			return this.renderers[type].modalTitle;
+			return this.renderers[type]?.modalTitle;
 		},
 		modalContentComponent(type) {
-			return this.renderers[type].modalContent;
+			return this.renderers[type]?.modalContent;
 		},
 		calendarEventComponent(type){
-			return this.renderers[type].calendarEvent;
+			return this.renderers[type]?.calendarEvent;
 		},
 		
 
@@ -354,14 +364,7 @@ const LvPlan = {
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
-			<h3 >{{event.type=='moodle'?$p.t('lvinfo','Moodleinformationen'):$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-			<div class="w-100">
-				<lv-info  :event="event" />
-			</div>
-			<template v-if="event.type != 'moodle'">
-				<h3 >{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
-				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
-			</template>
+			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="event" :event="event" :lvMenu="lvMenu" ></component>
 		</template>
 		<template #pageMobilContentEmpty >
 			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
diff --git a/public/js/components/Cis/Mylv/modalContent.js b/public/js/components/Cis/Mylv/modalContent.js
index c0050e9cc..d3ed0b0db 100644
--- a/public/js/components/Cis/Mylv/modalContent.js
+++ b/public/js/components/Cis/Mylv/modalContent.js
@@ -1,12 +1,20 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
-
+import LvMenu from "./LvMenu.js";
 
 export default {
 	props:{
 		event: {
 			type: Object,
 			required: true,
-		}
+		},
+		lvMenu:{
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	components:{
+		LvMenu,
 	},
 	computed: {
 		lektorenLinks: function () {
@@ -47,6 +55,7 @@ export default {
 		},
 	},
 	template: `
+	<div>
 		<h3>
 			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
 		</h3>
@@ -109,5 +118,9 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-		</table>`,
+		</table>
+		
+		<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
+		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
+	</div>`,
 }
\ No newline at end of file

From 0804c5670ed374c9d00694b7727cd70a3413281d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Jun 2025 15:36:32 +0200
Subject: [PATCH 0294/1357] refactor css variables

---
 public/css/components/searchbar/searchbar.css | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index bf091eef5..867273962 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -7,19 +7,24 @@
 
 :root{
 	--fhc-searchbar-shadow: var(--fhc-shadow-40, #ced4da);
+	--fhc-searchbar-settings-background-color: var(--fhc-dark, #343a40);
+	--fhc-searchbar-results-background-color: var(--fhc-background, #fff);
+	--fhc-searchbar-results-border-color: var(--fhc-border, lightgrey);
+	--fhc-searchbar-results-link-color: var(--fhc-link, #0d6efd);
+	--fhc-searchbar-results-btn-color: var(--bs-btn-color, white);
 }
 
 .searchbar_settings {
 	position: absolute; 
     z-index: 9999; 
-    background-color: var(--fhc-dark, #343a40);
+    background-color: var(--fhc-searchbar-settings-background-color);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: var(--fhc-background, #fff); 
-    border: 1px solid var(--fhc-border, lightgrey);
+    background-color: var(--fhc-searchbar-results-background-color);
+    border: 1px solid var(--fhc-searchbar-results-border-color);
     padding: .5rem;
     top: 100%;
     width: 100%;
@@ -29,7 +34,7 @@
 }
 
 .searchbar_results a{
-	color: var(--fhc-link, #0d6efd);
+	color: var(--fhc-searchbar-results-link-color);
 }
 /*
 .searchbar_results a:not(a~i) {
@@ -37,7 +42,7 @@
 }
 */
 .searchbar_results a.btn {
-	color: var(--bs-btn-color, white);
+	color: var(--fhc-searchbar-results-btn-color);
 }
 
 .searchbar_results_scroller {
@@ -46,7 +51,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid var(--fhc-border, lightgrey);
+    border-bottom: 1px solid var(--fhc-searchbar-results-border-color);
     margin-bottom: 1rem;
 }
 

From 5140d9de31fae5b5b63595823f5933ddb478eedf Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 15:38:56 +0200
Subject: [PATCH 0295/1357] refactor Accepting and Unaccepting Documents, new
 Error Message if more than one document per type, refactor List Accepted
 Documents

---
 .../api/frontend/v1/stv/Dokumente.php         | 35 +++++++++----------
 .../Details/Dokumente/List/Accepted.js        | 21 +++++++++++
 .../Details/Dokumente/List/Unaccepted.js      | 23 ++++++++++++
 system/phrasesupdate.php                      | 20 +++++++++++
 4 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index eca3d02ad..686094620 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -94,33 +94,29 @@ class Dokumente extends FHCAPI_Controller
 			if (hasData($result))
 			{
 				$data = getData($result);
-				array_push($arrayAccepted, current($data));
+				foreach ($data as $value)
+				{
+					array_push($arrayAccepted, $value);
+				}
 			}
 		}
 
-		//Merge with Data of Akte
+		//Array for total list of accepted documents
 		$newDataMap = [];
-		//helper, lookupArray
 		foreach ($arrayAccepted as $item) {
-			$newDataMap[$item->dokument_kurzbz] = $item;
+			$newDataMap[] = (array)$item;
 		}
 
-		//add Data of Akte to PrestudentData
-		foreach ($resultPreDoc as $obj) {
-			if (isset($newDataMap[$obj->dokument_kurzbz])) {
-				$obj->akte_id = $newDataMap[$obj->dokument_kurzbz]->akte_id;
-				$obj->hochgeladenamum = $newDataMap[$obj->dokument_kurzbz]->hochgeladenamum;
-				$obj->titel_intern = $newDataMap[$obj->dokument_kurzbz]->titel_intern;
-				$obj->nachgereicht = $newDataMap[$obj->dokument_kurzbz]->nachgereicht;
-				$obj->akzeptiertamum = $newDataMap[$obj->dokument_kurzbz]->akzeptiertamum;
-				$obj->dms_id = $newDataMap[$obj->dokument_kurzbz]->dms_id;
-				$obj->infotext = $newDataMap[$obj->dokument_kurzbz]->infotext;
-				$obj->anmerkung_intern = $newDataMap[$obj->dokument_kurzbz]->anmerkung_intern;
-				$obj->nachgereicht_am = $newDataMap[$obj->dokument_kurzbz]->nachgereicht_am;
-				$obj->vorhanden = $newDataMap[$obj->dokument_kurzbz]->vorhanden;
+		$listExistingKurzbz = array_column($newDataMap, 'dokument_kurzbz');
+
+		foreach ($resultPreDoc as $item)
+		{
+			if (!in_array($item->dokument_kurzbz, $listExistingKurzbz))
+			{
+				$newDataMap[] = (array)$item;
 			}
 		}
-		$this->terminateWithSuccess($resultPreDoc);
+		$this->terminateWithSuccess($newDataMap);
 	}
 
 	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
@@ -215,6 +211,9 @@ class Dokumente extends FHCAPI_Controller
 
 		$uid = getAuthUid();
 
+		//check if more than 1 dokumentkurzbz
+		//if()
+
 		$result = $this->DokumentprestudentModel->insert(
 			[
 				'prestudent_id' => $prestudent_id,
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 eea3c3b48..742d01360 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -237,6 +237,27 @@ export default {
 				});
 		},
 		deleteZuordnung(selected) {
+
+			//Check if more than one document per dokument_kurzbz should be unaccepted
+			const counts = {};
+			for (const item of selected)
+			{
+				const value = item.dokument_kurzbz;
+				if (!counts[value]) {
+					counts[value] = 1;
+				}
+				else {
+					counts[value]++;
+				}
+
+				if (counts[value] > 1) {
+					{
+						this.$fhcAlert.alertError(this.$p.t('dokumente', 'error_duplicateDokument_kurzbz'));
+						return;
+					}
+				}
+			}
+
 			Promise.allSettled(
 				selected.map(e =>
 					this.$api
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 3ca9bc136..8a0a24667 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -234,6 +234,27 @@ export default {
 			this.$refs.modalEdit.open(akte_id);
 		},
 		acceptDocuments(selected){
+
+			//Check if more than one document per dokument_kurzbz should be accepted
+			const counts = {};
+			for (const item of selected)
+			{
+				const value = item.dokument_kurzbz;
+				if (!counts[value]) {
+					counts[value] = 1;
+				}
+				else {
+					counts[value]++;
+				}
+
+				if (counts[value] > 1) {
+					{
+						this.$fhcAlert.alertError(this.$p.t('dokumente', 'error_duplicateDokument_kurzbz'));
+						return;
+					}
+				}
+			}
+
 			Promise
 				.allSettled(
 					selected.map(e =>
@@ -318,6 +339,8 @@ export default {
 			@click:new="actionUploadFile"
 		>
 			<template #actions="{selected}">
+			<p v-for="name in selected">
+			{{name.dokument_kurzbz}}</p>
 				<button
 					class="btn btn-primary"
 					@click="acceptDocuments(selected)"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2fc8ff900..1251efff5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43261,6 +43261,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_duplicateDokument_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren / Entakzeptieren von mehr als einem Dokument pro Dokumenttyp nicht zulässig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepting / unaccepting more than one document per document type is not permitted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 Studierendenverwaltung Dokumente END
 	// FHC4 Phrases Anrechnungen Start
 	array(

From cb2ed4696c2680aa15f009eece519adac454ec70 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 16:01:41 +0200
Subject: [PATCH 0296/1357] Tab Betriebsmittel: change type of field Kaution to
 number, add validation if numeric

---
 .../api/frontend/v1/betriebsmittel/BetriebsmittelP.php   | 9 +++++++++
 public/js/components/Betriebsmittel/Betriebsmittel.js    | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8e9d931f2..4405952a4 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -158,6 +158,11 @@ class BetriebsmittelP extends FHCAPI_Controller
 		], [
 			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
 		]);
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -241,6 +246,10 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 39681ffb4..95678d8dd 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -292,6 +292,12 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
 			this.statusNew = true;
+		},
+		//helper function: workaround to trigger validation if input is not a number
+		normalizeKaution() {
+			if (this.formData.kaution === null || this.formData.kaution === '') {
+				this.formData.kaution = 'xxx'
+			}
 		}
 	},
 	created() {
@@ -401,9 +407,10 @@ export default {
 				
 				<div class="row mb-3">
 					<form-input
-						type="text"
+						type="number"
 						:label="$p.t('infocenter/kaution')"
 						name="kaution"
+						@blur="normalizeKaution"
 						v-model="formData.kaution"
 						>
 					</form-input>

From 329da58ce68018825430d9b5ff1e660ecce9769e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 17:14:55 +0200
Subject: [PATCH 0297/1357] Tab Aufnahmetermine: add validation for existing
 RT-Data

---
 .../api/frontend/v1/stv/Aufnahmetermine.php      | 16 +++++++++++++---
 1 file 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 b787ea225..153079789 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -61,12 +61,24 @@ class Aufnahmetermine extends FHCAPI_Controller
 		}
 
 
-		$rt_id =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$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;
 		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
 		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
+		//validation if there is already an RT with chosen data existing
+		$result = $this->RtPersonModel->loadWhere(
+			array(
+				'rt_id' => $rt_id,
+				'person_id' => $person_id,
+				'studienplan_id' => $studienplan_id,
+				)
+		);
+		$data = getData($result);
+		if($data)
+			return $this->terminateWithError("Error", self::ERROR_TYPE_GENERAL);
+
 		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
@@ -78,12 +90,10 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
 			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
-
 		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

From 0aa92debeaad934e2cc7660bb4c9d13b852877e9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:25:40 +0200
Subject: [PATCH 0298/1357] Phrasen

---
 system/phrasesupdate.php | 684 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 683 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..be3dd4895 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,690 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	
+	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'input_search_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Suche...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_filter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_applyfilter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Apply',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'action_default_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard Aktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Default Action',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_student_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_prestudent_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_group_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MitarbeiterIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard-Kostenstelle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Standard cost center',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_parent_oe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übergeordnete OE',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parent OU',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_oe_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_room_address',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Site',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_floor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{floor} Stockwerk',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{floor} floor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sitzplätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Seats',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_pc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{max_person}, davon {workplaces} PC-Plätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{max_person}, of which {workplaces} PC-Workstations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_building',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gebäude',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Building',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_equipment',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zusatz Informationen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Additional information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Leader',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N.N.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_number_of_employees',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter-Anzahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Number of employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_version',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_keywords',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Schlagwörter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Keywords',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_content_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Inhalt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Content',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_no_results',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden keine Ergebnisse gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No results were found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_unknown_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unbekannter Ergebnistyp: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unknown resulttype: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei der Suche ist ein Fehler aufgetreten. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An error occurred while searching. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"] nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"] not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration für $config["{type}"] ist ungültig: Feld "{field}" fehlt, ist leer oder hat einen ungültigen Typ.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config for $config["{type}"] is invalid: field {field} is missing, empty or has an invalid type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config_searchfield',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"]["searchfields"]["{searchfield}"] is invalid: field {field} is missing or invalid.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From fa20652fefee1a6cef90f2a7b37c64a776c7074f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:48:20 +0200
Subject: [PATCH 0299/1357] Permissions for searchAdvanced

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

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 95ae6a6b3..8273e0cd9 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -35,7 +35,8 @@ class Searchbar extends FHCAPI_Controller
 	{
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
-			'search' => self::PERM_LOGGED
+			'search' => self::PERM_LOGGED,
+			'searchAdvanced' => self::PERM_LOGGED
 		]);
 	}
 

From e8d6d751e6cbeff4f2a6e8cc22137ce3a4cc51f6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:48:35 +0200
Subject: [PATCH 0300/1357] searchAdvanced in new API

---
 public/js/api/factory/searchbar.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/js/api/factory/searchbar.js b/public/js/api/factory/searchbar.js
index a7bd73b88..6bff98cbc 100644
--- a/public/js/api/factory/searchbar.js
+++ b/public/js/api/factory/searchbar.js
@@ -22,5 +22,12 @@ export default {
 			url: '/api/frontend/v1/searchbar/search',
 			params
 		};
+	},
+	searchAdvanced(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchAdvanced',
+			params
+		};
 	}
 };
\ No newline at end of file

From a080daa27a88799499a307236c31ea43a194a43b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:16:54 +0200
Subject: [PATCH 0301/1357] stundenplan/lvplan revert changes to legacy api
 endpoints

---
 .../ressource/{LvPlan.php => Stundenplan.php} | 24 +++++++++----------
 .../{LvPlandev.php => Stundenplandev.php}     | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename application/controllers/api/v1/ressource/{LvPlan.php => Stundenplan.php} (59%)
 rename application/controllers/api/v1/ressource/{LvPlandev.php => Stundenplandev.php} (58%)

diff --git a/application/controllers/api/v1/ressource/LvPlan.php b/application/controllers/api/v1/ressource/Stundenplan.php
similarity index 59%
rename from application/controllers/api/v1/ressource/LvPlan.php
rename to application/controllers/api/v1/ressource/Stundenplan.php
index 06672c90b..9a6614f21 100644
--- a/application/controllers/api/v1/ressource/LvPlan.php
+++ b/application/controllers/api/v1/ressource/Stundenplan.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlan extends API_Controller
+class Stundenplan extends API_Controller
 {
 	/**
-	 * LvPlan API constructor.
+	 * Stundenplan API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplan' => 'basis/stundenplan:rw'));
-		// Load model LvPlanModel
-		$this->load->model('ressource/stundenplan_model', 'LvPlanModel');
+		// Load model StundenplanModel
+		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
 
 
 	}
@@ -31,13 +31,13 @@ class LvPlan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getLvPlan()
+	public function getStundenplan()
 	{
-		$lvPlanID = $this->get('stundenplan_id');
+		$stundenplanID = $this->get('stundenplan_id');
 
-		if (isset($lvPlanID))
+		if (isset($stundenplanID))
 		{
-			$result = $this->LvPlanModel->load($lvPlanID);
+			$result = $this->StundenplanModel->load($stundenplanID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class LvPlan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postLvPlan()
+	public function postStundenplan()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplan_id']))
 			{
-				$result = $this->LvPlanModel->update($this->post()['stundenplan_id'], $this->post());
+				$result = $this->StundenplanModel->update($this->post()['stundenplan_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->LvPlanModel->insert($this->post());
+				$result = $this->StundenplanModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class LvPlan extends API_Controller
 		}
 	}
 
-	private function _validate($lvplan = NULL)
+	private function _validate($stundenplan = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/api/v1/ressource/LvPlandev.php b/application/controllers/api/v1/ressource/Stundenplandev.php
similarity index 58%
rename from application/controllers/api/v1/ressource/LvPlandev.php
rename to application/controllers/api/v1/ressource/Stundenplandev.php
index 625e6038d..fa6e788c3 100644
--- a/application/controllers/api/v1/ressource/LvPlandev.php
+++ b/application/controllers/api/v1/ressource/Stundenplandev.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlandev extends API_Controller
+class Stundenplandev extends API_Controller
 {
 	/**
-	 * LvPlandev API constructor.
+	 * Stundenplandev API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplandev' => 'basis/stundenplandev:rw'));
-		// Load model LvPlandevModel
-		$this->load->model('ressource/stundenplandev_model', 'LvPlandevModel');
+		// Load model StundenplandevModel
+		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
 
 
 	}
@@ -31,13 +31,13 @@ class LvPlandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getLvPlandev()
+	public function getStundenplandev()
 	{
-		$lvplandevID = $this->get('stundenplandev_id');
+		$stundenplandevID = $this->get('stundenplandev_id');
 
-		if (isset($lvplandevID))
+		if (isset($stundenplandevID))
 		{
-			$result = $this->LvPlandevModel->load($lvplandevID);
+			$result = $this->StundenplandevModel->load($stundenplandevID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class LvPlandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postLvPlandev()
+	public function postStundenplandev()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplandev_id']))
 			{
-				$result = $this->LvPlandevModel->update($this->post()['stundenplandev_id'], $this->post());
+				$result = $this->StundenplandevModel->update($this->post()['stundenplandev_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->LvPlandevModel->insert($this->post());
+				$result = $this->StundenplandevModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class LvPlandev extends API_Controller
 		}
 	}
 
-	private function _validate($lvplandev = NULL)
+	private function _validate($stundenplandev = NULL)
 	{
 		return true;
 	}

From 3db82aea95d318bdaaf4b49c751a468642b8404e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:26:29 +0200
Subject: [PATCH 0302/1357] stundenplan/lvplan revert changes to
 stundenplan_model and stundenplandev_model

---
 .../models/ressource/Stundenplan_model.php    | 20 +++++++++----------
 .../models/ressource/Stundenplandev_model.php |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 92a42a1df..012ce0a57 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
 		*/
 
 
-		$raum_lvplan= $this->execReadOnlyQuery("
+		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_lvplan;
+		return $raum_stundenplan;
 	}
 
 	/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
-	 * @param string $lvplanViewQuery the subquery used to group the result
+	 * @param string $stundenplanViewQuery the subquery used to group the result
 	 *
 	 * @return stdClass
 	 */
-	public function lvPlanGruppierung($lvplanViewQuery)
+	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
 		SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
 			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
-			FROM (".$lvplanViewQuery.") sp
+			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan but for a whole lva, irrespective of who is requesting it
+	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
 	 * 
 	 * @return void
 	 */
-	public function getLvPlanLVA($start_date, $end_date, $lv_id) {
+	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
+	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *
 	 * @return void
 	 */
-	public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
+	public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
 		
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 1a74c6aa8..800540d60 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
 	}
 
     /**
-     * Get LvPlan data.
+     * Get Stundenplan data.
      *
      * @param null $lehrveranstaltung_id
      * @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
      * @param false $nurBevorstehende If true, only future data is retrieved.
      * @return array|false|stdClass|null
      */
-    public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
+    public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
     {
         $params = array();
 

From 2b3d772a9002dd2a5087280d970558558c85408f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:50:29 +0200
Subject: [PATCH 0303/1357] Both searches usable

---
 .../controllers/api/frontend/v1/Searchbar.php |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  |  4 +-
 public/js/components/searchbar/searchbar.js   | 84 +++++++++++++++----
 3 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 8273e0cd9..d1444cbad 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -62,7 +62,7 @@ class Searchbar extends FHCAPI_Controller
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 		if (property_exists($result, 'error'))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result->data);
 	}
 
 	/**
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 352df5e9e..9146bc144 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -137,8 +137,8 @@ export default {
 		reloadList() {
 			this.$refs.stvList.reload();
 		},
-		searchfunction(params) {
-			return this.$api.call(ApiSearchbar.search(params));
+		searchfunction(params, config) {
+			return this.$api.call(ApiSearchbar.search(params), config);
 		}
 	},
 	created() {
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..8e1711e90 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -19,7 +19,8 @@ export default {
         showresult: false,  
         searching: false,
         error: null,
-		settingsDropdown:null,
+            abortController: null,
+        settingsDropdown:null,
       };
     },
     components: {
@@ -201,27 +202,80 @@ export default {
             this.searchresult.splice(0, this.searchresult.length);
             this.searching = true;
             this.showsearchresult();
-			if(this.searchsettings.types.length === 0) {
-				this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
-				this.searching = false;
-				return;
-			}
-            this.searchfunction(this.searchsettings)
+            if(this.searchsettings.types.length === 0) {
+                this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+                this.searching = false;
+                return;
+            }
+
+            if (this.abortController)
+                this.abortController.abort();
+            this.abortController = new AbortController();
+
+            this.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
             .then(response=>{
-                if( response.data?.error === 1 ) {
-                    this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+                if (!response.data) {
+                    this.error = this.$p.t('search/error_general');
                 } else {
-                    for(let element of response.data.data){
-                        this.searchresult.push(element);
+                    let res = response.data.map(el => el.data ? {...el, ...JSON.parse(el.data)} : el);
+                    this.lastQuery = response.meta.searchstring;
+                    if (this.searchoptions.mergeResults) {
+                        let counter = 0;
+                        let mergeTypes = [];
+                        let mergedType = 'merged';
+                        let mergeKey = '';
+
+                        switch (this.searchoptions.mergeResults) {
+                        case 'student':
+                            mergeTypes = ['student', 'prestudent'];
+                            mergedType += this.searchoptions.mergeResults;
+                            mergeKey = 'uid';
+                            break;
+                        case 'person':
+                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+                            mergedType += this.searchoptions.mergeResults;
+                            mergeKey = 'person_id';
+                            break;
+                        }
+
+                        if (mergeTypes.length) {
+                            res = Object.values(res.reduce((a, c) => {
+                                if (!mergeTypes.includes(c.type)) {
+                                    a['nomerge' + counter++] = c;
+                                } else if (c[mergeKey] === null) {
+                                    a['nomerge' + counter++] = c;
+                                } else if (a[c[mergeKey]] === undefined) {
+                                    a[c[mergeKey]] = {
+                                        rank: c.rank,
+                                        type: mergedType,
+                                        list: [c]
+                                    };
+                                } else {
+                                    a[c[mergeKey]].list.push(c);
+                                    if (c.rank > a[c[mergeKey]].rank)
+                                        a[c[mergeKey]].rank = c.rank;
+                                }
+                                return a;
+                            }, {})).sort((a, b) => b.rank - a.rank);
+                        }
                     }
+                    this.searchresult = res;
                 }
+                this.searching = false;
+                this.retry = 0;
             })
             .catch(error=> {
-                this.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
-                    + ' ' + error.message;
-            })
-            .finally(()=> {
+                if (error.code == "ERR_CANCELED") {
+                    return this.retry = 0;
+                }
+                if (error.code == "ECONNABORTED" && this.retry) {
+                    this.retry--;
+                    return this.callsearchapi();
+                }
+
+                this.error = this.$p.t('search/error_general', error);
                 this.searching = false;
+                this.retry = 0;
             });
         },
         refreshsearch: function() {

From 4db21d9abb89efa1bb54d6ec02abaf6f8b8e89d0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:05:31 +0200
Subject: [PATCH 0304/1357] stundenplan/lvplan use reverted classes and
 function names again

---
 .../controllers/api/frontend/v1/LvPlan.php    | 18 +++---
 .../controllers/api/frontend/v1/Studium.php   |  4 +-
 .../controllers/components/Cis/LvPlan.php     |  6 +-
 .../{LvPlanLib.php => StundenplanLib.php}     | 64 +++++++++----------
 4 files changed, 46 insertions(+), 46 deletions(-)
 rename application/libraries/{LvPlanLib.php => StundenplanLib.php} (90%)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 63da7892c..07435c9e5 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -51,7 +51,7 @@ class LvPlan extends FHCAPI_Controller
         $this->load->library('form_validation');
 
 		//load models
-		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
 
 
@@ -66,7 +66,7 @@ class LvPlan extends FHCAPI_Controller
      *
      */
 	public function LvPlanEvents(){
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$res_lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$res_lvplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
 		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
@@ -126,14 +126,14 @@ class LvPlan extends FHCAPI_Controller
 	}
 
 	public function getLvPlanForStudiensemester($studiensemester,$lvid){
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
 		
 	}
@@ -162,7 +162,7 @@ class LvPlan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -179,7 +179,7 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->lvplanlib->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -188,7 +188,7 @@ class LvPlan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -202,7 +202,7 @@ class LvPlan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index e73fa6d85..e4cf9e6a3 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
 	}
 
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
-		$this->load->library('LvPlanLib');
-		$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		$this->load->library('StundenplanLib');
+		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
 		if(!$lektoren){
 			return [];
 		}
diff --git a/application/controllers/components/Cis/LvPlan.php b/application/controllers/components/Cis/LvPlan.php
index 083cde03e..d4cf63520 100644
--- a/application/controllers/components/Cis/LvPlan.php
+++ b/application/controllers/components/Cis/LvPlan.php
@@ -27,14 +27,14 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
+		/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  		*/
-		$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID())); 
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID())); 
 		
 		$res = getData($res);
 		
diff --git a/application/libraries/LvPlanLib.php b/application/libraries/StundenplanLib.php
similarity index 90%
rename from application/libraries/LvPlanLib.php
rename to application/libraries/StundenplanLib.php
index ef0ad0920..8cb37658e 100644
--- a/application/libraries/LvPlanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -3,17 +3,17 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlanLib{
+class StundenplanLib{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches LvPlan events from a UID and start/end date
+	 * fetches Stundenplan events from a UID and start/end date
 	 * @access public
 	 *
 	 */
-	public function getLvPlan($start_date, $end_date, $lv_id = null){
+	public function getStundenplan($start_date, $end_date, $lv_id = null){
 		
 		$this->_ci =& get_instance();
 
@@ -21,7 +21,7 @@ class LvPlanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		
 
 		$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class LvPlanLib{
 			return $function_error;
 		}
 		
-		if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
+		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
 
-			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
-			$function_error = $this->expand_object_information($lvplan_data);
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 
-			// query lv itself in case its LvPlan is being queried and it has no entries
+			// query lv itself in case its Stundenplan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
 			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
@@ -63,7 +63,7 @@ class LvPlanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $lvplan_data;
+			return $stundenplan_data;
 			
 		}
 		
@@ -71,17 +71,17 @@ class LvPlanLib{
 		if($is_mitarbeiter)
 		{
 			
-			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
-			$function_error = $this->expand_object_information($lvplan_data);
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return error($function_error);
 			}
-			return success($lvplan_data);
+			return success($stundenplan_data);
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class LvPlanLib{
 			}
 			$student_lehrverband = getData($student_lehrverband);
 			
-			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$lvplan_query)
+			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$stundenplan_query)
 			{
 				return error([]);
 			}
 			
 			
-			$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
+			$stundenplan_data = getData($stundenplan_data) ?? [];
 
-			$function_error = $this->expand_object_information($lvplan_data);
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 			
-			return success($lvplan_data);
+			return success($stundenplan_data);
 		}
 		
 	}
@@ -147,7 +147,7 @@ class LvPlanLib{
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class LvPlanLib{
 			return error(getData($studiensemester));
 		}
 		$studiensemester = current(getData($studiensemester));
-		$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
+		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
 		SELECT DISTINCT uid 
 		FROM campus.vw_stundenplan
 		WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class LvPlanLib{
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor)
 			{
-				$this->_ci->LvPlanModel->addLimit(1);
-				$lektor_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
+				$this->_ci->StundenplanModel->addLimit(1);
+				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
 				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
 				FROM public.tbl_mitarbeiter
 				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
@@ -233,7 +233,7 @@ class LvPlanLib{
 			
 			if($item->ort_kurzbz) {
 
-				$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
+				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
 				SELECT content_id
 				FROM public.tbl_ort
 				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
@@ -590,4 +590,4 @@ class LvPlanLib{
 		}
 		return success($semester_range);
 	}
-}
\ No newline at end of file
+}

From 1c7d339e14e53572c4737fcbdf6eb7f65f5a5075 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:06:29 +0200
Subject: [PATCH 0305/1357] stundenplan/lvplan revert changes to jobs/LVPlanJob

---
 application/controllers/jobs/LVPlanJob.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
index 14ed473fb..c3fe5495a 100644
--- a/application/controllers/jobs/LVPlanJob.php
+++ b/application/controllers/jobs/LVPlanJob.php
@@ -39,7 +39,7 @@ class LVPlanJob extends JOB_Controller
 		$studiensemester_arr = array();
 
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
+		$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 
@@ -70,7 +70,7 @@ class LVPlanJob extends JOB_Controller
 			$fail = 0;
 
 			// get all schedule entries where group is missing
-			$result = $this->LvPlandevModel->getMissingDirectGroups($studiensemester);
+			$result = $this->StundenplandevModel->getMissingDirectGroups($studiensemester);
 			if(hasData($result))
 			{
 				foreach($result->retval as $row)
@@ -112,7 +112,7 @@ class LVPlanJob extends JOB_Controller
 					}
 
 					// add group to schedule
-					$result = $this->LvPlandevModel->insert(
+					$result = $this->StundenplandevModel->insert(
 						array(
 							'lehreinheit_id' => $row->lehreinheit_id,
 							'unr' => $unr,
@@ -159,7 +159,7 @@ class LVPlanJob extends JOB_Controller
     public function mailUpdatedZeitwuensche()
     {
         // Load models
-        $this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
+        $this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
         $this->load->model('organisation/Studiensemester_model', 'StundiensemesterModel');
         $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
         $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');

From d3b3c9db41e3b43eb676339dfaaf92ef255d1929 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:44:26 +0200
Subject: [PATCH 0306/1357] fix typo

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

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 850bdacae..1467f96f9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -60,7 +60,7 @@ export default {
 	methods: {
 		handleTabClick: function(index) {
 			let keys = Object.keys(this.tabs);
-			this.change(key[index]);
+			this.change(keys[index]);
 		},
 		change(key) {
 			this.$emit("change", key)

From 52c4ac64f13eef3174f8429e5dcbaf2019b2bd82 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 12:44:24 +0200
Subject: [PATCH 0307/1357] remove unused import and uuid helper

---
 public/js/components/searchbar/searchbar.js | 1 -
 public/js/helpers/UUID.js                   | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 public/js/helpers/UUID.js

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index ce08e3bfd..15d2a8c1d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,7 +4,6 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
 import prestudent from "./prestudent.js";
-import uuid from "../../helpers/UUID.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
diff --git a/public/js/helpers/UUID.js b/public/js/helpers/UUID.js
deleted file mode 100644
index 1c08c1237..000000000
--- a/public/js/helpers/UUID.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const uuid41 = () => {
-	const b = crypto.getRandomValues(new Uint16Array(8));
-	const d = [].map.call(b, a => a.toString(16).padStart(4, '0')).join('');
-	const vr = (((b[5] >> 12) & 3) | 8).toString(16);
-	return `${d.substr(0, 8)}-${d.substr(8, 4)}-4${d.substr(13, 3)}-${vr}${d.substr(17, 3)}-${d.substr(20, 12)}`;
-};
-
-export default uuid41;
\ No newline at end of file

From ae10ac877fe9282574a5ccab86df570e37dddc5f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 09:02:24 +0200
Subject: [PATCH 0308/1357] Tab Adressen: add handling selected Firma for edit
 and save

---
 .../api/frontend/v1/stv/Kontakt.php           | 20 ++-----------------
 .../Details/Kontakt/Address.js                | 11 +++++++---
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index e75802727..9b713b5f9 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -198,13 +198,7 @@ class Kontakt extends FHCAPI_Controller
 		$name = isset($_POST['name']) ? $_POST['name'] : null;
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		else
-			$firma_id = null;
+		$firma_id = isset($_POST['firma_id']) ? $_POST['firma_id'] : null;
 
 		$result = $this->AdresseModel->insert(
 			[
@@ -271,17 +265,6 @@ class Kontakt extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
 
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		elseif(isset($_POST['firma_id']))
-		{
-			$firma_id = $_POST['firma_id'];
-		}
-		else
-			$firma_id = null;
-
 		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
@@ -291,6 +274,7 @@ class Kontakt extends FHCAPI_Controller
 		$name = isset($_POST['name']) ? $_POST['name'] : null;
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+		$firma_id = isset($_POST['firma_id']) ? $_POST['firma_id'] : null;
 
 		$result = $this->AdresseModel->update(
 			[
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index a69c34b3f..943dfa94f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -188,8 +188,8 @@ export default{
 							title: this.$p.t('person', 'person_id')
 						});
 /*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
+													title: this.$p.t('global', 'aktionen')
+												});*/
 					}
 				}
 			],
@@ -200,7 +200,7 @@ export default{
 				typ: 'h',
 				nation: 'A',
 				address: {plz: null},
-				plz: null
+				plz: null,
 			},
 			statusNew: true,
 			places: [],
@@ -246,6 +246,10 @@ export default{
 			this.loadAdress(adresse_id).then(() => {
 				if(this.addressData.adresse_id)
 				{
+					this.selectedFirma = this.listFirmen.find(
+						item => item.firma_id === this.addressData.firma_id
+					);
+
 					this.addressData.address.plz = this.addressData.plz;
 					//	delete this.addressData.plz;
 					this.loadPlaces(this.addressData.address.plz);
@@ -353,6 +357,7 @@ export default{
 			this.addressData.typ = 'h';
 			this.addressData.nation = 'A';
 			this.addressData.address = {plz: null};
+			this.selectedFirma = null;
 
 			this.statusNew = true;
 		},

From 23e32a51b2a6617f914765511c8d65208f04f495 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Jun 2025 12:26:20 +0200
Subject: [PATCH 0309/1357] update(LvPlan Reservierungen):renderer componente
 erstellt und in Events geladen + styling fixes

---
 application/core/Events.php                   |  16 ++-
 public/css/Cis4/CoreCalendarEvents.css        |  31 +++--
 public/js/apps/Dashboard/Fhc.js               |  12 +-
 public/js/components/Calendar/Day/Page.js     |   8 +-
 public/js/components/Calendar/Week/Page.js    |   4 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   6 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |  31 +++++
 .../Lehreinheit}/modalContent.js              |   4 +-
 .../Lehreinheit}/modalTitle.js                |   0
 .../Reservierungen}/calendarEvent.js          |   8 +-
 .../Renderer/Reservierungen/modalContent.js   | 109 ++++++++++++++++++
 .../Cis/Renderer/Reservierungen/modalTitle.js |  11 ++
 12 files changed, 201 insertions(+), 39 deletions(-)
 create mode 100644 public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
 rename public/js/components/Cis/{Mylv => Renderer/Lehreinheit}/modalContent.js (96%)
 rename public/js/components/Cis/{Mylv => Renderer/Lehreinheit}/modalTitle.js (100%)
 rename public/js/components/Cis/{LvPlan/EventTypes => Renderer/Reservierungen}/calendarEvent.js (93%)
 create mode 100644 public/js/components/Cis/Renderer/Reservierungen/modalContent.js
 create mode 100644 public/js/components/Cis/Renderer/Reservierungen/modalTitle.js

diff --git a/application/core/Events.php b/application/core/Events.php
index a7d4754cc..9ad474fc5 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -6,9 +6,19 @@ 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/LvPlan/EventTypes/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js',
+		'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'
+	);
+});
+
+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'
 	);
 });
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 79ca36d00..17dc817ef 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,30 +1,29 @@
 /* Moodle Events in Month Page */
 .monthPageContainer .lehreinheitEventContent{
-	display: grid;
-	grid-template-columns: auto 1fr;
-	grid-template-rows: 1fr;
-	border-bottom: 1px solid var(--bs-border-color);
-	
+	display: flex;
+	border-bottom: 1px solid var(--bs-border-color);	
 }
 
 .monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:grid;
-	padding: .25rem .5rem .25rem .25rem;
-	margin-right: .25rem;
-	align-content: center;
+	display:none;
 }
 
 
 .monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: flex;
-	flex-wrap: wrap;
-	column-gap: 5px;
+	width: 100%;
 	font-size: .875em;
-	align-items:center;
-	justify-content: space-evenly;
+	overflow:hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display:flex;
+	place-content: center space-evenly;
 	
 }
 
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText #lehreinheitLektoren{
+	display:none;
+}
+
 /* Moodle Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
@@ -44,10 +43,10 @@
 
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
+	flex-direction: column;
+	place-content: center space-evenly;
 	flex-wrap: wrap;
 	column-gap: 5px;
-	align-items: center;
-	justify-content: space-evenly;
 
 }
 
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index f04d25efc..075a399d8 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -305,11 +305,13 @@ const app = Vue.createApp({
 
 					if (data[rendertype].calendarEventStyles){
 						var head = document.head;
-						var link = document.createElement("link");
-						link.type = "text/css";
-						link.rel = "stylesheet";
-						link.href = data[rendertype].calendarEventStyles;
-						head.appendChild(link);
+						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
 					}
 
 					if(this.renderers === null) {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 180122e6a..4247ffcd5 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -441,10 +441,10 @@ export default {
 										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-										
+
 										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
-										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast 
-											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden" >
+										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast
+											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small border border-secondary rounded overflow-hidden" >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
 											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
 												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
@@ -452,7 +452,7 @@ export default {
 												</slot>
 											</div>
 											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
-											<div class="d-block d-xl-none h-100" @click.prevent="eventClick(event)">
+											<div class="d-block d-xl-none h-100 " @click.prevent="eventClick(event)">
 												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
 													<p>this is a slot placeholder</p>
 												</slot>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b7705b1ed..cec65e577 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -369,10 +369,10 @@ export default {
 							</div>
 						</Transition>
 						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
-						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)" 
+						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)"
 						:selected="event.orig == selectedEvent"
 						:style="eventGridStyle(day,event)"
-						class="mx-2 small rounded overflow-hidden fhc-entry "
+						class="mx-2 small rounded overflow-hidden fhc-entry border border-secondary"
 						v-contrast >
 							<slot name="weekPage" :event="event.orig" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 64f67d8cb..a0b93062a 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -2,7 +2,7 @@ import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "./EventTypes/calendarEvent.js"
+import lehreinheitEvent from "../Renderer/Lehreinheit/calendarEvent.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -352,14 +352,14 @@ const LvPlan = {
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative border border-secondary border  h-100"
+				class="weekPageContainer position-relative h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
+			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry m-0 h-100  text-center">
 				<component :is="calendarEventComponent(event.type)" :event="event"></component>
 			</div>
 		</template>
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
new file mode 100644
index 000000000..b5f9ae617
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -0,0 +1,31 @@
+export default {
+	methods:{
+		convertTime: function ([hour, minute]) {
+			let date = new Date();
+			date.setHours(hour);
+			date.setMinutes(minute);
+			// returns date string as hh:mm
+			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
+
+		},
+	},
+	props:{
+		event: {
+			type:Object,
+			required:true,
+		},
+	},
+	template: `
+	<div class="lehreinheitEventContent h-100 w-100 p-1" >
+		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+		</div>
+		<div id="lehreinheitEventText">
+			<span id="lehreinheitTopic">{{event.topic}}</span>
+			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
+		</div>
+	</div>
+	`,
+}
diff --git a/public/js/components/Cis/Mylv/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
similarity index 96%
rename from public/js/components/Cis/Mylv/modalContent.js
rename to public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d3ed0b0db..d6dce547c 100644
--- a/public/js/components/Cis/Mylv/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -1,5 +1,5 @@
-import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
-import LvMenu from "./LvMenu.js";
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../Mylv/LvMenu.js";
 
 export default {
 	props:{
diff --git a/public/js/components/Cis/Mylv/modalTitle.js b/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js
similarity index 100%
rename from public/js/components/Cis/Mylv/modalTitle.js
rename to public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js
diff --git a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
similarity index 93%
rename from public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
rename to public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
index 6fa957d91..c6b8054c2 100644
--- a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
@@ -1,5 +1,5 @@
 export default {
-	methods:{
+	methods: {
 		convertTime: function ([hour, minute]) {
 			let date = new Date();
 			date.setHours(hour);
@@ -9,10 +9,10 @@ export default {
 
 		},
 	},
-	props:{
+	props: {
 		event: {
-			type:Object,
-			required:true,
+			type: Object,
+			required: true,
 		},
 	},
 	template: `
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
new file mode 100644
index 000000000..6dcef418c
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -0,0 +1,109 @@
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../Mylv/LvMenu.js";
+
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		},
+		lvMenu:{
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	components:{
+		LvMenu,
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date) {
+				return this.event.start;
+			}
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template: `
+	<div>
+		<h3>
+			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+		</h3>
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					
+				</tbody>
+		</table>
+		
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js
new file mode 100644
index 000000000..c5f195ddb
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js
@@ -0,0 +1,11 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div >{{ event.topic + ' [' + event.ort_kurzbz+']'}}</div>
+`
+}
\ No newline at end of file

From 85c16b7f5dc4526c8f52ec28ba28e6b530e5b34b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 15:04:08 +0200
Subject: [PATCH 0310/1357] Refactor dropdowns

- use allPersons for Dropdown Autocomplete Pruefer1, Pruefer2, Pruefer3
- use allMitarbeiter for Dropdown Autocomplete Vorsitz
---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 121 +++++--
 ...875_61229_61230_61231_TabAbschlusspruefung |   0
 .../js/api/factory/stv/abschlusspruefung.js   |  12 +
 .../Abschlusspruefung/Abschlusspruefung.js    | 334 ++++++++----------
 4 files changed, 237 insertions(+), 230 deletions(-)
 create mode 100644 merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index d7581c3d1..54a0e3278 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -20,6 +20,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
 			'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
 			'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllPersons' => ['admin:rw', 'assistenz:rw'],
 			'getPruefer' => ['admin:rw', 'assistenz:rw'],
 			'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
 			'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
@@ -149,16 +151,16 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$studiengang_kz= $this->input->post('studiengang_kz');
 
-/*		if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
-			$this->load->library('form_validation');
+		/*		if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
+					$this->load->library('form_validation');
 
-			$this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
-				'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
-			]);
+					$this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
+						'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
+					]);
 
-			if (!$this->form_validation->run())
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}*/
+					if (!$this->form_validation->run())
+						$this->terminateWithValidationErrors($this->form_validation->error_array());
+				}*/
 
 
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -224,11 +226,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-
 		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
@@ -256,14 +253,14 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'student_uid' => $student_uid,
 			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
 			'akadgrad_id' => $formData['akadgrad_id'],
-			'vorsitz' => $vorsitz,
+			'vorsitz' => $formData['vorsitz'],
 			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
 			'datum' => $formData['datum'], //TODO(Manu) check if minute format like FAS
 			'sponsion' => $formData['sponsion'],
-			'pruefer1' => $pruefer1,
-			'pruefer2' => $pruefer2,
-			'pruefer3' => $pruefer3,
+			'pruefer1' => $formData['pruefer1'],
+			'pruefer2' => $formData['pruefer2'],
+			'pruefer3' => $formData['pruefer3'],
 			'protokoll' => $formData['protokoll'],
 			'note' => $formData['note'],
 			'anmerkung' => $formData['anmerkung'],
@@ -298,7 +295,7 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
-		
+
 		$this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad'])
 		]);
@@ -319,25 +316,25 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$result = $this->AbschlusspruefungModel->update(
 			[
-			'abschlusspruefung_id' => $abschlusspruefung_id
+				'abschlusspruefung_id' => $abschlusspruefung_id
 			],
 			[
-			'student_uid' => $formData['student_uid'],
-			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
-			'akadgrad_id' => $formData['akadgrad_id'],
-			'vorsitz' => $vorsitz,
-			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
-			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-			'datum' => $formData['datum'],
-			'sponsion' => $formData['sponsion'],
-			'pruefer1' => $pruefer1,
-			'pruefer2' => $pruefer2,
-			'pruefer3' => $pruefer3,
-			'protokoll' => $formData['protokoll'],
-			'note' => $formData['note'],
-			'anmerkung' => $formData['anmerkung'],
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
+				'student_uid' => $formData['student_uid'],
+				'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+				'akadgrad_id' => $formData['akadgrad_id'],
+				'vorsitz' => $vorsitz,
+				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
+				'pruefer1' => $pruefer1,
+				'pruefer2' => $pruefer2,
+				'pruefer3' => $pruefer3,
+				'protokoll' => $formData['protokoll'],
+				'note' => $formData['note'],
+				'anmerkung' => $formData['anmerkung'],
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID()
 			]
 		);
 
@@ -402,4 +399,58 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess('step3');
 	}
+
+	/*
+	* returns list of all Mitarbeiter
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$sql = "
+			SELECT
+			    ma.mitarbeiter_uid as mitarbeiter_uid,
+				CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid, ')') as label
+			FROM
+			  public.tbl_mitarbeiter ma
+			  JOIN public.tbl_benutzer bn ON (bn.uid = ma.mitarbeiter_uid)
+			  JOIN public.tbl_person p ON (p.person_id = bn.person_id)
+			ORDER BY
+			p.nachname ASC
+			";
+
+		$result = $this->MitarbeiterModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	* returns list of all Persons
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllPersons()
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$sql = "
+			SELECT
+			    p.vorname, p.nachname, p.person_id,
+				CONCAT(p.nachname, ' ', p.vorname) as label
+			FROM
+			  public.tbl_person p
+			 -- JOIN public.tbl_benutzer bn ON (p.person_id = bn.person_id)
+			  -- and bn.aktiv = 'true'
+			ORDER BY
+			p.nachname ASC
+			";
+
+		//TODO(manu) check if filter active benutzer
+
+		$result = $this->PersonModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }
diff --git a/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung b/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/api/factory/stv/abschlusspruefung.js b/public/js/api/factory/stv/abschlusspruefung.js
index 37e442b19..e318d0d37 100644
--- a/public/js/api/factory/stv/abschlusspruefung.js
+++ b/public/js/api/factory/stv/abschlusspruefung.js
@@ -107,5 +107,17 @@ export default {
 			url: 'api/frontend/v1/stv/abschlusspruefung/checkForExistingExams/',
 			params: { uid }
 		};
+	},
+	getAllMitarbeiter(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/abschlusspruefung/getAllMitarbeiter/'
+		};
+	},
+	getAllPersons(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/abschlusspruefung/getAllPersons/'
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 76987aefc..5c9f881bb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -7,6 +7,7 @@ import AbschlusspruefungDropdown from "./AbschlusspruefungDropdown.js";
 
 import ApiStudiengang from '../../../../../api/factory/studiengang.js';
 import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
+import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address";
 
 export default {
 	components: {
@@ -78,7 +79,7 @@ export default {
 					{title: "prueferIn2", field: "p2_nachname", visible: false},
 					{title: "prueferIn3", field: "p3_nachname", visible: false},
 					{
-						title: "datum", 
+						title: "datum",
 						field: "datum",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -95,7 +96,7 @@ export default {
 					},
 					{title: "uhrzeit", field: "uhrzeit"},
 					{
-						title: "freigabe", 
+						title: "freigabe",
 						field: "freigabedatum",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -112,7 +113,7 @@ export default {
 					},
 					{title: "pruefungsantritt", field: "antritt_bezeichnung"},
 					{
-						title: "sponsion", 
+						title: "sponsion",
 						field: "sponsion",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -259,12 +260,14 @@ export default {
 			arrBeurteilungen: [],
 			arrAkadGrad: [],
 			arrNoten: [],
-			filteredMitarbeiter: [],
-			filteredPruefer: [],
-			abortController: {
-				mitarbeiter: null,
-				pruefer: null
-			},
+			selectedVorsitz: null,
+			listeFilteredMitarbeiter: [],
+			listeAllMitarbeiter: [],
+			listeAllPersons: [],
+			selectedPruefer1: null,
+			selectedPruefer2: null,
+			selectedPruefer3: null,
+			listeFilteredPersons: [],
 			stgInfo: { typ: '', oe_kurzbz: '' }
 		}
 	},
@@ -274,6 +277,19 @@ export default {
 				this.$refs.table.reloadTable();
 			}
 			this.getStudiengangByKz();
+		},
+		selectedVorsitz(newVal) {
+			this.formData.vorsitz = newVal?.mitarbeiter_uid || '';
+			console.log("newVal: " + newVal.mitarbeiter_uid);
+		},
+		selectedPruefer1(newVal) {
+			this.formData.pruefer1 = newVal?.person_id || '';
+		},
+		selectedPruefer2(newVal) {
+			this.formData.pruefer2 = newVal?.person_id || '';
+		},
+		selectedPruefer3(newVal) {
+			this.formData.pruefer3 = newVal?.person_id || '';
 		}
 	},
 	methods: {
@@ -293,8 +309,22 @@ export default {
 		actionEditAbschlusspruefung(abschlusspruefung_id) {
 			this.resetForm();
 			this.statusNew = false;
+			this.loadAbschlusspruefung(abschlusspruefung_id).then(() => {
+				//set selectedData to enable viewing label in primevue autocomplete fields
+				this.selectedVorsitz = this.listeAllMitarbeiter.find(
+					item => item.mitarbeiter_uid === this.formData.vorsitz
+				);
+				this.selectedPruefer1 = this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer1
+				);
+				this.selectedPruefer2= this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer2
+				);
+				this.selectedPruefer3= this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer3
+				);
+			});
 			this.$refs.finalexamModal.show();
-			this.loadAbschlusspruefung(abschlusspruefung_id);
 		},
 		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
 			this.$fhcAlert
@@ -374,7 +404,7 @@ export default {
 			this.formData.vorsitz = null;
 			this.formData.pruefungsantritt_kurzbz = null;
 			this.formData.abschlussbeurteilung_kurzbz = null;
-			this.formData.datum = null; //oder new Date();
+			this.formData.datum = null;
 			this.formData.sponsion = null;
 			this.formData.pruefer1 = null;
 			this.formData.pruefer2 = null;
@@ -382,34 +412,11 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.protokoll = null;
 			this.formData.note = null;
-			this.formData.p1 = null;
-			this.formData.p2 = null;
-			this.formData.p3 = null;
-			this.formData.pv = null;
-		},
-		search(event) {
-			if (this.abortController.mitarbeiter) {
-				this.abortController.mitarbeiter.abort();
-			}
-			this.abortController.mitarbeiter = new AbortController();
+			this.selectedVorsitz = null;
+			this.selectedPruefer1 = null;
+			this.selectedPruefer2 = null;
+			this.selectedPruefer3 = null;
 
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
-				.then(result => {
-					this.filteredMitarbeiter = result.data.retval;
-				});
-		},
-		searchNotAkad(event) {
-			if (this.abortController.pruefer) {
-				this.abortController.pruefer.abort();
-			}
-			this.abortController.pruefer = new AbortController();
-
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
-				.then(result => {
-					this.filteredPruefer = result.data.retval;
-				});
 		},
 		setDefaultFormData() {
 
@@ -434,6 +441,22 @@ export default {
 		printDocument(link) {
 			window.open(link, '_blank');
 		},
+		filterMitarbeiter(event){
+			const query = event?.query?.toLowerCase()?.trim() || "";
+
+			this.listeFilteredMitarbeiter = this.listeAllMitarbeiter.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
+		},
+		filterPersons(event){
+			const query = event?.query?.toLowerCase()?.trim() || "";
+
+			this.listeFilteredPersons = this.listeAllPersons.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
+		}
 	},
 	created() {
 		this.$api
@@ -470,6 +493,21 @@ export default {
 				this.arrAkadGrad = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getAllMitarbeiter())
+			.then(result => {
+				this.listeAllMitarbeiter = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getAllPersons())
+			.then(result => {
+				this.listeAllPersons = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
 		if (!this.student.length) {
 			this.$api
 				.call(ApiStudiengang.getStudiengangByKz(this.student.studiengang_kz))
@@ -484,7 +522,7 @@ export default {
 	template: `
 	<div class="stv-details-abschlusspruefung h-100 pb-3">
 		<h4>{{this.$p.t('stv','tab_finalexam')}}</h4>
-		
+
 		<div v-if="this.student.length">
 			<abschlusspruefung-dropdown
 				:showAllFormats="showAllFormats"
@@ -510,7 +548,7 @@ export default {
 			@click:new="actionNewAbschlusspruefung"
 			>
 		</core-filter-cmpt>
-		
+
 		<!--Modal: finalexamModal-->
 		<bs-modal ref="finalexamModal" dialog-class="modal-xl modal-dialog-scrollable">
 			<template #title>
@@ -576,87 +614,39 @@ export default {
 				</div>
 
 				<div class="row mb-3">
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.pv"
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							v-model="formData.pv"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p1"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							v-model="formData.p1"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-vorsitz"
+						label="VORSITZ"
+						name="vorsitz"
+						v-model="selectedVorsitz"
+						optionLabel="label"
+						optionValue="mitarbeiter_uid"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredMitarbeiter"
+						@complete="filterMitarbeiter"
+						:min-length="3"
+					>
+					</form-input>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer1"
+						:label="$p.t('abschlusspruefung', 'pruefer1')"
+						name="pruefer1"
+						v-model="selectedPruefer1"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons"
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
-
+				
 				<div class="row mb-3">
-
 					<form-input
 						container-class="col-6 stv-details-abschlusspruefung-abschlussbeurteilung_kurzbz"
 						:label="$p.t('abschlusspruefung', 'abschlussbeurteilung')"
@@ -673,44 +663,21 @@ export default {
 							{{beurteilung.bezeichnung}}
 						</option>
 					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p2"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							v-model="formData.p2"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer2"
+						:label="$p.t('abschlusspruefung', 'pruefer2')"
+						name="pruefer2"
+						v-model="selectedPruefer2"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons" 
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 
 				<div class="row mb-3">
@@ -729,44 +696,21 @@ export default {
 							{{grad.titel}}
 						</option>
 					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p3"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							v-model="formData.p3"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer3"
+						:label="$p.t('abschlusspruefung', 'pruefer3')"
+						name="pruefer3"
+						v-model="selectedPruefer3"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons" 
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 
 				<div class="row mb-3">

From 6e9650ddfad8307611623d1978d9793f6e1d23ec Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 18 Jun 2025 15:19:30 +0200
Subject: [PATCH 0311/1357] Bugfixes: Searchbar state in
 localStorage/sessionStorage

---
 public/js/components/searchbar/searchbar.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 95b16232d..aa2213310 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -105,7 +105,7 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue), this.searchoptions.origin){
+			if(Array.isArray(newValue) && this.searchoptions.origin){
 				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
@@ -130,9 +130,11 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			let localStorageValue = localStorage.getItem('searchtypes');
-			if (localStorageValue) {
-				result = JSON.parse(localStorageValue);
+			if (this.searchoptions.origin) {
+				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				if (localStorageValue) {
+					result = JSON.parse(localStorageValue);
+				}
 			}
 			return result;
 		},
@@ -144,7 +146,9 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem("searchstr") ?? '';
+			if (!this.searchoptions.origin)
+				return '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From 913211e84d9a8c5060925212691201a2f1fcc784 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:23:35 +0200
Subject: [PATCH 0312/1357] even more & better anw phrasen

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ad0f7e347..66f5f6c05 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30024,6 +30024,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'offen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -31984,6 +32004,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleTimeOverlap',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollzeiten überlappen mit Kontrolle von {0} bis {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Times overlap with attendance check from {0} to {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'keineKontrollenAnDatumFallback',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Kontrollen an {0} gefunden, es werden alle Kontrollen angezeigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance checks found on {0}, all attendance checks are being shown.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noLePreselectTermineTooOld',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine intelligente LV-Teil Vorauswahl möglich, da sämtliche Termine außerhalb des erlaubten Kontrollzeitraums liegen. Bitte wählen Sie sorgfältig den gewünschten LV-Teil aus.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No intelligent pre-selection of teaching unit is possible, as all dates fall outside the permitted control period. Please carefully select the desired teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 96e032bad9f8cac321a4cbab0c64d3c55aa3cc8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:46:47 +0200
Subject: [PATCH 0313/1357] add missing .js file extension

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5c9f881bb..9a1559df0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -7,7 +7,7 @@ import AbschlusspruefungDropdown from "./AbschlusspruefungDropdown.js";
 
 import ApiStudiengang from '../../../../../api/factory/studiengang.js';
 import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
-import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address";
+import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address.js";
 
 export default {
 	components: {

From 37701dbdfd57b82b77064255dba36bc91914affb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:57:22 +0200
Subject: [PATCH 0314/1357] disable dropdown property for pruefer

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5c9f881bb..65aa8aa41 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -617,7 +617,7 @@ export default {
 					<form-input
 						type="autocomplete"
 						container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-						label="VORSITZ"
+						:label="$p.t('abschlusspruefung', 'vorsitz')"
 						name="vorsitz"
 						v-model="selectedVorsitz"
 						optionLabel="label"
@@ -637,7 +637,6 @@ export default {
 						v-model="selectedPruefer1"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons"
 						@complete="filterPersons"
@@ -671,7 +670,6 @@ export default {
 						v-model="selectedPruefer2"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons" 
 						@complete="filterPersons"
@@ -704,7 +702,6 @@ export default {
 						v-model="selectedPruefer3"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons" 
 						@complete="filterPersons"

From 707a05f6cde09e9d677078dad7720952004ffec7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Jun 2025 12:41:20 +0200
Subject: [PATCH 0315/1357] Adding changes from merge_c4 branch to searchbar
 component

---
 public/js/components/searchbar/searchbar.js | 30 ++++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8e1711e90..38e07388d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -34,14 +34,14 @@ export default {
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
 		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-			<div ref="searchbox" class="h-100 input-group me-2 bg-white">
-				<span style="background-color:inherit" class="input-group-text">
+			<div ref="searchbox" class="h-100 input-group me-2">
+				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
                 <input @keyup="this.search" @focus="this.showsearchresult"
                     v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
             </div>
 
             <div v-show="this.showresult"
@@ -85,11 +85,12 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem('searchstr',newSearchValue);
+			if(this.searchoptions.origin){
+				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			}
 		},
     },
 	computed:{
-		
 		search_types_string(){
 			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
 				return this.searchsettings.types.join(' / ');
@@ -105,8 +106,8 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue)){
-				localStorage.setItem('searchtypes', JSON.stringify(newValue));
+			if(Array.isArray(newValue) && this.searchoptions.origin){
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -115,6 +116,10 @@ export default {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
 			toggle: false
 		});
+
+		if (!this.searchoptions.origin){
+			console.warn("No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.");
+		}
 	},
 	updated() {
 		if(this.showresult) {
@@ -126,8 +131,11 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem('searchtypes')) {
-				result = JSON.parse(localStorage.getItem('searchtypes'));
+			if (this.searchoptions.origin) {
+				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				if (localStorageValue) {
+					result = JSON.parse(localStorageValue);
+				}
 			}
 			return result;
 		},
@@ -139,7 +147,9 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem('searchstr') ?? '';
+			if (!this.searchoptions.origin)
+				return '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From 4f56d799accf77eab4cbf3065f41d5229fe25a6a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 07:43:39 +0200
Subject: [PATCH 0316/1357] remove private attribute

---
 application/controllers/api/frontend/v1/stv/Config.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 138bdec67..aed00ef27 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -29,8 +29,6 @@ class Config extends FHCAPI_Controller
 {
 
 
-	private $arr;
-
 	public function __construct()
 	{
 		// TODO(chris): permissions
@@ -164,12 +162,11 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
-		$this->arr = [
+		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
-		$result['finalexam'] = $this->arr;
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;

From a2250fc727cf2e17374e1831fd05ee153d7fd90b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:01:11 +0200
Subject: [PATCH 0317/1357] Add meta information for search mode

---
 application/controllers/api/frontend/v1/Searchbar.php | 4 ++++
 public/js/components/searchbar/searchbar.js           | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index d1444cbad..1f51334fc 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -62,6 +62,9 @@ class Searchbar extends FHCAPI_Controller
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 		if (property_exists($result, 'error'))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		
+		$this->addMeta('mode', 'simple');
+		
 		$this->terminateWithSuccess($result->data);
 	}
 
@@ -87,6 +90,7 @@ class Searchbar extends FHCAPI_Controller
 
 		$this->addMeta('time', $result->meta['time']);
 		$this->addMeta('searchstring', $result->meta['searchstring']);
+		$this->addMeta('mode', 'advanced');
 		
 		$this->terminateWithSuccess($data);
 	}
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 38e07388d..4db7869c7 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -16,6 +16,7 @@ export default {
             types: this.getSearchTypes(),
         },
         searchresult: [],
+        searchmode: '',
         showresult: false,  
         searching: false,
         error: null,
@@ -270,6 +271,7 @@ export default {
                         }
                     }
                     this.searchresult = res;
+                    this.searchmode = response.meta.mode;
                 }
                 this.searching = false;
                 this.retry = 0;

From bc79fe2dd60326deedd8040e258ae2fa9ce2fff2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:26:09 +0200
Subject: [PATCH 0318/1357] Prestudent Results

---
 .../components/searchbar/result/prestudent.js | 19 +++++++++++++++++--
 public/js/components/searchbar/searchbar.js   |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index c33877bf0..ba647e865 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -6,11 +6,26 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
 	computed: {
+		title() {
+			if (this.mode == 'simple')
+				return this.res.name;
+			return this.res.name + ' (' + this.res.status + ' ' + this.res.stg_kuerzel + ')';
+		},
+		photo_url() {
+			if (this.mode != 'simple')
+				return this.photo_url;
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		},
 		emails() {
+			if (this.mode == 'simple')
+				return new Set([this.res.email]);
 			return new Set(this.res.email);
 		}
 	},
@@ -19,8 +34,8 @@ export default {
 		class="searchbar-result-prestudent"
 		:res="res"
 		:actions="actions"
-		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
-		:image="res.photo_url"
+		:title="title"
+		:image="photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 4db7869c7..7e826399b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -3,7 +3,7 @@ import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
-import prestudent from "./prestudent.js";
+import prestudent from "./result/prestudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -57,7 +57,7 @@ export default {
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>

From 0b00e393daa051db398efeafcfe984028ae6641e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:51:52 +0200
Subject: [PATCH 0319/1357] Student Results

---
 public/js/components/searchbar/result/student.js | 12 +++++++++++-
 public/js/components/searchbar/searchbar.js      |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index e85716a94..13354b818 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -6,11 +6,21 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
 	computed: {
+		photo_url() {
+			if (this.mode != 'simple')
+				return this.photo_url;
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		},
 		emails() {
+			if (this.mode == 'simple')
+				return new Set([this.res.email]);
 			return new Set(this.res.email);
 		}
 	},
@@ -20,7 +30,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="res.photo_url"
+		:image="photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7e826399b..8359b932d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -2,7 +2,7 @@ import person from "./person.js";
 import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
-import student from "./student.js";
+import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 
 export default {
@@ -56,7 +56,7 @@ export default {
                   <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>

From 0202bb261f9d7f674366af92fbd502a55db1cc65 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 10:45:28 +0200
Subject: [PATCH 0320/1357] MergedStudent Results

---
 public/js/components/searchbar/result/mergedstudent.js | 3 +++
 public/js/components/searchbar/searchbar.js            | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
index aa5d7739f..e8ed89b65 100644
--- a/public/js/components/searchbar/result/mergedstudent.js
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -8,6 +8,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -20,6 +21,7 @@ export default {
 	template: `
 	<result-prestudent
 		v-if="prestudent"
+		:mode="mode"
 		:res="prestudent"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
@@ -27,6 +29,7 @@ export default {
 	></result-prestudent>
 	<result-student
 		v-else
+		:mode="mode"
 		:res="res.list[0]"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8359b932d..49cbdb2ff 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
+import mergedStudent from "./result/mergedstudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -30,7 +31,8 @@ export default {
       employee: employee,
       organisationunit: organisationunit,
       student: student,
-      prestudent: prestudent
+      prestudent: prestudent,
+      mergedStudent
     },
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
@@ -58,6 +60,7 @@ export default {
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
@@ -238,12 +241,12 @@ export default {
 
                         switch (this.searchoptions.mergeResults) {
                         case 'student':
-                            mergeTypes = ['student', 'prestudent'];
+                            mergeTypes = ['student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'uid';
                             break;
                         case 'person':
-                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'person_id';
                             break;

From 819ef7bc3220f361869d1cd9cf46e986bcfd6f71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 10:48:50 +0200
Subject: [PATCH 0321/1357] Bugfix this => this.res

---
 public/js/components/searchbar/result/prestudent.js | 2 +-
 public/js/components/searchbar/result/student.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index ba647e865..7852bbe57 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -18,7 +18,7 @@ export default {
 		},
 		photo_url() {
 			if (this.mode != 'simple')
-				return this.photo_url;
+				return this.res.photo_url;
 			if (this.res.foto)
 				return 'data:image/jpeg;base64,' + this.res.foto;
 			return null;
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 13354b818..1d6eb2a61 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -13,7 +13,7 @@ export default {
 	computed: {
 		photo_url() {
 			if (this.mode != 'simple')
-				return this.photo_url;
+				return this.res.photo_url;
 			if (this.res.foto)
 				return 'data:image/jpeg;base64,' + this.res.foto;
 			return null;

From 04d46b39ed83699c4ab5803431f7963e1b87d212 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 11:16:20 +0200
Subject: [PATCH 0322/1357] MergedPerson Results

---
 .../searchbar/result/mergedperson.js          | 21 ++++++++++++++++---
 public/js/components/searchbar/searchbar.js   |  5 ++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index be9d1e735..fb9684303 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -8,6 +8,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -24,14 +25,23 @@ export default {
 			 // Those properties should be the same in all entries
 			const { person_id, name } = this.res.list[0];
 			 // Get first photo (prefer student photo if available)
-			const photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
+			let photo_url;
+			if (this.mode == 'simple') {
+				let foto = (this.students ? this.students.find(el => el.foto) : null)?.foto;
+				if (foto)
+					foto = 'data:image/jpeg;base64,' + foto;
+				photo_url = foto || this.employee?.photo_url;
+			} else
+				photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
 
 			return { person_id, name, photo_url, email };
 		},
 		employee() {
 			return this.res.list.find(item => [
 				'employee',
-				'unassigned_employee'
+				'unassigned_employee',
+				'mitarbeiter',
+				'mitarbeiter_ohne_zuordnung'
 			].includes(item.type)) || null;
 		},
 		students() {
@@ -132,7 +142,12 @@ export default {
 								:action="actions.defaultactionstudent || actions.defaultaction"
 								@actionexecuted="$emit('actionexecuted')"
 								>
-								{{ student.status }} ({{ student.stg_kuerzel }})
+								<template v-if="mode == 'simple'">
+									{{ student.studiengang_kz }}
+								</template>
+								<template v-else>
+									{{ student.status }} ({{ student.stg_kuerzel }})
+								</template>
 							</template-action>
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 49cbdb2ff..fe4b850f1 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,6 +5,7 @@ import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import mergedStudent from "./result/mergedstudent.js";
+import mergedPerson from "./result/mergedperson.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -32,7 +33,8 @@ export default {
       organisationunit: organisationunit,
       student: student,
       prestudent: prestudent,
-      mergedStudent
+      mergedStudent,
+      mergedPerson
     },
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
@@ -61,6 +63,7 @@ export default {
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
+                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>

From b46da92f255368eb8a2936c3e235c576194c4ebb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 11:16:57 +0200
Subject: [PATCH 0323/1357] Employee Results

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index fe4b850f1..8945465d3 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,6 +1,6 @@
 import person from "./person.js";
 import raum from "./raum.js";
-import employee from "./employee.js";
+import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
@@ -64,7 +64,7 @@ export default {
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
+                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>

From 1d9936757ce076976b67e81496642b6f8dcaafae Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:37:33 +0200
Subject: [PATCH 0324/1357] update(LvPlan router) manages the route changes in
 the Calendar component instead of the LvPlan

---
 public/js/components/Calendar/Calendar.js | 24 ++++++++++++++++++++++-
 public/js/components/Cis/LvPlan/LvPlan.js | 20 -------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 0f53d5c04..92b1cf999 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -202,6 +202,28 @@ export default {
 		},
 	},
 	methods: {
+		handleChangeOffset(offset){
+			
+			let date = new Date(
+				this.focusDate.y,
+				this.focusDate.m,
+				this.focusDate.d
+			);
+			
+			date = date.getFullYear() + "-" +
+				String(date.getMonth() + 1).padStart(2, "0") + "-" +
+				String(date.getDate()).padStart(2, "0");
+
+			
+			this.$router.push({
+				name: "LvPlan",
+				params: {
+					mode: this.mode[0].toUpperCase() + this.mode.slice(1),
+					focus_date: date,
+					lv_id: this.$route.params.lv_id || null
+				}
+			})
+		},
 		setMode(mode) {
 			this.mode = mode
 		},
@@ -253,7 +275,7 @@ export default {
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
 		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
-		 @input="handleInput" @change:offset="$emit('change:offset', $event)">
+		 @input="handleInput" @change:offset="handleChangeOffset">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index a0b93062a..08c022182 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -178,26 +178,6 @@ const LvPlan = {
 			
 			this.currentDay = day;
 		},
-		handleOffset: function(offset)  {
-			this.currentDay = new Date(
-				this.currentDay.getFullYear() + offset.y, 
-				this.currentDay.getMonth() + offset.m,
-				this.currentDay.getDate() + offset.d
-			)
-
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
-		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
 			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!

From 30e4459f672ebe270423f71f4f25e1c1810ba7a3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:44:08 +0200
Subject: [PATCH 0325/1357] fix(LvPlan renderer) uses Vue.nextTick to
 acknowledge the suspense state of the dynamically loaded component

---
 public/js/components/Cis/LvPlan/LvPlan.js          | 14 ++++++++------
 .../Cis/Renderer/Lehreinheit/modalContent.js       |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 08c022182..2ada75802 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -199,12 +199,14 @@ const LvPlan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			if(this.isModalContentResolved && this.isModalTitleResolved){
-				if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-			} 
-			else{
-				this.isShowModal = true;
-			} 
+			Vue.nextTick(()=>{
+				if(this.isModalContentResolved && this.isModalTitleResolved){
+					if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+				} 
+				else{
+					this.isShowModal = true;
+				}
+			})
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d6dce547c..c03a1cd64 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -120,7 +120,6 @@ export default {
 				</tbody>
 		</table>
 		
-		<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
 	</div>`,
 }
\ No newline at end of file

From 4d61cdeb9146a4f7b9cf73021242a5ccd965b630 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:54:42 +0200
Subject: [PATCH 0326/1357] fix(LvPlan route): changes the route on
 change:range instead of change:offset because the focusdate is updates in
 change:range

---
 public/js/components/Calendar/Calendar.js | 10 ++++++----
 public/js/components/Cis/LvPlan/LvPlan.js |  5 +----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 92b1cf999..ab7dac2b3 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -202,7 +202,7 @@ export default {
 		},
 	},
 	methods: {
-		handleChangeOffset(offset){
+		handleRangeOffset(event){
 			
 			let date = new Date(
 				this.focusDate.y,
@@ -222,7 +222,9 @@ export default {
 					focus_date: date,
 					lv_id: this.$route.params.lv_id || null
 				}
-			})
+			});
+
+			this.$emit('change:range',event);
 		},
 		setMode(mode) {
 			this.mode = mode
@@ -274,8 +276,8 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
-		 @input="handleInput" @change:offset="handleChangeOffset">
+		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="handleRangeOffset"
+		 @input="handleInput" >
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 2ada75802..d9b82bbcc 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -221,10 +221,7 @@ const LvPlan = {
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
-				Vue.nextTick(() => {
-					this.loadEvents();
-					
-				});
+				this.loadEvents();
 			}
 		},
 		calendarDateToString: function (calendarDate) {

From b96a7ab180f10dc20605eb4437fb2f779bba7771 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:28:56 +0200
Subject: [PATCH 0327/1357] Person Results

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8945465d3..49642620c 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,4 +1,4 @@
-import person from "./person.js";
+import person from "./result/person.js";
 import raum from "./raum.js";
 import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";

From cf62563fa38b44bb046f6eb56693f2ac9e8d9712 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:48:52 +0200
Subject: [PATCH 0328/1357] Room Results

---
 public/js/components/searchbar/result/room.js | 9 +++++++--
 public/js/components/searchbar/searchbar.js   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 46fce1c71..8a7d8c124 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -6,6 +6,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -46,7 +47,10 @@ export default {
 
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
-				<div class="searchbar_tablecell">
+				<div v-if="mode == 'simple'" class="searchbar_tablecell">
+					{{ res.sitzplaetze }}
+				</div>
+				<div v-else class="searchbar_tablecell">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
 						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
@@ -66,7 +70,8 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
 				<div class="searchbar_tablecell">
-					<div class="no-margin-paragraphs" v-html="equipment"></div>
+					<div v-if="mode == 'simple'" class="no-margin-paragraphs" v-html="res.austattung.replace('<br />','')"></div>
+					<div v-else class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 49642620c..295b97984 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,5 +1,5 @@
 import person from "./result/person.js";
-import raum from "./raum.js";
+import raum from "./result/room.js";
 import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
@@ -66,7 +66,7 @@ export default {
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>

From d00530d6d67409ede2cc25c6fc2404fa73806919 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:54:36 +0200
Subject: [PATCH 0329/1357] Organisationsunit Results

---
 public/js/components/searchbar/result/organisationunit.js | 3 ++-
 public/js/components/searchbar/searchbar.js               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index fe5d6512a..1d9c03b08 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -29,9 +29,10 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
 				<div class="searchbar_tablecell">
-					<a :href="'mailto:' + res.mailgroup">
+					<a v-if="res.mailgroup" :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
 					</a>
+					<template v-else>-</template>
 				</div>
 			</div>
 
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 295b97984..01d4f659e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,7 +1,7 @@
 import person from "./result/person.js";
 import raum from "./result/room.js";
 import employee from "./result/employee.js";
-import organisationunit from "./organisationunit.js";
+import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import mergedStudent from "./result/mergedstudent.js";

From ad7e473cbd268c6bd771a1e65e98a82799cbc694 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:14:51 +0200
Subject: [PATCH 0330/1357] Dms Results

---
 public/js/components/searchbar/searchbar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 01d4f659e..5ef5f8451 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./result/employee.js";
 import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
+import dms from "./result/dms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
@@ -33,6 +34,7 @@ export default {
       organisationunit: organisationunit,
       student: student,
       prestudent: prestudent,
+      dms,
       mergedStudent,
       mergedPerson
     },
@@ -67,6 +69,7 @@ export default {
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>

From 5bf8f647cba3129ea7c5dbb6409e2a96dc655899 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:21:06 +0200
Subject: [PATCH 0331/1357] Cms Results

---
 public/js/components/searchbar/searchbar.js | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 5ef5f8451..3e77d2c9e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,11 +5,20 @@ import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import dms from "./result/dms.js";
+import cms from "./result/cms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
+import ApiLanguage from "../../api/factory/language.js"
+
 export default {
     props: [ "searchoptions", "searchfunction" ],
+    provide() {
+        return {
+            languages: Vue.computed(() => this.languages),
+            query: Vue.computed(() => this.lastQuery)
+        };
+    },
     data: function() {
       return {
         searchtimer: null,
@@ -25,6 +34,8 @@ export default {
         error: null,
             abortController: null,
         settingsDropdown:null,
+            languages: null,
+            lastQuery: ''
       };
     },
     components: {
@@ -35,6 +46,7 @@ export default {
       student: student,
       prestudent: prestudent,
       dms,
+      cms,
       mergedStudent,
       mergedPerson
     },
@@ -70,6 +82,7 @@ export default {
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
+                    <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>
@@ -110,6 +123,17 @@ export default {
 		},
 		
 	},
+    created() {
+        this.$api
+            .call(ApiLanguage.getAll())
+            .then(result => {
+                this.languages = result.data.reduce((a, c) => {
+                    a[c.sprache] = c;
+                    return a;
+                }, {});
+            })
+            .catch(this.$fhcAlert.handleSystemError);
+    },
     beforeMount: function() {
 		this.$watch('searchsettings.types', (newValue, oldValue) => {
 			if (Array.isArray(newValue) && newValue.length === 0){

From 5645f6a41fef2756970b5c381a259521d82a1408 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:24:11 +0200
Subject: [PATCH 0332/1357] Language API Endpoint

---
 public/js/api/factory/language.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 public/js/api/factory/language.js

diff --git a/public/js/api/factory/language.js b/public/js/api/factory/language.js
new file mode 100644
index 000000000..8175ccc0e
--- /dev/null
+++ b/public/js/api/factory/language.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAll() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/language/get'
+		};
+	}
+};
\ No newline at end of file

From 2ec20423e9f0fe5302e9b590810b5c0e17fe08a8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:24:20 +0200
Subject: [PATCH 0333/1357] Stv: Search-Origin

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9146bc144..5f0569973 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -72,6 +72,7 @@ export default {
 		return {
 			selected: [],
 			searchbaroptions: {
+				origin: 'stv',
 				cssclass: "position-relative",
 				calcheightonly: true,
 				types: [

From 08182fe0f504132293ed16ead5ae262aa1e1ccbc Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 18 Jun 2025 12:03:09 +0200
Subject: [PATCH 0334/1357] Added phrases for LV-Evaluierung

---
 system/phrasesupdate.php | 428 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 427 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..7c350c452 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,434 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'abschicken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abschicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'zurueckZumStart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurück zum Start',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Back to Start',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lvevaluierungAbschicken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung abschicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submit Course Evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lvevaluierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextCodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte geben Sie Ihren Code ein, um die Evaluierung zu starten:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter your code to start the evaluation:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginCodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierung-Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter your Evaluation-Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextLvevaluierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>Die folgende LV-Evaluierung umfasst</p>
+					</div>
+					<ul class="text-start small">
+						<li>zwei (geschlossene) Pflichtfragen</li>
+						<li>die Möglichkeit, optional zu einzelnen Bereichen konkreteres Feedback zu geben</li>
+						<li>zwei optionale Freitextfragen</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>The following course evaluation includes</p>
+					</div>
+					<ul class="text-start small">
+						<li>two (closed) mandatory questions</li>
+						<li>the opportunity to optionally provide more specific feedback on individual areas</li>
+						<li>two optional free-text questions</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextAntwortoptionen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>Die Antwortoptionen umfassen 5 Stufen:</p>
+					</div>
+					<ul class="text-start small">
+						<li>Sehr gut</li>
+						<li>Gut</li>
+						<li>Mittel</li>
+						<li>Schlecht</li>
+						<li>Sehr schlecht</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>The answer options comprise 5 levels:</p>
+					</div>
+					<ul class="text-start small">
+						<li>Excellent</li>
+						<li>Good</li>
+						<li>Satisfactory</li>
+						<li>Poor</li>
+						<li>Insufficient</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungPeriodeBeendet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Evaluierungszeitraum endete am {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation period was closed on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungPeriodeStartetErst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Evaluierungszeitraum startet erst am {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation period starts on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungEingereicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierung wurde am {date} eingereicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation was submitted on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtMehrVerfuegbar',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Evaluierung ist nicht mehr verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation is no longer available.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtVerfuegbar',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Evaluierung ist nicht verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation is not available yet.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'logoutTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Danke!<br>Was passiert nun mit Ihrem Feedback?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Thank you!<br>What happens to your feedback now?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'logoutText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<p>Ihr Feedback dient den Lehrenden zur Selbstevaluierung und Ihre Jahrgangsvertretungen werden von der Studiengangsleitung zum Jour-Fixe eingeladen, um die Ergebnisse zu besprechen.</p>
+					<p>Ihr Feedback dient der kontinuierlichen Weiterentwicklung der Lehrveranstaltung. Mehr Details dazu finden Sie hier: 
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<p>Your feedback is used by the lecturers for self-evaluation and your year representatives are invited to the Jour-Fixe by the head of degree program to discuss the results.</p>
+					<p>Your feedback is used for the continuous further development of the course. You can find more details here: 
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungZeitAbgelaufen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierungszeit ist abgelaufen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Evaluation time is over',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungAntwortenNichtUebermittelt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ihre Antworten wurden nicht übermittelt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your responses were not submitted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungCodeExistiertNicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieser Evaluierungscode exisitiert nicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation code does not exist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtAktiv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierung ist nicht aktiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation is not active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From ce8f0843cc3bfd97a6af8268c8abed41ae00e6e0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 17:31:43 +0200
Subject: [PATCH 0335/1357] calc active tab from router param when using
 primevue tabsview

---
 public/js/components/Tabs.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 1467f96f9..5c2a5a3d9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -50,6 +50,15 @@ export default {
 			set(v) {
 				this.$emit('update:modelValue', v);
 			}
+		},
+		calcActiveIndex: function() {
+			let keys = Object.keys(this.tabs);
+			let index = keys.indexOf(this.default);
+			if( index === -1 ) {
+				return 0;
+			} else {
+				return index;
+			}
 		}
 	},
 	watch: {
@@ -120,6 +129,7 @@ export default {
 	<tabview 
 		:scrollable="true" 
 		:lazy="true"
+		:activeIndex="calcActiveIndex"
 		@tab-click="handleTabClick"
 	>
 		<tabpanel 

From 9426ed9e59160e1579042e96d86993a5bfa775ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 17:36:37 +0200
Subject: [PATCH 0336/1357] disable headerSort for actions column

---
 public/js/components/Funktionen/Funktionen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 4fdf5b6e4..4fc7706de 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -94,6 +94,7 @@ export default {
 					{
 						//title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						headerSort:false,
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";

From d76e3feb2a37deb17ef6cca087dd7e5b823d4c8a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 09:32:19 +0200
Subject: [PATCH 0337/1357] update(LvPlan Month Event tooltip): adds a tooltip
 to the month lv plan events that contains more detailed information about the
 lv event

---
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index b5f9ae617..499a071a8 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -9,19 +9,41 @@ export default {
 
 		},
 	},
+	computed:{
+		calendarEventTooltip: function(){
+			let lektorenEmpty = true;
+			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
+			
+			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
+			
+			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
+				lektorenEmpty = false;
+				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
+				this.event.lektor.forEach(lektor => {
+					tooltipString += `${lektor.kurzbz}\n`;
+				})
+			}
+			if(lektorenEmpty){
+				tooltipString += "\n";	
+			}
+			tooltipString += `${this.$p.t('person','ort')}: ${this.event.ort_kurzbz}`;
+			
+			return tooltipString;
+		},
+	},
 	props:{
 		event: {
 			type:Object,
 			required:true,
 		},
 	},
-	template: `
+	template: /*html*/`
 	<div class="lehreinheitEventContent h-100 w-100 p-1" >
 		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
 			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
 			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
 		</div>
-		<div id="lehreinheitEventText">
+		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
 			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
 			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>

From b217118df41bd56fff3a0409cc8056378cd324c3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 10:00:35 +0200
Subject: [PATCH 0338/1357] Cleanup & Phrases

---
 public/js/components/searchbar/searchbar.js | 78 ++++++++++++++-------
 system/phrasesupdate.php                    | 30 ++++++--
 2 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 3e77d2c9e..5684623db 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -51,39 +51,63 @@ export default {
       mergedPerson
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
-		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
+        <form
+            ref="searchform"
+            class="d-flex me-3"
+            :class="searchoptions.cssclass"
+            action="javascript:void(0);"
+		 	@focusin="searchfocusin"
+            @focusout="searchfocusout"
+        >
 			<div ref="searchbox" class="h-100 input-group me-2">
 				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
-                <input @keyup="this.search" @focus="this.showsearchresult"
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
+                <input
+                    @keyup="search"
+                    @focus="showsearchresult"
+                    v-model="searchsettings.searchstr"
+                    class="form-control"
+                    type="search"
+                    :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
+                    :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
+                >
+                <span
+                    data-bs-toggle="collapse"
+                    data-bs-target="#searchSettings"
+                    aria-expanded="false"
+                    aria-controls="searchSettings"
+                    ref="settingsbutton"
+                    class="input-group-text"
+                    type="button"
+                    :title="$p.t('search/button_filter_label')"
+                    :aria-label="$p.t('search/button_filter_label')"
+                >
+                    <i class="fas fa-cog"></i>
+                </span>
             </div>
 
-            <div v-show="this.showresult"
+            <div v-show="showresult"
                  class="searchbar_results" tabindex="-1">
               <div class="searchbar_results_scroller" ref="result">
                 <div class="searchbar_results_wrapper" ref="results">
-                  <div v-if="this.searching">
+                  <div v-if="searching">
                     <i class="fas fa-spinner fa-spin fa-2x"></i>
                   </div>
-                  <div v-else-if="this.error !== null">{{ this.error }}</div>
-                  <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+                  <div v-else-if="this.error !== null">{{ error }}</div>
+                  <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
                   <template v-else="" v-for="res in searchresult">
-                    <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
-                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
+                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
+                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
+                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
+                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
+                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
-                    <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+                    <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
                   </template>
                 </div>
               </div>
@@ -93,12 +117,12 @@ export default {
 				@[\`shown.bs.collapse\`]="handleShowSettings"
 				@[\`hide.bs.collapse\`]="handleHideSettings"
                 class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
-              <div class="d-flex flex-column m-3" v-if="this.searchoptions.types.length > 0">
-              <span class="fw-light mb-2">Suche filtern nach:</span>  
-              <template v-for="(type, index) in this.searchoptions.types" :key="type">
+              <div class="d-flex flex-column m-3" v-if="searchoptions.types.length > 0">
+              <span class="fw-light mb-2">{{ $p.t('search/applyfilter_label') }}</span>  
+              <template v-for="(type, index) in searchoptions.types" :key="type">
                     <div class="form-check form-switch">
-                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types"  />
-                        <label class="ps-2 form-check-label non-selectable" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
+                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types">
+                        <label class="ps-2 form-check-label non-selectable" :for="$.uid + 'search_type_' + index">{{ type }}</label>
                     </div>
                 </template>
               </div>
@@ -231,6 +255,10 @@ export default {
             if( this.searchtimer !== null ) {
                 clearTimeout(this.searchtimer);
             }
+            if (this.abortController) {
+                this.abortController.abort();
+                this.abortController = null;
+            }
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.calcSearchResultExtent();
                 this.searchtimer = setTimeout(
@@ -247,7 +275,7 @@ export default {
             this.searching = true;
             this.showsearchresult();
             if(this.searchsettings.types.length === 0) {
-                this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+                this.error = this.$p.t('search/error_missing_type');
                 this.searching = false;
                 return;
             }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index be3dd4895..bd674e514 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41885,13 +41885,13 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Suche...',
+				'text' => 'Suche: {types}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Search...',
+				'text' => 'Search: {types}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41920,18 +41920,18 @@ and represent the current state of research on the topic. The prescribed citatio
 	array(
 		'app' => 'core',
 		'category' => 'search',
-		'phrase' => 'button_applyfilter_label',
+		'phrase' => 'applyfilter_label',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Übernehmen',
+				'text' => 'Suche filtern nach:',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Apply',
+				'text' => 'Filter search for:',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42437,6 +42437,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No result type selected. Please select at least one result type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From f7c03b29db3b5132302cd20b9f7052f2552ec001 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 10:35:20 +0200
Subject: [PATCH 0339/1357] refactor(Studiengang Widget Data): filters only
 active persons of studiengang information

---
 .../models/organisation/Studiengang_model.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 3afdb493e..02f972690 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -709,12 +709,18 @@ class Studiengang_model extends DB_Model
 		if (isError($stg_ltg))
 			return $stg_ltg;
 		$stg_ltg = getData($stg_ltg) ?: [];
+		$stg_ltg = array_values(array_filter($stg_ltg, function($stg_leitung){
+			return $stg_leitung->aktiv;
+		}));
 		$addFotoProperty($stg_ltg);
 
 		$gf_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
 		if (isError($gf_ltg))
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
+		$gf_ltg = array_values(array_filter($gf_ltg, function($gf_leitung){
+			return $gf_leitung->aktiv;
+		}));
 		$addEmailProperty($gf_ltg);
 		$addFotoProperty($gf_ltg);
 
@@ -722,6 +728,9 @@ class Studiengang_model extends DB_Model
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
+		$stv_ltg = array_values(array_filter($stv_ltg, function($stv_leitung){
+			return $stv_leitung->aktiv;
+		}));
 		$addEmailProperty($stv_ltg);
 		$addFotoProperty($stv_ltg);
 
@@ -729,6 +738,9 @@ class Studiengang_model extends DB_Model
 		if (isError($ass))
 			return $ass;
 		$ass = getData($ass) ?: [];
+		$ass = array_values(array_filter($ass, function($assistenz){
+			return $assistenz->aktiv;
+		}));
 		$addEmailProperty($ass);
 		$addFotoProperty($ass);
 
@@ -736,6 +748,9 @@ class Studiengang_model extends DB_Model
 		if (isError($hochschulvertr))
 			return $hochschulvertr;
 		$hochschulvertr = getData($hochschulvertr) ?: [];
+		$hochschulvertr = array_values(array_filter($hochschulvertr, function($hochschul_vertreter){
+			return $hochschul_vertreter->aktiv;
+		}));
 		$addEmailProperty($hochschulvertr);
 
 
@@ -743,6 +758,9 @@ class Studiengang_model extends DB_Model
 		if (isError($stdv))
 			return $stdv;
 		$stdv = getData($stdv) ?: [];
+		$stdv = array_values(array_filter($stdv, function($std_vertreter){
+			return $std_vertreter->aktiv;
+		}));
 		$addEmailProperty($stdv);
 
 
@@ -750,6 +768,9 @@ class Studiengang_model extends DB_Model
 		if (isError($jahrgangsvertr))
 			return $jahrgangsvertr;
 		$jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+		$jahrgangsvertr = array_values(array_filter($jahrgangsvertr, function($jahrgang_vertreter){
+			return $jahrgang_vertreter->aktiv;
+		}));
 		$addEmailProperty($jahrgangsvertr);
 
 

From 8c1c56077e1921c66295ab0ee78a350518f6107c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:00:51 +0200
Subject: [PATCH 0340/1357] CIS: Search-Origin

---
 public/js/apps/Cis.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b62592ebd..962dec5c1 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,6 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
+            	origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [

From 301818be6972428a55ecd585bba857cfbaaa0797 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:17:00 +0200
Subject: [PATCH 0341/1357] Fallback "room" for "raum" searchactions

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 5684623db..362a96bb9 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -104,7 +104,7 @@ export default {
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum" @actionexecuted="hideresult"></raum>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>

From 7233bc3cdd9d88bb4381f4e55de48b8da1e44621 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:23:22 +0200
Subject: [PATCH 0342/1357] Bugfix missing css variable

---
 public/css/components/searchbar/searchbar.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 68a8484ed..c55e13f7e 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -142,7 +142,7 @@
 	align-items: center;
 	overflow: hidden;
 	color: rgba(var(--bs-white-rgb),1);
-	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	background-color: rgba(var(--bs-primary-rgb), 1);
 }
 .searchbar-square-image.rounded-circle > img,
 .searchbar-square-image.rounded-circle > div {
@@ -162,7 +162,7 @@
 	align-items: center;
 	overflow: hidden;
 	color: rgba(var(--bs-white-rgb),1);
-	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	background-color: rgba(var(--bs-primary-rgb), 1);
 	height: calc((100px - .75em) * 1.3);
 }
 .searchbar-rounded-image > img,

From cc40fd43934fb36abf89dd1bf6e617b9c511b780 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 12:15:10 +0200
Subject: [PATCH 0343/1357] Safetycheck FHCAPI plugin

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

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index b087a6235..0c50162eb 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -42,6 +42,8 @@ export default {
 		function _clean_return_value(response) {
 			const result = response.data;
 			delete response.data;
+			if (!result)
+				return {meta: {response}, data: null};
 			if (!result.meta)
 				result.meta = {response};
 			else

From e99cbc9f3d49f5a2b18f2aff5e257300c7d86c9b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 13:28:32 +0200
Subject: [PATCH 0344/1357] fix(lvMenu optionen):fixes click event bugs with
 the lv menu and changes the styling for some lvmenu options

---
 public/css/Cis4/Cis.css                 | 21 ++++++++++++++++++++-
 public/js/components/Cis/Mylv/LvMenu.js | 23 ++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 57617ec8d..3b382d1b4 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -154,11 +154,30 @@ html {
 	color: var(--fhc-text);
 }
 
+#cis-menu .menu-entry .submenu{
+	background-color: var(--fhc-background-highlight);
+	color: inherit;
+}
+
+#cis-menu .menu-entry:hover .submenu{
+	background-color: var(--fhc-primary-highlight);
+	color: inherit;
+}
+
+#cis-menu .menu-entry:hover .submenu:hover{
+	color: var(--fhc-dark);
+}
+
+#cis-menu [disabled="true"].menu-entry .submenu{
+	opacity: 0.5;
+	background-color: var(--fhc-secondary)
+}
+
 [disabled="true"].menu-entry {
 	pointer-events: none;
 	cursor: default;
 	background-color: var(--fhc-disabled) !important;
-	color: black !important;
+	color: var(--fhc-dark) !important;
 	opacity: 0.75;
 	-webkit-touch-callout: none;
 	/* iOS Safari */
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 5f25bff5d..06a63915d 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -31,25 +31,6 @@ export default {
 		c4_target: function (menuItem) {
 			if (menuItem.c4_moodle_links?.length > 0) return null;
 			return menuItem.c4_target ?? null;
-		},
-		selectMenu: function (menuItem, index = null) {
-
-			// early return if link is #
-			if (index != null && menuItem.c4_linkList[index][1] == '#') return;
-
-			switch (menuItem.id) {
-				case "core_menu_mailanstudierende": window.location.href = menuItem.c4_link; break;
-				default:
-					this.selectedMenu = { ...menuItem };
-					this.$emit("update:isMenuSelected", true);
-			}
-
-			if (this.selectedMenu && index != null && menuItem.c4_linkList[index][1] != '#') {
-				this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
-				this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
-			}
-
-			
 		},
 		c4_link(menuItem) {
 			if (!menuItem) return null;
@@ -73,8 +54,8 @@ export default {
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
-						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
-						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
+						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
+						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</p>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
 						<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>

From 7b627484c22b3e4a8432f7dfda80faf91c496475 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 15:01:26 +0200
Subject: [PATCH 0345/1357] Code Quality

---
 application/config/search.php               | 11 ++++++--
 public/js/components/searchbar/searchbar.js |  4 +--
 system/dbupdate_3.4/40128_search.php        | 31 +++++++++++++++++----
 system/phrasesupdate.php                    |  4 ++-
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 3a2c27a18..e4876ec8f 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -516,7 +516,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = unassigned_employee.standort_id";
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
+	kontakttyp = 'telefon' 
+	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
+";
 
 $config['organisationunit'] = [
 	'alias' => ['ou', 'organisationseinheit', 'oe'],
@@ -722,7 +725,11 @@ $config['cms'] = [
 		'content' => [
 			'alias' => ['inhalt'],
 			'comparison' => "vector",
-			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))"
+			'field' => "(
+				setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') 
+				|| 
+				setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')
+			)"
 		],
 		'content_id' => [
 			'alias' => ['id'],
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 362a96bb9..1bfb26032 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -131,7 +131,7 @@ export default {
           </form>
     `,
     watch:{
-		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
+		'searchsettings.searchstr': function (newSearchValue) {
 			if(this.searchoptions.origin){
 				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 			}
@@ -159,7 +159,7 @@ export default {
             .catch(this.$fhcAlert.handleSystemError);
     },
     beforeMount: function() {
-		this.$watch('searchsettings.types', (newValue, oldValue) => {
+		this.$watch('searchsettings.types', newValue => {
 			if (Array.isArray(newValue) && newValue.length === 0){
 				this.searchsettings.types = this.allSearchTypes();
 			}
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 8ca0fd246..f207d77dd 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -37,9 +37,15 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_
 		$$
 		BEGIN
 			IF TG_TABLE_NAME = 'tbl_organisationseinheit' THEN
-				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((SELECT bezeichnung FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
+				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((
+					SELECT bezeichnung 
+					FROM public.tbl_organisationseinheittyp 
+					WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz
+				), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
 			ELSIF TG_TABLE_NAME = 'tbl_organisationseinheittyp' THEN
-				UPDATE public.tbl_organisationseinheit SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
+				UPDATE public.tbl_organisationseinheit 
+					SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) 
+					WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
 			END IF;
 			RETURN NEW;
 		END;
@@ -53,7 +59,13 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_
 
 $update_column = false;
 // Add trigger tr_organisationseinheit_update_organisationseinheittyp_kurzbz to public.tbl_organisationseinheit
-if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheit' AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' LIMIT 1;")))
+if (!$db->db_num_rows(@$db->db_query("
+	SELECT 1 
+	FROM information_schema.triggers 
+	WHERE event_object_table ='tbl_organisationseinheit' 
+	AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' 
+	LIMIT 1;
+")))
 {
 	$qry = "CREATE TRIGGER tr_organisationseinheit_update_organisationseinheittyp_kurzbz
 		BEFORE UPDATE OF organisationseinheittyp_kurzbz OR INSERT
@@ -70,7 +82,13 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers
 }
 
 // Add trigger tr_organisationseinheittyp_update_bezeichnung to public.tbl_organisationseinheittyp
-if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheittyp' AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' LIMIT 1;")))
+if (!$db->db_num_rows(@$db->db_query("
+	SELECT 1 
+	FROM information_schema.triggers 
+	WHERE event_object_table ='tbl_organisationseinheittyp' 
+	AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' 
+	LIMIT 1;
+")))
 {
 	$qry = "CREATE TRIGGER tr_organisationseinheittyp_update_bezeichnung
 		BEFORE UPDATE OF bezeichnung
@@ -176,7 +194,10 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vect
 	$qry = "
 		CREATE INDEX idx_tbl_contentsprache_fts_titel_content_vector 
 		ON campus.tbl_contentsprache 
-		USING GIN ((setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')));
+		USING GIN ((
+			setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') 
+			|| setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')
+		));
 	";
 
 	if (!$db->db_query($qry))
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bd674e514..88ef35fff 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42565,7 +42565,9 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'text' => 'Such-Konfiguration ' .
+					'$config["{type}"]["searchfields"]["{searchfield}"] ' .
+					'ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From fd2de106f8a4a760e1df0c001896022cc95a4ba9 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 24 Jun 2025 15:02:45 +0200
Subject: [PATCH 0346/1357] Added column evaluierung to
 lehre.tbl_lehrveranstaltung

- evaluierung (boolean) indicates if lehrveranstaltung shall be evaluated. Default is true.
---
 system/dbupdate_3.4.php                      |  3 ++-
 system/dbupdate_3.4/62063_lv_evaluierung.php | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 system/dbupdate_3.4/62063_lv_evaluierung.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 0e2b4e7c6..6b346573a 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,7 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/62063_lv_evaluierung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -241,7 +242,7 @@ $tabellen=array(
 	"lehre.tbl_lehrmittel" => array("lehrmittel_kurzbz","beschreibung","ort_kurzbz"),
 	"lehre.tbl_lehrmodus" => array("lehrmodus_kurzbz","bezeichnung_mehrsprachig","aktiv"),
 	"lehre.tbl_lehrtyp" => array("lehrtyp_kurzbz","bezeichnung"),
-	"lehre.tbl_lehrveranstaltung"  => array("lehrveranstaltung_id","kurzbz","bezeichnung","lehrform_kurzbz","studiengang_kz","semester","sprache","ects","semesterstunden","anmerkung","lehre","lehreverzeichnis","aktiv","planfaktor","planlektoren","planpersonalkosten","plankostenprolektor","koordinator","sort","zeugnis","projektarbeit","updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung_english","orgform_kurzbz","incoming","lehrtyp_kurzbz","oe_kurzbz","raumtyp_kurzbz","anzahlsemester","semesterwochen","lvnr","farbe","semester_alternativ","old_lehrfach_id","sws","lvs","alvs","lvps","las","benotung","lvinfo","lehrauftrag","lehrmodus_kurzbz","lehrveranstaltung_template_id"),
+	"lehre.tbl_lehrveranstaltung"  => array("lehrveranstaltung_id","kurzbz","bezeichnung","lehrform_kurzbz","studiengang_kz","semester","sprache","ects","semesterstunden","anmerkung","lehre","lehreverzeichnis","aktiv","planfaktor","planlektoren","planpersonalkosten","plankostenprolektor","koordinator","sort","zeugnis","projektarbeit","updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung_english","orgform_kurzbz","incoming","lehrtyp_kurzbz","oe_kurzbz","raumtyp_kurzbz","anzahlsemester","semesterwochen","lvnr","farbe","semester_alternativ","old_lehrfach_id","sws","lvs","alvs","lvps","las","benotung","lvinfo","lehrauftrag","lehrmodus_kurzbz","lehrveranstaltung_template_id", "evaluierung"),
 	"lehre.tbl_lehrveranstaltung_kompatibel" => array("lehrveranstaltung_id","lehrveranstaltung_id_kompatibel"),
 	"lehre.tbl_lvangebot" => array("lvangebot_id","lehrveranstaltung_id","studiensemester_kurzbz","gruppe_kurzbz","incomingplaetze","gesamtplaetze","anmeldefenster_start","anmeldefenster_ende","insertamum","insertvon","updateamum","updatevon"),
 	"lehre.tbl_lvregel" => array("lvregel_id","lvregeltyp_kurzbz","operator","parameter","lvregel_id_parent","lehrveranstaltung_id","studienplan_lehrveranstaltung_id","insertamum","insertvon","updateamum","updatevon"),
diff --git a/system/dbupdate_3.4/62063_lv_evaluierung.php b/system/dbupdate_3.4/62063_lv_evaluierung.php
new file mode 100644
index 000000000..5a0714772
--- /dev/null
+++ b/system/dbupdate_3.4/62063_lv_evaluierung.php
@@ -0,0 +1,15 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+//Add column evaluierung to lehre.tbl_lehrveranstaltung
+if(!@$db->db_query("SELECT evaluierung FROM lehre.tbl_lehrveranstaltung LIMIT 1"))
+{
+	$qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN evaluierung boolean NOT NULL DEFAULT true;
+			COMMENT ON COLUMN lehre.tbl_lehrveranstaltung.evaluierung IS 'TRUE wenn für diese LV eine LV-Evaluierung durchgeführt wird';
+			";
+
+	if(!$db->db_query($qry))
+		echo '<strong>lehre.tbl_lehrveranstaltung '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Spalte evaluierung zu Tabelle lehre.tbl_lehrveranstaltung hinzugefügt';
+}

From b344b5925af82a6f32d15498ae8e49c83fd67ea8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 15:19:21 +0200
Subject: [PATCH 0347/1357] Use Advanced search for CIS & StV

---
 public/js/apps/Cis.js                           | 6 +++---
 public/js/components/Stv/Studentenverwaltung.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 962dec5c1..bd538a067 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -16,9 +16,9 @@ const app = Vue.createApp({
 				cssclass: "",
 				calcheightonly: true,
                 types: [
-                    "mitarbeiter",
+                    "employee",
 					"student",
-                    "raum",
+                    "room",
                     "organisationunit"
                 ],
                 actions: {
@@ -112,7 +112,7 @@ const app = Vue.createApp({
     },
     methods: {
         searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.search(searchsettings));
+        	return this.$api.call(ApiSearchbar.searchAdvanced(searchsettings));
         }
     }
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 5f0569973..6cd472ea8 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -76,7 +76,7 @@ export default {
 				cssclass: "position-relative",
 				calcheightonly: true,
 				types: [
-					"studentStv",
+					"student",
 					"prestudent"
 				],
 				actions: {
@@ -139,7 +139,7 @@ export default {
 			this.$refs.stvList.reload();
 		},
 		searchfunction(params, config) {
-			return this.$api.call(ApiSearchbar.search(params), config);
+			return this.$api.call(ApiSearchbar.searchAdvanced(params), config);
 		}
 	},
 	created() {

From e385a06b73f3811a6fe269845278fe30fd07170f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 09:36:47 +0200
Subject: [PATCH 0348/1357] merge_C4 compatibility

---
 public/js/apps/Cis.js                       | 2 +-
 public/js/components/searchbar/searchbar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index bd538a067..29784b225 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,7 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
-            	origin: "cis",
+				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 1bfb26032..4acdf0288 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -56,7 +56,7 @@ export default {
             class="d-flex me-3"
             :class="searchoptions.cssclass"
             action="javascript:void(0);"
-		 	@focusin="searchfocusin"
+            @focusin="searchfocusin"
             @focusout="searchfocusout"
         >
 			<div ref="searchbox" class="h-100 input-group me-2">

From c3ec34a038ba531a82266118cedc1f9f070258b1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 09:39:19 +0200
Subject: [PATCH 0349/1357] Code Quality to be compatibler with feature-40128

---
 public/js/components/searchbar/searchbar.js | 34 +++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index aa2213310..197800c29 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -31,16 +31,38 @@ export default {
       prestudent: prestudent
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
-		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
+        <form
+            ref="searchform"
+            class="d-flex me-3"
+            :class="searchoptions.cssclass"
+            action="javascript:void(0);"
+            @focusin="searchfocusin"
+            @focusout="searchfocusout"
+        >
 			<div ref="searchbox" class="h-100 input-group me-2">
 				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
-                <input @keyup="this.search" @focus="this.showsearchresult"
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
+                <input
+                    @keyup="search"
+                    @focus="showsearchresult"
+                    v-model="searchsettings.searchstr"
+                    class="form-control"
+                    type="search"
+                    :placeholder="'Search: '+ search_types_string"
+                    aria-label="Search"
+                >
+                <span
+                    data-bs-toggle="collapse"
+                    data-bs-target="#searchSettings"
+                    aria-expanded="false"
+                    aria-controls="searchSettings"
+                    ref="settingsbutton"
+                    class="input-group-text"
+                    type="button"
+                >
+                    <i class="fas fa-cog"></i>
+                </span>
             </div>
 
             <div v-show="this.showresult"

From cbc9a87a475e9baa7c8d38fde08f3d498687a9ee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Jun 2025 11:22:14 +0200
Subject: [PATCH 0350/1357] update(Profil Profilbild): adds button to upload
 new profil foto if foto is not yet acepted

---
 .../controllers/api/frontend/v1/Profil.php    | 24 +++++++++++++++++++
 public/css/components/Profil.css              | 14 ++++++++++-
 .../Cis/Profil/MitarbeiterProfil.js           |  5 +++-
 .../Cis/Profil/MitarbeiterViewProfil.js       |  5 +++-
 .../ProfilComponents/ProfilInformation.js     |  7 ++++++
 .../js/components/Cis/Profil/StudentProfil.js | 17 +++++++------
 .../Cis/Profil/StudentViewProfil.js           |  5 +++-
 7 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index f234fc30e..b58d90d07 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -108,6 +108,7 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
+		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
 		$res->data->editAllowed = $editAllowed;
 		$this->terminateWithSuccess($res);
 	}
@@ -648,5 +649,28 @@ class Profil extends FHCAPI_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+	/**
+	 * checks whether the foto of a user is accepted or not
+	 * @access private
+	 * @param  integer $pid the personId of the student or mitarbeiter
+	 * @return bool whether the foto is accepted or not
+	 */
+	private function isFotoAkzeptiert($pid)
+	{
+		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotostatus = $this->FotostatusModel->execReadOnlyQuery("
+		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
+		from public.tbl_person_fotostatus
+		where person_id = ? 
+		order by person_id, insertamum desc",[$pid]);
+		$fotostatus = $this->getDataOrTerminateWithError($fotostatus);
+		if(is_array($fotostatus) && count($fotostatus) > 0){
+			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
+		}
+		else
+			$fotostatus = false;
+		return $fotostatus;
+	}
 }
 
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index b1ac8d67a..220c2ebfe 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -9,7 +9,6 @@
   width:21px; 
   background-color:var(--fhc-profil-border); 
   position:absolute;
-  /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
   right:12px; 
   display:flex; 
@@ -18,6 +17,19 @@
   border-radius:3px;
 }
 
+.image-upload {
+	height: 22px;
+	width: 21px;
+	background-color: var(--fhc-profil-border);
+	position: absolute;
+	bottom: 4.5px;
+	left: 14.5px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 3px 3px 3px 0;
+}
+
 .tabulator-collapsed-row{
     padding:15px;
     background-color: var(--fhc-profil-tabulator-shadow);
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 07a6339e4..0bb628e19 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -218,6 +218,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 		getTelefonValue() {
 			if(this.data.standort_telefon?.kontakt) {
 				return this.data.standort_telefon.kontakt + " " + this.data.telefonklappe
@@ -337,7 +340,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- PROFIL INFORMATION -->
-                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
+                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index cef970ec2..23a86b5f9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -113,6 +113,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
@@ -189,7 +192,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- Profil Informationen -->
-                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
+                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index e39b4d57d..2881ecec1 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -11,6 +11,10 @@ export default {
 		editable: {
 			type: Boolean,
 			default: false
+		},
+		fotoStatus:{
+			type: Boolean,
+			default: true
 		}
 	},
 	data() {
@@ -83,6 +87,9 @@ export default {
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
+                        </div>
+						<div v-if="!fotoStatus" role="button" @click.prevent="" class="image-upload">
+                            <i class="fa fa-upload"></i>
                         </div>
                     </div>
                 </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 635033fda..2c0d5ba2b 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -166,6 +166,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 
 		filteredEditData() {
 			return this.editDataFilter
@@ -239,9 +242,9 @@ export default {
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form">
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" 
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal"
     :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
-    <!-- ROW --> 
+    <!-- ROW -->
     <div class="row">
         <!-- HIDDEN QUICK LINKS -->
         <div  class="d-md-none col-12 ">
@@ -251,7 +254,7 @@ export default {
                     <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                 </div>
             </div>-->
-            
+
 			<!-- Bearbeiten Button -->
 			<div v-if="editable" class="row ">
 				<div class="col mb-3">
@@ -267,24 +270,24 @@ export default {
 			</div>
 				<div v-if="data.profilUpdates" class="row mb-3">
 					<div class="col">
-						<!-- MOBILE PROFIL UPDATES -->  
+						<!-- MOBILE PROFIL UPDATES -->
 						<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
 					</div>
 				</div>
 			</div>
 			<!-- END OF HIDDEN QUCK LINKS -->
-			
+
 			<!-- MAIN PANNEL -->
 			<div class="col-sm-12 col-md-8 col-xxl-9 ">
 				<!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
 				<!-- INFORMATION CONTENT START -->
-				<!-- ROW WITH THE PROFIL INFORMATION --> 
+				<!-- ROW WITH THE PROFIL INFORMATION -->
 				<div class="row mb-4 ">
 					<div  class="col-lg-12 col-xl-6 ">
 						<div class="row mb-4">
 							<div class="col">
 								<!-- PROFIL INFORMATION -->
-								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable"></profil-information>
+								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
 						<div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 1c2044441..f7ad03b98 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -29,6 +29,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 		profilInformation() {
 			if (!this.data) {
 				return {};
@@ -115,7 +118,7 @@ export default {
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
-                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable"></profil-information>
+                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->

From 4b8af46a2ee0edf7968ec18c4204fd6d0e40d0cc Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 25 Jun 2025 13:30:05 +0200
Subject: [PATCH 0351/1357] Added 'evaluierung' to lehrveranstaltung.class.php
 and updated related methods

---
 include/lehrveranstaltung.class.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 48edd9d0a..aa3b6771e 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -70,6 +70,7 @@ class lehrveranstaltung extends basis_db
 	public $farbe;
 	public $lehrauftrag=true;
 	public $lehrveranstaltung_template_id; // integer
+	public $evaluierung=true; // boolean
 
 
 	public $studienplan_lehrveranstaltung_id;
@@ -170,6 +171,7 @@ class lehrveranstaltung extends basis_db
 			$this->benotung = $this->db_parse_bool($row->benotung);
 			$this->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$this->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$this->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			// FIXME: LV-Bezeichnung richtig mehrsprachig machen
 			// Zwischenzeitlich 'Italian' zum bezeichnung_arr dazugegeben
@@ -244,6 +246,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -394,6 +397,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['Italian'] = $row->bezeichnung;
@@ -524,6 +528,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -607,6 +612,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -779,7 +785,7 @@ class lehrveranstaltung extends basis_db
 				insertvon, planfaktor, planlektoren, planpersonalkosten, plankostenprolektor, updateamum, updatevon, sort,
 				zeugnis, projektarbeit, sprache, koordinator, bezeichnung_english, orgform_kurzbz, incoming, lehrtyp_kurzbz, oe_kurzbz,
 				raumtyp_kurzbz, anzahlsemester, semesterwochen, lvnr, semester_alternativ, farbe, lehrveranstaltung_template_id,sws,lvs,alvs,lvps,las,benotung,lvinfo,
-				lehrauftrag, lehrmodus_kurzbz) VALUES ('.
+				lehrauftrag, lehrmodus_kurzbz, evaluierung) VALUES ('.
 					$this->db_add_param($this->studiengang_kz). ', '.
 					$this->db_add_param($this->bezeichnung). ', '.
 					$this->db_add_param($this->kurzbz). ', '.
@@ -824,7 +830,8 @@ class lehrveranstaltung extends basis_db
 					$this->db_add_param($this->benotung, FHC_BOOLEAN).','.
 					$this->db_add_param($this->lvinfo, FHC_BOOLEAN).','.
 					$this->db_add_param($this->lehrauftrag, FHC_BOOLEAN).','.
-					$this->db_add_param($this->lehrmodus_kurzbz)
+					$this->db_add_param($this->lehrmodus_kurzbz).','.
+					$this->db_add_param($this->evaluierung, FHC_BOOLEAN)
 					.');';
 		}
 		else
@@ -880,7 +887,8 @@ class lehrveranstaltung extends basis_db
 					'las = '.$this->db_add_param($this->las).', '.
 					'benotung = '.$this->db_add_param($this->benotung, FHC_BOOLEAN).', '.
 					'lvinfo = '.$this->db_add_param($this->lvinfo, FHC_BOOLEAN).', '.
-					'lehrauftrag = '.$this->db_add_param($this->lehrauftrag, FHC_BOOLEAN).' '.
+					'lehrauftrag = '.$this->db_add_param($this->lehrauftrag, FHC_BOOLEAN).', '.
+					'evaluierung = '.$this->db_add_param($this->evaluierung, FHC_BOOLEAN).' '.
 					'WHERE lehrveranstaltung_id = ' . $this->db_add_param($this->lehrveranstaltung_id, FHC_INTEGER, false) . ';';
 		}
 
@@ -991,6 +999,7 @@ class lehrveranstaltung extends basis_db
 				$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 				$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 				$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1086,6 +1095,7 @@ class lehrveranstaltung extends basis_db
 				$l->benotung = $this->db_parse_bool($row->benotung);
 				$l->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$l->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$l->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$l->bezeichnung_arr['German'] = $row->bezeichnung;
 				$l->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1170,6 +1180,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1271,6 +1282,7 @@ class lehrveranstaltung extends basis_db
 				$obj->benotung = $this->db_parse_bool($row->benotung);
 				$obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$obj->bezeichnung_arr['German'] = $row->bezeichnung;
 				$obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1396,6 +1408,7 @@ class lehrveranstaltung extends basis_db
 				$obj->lvinfo =$this->db_parse_bool( $lv->lvinfo);
 				$obj->zeugnis = $this->db_parse_bool($lv->zeugnis);
 				$obj->lehrauftrag = $this->db_parse_bool($lv->lehrauftrag);
+				$obj->evaluierung = $this->db_parse_bool($lv->evaluierung);
 
 				$values[] = $obj;
 
@@ -1422,6 +1435,7 @@ class lehrveranstaltung extends basis_db
 			$obj->lvinfo =$this->db_parse_bool( $this->lvinfo);
 			$obj->zeugnis = $this->db_parse_bool($this->zeugnis);
 			$obj->lehrauftrag = $this->db_parse_bool($this->lehrauftrag);
+			$obj->evaluierung = $this->db_parse_bool($this->evaluierung);
 
 			$values[] = $obj;
 		}
@@ -1476,6 +1490,7 @@ class lehrveranstaltung extends basis_db
 				$obj->export = $lv->export;
 				$obj->genehmigung = $lv->genehmigung;
 				$obj->lehrauftrag = $lv->lehrauftrag;
+				$obj->evaluierung = $lv->evaluierung;
 				$obj->lehre = $lv->lehre;
 				$obj->children = array();
 				if(count($lv->childs) > 0)
@@ -1507,6 +1522,7 @@ class lehrveranstaltung extends basis_db
 			$obj->zeugnis = $this->db_parse_bool($this->zeugnis);
 			$obj->curriculum = $this->db_parse_bool($this->curriculum);
 			$obj->lehrauftrag = $this->lehrauftrag;
+			$obj->evaluierung = $this->db_parse_bool($this->evaluierung);
 
 			$values[] = $obj;
 		}
@@ -1613,6 +1629,7 @@ class lehrveranstaltung extends basis_db
 				$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 				$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 				$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1700,6 +1717,7 @@ class lehrveranstaltung extends basis_db
                 $lv_obj->benotung = $this->db_parse_bool($row->benotung);
                 $lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
                 $lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+                $lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
                 $lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
                 $lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -1873,6 +1891,7 @@ class lehrveranstaltung extends basis_db
 			$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 			$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 			$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+			$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 			$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 			$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -2003,6 +2022,7 @@ class lehrveranstaltung extends basis_db
 				$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 				$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$lv_obj->studiengang_kurzbzlang = $row->studiengang_kurzbzlang;
 
@@ -2131,6 +2151,7 @@ class lehrveranstaltung extends basis_db
 				$lv_obj->benotung = $this->db_parse_bool($row->benotung);
 				$lv_obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$lv_obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$lv_obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$lv_obj->bezeichnung_arr['German'] = $row->bezeichnung;
 				$lv_obj->bezeichnung_arr['English'] = $row->bezeichnung_english;
@@ -2402,6 +2423,7 @@ class lehrveranstaltung extends basis_db
 				$obj->benotung = $this->db_parse_bool($row->benotung);
 				$obj->lvinfo = $this->db_parse_bool($row->lvinfo);
 				$obj->lehrauftrag = $this->db_parse_bool($row->lehrauftrag);
+				$obj->evaluierung = $this->db_parse_bool($row->evaluierung);
 
 				$obj->bezeichnung_arr['German'] = $row->bezeichnung;
 				$obj->bezeichnung_arr['English'] = $row->bezeichnung_english;

From daf9d2ea15f8d7063a07cf179cb87cdd8cda8d31 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 25 Jun 2025 13:35:20 +0200
Subject: [PATCH 0352/1357] Added checkbox 'evaluierung' Lehrveranstaltung
 Details in VILESCI

---
 vilesci/lehre/lehrveranstaltung_details.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
index bad2a7d93..c1433047c 100644
--- a/vilesci/lehre/lehrveranstaltung_details.php
+++ b/vilesci/lehre/lehrveranstaltung_details.php
@@ -122,6 +122,7 @@
 		$lv->benotung = isset($_POST['benotung']);
 		$lv->lvinfo = isset($_POST['lvinfo']);
 		$lv->lehrauftrag = isset($_POST['lehrauftrag']);
+		$lv->evaluierung = isset($_POST['evaluierung']);
 		$lv->lehrveranstaltung_template_id = $lv->lehrtyp_kurzbz == 'tpl' ? '' : $_POST['lehrveranstaltung_template_id'];
 
 		if(!$lv->save())
@@ -446,6 +447,10 @@
 			<td>Lehrauftrag</td>
 			<td><input type="checkbox" name="lehrauftrag" '.($lv->lehrauftrag?'checked':'').'></td>
 		</tr>
+		<tr>
+			<td>Evaulierung</td>
+			<td><input type="checkbox" name="evaluierung" '.($lv->evaluierung?'checked':'').'></td>
+		</tr>
 		<tr id="lehrveranstaltung_template_id">
 			<td>Template</td>
 			<td colspan="2"><input type="text" name="lehrveranstaltung_template_id" value="'.$lv->lehrveranstaltung_template_id.'" size="6"> <span class="text-template_name"></span></td>

From 057288a4a5312f052dd196021172b42ad2ffb44a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:02:51 +0200
Subject: [PATCH 0353/1357] phrasen & rechte rename

---
 include/tw/cis_menu_lv.inc.php |   8 +--
 system/phrasesupdate.php       | 126 ++++++++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 73a347dc3..29ba54724 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -244,10 +244,10 @@ function checkZeilenUmbruch()
 	if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG)))
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA') || in_array($lv->lehrveranstaltung_id, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA)))
-		&& ($rechte->isBerechtigt('extension/anw_ent_admin')
-				|| $rechte->isBerechtigt('extension/anwesenheit_lektor')
-				|| $rechte->isBerechtigt('extension/anwesenheit_student')
-				|| $rechte->isBerechtigt('extension/anwesenheit_admin')))
+		&& ($rechte->isBerechtigt('extension/anw_r_ent_assistenz')
+				|| $rechte->isBerechtigt('extension/anw_r_lektor')
+				|| $rechte->isBerechtigt('extension/anw_r_student')
+				|| $rechte->isBerechtigt('extension/anw_r_full_assistenz')))
 	{
 		$link='';
 		$text='';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 66f5f6c05..8ee5685d6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31447,18 +31447,78 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'studentConfig',
+		'phrase' => 'errorCodeTooOld',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studenten auswählen.',
+				'text' => 'Der Zugangscode ist zeitlich abgelaufen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Configure student profile.',
+				'text' => 'The access code has expired.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'profil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Profil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'profile',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'admin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'allowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktuell prüfbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'allowed to test',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -31504,6 +31564,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'termine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterricht laut Stundenplan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lesson as per Timetable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -31644,6 +31724,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32296,6 +32396,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'file',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From aec0162c0174977d61de9571b12e390bcff86802 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:49:29 +0200
Subject: [PATCH 0354/1357] Konto: Buchungstypen order

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

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index ac36b5d8f..a33680ea0 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -116,6 +116,8 @@ class Konto extends FHCAPI_Controller
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
+		$this->BuchungstypModel->addOrder('beschreibung');
+		
 		$result = $this->BuchungstypModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);

From c9cc86fdbd9fbf5053be63611ef5c53c9d1a9b43 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:50:03 +0200
Subject: [PATCH 0355/1357] Archiv: Downloadbutton in actions column

---
 .../Stv/Studentenverwaltung/Details/Archiv.js          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index fd174e16f..7f615f8b5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -115,6 +115,16 @@ export default {
 						let container = document.createElement('div');
 						container.className = "d-flex gap-2";
 
+						let downloadButton = document.createElement('button');
+						downloadButton.className = 'btn btn-outline-secondary';
+						downloadButton.innerHTML = '<i class="fa fa-download"></i>';
+						downloadButton.title = this.$p.t('ui', 'downloadDok');
+						downloadButton.addEventListener('click', evt => {
+							evt.stopPropagation();
+							this.actionDownload(cell.getData().akte_id);
+						});
+						container.append(downloadButton);
+
 						if (this.config.showEdit)
 						{
 							let editButton = document.createElement('button');

From af2aa416aae48a8a5ef2450ed2b973abb86be054 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:50:36 +0200
Subject: [PATCH 0356/1357] Documents: Doubleclick-Download like in Archive

---
 .../Details/Dokumente/List/Accepted.js                 | 10 ++++++++++
 .../Details/Dokumente/List/Unaccepted.js               | 10 ++++++++++
 2 files changed, 20 insertions(+)

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 742d01360..9994a230e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -199,6 +199,16 @@ export default {
 							title: this.$p.t('global', 'dokument')
 						});
 					}
+				},
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						if (row.getData().vorhanden) {
+							window.open(
+								this.actionDownloadFile(row.getData().akte_id)
+							);
+						}
+					}
 				}
 			]
 		}
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 8a0a24667..949f7d4c8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -207,6 +207,16 @@ export default {
 							title: this.$p.t('global', 'dokument')
 						});
 					}
+				},
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						if (row.getData().vorhanden) {
+							window.open(
+								this.actionDownloadFile(row.getData().akte_id)
+							);
+						}
+					}
 				}
 			]
 		}

From 9610ca55f7c337adbbdedd2ac64e562ad2acf8fb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 26 Jun 2025 15:21:09 +0200
Subject: [PATCH 0357/1357] update(Profil Profilbild): first version of the
 profilbild upload endpoint

---
 .../api/frontend/v1/ProfilUpdate.php          | 101 ++++++++++++++++++
 public/js/api/factory/profilUpdate.js         |   7 ++
 .../ProfilComponents/ProfilInformation.js     |  10 +-
 .../EditProfilComponents/ImageUpload.js       |  83 ++++++++++++++
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 827654d21..4a26e5bf8 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -44,6 +44,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'updateProfilRequest' => self::PERM_LOGGED,
 			'deleteProfilRequest' => self::PERM_LOGGED,
 			'insertFile' => self::PERM_LOGGED,
+			'updateProfilbild' => self::PERM_LOGGED,
 			'show' => self::PERM_LOGGED,
 			]);
 
@@ -478,6 +479,106 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess($res);
 	}
 
+	public function updateProfilbild()
+	{
+
+		$resize = function($filename, $width, $height){
+			// Hoehe und Breite neu berechnen
+			list($width_orig, $height_orig) = getimagesize($filename);
+			
+			if ($width && ($width_orig < $height_orig))
+			{
+				$width = ($height / $height_orig) * $width_orig;
+			}
+			else
+			{
+				$height = ($width / $width_orig) * $height_orig;
+			}
+
+			$image_p = imagecreatetruecolor($width, $height);
+
+			$image = imagecreatefromjpeg($filename);
+
+			//Bild nur verkleinern aber nicht vergroessern
+			if($width_orig>$width || $height_orig>$height)
+				imagecopyresampled($image_p, $image, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
+			else
+				$image_p = $image;
+
+			imagejpeg($image_p, $filename, 80);
+
+			@imagedestroy($image_p);
+			@imagedestroy($image);
+		};
+		
+		if (!count($_FILES)) {
+			$this->terminateWithError("No file available for upload");
+		}
+
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+		$count = 0;
+		for ($i = 0; $i < $file_count; $i++) {
+			$count++;
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+
+			$filename = $_FILES['files']['tmp_name'];
+
+			$ext = substr($files['name'][$i], strrpos($files['name'][$i], '.') + 1);
+			if($ext!='jpg' && $ext!='jpeg'){
+				$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
+			}
+			
+			$width = 827;
+			$height = 1063;
+			// resize
+			$resize($filename, $width, $height);
+
+
+			//akte
+			$fp = fopen($filename,'r');
+			//auslesen
+			$content = fread($fp, filesize($filename));
+			$base64_content = base64_encode($content);
+			$this->load->library('AkteLib');
+			$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
+			fclose($fp);
+			if (isError($aktenInsertResult)) {
+				$this->terminateWithError(getError($aktenInsertResult));
+			}
+
+			// in person abspeichern
+			$resize($filename, 101, 130);
+			$fp = fopen($filename,'r');
+			$content = fread($fp, filesize($filename));
+			fclose($fp);
+			$base64_content = base64_encode($content);
+			$this->load->model('person/Person_model','PersonModel');
+			$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
+			if(isError($personUpdate)){
+				$this->terminateWithError(getError($personUpdate));
+			}
+			// update foto status
+			$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+			$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
+			if(isError($fotoInsert)){
+				$this->terminateWithError(getError($fotoInsert));
+			}
+
+		}
+		
+		
+		$this->terminateWithSuccess(["fotoStatus"=>getData($fotoInsert),"personUpdate"=>getData($personUpdate),"akteInsert"=>getData($aktenInsertResult)]);
+
+
+	}
+
 	public function getProfilUpdateWithPermission($status = null)
 	{
 		// early return if no status has been passed as argument
diff --git a/public/js/api/factory/profilUpdate.js b/public/js/api/factory/profilUpdate.js
index 42e87ae0e..dfef399bf 100644
--- a/public/js/api/factory/profilUpdate.js
+++ b/public/js/api/factory/profilUpdate.js
@@ -61,6 +61,13 @@ export default {
 			params: dms
 		};
 	},
+	updateProfilbild(dms) {
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/ProfilUpdate/updateProfilbild`,
+			params: dms
+		};
+	},
 	getProfilRequestFiles(requestID) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 2881ecec1..e0ed7da5b 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -1,4 +1,5 @@
 import ApiProfil from '../../../../api/factory/profil.js';
+import ImageUpload from '../../Profil/ProfilModal/EditProfilComponents/ImageUpload.js';
 
 export default {
 	props: {
@@ -17,6 +18,9 @@ export default {
 			default: true
 		}
 	},
+	components:{
+		ImageUpload,
+	},
 	data() {
 		return {
 			FotoSperre: this.data.foto_sperre,
@@ -25,6 +29,9 @@ export default {
 	emits: ["showEditProfilModal"],
 
 	methods: {
+		showModal(){
+			this.$refs.imageUpload.show();
+		},
 		sperre_foto_function() {
 			//TODO: refactor
 			if (!this.data) {
@@ -66,6 +73,7 @@ export default {
 	template: /*html*/ `
 
 <div class="card h-100">
+	<image-upload ref="imageUpload" titel="test"></image-upload>
     <div class="card-header">
         <div class="row">
             <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
@@ -88,7 +96,7 @@ export default {
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="!fotoStatus" role="button" @click.prevent="" class="image-upload">
+						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
new file mode 100644
index 000000000..b7ab16755
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
@@ -0,0 +1,83 @@
+import Dms from "../../../../Form/Upload/Dms.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+
+import ApiProfilUpdate from '../../../../../api/factory/profilUpdate.js';
+
+export default {
+	data() {
+		return {
+			dmsData: [],
+		};
+	},
+	components: {
+		Dms,
+		BsModal,
+	},
+	mixins: [BsModal],
+	props: {
+		titel: {
+			type: Object,
+		},
+		files: {
+			type: Array,
+		},
+		updateID: {
+			type: Boolean,
+		},
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function,
+	},
+	methods:{
+		async uploadImage(){
+			if(this.dmsData){
+				let formData = new FormData();
+				formData.append("files[]", this.dmsData[0]);
+				await this.$api
+					.call(ApiProfilUpdate.updateProfilbild(formData))
+					.then((res) => {
+						console.log("here", res.data?.map((file) => file.dms_id)) ;
+					});	
+			}
+			
+		}
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+		if (this.files) {
+			this.dmsData = this.files;
+		}
+	},
+	popup(options) {
+			BsModal.popup.bind(this);
+			return BsModal.popup(null, options);
+	},
+	template: /*html*/`
+
+	<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+		<template #title>
+			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[titel])}}</p>
+		</template>
+		<template #default>
+			<div class="form-underline">
+				<div class="form-underline-titel">{{titel?titel:$p.t('global','titel')}}</div>
+			</div>
+			<div class="row gx-2">
+				<div class="col">
+					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
+				</div>
+				<div class="col-auto">
+					<button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
+				</div>
+			</div>
+			<div class="d-flex" style="margin-left:auto;">
+				<button @click="uploadImage" class="btn btn-primary">upload</button>
+			</div>
+		</template>
+		<template #footer>
+		</template>
+	</bs-modal>
+    `,
+};

From 0adf7ee9dc9b9c19cbcff4ab34e8f02bce3da1ea Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 27 Jun 2025 09:52:18 +0200
Subject: [PATCH 0358/1357] Fix "Spaltenbreite wird nicht gespeichert" for
 Kontakt Tabs: use Filtercomponent default layout

---
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 2 --
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js      | 2 --
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js          | 2 --
 3 files changed, 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 943dfa94f..ed32e2eab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -122,8 +122,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'adresse_id',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index b6896fb6b..6c02677ce 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -86,8 +86,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'bankverbindung_id',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 42896c8b7..ee37427b1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -94,8 +94,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'kontakt_id',

From e3fe20831e311d5e2124ea75011272da9a2825ad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 27 Jun 2025 11:36:40 +0200
Subject: [PATCH 0359/1357] update(Profil Profilbild): changes styling layout
 and polishment

---
 .../api/frontend/v1/ProfilUpdate.php          | 102 ++++++++----------
 public/css/components/dashboard.css           |  13 ++-
 .../ProfilComponents/ProfilInformation.js     |   2 +-
 .../EditProfilComponents/ImageUpload.js       |  13 ++-
 system/phrasesupdate.php                      |  40 +++++++
 5 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 4a26e5bf8..929ea49d6 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -515,68 +515,58 @@ class ProfilUpdate extends FHCAPI_Controller
 			$this->terminateWithError("No file available for upload");
 		}
 
-		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
 		$files = $_FILES['files'];
-		$file_count = count($files['name']);
-		$count = 0;
-		for ($i = 0; $i < $file_count; $i++) {
-			$count++;
-			$_FILES['files']['name'] = $files['name'][$i];
-			$_FILES['files']['type'] = $files['type'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-			$_FILES['files']['error'] = $files['error'][$i];
-			$_FILES['files']['size'] = $files['size'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+		
+		$_FILES['files']['name'] = current($files['name']);
+		$_FILES['files']['type'] = current($files['type']);
+		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
+		$_FILES['files']['error'] = current($files['error']);
+		$_FILES['files']['size'] = current($files['size']);
+		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
 
-			$filename = $_FILES['files']['tmp_name'];
-
-			$ext = substr($files['name'][$i], strrpos($files['name'][$i], '.') + 1);
-			if($ext!='jpg' && $ext!='jpeg'){
-				$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
-			}
-			
-			$width = 827;
-			$height = 1063;
-			// resize
-			$resize($filename, $width, $height);
-
-
-			//akte
-			$fp = fopen($filename,'r');
-			//auslesen
-			$content = fread($fp, filesize($filename));
-			$base64_content = base64_encode($content);
-			$this->load->library('AkteLib');
-			$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
-			fclose($fp);
-			if (isError($aktenInsertResult)) {
-				$this->terminateWithError(getError($aktenInsertResult));
-			}
-
-			// in person abspeichern
-			$resize($filename, 101, 130);
-			$fp = fopen($filename,'r');
-			$content = fread($fp, filesize($filename));
-			fclose($fp);
-			$base64_content = base64_encode($content);
-			$this->load->model('person/Person_model','PersonModel');
-			$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
-			if(isError($personUpdate)){
-				$this->terminateWithError(getError($personUpdate));
-			}
-			// update foto status
-			$this->load->model('person/Fotostatusperson_model','FotostatusModel');
-			$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
-			if(isError($fotoInsert)){
-				$this->terminateWithError(getError($fotoInsert));
-			}
+		$filename = $_FILES['files']['tmp_name'];
 
+		$ext = substr(current($files['name']), strrpos(current($files['name']), '.') + 1);
+		if($ext!='jpg' && $ext!='jpeg'){
+			$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
 		}
 		
+		// resize
+		$resize($filename, 827, 1063);
+
+		//akte
+		$fp = fopen($filename,'r');
+		//auslesen
+		$content = fread($fp, filesize($filename));
+		$base64_content = base64_encode($content);
+		$this->load->library('AkteLib');
+		$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
+		fclose($fp);
+		if (isError($aktenInsertResult)) {
+			$this->terminateWithError(getError($aktenInsertResult));
+		}
+
+		// in person abspeichern
+		$resize($filename, 101, 130);
+		$fp = fopen($filename,'r');
+		$content = fread($fp, filesize($filename));
+		fclose($fp);
+		$base64_content = base64_encode($content);
+		$this->load->model('person/Person_model','PersonModel');
+		$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
+		if(isError($personUpdate)){
+			$this->terminateWithError(getError($personUpdate));
+		}
+
+
+		// update foto status
+		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
+		if(isError($fotoInsert)){
+			$this->terminateWithError(getError($fotoInsert));
+		}
 		
-		$this->terminateWithSuccess(["fotoStatus"=>getData($fotoInsert),"personUpdate"=>getData($personUpdate),"akteInsert"=>getData($aktenInsertResult)]);
-
-
+		$this->terminateWithSuccess();
 	}
 
 	public function getProfilUpdateWithPermission($status = null)
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 78567be2b..d030e80cd 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -138,14 +138,17 @@
 	position: relative;
 }
 
+.dashboard-item-overlay{
+	background-color: var(--fhc-dashboard-item-overlay-background);
+}
+
 .dashboard-item-overlay::before{
 	position:absolute;
 	content:"";
-	top:0;
-	left:0;
-	right:0;
-	bottom:0;
-	background-color:var(--fhc-dashboard-item-overlay-background);
+	top:0.25rem;
+	left:0.25rem;
+	right:0.25rem;
+	bottom:0.25rem;
 	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
 	opacity: 0.5;
 }
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index e0ed7da5b..50399edf5 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -73,7 +73,7 @@ export default {
 	template: /*html*/ `
 
 <div class="card h-100">
-	<image-upload ref="imageUpload" titel="test"></image-upload>
+	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
             <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
index b7ab16755..672b4ce4a 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
@@ -38,7 +38,8 @@ export default {
 				await this.$api
 					.call(ApiProfilUpdate.updateProfilbild(formData))
 					.then((res) => {
-						console.log("here", res.data?.map((file) => file.dms_id)) ;
+						this.$fhcAlert.alertSuccess(this.$p.t('global','hochgeladen'));
+						this.modal.hide();
 					});	
 			}
 			
@@ -58,7 +59,7 @@ export default {
 
 	<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 		<template #title>
-			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[titel])}}</p>
+			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilBildUpdateMessage',[titel])}}</p>
 		</template>
 		<template #default>
 			<div class="form-underline">
@@ -66,18 +67,16 @@ export default {
 			</div>
 			<div class="row gx-2">
 				<div class="col">
-					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
+					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData"  ></dms>
 				</div>
 				<div class="col-auto">
 					<button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
 				</div>
 			</div>
-			<div class="d-flex" style="margin-left:auto;">
-				<button @click="uploadImage" class="btn btn-primary">upload</button>
+			<div class="d-flex" >
+				<button @click="uploadImage" class="btn fhc-primary-bg mt-4 text-light" style="margin-left:auto;">{{$p.t('global','upload')}}</button>
 			</div>
 		</template>
-		<template #footer>
-		</template>
 	</bs-modal>
     `,
 };
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 26c9d7bee..43913661a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28138,6 +28138,26 @@ array(
 	),
 		//Profil Phrasen ende
 		//ProfilUpdate Phrasen start
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilBild',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -28459,6 +28479,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilBildUpdateMessage',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Bitte laden Sie ihr {0} hoch',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Please upload your {0}',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',

From 239eace246349288b1146c1c684243e59e5721af Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 27 Jun 2025 23:14:56 +0200
Subject: [PATCH 0360/1357] registration links to Bewerbungstool: changed in
 infocenter and fas, studentenverwaltung so that user email is not verified

---
 application/views/system/infocenter/stammdaten.php            | 2 +-
 .../js/components/Stv/Studentenverwaltung/Details/Details.js  | 4 ++--
 rdf/student.rdf.php                                           | 2 +-
 vilesci/personen/personendetails.php                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index f143c9c03..4806d979a 100644
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -188,7 +188,7 @@
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
-					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress ?>"
+					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress.'&keepEmailUnverified=true' ?>"
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index ae4f92b20..3ca656697 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -153,7 +153,7 @@ export default {
 						<label>Zugangscode</label>
 						<div class="align-self-center">
 							<span class="form-text">
-								<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat" target="_blank">{{data.zugangscode}}</a>
+								<a :href="cisRoot + 'addons/bewerbung/cis/registration.php?code=' + data.zugangscode + '&emailAdresse=' + data.email_privat + '&keepEmailUnverified=true'" target="_blank">{{data.zugangscode}}</a>
 							</span>
 						</div>
 					</div>
@@ -459,4 +459,4 @@ export default {
 			</div>
 		</fieldset>
 	</core-form>`
-};
\ No newline at end of file
+};
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 40cf28e01..f16f8a7b0 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -349,7 +349,7 @@ function draw_content($row)
 			<STUDENT:mail_privat><![CDATA['.$mail_privat.']]></STUDENT:mail_privat>
 			<STUDENT:mail_intern><![CDATA['.(isset($row->uid)?$row->uid.'@'.DOMAIN:'').']]></STUDENT:mail_intern>
 			<STUDENT:zugangscode><![CDATA['.$row->zugangscode.']]></STUDENT:zugangscode>
-			<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.$mail_privat.']]></STUDENT:link_bewerbungstool>
+			<STUDENT:link_bewerbungstool><![CDATA['.CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.$row->zugangscode.'&emailAdresse='.$mail_privat.'&keepEmailUnverified=true]]></STUDENT:link_bewerbungstool>
 			<STUDENT:bpk><![CDATA['.$row->bpk.']]></STUDENT:bpk>
 
 			<STUDENT:aktiv><![CDATA['.$aktiv.']]></STUDENT:aktiv>
diff --git a/vilesci/personen/personendetails.php b/vilesci/personen/personendetails.php
index a20e34c5d..684b21712 100644
--- a/vilesci/personen/personendetails.php
+++ b/vilesci/personen/personendetails.php
@@ -153,7 +153,7 @@ echo "<tr><td align='right'>Name:</td><td> $person->titelpre $person->nachname $
 echo "<tr><td align='right'>Geburtsdatum:</td><td> ".$datum_obj->formatDatum($person->gebdatum,'d.m.Y')."</td></tr>";
 echo "<tr><td align='right'>Geschlecht:</td><td> ".$person->geschlecht."</td></tr>";
 echo "<tr valign='top'><td align='right'>Anmerkung:</td><td width='800px'> ".$db->convert_html_chars($person->anmerkungen)."</td></tr>";
-echo "<tr valign='top'><td align='right'>Zugangscode:</td><td width='800px'>".(in_array('bewerbung', (explode(';', ACTIVE_ADDONS)))?"<a href='".CIS_ROOT."addons/bewerbung/cis/registration.php?code=".$db->convert_html_chars($person->zugangscode)."&emailAdresse=".$email."' target='_blank'>".$db->convert_html_chars($person->zugangscode)."</a>":$db->convert_html_chars($person->zugangscode))."</td></tr>";
+echo "<tr valign='top'><td align='right'>Zugangscode:</td><td width='800px'>".(in_array('bewerbung', (explode(';', ACTIVE_ADDONS)))?"<a href='".CIS_ROOT."addons/bewerbung/cis/registration.php?code=".$db->convert_html_chars($person->zugangscode)."&emailAdresse=".$email."&keepEmailUnverified=true' target='_blank'>".$db->convert_html_chars($person->zugangscode)."</a>":$db->convert_html_chars($person->zugangscode))."</td></tr>";
 echo '</table>';
 
 echo '<br><a href="../fhausweis/search.php?person_id='.$person->person_id.'">Statusinformation - FH Ausweis</a><br>';

From fbb00a2616ee5294ca99a41a7b6a8faf343c43c0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 08:52:40 +0200
Subject: [PATCH 0361/1357] Tab Abschlusspruefung

- set textfield protokoll readonly
- update: add updatevon, updateamum
- selectedFields vorsitz, pruefer: set default null
---
 .../api/frontend/v1/stv/Abschlusspruefung.php          |  4 ++--
 .../Details/Abschlusspruefung/Abschlusspruefung.js     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index 54a0e3278..da9e79d16 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -333,8 +333,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'protokoll' => $formData['protokoll'],
 				'note' => $formData['note'],
 				'anmerkung' => $formData['anmerkung'],
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID()
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
 			]
 		);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index ab9c5134a..5184de62d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -279,17 +279,16 @@ export default {
 			this.getStudiengangByKz();
 		},
 		selectedVorsitz(newVal) {
-			this.formData.vorsitz = newVal?.mitarbeiter_uid || '';
-			console.log("newVal: " + newVal.mitarbeiter_uid);
+			this.formData.vorsitz = newVal?.mitarbeiter_uid || null;
 		},
 		selectedPruefer1(newVal) {
-			this.formData.pruefer1 = newVal?.person_id || '';
+			this.formData.pruefer1 = newVal?.person_id || null;
 		},
 		selectedPruefer2(newVal) {
-			this.formData.pruefer2 = newVal?.person_id || '';
+			this.formData.pruefer2 = newVal?.person_id || null;
 		},
 		selectedPruefer3(newVal) {
-			this.formData.pruefer3 = newVal?.person_id || '';
+			this.formData.pruefer3 = newVal?.person_id || null;
 		}
 	},
 	methods: {
@@ -753,6 +752,7 @@ export default {
 						v-model="formData.protokoll"
 						name="protokoll"
 						:rows= 10
+						readonly
 						>
 					</form-input>
 				</div>

From 19ef7c2ce1461b13c96ddfb155d974c81313f453 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 10:32:28 +0200
Subject: [PATCH 0362/1357] Tab Abschlusspruefung: bugfix printDocument

---
 public/js/api/factory/stv/abschlusspruefung.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/api/factory/stv/abschlusspruefung.js b/public/js/api/factory/stv/abschlusspruefung.js
index e318d0d37..db8403b48 100644
--- a/public/js/api/factory/stv/abschlusspruefung.js
+++ b/public/js/api/factory/stv/abschlusspruefung.js
@@ -105,7 +105,7 @@ export default {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/abschlusspruefung/checkForExistingExams/',
-			params: { uid }
+			params: { uids }
 		};
 	},
 	getAllMitarbeiter(){

From 414e4c95651e5e6b943ee424a9a9f33ba9c3a935 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 11:39:16 +0200
Subject: [PATCH 0363/1357] Tab Abschlusspruefung: add Berechtigungen
 Studiengang backend: insert, update, delete

---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index da9e79d16..d8bc067f9 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -40,6 +40,51 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel');
+
+
+		//Permission checks for Studiengangsarray
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+		if ($this->router->method == 'insertAbschlusspruefung' || $this->router->method == 'updateAbschlusspruefung')
+		{
+			$student_uid = $this->input->post('uid') ?: ($this->input->post('formData')['student_uid'] ?? null);
+
+			if(!$student_uid)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteAbschlusspruefung')
+		{
+			$abschlusspruefung_id = $this->input->post('id');
+
+			if(!$abschlusspruefung_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Abschlusspruefung ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$result = $this->AbschlusspruefungModel->load(
+				array('abschlusspruefung_id' => $abschlusspruefung_id)
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+			$student_uid = current($data)->student_uid;
+
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+	}
+
+	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 $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		}
 	}
 
 	public function getAbschlusspruefung($student_uid)

From 1c29bcd685d1b5a78383274738d52c12fa1d2dcc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 11:40:18 +0200
Subject: [PATCH 0364/1357] feature(LvPlan Feiertage): adds endpoint to fetch
 feiertage and adds renderer components for the feiertage in the LvPlan

---
 .../controllers/api/frontend/v1/LvPlan.php    | 24 +++++++-
 application/core/Events.php                   | 10 ++++
 application/libraries/StundenplanLib.php      | 60 +++++++++++++++++++
 public/css/Cis4/CoreCalendarEvents.css        | 54 ++++++++++++++++-
 .../Cis/Renderer/Feiertage/calendarEvent.js   | 14 +++++
 .../Cis/Renderer/Feiertage/modalContent.js    | 21 +++++++
 .../Cis/Renderer/Feiertage/modalTitle.js      | 11 ++++
 system/phrasesupdate.php                      | 20 +++++++
 8 files changed, 208 insertions(+), 6 deletions(-)
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/modalContent.js
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/modalTitle.js

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 07435c9e5..3e0bf3d50 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -102,19 +102,37 @@ class LvPlan extends FHCAPI_Controller
 				'username' => getAuthUID()
 			]
 		);
+
+		$lvAndMoodleEvents = array_merge($lvplan_events,$moodle_events);
+
+		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$current_Studiensemester = $this->StudiensemesterModel->getAkt();
+		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
+		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
+		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
+		$studiengang = $this->getDataOrTerminateWithError($studiengang);
+		$studiengang = current($studiengang)->studiengang_kz;
+
+		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
 		
-		$result = array_merge($lvplan_events,$moodle_events);
+		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
 		// sort array with moodle events first
-		usort($result, function($a, $b){
+		usort($lvAndMoodleEvents, function($a, $b){
 			if ($a->type === 'moodle' && $b->type !== 'moodle') {
 				return -1;
 			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
 				return 1;
+			} elseif ($a->type === 'ferien' && ($b->type !== 'moodle' && $b->type !== 'ferien')) {
+				return -1;
+			} elseif (($a->type !== 'ferien' && $a->type !== 'moodle') && $b->type === 'ferien') {
+				return 1;
 			} else {
 				return 0;
 			}
 		});
-		$this->terminateWithSuccess($result);
+
+		$this->terminateWithSuccess($allEvents);
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
diff --git a/application/core/Events.php b/application/core/Events.php
index 9ad474fc5..b689a99d3 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -23,4 +23,14 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
+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'
+	);
+});
+
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 8cb37658e..b2c82fd77 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -254,6 +254,66 @@ class StundenplanLib{
 		}
 	}
 
+	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz){
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('organisation/Ferien_model','FerienModel');
+		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
+		SELECT * 
+		FROM lehre.tbl_ferien
+		WHERE (bisdatum BETWEEN ? AND ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		",[$start_date, $end_date, $studiengang_kz]);
+
+		if (isError($ferienEvents)) {
+			return error(getData($ferienEvents));
+		}
+		$ferienEvents = getData($ferienEvents);
+
+		$ferienEvents = array_map(function($event){
+			$event_start = new DateTime($event->vondatum);
+			$event_end = new DateTime($event->bisdatum);
+			$event_end->modify('+1 day');
+
+			$interval = new DateInterval('P1D');
+			$period = new DatePeriod($event_start, $interval, $event_end);
+			$event->dates = array_map(function($date){
+				return $date->format('Y-m-d');
+			}, iterator_to_array($period));
+			return $event;
+		}, $ferienEvents);
+
+		$ferienEventsFlattened=[];
+		foreach($ferienEvents as $ferien_event){
+			foreach($ferien_event->dates as $date){
+				$event = new stdClass();
+				$event->bezeichnung = $ferien_event->bezeichnung;
+				$event->datum = $date;
+				$event->type = 'ferien';
+				$ferienEventsFlattened[] = $event;
+			}
+		};
+
+		$today=new DateTime();
+		$ferienEventsFlattened = array_map(function($event) use($today){
+			$ferien_event = (object) array(
+				'type' => 'ferien',
+				'beginn' => $today->format('H:i:s'),
+				'ende' => $today->format('H:i:s'),
+				'allDayEvent' => true,
+				'datum' => $event->datum,
+				'topic' => $event->bezeichnung,
+				'titel' => $event->bezeichnung,
+				'farbe' => '00689E'
+				
+			);
+			return $ferien_event;
+		}, $ferienEventsFlattened);
+		 
+
+		return $ferienEventsFlattened;
+	}
+
+	// start of the private functions ########################################################################################################
+
 	// function used to sort an array of studiensemester strings
 	private function sortStudienSemester(&$semester_range){
 		usort(
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 17dc817ef..99dd58b49 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,4 +1,4 @@
-/* Moodle Events in Month Page */
+/* Lehreinheits Events in Month Page */
 .monthPageContainer .lehreinheitEventContent{
 	display: flex;
 	border-bottom: 1px solid var(--bs-border-color);	
@@ -24,7 +24,7 @@
 	display:none;
 }
 
-/* Moodle Events in Week Page */
+/* Lehreinheits Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
 	grid-template-columns: auto 1fr;
@@ -50,7 +50,7 @@
 
 }
 
-/* Moodle Events in Day Page */
+/* Lehreinheits Events in Day Page */
 .dayPageContainer .lehreinheitEventContent {
 	display: flex;
 	padding-left:4rem;
@@ -72,3 +72,51 @@
 	font-weight: 500;
 }
 
+/* Ferientage Events in Month Page */
+.monthPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items:center;
+	color: var(--fhc-light);
+}
+
+.monthPageContainer .feiertagEventContent #ferienEventIcon{
+	margin: 0.5rem;
+}
+
+.monthPageContainer .feiertagEventContent #ferienEventTitle {
+
+}
+
+/* Ferientage Events in Week Page */
+.weekPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items:center;
+	color: var(--fhc-light);
+}
+
+.weekPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0.25rem;
+}
+
+.weekPageContainer .feiertagEventContent #ferienEventTitle {
+	
+}
+
+/* Ferientage Events in Day Page */
+.dayPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
+
+.dayPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0.5rem;
+}
+
+.dayPageContainer .feiertagEventContent #ferienEventTitle {}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
new file mode 100644
index 000000000..b3367b64e
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -0,0 +1,14 @@
+
+export default {
+	props: {
+		event: {
+			type: Object,
+			required: true,
+		},
+	},
+	template: `
+		<div class="feiertagEventContent " >
+			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
+			<span id="ferienEventTitle" ><strong>{{event.titel}}</strong></span>
+		</div>`,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/modalContent.js b/public/js/components/Cis/Renderer/Feiertage/modalContent.js
new file mode 100644
index 000000000..aa0db470c
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/modalContent.js
@@ -0,0 +1,21 @@
+import { formatDate } from "../../../../helpers/DateHelpers.js"
+
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		},
+		
+	},
+	methods:{
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template: `
+	<div>
+	<h2>{{event.titel ? event.titel : event.topic}}</h2>
+	<p><i id="ferienEventIcon" class="fa-regular fa-calendar me-2"></i>{{methodFormatDate(event?.datum)}}</p>
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/modalTitle.js b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js
new file mode 100644
index 000000000..59feee375
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js
@@ -0,0 +1,11 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div>{{ $p.t('global','feiertag') }}</div>
+`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 43913661a..6aeeca9cd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -188,6 +188,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'feiertag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Feiertag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Holiday',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 1c73fdc83c18dba48755dec89ef6a68ba1464b98 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 30 Jun 2025 13:12:21 +0200
Subject: [PATCH 0365/1357] phrasen

---
 system/phrasesupdate.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8ee5685d6..bb8a09605 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31692,7 +31692,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten gefunden für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32376,6 +32376,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentenInLVTeil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten in LV-Teil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students in teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 5b10c87e9bbf8c59cdf353b3227077858dbbd5c4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 14:31:05 +0200
Subject: [PATCH 0366/1357] update(LvPlan Feiertage):if loggedin person does
 not have a studiengang, only consider studiengang 0

---
 application/controllers/api/frontend/v1/LvPlan.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 3e0bf3d50..63ca5b159 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -112,7 +112,11 @@ class LvPlan extends FHCAPI_Controller
 		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
 		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
 		$studiengang = $this->getDataOrTerminateWithError($studiengang);
-		$studiengang = current($studiengang)->studiengang_kz;
+		if(!empty($studiengang)){
+			$studiengang = current($studiengang)->studiengang_kz;
+		}else{
+			$studiengang = 0;
+		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
 		

From ed17e87afd2f9ded0daffe31ad1da4434692f807 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 14:51:42 +0200
Subject: [PATCH 0367/1357] dbupdate create Cis40 dashboard if it does not
 exist, 61730_Dashboard_Anpassungen only output message if something was
 updated

---
 system/dbupdate_3.4.php                       |   1 +
 system/dbupdate_3.4/25999_C4_dashboard.php    | 352 ++++++++++++++++++
 .../61730_Dashboard_Anpassungen.php           |   7 +-
 3 files changed, 359 insertions(+), 1 deletion(-)
 create mode 100644 system/dbupdate_3.4/25999_C4_dashboard.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 8ff7fab2b..feccdb0f1 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,7 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 
 
diff --git a/system/dbupdate_3.4/25999_C4_dashboard.php b/system/dbupdate_3.4/25999_C4_dashboard.php
new file mode 100644
index 000000000..aab20089c
--- /dev/null
+++ b/system/dbupdate_3.4/25999_C4_dashboard.php
@@ -0,0 +1,352 @@
+<?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:
+ * CIS 4.0 Dashboard
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add widget: Hallo Welt
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'hallowelt';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Hallo Welt"<br>';
+		}
+	}
+}
+
+// Add widget: News
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'news';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "News"<br>';
+		}
+	}
+}
+
+// Add widget: Bookmark
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'url';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Bookmark"<br>';
+		}
+	}
+}
+
+// Add widget: Ampel
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'ampel';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Ampel"<br>';
+		}
+	}
+}
+
+// update stundenplan widget
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'stundenplan';"))
+{
+	if($db->db_num_rows($result) > 0)
+	{
+		$qry = <<<EOWHW
+			UPDATE 
+				dashboard.tbl_widget 
+			SET
+				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 
+			WHERE
+				widget_kurzbz = 'stundenplan';
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Renamed Widget "Stundenplan" to "LV-Plan"<br>';
+		}
+	}
+}
+
+// Add widget: LV-Plan
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'lvplan';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "LV-Plan"<br>';
+		}
+	}
+}
+
+// Add widget: Studiengang
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'studiengang';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'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
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Studiengang"<br>';
+		}
+	}
+}
+
+// Add dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard WHERE dashboard_kurzbz = 'CIS';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO dashboard.tbl_dashboard(dashboard_kurzbz, beschreibung) VALUES('CIS', 'CIS 4.0 Dashboard');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard: Added Dashboard "CIS"<br>';
+        }
+
+		$widgetmappingqry = <<<EOWMQ
+			insert into 
+				dashboard.tbl_dashboard_widget (
+					dashboard_id, 
+					widget_id
+				) 
+				(
+					select 
+						td.dashboard_id, tw.widget_id 
+					from 
+						dashboard.tbl_dashboard td 
+					cross join 
+						dashboard.tbl_widget tw 
+					where 
+						td.dashboard_kurzbz = 'CIS' 
+						and 
+						tw.widget_kurzbz in ('hallowelt', 'news', 'url', 'ampel', 'studiengang')
+					order by td.dashboard_id, tw.widget_id
+				) 
+			ON CONFLICT (dashboard_id, widget_id) DO NOTHING
+EOWMQ;
+
+        if(!$db->db_query($widgetmappingqry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_widget '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard_widget: Added WidgetMapping for Dashboard "CIS"<br>';
+        }
+    }
+}
+
+// Add general preset for dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard_preset WHERE funktion_kurzbz IS NULL AND dashboard_id = (select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS');"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = <<<EOGP
+			insert into 
+				dashboard.tbl_dashboard_preset (
+					dashboard_id,
+					funktion_kurzbz,
+					preset
+				)
+				values (
+					(select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS'),
+					NULL,
+					(SELECT '{"general": {"widgets": {"2ad7f459a8218ae39f0b68201a9545a4": {"place": {"4": {"h": 2, "w": 3, "x": 0, "y": 0}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'news')  || ', "widgetid": "2ad7f459a8218ae39f0b68201a9545a4"}, "4590326a80c27e61d861b18b46858084": {"place": {"4": {"h": 1, "w": 1, "x": 3, "y": 2}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'lvplan')  || ', "widgetid": "4590326a80c27e61d861b18b46858084"}, "8ec3f441d4adc9dd2bc5cc14a663eae9": {"place": {"4": {"h": 1, "w": 1, "x": 0, "y": 2}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'url')  || ', "widgetid": "8ec3f441d4adc9dd2bc5cc14a663eae9"}, "e4214d3f2bed8740d4c9cede165ccd07": {"place": {"4": {"h": 2, "w": 1, "x": 3, "y": 0}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'ampel')  || ', "widgetid": "e4214d3f2bed8740d4c9cede165ccd07"}}}}')::jsonb
+				)
+EOGP;
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard_preset: Added General Preset for Dashboard "CIS"<br>';
+        }
+	}
+}
+
+// Add general preset for dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard_preset WHERE funktion_kurzbz = 'Student' AND dashboard_id = (select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS');"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = <<<EOGP
+			insert into 
+				dashboard.tbl_dashboard_preset (
+					dashboard_id,
+					funktion_kurzbz,
+					preset
+				)
+				values (
+					(select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS'),
+					'Student',
+					(SELECT '{"Student": {"widgets": {"3c448b2a774ff361bf59516ef0b841ef": {"place": {"4": {"h": 1, "w": 1, "x": 3, "y": 0}}, "config": [], "preset": 1, "widget": 6, "widgetid": "3c448b2a774ff361bf59516ef0b841ef"}, "83808e47ccf95db1afb4fe014d221ca9": {"place": {"4": {"h": 1, "w": 1, "x": 0, "y": 0}}, "config": {}, "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'studiengang')  || ', "widgetid": "83808e47ccf95db1afb4fe014d221ca9"}}}}')::jsonb
+				)
+EOGP;
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            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/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
index e59df948a..60ad958a6 100644
--- a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -1,7 +1,9 @@
 <?php
 
+$rowcount = 0;
 $result = @$db->db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'");
 $result_num_rows = $db->db_num_rows($result);
+$rowcount += $result_num_rows;
 $errorList = array();
 for($i = 0; $i < $result_num_rows; $i++)
 {
@@ -26,6 +28,7 @@ for($i = 0; $i < $result_num_rows; $i++)
 
 $result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'");
 $result_num_rows = $db->db_num_rows($result);
+$rowcount += $result_num_rows;
 for($i = 0; $i < $result_num_rows; $i++)
 {
 	$row = $db->db_fetch_object($result, $i);
@@ -48,7 +51,9 @@ for($i = 0; $i < $result_num_rows; $i++)
 }
 
 if(empty($errorList)){
-	echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
+	if($rowcount > 0) {
+		echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
+	}
 }
 else{
 	foreach($errorList as $error){

From 9c30b5438fd5f21cb1fed774752d1822bd8f369a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 15:07:16 +0200
Subject: [PATCH 0368/1357] update(StundenplanLib StundenplanQuery): removes
 the ort_kurzbz from the group by because the ort_kurzbz should be grouped in
 the aggregate function

---
 application/models/ressource/Stundenplan_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..672bacfc3 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -178,7 +178,7 @@ class Stundenplan_model extends DB_Model
 
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		ORDER BY datum, beginn
 		");
@@ -235,7 +235,7 @@ class Stundenplan_model extends DB_Model
 			
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		ORDER BY datum, beginn
 		", [$start_date, $end_date, $lv_id]);
@@ -292,7 +292,7 @@ class Stundenplan_model extends DB_Model
 		
 			) as subquery
 		
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}

From 83ac1abcf6ae876319ed90446a790135bed4b2b9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 15:26:25 +0200
Subject: [PATCH 0369/1357] update(LvPlan Events): overflow css fix for the
 LvPlan Events

---
 public/css/Cis4/CoreCalendarEvents.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 99dd58b49..1611ac123 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -44,9 +44,9 @@
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
 	flex-direction: column;
-	place-content: center space-evenly;
-	flex-wrap: wrap;
 	column-gap: 5px;
+	overflow-y: scroll;
+	min-height:0;
 
 }
 

From 986d1cfb5fde770bf18a96159cbffc45b244b83f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 17:02:45 +0200
Subject: [PATCH 0370/1357] add aria-label to skip link and raumsuche tabulator
 links, move skip link to html body, change raumsuche h2 to h1

---
 application/helpers/hlp_header_helper.php       |  2 +-
 application/views/templates/FHC-Header.php      |  5 +++--
 public/js/components/Cis/Raumsuche/Raumsuche.js | 14 ++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index cbc1319c7..24c02eac5 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -243,6 +243,6 @@ function generateSkipLink($skipID)
 {
 	$toPrint = '<a id="skiplink" href="';
 	$toPrint.=$skipID;
-	$toPrint.='" class="fhcSkipLink"></a>';
+	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index e486ac8f9..f7b5491a1 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -16,8 +16,7 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<?php if($skipID) generateSkipLink($skipID); ?>
-		
+
 		<title><?php printPageTitle($title); ?></title>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -139,5 +138,7 @@
 	</head>
 	<body>
 
+		<?php if($skipID) generateSkipLink($skipID); ?>
+
 <!-- Header end -->
 
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index ab2ceb563..978e92407 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -56,7 +56,7 @@ export const Raumsuche =  {
 					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
 					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('rauminfo/raumInfo')),
+					{title: Vue.computed(() => this.$p.t('rauminfo/rauminfo')),
 						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
 						field: 'linkRes', formatter: this.linkFormatter, widthGrow: 1}
@@ -87,10 +87,16 @@ export const Raumsuche =  {
 			this.tableBuiltResolve = resolve
 		},
 		linkFormatter(cell) {
-			const val = cell.getValue()
+			const val = cell.getValue();
+			const field = cell.getField();
+			const arialabel = (field === 'linkInfo') 
+							? this.$p.t('rauminfo/rauminfo') 
+							: this.$p.t('rauminfo/roomReservations');
 			if(val) {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a></div>'
+				'<a href="'+val+'" aria-label="' + arialabel + '">' +
+				'<i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i>' +
+				'</a></div>'
 			} else {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'-</div>'
@@ -192,7 +198,7 @@ export const Raumsuche =  {
 		this.setupMounted()
 	},
 	template: `
-	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
+	<h1 class="h3">{{$p.t('lvplan/raumsuche')}}</h1>
 	<hr>
 	<div class="row">
 		<div class="col-12 col-lg-2">

From 34220a8f390a7b454875e7ee51133ccdd31c7f8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 17:10:13 +0200
Subject: [PATCH 0371/1357] add alt text to profile picture

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

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 99a281ec4..7a2d174ee 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -98,7 +98,7 @@ export default {
 		this.fetchMenu();
 	},
 	mounted(){
-		this.$p.loadCategory(['ui', 'global'])
+		this.$p.loadCategory(['ui', 'global', 'profilUpdate'])
 		this.navUserDropdown = new bootstrap.Collapse(this.$refs.navUserDropdown,{
 			toggle: false
 		});
@@ -118,7 +118,7 @@ export default {
     </div>
 	<div id="nav-user">
 		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-			<img :src="avatarUrl" class="bg-dark avatar rounded-circle border border-dark"/>
+			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
 		</button>
 		<ul ref="navUserDropdown"
 		@[\`shown.bs.collapse\`]="handleShowNavUser"

From e9614e8ca8fe4858cd627ada4864b1e8804c7c93 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 1 Jul 2025 12:12:48 +0200
Subject: [PATCH 0372/1357] add css classes searchbar_label and searchbar_value
 to improve responsiveness of results in Cis4

---
 public/js/components/searchbar/result/dms.js  | 16 ++++-----
 .../components/searchbar/result/employee.js   | 16 ++++-----
 .../searchbar/result/mergedperson.js          | 36 +++++++++----------
 .../searchbar/result/organisationunit.js      | 16 ++++-----
 .../js/components/searchbar/result/person.js  |  8 ++---
 .../components/searchbar/result/prestudent.js | 24 ++++++-------
 public/js/components/searchbar/result/room.js | 18 +++++-----
 .../js/components/searchbar/result/student.js | 16 ++++-----
 8 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 75b281541..8516c1555 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -46,26 +46,26 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_dms_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_dms_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.dms_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_version') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_version') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.version }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_keywords') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_keywords') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.keywords }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('global/beschreibung') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('global/beschreibung') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.description }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index a86fc6cbf..b86aa3ca5 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -21,8 +21,8 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_stdkst') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_stdkst') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
 						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
 					</ul>
@@ -30,8 +30,8 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('lehre/organisationseinheit') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/organisationseinheit') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
 						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
 					</ul>
@@ -39,16 +39,16 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a :href="'mailto:' + res.email" class="d-block">
 						{{ res.email }}
 					</a>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/telefon') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/telefon') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a :href="'tel:' + res.phone" class="d-block">
 						{{ res.phone }}
 					</a>
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index fb9684303..f02febf6f 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -68,14 +68,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ person.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
@@ -95,8 +95,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_stdkst') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_stdkst') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
 							<li
 								v-for="(stdkst, idx) in employee.standardkostenstelle"
@@ -109,8 +109,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
 							<li
 								v-for="(oe, idx) in employee.organisationunit_name"
@@ -123,8 +123,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('person/telefon') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('person/telefon') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<a :href="telurl">
 							{{ employee.phone }}
 						</a>
@@ -152,26 +152,26 @@ export default {
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/studiengang') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.prestudent_id }}
 						</div>
 					</div>
 					<div v-if="student.uid" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_student_uid') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_student_uid') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.uid }}
 						</div>
 					</div>
 					<div v-if="student.matrikelnr" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('person/matrikelnummer') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('person/matrikelnummer') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.matrikelnr }}
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 1d9c03b08..66dda9726 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -20,15 +20,15 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_parent_oe') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_parent_oe') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.parentoe_name }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_group_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-if="res.mailgroup" :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
 					</a>
@@ -37,8 +37,8 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_leader') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_leader') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
 						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
 					</ul>
@@ -47,8 +47,8 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_number_of_employees') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_number_of_employees') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.number_of_people }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f6ce0a5f0..f255caffe 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -26,14 +26,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 7852bbe57..574f9c4fb 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -41,40 +41,40 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
 			</div>
 			<div v-if="res.uid" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_student_uid') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div v-if="res.matrikelnr" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/matrikelnummer') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_prestudent_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_prestudent_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.prestudent_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/studiengang') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.bezeichnung }} {{ res.orgform ? '(' + res.orgform + ')' : '' }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 8a7d8c124..03c59deb5 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -39,18 +39,18 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_room_address') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_room_address') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ address }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
-				<div v-if="mode == 'simple'" class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_workplaces') }}</div>
+				<div v-if="mode == 'simple'" class="searchbar_tablecell searchbar_value">
 					{{ res.sitzplaetze }}
 				</div>
-				<div v-else class="searchbar_tablecell">
+				<div v-else class="searchbar_tablecell searchbar_value">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
 						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
@@ -61,15 +61,15 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_building') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_building') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.building }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_equipment') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<div v-if="mode == 'simple'" class="no-margin-paragraphs" v-html="res.austattung.replace('<br />','')"></div>
 					<div v-else class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 1d6eb2a61..6a38ba9bc 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -36,26 +36,26 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_student_uid') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/matrikelnummer') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>

From c353e854e8cacffc2490db255932ec87c1f9be1e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 1 Jul 2025 14:32:33 +0200
Subject: [PATCH 0373/1357] Tab Anrechnungen/Exemptions

- bugfix handle overflow in textfield of Notiz
- bugfix delete: remove anrechnung_id also from lehre.tbl_anrechnung_anrechnungstatus
- redesign Notizen of Anrechnungen: header with title Lehrveranstaltungen
- add reload functionality to update count of notizen in action buttons
---
 .../api/frontend/v1/stv/Anrechnungen.php      | 15 +++++++++++++
 .../Anrechnunganrechnungstatus_model.php      | 14 ++++++++++++
 public/css/Studentenverwaltung.css            |  3 ++-
 public/css/components/Notiz.css               | 22 ++++++++++++++++++-
 public/js/components/Notiz/Notiz.js           | 19 ++++++++++++----
 .../Details/Anrechnungen/Anrechnungen.js      | 12 ++++++++--
 6 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 application/models/education/Anrechnunganrechnungstatus_model.php

diff --git a/application/controllers/api/frontend/v1/stv/Anrechnungen.php b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
index 85019334f..251e2d5bd 100644
--- a/application/controllers/api/frontend/v1/stv/Anrechnungen.php
+++ b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
@@ -157,6 +157,7 @@ class Anrechnungen extends FHCAPI_Controller
 
 	public function loadAnrechnung($anrechnung_id)
 	{
+		$this->AnrechnungsModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'ON (lv.lehrveranstaltung_id = lehre.tbl_anrechnung.lehrveranstaltung_id)');
 		$result = $this->AnrechnungsModel->loadWhere(
 			array('anrechnung_id' => $anrechnung_id)
 		);
@@ -231,11 +232,25 @@ class Anrechnungen extends FHCAPI_Controller
 
 	public function deleteAnrechnung($anrechnung_id)
 	{
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		//delete anrechnung_id of table tbl_anrechnung_anrechnungstatus
+		$this->load->model('education/Anrechnunganrechnungstatus_model','AnrechnungAnrechnungstatusModel');
+		$result = $this->AnrechnungAnrechnungstatusModel->delete(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+		$this->getDataOrTerminateWithError($result);
+
+		//delete anrechnung_id of table tbl_anrechnung
 		$result = $this->AnrechnungsModel->delete(
 			array('anrechnung_id' => $anrechnung_id)
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_commit();
+
 		$this->terminateWithSuccess($data);
 	}
 }
diff --git a/application/models/education/Anrechnunganrechnungstatus_model.php b/application/models/education/Anrechnunganrechnungstatus_model.php
new file mode 100644
index 000000000..68b319506
--- /dev/null
+++ b/application/models/education/Anrechnunganrechnungstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+
+class Anrechnunganrechnungstatus_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_anrechnung_anrechnungstatus';
+		$this->pk = 'anrechnungstatus_id';
+	}
+}
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index d39cfc9b1..0b62e2809 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -58,7 +58,8 @@ html {
 	overflow: visible !important;
 }
 
-.tabulator-cell {
+/* to avoid interference with Notiz.css and overflow for textfield */
+.stv-details-abschlusspruefung .tabulator-cell {
 	overflow: visible !important;
 }
 
diff --git a/public/css/components/Notiz.css b/public/css/components/Notiz.css
index 75c69ec80..badfa4538 100644
--- a/public/css/components/Notiz.css
+++ b/public/css/components/Notiz.css
@@ -3,4 +3,24 @@
 }
 .notizText {
     color: darkblue;
-}
\ No newline at end of file
+}
+
+/* Enforce content clipping in the scrollable section */
+.tabulator .tabulator-tableHolder {
+    overflow-x: hidden;
+    position: relative;
+}
+
+.tabulator .tabulator-table {
+    overflow-x: hidden;
+    table-layout: fixed;
+    width: 100%;
+}
+
+.tabulator .tabulator-cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+}
+
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 44cc56374..0d180d2ff 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -81,6 +81,7 @@ export default {
 						title: "Text",
 						field: "text_stripped",
 						width: 250,
+						clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -174,6 +175,7 @@ export default {
 					}],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
+				responsiveLayout: "collapse",
 				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
@@ -200,10 +202,6 @@ export default {
 							title: this.$p.t('global', 'titel'),
 							//visible: this.showVariables.showTitel
 						});
-						cm.getColumnByField('text_stripped').component.updateDefinition({
-							title: this.$p.t('global', 'text'),
-							//visible: this.showVariables.showText
-						});
 						cm.getColumnByField('bearbeiter').component.updateDefinition({
 							title: this.$p.t('notiz', 'bearbeiter'),
 							visible: this.showVariables.showBearbeiter
@@ -250,6 +248,16 @@ export default {
 						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
 						});
+
+						cm.getColumnByField('text_stripped').component.updateDefinition({
+							title: this.$p.t('global', 'text'),
+							width: 250,
+							tooltip: true,
+							clipContents: true,
+						});
+
+						// Force layout recalculation for handling overflow text
+						this.$refs.table.tabulator.redraw(true);
 					}
 				}
 			],
@@ -355,6 +363,7 @@ export default {
 						this.$refs.NotizModal.hide();
 					}
 					this.reload();
+					this.$emit('reload');
 				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -367,6 +376,7 @@ export default {
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.reload();
+					this.$emit('reload');
 					this.resetFormData();
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -410,6 +420,7 @@ export default {
 						this.$refs.NotizModal.hide();
 					}
 					this.reload();
+					this.$emit('reload');
 				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 23e3819ff..abe5d177d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -182,6 +182,7 @@ export default {
 		},
 		addNote(anrechnung_id){
 			this.currentAnrechnung_id = anrechnung_id;
+			this.loadAnrechnung(this.currentAnrechnung_id);
 			this.showNotizen = true;
 		},
 		addNewAnrechnung(){
@@ -266,6 +267,9 @@ export default {
 		reload() {
 			this.$refs.table.reloadTable();
 		},
+		handleReload(){
+			this.reload();
+		},
 		resetForm(){
 			this.formData = {};
 			this.statusNew = true;
@@ -303,7 +307,7 @@ export default {
 					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
 					
 					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
-							<div class="justify-content-end pb-3">
+							<!-- <div class="justify-content-end pb-3">
 								<form-input
 									container-class="form-switch"
 									type="checkbox"
@@ -312,7 +316,10 @@ export default {
 									@change="onSwitchHide"
 									>
 								</form-input>
-							</div>
+							</div> -->
+						<h6><strong>LV {{formData.lehrveranstaltung_id}}:
+							{{formData.bezeichnung}} | {{formData.bezeichnung_english}}</strong></h6>
+
 						<core-notiz
 							:endpoint="endpoint"
 							ref="formNotes"
@@ -322,6 +329,7 @@ export default {
 							show-document
 							show-tiny-mce
 							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+							@reload="handleReload"
 							>
 						</core-notiz>
 					

From 9315503ec162fdd799e98eb3b45e28a2ea3b8146 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 1 Jul 2025 15:46:09 +0200
Subject: [PATCH 0374/1357] Header: use comma in name only if posttitel exists

---
 public/js/components/DetailHeader/DetailHeader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0b50c5153..96cd2e4b7 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -132,7 +132,8 @@ export default {
 						<h2 class="h4">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
-							{{headerData[0].nachname}},
+							{{headerData[0].nachname}}
+							<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
 

From bf1dac3fd9844d019cdc01d4f663062df71b92de Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Jul 2025 08:55:21 +0200
Subject: [PATCH 0375/1357] update(LvPlan Feiertage): checks if the query
 result is array before performing array operations and returns success status
 instead of raw data

---
 .../controllers/api/frontend/v1/LvPlan.php    |  2 +-
 .../controllers/api/frontend/v1/Studium.php   |  4 +-
 application/libraries/StundenplanLib.php      | 93 ++++++++++---------
 3 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 63ca5b159..69d08110a 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -119,7 +119,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
-		
+		$ferienEvents = $this->getDataOrTerminateWithError($ferienEvents);
 		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
 		// sort array with moodle events first
 		usort($lvAndMoodleEvents, function($a, $b){
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index e4cf9e6a3..23c6b87d5 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -311,9 +311,7 @@ SELECT tbl_lehrveranstaltung.*,
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
 		$this->load->library('StundenplanLib');
 		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
-		if(!$lektoren){
-			return [];
-		}
+		$lektoren = $this->getDataOrTerminateWithError($lektoren);
 		$lektoren = array_map(function($lektor){
 			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
 		},$lektoren);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index b2c82fd77..a16c8e02e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -176,7 +176,7 @@ class StundenplanLib{
 			},$lektoren);
 
 		}
-		return $lektoren;
+		return success($lektoren);
 	}
 
 	public function expand_object_information($data){
@@ -267,49 +267,56 @@ class StundenplanLib{
 			return error(getData($ferienEvents));
 		}
 		$ferienEvents = getData($ferienEvents);
+		
+		if(is_array($ferienEvents) && count($ferienEvents) > 0){
+			
+			$ferienEvents = array_map(function($event){
+				$event_start = new DateTime($event->vondatum);
+				$event_end = new DateTime($event->bisdatum);
+				$event_end->modify('+1 day');
+	
+				$interval = new DateInterval('P1D');
+				$period = new DatePeriod($event_start, $interval, $event_end);
+				$event->dates = array_map(function($date){
+					return $date->format('Y-m-d');
+				}, iterator_to_array($period));
+				return $event;
+			}, $ferienEvents);
+	
+			$ferienEventsFlattened=[];
+			foreach($ferienEvents as $ferien_event){
+				foreach($ferien_event->dates as $date){
+					$event = new stdClass();
+					$event->bezeichnung = $ferien_event->bezeichnung;
+					$event->datum = $date;
+					$event->type = 'ferien';
+					$ferienEventsFlattened[] = $event;
+				}
+			};
+	
+			$today=new DateTime();
+			$ferienEventsFlattened = array_map(function($event) use($today){
+				$ferien_event = (object) array(
+					'type' => 'ferien',
+					'beginn' => $today->format('H:i:s'),
+					'ende' => $today->format('H:i:s'),
+					'allDayEvent' => true,
+					'datum' => $event->datum,
+					'topic' => $event->bezeichnung,
+					'titel' => $event->bezeichnung,
+					'farbe' => '00689E'
+					
+				);
+				return $ferien_event;
+			}, $ferienEventsFlattened);
+			
+			return success($ferienEventsFlattened);
+		}
+		else{
+			return success([]);
+		}
 
-		$ferienEvents = array_map(function($event){
-			$event_start = new DateTime($event->vondatum);
-			$event_end = new DateTime($event->bisdatum);
-			$event_end->modify('+1 day');
-
-			$interval = new DateInterval('P1D');
-			$period = new DatePeriod($event_start, $interval, $event_end);
-			$event->dates = array_map(function($date){
-				return $date->format('Y-m-d');
-			}, iterator_to_array($period));
-			return $event;
-		}, $ferienEvents);
-
-		$ferienEventsFlattened=[];
-		foreach($ferienEvents as $ferien_event){
-			foreach($ferien_event->dates as $date){
-				$event = new stdClass();
-				$event->bezeichnung = $ferien_event->bezeichnung;
-				$event->datum = $date;
-				$event->type = 'ferien';
-				$ferienEventsFlattened[] = $event;
-			}
-		};
-
-		$today=new DateTime();
-		$ferienEventsFlattened = array_map(function($event) use($today){
-			$ferien_event = (object) array(
-				'type' => 'ferien',
-				'beginn' => $today->format('H:i:s'),
-				'ende' => $today->format('H:i:s'),
-				'allDayEvent' => true,
-				'datum' => $event->datum,
-				'topic' => $event->bezeichnung,
-				'titel' => $event->bezeichnung,
-				'farbe' => '00689E'
-				
-			);
-			return $ferien_event;
-		}, $ferienEventsFlattened);
-		 
-
-		return $ferienEventsFlattened;
+		
 	}
 
 	// start of the private functions ########################################################################################################

From 56e8a34d686b60d4d88c5d4963bcd6e879d0c040 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 2 Jul 2025 09:09:33 +0200
Subject: [PATCH 0376/1357] readd Phrasen Vertragsverwaltung

---
 system/phrasesupdate.php | 744 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 743 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..2dceba449 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,750 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// CONTRACT MANAGEMENT START
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'addVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuen Vertrag erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add new contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'editVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'addStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'editStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstatus löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'deleteLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftrag löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete teaching assignment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'datum_vertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'contract date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertrag_urfassung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrags-Urfassung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'original version of the contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'filter_offeneVertraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur offene Verträge anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show only open contracts',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_addOrUpdateLehrauftraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Hinzufügen bzw. Aktualisieren von Lehraufträgen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error while adding or updating teaching assignments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_insertOrUpdateStatusVertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Hinzufügen bzw. Aktualisieren des Vertragsstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error while adding or updating the contract status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'error_statusVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status bereits vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status already existing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragstyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragstyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsdatum_iso',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsdatum Iso',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Date Iso',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'vertrag_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsstunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsstunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract hours',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsstunden_studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'vertragsstunden Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract hours study semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'abgerechnet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abgerechnetr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'billed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'mitarbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'projektarbeit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Projekt work ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'pruefung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfung UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exam ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragErstellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag erstellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragDetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragdetails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract Status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNotValidDate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} hat kein gültiges Datumsformat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The input field {field} does not have a valid date format',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'text_explainLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die folgenden Lehraufträge sind noch keinem Vertrag zugeordnet. Markieren Sie die Lehraufträge um diese dem Vertrag zuzuordnen:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The following teaching assignments have not yet been assigned to a contract. Mark the teaching assignments to assign them to the contract:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'text_addLehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Folgende Lehraufträge werden hinzugefügt:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The following teaching assignments will be added:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Contract management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'nurAktiveMaAnzeigen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur aktive Mitarbeiter:innen anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show only active employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'printHonorarvertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Honorarvertrag drucken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Print fee agreement',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'alertMindestensZweiVertraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte mindestens 2 Verträge auswählen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select at least 2 contracts!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'alertOnlyApprovedContracts',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Verträge müssen genehmigt sein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All contracts must be approved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'vertragsarten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertragsarten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Types of Contracts',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'vertrag',
+		'phrase' => 'idsDienstverhaeltnisse',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'IDs Dienstverhältnis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'IDs employment relationship',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// CONTRACT MANAGEMENT END
 );
 
 

From 411b97fa14674c70a0fe87f2d6ade72edb31372e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 2 Jul 2025 11:54:32 +0200
Subject: [PATCH 0377/1357] reload Vertragsstatus if change of mitarbeiter

---
 .../api/frontend/v1/vertraege/Vertraege.php        | 14 +++++++++++++-
 public/js/api/factory/vertraege/vertraege.js       |  4 ++--
 public/js/components/Vertraege/List/Details.js     |  2 +-
 public/js/components/Vertraege/List/Status.js      | 12 +++++++++---
 public/js/components/Vertraege/Vertraege.js        |  1 +
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 0d4b06a30..04f1df69c 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -75,8 +75,20 @@ class Vertraege extends FHCAPI_Controller
 		$this->terminateWithSuccess((getData($result) ?: []));
 	}
 
-	public function getStatiOfContract($vertrag_id)
+	public function getStatiOfContract($person_id, $vertrag_id)
 	{
+		//check if vertrag_id corresponds with person_id and return null if not
+		$result = $this->VertragModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'person_id' => $person_id
+			)
+		);
+		if(!hasData($result))
+		{
+			$this->terminateWithSuccess([]);
+		}
+
 		$result = $this->VertragModel->getStatiOfContract($vertrag_id);
 
 		if (isError($result)) {
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
index 714856cfe..1eff24a6b 100644
--- a/public/js/api/factory/vertraege/vertraege.js
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -40,10 +40,10 @@ export default {
 			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractTypes/'
 		};
 	},
-	getStatiOfContract(vertrag_id){
+	getStatiOfContract(person_id, vertrag_id){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getStatiOfContract/' + vertrag_id
+			url: 'api/frontend/v1/vertraege/Vertraege/getStatiOfContract/' + person_id + '/' + vertrag_id
 		};
 	},
 	configPrintDocument() {
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index 47eb629a3..a8f50743a 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -198,7 +198,7 @@ export default {
 <!--	<div class="core-contracts-details vv">-->
 	<br>		
 		<h5>{{$p.t('vertrag', 'vertragDetails')}}</h5>
-	
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index fd3b9afd7..7427ac7af 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -18,6 +18,10 @@ export default {
 		},
 	},
 	props: {
+		person_id: {
+			type: [Number],
+			required: true
+		},
 		vertrag_id: {
 			type: [Number],
 			required: true
@@ -40,7 +44,7 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-					this.endpoint.getStatiOfContract(this.vertrag_id)
+					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
@@ -199,9 +203,11 @@ export default {
 		}
 	},
 	watch: {
+		person_id() {
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' +  this.person_id + '/' + this.vertrag_id);
+		},
 		vertrag_id() {
-			//this.reloadTable();
-			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + this.vertrag_id);
+			this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' +  this.person_id + '/' + this.vertrag_id);
 		},
 		formDataParent: {
 			handler(newVal, oldVal) {
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 202f517f3..27a154672 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -601,6 +601,7 @@ export default {
 				<!-- ContractStati -->
 				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
 					<contract-stati
+						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"
 						:listContractStati="listContractStati"
 						:formDataParent="contractFormData"

From 56bfe46675ff6281ca454073c486c55399b3e7fb Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 2 Jul 2025 12:10:28 +0200
Subject: [PATCH 0378/1357] Added phrases for lvevaluierung

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7c350c452..8ac45c0fa 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41915,6 +41915,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	// LVEVALUIERUNG ---------------------------------------------------------------------------------------------------
 	array(
 		'app' => 'lvevaluierung',
 		'category' => 'global',
@@ -42301,6 +42302,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'zeitLaeuftAb',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zeit läuft bald ab – zum Speichern bitte ‚Abschicken‘ klicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Time is running out — please click ‘Submit’ to save your answers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 31f0be35c876a39eb7d2bcfaae57039e9932dfa7 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 2 Jul 2025 12:53:54 +0200
Subject: [PATCH 0379/1357] selbe person auch wenn nicht abbrecher

---
 application/models/person/Person_model.php | 116 +++++++++------------
 1 file changed, 52 insertions(+), 64 deletions(-)

diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 997048972..3947378cf 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -307,72 +307,60 @@ class Person_model extends DB_Model
 
 	public function checkDuplicate($person_id)
 	{
-		$qry = "SELECT person_id
-				FROM public.tbl_prestudent p
-				JOIN
-				(
-					SELECT DISTINCT ON(prestudent_id) *
-					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id IN
-						(
-							SELECT prestudent_id
-							FROM public.tbl_prestudent
-							WHERE person_id IN
-							(
-								SELECT p2.person_id
-								FROM public.tbl_person p
-								JOIN public.tbl_person p2
-								ON lower(p.vorname) = lower(p2.vorname)
-								AND lower(p.nachname) = lower(p2.nachname)
-								AND p.gebdatum = p2.gebdatum
-								AND p.person_id = ?
-							)
-						)
-					ORDER BY prestudent_id, datum DESC, insertamum DESC
-				) ps USING(prestudent_id)
-				JOIN public.tbl_status USING(status_kurzbz)
+		$qry = "
+			WITH person AS (
+				SELECT *
+				FROM public.tbl_person
+				WHERE person_id = ?
+			),
+			allePersonen AS (
+				SELECT p.person_id
+				FROM public.tbl_person p
+					JOIN person
+						ON lower(p.vorname) = lower(person.vorname)
+						AND lower(p.nachname) = lower(person.nachname)
+						AND p.gebdatum = person.gebdatum
+			),
+			lastStatus AS (
+				SELECT DISTINCT ON (tbl_prestudentstatus.prestudent_id)
+					tbl_prestudentstatus.prestudent_id,
+					tbl_prestudentstatus.status_kurzbz,
+					tbl_prestudent.studiengang_kz,
+					tbl_prestudent.person_id
+				FROM public.tbl_prestudentstatus
+				JOIN public.tbl_prestudent USING (prestudent_id)
+				WHERE tbl_prestudent.person_id IN (SELECT person_id FROM allePersonen)
+				ORDER BY tbl_prestudentstatus.prestudent_id, tbl_prestudentstatus.datum DESC, tbl_prestudentstatus.insertamum DESC
+			),
+			interessenten AS (
+				SELECT *
+				FROM lastStatus
 				WHERE status_kurzbz = 'Interessent'
-				AND studiengang_kz IN
-				(
-					SELECT studiengang_kz
-					FROM public.tbl_prestudent p
-					JOIN
-					(
-						SELECT DISTINCT ON(prestudent_id) *
-						FROM public.tbl_prestudentstatus
-						WHERE prestudent_id IN
-						(
-							SELECT prestudent_id
-							FROM public.tbl_prestudent
-							WHERE person_id IN
-							(
-								SELECT p2.person_id
-								FROM public.tbl_person p
-								JOIN public.tbl_person p2
-								ON lower(p.vorname) = lower(p2.vorname)
-								AND lower(p.nachname) = lower(p2.nachname)
-								AND p.gebdatum = p2.gebdatum
-								AND p.person_id = ?
-							)
-						)
-						ORDER BY prestudent_id, datum DESC, insertamum DESC
-					) ps USING(prestudent_id)
-					JOIN public.tbl_status USING(status_kurzbz)
-					WHERE status_kurzbz = 'Abbrecher'
-				)
-
-				UNION
-
+			),
+			keineInteressenten AS (
+				SELECT *
+				FROM lastStatus
+				WHERE status_kurzbz != 'Interessent'
+			),
+			doppeltePerson AS (
 				SELECT p2.person_id
-				FROM tbl_person p1
-				JOIN tbl_prestudent ps ON p1.person_id = ps.person_id
-				INNER JOIN (
-					SELECT vorname, nachname, gebdatum, person.person_id
-					FROM tbl_person person
-					JOIN tbl_prestudent sps ON person.person_id = sps.person_id
-				) p2
-					ON (lower(p1.vorname) = lower(p2.vorname) AND lower(p1.nachname) = lower(p2.nachname) AND p1.gebdatum = p2.gebdatum)
-				WHERE p1.person_id != p2.person_id AND (p1.person_id = ?)";
+				FROM public.tbl_person p1
+				JOIN public.tbl_prestudent ps1 ON ps1.person_id = p1.person_id
+				JOIN public.tbl_person p2
+						ON  lower(p1.vorname) = lower(p2.vorname)
+						AND lower(p1.nachname) = lower(p2.nachname)
+						AND p1.gebdatum = p2.gebdatum
+				WHERE p1.person_id = ?
+				  AND p1.person_id <> p2.person_id
+			)
+			SELECT DISTINCT(interessenten.person_id)
+			FROM interessenten
+				JOIN keineInteressenten
+					ON interessenten.studiengang_kz = keineInteressenten.studiengang_kz
+			WHERE interessenten.person_id = ?
+			UNION
+			SELECT DISTINCT person_id
+			FROM doppeltePerson";
 
 		return $this->execQuery($qry, array($person_id, $person_id, $person_id));
 	}

From b4d5e1c90af64fdb0827565b9a2b1b181c125bcc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 2 Jul 2025 13:41:08 +0200
Subject: [PATCH 0380/1357] bugfix delete Vertragsdetails, add missing data
 updateamum, updatevon

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 04f1df69c..1b1022887 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -321,7 +321,9 @@ class Vertraege extends FHCAPI_Controller
 						'mitarbeiter_uid' => $row['mitarbeiter_uid']
 					],
 					[
-						'vertrag_id' => $vertrag_id
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
 					]
 				);
 
@@ -342,7 +344,9 @@ class Vertraege extends FHCAPI_Controller
 						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
 					],
 					[
-						'vertrag_id' => $vertrag_id
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
 					]
 				);
 
@@ -394,7 +398,9 @@ class Vertraege extends FHCAPI_Controller
 						'vertrag_id' => $vertrag_id
 					],
 					[
-						'vertrag_id' => null
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
 					]
 				);
 
@@ -423,7 +429,10 @@ class Vertraege extends FHCAPI_Controller
 						'vertrag_id' => $vertrag_id
 					],
 					[
-						'vertrag_id' => null
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+
 					]
 				);
 
@@ -570,13 +579,14 @@ class Vertraege extends FHCAPI_Controller
 
 		$status_result = $this->VertragvertragsstatusModel->update(
 			[
-			'vertrag_id' => $this->input->post('vertrag_id'),
-			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')],
+				'vertrag_id' => $this->input->post('vertrag_id'),
+				'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
+			],
 			[
-			'uid' => getAuthUID(),
-			'updateamum' => date('c'),
-			'updatevon' => getAuthUID(),
-			'datum' => $this->input->post('datum')
+				'uid' => getAuthUID(),
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID(),
+				'datum' => $this->input->post('datum')
 			]
 		);
 
@@ -591,7 +601,7 @@ class Vertraege extends FHCAPI_Controller
 	{
 		$lehreinheit_id = $this->input->post('lehreinheit_id');
 		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
-		$vertrag_id = $this->input->post('vertrag_id ');
+		$vertrag_id = $this->input->post('vertrag_id');
 
 		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
 
@@ -603,7 +613,9 @@ class Vertraege extends FHCAPI_Controller
 				'vertrag_id' => $vertrag_id
 			],
 			[
-				'vertrag_id' => null
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
 			]
 		);
 

From 5ddc4749fa6f9702012666c7d955b916c88ef2ce Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Jul 2025 14:35:07 +0200
Subject: [PATCH 0381/1357] update(Accessability changes):adds aria-label to
 empty buttons and more accessability changes

---
 public/css/Cis4/CoreCalendarEvents.css        |   4 +-
 public/js/components/Calendar/Header.js       |  36 +-
 public/js/components/Calendar/Week/Page.js    |   2 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   4 +-
 public/js/components/Cis/Menu.js              |  14 +-
 public/js/components/Cis/Mylv/Student.js      |   4 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |   2 +-
 .../ProfilComponents/ProfilInformation.js     |   2 +-
 .../ProfilComponents/RoleInformation.js       |  12 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |   4 +-
 public/js/components/Cis/ThemeSwitch.js       |  11 +-
 public/js/components/filter/Filter.js         |   6 +-
 system/phrasesupdate.php                      | 464 +++++++++++++++++-
 13 files changed, 532 insertions(+), 33 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 1611ac123..fd418a9f8 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -46,7 +46,9 @@
 	flex-direction: column;
 	column-gap: 5px;
 	overflow-y: scroll;
-	min-height:0;
+	height: 100%;
+	min-height:auto;
+	justify-content: space-evenly;
 
 }
 
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 5ee3d51e7..c1b53d9c8 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -27,13 +27,39 @@ export default {
 		'next',
 		'click'
 	],
+	methods:{
+		modeAriaLabelText(mode) {
+			switch (mode.toLowerCase()) {
+				case "day": return this.$p.t('LvPlan', 'modeDay');
+				case "week": return this.$p.t('LvPlan', 'modeWeek');
+				case "month": return this.$p.t('LvPlan', 'modeMonth');
+			}
+		},
+	},
 	computed: {
 		getHeaderClassSide() {
 			return this.containerWidth > 780 ? 'col-3' : 'col-12'
 		},
 		getHeaderClassMiddle() {
 			return this.containerWidth > 780 ? 'col-6' : 'col-12'
-		}
+		},
+		previousButtonAriaLabelText(){
+			switch(this.mode.toLowerCase()){
+				case "day": return this.$p.t('LvPlan', 'previousDay');
+				case "week": return this.$p.t('LvPlan', 'previousWeek');
+				case "weeks": return this.$p.t('LvPlan', 'previousYear');
+				case "month": return this.$p.t('LvPlan', 'previousMonth');
+			}
+		},
+		nextButtonAriaLabelText() {
+			switch (this.mode.toLowerCase()) {
+				case "day": return this.$p.t('LvPlan', 'nextDay');
+				case "week": return this.$p.t('LvPlan', 'nextWeek');
+				case "weeks": return this.$p.t('LvPlan', 'nextYear');
+				case "month": return this.$p.t('LvPlan', 'nextMonth');
+			}
+		},
+		
 	},
 	template: /*html*/`
 	<div class="calendar-header card-header w-100">
@@ -44,7 +70,7 @@ export default {
 			<div :class="getHeaderClassMiddle" :style="{'padding-left':headerPadding}">
 				<div class="row align-items-center justify-content-center">
 					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')" v-tooltip.top="{ value: previousButtonAriaLabelText, showDelay: 1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-left" aria-hidden="true"></i></button>
 					</div>
 					<div class="justify-content-center text-center col-auto">
 						<div class="d-flex justify-content-center align-items-center">
@@ -55,15 +81,15 @@ export default {
 						</div>
 					</div>
 					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')" v-tooltip.top="{value:nextButtonAriaLabelText, showDelay:1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-right" aria-hide="true"></i></button>
 					</div>
 				</div>
 			</div>
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
-							<i v-if="condition" class="fa" :class="icon" ></i>
+						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
 				</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index cec65e577..3bfc7b668 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -326,7 +326,7 @@ export default {
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
 					<div class="fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
+					<a href="#" class="small text-muted text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index d9b82bbcc..7aeaa0f1b 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -316,9 +316,9 @@ const LvPlan = {
 	>
 		<template #calendarDownloads>
 			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :title="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
+				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
 					<div class="d-flex flex-column">
-						<i :class="icon"></i>
+						<i aria-hidden="true" :class="icon"></i>
 						<span class="small">{{title}}</span>
 					</div>
 				</a>
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 7a2d174ee..ee1b671e6 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -27,6 +27,7 @@ export default {
 			url:null,
 			urlMatchRankings:[],
 			navUserDropdown:null,
+			menuOpen:true,
         };
     },
 	provide(){
@@ -37,6 +38,13 @@ export default {
 		}
 	},
 	computed:{
+		menuCollapseAriaLabel(){
+			if(this.menuOpen){
+				return this.$p.t('global', 'collapseMenu');
+			}else{
+				return this.$p.t('global', 'extendMenu');
+			}
+		},
 		highestMatchingUrlCount(){
 			// gets the hightest ranking inside the array
 			let highestMatch = Math.max(...this.urlMatchRankings);
@@ -111,7 +119,7 @@ export default {
     <div id="nav-logo" class="d-none d-lg-block">
 		<div class="d-flex h-100">
 			<a :href="rootUrl">
-				<img :src="logoUrl" alt="Logo">
+				<img :src="logoUrl" alt="Corporate Identity Logo">
 			</a>
 			<theme-switch></theme-switch>
 		</div>
@@ -135,8 +143,8 @@ export default {
     <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">
-				<button type="button" class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
-					<i class="fa fa-arrow-circle-left fhc-text"></i>
+				<button :aria-label="menuCollapseAriaLabel"  type="button" @click="menuOpen = !menuOpen"  class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
+					<i aria-hidden="true" class="fa fa-arrow-circle-left fhc-text"></i>
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 300ed44f8..508acb883 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -101,13 +101,13 @@ export default {
 			</div>
 			<div class="col-auto">
 				<div class="input-group">
-					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
+					<button :aria-label="$p.t('lehre','previousStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','previousStudSemester')}" class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
 						<i class="fa fa-caret-left" aria-hidden="true"></i>
 					</button>
 					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 						<option v-for="semester in studiensemester" :key="semester.studiensemester_kurzbz">{{semester.studiensemester_kurzbz}}</option>
 					</select>
-					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsLast" @click="nextSem">
+					<button class="btn btn-outline-secondary" :aria-label="$p.t('lehre','nextStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','nextStudSemester')}" type="button" :disabled="currentIsLast" @click="nextSem">
 						<i class="fa fa-caret-right" aria-hidden="true"></i>
 					</button>
 				</div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index e911453f1..8b5ca885c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -16,7 +16,7 @@ export default {
             {{title}}
         </div>
         <div class="card-body">
-            <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
+            <h4 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h4>
             <div class="card-text row text-break mb-2" v-for="verteiler in data">
                 <div class="col-12 ">
                     <div class="row">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 50399edf5..7cd6f213e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -91,7 +91,7 @@ export default {
             <div class="col-12 col-sm-6 mb-2">
                 <div class="row justify-content-center">
                     <div class="col-auto " style="position:relative">
-                        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
+                        <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 2e2ec0c6e..ae1a4f2b9 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -48,24 +48,24 @@ export default {
 						<!-- print semester link -->
 						<span v-else-if="key == 'semester' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','semesterLink')" class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
 						<!-- print verband link -->
 						<span v-else-if="key =='verband' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','verbandLink')" class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
 						<!-- print gruppe link -->
 						<span v-else-if="key == 'gruppe' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','gruppenLink')" class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index 499a071a8..dc3cdb443 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -40,8 +40,8 @@ export default {
 	template: /*html*/`
 	<div class="lehreinheitEventContent h-100 w-100 p-1" >
 		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+			<span >{{convertTime(event.beginn.split(":"))}}</span>
+			<span >{{convertTime(event.ende.split(":"))}}</span>
 		</div>
 		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index 7f560376e..bff06a70c 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -8,7 +8,8 @@ export default {
 		switchTheme(nextTheme){
 			this.theme = nextTheme;
 			this.$theme.switchTheme(this.theme);
-		}
+		},
+		
 	},
 	computed:{
 		nextTheme(){
@@ -23,10 +24,10 @@ export default {
 	},
 	template:/*html*/`
 
-	<button @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text"></i>
-		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
+	<button :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text" aria-hidden="true"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text" aria-hidden="true"></i>
+		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>
 	</button>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 3cf069ff8..e5e804db1 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -669,13 +669,13 @@ export const CoreFilterCmpt = {
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
 					<span v-else-if="description">{{ description }}</span>
-					<a v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>
-					<a v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
+					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
 						<span class="fa-solid fa-xl fa-filter-circle-xmark"></span>
 					</a>
-					<a href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+					<a aria-label="filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
 						<span class="fa-solid fa-xl fa-table-columns"></span>
 					</a>
 					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6aeeca9cd..40640a186 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -268,6 +268,106 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'collapseMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu einklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Collapse menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'extendMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu ausklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Extend menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'sender',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sender',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sender',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'collapseMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu einklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Collapse menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'extendMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu ausklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Extend menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -27276,6 +27376,86 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'gruppenLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Gruppen Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'group link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'verbandLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Verband Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Verband link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+			array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'verbandLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Verband Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Verband link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'semesterLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Semester Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Semester link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',
@@ -28156,7 +28336,229 @@ array(
 			)
 		)
 	),
-		//Profil Phrasen ende
+	//Profil Phrasen ende
+	// LvPlan Phrasen start
+	array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorherige Woche',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous week',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousYear',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriges Jahr',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous year',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriges Monat',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous month',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriger Tag',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous day',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächster Tag',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next day',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächste Woche',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next week',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächster Monat',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next month',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextYear',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächstes Jahr',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next year',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Tages Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Daily view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Wochen Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Week view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Monats Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Month view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		// LvPlan Phrasen ende
 		//ProfilUpdate Phrasen start
 		array(
 			'app' => 'core',
@@ -29661,6 +30063,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'switchTheme',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zum {0} Theme wechseln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Switch to {0} theme',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -40144,6 +40566,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'previousStudSemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorheriges Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Previous study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'nextStudSemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nächstes Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Next study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From ac1335a50d6f75c859573f9fbdd4fd191acc7df7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 2 Jul 2025 14:53:44 +0200
Subject: [PATCH 0382/1357] Notizen as Modal

---
 public/js/components/Notiz/Notiz.js           | 17 +++---
 .../Details/Anrechnungen/Anrechnungen.js      | 54 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 0d180d2ff..1237db868 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -176,7 +176,7 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				responsiveLayout: "collapse",
-				height: '250',
+				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'notiz_id',
@@ -572,10 +572,9 @@ export default {
 				>
 			</core-filter-cmpt>
 			
-			<br>
 		
-			<form-form ref="formNotiz" @submit.prevent class="row pt-3">
-				<br><br>
+			<form-form ref="formNotiz" @submit.prevent class="row">
+
 				<div class="pt-2">
 					<div class="row mb-3">
 						<div class="col-sm-7">
@@ -708,9 +707,13 @@ export default {
 						<p class="small">{{notizData.lastupdate}}</p>
 					</div>
 				</div>
-				
-				<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-				<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+				<div class="row">
+					<div class="text-end">
+						<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+						<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+					</div>
+				</div>
+
 			</form-form>
 		</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index abe5d177d..a85ee77f5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -184,6 +184,7 @@ export default {
 			this.currentAnrechnung_id = anrechnung_id;
 			this.loadAnrechnung(this.currentAnrechnung_id);
 			this.showNotizen = true;
+			this.$refs.anrechnungsnotizModal.show();
 		},
 		addNewAnrechnung(){
 			const dataToSend = {
@@ -304,36 +305,31 @@ export default {
 	},
 	template: `
 				<div class="stv-details-tab_exemptions h-100 pb-3">
-					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
-					
-					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
-							<!-- <div class="justify-content-end pb-3">
-								<form-input
-									container-class="form-switch"
-									type="checkbox"
-									label="Notizen"
-									v-model="showNotizen"
-									@change="onSwitchHide"
-									>
-								</form-input>
-							</div> -->
-						<h6><strong>LV {{formData.lehrveranstaltung_id}}:
-							{{formData.bezeichnung}} | {{formData.bezeichnung_english}}</strong></h6>
 
-						<core-notiz
-							:endpoint="endpoint"
-							ref="formNotes"
-							notiz-layout="popupModal"
-							typeId="anrechnung_id"
-							:id="currentAnrechnung_id"
-							show-document
-							show-tiny-mce
-							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-							@reload="handleReload"
-							>
-						</core-notiz>
-					
-					</div>
+					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl">
+
+						<template #title>
+							<h5>
+								<strong>LV {{formData.lehrveranstaltung_id}}: {{formData.bezeichnung}} | {{formData.bezeichnung_english}}
+								</strong>
+							</h5>
+						</template>
+
+						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 800px;">
+							<core-notiz
+										:endpoint="endpoint"
+										ref="formNotes"
+										notiz-layout="classicFas"
+										typeId="anrechnung_id"
+										:id="currentAnrechnung_id"
+										show-document
+										show-tiny-mce
+										:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+										@reload="handleReload"
+										>
+								</core-notiz>
+							</bs-modal>
+						</div>
 					
 					<template v-if="config.editableAnrechnungen" >
 						<core-filter-cmpt

From 4b260673809429ee645242fdfe9cdd0bf474c636 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 2 Jul 2025 15:20:17 +0200
Subject: [PATCH 0383/1357] moar anw phrasen

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bb8a09605..72baff627 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29944,6 +29944,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleOhneQR',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten ohne QR-Code einfügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Insert attendances without QR-Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 46a10bd92e6da6ebf30e5961d92901db8f0fa775 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 3 Jul 2025 11:14:20 +0200
Subject: [PATCH 0384/1357] page handling

- entry in main navigation menu
- import navigation component
- remove space side menu
---
 application/config/navigation.php                   |  7 +++++++
 application/views/Vertragsverwaltung.php            |  5 +++--
 public/css/Vertragsverwaltung.css                   |  4 ++++
 public/js/apps/Vertragsverwaltung.js                |  4 +++-
 public/js/components/Vertraege/Vertraege.js         |  4 ----
 .../js/components/Vertraege/Vertragsverwaltung.js   | 13 ++++++++-----
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 2327513ad..5030cb1b1 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -153,6 +153,13 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
+				),
+				'vertragsverwaltung' => array(
+					'link' => site_url('vertragsverwaltung'),
+					'description' => 'Vertragsverwaltung',
+					'expand' => true,
+					'sort' => 51,
+					'requiredPermissions' => 'vertrag/mitarbeiter:r'
 				)
 			)
 		),
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index d4802398e..b66ac6e3e 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -6,7 +6,8 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'vue3' => true,
 	'primevue3' => true,
-	#'filtercomponent' => true,
+	'filtercomponent' => true,
+	'navigationcomponent' => true,
 	'tabulator5' => true,
 	'tinymce5' => true,
 	'phrases' => array(
@@ -16,7 +17,7 @@ $includesArray = array(
 	'customCSSs' => [
 		'public/css/components/vue-datepicker.css',
 		'public/css/components/primevue.css',
-		'public/css/Vertragsverwaltung.css'
+		'public/css/Vertragsverwaltung.css',
 	],
 	'customJSs' => [
 		#'vendor/npm-asset/primevue/tree/tree.min.js',
diff --git a/public/css/Vertragsverwaltung.css b/public/css/Vertragsverwaltung.css
index 7f28d7335..7b2d71481 100644
--- a/public/css/Vertragsverwaltung.css
+++ b/public/css/Vertragsverwaltung.css
@@ -14,3 +14,7 @@ html {
 .vv> div {
 	flex: 1 1 auto;
 }
+
+.vv {
+	margin-left: 0 !important;
+}
diff --git a/public/js/apps/Vertragsverwaltung.js b/public/js/apps/Vertragsverwaltung.js
index 3f8e47d3d..59b1c8734 100644
--- a/public/js/apps/Vertragsverwaltung.js
+++ b/public/js/apps/Vertragsverwaltung.js
@@ -10,7 +10,9 @@ const router = VueRouter.createRouter({
 	]
 });
 
-const app = Vue.createApp();
+const app = Vue.createApp({
+	name: 'VertragsverwaltungApp'
+});
 
 app
 	.use(router)
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 27a154672..b0bc09535 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -53,7 +53,6 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Bezeichnung", field: "bezeichnung", width: 150},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
 					{
 						title: "Betrag", field: "betrag", width: 150,
 						formatter: function (cell) {
@@ -145,9 +144,6 @@ export default {
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('ui', 'bezeichnung')
 						});
-						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'lehreinheit_id')
-						});
 						cm.getColumnByField('betrag').component.updateDefinition({
 							title: this.$p.t('ui', 'betrag')
 						});
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 5e27a6d77..6cdf92005 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -1,3 +1,4 @@
+import {CoreNavigationCmpt} from "../navigation/Navigation.js";
 import MitarbeiterHeader from "./MitarbeiterHeader.js";
 import FhcHeader from "../DetailHeader/DetailHeader.js";
 import VertraegeMitarbeiter from "./Vertraege.js";
@@ -8,6 +9,7 @@ import ApiCoreVertraege from '../../api/factory/vertraege/vertraege.js';
 export default {
 	name: 'Vertragsverwaltung',
 	components: {
+		CoreNavigationCmpt,
 		VerticalSplit,
 		MitarbeiterHeader,
 		FhcHeader,
@@ -38,9 +40,11 @@ export default {
 		}
 	},
 	template: `
-<div class="vv">
-	<div class="container-fluid overflow-hidden">
-			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+		<!-- Navigation component -->
+		<core-navigation-cmpt></core-navigation-cmpt>
+
+		<div class="vv">
+			<main>
 				<vertical-split ref="vsplit">
 					<template #top>	
 						<div class="d-flex flex-column" style="height: 100%;">
@@ -62,6 +66,5 @@ export default {
 				</vertical-split>
 			</main>	
 		</div>
-	</div>
-	`
+		`
 }
\ No newline at end of file

From 919471d067c797cce4394d70b552a0c00f167365 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 11:32:00 +0200
Subject: [PATCH 0385/1357] phrasen adjustment & error catch cases

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72baff627..ea1ca3a30 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31707,18 +31707,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'noStudentsFound',
+		'phrase' => 'noStudentsFoundV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten für Mitarbeiter {0} in dem gewählten LV-Teil {1} gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No assigned students for the selected teaching unit found!',
+				'text' => 'No assigned students for employee {0} in the selected teaching unit {1} found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From d1e35b185180471543af163b02d2a40ca0e95d86 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 3 Jul 2025 12:14:00 +0200
Subject: [PATCH 0386/1357] bugfix js error after sort: take out persistance
 for header filter

---
 public/js/components/Vertraege/Vertraege.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index b0bc09535..fcead6adf 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -130,6 +130,11 @@ export default {
 				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
+				persistence: {
+					sort: true,
+					page: true,
+					filter: false //to avoids js errors
+				},
 				persistenceID: 'core-contracts'
 			},
 			tabulatorEvents: [
@@ -214,7 +219,6 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
-			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + this.person_id);
 		},
 	},
 	methods: {

From 7fc98bd6a492159aba39aa119f94cb0f7ddb2ed5 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 13:23:47 +0200
Subject: [PATCH 0387/1357] tooltip update

---
 system/phrasesupdate.php | 48 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ea1ca3a30..4ba179ef8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29684,6 +29684,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeBlau',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student ist am gewählten Datum bestätigt entschuldigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student is confirmed excused on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeTuerkis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student hat eine offene Entschuldigung am gewählten Datum.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student has an open excuse on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32239,7 +32279,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipAssistenz',
+		'phrase' => 'tooltipAssistenzV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -32283,7 +32323,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipLektorStartKontrolle',
+		'phrase' => 'tooltipLektorStartKontrolleV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -32292,7 +32332,7 @@ array(
 
 				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
 
-				Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.',
+				Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32302,7 +32342,7 @@ array(
 
 				The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable.
 
-				You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.',
+				You can conduct multiple attendance checks per day per date and lesson group, as long as they do not overlap in your times and are at least {0} minutes long.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

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

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

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

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

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

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

From e659e8e12cf7cd7f2311e37b72cde155f0ede50b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 3 Jul 2025 15:30:02 +0200
Subject: [PATCH 0390/1357] update(Profil Tabulator Columns):preloads phrasen
 for the tabulator tables, otherwise the column titles are not displayed

---
 .../Cis/Profil/MitarbeiterProfil.js           | 52 ++++++++++++-------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 18 +++++--
 .../js/components/Cis/Profil/StudentProfil.js | 42 +++++++++------
 3 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0bb628e19..840cdefc1 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -33,7 +33,7 @@ export default {
 		return {
 			showModal: false,
 			editDataFilter: null,
-
+			preloadedPhrasen:{},
 			// tabulator options
 			funktionen_table_options: {
 				persistenceID: "filterTableMaProfilFunktionen",
@@ -58,21 +58,21 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+						title: Vue.computed(() => this.preloadedPhrasen.bezeichnungPhrase),
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+						title: Vue.computed(() => this.preloadedPhrasen.organisationseinheitPhrase),
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+						title: Vue.computed(() => this.preloadedPhrasen.gueltigVonPhrase),
 						field: "Gültig_von",
 						headerFilter: true,
 						resizable: true,
@@ -80,7 +80,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+						title: Vue.computed(() => this.preloadedPhrasen.gueltigBisPhrase),
 						field: "Gültig_bis",
 						headerFilter: true,
 						resizable: true,
@@ -88,7 +88,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+						title: Vue.computed(() => this.preloadedPhrasen.wochenstundenPhrase),
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
@@ -121,14 +121,14 @@ export default {
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: Vue.computed(() => this.preloadedPhrasen.entlehnteBetriebsmittelPhrase),
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/inventarnummer')),
+						title: Vue.computed(() => this.preloadedPhrasen.inventarnummerPhrase),
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -136,7 +136,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
+						title: Vue.computed(() => this.preloadedPhrasen.ausgabedatumPhrase),
 						field: "Ausgegeben_am",
 						headerFilter: true,
 						minWidth: 200,
@@ -283,6 +283,18 @@ export default {
 	},
 
 	created() {
+		// preload phrasen
+		this.$p.loadCategory(["ui","lehre","global","profil"]).then(() => {
+			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
+			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
+			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+			this.preloadedPhrasen.entlehnteBetriebsmittelPhrase = this.$p.t('profil/entlehnteBetriebsmittel');
+			this.preloadedPhrasen.inventarnummerPhrase = this.$p.t('profil/inventarnummer');
+			this.preloadedPhrasen.ausgabedatumPhrase = this.$p.t('profil/ausgabedatum');
+			this.preloadedPhrasen.loaded=true;
+		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 
@@ -298,7 +310,7 @@ export default {
 			this.setTableColumnTitles()
 		}
 	},
-	template: /*html*/ ` 
+	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
@@ -306,7 +318,7 @@ export default {
             <!--TODO: uncomment when implemented
                 <div class="row mb-3">
                            <div class="col">
-                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>    
+                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                            </div>
                          </div>-->
             <!-- Bearbeiten Button -->
@@ -324,7 +336,7 @@ export default {
             </div>
             <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
-                    <!-- MOBILE PROFIL UPDATES -->  
+                    <!-- MOBILE PROFIL UPDATES -->
                     <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates" ></fetch-profil-updates>
                 </div>
             </div>
@@ -334,7 +346,7 @@ export default {
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
             <!-- INFORMATION CONTENT START -->
-            <!-- ROW WITH THE PROFIL INFORMATION --> 
+            <!-- ROW WITH THE PROFIL INFORMATION -->
             <div class="row mb-4">
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
@@ -411,18 +423,20 @@ export default {
             <div class="row">
                 <div class="col-12 mb-4" >
                     <!-- FUNKTIONEN TABELLE -->
-                    <core-filter-cmpt 
+                    <core-filter-cmpt
+						v-if="preloadedPhrasen.loaded"
                     	@tableBuilt="funktionenTableBuilt"
-						:title="$p.t('person','funktionen')"  
-						ref="funktionenTable" 
-						:tabulator-options="funktionen_table_options"  
-						tableOnly 
+						:title="$p.t('person','funktionen')"
+						ref="funktionenTable"
+						:tabulator-options="funktionen_table_options"
+						tableOnly
 						:sideMenu="false"
                      />
                 </div>
                 <div class="col-12 mb-4" >
                     <!-- BETRIEBSMITTEL TABELLE -->
-                    <core-filter-cmpt 
+                    <core-filter-cmpt
+						v-if="preloadedPhrasen.loaded"
                     	@tableBuilt="betriebsmittelTableBuilt"
 						:title="$p.t('profil','entlehnteBetriebsmittel')"
 						ref="betriebsmittelTable"
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 23a86b5f9..56c7ab84b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -18,7 +18,7 @@ export default {
 	data() {
 		return {
 			collapseIconFunktionen: true,
-
+			preloadedPhrasen:{},
 			funktionen_table_options: {
 				persistenceID: "filterTableMaViewProfilFunktionen",
 				persistence: {
@@ -166,6 +166,16 @@ export default {
 			};
 		},
 	},
+	created(){
+		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
+			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
+			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
+			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+			this.preloadedPhrasen.loaded = true;
+		});
+	},
 
 	template: /*html*/ `
 
@@ -175,9 +185,9 @@ export default {
         <!-- HIDDEN QUICK LINKS -->
         <!-- TODO: uncomment when implemented
             <div  class="d-md-none col-12 ">
-            
+
             <quick-links :title="$p.t('profil','quickLinks')" :mobile="true" ></quick-links>
-            
+
             </div>
             -->
         <!-- END OF HIDDEN QUCK LINKS -->
@@ -223,7 +233,7 @@ export default {
             <div class="row">
                 <!-- FIRST TABLE -->
                 <div class="col-12 mb-4" >
-                    <core-filter-cmpt @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt v-if="preloadedPhrasen.loaded" @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                 </div>
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
             </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 2c0d5ba2b..5d9b441e0 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -32,7 +32,7 @@ export default {
 			showModal: false,
 			collapseIconBetriebsmittel: true,
 			editDataFilter: null,
-
+			preloadedPhrasen:{},
 			// tabulator options
 			zutrittsgruppen_table_options: {
 				persistenceID: "filterTableStudentProfilZutrittsgruppen",
@@ -42,7 +42,7 @@ export default {
 				height: 200,
 				layout: "fitColumns",
 				columns: [{
-					title: Vue.computed(() => this.$p.t('profil/zutrittsGruppen')),
+					title: Vue.computed(() => this.preloadedPhrasen.zutrittsGruppenPhrase),
 					field: "bezeichnung"
 				}],
 			},
@@ -68,14 +68,14 @@ export default {
 						headerClick: this.collapseFunction,
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: Vue.computed(()=>this.preloadedPhrasen.entlehnteBetriebsmittelPhrase),
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/inventarnummer')),
+						title: Vue.computed(() =>this.preloadedPhrasen.inventarnummerPhrase) ,
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -83,7 +83,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
+						title: Vue.computed(() =>this.preloadedPhrasen.ausgabedatum) ,
 						field: "Ausgegeben_am",
 						headerFilter: true,
 						minWidth: 200,
@@ -231,6 +231,14 @@ export default {
 		},
 	},
 	created() {
+		// preload phrasen
+		this.$p.loadCategory('profil').then(() => {
+			this.preloadedPhrasen.zutrittsGruppenPhrase = this.$p.t('profil/zutrittsGruppen');
+			this.preloadedPhrasen.entlehnteBetriebsmittelPhrase = this.$p.t('profil/entlehnteBetriebsmittel');
+			this.preloadedPhrasen.inventarnummerPhrase = this.$p.t('profil/inventarnummer');
+			this.preloadedPhrasen.ausgabedatum = this.$p.t('profil/ausgabedatum');
+			this.preloadedPhrasen.loaded = true;
+		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 	},
@@ -294,7 +302,7 @@ export default {
 							<div  class=" col-lg-12">
 								<!-- STUDENT INFO -->
 								<role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
-							</div> 
+							</div>
 						</div>
 					<!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
 					</div>
@@ -329,7 +337,7 @@ export default {
 							</div>
 						</div>
 					</div>
-			
+
 					<div class="row mb-4">
 						<div class="col">
 							<!-- PRIVATE ADRESSEN-->
@@ -347,7 +355,7 @@ export default {
 								<div class="card-body">
 									<div class="gy-3 row ">
 										<div v-for="element in data.adressen" class="col-12">
-											<Adresse :data="element"></Adresse> 
+											<Adresse :data="element"></Adresse>
 										</div>
 									</div>
 								</div>
@@ -359,16 +367,18 @@ export default {
 			<!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
 			<div class="row">
 				<div class="col-12 mb-4" >
-					<core-filter-cmpt 
-					@tableBuilt="betriebsmittelTableBuilt" 
-					:title="$p.t('profil','entlehnteBetriebsmittel')"  
-					ref="betriebsmittelTable" 
-					:tabulator-options="betriebsmittel_table_options" 
-					tableOnly 
+					<core-filter-cmpt
+					v-if="preloadedPhrasen.loaded"
+					@tableBuilt="betriebsmittelTableBuilt"
+					:title="$p.t('profil','entlehnteBetriebsmittel')"
+					ref="betriebsmittelTable"
+					:tabulator-options="betriebsmittel_table_options"
+					tableOnly
 					:sideMenu="false" />
-				</div> 
+				</div>
 				<div class="col-12 mb-4" >
-					<core-filter-cmpt 
+					<core-filter-cmpt
+					v-if="preloadedPhrasen.loaded"
 					@tableBuilt="zutrittsgruppenTableBuilt" 
 					:title="$p.t('profil','zutrittsGruppen')" 
 					ref="zutrittsgruppenTable" 

From b46c0147a049b9ee12e4f039bfa3fa642e308b6d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 3 Jul 2025 15:30:38 +0200
Subject: [PATCH 0391/1357] update(Filter Component): uses fhc-text instead of
 text-dark for the filter icon of the filter component

---
 public/js/components/filter/Filter.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index e5e804db1..aae6ed5c6 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -669,16 +669,16 @@ export const CoreFilterCmpt = {
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
 					<span v-else-if="description">{{ description }}</span>
-					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 fhc-text" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>
-					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
+					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 fhc-text" :title="$p.t('ui','filterdelete')" @click="clearFilters">
 						<span class="fa-solid fa-xl fa-filter-circle-xmark"></span>
 					</a>
-					<a aria-label="filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+					<a aria-label="filter" href="#" class="btn btn-link px-0 fhc-text" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
 						<span class="fa-solid fa-xl fa-table-columns"></span>
 					</a>
-					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
+					<table-download class="btn btn-link px-0 fhc-text" :tabulator="tabulator" :config="download"></table-download>
 				</div>
 			</div>
 

From 475290e3eff3c09b60d4f053645b901ca2708948 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 15:47:06 +0200
Subject: [PATCH 0392/1357] yet another phrase

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4ba179ef8..260c1720c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -32876,6 +32876,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From c8e7adc0748fbfdbd4aa146ef6d94fa0ff5a8f3b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Jul 2025 16:17:31 +0200
Subject: [PATCH 0393/1357] alter ferien query to get overlapping events e.g.
 summer holidays

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

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index a16c8e02e..8bc5a7c70 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -260,7 +260,7 @@ class StundenplanLib{
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
-		WHERE (bisdatum BETWEEN ? AND ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		WHERE (bisdatum >= ? AND vondatum <= ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
 		",[$start_date, $end_date, $studiengang_kz]);
 
 		if (isError($ferienEvents)) {

From d48865d2a1ee8b913d337f3127369e44bff391f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Jul 2025 16:37:45 +0200
Subject: [PATCH 0394/1357] only show lvs with lehre flag true in degree
 programs overview

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

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 23c6b87d5..6f1eff18f 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -260,7 +260,9 @@ SELECT tbl_lehrveranstaltung.*,
         FROM lehre.tbl_lehrveranstaltung
         JOIN lehre.tbl_studienplan_lehrveranstaltung
         USING(lehrveranstaltung_id)
-        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
+        WHERE 
+			tbl_lehrveranstaltung.lehre = true AND
+			tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
 		
         if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
 			$query .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";

From 88adb8b139f0dd62d054ad8655d52a2b2d79946b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Jul 2025 07:43:21 +0200
Subject: [PATCH 0395/1357] Tab Messages: fix input Variables in TinyMCE

---
 .../Messages/Details/NewMessage/Modal.js           | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 3503cbeb9..9c9bcd4cd 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -153,17 +153,11 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
-				/*				this.editor.focus();
-								this.editor.setDirty(true);*/
 
-				//this.editor.fire('change'); //forces
-
-				//this.editor.undoManager.add();
-
-				//this.editor.insertContent(selectedItem.value + "\u00A0");
-				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
-				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+				this.editor.fire('input');
+				this.editor.fire('change');
+				this.editor.setDirty(true);
+				this.editor.save();
 
 			} else {
 				console.error("Editor instance is not available.");

From 101636e9fcd48dec5d1861074d33e511d21df4b1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 4 Jul 2025 11:31:13 +0200
Subject: [PATCH 0396/1357] timeline tooltip

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 260c1720c..26472be29 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -32876,6 +32876,38 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipAnwTimeline',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt.
+				
+					Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen.
+					
+					Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen.
+					
+					Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student.
+
+					When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually.
+					
+					Scrolling within the timeline changes the visual spacing between individual days.
+					
+					Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 5b2b715a169f83e0e29a186577e39bcae984da20 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 7 Jul 2025 08:59:36 +0200
Subject: [PATCH 0397/1357] userstory 61241: bugs behoben

---
 .../api/frontend/v1/Lehrveranstaltung.php     |  16 +-
 .../controllers/api/frontend/v1/lv/Gruppe.php |  11 +-
 .../api/frontend/v1/lv/Lehreinheit.php        |   7 +-
 .../models/education/Lehreinheit_model.php    | 290 ++++++++----------
 .../education/Lehreinheitgruppe_model.php     |   4 +-
 .../education/Lehrveranstaltung_model.php     |  17 +-
 public/css/Lvverwaltung.css                   |   5 +-
 .../components/LVVerwaltung/LVVerwaltung.js   |   2 +-
 .../js/components/LVVerwaltung/Setup/Table.js | 139 ++++++---
 .../js/components/LVVerwaltung/Tabs/Notiz.js  |   2 +-
 system/phrasesupdate.php                      |  42 +++
 11 files changed, 300 insertions(+), 235 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
index 1b2e2bc35..098d44712 100644
--- a/application/controllers/api/frontend/v1/Lehrveranstaltung.php
+++ b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
@@ -39,6 +39,12 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
+
+		$this->loadPhrases(
+			array(
+				'ui'
+			)
+		);
 	}
 	public function loadByEmployee($mitarbeiter_uid = null, $stg_kz = null)
 	{
@@ -54,7 +60,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
 		{
-			$lehreinheiten = $this->_ci->LehreinheitModel->getLEByLV($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid);
+			$lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz, $mitarbeiter_uid);
 			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
 
 			if (!isset($lehrveranstaltung->_children))
@@ -69,8 +75,8 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 	public function loadByStudiengang($studiengang_kz = null, $semester = null)
 	{
-		if (is_null($studiengang_kz) || !ctype_digit((string)$studiengang_kz))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$verband = null;
 		if (!is_null($semester) && !is_numeric($semester))
@@ -164,7 +170,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		if (is_null($lehrveranstaltung_id) || !ctype_digit((string)$lehrveranstaltung_id))
 			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-		$this->_ci->LehrveranstaltungModel->addSelect('lehrveranstaltung_id, lehrform_kurzbz, lehre, bezeichnung as lvbezeichnung');
+		$this->_ci->LehrveranstaltungModel->addSelect('lehrveranstaltung_id, lehrform_kurzbz, lehre, bezeichnung as lvbezeichnung, sprache');
 		$lehrveranstaltung_result = $this->_ci->LehrveranstaltungModel->loadWhere(array('lehrveranstaltung_id' => $lehrveranstaltung_id));
 		$lehrveranstaltung_result = $this->getDataOrTerminateWithError($lehrveranstaltung_result);
 		$lehrveranstaltung = $lehrveranstaltung_result[0];
@@ -202,7 +208,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
 		{
-			$lehreinheiten = $this->LehreinheitModel->getLEByLV($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
+			$lehreinheiten = $this->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
 			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
 
 			if (!isset($lehrveranstaltung->_children))
diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
index 01c11f98f..09f253a59 100644
--- a/application/controllers/api/frontend/v1/lv/Gruppe.php
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -19,6 +19,13 @@ class Gruppe extends FHCAPI_Controller
 
 		$this->_ci = &get_instance();
 		$this->_setAuthUID();
+		$this->_ci->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'ui'
+			)
+		);
+
 		$this->_ci->load->model('organisation/Gruppe_model', 'GruppeModel');
 		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$this->_ci->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
@@ -57,10 +64,6 @@ class Gruppe extends FHCAPI_Controller
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($gid) || !ctype_digit((string)$gid) || is_null($lehrverband))
 			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-		$gruppe_result = $this->_ci->GruppeModel->loadWhere(array('gid' => $gid));
-		if (!hasData($gruppe_result) || isError($gruppe_result))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
 		$this->checkPermission($lehreinheit_id);
 
 		$result = $this->_ci->LehreinheitgruppeModel->addGroup($lehreinheit_id, $gid, !($lehrverband === 'false'));
diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index 84ee66d5d..0c42c0082 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -164,7 +164,6 @@ class Lehreinheit extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-
 		$updateData = array();
 		foreach ($updatableFields as $field)
 		{
@@ -183,6 +182,12 @@ class Lehreinheit extends FHCAPI_Controller
 			$updateData
 		);
 
+		if (!isset($updateData['unr']))
+		{
+			$unr = getData($result);
+			$this->_ci->LehreinheitModel->update($unr, array('unr' => $unr));
+		}
+
 		$this->terminateWithSuccess($result);
 	}
 
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index ba9e82c64..ce414bad2 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -335,7 +335,7 @@ EOSQL;
 	}
 
 
-	public function getByLvidStudiensemester($lv_id, $studiensemester_kurzbz)
+	public function getByLvidStudiensemester($lv_id, $studiensemester_kurzbz, $mitarbeiter_uid = null, $fachbereich_kurzbz = null)
 	{
 		$qry = "WITH lehreinheiten AS (
 				SELECT *
@@ -343,98 +343,64 @@ EOSQL;
 				WHERE lehrveranstaltung_id = ?
 					AND studiensemester_kurzbz = ?
 			),
-			gruppen AS (
-				SELECT
-					COALESCE(
-						string_agg(
-							tbl_lehreinheitgruppe.gruppe_kurzbz, ' '
-						) FILTER (WHERE NOT direktinskription),
-							string_agg(
-								COALESCE(
-									upper(tbl_studiengang.typ::varchar(1) ||tbl_studiengang.kurzbz) ||
-									'-'||
-									COALESCE(tbl_lehreinheitgruppe.semester::varchar, '') ||
-									COALESCE(tbl_lehreinheitgruppe.verband::varchar, '')||
-									COALESCE(tbl_lehreinheitgruppe.gruppe, '')), ', '
-							)
-					) AS gruppe,
-					lehreinheit_id
-					FROM
-						lehre.tbl_lehreinheitgruppe
-							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-							LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
-					GROUP BY lehreinheit_id
-				),
-				mitarbeiter AS (
-					SELECT kurzbz, semesterstunden, planstunden, lehreinheit_id
-					FROM lehre.tbl_lehreinheitmitarbeiter
-						JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
-				),
-				fachbereich AS (
-					SELECT
-						tbl_organisationseinheit.bezeichnung,
-						tbl_organisationseinheit.organisationseinheittyp_kurzbz,
-						lehreinheit_id
-					FROM
-						public.tbl_organisationseinheit,
-						lehre.tbl_lehrveranstaltung as lehrfach,
-						lehre.tbl_lehreinheit
-					WHERE tbl_organisationseinheit.oe_kurzbz = lehrfach.oe_kurzbz
-						AND lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
-				),
-				tag_data_agg AS (
-					SELECT
-						lehreinheit_id,
-						COALESCE(json_agg(tag ORDER BY id), '[]'::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,
-								lehreinheit_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 lehreinheit_id IN (SELECT lehreinheit_id FROM lehreinheiten)
-						) AS tag
-					GROUP BY lehreinheit_id
-				)
+				". $this->_getGruppenCTE() . ", 
+				". $this->_getLektorenCTE() . ", 
+				". $this->_getFachbereichCTE() . ",
+				". $this->_getTagsCTE() . "
+				
 				SELECT lehreinheiten.*,
 						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
 						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
 						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
 						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
-						(
-							SELECT string_agg(gr.gruppe, ' ')
-							FROM gruppen gr
-							WHERE gr.lehreinheit_id = lehreinheiten.lehreinheit_id
-						) AS gruppen,
-						(
-							SELECT string_agg(ma.kurzbz, ' ')
-							FROM mitarbeiter ma
-							WHERE ma.lehreinheit_id = lehreinheiten.lehreinheit_id
-						) AS lektoren,
-						(
-							SELECT string_agg(fachbereich.bezeichnung, ' ')
-							FROM fachbereich
-							WHERE fachbereich.lehreinheit_id = lehreinheiten.lehreinheit_id
-						) AS fachbereich
+						gruppen.gruppen,
+						mitarbeiter.lektoren,
+						mitarbeiter.le_planstunden,
+						mitarbeiter.semesterstunden,
+						fachbereich.bezeichnung as fachbereich,
+						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
+						semester
 				FROM lehreinheiten
 					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
-					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id";
+					LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id
+					LEFT JOIN mitarbeiter ON lehreinheiten.lehreinheit_id = mitarbeiter.lehreinheit_id
+					LEFT JOIN fachbereich ON lehreinheiten.lehreinheit_id = fachbereich.lehreinheit_id
+					LEFT JOIN gruppen ON lehreinheiten.lehreinheit_id = gruppen.lehreinheit_id
+				WHERE true 
+				";
 
-		return $this->execReadOnlyQuery($qry, array($lv_id, $studiensemester_kurzbz));
+		$params = array($lv_id, $studiensemester_kurzbz);
+
+		if ($mitarbeiter_uid !== null)
+		{
+			$qry .= " AND lehreinheiten.lehreinheit_id IN ( SELECT lehreinheit_id FROM lehre.tbl_lehreinheitmitarbeiter WHERE mitarbeiter_uid = ?) ";
+			$params[] = $mitarbeiter_uid;
+		}
+
+		if($fachbereich_kurzbz !== null)
+		{
+			$qry .= " AND EXISTS ( SELECT 1 FROM lehre.tbl_lehrveranstaltung JOIN public.tbl_fachbereich USING(oe_kurzbz) WHERE fachbereich_kurzbz= ? AND lehrveranstaltung_id=lehreinheiten.lehrfach_id)";
+			$params[] = $fachbereich_kurzbz;
+		}
+		$qry .= " ORDER BY lehrveranstaltung_id;";
+
+		return $this->execReadOnlyQuery($qry, $params);
 	}
 
 	private function getLVTmp($stg_kz = null)
 	{
 		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
-						'' as studienplan_id, '' as studienplan_beeichnung, 
-						CONCAT(vw_lehreinheit.stg_typ, vw_lehreinheit.stg_kurzbz) as studiengang
-				FROM campus.vw_lehreinheit
+						'' as stundenblockung,
+						'' as lehreinheit_id,
+						'' as wochenrythmus,
+						'' as raumtyp,
+						'' as raumtypalternativ,
+						'' as gruppen,
+						'' as studienplan_id,
+						'' as studienplan_beeichnung, 
+						UPPER(CONCAT(vw_lehreinheit.stg_typ, vw_lehreinheit.stg_kurzbz)) as studiengang
+                FROM campus.vw_lehreinheit
 				WHERE mitarbeiter_uid = ?
 				  AND studiensemester_kurzbz = ?";
 
@@ -460,89 +426,6 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}
 
-
-
-	public function getLEByLV($lv_id, $studiensemester_kurzbz, $mitarbeiter_uid = null, $fachbereich_kurzbz = null)
-	{
-		$qry = "
-				WITH gruppen AS (
-					SELECT
-						COALESCE(
-							string_agg(
-								tbl_lehreinheitgruppe.gruppe_kurzbz, ', '
-								) FILTER (WHERE NOT direktinskription),
-								string_agg(
-									COALESCE(
-										upper(tbl_studiengang.typ::varchar(1) ||tbl_studiengang.kurzbz) ||
-										'-'||
-										COALESCE(tbl_lehreinheitgruppe.semester::varchar, '') ||
-										COALESCE(tbl_lehreinheitgruppe.verband::varchar, '')||
-										COALESCE(tbl_lehreinheitgruppe.gruppe, '')), ', '
-									)
-						) AS gruppen,
-						lehreinheit_id
-					FROM
-						lehre.tbl_lehreinheitgruppe
-							LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-							LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
-					GROUP BY lehreinheit_id
-				),
-				lektoren AS (
-					SELECT string_agg(kurzbz, ' ') as lektoren,
-						   string_agg(semesterstunden::text, ' ') as semesterstunden,
-						   string_agg(planstunden::text, ' ') as planstunden,
-						   lehreinheit_id
-					FROM lehre.tbl_lehreinheitmitarbeiter
-							 JOIN public.tbl_mitarbeiter USING(mitarbeiter_uid)
-					GROUP BY lehreinheit_id
-				),
-				fachbereich AS (
-					SELECT
-						string_agg(CONCAT(tbl_organisationseinheit.bezeichnung, ' (', tbl_organisationseinheit.organisationseinheittyp_kurzbz, ')'),' ')  as fachbereich,
-						lehreinheit_id
-					FROM
-						public.tbl_organisationseinheit,
-						lehre.tbl_lehrveranstaltung as lehrfach,
-						lehre.tbl_lehreinheit
-					WHERE
-						tbl_organisationseinheit.oe_kurzbz = lehrfach.oe_kurzbz
-					  AND lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
-					GROUP BY lehreinheit_id
-				)
-				SELECT tbl_lehreinheit.*,
-						tbl_lehrveranstaltung.*,
-						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
-						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-						lektoren.lektoren,
-						lektoren.semesterstunden,
-						lektoren.planstunden,
-						fachbereich.fachbereich
-				FROM lehre.tbl_lehreinheit
-					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
-					LEFT JOIN gruppen ON tbl_lehreinheit.lehreinheit_id = gruppen.lehreinheit_id
-					LEFT JOIN lektoren ON tbl_lehreinheit.lehreinheit_id = lektoren.lehreinheit_id
-					LEFT JOIN fachbereich ON tbl_lehreinheit.lehreinheit_id = fachbereich.lehreinheit_id
-				WHERE tbl_lehreinheit.lehrveranstaltung_id = ?
-				AND studiensemester_kurzbz = ?
-				";
-
-		$params = array($lv_id, $studiensemester_kurzbz);
-		if ($mitarbeiter_uid !== null)
-		{
-			$qry .= " AND tbl_lehreinheit.lehreinheit_id IN ( SELECT lehreinheit_id FROM lehre.tbl_lehreinheitmitarbeiter WHERE mitarbeiter_uid = ?) ";
-			$params[] = $mitarbeiter_uid;
-		}
-
-		if($fachbereich_kurzbz !== null)
-		{
-			$qry .= " AND EXISTS ( SELECT 1 FROM lehre.tbl_lehrveranstaltung JOIN public.tbl_fachbereich USING(oe_kurzbz) WHERE fachbereich_kurzbz= ? AND lehrveranstaltung_id=tbl_lehreinheit.lehrfach_id)";
-			$params[] = $fachbereich_kurzbz;
-		}
-		$qry .= " ORDER BY lehreinheit_id;";
-
-		return $this->execReadOnlyQuery($qry, $params);
-	}
-
 	public function deleteLehreinheit($lehreinheit_id)
 	{
 		$lehreinheit = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
@@ -741,4 +624,85 @@ EOSQL;
 		$this->db->trans_commit();
 		return success('Contract successfully updated.');
 	}
+
+	private function _getGruppenCTE()
+	{
+		return "gruppen AS (
+					SELECT
+						lehreinheit_id,
+						 STRING_AGG(
+								 CASE
+									 WHEN (tbl_lehreinheitgruppe.gruppe_kurzbz IS NULL OR tbl_lehreinheitgruppe.gruppe_kurzbz = '')
+										 THEN
+										 UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) ||
+										 COALESCE(TRIM(tbl_lehreinheitgruppe.semester::text), '') ||
+										 COALESCE(TRIM(tbl_lehreinheitgruppe.verband), '') ||
+										 COALESCE(TRIM(tbl_lehreinheitgruppe.gruppe), '')
+									 ELSE
+										 CASE
+											 WHEN NOT tbl_gruppe.direktinskription THEN tbl_lehreinheitgruppe.gruppe_kurzbz
+											 ELSE NULL
+											 END
+									 END,
+								 ' '
+						 ) AS gruppen
+					 FROM lehre.tbl_lehreinheitgruppe
+						LEFT JOIN public.tbl_studiengang USING (studiengang_kz)
+						LEFT JOIN public.tbl_gruppe USING (gruppe_kurzbz)
+						JOIN lehreinheiten USING(lehreinheit_id)
+						GROUP BY lehreinheit_id
+				)";
+	}
+	private function _getLektorenCTE()
+	{
+		return "mitarbeiter AS (
+					 SELECT
+						tbl_lehreinheitmitarbeiter.lehreinheit_id,
+						STRING_AGG(m.kurzbz, ' ') AS lektoren,
+						STRING_AGG(tbl_lehreinheitmitarbeiter.semesterstunden::text, ' ') AS semesterstunden,
+						STRING_AGG(tbl_lehreinheitmitarbeiter.planstunden::text, ' ') AS le_planstunden
+					FROM lehre.tbl_lehreinheitmitarbeiter
+						JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+						JOIN lehreinheiten USING(lehreinheit_id)
+					GROUP BY tbl_lehreinheitmitarbeiter.lehreinheit_id
+				)";
+	}
+
+	private function _getFachbereichCTE()
+	{
+		return "fachbereich AS (
+					SELECT
+						 CONCAT(tbl_organisationseinheit.bezeichnung, ' (',  tbl_organisationseinheit.organisationseinheittyp_kurzbz, ')') as bezeichnung,
+						 lehreinheiten.lehreinheit_id
+					 FROM public.tbl_organisationseinheit
+						JOIN lehre.tbl_lehrveranstaltung AS lehrfach ON tbl_organisationseinheit.oe_kurzbz = lehrfach.oe_kurzbz
+						JOIN lehre.tbl_lehreinheit ON lehrfach.lehrveranstaltung_id = tbl_lehreinheit.lehrfach_id
+						JOIN lehreinheiten ON tbl_lehreinheit.lehreinheit_id = lehreinheiten.lehreinheit_id
+				)";
+	}
+
+	private function _getTagsCTE()
+	{
+		return "tag_data_agg AS (
+					SELECT
+						lehreinheit_id,
+						COALESCE(json_agg(tag ORDER BY id), '[]'::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,
+								lehreinheit_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 lehreinheit_id IN (SELECT lehreinheit_id FROM lehreinheiten)
+						) AS tag
+					GROUP BY lehreinheit_id
+				)";
+	}
+
 }
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
index 5dd2fa66c..8fc8e09f3 100644
--- a/application/models/education/Lehreinheitgruppe_model.php
+++ b/application/models/education/Lehreinheitgruppe_model.php
@@ -304,7 +304,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		}
 		else if ($verband === true)
 		{
-			$gruppen_result = $this->_ci->LehrverbandModel->loadWhere(array('gid' => $gid));
+			$gruppen_result = $this->LehrverbandModel->loadWhere(array('gid' => $gid));
 
 			if (!hasData($gruppen_result))
 				return error('No group found for gid ' . $gid);
@@ -470,6 +470,6 @@ class Lehreinheitgruppe_model extends DB_Model
 								END AS verplant");
 		$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
-		return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_gruppe.direktinskription' => false));
+		return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
 	}
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 955177273..121de9233 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1122,9 +1122,9 @@ class Lehrveranstaltung_model extends DB_Model
 
 		$qry .= "
 			SELECT DISTINCT on(lehrveranstaltung_id) lehrveranstaltung_id, 
-				kurzbz as lv_kurzbz,
-				bezeichnung as lv_bezeichnung,
-				bezeichnung_english as lv_bezeichnung_english,
+				tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
 				studiengang_kz,
 				semester,
 				tbl_lehrveranstaltung.sprache,
@@ -1133,7 +1133,7 @@ class Lehrveranstaltung_model extends DB_Model
 				tbl_lehrveranstaltung.anmerkung,
 				tbl_lehrveranstaltung.lehre,
 				lehreverzeichnis as lv_lehreverzeichnis,
-				aktiv,
+				tbl_lehrveranstaltung.aktiv,
 				planfaktor as lv_planfaktor,
 				planlektoren as lv_planlektoren,
 				planpersonalkosten as lv_planpersonalkosten,
@@ -1143,9 +1143,11 @@ class Lehrveranstaltung_model extends DB_Model
 				''::text as studienplan_id,
 				'' as studienplan_bezeichnung,
 				'' as studienplan_lehrveranstaltung_id_parent,
-				tbl_lehrveranstaltung.lehrtyp_kurzbz
+				tbl_lehrveranstaltung.lehrtyp_kurzbz,
+				UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang
 			FROM lehre.tbl_lehrveranstaltung 
 				JOIN lehre.tbl_lehreinheit USING (lehrveranstaltung_id)
+				JOIN public.tbl_studiengang USING(studiengang_kz)
 				WHERE studiengang_kz = ?
 					AND studiensemester_kurzbz = ?
 		";
@@ -1178,17 +1180,18 @@ class Lehrveranstaltung_model extends DB_Model
 	{
 		return "
 		SELECT
-				lehrveranstaltung_id, kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
+				lehrveranstaltung_id, tbl_lehrveranstaltung.kurzbz as lv_kurzbz, tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung, bezeichnung_english as lv_bezeichnung_english, studiengang_kz,
 				tbl_studienplan_lehrveranstaltung.semester, tbl_lehrveranstaltung.sprache,
 				ects as lv_ects, semesterstunden, anmerkung, lehre, lehreverzeichnis as lv_lehreverzeichnis, tbl_lehrveranstaltung.aktiv,
 				planfaktor as lv_planfaktor, planlektoren as lv_planlektoren, planpersonalkosten as lv_planpersonalkosten,
 				plankostenprolektor as lv_plankostenprolektor, lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.orgform_kurzbz,
 				tbl_studienplan_lehrveranstaltung.studienplan_id::text as studienplan_id, tbl_studienplan.bezeichnung as studienplan_bezeichnung, tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent::text,
-				tbl_lehrveranstaltung.lehrtyp_kurzbz
+				tbl_lehrveranstaltung.lehrtyp_kurzbz, UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang
 			FROM
 			    lehre.tbl_lehrveranstaltung
 				JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id)
 				JOIN lehre.tbl_studienplan USING(studienplan_id)
+				JOIN tbl_studiengang USING(studiengang_kz)
 			WHERE
 				tbl_lehrveranstaltung.aktiv AND ((studienplan_id, tbl_studienplan_lehrveranstaltung.semester) IN ( " . implode(',', $placeholders) . "))
 			UNION
diff --git a/public/css/Lvverwaltung.css b/public/css/Lvverwaltung.css
index 1ca3f0be1..38d74def4 100644
--- a/public/css/Lvverwaltung.css
+++ b/public/css/Lvverwaltung.css
@@ -14,14 +14,17 @@ textarea[name="anmerkung"] {
 .lv_table_icon.icon-modul::before
 {
 	content: '\f468';
+	color: #4e4ed2;
 }
 
 .lv_table_icon.icon-lv::before
 {
 	content: '\f466';
+	color: black;
 }
 
 .lv_table_icon.icon-::before
 {
 	content: '\f073';
-}
\ No newline at end of file
+	color: #f3c541;
+}
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 772af5a47..c7c34802d 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -186,7 +186,7 @@ export default {
 				: this.$route.params.stg;
 		}
 
-		this.$p.loadCategory(['lehre', 'person'])
+		this.$p.loadCategory(['lehre', 'person', 'global'])
 
 		this.$api.call(ApiDetails.getStudiensemester())
 			.then(result => {
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 9b0ae71f3..b4674ccff 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -100,7 +100,6 @@ export default {
 			expanded: [],
 			selectedColumnValues: [],
 			tagEndpoint: ApiTag,
-			iconPath: FHC_JS_DATA_STORAGE_OBJECT.app_root + '/skin/images/lehrtyp_',
 			tabulatorEvents: [
 				{
 					event: 'rowSelectionChanged',
@@ -119,7 +118,8 @@ export default {
 					handler: (data) => {
 						this.getExpandedRows()
 					}
-				},{
+				},
+				{
 					event: 'dataTreeRowCollapsed',
 					handler: (data) => {
 						this.getExpandedRows()
@@ -157,19 +157,18 @@ export default {
 				initialSort:[
 					{column: 'lv_bezeichnung', dir: 'desc'},
 				],
+				dataTreeChildIndent: 20,
 				dataTreeElementColumn: "lv_kurzbz",
-				dataTreeFilter: true,
 				dataTreeStartExpanded: false,
 				dataTreeCollapseElement: '<i class="fa-solid fa-caret-down"></i>',
 				dataTreeExpandElement: '<i class="fa-solid fa-caret-right"></i>',
 				columnDefaults: {
 					tooltip: true,
 					headerFilter: "input",
-					headerFilterFunc: extendedHeaderFilter
+					headerFilterFunc: extendedHeaderFilter,
 				},
 				layout: 'fitDataStretch',
-				layoutColumnsOnNewData: false,
-				height: '100%',
+				persistenceID: 'lehrveranstaltungen_2025_07_07_v1',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
@@ -217,7 +216,6 @@ export default {
 					];
 				},
 
-				persistenceID: 'lehrveranstaltungen_2025_05_27_v1',
 				columns: [
 					{
 						title: this.$p.t('lehre', 'kurzbz'),
@@ -302,45 +300,55 @@ export default {
 						},
 						width: 150,
 					},
+					{
+						title: this.$p.t('lehre', 'kurzbz'),
+						field: "lv_kurzbz_anzeige",
+						headerFilterFuncParams: {field: 'lv_kurzbz_anzeige'},
+						formatter: (cell, formatterParams) => {
+							let rowData = cell.getRow().getData();
+							return rowData?.lv_kurzbz?.toUpperCase();
+						},
+						headerFilter: true
+					},
 					{
 						title: this.$p.t('lehre', 'lehrveranstaltung_id'),
 						field: "lehrveranstaltung_id",
 						headerFilterFuncParams: {field: 'lehrveranstaltung_id'},
-						headerFilter: true
+						headerFilter: true,
+						visible: false
 					},
 					{title: this.$p.t('ui', 'bezeichnung'), field: "lv_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung'}},
-					{title: this.$p.t('lehre', 'bezeichnungeng'), field: "lv_bezeichnung_english", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung_english'}},
+					{title: this.$p.t('lehre', 'bezeichnungeng'), field: "lv_bezeichnung_english", headerFilter: true, headerFilterFuncParams: {field: 'lv_bezeichnung_english'}, visible: false},
 					{
 						title: this.$p.t('lehre', 'studiengangskennzahlLehre'),
 						field: "lv_studiengang_kz",
 						headerFilter: true,
-						headerFilterFuncParams: {field: 'lv_studiengang_kz'}
+						headerFilterFuncParams: {field: 'lv_studiengang_kz'},
+						visible: false
 					},
-					{title: this.$p.t('lehre', 'studiengang'), field: "studiengang", headerFilter: true, headerFilterFuncParams: {field: 'studiengang'}},
+					{title: this.$p.t('lehre', 'studiengang'), field: "studiengang", headerFilter: true, headerFilterFuncParams: {field: 'studiengang'}, visible: false},
 					{title: this.$p.t('lehre', 'semester'), field: "semester", headerFilter: true, headerFilterFuncParams: {field: 'semester'}},
-					{title: this.$p.t('global', 'sprache'), field: "sprache", headerFilter: true, headerFilterFuncParams: {field: 'sprache'}},
-					{title: this.$p.t('lehre', 'ects'), field: "lv_ects", headerFilter: true, headerFilterFuncParams: {field: 'lv_ects'}},
-					{title: this.$p.t('lehre', 'semesterstunden'), field: "semesterstunden", headerFilter: true, headerFilterFuncParams: {field: 'semesterstunden'}},
-					{title: this.$p.t('global', 'anmerkung'), field: "anmerkung", headerFilter: true, headerFilterFuncParams: {field: 'anmerkung'}},
-					{title: this.$p.t('lehre', 'lehre'), field: "lehre", headerFilter: true, headerFilterFuncParams: {field: 'lehre'}},
-					{title: "Lehreverzeichnis", field: "lehreverzeichnis", headerFilter: true, headerFilterFuncParams: {field: 'lehreverzeichnis'}},
-					{title: this.$p.t('person', 'aktiv'), field: "aktiv", headerFilter: true, headerFilterFuncParams: {field: 'aktiv'}},
-					{title: "Planfaktor", field: "planfaktor", headerFilter: true, headerFilterFuncParams: {field: 'planfaktor'}},
-					{title: "Planlektoren", field: "planlektoren", headerFilter: true, headerFilterFuncParams: {field: 'planlektoren'}},
-					{title: "planpersonalkosten", field: "planpersonalkosten", headerFilter: true, headerFilterFuncParams: {field: 'planpersonalkosten'}},
-					{title: "plankostenprolektor", field: "plankostenprolektor", headerFilter: true, headerFilterFuncParams: {field: 'plankostenprolektor'}},
-					{title: this.$p.t('ui', 'organisationsform'), field: "orgform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'orgform_kurzbz'}},
-					{title: this.$p.t('ui', 'studienplan_id'), field: "studienplan_id", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_id'}},
-					{title: "studienplan_bezeichnung", field: "studienplan_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_bezeichnung'}},
-					{title: "lehrtyp_kurzbz", field: "lehrtyp_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrtyp_kurzbz'}},
+					{title: this.$p.t('global', 'sprache'), field: "sprache", headerFilter: true, headerFilterFuncParams: {field: 'sprache'}, visible: false},
+					{title: this.$p.t('lehre', 'ects'), field: "lv_ects", headerFilter: true, headerFilterFuncParams: {field: 'lv_ects'}, visible: false},
+					{title: this.$p.t('lehre', 'semesterstunden'), field: "semesterstunden", headerFilter: true, headerFilterFuncParams: {field: 'semesterstunden'}, visible: false},
+					{title: this.$p.t('global', 'anmerkung'), field: "anmerkung", headerFilter: true, headerFilterFuncParams: {field: 'anmerkung'}, visible: false},
+					{title: this.$p.t('lehre', 'lehre'), field: "lehre", headerFilter: true, headerFilterFuncParams: {field: 'lehre'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
+					{title: this.$p.t('person', 'aktiv'), field: "aktiv", headerFilter: true, headerFilterFuncParams: {field: 'aktiv'}, formatter: (cell) => cell.getValue() ? this.toUpperCase(this.$p.t('ui', 'ja')) : this.toUpperCase(this.$p.t('ui', 'nein')), visible: false},
+					{title: this.$p.t('lehre', 'organisationsform'), field: "orgform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'orgform_kurzbz'}},
+					{title: this.$p.t('ui', 'studienplan_id'), field: "studienplan_id", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_id'}, visible: false},
+					{title: this.$p.t('lehre', 'studienplan'), field: "studienplan_bezeichnung", headerFilter: true, headerFilterFuncParams: {field: 'studienplan_bezeichnung'}, visible: false},
+					{title: this.$p.t('lehre', 'lehrtyp'), field: "lehrtyp_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrtyp_kurzbz'}, visible: false},
 					{title: this.$p.t('lehre', 'lehrform'), field: "lehrform_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'lehrform_kurzbz'}},
-					{title: this.$p.t('lehre', 'leplanstunden'), field: "le_planstunden", headerFilter: true, headerFilterFuncParams: {field: 'le_planstunden'}},
-					{title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}},
-					{title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}},
-					{title: this.$p.t('lehre', 'wochenrhytmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}},
-					{title: this.$p.t('lehre', 'startkw'), field: "startkw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}},
-					{title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}},
-					{title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}},
+					{title: this.$p.t('lehre', 'leplanstunden'), field: "le_planstunden", headerFilter: true, headerFilterFuncParams: {field: 'le_planstunden'}, visible: false},
+					{title: this.$p.t('lehre', 'lehreinheit_id'), field: "lehreinheit_id", headerFilter: true, headerFilterFuncParams: {field: 'lehreinheit_id'}, visible: false},
+					{title: this.$p.t('lehre', 'studiensemester'), field: "studiensemester_kurzbz", headerFilter: true, headerFilterFuncParams: {field: 'studiensemester_kurzbz'}, visible: false},
+					{title: this.$p.t('lehre', 'unr'), field: "unr", headerFilter: true, headerFilterFuncParams: {field: 'unr'}, visible: false},
+					{title: this.$p.t('lehre', 'fachbereich'), field: "fachbereich", headerFilter: true, headerFilterFuncParams: {field: 'fachbereich'}, visible: false},
+					{title: this.$p.t('lehre', 'stundenblockung'), field: "stundenblockung", headerFilter: true, headerFilterFuncParams: {field: 'stundenblockung'}, visible: false},
+					{title: this.$p.t('lehre', 'wochenrhythmus'), field: "wochenrythmus", headerFilter: true, headerFilterFuncParams: {field: 'wochenrythmus'}, visible: false},
+					{title: this.$p.t('lehre', 'startkw'), field: "start_kw", headerFilter: true, headerFilterFuncParams: {field: 'startkw'}, visible: false},
+					{title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}, visible: false},
+					{title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}, visible: false},
 					{title: this.$p.t('lehre', 'gruppen'), field: "gruppen", headerFilter: true, headerFilterFuncParams: {field: 'gruppen'}},
 					{title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: 'lektoren'}},
 				],
@@ -359,6 +367,11 @@ export default {
 		shouldAutoLoad() {
 			return this.filter && this.filter.activeFilter;
 		},
+		toUpperCase(str) {
+			if (!str)
+				return '';
+			return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase()
+		},
 		async reload()
 		{
 
@@ -369,7 +382,7 @@ export default {
 		},
 		rowSelectionChanged(data) {
 			this.selectedRows = this.$refs.table.tabulator.getSelectedRows();
-			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().lehreinheit_id !== undefined).map(row => row.getData().lehreinheit_id);
+			this.selectedColumnValues = this.selectedRows.filter(row => row.getData().lehreinheit_id !== undefined && row.getData().lehreinheit_id).map(row => row.getData().lehreinheit_id);
 
 			if (data[0]?.lehreinheit_id !== undefined && this.selectedColumnValues.length === 1)
 			{
@@ -471,9 +484,7 @@ export default {
 				if (Array.isArray(addedTag.response))
 				{
 					addedTag.response.forEach(tag => {
-
-						const all = this.getAllRows(table.getRows());
-						const targetRow = all.find(row => row.getData().lehreinheit_id === tag.lehreinheit_id);
+						const targetRow = this.allRows.find(row => row.getData().lehreinheit_id === tag.lehreinheit_id);
 						if (targetRow)
 						{
 							const rowData = targetRow.getData();
@@ -496,10 +507,7 @@ export default {
 			});
 		},
 		deletedTag(deletedTag) {
-			const table = this.$refs.table.tabulator;
-			const all = this.getAllRows(table.getRows());
-
-			const targetRow = all.find(row => {
+			const targetRow = this.allRows.find(row => {
 				const rowData = row.getData();
 
 				let tags = [];
@@ -532,10 +540,7 @@ export default {
 		},
 
 		updatedTag(updatedTag) {
-			const table = this.$refs.table.tabulator;
-			const all = this.getAllRows(table.getRows());
-
-			const targetRow = all.find(row => {
+			const targetRow = this.allRows.find(row => {
 				const rowData = row.getData();
 				let tags = [];
 
@@ -587,9 +592,8 @@ export default {
 
 		async getExpandedRows() {
 			this.expanded = [];
-			let rows = this.$refs.table.tabulator.getRows();
-			let allRows = this.getAllRows(rows);
-			allRows.forEach(row => {
+
+			this.allRows.forEach(row => {
 				if (row.getTreeChildren().length > 0 && row.isTreeExpanded())
 				{
 					this.expanded.push(row.getData().uniqueindex);
@@ -597,9 +601,9 @@ export default {
 			});
 		},
 		reexpandRows() {
-			const all = this.getAllRows(this.$refs.table.tabulator.getRows());
+			this.allRows = this.getAllRows(this.$refs.table.tabulator.getRows());
 
-			const matchingRows = all.filter(row =>
+			const matchingRows = this.allRows.filter(row =>
 				this.expanded.includes(row.getData().uniqueindex)
 			);
 
@@ -637,6 +641,39 @@ export default {
 			});
 			return result;
 		},
+		resetTree() {
+			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()
+		{
+			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;
+					lastMatchingRow = row;
+				}
+			});
+
+			if (lastMatchingRow)
+			{
+				lastMatchingRow.treeExpand();
+			}
+			this.$refs.table.tabulator.redraw();
+		},
 	},
 	template: `
 	<core-filter-cmpt
@@ -660,6 +697,8 @@ export default {
 				@updated="updatedTag"
 				zuordnung_typ="lehreinheit_id"
 			></core-tag>
+			<button @click="expandTree" class="btn btn-outline-secondary" type="button"><i class="fa-solid fa-maximize"></i></button>
+			<button @click="resetTree" class="btn btn-outline-secondary" type="button"><i id="togglegroup" class="fa-solid fa-minimize"></i></button>
 		</template>
 		<template #search>
 			<slot name="filterzuruecksetzen"></slot>
diff --git a/public/js/components/LVVerwaltung/Tabs/Notiz.js b/public/js/components/LVVerwaltung/Tabs/Notiz.js
index 6bccf5c52..7ec1a3dfe 100644
--- a/public/js/components/LVVerwaltung/Tabs/Notiz.js
+++ b/public/js/components/LVVerwaltung/Tabs/Notiz.js
@@ -19,7 +19,7 @@ export default {
 			class="overflow-hidden"
 			:endpoint="endpoint"
 			ref="formc"
-			notiz-layout="twoColumnsFormLeft"
+			notiz-layout="popupModal"
 			type-id="lehreinheit_id"
 			:id="modelValue.lehreinheit_id"
 			show-document
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c158e3971..d54efe32c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -39744,6 +39744,48 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'fachbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Institut',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Institute',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lehrtyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrtyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN START
 	array(
 		'app' => 'core',

From aca49114be9f54a4b814d125967af6e991b47987 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 7 Jul 2025 09:56:34 +0200
Subject: [PATCH 0398/1357] anmerkung zur bewerbung weiterleiten

---
 .../views/system/infocenter/anmerkungenZurBewerbung.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php
index ca012ff3e..3ffe5f9a2 100644
--- a/application/views/system/infocenter/anmerkungenZurBewerbung.php
+++ b/application/views/system/infocenter/anmerkungenZurBewerbung.php
@@ -18,6 +18,9 @@
 							<?php (!isset($notiz->kurzbzlang)) ?: print_r('(' . nl2br($notiz->kurzbzlang) . ') - ') ?>
 							<?php echo nl2br($notiz->text) ?>
 						</td>
+						<td>
+							<a href="mailto:<?php echo htmlspecialchars($notiz->email)?>?body=<?php echo rawurlencode($notiz->text);; ?>"><i class="fa fa-envelope"></i></a>
+						</td>
 					</tr>
 				<?php endforeach; ?>
 				</tbody>

From 5280943099901617c81318d27c225c64c0553780 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 7 Jul 2025 10:10:38 +0200
Subject: [PATCH 0399/1357] fix(Studium):checks if the query of the data in the
 studium endpoints returns an array otherwise return empty array to avoid
 breaking the endpoint

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

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 6f1eff18f..fb4d3ce3c 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -313,10 +313,12 @@ SELECT tbl_lehrveranstaltung.*,
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
 		$this->load->library('StundenplanLib');
 		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
-		$lektoren = $this->getDataOrTerminateWithError($lektoren);
+		$lektoren = $this->getDataOrTerminateWithError($lektoren) ?? [];
+		
 		$lektoren = array_map(function($lektor){
 			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
 		},$lektoren);
+		
 		return $lektoren;
 	}
 

From 4937c1190aea2d13e33c4131237ad5e953948573 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Jul 2025 11:13:37 +0200
Subject: [PATCH 0400/1357] bugfix: warning html-tags

---
 public/js/components/DetailHeader/DetailHeader.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 96cd2e4b7..4cf2571a8 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -110,8 +110,7 @@ export default {
 					<div
 						v-for="person in headerData"
 						:key="person.person_id"
-						class="d-flex flex-column align-items-center h-100"
-						class="position-relative d-inline-block"
+						class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
 					>
 						<img
 						  class="d-block h-100 rounded"
@@ -162,7 +161,6 @@ export default {
 					  </h5>
 
 					</div>
-				</div>
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">

From 7bd0b39f77f9becdaa738432afda143e630e6746 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 7 Jul 2025 11:14:02 +0200
Subject: [PATCH 0401/1357] resetting currentTreeLevel

---
 public/js/components/LVVerwaltung/Setup/Table.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index b4674ccff..34a3b3399 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -607,6 +607,9 @@ export default {
 				this.expanded.includes(row.getData().uniqueindex)
 			);
 
+			if (matchingRows.length === 0)
+				this.currentTreeLevel = 0;
+
 			matchingRows.forEach((row, index) => {
 				row._row.modules.dataTree.open = true;
 

From ddea3afde48e8e2d946523302ced6c96366c2cde Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Jul 2025 15:36:12 +0200
Subject: [PATCH 0402/1357] =?UTF-8?q?Adaptions=20FHC-Alert=20-=20restructu?=
 =?UTF-8?q?re=20plugins=20Api,=20FhcAlert=20ans=20Phrasen=20to=20use=20Phr?=
 =?UTF-8?q?asen=20in=20Fhc-Alert=20=E2=80=93=20fix=20behaviour=20alert=20w?=
 =?UTF-8?q?arning:=20show=20always=20clossing=20cross,=20and=20symbol=20-?=
 =?UTF-8?q?=20fix=20behaviour=20alert=20error:=20add=20scrolling=20to=20Te?=
 =?UTF-8?q?xt=20MessageError=20-=20phrases=20alerts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/components/primevue.css            | 11 ++++
 .../js/components/Stv/Studentenverwaltung.js  |  2 +
 public/js/plugins/Api.js                      |  4 +-
 public/js/plugins/FhcAlert.js                 | 23 ++++---
 public/js/plugins/Phrasen.js                  |  6 +-
 system/phrasesupdate.php                      | 62 +++++++++++++++++++
 6 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 38b15004b..fbbae4e58 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -5249,6 +5249,8 @@
 }
 .p-toast .p-toast-message .p-toast-message-content .p-toast-message-text {
   margin: 0 0 0 1rem;
+  flex: 1 0 0%;
+  word-break: break-word;
 }
 .p-toast .p-toast-message .p-toast-message-content .p-toast-message-icon {
   font-size: 2rem;
@@ -5314,6 +5316,15 @@
 .p-toast .p-toast-message.p-toast-message-error .p-toast-icon-close {
   color: #721c24;
 }
+.p-toast.p-component.p-toast-top-right.fhc-alert {
+  max-height: calc(100vh - 20px - 1rem);
+  overflow: auto;
+}
+
+.p-toast-message-text .alertCollapseText {
+  overflow: auto;
+  max-height: 30rem;
+}
 
 .p-galleria .p-galleria-close {
   margin: 0.5rem;
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 36340a767..96846f76d 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -192,6 +192,8 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
+		//Test manu Systemerror
+		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl(
 				ApiStv.students.uid(this.$route.params.id),
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index b087a6235..d0ffaa439 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -6,7 +6,9 @@ export default {
 		if (app.config.globalProperties.$api) {
 			return;
 		}
-		app.use(FhcAlert);
+
+		if (!app.config.globalProperties.$fhcAlert)
+			app.use(FhcAlert);
 
 		function _get_config(form, uri, data, config) {
 			if (typeof form == 'string' && config === undefined) {
diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index c6aaee33e..ad3975a73 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -96,6 +96,7 @@ import PvConfig from "../../../index.ci.php/public/js/components/primevue/config
 import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
 import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
 import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
+import FhcPhrasen from "./Phrasen.js";
 
 import {CoreRESTClient} from '../RESTClient.js';
 
@@ -138,7 +139,7 @@ const helperApp = Vue.createApp({
 			return FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto !== '';
 		}
 	},
-	template: `
+	template: /* html */`
 	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
 		<template #message="slotProps">
@@ -168,7 +169,7 @@ const helperApp = Vue.createApp({
 					</a>
 				</div>
 				<div ref="messageCard" :id="'fhcAlertCollapseMessageCard' + slotProps.message.id" class="collapse mt-3">
-					<div class="card card-body text-body small">
+					<div class="card card-body text-body small alertCollapseText">
 						{{slotProps.message.detail}}
 					</div>
 				</div>
@@ -180,6 +181,7 @@ const helperApp = Vue.createApp({
 
 helperApp.use(PvConfig);
 helperApp.use(PvConfirmationService);
+//helperApp.use(FhcPhrasen);
 
 const helperAppInstance = helperApp.mount(helperAppContainer);
 
@@ -188,6 +190,9 @@ document.body.appendChild(helperAppContainer);
 
 export default {
 	install: (app, options) => {
+		if (!app.config.globalProperties.$p)
+			app.use(FhcPhrasen);
+
 		const $fhcAlert = {
 			alertSuccess(message) {
 				if (Array.isArray(message))
@@ -210,6 +215,8 @@ export default {
 				helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
 			},
 			alertSystemError(message) {
+				//TODO(Manu) for translation of content of template: restructure in data
+				//and update definitions with  translations
 				if (Array.isArray(message))
 					return message.forEach(this.alertSystemError);
 				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
@@ -218,11 +225,11 @@ export default {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: 'fhcAlertConfirm',
-						header: 'Achtung',
-						message: 'Möchten Sie sicher löschen?',
-						acceptLabel: 'Löschen',
+						header: Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
+						message: Vue.computed(() => app.config.globalProperties.$p.t('alert/confirm_delete')),
+						acceptLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/loeschen')),
 						acceptClass: 'p-button-danger',
-						rejectLabel: 'Abbrechen',
+						rejectLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
 						rejectClass: 'p-button-secondary',
 						accept() {
 							resolve(true);
@@ -237,11 +244,11 @@ export default {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: options?.group ?? 'fhcAlertConfirm',
-						header: options?.header ?? 'Achtung',
+						header: options?.header ?? Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
 						message: options?.message ?? '',
 						acceptLabel: options?.acceptLabel ?? 'Ok',
 						acceptClass: options?.acceptClass ?? 'btn btn-primary',
-						rejectLabel: options?.rejectLabel ?? 'Abbrechen',
+						rejectLabel: options?.rejectLabel ?? Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
 						rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary',
 						accept() {
 							resolve(true);
diff --git a/public/js/plugins/Phrasen.js b/public/js/plugins/Phrasen.js
index 70f4fb64f..303e74358 100644
--- a/public/js/plugins/Phrasen.js
+++ b/public/js/plugins/Phrasen.js
@@ -87,8 +87,10 @@ const phrasen = {
 
 export default {
 	install(app, options) {
-		app.use(OldFhcApi); // TODO(chris): remove at some point
-		app.use(PluginsApi);
+		if (!app.config.globalProperties.$fhcApi)
+			app.use(OldFhcApi); // TODO(chris): remove at some point
+		if (!app.config.globalProperties.$api)
+			app.use(PluginsApi);
 		app.config.globalProperties.$p = {
 			t: phrasen.t,
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index abe07745e..34180326d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44414,6 +44414,68 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	// FHC-4 Studierendenverwaltung FHC-ALERTS START
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'attention',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Achtung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attention',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'confirm_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Möchten Sie wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you really want to delete?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'attention',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Achtung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attention',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC-4 Studierendenverwaltung FHC-ALERTS END
 );
 
 

From 3f9564b686c77f5ac09cc39341a8caa36c286725 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 7 Jul 2025 16:21:04 +0200
Subject: [PATCH 0403/1357] anrechnungen notiz layout cleanup, use tabulator
 layout fitDataStretchFrozen

---
 public/js/components/Notiz/Notiz.js           | 24 +++++++++----------
 .../Details/Anrechnungen/Anrechnungen.js      |  8 +++----
 .../Details/Dokumente/List/Accepted.js        |  2 +-
 .../Details/Dokumente/List/Unaccepted.js      |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 1237db868..783987363 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -173,12 +173,12 @@ export default {
 						},
 						frozen: true
 					}],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
-				responsiveLayout: "collapse",
-				height: '200',
-				selectableRangeMode: 'click',
-				selectable: true,
+				//responsiveLayout: "collapse",
+				maxHeight: '200px',
+				//selectableRangeMode: 'click',
+				//selectable: true,
 				index: 'notiz_id',
 				persistenceID: 'core-notiz'
 			},
@@ -576,16 +576,14 @@ export default {
 			<form-form ref="formNotiz" @submit.prevent class="row">
 
 				<div class="pt-2">
-					<div class="row mb-3">
-						<div class="col-sm-7">
-							<span class="small">[{{notizData.typeId}}]</span>
-						</div>
-					</div>
 					
-					<div class="row mb-3">
+					<div class="row mt-4 mb-1">
 						<div class="col-sm-7">
-							<p v-if="notizData.statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
-							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
+							<p>
+								<span v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}}</span>
+								<span v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</span>
+								<span class="small"> [{{notizData.typeId}}]</span>
+							</p>
 						</div>
 					</div>
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index a85ee77f5..c11c0b39a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -306,7 +306,7 @@ export default {
 	template: `
 				<div class="stv-details-tab_exemptions h-100 pb-3">
 
-					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl">
+					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl" body-class="p-0">
 
 						<template #title>
 							<h5>
@@ -315,7 +315,7 @@ export default {
 							</h5>
 						</template>
 
-						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 800px;">
+						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 825px;">
 							<core-notiz
 										:endpoint="endpoint"
 										ref="formNotes"
@@ -327,9 +327,9 @@ export default {
 										:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 										@reload="handleReload"
 										>
-								</core-notiz>
-							</bs-modal>
+							</core-notiz>
 						</div>
+					</bs-modal>
 					
 					<template v-if="config.editableAnrechnungen" >
 						<core-filter-cmpt
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 9994a230e..451e4f5f4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -146,7 +146,7 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 300,
 				selectable: true,
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 949f7d4c8..21dec91e8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -162,7 +162,7 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 300,
 				selectable: true,

From 1a0374bf18ad3b88d649f8fac9a5ffbafd03fe85 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 8 Jul 2025 11:07:07 +0200
Subject: [PATCH 0404/1357] fix stv list filters

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

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index b2044a6d5..41c5fc613 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -712,7 +712,12 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = $this->input->get('filter');
+		$filter = json_decode($this->input->get('filter'), true);
+		if (!is_array($filter))
+		{
+			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
+			return;
+		}
 		if (isset($filter['konto_count_0'])) {
 			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
 			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index bdb9732fb..c5f7a07c0 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -108,7 +108,7 @@ export default {
 					}
 				},
 
-				ajaxRequestFunc: (url, params) => {
+				ajaxRequestFunc: (url, config, params) => {
 					if( url === '' ) 
 					{
 						return Promise.resolve({ data: []});

From 8ce672d9140f981f3dd005a9dcc1e426e3c95125 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Jul 2025 13:33:00 +0200
Subject: [PATCH 0405/1357] refactor(Profil Library): exports Profil functions
 in its own library to reuse functionalities

---
 application/controllers/Cis/Profil.php        |  19 +-
 .../controllers/api/frontend/v1/Profil.php    |  29 +-
 application/libraries/ProfilLib.php           | 583 ++++++++++++++++++
 public/js/api/factory/profil.js               |   8 +-
 .../Cis/Profil/MitarbeiterProfil.js           |   9 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |   5 +-
 public/js/components/Cis/Profil/Profil.js     |  33 +-
 .../ProfilComponents/ProfilInformation.js     |   9 +-
 .../js/components/Cis/Profil/StudentProfil.js |  10 +-
 .../Cis/Profil/StudentViewProfil.js           |   5 +-
 10 files changed, 661 insertions(+), 49 deletions(-)
 create mode 100644 application/libraries/ProfilLib.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8c3088bd7..c287d87d0 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -55,8 +55,13 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
+		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView(getAuthUID());
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
 		$viewData = array(
-
+			'editable'=>true,
+			'profil_data' => $profil_data,
 		);
 		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}
@@ -68,8 +73,16 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$viewData = array ('uid' => $uid);
-		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView($uid);
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array (
+			'uid' => $uid,
+			'profil_data'=>$profil_data,
+		);
+		if($uid == getAuthUID()){
+			$viewData['editable'] = true;
+		}
 		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}
 
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index b58d90d07..57af6aa37 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -32,7 +32,7 @@ class Profil extends FHCAPI_Controller
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
-			
+			'profilViewData' => self::PERM_LOGGED,
 		]);
 		
 		$this->load->library('PermissionLib');
@@ -58,7 +58,28 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-
+	public function profilViewData($uid){
+		$uid = json_decode($uid);
+		$this->load->library('ProfilLib');
+		$editable = false;
+		if(isset($uid) && $uid != null){
+			$profil_data = $this->profillib->getView($uid);
+			if($uid == getAuthUID()){
+				$editable = true;
+			}
+		}else{
+			$editable = true;
+			$profil_data = $this->profillib->getView(getAuthUID());
+		}
+		
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>$editable,
+			'profil_data' => $profil_data,
+		);
+		$this->terminateWithSuccess($viewData);
+	}
+	
 	
     /**
 	 * function that returns the data used for the corresponding view
@@ -70,7 +91,6 @@ class Profil extends FHCAPI_Controller
 	public function getView($uid)
 	{
 		$res = new stdClass();
-		$editAllowed = getAuthUID() == $uid || $this->permissionlib->isBerechtigt('admin');
 
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
 		if ($uid == "Profil" || $uid == $this->uid) {
@@ -85,8 +105,6 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->studentProfil();
 				$res->data->pid = $this->pid;
 			}
-			// editing your own profil - true
-			$editAllowed = true;
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -109,7 +127,6 @@ class Profil extends FHCAPI_Controller
 			}
 		}
 		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
-		$res->data->editAllowed = $editAllowed;
 		$this->terminateWithSuccess($res);
 	}
 
diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
new file mode 100644
index 000000000..08caa0035
--- /dev/null
+++ b/application/libraries/ProfilLib.php
@@ -0,0 +1,583 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class ProfilLib{
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		
+	}
+
+	public function getView($uid)
+	{
+		// loading required models
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->load->model("person/Person_model","PersonModel");
+		$res = new stdClass();
+
+		// checking the uid
+		if ($uid == getAuthUID()) {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter(getAuthUID());
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = getAuthPersonId();
+			} else {
+				$res->view = "StudentProfil";
+				$res->data = $this->studentProfil();
+				$res->data->pid = getAuthPersonId();
+			}
+		}
+		// UID is availabe when accessing Profil/View/:uid
+		else {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter($uid);
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);
+
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+			}
+		}
+		$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		return success($res);
+	}
+
+	//PRIVATE METHODS ###############################################
+
+	/**
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
+	 */
+	private function studentProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN :"";
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN : "";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
+	private function getZutrittskarteDatum($uid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$zutrittskarte_ausgegebenam = $this->ci->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		
+		if(isError($zutrittskarte_ausgegebenam)){
+			return error(getData($zutrittskarte_ausgegebenam));
+		}
+		$zutrittskarte_ausgegebenam = getData($zutrittskarte_ausgegebenam);
+		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
+		
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		return $zutrittskarte_ausgegebenam;
+	}
+
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
+	private function getAdressenInfo($pid)
+	{
+		$this->ci->load->model("person/Adresse_model","AdresseModel");
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+		$adresse_res = $this->ci->AdresseModel->loadWhere(["person_id" => $pid]);
+		if(isError($adresse_res)){
+			return error(getData($adresse_res));
+		}
+		$adresse_res = getData($adresse_res) ?? [];
+		return $adresse_res;
+	}
+
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
+	private function getKontaktInfo($pid)
+	{
+		$this->ci->load->model("person/Kontakt_model","KontaktModel");
+		$this->ci->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->ci->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->ci->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->ci->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+		$kontakte_res = $this->ci->KontaktModel->loadWhere(['person_id' => $pid]);
+		if(isError($kontakte_res)){
+			return error(getData($kontakte_res));
+		}
+		$kontakte_res = getData($kontakte_res);
+		return $kontakte_res;
+	}
+
+	/**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
+	private function getMailverteiler($uid)
+	{
+		$this->ci->load->model("person/Person_model","PersonModel");
+		$this->ci->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->ci->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->ci->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->ci->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$mailverteiler_res = $this->ci->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if(isError($mailverteiler_res)){
+			return error(getData($mailverteiler_res));
+		}
+		$mailverteiler_res = getData($mailverteiler_res) ?? [];
+		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element;
+		}, $mailverteiler_res);
+		return $mailverteiler_res;
+	}
+
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		/** @param integer $geburtsInfo */
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
+		}
+		$this->ci->BenutzerModel->addSelect($selectClause);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$person_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($person_res)){
+			return error(getData($person_res));
+		}
+		$person_res = getData($person_res);
+		$person_res = $person_res ? current($person_res) : null;
+
+		if(isset($person_res)){
+			if( ($person_res->foto === null) || ((getAuthUID() !== $uid) && ($person_res->foto_sperre !== false)) )
+			{
+				$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+				$person_res->foto = $dummy_foto;
+			}
+		}
+
+		return $person_res;
+	}
+
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
+	private function getBenutzerFunktion($uid)
+	{
+		$this->ci->load->model("person/Benutzerfunktion_model","BenutzerfunktionModel");
+		$this->ci->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->ci->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+		$benutzer_funktion_res = $this->ci->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		if(isError($benutzer_funktion_res)){
+			return error(getData($benutzer_funktion_res));
+		}
+		$benutzer_funktion_res = getData($benutzer_funktion_res);
+		return $benutzer_funktion_res;
+	}
+
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
+	private function getBetriebsmittelInfo($pid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$this->ci->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->ci->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if(isError($betriebsmittelperson_res)){
+			return error(getData($betriebsmittelperson_res));
+		}
+		$betriebsmittelperson_res = getData($betriebsmittelperson_res);
+		return $betriebsmittelperson_res;
+	}
+
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
+	private function getProfilUpdates($uid)
+	{
+		$this->ci->load->model("person/Profil_update_model","ProfilUpdateModel");
+		$profilUpdates = $this->ci->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if(isError($profilUpdates)){
+			return error(getData($profilUpdates));
+		}
+		$profilUpdates = getData($profilUpdates);
+		return $profilUpdates;
+	}
+
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
+	private function getTelefonInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->ci->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->ci->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if(isError($telefon_res)){
+			return error(getData($telefon_res));
+		}
+		$telefon_res = getData($telefon_res);
+		$telefon_res = $telefon_res ? current($telefon_res) : null;
+		return $telefon_res;
+	}
+
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
+	private function getMitarbeiterInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->ci->MitarbeiterModel->load($uid);
+		if(isError($mitarbeiter_res)){
+			return error(getData($mitarbeiter_res));
+		}
+		$mitarbeiter_res = getData($mitarbeiter_res);
+		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
+
+		return $mitarbeiter_res;
+	}
+
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
+	private function getZutrittsgruppen($uid)
+	{
+		$this->ci->load->model("person/Benutzergruppe_model","BenutzergruppeModel");
+		$this->ci->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->ci->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$zutrittsgruppe_res = $this->ci->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if(isError($zutrittsgruppe_res)){
+			return error(getData($zutrittsgruppe_res));	
+		}
+		$zutrittsgruppe_res = getData($zutrittsgruppe_res);
+		return $zutrittsgruppe_res;
+	}
+
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
+	private function getStudentInfo($uid)
+	{
+		$this->ci->load->model("crm/Student_model","StudentModel");
+		$this->ci->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->ci->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+		$student_res = $this->ci->StudentModel->load([$uid]);
+		
+		if(isError($student_res)){
+			return error(getData($student_res));
+		}
+		$student_res = getData($student_res);
+		$student_res = $student_res ? current($student_res) : null;
+		return $student_res;
+	}
+
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return object the Matrikelnummer corresponding to a userID
+	 */
+	private function getMatrikelNummer($uid)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["matr_nr"]);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$matr_res = $this->ci->BenutzerModel->load([$uid]);
+		
+		if(isError($matr_res)){
+			return error(getData($matr_res));
+		}
+		$matr_res = getData($matr_res);
+		$matr_res = $matr_res ? current($matr_res) : [];
+		return $matr_res;
+	}
+
+	/**
+	 * checks whether the foto of a user is accepted or not
+	 * @access private
+	 * @param  integer $pid the personId of the student or mitarbeiter
+	 * @return bool whether the foto is accepted or not
+	 */
+	private function isFotoAkzeptiert($pid)
+	{
+		$this->ci->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotostatus = $this->ci->FotostatusModel->execReadOnlyQuery("
+		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
+		from public.tbl_person_fotostatus
+		where person_id = ? 
+		order by person_id, insertamum desc",[$pid]);
+		if(isError($fotostatus)){
+			return error(getData($fotostatus));
+		}
+		$fotostatus = getData($fotostatus);
+		if(is_array($fotostatus) && count($fotostatus) > 0){
+			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
+		}
+		else
+			$fotostatus = false;
+		return $fotostatus;
+	}
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
+	private function getBenutzerAlias($uid)
+	{
+		$this->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
+			
+		return $benutzer_res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/factory/profil.js b/public/js/api/factory/profil.js
index 5da1f202d..49d0263c6 100644
--- a/public/js/api/factory/profil.js
+++ b/public/js/api/factory/profil.js
@@ -22,6 +22,12 @@ export default {
 			url: `/api/frontend/v1/Profil/getView/${uid}`
 		};
 	},
+	profilViewData(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/Profil/profilViewData/${uid}`
+		};
+	},
 	fotoSperre(value) {
 		return {
 			method: 'get',
@@ -69,5 +75,5 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/Profil/getAllNationen'
 		};
-	}
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 840cdefc1..456d32375 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -27,7 +27,7 @@ export default {
 		ProfilInformation,
 	},
 
-	inject: ["sortProfilUpdates", "collapseFunction", "language"],
+	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 
 	data() {
 		return {
@@ -215,9 +215,6 @@ export default {
 	},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -322,7 +319,7 @@ export default {
                            </div>
                          </div>-->
             <!-- Bearbeiten Button -->
-            <div class="row mb-3 ">
+            <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
                     <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                         <div class="row">
@@ -352,7 +349,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- PROFIL INFORMATION -->
-                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 56c7ab84b..4d2b080b6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -110,9 +110,6 @@ export default {
 				return this.data.telefonklappe
 			}
 		},
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -202,7 +199,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- Profil Informationen -->
-                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index edb55e6b3..8ca2cfe8e 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -46,7 +46,10 @@ export const Profil = {
 	props: {
 		uid: {
 			type: String,
-			default: 'Profil'
+			required:false,
+		},
+		viewData: {
+			type: Object,
 		}
 	},
 	data() {
@@ -59,10 +62,12 @@ export const Profil = {
 			data: null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
 			notFoundUID: null,
+			isEditable: this.viewData.editable ?? false,
 		};
 	},
 	provide() {
 		return {
+			isEditable: Vue.computed(()=>this.isEditable),
 			profilUpdateStates: Vue.computed(() =>
 				this.profilUpdateStates ? this.profilUpdateStates : false
 			),
@@ -153,18 +158,19 @@ export const Profil = {
 					console.error(error);
 				});
 			
-			let uid = this.uid ?? location.pathname.split("/").pop();
-
+			
 			this.$api
-				.call(ApiProfil.getView(uid))
-				.then((res) => {
-					if (!res.data) {
-						this.notFoundUID = uid;
-					} else {
-						this.view = res.data?.view;
-						this.data = res.data?.data;
-					}
-				});	
+				.call(ApiProfil.profilViewData(this.$route.params.uid??null))
+				.then((response) => response.data).then(data=>{
+					this.view = data?.profil_data.view;
+					this.data = data?.profil_data.data;
+					this.isEditable = data?.editable ?? false;
+				})
+				.catch((error) => {
+					console.error(error);
+				});
+			
+			
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -254,6 +260,7 @@ export const Profil = {
 		},
 	},
 	computed: {
+		
 		filteredEditData() {
 			if (!this.data) {
 				return;
@@ -365,7 +372,7 @@ export const Profil = {
 			this.load()
 		}
 	},
-	async created() {
+	created() {
 		this.load()
 	},
 	template: `
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 7cd6f213e..b8c855b46 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -9,10 +9,6 @@ export default {
 		data: {
 			type: Object,
 		},
-		editable: {
-			type: Boolean,
-			default: false
-		},
 		fotoStatus:{
 			type: Boolean,
 			default: true
@@ -27,6 +23,7 @@ export default {
 		};
 	},
 	emits: ["showEditProfilModal"],
+	inject:["isEditable"],
 
 	methods: {
 		showModal(){
@@ -76,7 +73,7 @@ export default {
 	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
-            <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
                 <i class="fa fa-edit"></i>
             </div>
             <div class="col">
@@ -93,7 +90,7 @@ export default {
                     <div class="col-auto " style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
-                        <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
+                        <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
 						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 5d9b441e0..e0cf5826b 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -26,7 +26,7 @@ export default {
 		FetchProfilUpdates,
 		EditProfil,
 	},
-	inject: ["sortProfilUpdates", "collapseFunction", "language"],
+	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
 		return {
 			showModal: false,
@@ -163,9 +163,7 @@ export default {
 	},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
+		
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -264,7 +262,7 @@ export default {
             </div>-->
 
 			<!-- Bearbeiten Button -->
-			<div v-if="editable" class="row ">
+			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
 					<button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
@@ -295,7 +293,7 @@ export default {
 						<div class="row mb-4">
 							<div class="col">
 								<!-- PROFIL INFORMATION -->
-								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
 						<div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index f7ad03b98..ccc55362e 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -26,9 +26,6 @@ export default {
 	methods: {},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -118,7 +115,7 @@ export default {
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
-                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->

From 3ca49c5574dda5c3ee332895560ed97c0a098f18 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 8 Jul 2025 15:01:54 +0200
Subject: [PATCH 0406/1357] refactor function getHeader, get mitarbeiter_uid as
 prop instead of using function getMitarbeiterUid

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 16 +-----
 .../models/ressource/Mitarbeiter_model.php    | 28 +---------
 public/js/api/factory/detailHeader.js         |  4 +-
 .../components/DetailHeader/DetailHeader.js   |  8 +--
 .../components/Vertraege/MitarbeiterHeader.js | 12 +++--
 public/js/components/Vertraege/Vertraege.js   | 53 ++++++++-----------
 .../Vertraege/Vertragsverwaltung.js           | 17 ++++--
 7 files changed, 55 insertions(+), 83 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 1b1022887..246de82e0 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -29,7 +29,6 @@ class Vertraege extends FHCAPI_Controller
 			'getHeader' => ['vertrag/mitarbeiter:r'],
 			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
 			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
-			'getMitarbeiterUid' => ['vertrag/mitarbeiter:r'],
 			]);
 
 		//Load Models and Libraries
@@ -684,11 +683,11 @@ class Vertraege extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result));
 	}
 
-	public function getPersonAbteilung($person_id)
+	public function getPersonAbteilung($mitarbeiter_uid)
 	{
 		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
 
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($person_id);
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -716,15 +715,4 @@ class Vertraege extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(current($data));
 	}
-
-
-	public function getMitarbeiterUid($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getMitarbeiterUid($person_id);
-
-		//no error here: ma_uid | null as result
-		$this->terminateWithSuccess($result);
-	}
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 0909c1095..ef86ac5fd 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -151,12 +151,8 @@ class Mitarbeiter_model extends DB_Model
 	 *
 	 * @return Array benutzerfunktionsdata
 	 */
-	public function getPersonAbteilung($person_id)
+	public function getPersonAbteilung($uid)
 	{
-		$uid = $this->getMitarbeiterUid($person_id);
-		if (!$uid) {
-			return null;
-		}
 		$qry = "
 			SELECT
 				bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
@@ -213,7 +209,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-			  *
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
 			FROM
 				public.tbl_person
 				JOIN public.tbl_benutzer b USING(person_id)
@@ -382,26 +378,6 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry);
 	}
 
-	public function getMitarbeiterUid($person_id)
-	{
-		$qry = "
-        SELECT tbl_benutzer.uid
-        FROM tbl_mitarbeiter
-            JOIN tbl_benutzer ON CAST(tbl_mitarbeiter.mitarbeiter_uid AS TEXT) = CAST(tbl_benutzer.uid AS TEXT)
-            JOIN tbl_person USING (person_id)
-        WHERE tbl_person.person_id = ?
-    ";
-		$result = $this->execQuery($qry, [$person_id]);
-
-		$data = getData($result);
-		if (empty($data)) {
-			return null; // No UID found
-		}
-
-		$uid = isset($data[0]->uid) ? $data[0]->uid : null;
-		return $uid;
-	}
-
 	/**
 	 * Gets Mitarbeiter for a certain Lehrveranstaltung.
 	 *
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
index f9f368bc7..74563bd4b 100644
--- a/public/js/api/factory/detailHeader.js
+++ b/public/js/api/factory/detailHeader.js
@@ -22,10 +22,10 @@ export default {
 			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
 		};
 	},
-	getPersonAbteilung(person_id){
+	getPersonAbteilung(mitarbeiter_uid){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + mitarbeiter_uid,
 		};
 	},
 	getLeitungOrg(oekurzbz){
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0b50c5153..528133b5a 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -42,7 +42,7 @@ export default {
 		if(this.person_id) {
 			this.getHeader(this.person_id);
 
-			this.loadDepartmentData(this.person_id)
+			this.loadDepartmentData(this.mitarbeiter_uid)
 				.then(() => {
 					// Call getLeitungOrg only after departmentData is loaded
 					this.getLeitungOrg(this.departmentData.oe_kurzbz);
@@ -83,9 +83,9 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadDepartmentData(person_id) {
+		loadDepartmentData(mitarbeiter_uid) {
 			return this.$api
-				.call(ApiDetailHeader.getPersonAbteilung(person_id))
+				.call(ApiDetailHeader.getPersonAbteilung(mitarbeiter_uid))
 				.then(result => {
 					this.departmentData = result.data;
 				})
@@ -106,7 +106,9 @@ export default {
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+
 			<template v-if="typeHeader==='student'">
+			{{headerData}}
 					<div
 						v-for="person in headerData"
 						:key="person.person_id"
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 98f987a44..200687632 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -8,7 +8,7 @@ export default {
 		FormInput
 	},
 	emits: [
-		"selectedPerson"
+		"selectionChanged"
 	],
 	props: {
 		endpoint: {
@@ -66,7 +66,7 @@ export default {
 					event: 'rowSelectionChanged',
 					handler: this.rowSelectionChanged
 				},
-		{
+				{
 					event: 'tableBuilt',
 					handler: async() => {
 
@@ -103,13 +103,19 @@ export default {
 				}
 			],
 			selectedPerson: null,
+			selectedUid: null,
 			isFilterSet: false,
 		}
 	},
 	methods: {
 		rowSelectionChanged(data) {
 			this.selectedPerson = data[0].person_id;
-			this.$emit('selectedPerson', this.selectedPerson);
+			this.selectedUid = data[0].uid;
+
+			this.$emit('selectionChanged', {
+				person_id: this.selectedPerson,
+				uid: this.selectedUid
+			});
 		},
 		onSwitchChange() {
 			if (this.isFilterSet) {
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index fcead6adf..51cf82ed1 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -37,6 +37,10 @@ export default {
 			type: [Number],
 			required: true
 		},
+		mitarbeiter_uid: {
+			type: [String],
+			required: true
+		},
 	},
 	computed: {
 		appRoot() {
@@ -210,7 +214,6 @@ export default {
 			triggeredData: [],
 			childData: {},
 			isFilterSet: false,
-			ma_uid: null,
 			clickedRows: [],
 			arraySelectedContracts: [],
 		}
@@ -460,39 +463,29 @@ export default {
 		},
 		//methods for functionality ADDON KU
 		printContract(){
-			this.getMitarbeiterUid().then(()=> {
-				//check if at least 2 contracts chosen
-				if(this.arraySelectedContracts.length < 2) {
-					this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertMindestensZweiVertraege'));
-					return;
-				}
+			//check if at least 2 contracts chosen
+			if(this.arraySelectedContracts.length < 2) {
+				this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertMindestensZweiVertraege'));
+				return;
+			}
 
-				//check if status=="Genehmigt"
-				const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
-				if(statusNotGenehmigtExists) {
-					this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertOnlyApprovedContracts'));
-					return;
-				}
+			//check if status=="Genehmigt"
+			const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
+			if(statusNotGenehmigtExists) {
+				this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertOnlyApprovedContracts'));
+				return;
+			}
 
-				//build String to Print PDF
-				let vertragString = '';
+			//build String to Print PDF
+			let vertragString = '';
 
-				this.arraySelectedContracts.forEach(element => {
-					vertragString += '&vertrag_id[]=' + element[0].toString();
-				});
+			this.arraySelectedContracts.forEach(element => {
+				vertragString += '&vertrag_id[]=' + element[0].toString();
+			});
 
-				let linkToPdf = this.dataPrintHonorar.link +
-						'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.ma_uid + vertragString + '&output=pdf&uid=' + this.ma_uid;
-				window.open(linkToPdf, '_blank');
-				});
-		},
-		getMitarbeiterUid(){
-			return this.$api
-				.call(this.endpoint.getMitarbeiterUid(this.person_id))
-				.then(response => {
-					this.ma_uid = response.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			let linkToPdf = this.dataPrintHonorar.link +
+					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
+			window.open(linkToPdf, '_blank');
 		},
 		toggleRowClick(contractId, status, bezeichnung) {
 			const index = this.arraySelectedContracts.findIndex(
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 6cdf92005..a6d2b9e95 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -28,12 +28,14 @@ export default {
 	data() {
 		return {
 			person_id: null,
+			mitarbeiter_uid: null,
 			endpoint: ApiCoreVertraege
 		}
 	},
 	methods: {
-		selectPerson(selected){
-			this.person_id = selected;
+		handleSelection(selection) {
+			this.mitarbeiter_uid = selection.uid;
+			this.person_id = selection.person_id;
 		},
 		redirectToLeitung(leitung){
 			this.person_id = leitung.person_id;
@@ -41,7 +43,7 @@ export default {
 	},
 	template: `
 		<!-- Navigation component -->
-		<core-navigation-cmpt></core-navigation-cmpt>
+		<core-navigation-cmpt/>
 
 		<div class="vv">
 			<main>
@@ -50,7 +52,8 @@ export default {
 						<div class="d-flex flex-column" style="height: 100%;">
 							<mitarbeiter-header
 								:endpoint="endpoint"
-								@selectedPerson="selectPerson"/>
+								@selectionChanged="handleSelection"
+								/>
 						</div>
 					</template>
 					<template #bottom>
@@ -60,7 +63,11 @@ export default {
 								typeHeader="mitarbeiter"
 								@redirectToLeitung="redirectToLeitung"
 							></fhc-header>
-							<vertraege-mitarbeiter :endpoint="endpoint" :person_id="this.person_id"/>
+							<vertraege-mitarbeiter
+								:endpoint="endpoint"
+								:person_id="this.person_id"
+								:mitarbeiter_uid="this.mitarbeiter_uid"
+								/>
 						</div>
 					</template>
 				</vertical-split>

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

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

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

From d526a770c5b6aba74c9084ccd74f8f26587c7862 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 9 Jul 2025 13:35:21 +0200
Subject: [PATCH 0408/1357] refactor(Wave accessability changes): changes color
 contrasts and fixes other little bugs

---
 application/libraries/ProfilLib.php           |  1 -
 public/css/Cis4/Cis.css                       |  8 ++++++--
 public/css/Cis4/CoreCalendarEvents.css        |  3 ++-
 public/css/components/FormUnderline.css       |  2 ++
 public/css/components/Profil.css              |  2 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 ++--
 .../Cis/Profil/MitarbeiterProfil.js           |  4 ++--
 .../ProfilComponents/ProfilInformation.js     |  2 +-
 .../js/components/Cis/Profil/StudentProfil.js |  4 ++--
 .../Cis/Renderer/Lehreinheit/modalContent.js  |  8 ++++----
 public/js/components/Cis/ThemeSwitch.js       |  8 ++++----
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 12 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 08caa0035..17d2218ad 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -25,7 +25,6 @@ class ProfilLib{
 				return error(getData($isMitarbeiter));
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
-			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
 			if ($isMitarbeiter) {
 				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 3b382d1b4..99ab609b9 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -108,9 +108,9 @@ html {
 	--fhc-cis-main-py: 1.5rem;
 
 	--fhc-cis-menu-lvl-1-bg: var(--fhc-primary);
-	--fhc-cis-menu-lvl-1-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-color: var(--fhc-light);
 	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
-	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-light);
 
 	--fhc-cis-menu-lvl-2-bg: var(--fhc-secondary);
 	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
@@ -135,6 +135,10 @@ html {
 	--fhc-cis-grade-negative: var(--fhc-danger);
 }
 
+#themeSwitch i{
+	color: var(fhc-light) !important;
+}
+
 @media (min-width: 992px) {
 	:root {
 		--fhc-cis-menu-width: 250px;
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index fd418a9f8..9111d21cd 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -48,7 +48,8 @@
 	overflow-y: scroll;
 	height: 100%;
 	min-height:auto;
-	justify-content: space-evenly;
+	justify-content: space-between;
+	align-items:center;
 
 }
 
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index 0d1fd991f..a3cbdc7ff 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -3,6 +3,7 @@
 :root {
 	--fhc-formunderline-border: var(--fhc-border, #dee2e6);
 	--fhc-formunderline-link: var(--fhc-link, initial);
+	--fhc-formunderline-titel-color: var(--fhc-text,gray);
 }
 
 .form-underline{
@@ -39,4 +40,5 @@
     opacity: 0.65;
     font-size: .85rem;
     padding-left: 0.5rem;
+	color: var(--fhc-formunderline-titel-color) !important;
   }
\ No newline at end of file
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 220c2ebfe..4800e749f 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,6 +1,6 @@
 
 :root{
-	--fhc-profil-border: var(--fhc-border, white);
+	--fhc-profil-border: var(--fhc-background-highlight, gray);
 	--fhc-profil-tabulator-shadow: var(--fhc-shadow-20, rgba(0,0,0,0.1));
 }
 
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 537012ee6..7725fa93f 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -83,13 +83,13 @@ export default {
 			<slot name="modalContent"></slot>
 			
 			<template v-if="showMenu && this.menu">
-				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
+				<h5>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h5>
 				<lv-menu :menu="menu"></lv-menu>
 			</template>
 		</template>
 		<!-- optional footer -->
 		<template  v-slot:footer >
-			<button class="btn btn-outline-secondary " @click="hide">{{$p.t('ui','cancel')}}</button>    
+			<button class="btn btn-outline-secondary card" @click="hide">{{$p.t('ui','cancel')}}</button>    
 		</template>
 		<!-- end of optional footer --> 
 	</bs-modal>`,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 456d32375..873984c1b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -321,7 +321,7 @@ export default {
             <!-- Bearbeiten Button -->
             <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
-                    <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                    <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">
                             <div class="col-auto">
                                 <i class="fa fa-edit"></i>
@@ -460,7 +460,7 @@ export default {
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
-                    <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                    <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">
                             <div class="col-auto">
                                 <i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index b8c855b46..438b3cca8 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -87,7 +87,7 @@ export default {
             <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
             <div class="col-12 col-sm-6 mb-2">
                 <div class="row justify-content-center">
-                    <div class="col-auto " style="position:relative">
+                    <div class="col-auto profil-image" style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index e0cf5826b..480130cbb 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -264,7 +264,7 @@ export default {
 			<!-- Bearbeiten Button -->
 			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
-					<button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+					<button @click="showEditProfilModal" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
 							<div class="col-2">
 								<i class="fa fa-edit"></i>
@@ -399,7 +399,7 @@ export default {
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
-					<button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+					<button @click="()=>showEditProfilModal()" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
 							<div class="col-2">
 								<i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index c03a1cd64..2d5f34eee 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -56,9 +56,9 @@ export default {
 	},
 	template: `
 	<div>
-		<h3>
+		<h5>
 			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-		</h3>
+		</h5>
 		<table class="table table-hover mb-4">
 				<tbody>
 					<tr>
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -96,7 +96,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index bff06a70c..d7840be22 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -24,10 +24,10 @@ export default {
 	},
 	template:/*html*/`
 
-	<button :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text" aria-hidden="true"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text" aria-hidden="true"></i>
-		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>
+	<button id="themeSwitch" :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun " aria-hidden="true"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon " aria-hidden="true"></i>
+		<!--<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>-->
 	</button>
 	`
 }
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 40640a186..b0e9f8888 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -188,6 +188,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'raum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Room',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 153e273fec5396c5bd0991867a3b38b5335ab54f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 9 Jul 2025 13:52:46 +0200
Subject: [PATCH 0409/1357] firefox check entfernt

---
 cis/testtool/login.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 5a2ae0dea..5306dadab 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -447,14 +447,6 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 		{
 			e.preventDefault();
 		});
-		// If Browser is any other than Mozilla Firefox and the test includes any MathML,
-		// show message to use Mozilla Firefox
-		var ua = navigator.userAgent;
-		if ((ua.indexOf("Firefox") > -1) == false)
-		{
-			$("#alertmsgdiv").html("<div class='alert alert-danger'>BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!<br>(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.<br><br>PLEASE USE MOZILLA FIREFOX BROWSER!<br>(Otherwise some exam items will not be displayed correctly</div>");
-			//alert('BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!\n(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.\n\nPLEASE USE MOZILLA FIREFOX BROWSER!\n(Ohterwise some exam items will not be displayed correctly.)');
-		}
 	});
 	</script>
 <?php

From 8138e23e71f5226503af877a6e0d95949ff86cb1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 09:12:01 +0200
Subject: [PATCH 0410/1357] set tabulator_row overflow just jor
 abschlusspruefung to visible

---
 public/css/Studentenverwaltung.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 0b62e2809..bb2588926 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -54,7 +54,7 @@ html {
 }
 
 /* Dropdown AbschlusspruefungList.js */
-.tabulator-row {
+.stv-details-abschlusspruefung .tabulator-row {
 	overflow: visible !important;
 }
 

From 08a394cad0b41cf80aabeb26fa7efaeefee4bca0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 09:47:09 +0200
Subject: [PATCH 0411/1357] add eventListener to prevent bootstrap dialog from
 blocking focusin in tinymce linking popup

---
 .../Messages/Details/NewMessage/Modal.js      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 9c9bcd4cd..57573a9ba 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -68,7 +68,16 @@ export default {
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
 				//height: 800,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
+				plugins: 'link linktitle',
+				link_context_toolbar: true,
+				automatic_uploads: true,
+				default_link_target: "_blank",
+				link_title: true,
+				target_list: [
+					{ title: 'New tab', value: '_blank' },
+					{ title: 'Same tab', value: '_self' }
+				],
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -88,7 +97,15 @@ export default {
 						const newContent = editor.getContent();
 						vm.formData.body = newContent;
 					});
+
+					// Prevent Bootstrap dialog from blocking focusin
+					document.addEventListener('focusin', (e) => {
+						if (e.target.closest(".tox-tinymce-aux, .moxman-window, .tam-assetmanager-root") !== null) {
+							e.stopImmediatePropagation();
+						}
+					});
 				},
+
 			});
 		},
 		updateText(value) {

From 7039719700d8f44b76d331570713056eef99fd17 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 11:31:24 +0200
Subject: [PATCH 0412/1357] Tab Messages: show reply button only if not
 disabled

---
 public/js/components/Messages/Details/TableMessages.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 05355b96c..65c090327 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -29,7 +29,6 @@ export default {
 	},
 	data(){
 		return {
-			pageNo: 1,
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.loadAjaxCall,
@@ -102,8 +101,12 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							if (this.personId != cell.getData().sender_id)
+							if (this.personId != cell.getData().sender_id) {
 								button.disabled = true;
+								button.style = "visibility: hidden";
+								button.ariaHidden = true;
+							}
+
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
 							button.innerHTML = '<i class="fa fa-reply"></i>';
@@ -112,6 +115,7 @@ export default {
 								(event) =>
 									this.actionReplyToMessage(cell.getData().message_id)
 							);
+
 							container.append(button);
 
 							button = document.createElement('button');

From 129b8b2e491a6eb014e54c20a9c5cfcac4909187 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 11:47:22 +0200
Subject: [PATCH 0413/1357] refactor(LvPlan Widget renderer component): adds
 the renderer component to the lvplan widget

---
 public/css/Cis4/CoreCalendarEvents.css        | 43 +++++++++-
 .../Cis/Renderer/Feiertage/calendarEvent.js   |  2 +-
 .../js/components/DashboardWidget/LvPlan.js   | 82 ++++++++++++++-----
 3 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 9111d21cd..f248f4a61 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -122,4 +122,45 @@
 	margin: 0.5rem;
 }
 
-.dayPageContainer .feiertagEventContent #ferienEventTitle {}
\ No newline at end of file
+.dayPageContainer .feiertagEventContent #ferienEventTitle {}
+
+/* Minimized Container Styles */
+
+/* Ferientage Events for Minimized */
+
+.minimizedContainer .feiertagEventContent{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
+
+.minimizedContainer .feiertagEventContent #ferienEventIcon{
+	margin: 0.5rem;
+}
+
+.minimizedContainer .feiertagEventContent #ferienEventTitle{
+	flex-grow: 1;
+}
+
+/* Lehreinheits Events in Minimized */
+.dayPageContainer .lehreinheitEventContent {
+	display: flex;
+	padding-left: 4rem;
+	justify-content: space-evenly;
+	align-items: center;
+
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display: grid;
+	align-content: center;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: contents;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText * {
+	font-weight: 500;
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index b3367b64e..ffc164117 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -9,6 +9,6 @@ export default {
 	template: `
 		<div class="feiertagEventContent " >
 			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
-			<span id="ferienEventTitle" ><strong>{{event.titel}}</strong></span>
+			<span id="ferienEventTitle" class="fw-bold text-center">{{event.titel}}</span>
 		</div>`,
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index f180c47e6..1e2588161 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -30,9 +30,29 @@ export default {
 			roomInfoContentID: null,
 			ort_kurzbz: null,
 			selectedEvent: null,
+			isModalContentResolved: false,
+			isModalTitleResolved: false,
+			isShowModal: false,
 		}
 	},
+	inject: ["renderers"],
+	watch:{
+		modalLoaded: {
+			handler: function (newValue) {
+				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
+					this.$nextTick(() => {
+						if (this.$refs.lvmodal) this.$refs.lvmodal.show();
+						this.isShowModal = false;
+					});
+				}
+			},
+			immediate: true
+		},
+	},
 	computed: {
+		modalLoaded: function () {
+			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved: this.isModalTitleResolved };
+		},
 		allEventsGrouped() {
 			// groups all events of the next 7 days together
 			const currentCalendarDate = new CalendarDate(this.currentDay)
@@ -46,7 +66,7 @@ export default {
 				arr[1].push(cur)
 				
 				return acc
-			}, mapArr))
+			}, mapArr));
 		},
 		currentEvents() {
 			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
@@ -64,6 +84,34 @@ export default {
 		},
 	},
 	methods: {
+		showModal: function (event) {
+			this.currentlySelectedEvent = event;
+			Vue.nextTick(() => {
+				if (this.isModalContentResolved && this.isModalTitleResolved) {
+					if (this.$refs.lvmodal) this.$refs.lvmodal.show();
+				}
+				else {
+					this.isShowModal = true;
+				}
+			})
+		},
+		modalTitleResolved: function () {
+			this.isModalTitleResolved = true;
+
+		},
+		modalContentResolved: function () {
+			this.isModalContentResolved = true;
+
+		},
+		modalTitleComponent(type) {
+			return this.renderers[type]?.modalTitle;
+		},
+		modalContentComponent(type) {
+			return this.renderers[type]?.modalContent;
+		},
+		calendarEventComponent(type) {
+			return this.renderers[type]?.calendarEvent;
+		},
 		getEventStyle: function(evt) {
 			const styles = {'background-color': evt.color};
 			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
@@ -169,7 +217,18 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
+		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  >
+			<template #modalTitle>
+				<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
+					<component :is="modalTitleComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
+				</Suspense>
+			</template>
+			<template #modalContent>
+				<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
+					<component :is="modalContentComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
+				</Suspense>
+			</template>
+		</lv-modal>
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #monthPage="{event,day}">
@@ -184,7 +243,7 @@ export default {
 				</span>
 			</template>
 			<template #minimizedPage >
-				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
+				<div class="minimizedContainer flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>
@@ -193,22 +252,7 @@ export default {
 							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<template v-if="evt.type=='moodle'">
-								<div class="d-flex align-items-center ">
-									<moodle-svg></moodle-svg>
-									<b v-contrast class="flex-grow-1 text-center"><strong v-html="evt.titel"></strong> - {{evt.topic}}</b>
-								</div>
-							</template>
-							<template v-else>
-								<b>{{evt.topic}}</b>
-								<br>
-								<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
-									<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-									<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-									<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-								</small>
-							</template>
-							
+							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">
 							{{ $p.t('lehre/noLvFound') }}

From 6f3759d95d4fb251d500acb7ab43ebca1099322b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 11:47:51 +0200
Subject: [PATCH 0414/1357] update(Wave accessability): updates aria labels for
 accessability

---
 public/css/components/dashboard.css         | 10 +++---
 public/js/components/Cis/LvPlan/LvPlan.js   |  4 +--
 public/js/components/Dashboard/Dashboard.js |  2 +-
 public/js/components/Dashboard/Item.js      | 34 ++++++++++-----------
 public/js/components/DashboardWidget/Url.js | 10 +++---
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index d030e80cd..ae2bb252f 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -112,23 +112,23 @@
 }
 
 .cursor-nw-resize {
-	cursor: nw-resize;
+	cursor: nw-resize !important;
 }
 
 .cursor-ew-resize {
-	cursor: ew-resize;
+	cursor: ew-resize !important;
 }
 
 .cursor-ns-resize {
-	cursor: ns-resize;
+	cursor: ns-resize !important;
 }
 
 .no-drag-drop {
-	cursor: not-allowed;
+	cursor: not-allowed !important;
 }
 
 .cursor-move {
-	cursor: move;
+	cursor: move !important;
 }
 
 .draggedItem {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 7aeaa0f1b..a095f9f31 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -2,7 +2,6 @@ import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "../Renderer/Lehreinheit/calendarEvent.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -24,7 +23,6 @@ const LvPlan = {
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			renderComponents: {},
 			isModalContentResolved: false,
 			isModalTitleResolved: false,
 			isShowModal: false,
@@ -94,7 +92,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent
+		FhcCalendar, LvModal, LvMenu
 	},
 	computed:{
 		modalLoaded: function(){
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 825bad3f7..81eabd31c 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -196,7 +196,7 @@ export default {
 	<div class="core-dashboard">
 		<h3 v-show="viewDataInternal?.name">
 			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
-			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
+			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 68a92e701..e1a03e2f3 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -160,32 +160,32 @@ export default {
 	<div v-show="!dragstate" class="h-100 card border-0">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
-				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+				<span type="button" v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move" aria-label="move widget" v-tooltip="{showDelay:1000, value:'move widget'}"><i class="fa-solid fa-grip-vertical" aria-hidden="true"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
 			<template v-if="isPinned">
-				<div v-if="editMode" pinned="true" @click="unpin" class="pin cursor-pointer col-auto me-2">
-					<i class="fa-solid fa-thumbtack "></i>
+				<div type="button" v-if="editMode" pinned="true" @click="unpin" v-tooltip="{showDelay:1000, value: 'unpin item'}" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 				</div>
 				<div v-else class="col-auto me-2">
 					<i class="fa-solid fa-thumbtack "></i>
 				</div>
 			</template>
 			<template v-else>
-				<div v-if="editMode"  class="col-auto me-2 pin" @click="pinItem">
-					<i class="fa-solid fa-thumbtack" style="color:lightgray;"></i>
+				<div type="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" v-tooltip="{showDelay:1000, value: 'pin item'}">
+					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 				</div>
 			</template>
-			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
-          		<i class="fa fa-arrow-up-right-from-square me-1"></i>
+			<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto ">
+          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
           	</a>
-			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
-				<i class="fa-solid fa-trash"></i>
+			<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
+			<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
+				<i class="fa-solid fa-trash" aria-hidden="true"></i>
 			</a>
 			<Transition>
 				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 				</div>
 			</Transition>
 		</div>
@@ -209,18 +209,18 @@ export default {
 		<height-transition>
 			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
 				<template v-if="maxWidth < 2">
-					<span drag-action="resize" class="col-auto px-1 cursor-ns-resize">
-						<i  class="fa-solid fa-up-down pe-2"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ns-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-down pe-2" aria-hidden="true"></i>
 					</span>
 				</template>
 				<template v-else-if="maxHeight < 2">
-					<span drag-action="resize" class="col-auto px-1 cursor-ew-resize">
-						<i class="fa-solid fa-left-right pe-2"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ew-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i class="fa-solid fa-left-right pe-2" aria-hidden="true"></i>
 					</span>
 				</template>
 				<template v-else>
-					<span drag-action="resize" class="col-auto px-1 cursor-nw-resize">
-						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-nw-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x" aria-hidden="true"></i>
 					</span>
 				</template>
 			</div>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 796726f04..93718a10c 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,7 +161,7 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
             <template v-if="shared">
 
@@ -173,12 +173,12 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" >
-								<i class="fa fa-edit me-1"></i>
+							<a type="button" href="#" @click.prevent="openEditModal(link)" aria-label="edit bookmark" v-tooltip="{showDelay:1000,value:'edit bookmark'}">
+								<i class="fa fa-edit me-1" aria-hidden="true"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)">
-								<i class="fa fa-regular fa-trash-can"></i>
+							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" v-tooltip="{showDelay:1000,value:'delete bookmark'}" @click.prevent="removeLink(link.bookmark_id)">
+								<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
 							</a>
 						</div>
 					</div>

From dba435dafb6ba91ea790dad97bd5ccb7b8d5ddd4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 12:10:39 +0200
Subject: [PATCH 0415/1357] fix(VueDatepicker darkmode): updates the dark mode
 property of the vueDatePicker if the theme is switched to light or dark mode

---
 public/js/components/Cis/Raumsuche/Raumsuche.js | 10 ++++++----
 public/js/plugin/Theme.js                       |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 978e92407..6878cefc2 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -184,12 +184,11 @@ export const Raumsuche =  {
 			}
 
 		}
-	},
-	watch: {
-
 	},
 	computed: {
-
+		isDarkMode(){
+			return this.$theme.theme_name.value == 'dark';
+		}
 	},
 	created() {
 		
@@ -203,6 +202,7 @@ export const Raumsuche =  {
 	<div class="row">
 		<div class="col-12 col-lg-2">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="datum"
 				:clearable="false"
 				date-picker
@@ -215,6 +215,7 @@ export const Raumsuche =  {
 		</div>
 		<div class="col-12 col-lg-1">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="von"
 				:clearable="false"
 				time-picker
@@ -227,6 +228,7 @@ export const Raumsuche =  {
 		</div>
 		<div class="col-12 col-lg-1">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="bis"
 				:clearable="false"
 				time-picker
diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
index d063b4d46..a6360d4a6 100644
--- a/public/js/plugin/Theme.js
+++ b/public/js/plugin/Theme.js
@@ -1,4 +1,4 @@
-const theme_name= FHC_JS_DATA_STORAGE_OBJECT.theme.name;
+let theme_name = Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.theme.name);
 const theme_modes = FHC_JS_DATA_STORAGE_OBJECT.theme.modes;
 
 const toggleTheme = (theme)=>{
@@ -7,6 +7,7 @@ const toggleTheme = (theme)=>{
 	for (const theme of theme_modes) {
 		document.documentElement.classList.remove(theme);
 	}
+	theme_name.value = theme;
 	document.documentElement.classList.add(theme);
 
 	document.body.setAttribute("data-bs-theme", theme);
@@ -40,7 +41,7 @@ const initializeTheme = ()=>{
 export default {
 	install: (app,options)=>{
 		
-		document.documentElement.classList.add(theme_name);
+		document.documentElement.classList.add(theme_name.value);
 
 		initializeTheme();
 

From a942423e846ebc3d37de6d0eda6a348b6a021cc7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 12:44:35 +0200
Subject: [PATCH 0416/1357] remove unused code

---
 application/models/accounting/Vertrag_model.php   | 4 +---
 public/js/api/factory/vertraege/vertraege.js      | 6 ------
 public/js/components/DetailHeader/DetailHeader.js | 1 -
 public/js/components/Vertraege/Vertraege.js       | 5 -----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/application/models/accounting/Vertrag_model.php b/application/models/accounting/Vertrag_model.php
index 59ed37df3..c8fdf727a 100644
--- a/application/models/accounting/Vertrag_model.php
+++ b/application/models/accounting/Vertrag_model.php
@@ -510,7 +510,7 @@ SELECT
 	 * @param $person_id, $vertrag_id
 	 * @return array of objects
 	 */
-	//TODO(Manu) vereinfachen!
+
 	public function loadContractsOfPersonAssigned($person_id, $vertrag_id)
 	{
 		$query = "
@@ -584,6 +584,4 @@ SELECT
 
 		return $this->execQuery($query, array($vertrag_id));
 	}
-
-
 }
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
index 1eff24a6b..a925f71e9 100644
--- a/public/js/api/factory/vertraege/vertraege.js
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -132,10 +132,4 @@ export default {
 			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiter/',
 		};
 	},
-	getMitarbeiterUid(person_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id
-		};
-	},
 };
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 528133b5a..8e9b2056c 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -108,7 +108,6 @@ export default {
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<template v-if="typeHeader==='student'">
-			{{headerData}}
 					<div
 						v-for="person in headerData"
 						:key="person.person_id"
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 51cf82ed1..32e7a4ae2 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -233,7 +233,6 @@ export default {
 		actionEditContract(vertrag_id) {
 			this.resetModal();
 			this.statusNew = false;
-			//TODO(Manu) reload Assigned!!
 			this.$refs.unassignedLehrauftraege.reloadUnassigned();
 			this.loadContract(vertrag_id)
 				.then(this.$refs.contractModal.show);
@@ -437,10 +436,6 @@ export default {
 			this.formData.bezeichnung = this.getFormattedDate();
 			this.formData.vertragstyp_kurzbz = null;
 			this.statusNew = true;
-
-			//this.childData = {};
-			//always null??
-			//TODO(Manu) check if this.childData = {},
 		},
 		updateBetrag(sumBetrag){
 			this.formData.betrag = sumBetrag;

From ec1960e83925a8b0d66759b68e33b34efd227917 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 13:33:54 +0200
Subject: [PATCH 0417/1357] Bugfix: Delete Vertragsstatus if Betreuung

---
 .../controllers/api/frontend/v1/vertraege/Vertraege.php     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index 246de82e0..5eaa242ad 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -634,7 +634,7 @@ class Vertraege extends FHCAPI_Controller
 		$person_id= $this->input->post('person_id');
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
 		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
-		$vertrag_id = $this->input->post('vertrag_id ');
+		$vertrag_id = $this->input->post('vertrag_id');
 
 		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
 
@@ -646,7 +646,9 @@ class Vertraege extends FHCAPI_Controller
 				'vertrag_id' => $vertrag_id
 			],
 			[
-				'vertrag_id' => null
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
 			]
 		);
 

From 5279ac9868f797d907e3b919b52c90c921fccebd Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 10 Jul 2025 13:46:20 +0200
Subject: [PATCH 0418/1357] pep lv entwicklung hinzugefuegt readonly category
 hinzugefuegt tags mixin erstellt

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..c4d2b205f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40269,6 +40269,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'readonlycategory',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Kategorie ist deaktiviert und kann nur im Lesemodus angezeigt werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The category is deactivated and can only be viewed in read-only mode.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'werksvertragsects',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Werkvertragsvolumen in ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Work contract volume in ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lv_entwicklung_rolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Role',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'pep',
 		'category' => 'ui',

From 179b50c798df2fea5f578809c053bfa58cea964a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 14:27:54 +0200
Subject: [PATCH 0419/1357] fixed js-warnings  - Extraneous non-props
 attributes  - duplicate html code  - html template error

---
 application/views/Vertragsverwaltung.php      |  2 -
 .../components/DetailHeader/DetailHeader.js   | 74 +++++++++----------
 public/js/components/Vertraege/Vertraege.js   |  4 +-
 3 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index b66ac6e3e..db7701f0f 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -39,8 +39,6 @@ $configArray = [
 
 <div id="main">
 	<router-view
-		stv-root="<?= site_url('Vertragsverwaltung'); ?>"
-		cis-root="<?= CIS_ROOT; ?>"
 		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 	>
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 8e9b2056c..b8dc0409f 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -108,47 +108,46 @@ export default {
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<template v-if="typeHeader==='student'">
-					<div
-						v-for="person in headerData"
-						:key="person.person_id"
-						class="d-flex flex-column align-items-center h-100"
-						class="position-relative d-inline-block"
-					>
-						<img
-						  class="d-block h-100 rounded"
-						  alt="Profilbild"
-						  :src="'data:image/jpeg;base64,' + person.foto"
-						/>
+				<div
+					v-for="person in headerData"
+					:key="person.person_id"
+					class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
+				>
+					<img
+					  class="d-block h-100 rounded"
+					  alt="Profilbild"
+					  :src="'data:image/jpeg;base64,' + person.foto"
+					/>
 
-						<template v-if="person.foto_sperre">
-							<i
-							  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-							  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-							></i>
-						</template>
+					<template v-if="person.foto_sperre">
+						<i
+						  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+						></i>
+					</template>
 					<small class="text-muted">{{person.uid}}</small>
-					</div>
+				</div>
 
-					<div v-if="headerData.length == 1">
-						<h2 class="h4">
-							{{headerData[0].titelpre}}
-							{{headerData[0].vorname}}
-							{{headerData[0].nachname}},
-							{{headerData[0].titelpost}}
-						</h2>
+				<div v-if="headerData.length == 1">
+					<h2 class="h4">
+						{{headerData[0].titelpre}}
+						{{headerData[0].vorname}}
+						{{headerData[0].nachname}},
+						{{headerData[0].titelpost}}
+					</h2>
 
-						<h5 class="h6">
-						 <strong class="text-muted">Person ID </strong>
-							{{headerData[0].person_id}}
-							<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
-							 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-							<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-							  {{headerData[0].semester}}
-							<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-							{{headerData[0].verband}}
-							<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-							{{headerData[0].gruppe}}
-						 </h5>
+					<h5 class="h6">
+					 <strong class="text-muted">Person ID </strong>
+						{{headerData[0].person_id}}
+						<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+						 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+						<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+						  {{headerData[0].semester}}
+						<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+						{{headerData[0].verband}}
+						<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+						{{headerData[0].gruppe}}
+					 </h5>
 
 					  <h5 class="h6">
 						<strong class="text-muted">Email </strong>
@@ -161,7 +160,6 @@ export default {
 						  {{headerData[0].matr_nr}}
 					  </h5>
 
-					</div>
 				</div>
 		</template>
 
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 32e7a4ae2..d075ddd62 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -698,14 +698,14 @@ export default {
 								>
 							</form-input>
 						</div>
-				</core-form>
+					</core-form>
 				
 				<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" :disabled="!this.hasSchreibrechte" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('vertrag', 'vertragErstellen')}}</button>
 				</template>
 			</bs-modal>
-		</core-form>
+
 	</div>`
 }
 

From 2deef8039dbe9306f982fbe6eb1db933373497fb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 14:32:26 +0200
Subject: [PATCH 0420/1357] update(LvPlan color contrast): changes the colors
 for some of the text in the lvplan component for more contrast

---
 public/css/components/calendar.css          | 28 ++++++++++++++++++---
 public/js/components/Calendar/Day/Page.js   |  6 ++---
 public/js/components/Calendar/Header.js     |  4 +--
 public/js/components/Calendar/Month/Page.js |  2 +-
 public/js/components/Calendar/Week/Page.js  |  6 ++---
 public/js/components/Calendar/Weeks.js      |  2 +-
 public/js/components/Calendar/Years/Page.js |  2 +-
 public/js/components/Cis/LvPlan/LvPlan.js   |  2 +-
 8 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index fe8841867..85962d4e0 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -170,7 +170,7 @@
 	content: "";
 	position: absolute;
 	top: 0;
-	left: 0;
+	left: 3rem;
 	margin:auto;
 	width: 100%;
 	height: 100%;
@@ -208,11 +208,16 @@
 }
 
 .fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-lg .fhc-calendar-month-page-weekday,
-.fhc-calendar-md .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-weekday {
+.fhc-calendar-md .fhc-calendar-month-page-day {
   border: solid 1px var(--fhc-calendar-border);
 }
+
+.fhc-calendar-lg .fhc-calendar-month-page-weekday,
+.fhc-calendar-md .fhc-calendar-month-page-weekday{
+	border: solid 1px var(--fhc-secondary);
+}
+
+
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
   aspect-ratio: 1;
@@ -419,3 +424,18 @@
 .weekPageContainer {
 	container-type: inline-size;
 }
+
+#calendarHeaderTitle{
+	color: var(--fhc-text);
+}
+
+.fhc-calendar-day-page .hours,
+.fhc-calendar-day-page .curTimeIndicator,
+.fhc-calendar-day-page .fhc-calendar-hour-indicator,
+.fhc-calendar-week-page .hours,
+.fhc-calendar-week-page .curTimeIndicator,
+.fhc-calendar-week-page .fhc-calendar-hour-indicator,
+.fhc-calendar-day-page .date,
+.fhc-calendar-week-page .date {
+	color: var(--fhc-text-secondary) !important;
+}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 4247ffcd5..43154aa0a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -385,8 +385,8 @@ export default {
 				<div class="d-flex flex-column h-100 border">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
-							<div class="fw-bold">{{dayText.tag}}</div>
-							<a href="#" class="small text-secondary text-decoration-none" >{{dayText.datum}}</a>
+							<div class="day fw-bold">{{dayText.tag}}</div>
+							<a href="#" class="small date text-decoration-none" >{{dayText.datum}}</a>
 						</div>
 					</div>
 					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
@@ -438,7 +438,7 @@ export default {
 									</Transition>
 									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 									<div class="hours">
-										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
 
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index c1b53d9c8..7ddb384f2 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -74,7 +74,7 @@ export default {
 					</div>
 					<div class="justify-content-center text-center col-auto">
 						<div class="d-flex justify-content-center align-items-center">
-							<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+							<button id="calendarHeaderTitle" class="btn btn-link text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
 								{{ title }}
 								<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
 							</button>
@@ -88,7 +88,7 @@ export default {
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary card d-inline-block" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
 							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 3f9d9ad67..bd974afde 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -143,7 +143,7 @@ export default {
 		</div>
 		<template v-for="week in weeks"
 		:key="week.no">
-			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25"
+			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end "
 			@click.prevent="changeToWeek(week)">{{week.no}}</a>
 			<a href="#"
 			@click.prevent="clickEvent(day,week)"
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 3bfc7b668..b5bfcd3c3 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -325,8 +325,8 @@ export default {
 	<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
-					<div class="fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="small text-muted text-decoration-none" >{{dayText[day]?.datum}}</a>
+					<div class="day fw-bold">{{dayText[day]?.tag}}</div>
+					<a href="#" class="date small text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
@@ -360,7 +360,7 @@ export default {
 						</div>
 					</Transition>
 					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index bed39d624..057889e83 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -60,7 +60,7 @@ export default {
 		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
-				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
+				<button @click="setWeek(week)" class="btn btn-outline-secondary card" :class="{'border-0': week != focusDate.w}">
 					{{week}}
 				</button>
 			</div>
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
index 3d78fc38d..b7461cd03 100644
--- a/public/js/components/Calendar/Years/Page.js
+++ b/public/js/components/Calendar/Years/Page.js
@@ -28,7 +28,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-years-page d-flex flex-wrap">
 		<div v-for="year in years" :key="year" class="d-grid col-4">
-			<button class="btn btn-outline-secondary" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
+			<button class="btn btn-outline-secondary card justify-content-center" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
 				{{year}}
 			</button>
 		</div>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index a095f9f31..14c9b77a2 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -314,7 +314,7 @@ const LvPlan = {
 	>
 		<template #calendarDownloads>
 			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
+				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary card">
 					<div class="d-flex flex-column">
 						<i aria-hidden="true" :class="icon"></i>
 						<span class="small">{{title}}</span>

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

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

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

From 5bda4db59218977c6f2fd95f841092a1eaab14d8 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 11 Jul 2025 07:33:10 +0200
Subject: [PATCH 0422/1357] unr beim kopieren setzen gruppen anzeige
 direktinskription rausgefillert datatree aufklappen bug gefixed kurzbz bei
 den icons statt eigene spalte

---
 .../api/frontend/v1/lv/Lehreinheit.php        |  1 +
 .../education/Lehreinheitgruppe_model.php     |  8 +++++-
 .../js/components/LVVerwaltung/Setup/Table.js | 28 ++++++++++---------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index 0c42c0082..d58489453 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -215,6 +215,7 @@ class Lehreinheit extends FHCAPI_Controller
 
 		$lehreinheit_id_new = getData($insert_result);
 
+		$this->_ci->LehreinheitModel->update(array('lehreinheit_id' => $lehreinheit_id_new), array('unr' => $lehreinheit_id_new));
 		if (in_array($art, array('gruppen', 'alle')))
 		{
 			$gruppen_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
diff --git a/application/models/education/Lehreinheitgruppe_model.php b/application/models/education/Lehreinheitgruppe_model.php
index 8fc8e09f3..bca395f31 100644
--- a/application/models/education/Lehreinheitgruppe_model.php
+++ b/application/models/education/Lehreinheitgruppe_model.php
@@ -470,6 +470,12 @@ class Lehreinheitgruppe_model extends DB_Model
 								END AS verplant");
 		$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
 		$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
-		return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
+
+		$this->db->where('lehreinheit_id', $lehreinheit_id);
+		$this->db->group_start()
+			->where('tbl_gruppe.direktinskription !=', true)
+			->or_where('tbl_gruppe.direktinskription IS NULL')
+			->group_end();
+		return $this->load();
 	}
 }
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 34a3b3399..a1b2830f1 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -168,7 +168,7 @@ export default {
 					headerFilterFunc: extendedHeaderFilter,
 				},
 				layout: 'fitDataStretch',
-				persistenceID: 'lehrveranstaltungen_2025_07_07_v1',
+				persistenceID: 'lehrveranstaltungen_2025_07_11_v1',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
@@ -225,11 +225,19 @@ export default {
 						formatter: (cell, formatterParams) => {
 							const rowData = cell.getRow().getData();
 							const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
+							const lvkurzbz = (cell.getValue()).toUpperCase();
 
+							const parentspan = document.createElement('span');
 							const span = document.createElement('span');
+
+
 							span.classList.add('lv_table_icon', `icon-${iconKey}`);
 							span.title = iconKey || 'LV-Teil';
-							return span;
+
+							parentspan.appendChild(span);
+							parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
+
+							return parentspan
 						},
 
 						cellClick: (e, cell) => {
@@ -300,16 +308,6 @@ export default {
 						},
 						width: 150,
 					},
-					{
-						title: this.$p.t('lehre', 'kurzbz'),
-						field: "lv_kurzbz_anzeige",
-						headerFilterFuncParams: {field: 'lv_kurzbz_anzeige'},
-						formatter: (cell, formatterParams) => {
-							let rowData = cell.getRow().getData();
-							return rowData?.lv_kurzbz?.toUpperCase();
-						},
-						headerFilter: true
-					},
 					{
 						title: this.$p.t('lehre', 'lehrveranstaltung_id'),
 						field: "lehrveranstaltung_id",
@@ -667,7 +665,11 @@ export default {
 				if (level === this.currentTreeLevel - 1 )
 				{
 					row._row.modules.dataTree.open = true;
-					lastMatchingRow = row;
+
+					if (row._row.data._children?.length > 0)
+					{
+						lastMatchingRow = row;
+					}
 				}
 			});
 

From c2cc1c5870a6999e898ea879f00dc6c169fce481 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 09:14:34 +0200
Subject: [PATCH 0423/1357] fix(Profil viewData): fixes little data conversion
 error in the endpoint

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

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 57af6aa37..c048e51d6 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -59,10 +59,10 @@ class Profil extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 	public function profilViewData($uid){
-		$uid = json_decode($uid);
+		$uid = $uid;
 		$this->load->library('ProfilLib');
 		$editable = false;
-		if(isset($uid) && $uid != null){
+		if(isset($uid) && $uid != "null"){
 			$profil_data = $this->profillib->getView($uid);
 			if($uid == getAuthUID()){
 				$editable = true;

From 75a93523e00a39be1e273bbdd26fff75d13b7f79 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:01:18 +0200
Subject: [PATCH 0424/1357] refactor(Profil endpoint): changes how the
 parameter is passed to the profil endpoint

---
 .../controllers/api/frontend/v1/Profil.php    | 533 +-----------------
 public/js/api/factory/profil.js               |  13 +-
 2 files changed, 12 insertions(+), 534 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c048e51d6..3133b107a 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -27,7 +27,6 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getView' => self::PERM_LOGGED,
             'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
@@ -38,16 +37,7 @@ class Profil extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
-		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
-		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
 
 
 		//? put the uid and pid inside the controller for reusability
@@ -58,11 +48,10 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-	public function profilViewData($uid){
-		$uid = $uid;
+	public function profilViewData($uid=null){
 		$this->load->library('ProfilLib');
 		$editable = false;
-		if(isset($uid) && $uid != "null"){
+		if(isset($uid) && $uid != null){
 			$profil_data = $this->profillib->getView($uid);
 			if($uid == getAuthUID()){
 				$editable = true;
@@ -79,56 +68,6 @@ class Profil extends FHCAPI_Controller
 		);
 		$this->terminateWithSuccess($viewData);
 	}
-	
-	
-    /**
-	 * function that returns the data used for the corresponding view
-	 * the client side parses the @param $uid and calls this function to get the data to the correct view 
-	 * @access public
-	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
-	 * @return stdClass all the data corresponding to a view of a user
-	 */
-	public function getView($uid)
-	{
-		$res = new stdClass();
-
-		// if parsing the URL did not found a UID then the UID of the logged in user is used
-		if ($uid == "Profil" || $uid == $this->uid) {
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-			if ($isMitarbeiter) {
-				$res->view = "MitarbeiterProfil";
-				$res->data = $this->mitarbeiterProfil();
-				$res->data->pid = $this->pid;
-			} else {
-				$res->view = "StudentProfil";
-				$res->data = $this->studentProfil();
-				$res->data->pid = $this->pid;
-			}
-		}
-		// UID is availabe when accessing Profil/View/:uid
-		else {
-			$this->PersonModel->addSelect(["person_id"]);
-			$pid = $this->PersonModel->getByUid($uid);
-			$pid = $this->getDataOrTerminateWithError($pid);
-			$pid = $pid ? $pid[0] : null;
-			if (!$pid) {
-				$this->terminateWithError("Person with UID: " . $uid . " does not exist");
-			}
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-			if ($isMitarbeiter) {
-				$res->view = "ViewMitarbeiterProfil";
-				$res->data = $this->viewMitarbeiterProfil($uid);
-
-			} else {
-				$res->view = "ViewStudentProfil";
-				$res->data = $this->viewStudentProfil($uid);
-			}
-		}
-		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
-		$this->terminateWithSuccess($res);
-	}
 
     /**
 	 * update column foto_sperre in public.tbl_person
@@ -201,92 +140,7 @@ class Profil extends FHCAPI_Controller
 		
 	}
 
-
-    // -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * function that returns the data used for viewing another mitarbeiter profile
-	 * @access private 
-	 * @param  integer $uid the userID to retrieve the mitarbeiter data
-	 * @return stdClass restricted mitarbeiter data
-	 */
-	private function viewMitarbeiterProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
-		$benutzer_res = $this->getBenutzerAlias($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
-		$telefon_res = $this->getTelefonInfo($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Info
-		foreach ($person_res as $key => $val) {
-			$res->$key = $val;
-		}
-
-		//? Mitarbeiter Info
-		foreach ($mitarbeiter_res as $key => $val) {
-			$res->$key = $val;
-
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		
-		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
-		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
-
-		return $res;
-	}
-
-	/**
-	 * function that returns the data used for viewing another student profile
-	 * @access private 
-	 * @param  integer $uid the userID to retrieve the student data
-	 * @return stdClass restricted student data
-	 */
-	private function viewStudentProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$student_res = $this->getStudentInfo($uid);
-		$matr_res = $this->getMatrikelNummer($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->mailverteiler = $mailverteiler_res;
-
-		return $res;
-	}
-
+    
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -310,384 +164,9 @@ class Profil extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	/**
-	 * function that returns the data used for the mitarbeiter profile
-	 * @access private 
-	 * @return stdClass mitarbeiter data
-	 */
-	private function mitarbeiterProfil()
-	{
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
 
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid, true);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-		$telefon_res = $this->getTelefonInfo($this->uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Mitarbeiter Information
-		foreach ($mitarbeiter_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->mailverteiler = $mailverteiler_res;
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		
-		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
-		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->standort_telefon = $telefon_res;
-		$res->profilUpdates = $profilUpdates;
-
-		return $res;
-	}
-
-	/**
-	 * function that returns the data used for the student profile
-	 * @access private 
-	 * @return stdClass student data
-	 */
-	private function studentProfil()
-	{
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid, true);
-		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
-		$student_res = $this->getStudentInfo($this->uid);
-		$matr_res = $this->getMatrikelNummer($this->uid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = trim($value);
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->zuttritsgruppen = $zutrittsgruppe_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->profilUpdates = $profilUpdates;
-
-		return $res;
-	}
-
-
-    /**
-	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
-	 * @return array returns the mailvertailer corresponding to a userID 
-	 */
-	private function getMailverteiler($uid)
-	{
-		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
-		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
-		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
-		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
-
-		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-		$mailverteiler_res = $this->getDataOrTerminateWithError($mailverteiler_res);
-		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
-		$mailverteiler_res = array_map(function ($element) {
-			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-			return $element;
-		}, $mailverteiler_res);
-		return $mailverteiler_res;
-	}
-
-	/**
-	 * gets all the Benutzerfunktionen of a corresponding user
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
-	 * @return array returns the Benutzerfunktionen corresponding to a userID 
-	 */
-	private function getBenutzerFunktion($uid)
-	{
-		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
-		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
-
-		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-		$benutzer_funktion_res = $this->getDataOrTerminateWithError($benutzer_funktion_res);
-		return $benutzer_funktion_res;
-	}
-
-	/**
-	 * gets all the Betriebsmittel of a corresponding user
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
-	 * @return array returns the Betriebsmittel corresponding to a userID 
-	 */
-	private function getBetriebsmittelInfo($pid)
-	{
-		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
-
-		//? betriebsmittel are not needed in a view
-		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
-		$betriebsmittelperson_res = $this->getDataOrTerminateWithError($betriebsmittelperson_res);
-		return $betriebsmittelperson_res;
-	}
-
-	/**
-	 * gets the alias of a corresponding user
-	 * @access private
-	 * @param  integer $uid the userID used to get the alias
-	 * @return string the alias of the userID
-	 */
-	private function getBenutzerAlias($uid)
-	{
-		$this->BenutzerModel->addSelect(["alias"]);
-		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
-		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
-			
-		return $benutzer_res;
-	}
-
-	/**
-	 * gets the person information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the person information
-	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
-	 * @return array all the person informaion corresponding to a userID
-	 */
-	private function getPersonInfo($uid, $geburtsInfo = null)
-	{
-		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
-		/** @param integer $geburtsInfo */
-		if ($geburtsInfo) {
-			array_push($selectClause, "gebort");
-			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
-		}
-		$this->BenutzerModel->addSelect($selectClause);
-		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-
-		$person_res = $this->BenutzerModel->load([$uid]);
-		$person_res = $this->getDataOrTerminateWithError($person_res);
-		$person_res = $person_res ? current($person_res) : null;
-
-		if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
-		{
-			$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
-			$person_res->foto = $dummy_foto;
-		}
-
-		return $person_res;
-	}
-
-	/**
-	 * gets the mitarbeiter information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the mitarbeiter information
-	 * @return array all the mitarbeiter informaion corresponding to a userID
-	 */
-	private function getMitarbeiterInfo($uid)
-	{
-		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
-		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
-		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-		$mitarbeiter_res = $this->getDataOrTerminateWithError($mitarbeiter_res);
-		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
-
-		return $mitarbeiter_res;
-	}
-
-	/**
-	 * gets the telefon information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the telefon information
-	 * @return array all the telefon informaion corresponding to a userID
-	 */
-	private function getTelefonInfo($uid)
-	{
-		$this->MitarbeiterModel->addSelect(["kontakt"]);
-		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
-		$this->MitarbeiterModel->addLimit(1);
-		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-		$telefon_res = $this->getDataOrTerminateWithError($telefon_res);
-		$telefon_res = $telefon_res ? current($telefon_res) : null;
-		return $telefon_res;
-	}
-
-	/**
-	 * gets the student information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the student information
-	 * @return array all the student informaion corresponding to a userID
-	 */
-	private function getStudentInfo($uid)
-	{
-		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
-		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
-
-		$student_res = $this->StudentModel->load([$uid]);
-		
-		$student_res = $this->getDataOrTerminateWithError($student_res);
-		$student_res = $student_res ? current($student_res) : null;
-		return $student_res;
-	}
-
-	/**
-	 * gets the profil updates corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the profil updates
-	 * @return array all the profil updates corresponding to a userID
-	 */
-	private function getProfilUpdates($uid)
-	{
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
-		$profilUpdates = $this->getDataOrTerminateWithError($profilUpdates);
-		return $profilUpdates;
-	}
-
-	/**
-	 * gets the Matrikelnummer corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the Matrikelnummer
-	 * @return integer the Matrikelnummer corresponding to a userID
-	 */
-	private function getMatrikelNummer($uid)
-	{
-		$this->BenutzerModel->addSelect(["matr_nr"]);
-		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-
-		$matr_res = $this->BenutzerModel->load([$uid]);
-		
-		$matr_res = $this->getDataOrTerminateWithError($matr_res);
-		$matr_res = $matr_res ? current($matr_res) : [];
-		return $matr_res;
-	}
-
-	/**
-	 * gets the Zutrittsgruppen corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the Zutrittsgruppen
-	 * @return array all the Zutrittsgruppen corresponding to a userID
-	 */
-	private function getZutrittsgruppen($uid)
-	{
-		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
-		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
-
-		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
-		$zutrittsgruppe_res = $this->getDataOrTerminateWithError($zutrittsgruppe_res);
-		return $zutrittsgruppe_res;
-	}
-
-	/**
-	 * gets the address information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the address information
-	 * @return array all the address information corresponding to a userID
-	 */
-	private function getAdressenInfo($pid)
-	{
-		$adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
-		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
-		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
-
-		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
-		$adresse_res = $this->getDataOrTerminateWithError($adresse_res);
-		return $adresse_res;
-	}
-
-	/**
-	 * gets the kontakt information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the kontakt information
-	 * @return array all the kontakt information corresponding to a userID
-	 */
-	private function getKontaktInfo($pid)
-	{
-		$this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
-		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
-		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
-		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
-
-		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
-		$kontakte_res = $this->getDataOrTerminateWithError($kontakte_res);
-		return $kontakte_res;
-	}
-
-	/**
-	 * gets the date of issue of the FH access card corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the date of issue of the FH access card
-	 * @return string the date of issue of the FH access card corresponding to a userID
-	 */
-	private function getZutrittskarteDatum($uid)
-	{
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
-		
-		$zutrittskarte_ausgegebenam = $this->getDataOrTerminateWithError($zutrittskarte_ausgegebenam);
-		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
-		
-		//? formats date from 01-01-2000 to 01.01.2000
-		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
-		return $zutrittskarte_ausgegebenam;
-	}
-
-	/**
-	 * checks whether the foto of a user is accepted or not
-	 * @access private
-	 * @param  integer $pid the personId of the student or mitarbeiter
-	 * @return bool whether the foto is accepted or not
-	 */
-	private function isFotoAkzeptiert($pid)
-	{
-		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
-		$fotostatus = $this->FotostatusModel->execReadOnlyQuery("
-		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
-		from public.tbl_person_fotostatus
-		where person_id = ? 
-		order by person_id, insertamum desc",[$pid]);
-		$fotostatus = $this->getDataOrTerminateWithError($fotostatus);
-		if(is_array($fotostatus) && count($fotostatus) > 0){
-			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
-		}
-		else
-			$fotostatus = false;
-		return $fotostatus;
-	}
+	
 }
 
diff --git a/public/js/api/factory/profil.js b/public/js/api/factory/profil.js
index 49d0263c6..1d884c714 100644
--- a/public/js/api/factory/profil.js
+++ b/public/js/api/factory/profil.js
@@ -16,16 +16,15 @@
  */
 
 export default {
-	getView(uid) {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/Profil/getView/${uid}`
-		};
-	},
+	
 	profilViewData(uid) {
+		let url = "/api/frontend/v1/Profil/profilViewData";
+		if(uid){
+			url += `/${uid}`;
+		}
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Profil/profilViewData/${uid}`
+			url: url
 		};
 	},
 	fotoSperre(value) {

From 28e42163a1f92e37040446f523861813b312c863 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:10:35 +0200
Subject: [PATCH 0425/1357] fix(Profil fotoStatus): changes how fotoStatus is
 evaluated for different views

---
 application/libraries/ProfilLib.php                            | 3 ++-
 data-                                                          | 0
 fotoStatus                                                     | 0
 public/js/components/Cis/Profil/MitarbeiterProfil.js           | 2 +-
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js       | 2 +-
 .../Cis/Profil/ProfilComponents/ProfilInformation.js           | 2 +-
 public/js/components/Cis/Profil/StudentProfil.js               | 2 +-
 public/js/components/Cis/Profil/StudentViewProfil.js           | 2 +-
 8 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 data-
 create mode 100644 fotoStatus

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 17d2218ad..70a8717db 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -34,6 +34,7 @@ class ProfilLib{
 				$res->data = $this->studentProfil();
 				$res->data->pid = getAuthPersonId();
 			}
+			$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -53,7 +54,7 @@ class ProfilLib{
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
-		$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		
 		return success($res);
 	}
 
diff --git a/data- b/data-
new file mode 100644
index 000000000..e69de29bb
diff --git a/fotoStatus b/fotoStatus
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 873984c1b..8eaae6dd9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -216,7 +216,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		getTelefonValue() {
 			if(this.data.standort_telefon?.kontakt) {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 4d2b080b6..c1ce4ead6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -111,7 +111,7 @@ export default {
 			}
 		},
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		personEmails() {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 438b3cca8..5dd4a6969 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -93,7 +93,7 @@ export default {
                         <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
+						<div v-if="fotoStatus != null && !fotostatus" role="button" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 480130cbb..cc0068411 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -165,7 +165,7 @@ export default {
 	computed: {
 		
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		filteredEditData() {
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index ccc55362e..2ce649dae 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -27,7 +27,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		profilInformation() {
 			if (!this.data) {

From 31fbaaa0172efb36e9a8cf45eb264ff58a21bce6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 11 Jul 2025 11:30:13 +0200
Subject: [PATCH 0426/1357] remove unnessecary 0byte files

---
 data-      | 0
 fotoStatus | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 data-
 delete mode 100644 fotoStatus

diff --git a/data- b/data-
deleted file mode 100644
index e69de29bb..000000000
diff --git a/fotoStatus b/fotoStatus
deleted file mode 100644
index e69de29bb..000000000

From 1bf49ad7ab7363e8fae9e050ece7adf98e32b86c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:50:15 +0200
Subject: [PATCH 0427/1357] fix(Profillib): data handling fix

---
 application/libraries/ProfilLib.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 70a8717db..2a130d263 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -15,6 +15,7 @@ class ProfilLib{
 		// loading required models
 		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
 		$this->ci->load->model("person/Person_model","PersonModel");
+
 		$res = new stdClass();
 
 		// checking the uid
@@ -44,7 +45,6 @@ class ProfilLib{
 				return error(getData($isMitarbeiter));
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
-			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
 			if ($isMitarbeiter) {
 				$res->view = "ViewMitarbeiterProfil";
 				$res->data = $this->viewMitarbeiterProfil($uid);
@@ -536,9 +536,14 @@ class ProfilLib{
 	 */
 	private function getBenutzerAlias($uid)
 	{
-		$this->BenutzerModel->addSelect(["alias"]);
-		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($benutzer_res)){
+			return error(getData($benutzer_res));
+		}
+
+		$benutzer_res = getData($benutzer_res);
 		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
 			
 		return $benutzer_res;

From 22afddc2ae6f7682034ce02f70b010b11242e6d5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 11 Jul 2025 14:21:56 +0200
Subject: [PATCH 0428/1357] add changes for detail header of Vertragsverwaltung

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 720 ++++++++++++++++++
 public/js/api/factory/detailHeader.js         |   4 +-
 .../components/DetailHeader/DetailHeader.js   |   7 +-
 3 files changed, 726 insertions(+), 5 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/vertraege/Vertraege.php

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
new file mode 100644
index 000000000..bb14bc511
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -0,0 +1,720 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Vertraege extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllVertraege' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsNotAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractTypes' =>  ['vertrag/mitarbeiter:r'],
+			'getAllContractStati' =>  ['vertrag/mitarbeiter:r'],
+			'getStatiOfContract' =>  ['vertrag/mitarbeiter:r'],
+			'loadContract' => ['vertrag/mitarbeiter:r'],
+			'loadContractStatus' => ['vertrag/mitarbeiter:r'],
+			'updateContract' =>['vertrag/mitarbeiter:w'],
+			'addNewContract' =>['vertrag/mitarbeiter:w'],
+			'deleteContract' =>['vertrag/mitarbeiter:w'],
+			'insertContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteContractStatus' =>['vertrag/mitarbeiter:w'],
+			'updateContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
+			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
+			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
+		]);
+
+		//Load Models and Libraries
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('accounting/Vertragsstatus_model', 'VertragsstatusModel');
+		$this->load->model('accounting/Vertragstyp_model', 'VertragstypModel');
+		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'vertrag'
+		]);
+	}
+
+	public function getAllVertraege($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPerson($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsNotAssigned($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonNotAssigned($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsAssigned($person_id, $vertrag_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonAssigned($person_id, $vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getStatiOfContract($person_id, $vertrag_id)
+	{
+		//check if vertrag_id corresponds with person_id and return null if not
+		$result = $this->VertragModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'person_id' => $person_id
+			)
+		);
+		if(!hasData($result))
+		{
+			$this->terminateWithSuccess([]);
+		}
+
+		$result = $this->VertragModel->getStatiOfContract($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractTypes()
+	{
+		$result = $this->VertragstypModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAllContractStati()
+	{
+		$result = $this->VertragsstatusModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function addNewContract()
+	{
+		$this->load->library('form_validation');
+
+		$person_id = $this->input->post('person_id');
+
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$lehrauftraege = $this->input->post('clickedRows');
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->insert([
+			'person_id' => $person_id,
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+		$vertrag_id = $result->retval;
+
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $vertrag_id,
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => 'neu',
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => date('c')
+		]);
+
+		if (!$status_result) {
+			$this->db->trans_rollback();
+			$this->terminateWithError($this->p->t('vertrag', 'error_insertOrUpdateStatusVertrag'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Hinzufügen der Lehraufträge
+		foreach ($lehrauftraege as $row)
+		{
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]
+				);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]
+				);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+		$this->db->trans_complete();
+		$this->terminateWithSuccess(true);
+	}
+
+	public function updateContract()
+	{
+		$this->load->library('form_validation');
+
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+		$formData = $this->input->post('formData');
+		$lehrauftraege = $this->input->post('clickedRows');
+
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
+
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->update(
+			$vertrag_id,
+			[
+				'person_id' => $person_id,
+				'vertragsdatum' => $vertragsdatum,
+				'bezeichnung' => $bezeichnung,
+				'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+				'betrag' => $betrag,
+				'vertragsstunden' => $vertragsstunden,
+				'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+				'anmerkung' => $anmerkung,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		$this->getDataOrTerminateWithError($result);
+
+		//Adding of Lehraufträge
+		foreach ($lehrauftraege as $row)
+		{
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function loadContract($vertrag_id)
+	{
+		$result = $this->VertragModel->load($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteContract($vertrag_id)
+	{
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//check if attached Lehrauftrag
+		$resultLehrauftrag = $this->LehreinheitmitarbeiterModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultLehrauftrag))
+		{
+			$resultLehrauftrag = getData($resultLehrauftrag);
+			foreach($resultLehrauftrag as $lehrauftrag)
+			{
+				$result = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $lehrauftrag->lehreinheit_id,
+						'mitarbeiter_uid' => $lehrauftrag->mitarbeiter_uid,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		//if attached Betreuung
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		//if attached Betreuung
+		$resultBetreuung = $this->Projektbetreuermodel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultBetreuung))
+		{
+			$resultBetreuung = getData($resultBetreuung);
+			foreach($resultBetreuung as $betreuung)
+			{
+				$result = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $betreuung->person_id,
+						'projektarbeit_id' => $betreuung->projektarbeit_id,
+						'betreuerart_kurzbz' => $betreuung->betreuerart_kurzbz,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+
+					]
+				);
+
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->VertragvertragsstatusModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($result))
+		{
+			$data = getData($result);
+			foreach ($data as $item)
+			{
+				//delete all entries in lehre.tbl_vertrag_vertragsstatus
+				$result = $this->VertragvertragsstatusModel->delete([
+					'vertrag_id' => $vertrag_id,
+					'vertragsstatus_kurzbz' => $item->vertragsstatus_kurzbz,
+					'uid' => $item->uid
+				]);
+				if(isError($result))
+					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//delete Contract
+		$result = $this->VertragModel->delete(
+			array('vertrag_id' => $vertrag_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' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function insertContractStatus()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+            array(
+                'vertrag_id' => $this->input->post('vertrag_id'),
+                'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
+            )
+        );
+
+        if (hasData($result))
+		{
+			$this->terminateWithError($this->p->t('vertrag', 'error_statusVorhanden'), self::ERROR_TYPE_GENERAL);
+        }
+
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $this->input->post('vertrag_id'),
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => $this->input->post('datum')
+		]);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
+		}
+
+		return $this->terminateWithSuccess(current(getData($status_result)));
+	}
+
+	public function deleteContractStatus()
+	{
+		$status = $this->input->post('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$result = $this->VertragvertragsstatusModel->delete(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'vertragsstatus_kurzb']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function loadContractStatus()
+	{
+		$status = $this->input->get('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->get('vertrag_id');
+
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+		if (!$result) {
+			$this->terminateWithError('Status not existing');
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateContractStatus()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_result = $this->VertragvertragsstatusModel->update(
+			[
+				'vertrag_id' => $this->input->post('vertrag_id'),
+				'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
+			],
+			[
+				'uid' => getAuthUID(),
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID(),
+				'datum' => $this->input->post('datum')
+			]
+		);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Updaten des Vertragsstatus.');
+		}
+
+		return $this->terminateWithSuccess(current(getData($status_result)));
+	}
+
+	public function deleteLehrauftrag()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//kein delete: ein update, bei dem die vertrag_id auf null gesetzt wird
+		$result = $this->LehreinheitmitarbeiterModel->update(
+			[
+				'lehreinheit_id' => $lehreinheit_id,
+				'mitarbeiter_uid' => $mitarbeiter_uid,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetreuung()
+	{
+		$person_id= $this->input->post('person_id');
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		$result = $this->Projektbetreuermodel->update(
+			[
+				'person_id' => $person_id,
+				'projektarbeit_id' => $projektarbeit_id,
+				'betreuerart_kurzbz' => $betreuerart_kurzbz,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Projektbetreuung']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function getMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonenWithContractDetails();
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			//return data before PV21 (with filter fix angestellt, active and with bisverwendung)
+			$result = $this->Mitarbeitermodel->getPersonal(true, true, true);
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+}
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
index f9f368bc7..74563bd4b 100644
--- a/public/js/api/factory/detailHeader.js
+++ b/public/js/api/factory/detailHeader.js
@@ -22,10 +22,10 @@ export default {
 			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
 		};
 	},
-	getPersonAbteilung(person_id){
+	getPersonAbteilung(mitarbeiter_uid){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + mitarbeiter_uid,
 		};
 	},
 	getLeitungOrg(oekurzbz){
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 4cf2571a8..6014faadd 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -42,7 +42,7 @@ export default {
 		if(this.person_id) {
 			this.getHeader(this.person_id);
 
-			this.loadDepartmentData(this.person_id)
+			this.loadDepartmentData(this.mitarbeiter_uid)
 				.then(() => {
 					// Call getLeitungOrg only after departmentData is loaded
 					this.getLeitungOrg(this.departmentData.oe_kurzbz);
@@ -83,9 +83,9 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadDepartmentData(person_id) {
+		loadDepartmentData(mitarbeiter_uid) {
 			return this.$api
-				.call(ApiDetailHeader.getPersonAbteilung(person_id))
+				.call(ApiDetailHeader.getPersonAbteilung(mitarbeiter_uid))
 				.then(result => {
 					this.departmentData = result.data;
 				})
@@ -106,6 +106,7 @@ export default {
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+
 			<template v-if="typeHeader==='student'">
 					<div
 						v-for="person in headerData"

From 12cdf5a83ef4c2b0e09fbefd25b32e638f8a756d Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 11 Jul 2025 17:11:19 +0200
Subject: [PATCH 0429/1357] =?UTF-8?q?accepting=20documents:=20enabled=20ac?=
 =?UTF-8?q?cepting=20for=20all=20Studieng=C3=A4nge,=20not=20just=20master,?=
 =?UTF-8?q?=20added=20date=20and=20insertamum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/dokument.class.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/dokument.class.php b/include/dokument.class.php
index 6dec9a66d..7b1d490fb 100644
--- a/include/dokument.class.php
+++ b/include/dokument.class.php
@@ -888,9 +888,10 @@ class dokument extends basis_db
 	 * Akzeptiert ein bestimmtes Dokument
 	 * @param char $dokument_kurzbz Bezeichner Dokument.
 	 * @param int $person_id Personenkennzeichen.
+	 * @param array $studiengang_typen einschränken nach Studiengang Typ.
 	 * @return boolean true wenn akzeptiert bzw geprüft ohne Akzeptieren, false wenn Fehler
 	 */
-	public function akzeptiereDokument($dokument_kurzbz, $person_id)
+	public function akzeptiereDokument($dokument_kurzbz, $person_id, $studiengang_typen = null)
 	{
 		$db = new basis_db();
 		$arrayDoksZuAkzeptieren = array();
@@ -902,7 +903,6 @@ class dokument extends basis_db
 					tbl_prestudent ps, tbl_studiengang sg
 				WHERE
 					ps.studiengang_kz = sg.studiengang_kz
-				AND sg.typ = 'm'
 				AND person_id = ".$this->db_add_param($person_id)."
 				AND not exists(
 					SELECT *
@@ -910,6 +910,11 @@ class dokument extends basis_db
 					where dok.prestudent_id = ps.prestudent_id
 					and dokument_kurzbz = ".$this->db_add_param($dokument_kurzbz).")";
 
+		if (isset($studiengang_typen) && is_array($studiengang_typen) && !empty($studiengang_typen))
+		{
+			$qry .= ' AND sg.typ IN ('. $db->db_implode4SQL($studiengang_typen).')';
+		}
+
 		//gibt ein Array von zu akzeptierenden Dokumenten zurück
 		if ($db->db_query($qry))
 		{
@@ -923,11 +928,14 @@ class dokument extends basis_db
 				}
 
 				//für alle prestudent_ids das Dokument akzeptieren
-				$qry = "INSERT INTO public.tbl_dokumentprestudent(dokument_kurzbz, prestudent_id) VALUES";
+				$qry = "INSERT INTO public.tbl_dokumentprestudent(dokument_kurzbz, prestudent_id, datum, insertamum) VALUES";
 
 				foreach ($arrayDoksZuAkzeptieren as $prestudent_id)
 				{
-					$qry .= "(".$this->db_add_param($dokument_kurzbz). ",". $prestudent_id. ")";
+					$qry .= "(".$this->db_add_param($dokument_kurzbz).
+						",".$this->db_add_param($prestudent_id, FHC_INTEGER).
+						",".$this->db_add_param(date('Y-m-d')).
+						",".$this->db_add_param(strftime('%Y-%m-%d %H:%M')). ")";
 
 					if (next($arrayDoksZuAkzeptieren) == true)
 					{

From 10399db372373d62c99c3b87aa505c60280aa68e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 09:42:41 +0200
Subject: [PATCH 0430/1357] add handling comma in combination with titelpost

---
 public/js/components/DetailHeader/DetailHeader.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index b8dc0409f..19b414635 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -128,13 +128,14 @@ export default {
 					<small class="text-muted">{{person.uid}}</small>
 				</div>
 
-				<div v-if="headerData.length == 1">
-					<h2 class="h4">
-						{{headerData[0].titelpre}}
-						{{headerData[0].vorname}}
-						{{headerData[0].nachname}},
-						{{headerData[0].titelpost}}
-					</h2>
+					<div v-if="headerData.length == 1">
+						<h2 class="h4">
+							{{headerData[0].titelpre}}
+							{{headerData[0].vorname}}
+							{{headerData[0].nachname}}
+							<span v-if="headerData[0].titelpost">, </span>
+							{{headerData[0].titelpost}}
+						</h2>
 
 					<h5 class="h6">
 					 <strong class="text-muted">Person ID </strong>

From 9d341cc04570cf2308d5f63e59cb1bc29d7318c1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 10:23:05 +0200
Subject: [PATCH 0431/1357] getFunction for Student: restrict select attributes
 for person, update mitarbeiter model

---
 .../api/frontend/v1/stv/Student.php           |  14 +-
 .../models/ressource/Mitarbeiter_model.php    | 191 ++++++++++++++----
 2 files changed, 170 insertions(+), 35 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index ce2e2df8d..10b972a45 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -74,7 +74,19 @@ class Student extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('p.titelpre');
+		$this->PrestudentModel->addSelect('p.nachname');
+		$this->PrestudentModel->addSelect('p.vorname');
+		$this->PrestudentModel->addSelect('p.wahlname');
+		$this->PrestudentModel->addSelect('p.vornamen');
+		$this->PrestudentModel->addSelect('p.titelpost');
+		$this->PrestudentModel->addSelect('p.svnr');
+		$this->PrestudentModel->addSelect('p.ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('p.gebdatum');
+		$this->PrestudentModel->addSelect('p.geschlecht');
+		$this->PrestudentModel->addSelect('p.foto');
+		$this->PrestudentModel->addSelect('p.foto_sperre');
 		$this->PrestudentModel->addSelect('s.student_uid');
 		$this->PrestudentModel->addSelect('matrikelnr');
 		$this->PrestudentModel->addSelect('b.aktiv');
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 2b652c65b..bf4672070 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -12,34 +12,34 @@ class Mitarbeiter_model extends DB_Model
 		$this->pk = 'mitarbeiter_uid';
 	}
 
-    /**
-     * Checks if the user is a Mitarbeiter.
-     * @param string $uid
-     * @param boolean null $fixangestellt
-     * @return array
-     */
-    public function isMitarbeiter($uid, $fixangestellt = null)
-    {
-        $this->addSelect('1');
+	/**
+	 * Checks if the user is a Mitarbeiter.
+	 * @param string $uid
+	 * @param boolean null $fixangestellt
+	 * @return array
+	 */
+	public function isMitarbeiter($uid, $fixangestellt = null)
+	{
+		$this->addSelect('1');
 
-        if (is_bool($fixangestellt))
-        {
-            $result = $this->loadWhere(array('mitarbeiter_uid' => $uid, 'fixangestellt' => $fixangestellt));
-        }
-        else    // default
-        {
-            $result = $this->loadWhere(array('mitarbeiter_uid' => $uid));
-        }
+		if (is_bool($fixangestellt))
+		{
+			$result = $this->loadWhere(array('mitarbeiter_uid' => $uid, 'fixangestellt' => $fixangestellt));
+		}
+		else    // default
+		{
+			$result = $this->loadWhere(array('mitarbeiter_uid' => $uid));
+		}
 
-        if(hasData($result))
-        {
-            return success(true);
-        }
-        else
-        {
-            return success(false);
-        }
-    }
+		if(hasData($result))
+		{
+			return success(true);
+		}
+		else
+		{
+			return success(false);
+		}
+	}
 
 	/**
 	 * Laedt das Personal
@@ -98,6 +98,129 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
+	/**
+	 * gibt Personen mit Übersicht von Vertragsdaten aus
+	 *
+	 * @return array
+	 */
+	public function getPersonenWithContractDetails($person_id = null)
+	{
+		$qry = "
+			SELECT
+				b.uid , p.person_id,
+				p.vorname, p.nachname,
+				gebdatum,
+				COALESCE(b.alias, b.uid) AS email,
+				STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
+				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
+				STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
+				b.aktiv
+				FROM
+					hr.tbl_dienstverhaeltnis d
+				JOIN
+					public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+				JOIN
+					public.tbl_person p ON p.person_id = b.person_id
+				JOIN
+					public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+				JOIN
+					hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			";
+
+		if($person_id)
+		{
+			$qry .= " WHERE p.person_id = ?";
+		}
+
+		$qry.= "
+			GROUP BY
+				b.uid, p.person_id, p.vorname, p.nachname, b.alias
+			ORDER BY
+					p.nachname, p.vorname;
+			";
+
+		$params = array($person_id);
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * get current disciplinary Abteilung of person
+	 *
+	 * @param $person_id
+	 *
+	 * @return Array benutzerfunktionsdata
+	 */
+	public function getPersonAbteilung($uid)
+	{
+		$qry = "
+			SELECT
+				bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
+				bf.updatevon, bf.insertamum, bf.insertvon, bf.ext_id, bf.semester, bf.oe_kurzbz,
+				bf.datum_von, bf.datum_bis, bf.bezeichnung, bf.wochenstunden,
+				oe.oe_kurzbz, oe.oe_parent_kurzbz, oe.bezeichnung,
+				oe.organisationseinheittyp_kurzbz, oe.aktiv, oe.mailverteiler,
+				oe.freigabegrenze, oe.kurzzeichen, oe.lehre, oe.standort,
+				oe.warn_semesterstunden_frei, oe.warn_semesterstunden_fix, oe.standort_id
+			FROM tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+			WHERE uid = ?
+				AND funktion_kurzbz = 'oezuordnung'
+				AND datum_von <= NOW()
+				AND (datum_bis IS NULL OR datum_bis >= NOW())
+		";
+		$result = $this->execQuery($qry, [$uid]);
+
+		return $result;
+	}
+
+	/**
+	 * get Leitung / Vorgesetzten of current OE
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata / benutzerfunktionsdata
+	 */
+	public function getLeitungOrg($oe_kurzbz)
+	{
+		$qry = "
+            SELECT bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,
+				bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,
+				bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
+				p.person_id, p.vorname,p.nachname,p.titelpre,p.titelpost
+            FROM public.tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+            JOIN public.tbl_benutzer b USING (uid) JOIN public.tbl_mitarbeiter ma ON(b.uid=ma.mitarbeiter_uid)
+            JOIN public.tbl_person p  USING(person_id)
+            WHERE funktion_kurzbz='Leitung' AND oe.oe_kurzbz = ?
+                AND datum_von<=now() AND (datum_bis is null OR datum_bis>=now());
+        ";
+
+		return $this->execQuery($qry, array($oe_kurzbz));
+	}
+
+	/**
+	 * get persondata for person_id
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata
+	 */
+	public function getHeader($person_id)
+	{
+		$qry = "
+			SELECT
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
+			FROM
+				public.tbl_person
+				JOIN public.tbl_benutzer b USING(person_id)
+				JOIN public.tbl_mitarbeiter ma ON (ma.mitarbeiter_uid = b.uid)
+			WHERE
+				person_id = ?
+        ";
+
+		return $this->execQuery($qry, array($person_id));
+	}
+
 	/**
 	 * Gibt ein Array mit den UIDs der Vorgesetzten zurück
 	 * @return object
@@ -213,7 +336,7 @@ class Mitarbeiter_model extends DB_Model
 
 		if (hasData($kurzbzexists) && getData($kurzbzexists)[0])
 			return error('No Kurzbezeichnung could be generated');
-	
+
 		return success($kurzbz);
 	}
 
@@ -240,13 +363,13 @@ class Mitarbeiter_model extends DB_Model
 		$qry = "
 			SELECT " . $returnwert . "  
 			FROM 
-			    public.tbl_mitarbeiter ma 
+				public.tbl_mitarbeiter ma
 			JOIN 
-			    public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
+				public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
 			JOIN 
-			    public.tbl_person p on (p.person_id = b.person_id)
+				public.tbl_person p on (p.person_id = b.person_id)
 			WHERE 
-			    lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
+				lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
@@ -264,11 +387,11 @@ class Mitarbeiter_model extends DB_Model
 	public function getMitarbeiterFromLV($lehrveranstaltung_id)
 	{
 		$qry = "SELECT DISTINCT
-    			lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
+				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
 			FROM 
-			    lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
 			WHERE 
-			    lehrveranstaltung_id= ?
+				lehrveranstaltung_id= ?
 			AND 
 				mitarbeiter_uid=uid 
 			AND 

From c9cced3f61f2a234aac43af6a10f3c1dc131fb8e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 13:09:52 +0200
Subject: [PATCH 0432/1357] bugfix firma_id: define default as null instead of
 empty string

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index ed32e2eab..d0c7fbd04 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -231,7 +231,7 @@ export default{
 			this.reload();
 		},
 		selectedFirma(newVal) {
-			this.addressData.firma_id = newVal?.firma_id || '';
+			this.addressData.firma_id = newVal?.firma_id || null;
 		}
 	},
 	methods:{

From a1fe2e1b4b407070f0de0755821514c364e552e5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 13:57:37 +0200
Subject: [PATCH 0433/1357] fix SearchLib bug, add searchtypes config
 studentcis and active_organisationunit, use new searchtype in cis4
 searchoptions and searchbar result rendering

---
 application/config/search.php               | 19 +++++++++++++++++++
 application/libraries/SearchLib.php         |  5 +++--
 public/js/apps/Cis.js                       |  4 ++--
 public/js/components/searchbar/searchbar.js |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index e4876ec8f..bf98d3e93 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -209,6 +209,20 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
+$config['studentcis'] = $config['student'];
+unset($config['studentcis']['fields']['email']);
+$config['studentcis']['resultfields'] = [
+	"s.student_uid AS uid",
+	"s.matrikelnr",
+	"p.person_id",
+	"(p.vorname || ' ' || p.nachname) AS name",
+	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
+	"CASE
+		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+		ELSE NULL END
+		AS photo_url"
+];
+
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -652,6 +666,11 @@ $config['organisationunit'] = [
 			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
 ];
 
+$config['active_organisationunit'] = $config['organisationunit'];
+$config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
+$config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['active_organisationunit']['table'] = 'active_organisationseinheit';
+
 $config['room'] = [
 	'alias' => ['raum'],
 	'primarykey' => 'ort_kurzbz',
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index f48bf7e2e..0c942c436 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -668,8 +668,9 @@ class SearchLib
 					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
-			if ($or_with[0] === "RECURSIVE") {
-				if ($sqlWith[0] !== "RECURSIVE")
+			if ($or_with[0] === "RECURSIVE")
+			{
+				if (empty($sqlWith) || $sqlWith[0] !== "RECURSIVE")
 					array_unshift($sqlWith, "RECURSIVE");
 				array_shift($or_with);
 			}
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 29784b225..994efbec8 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -17,9 +17,9 @@ const app = Vue.createApp({
 				calcheightonly: true,
                 types: [
                     "employee",
-					"student",
+					"studentcis",
                     "room",
-                    "organisationunit"
+                    "active_organisationunit"
                 ],
                 actions: {
                     employee: {
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 4acdf0288..ec08dd178 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -98,12 +98,12 @@ export default {
                   <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv' || res.type === 'studentcis'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
+                    <organisationunit v-else-if="res.type === 'organisationunit' || res.type === 'active_organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>

From 3ed2bb4d787f5f9c5bfe42e958756f5053b5d2c3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:16:21 +0200
Subject: [PATCH 0434/1357] add uid@DOMAIN to emails result for prestudent and
 student, mergedperson render student only results, add searchresult_inaktiv
 css class to inactive users

---
 application/config/search.php                 | 13 ++++---
 .../js/components/Stv/Studentenverwaltung.js  | 10 +++++-
 .../searchbar/result/mergedperson.js          | 34 ++++++++++++++++---
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index bf98d3e93..b4fd4a42b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -197,11 +197,12 @@ $config['student'] = [
 		"s.matrikelnr",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"(s.student_uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
 		"CASE
 			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 			ELSE NULL END
-			AS photo_url"
+			AS photo_url",
+		"b.aktiv"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_student s USING (student_uid)
@@ -220,7 +221,8 @@ $config['studentcis']['resultfields'] = [
 	"CASE
 		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 		ELSE NULL END
-		AS photo_url"
+		AS photo_url",
+	"b.aktiv"
 ];
 
 $config['prestudent'] = [
@@ -311,7 +313,7 @@ $config['prestudent'] = [
 		"p.person_id",
 		"b.uid",
 		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"(b.uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
 		"CASE
 			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 			ELSE NULL END
@@ -334,7 +336,8 @@ $config['prestudent'] = [
 				LIMIT 1
 			),
 			sg.orgform_kurzbz
-		) AS orgform"
+		) AS orgform",
+		"b.aktiv"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 6cd472ea8..13a0369ba 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -107,7 +107,15 @@ export default {
 						},
 						defaultactionstudent: {
 							type: "link",
-							action: data => this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id)
+							action: data => {
+								if (data.prestudent_id) {
+									return this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id);
+								} else if (data.uid) {
+									return this.$fhcApi.getUri('/studentenverwaltung/student/' + data.uid);
+								} else {
+									return this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id);
+								}
+							}
 						},
 						childactions: []
 					}
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index f02febf6f..0f6f3f0ee 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -45,7 +45,26 @@ export default {
 			].includes(item.type)) || null;
 		},
 		students() {
-			const students = this.res.list.filter(item => item.type == 'prestudent');
+			const students = this.res.list.filter(item => [
+					'student',
+					'prestudent',
+					'studentcis',
+					'studentStv'
+				].includes(item.type))
+				.filter((item, idx, arr) => {
+					if (item.type === 'prestudent') {
+						return true;
+					}
+
+					let prestudentwithsameuidexists = arr.some(tmpitem => {
+						return tmpitem.uid === item.uid && tmpitem.type === 'prestudent';
+					});
+
+					if (prestudentwithsameuidexists) {
+						return false;
+					}
+					return true;
+				});
 			return students.length ? students : null;
 		},
 		emails() {
@@ -54,11 +73,15 @@ export default {
 		},
 		telurl() {
 			return 'tel:' + this.employee?.phone;
+		},
+		inaktiv() {
+			return this.res.list.some(item => item?.aktiv === false);
 		}
 	},
 	template: `
 	<template-frame
 		class="searchbar-result-mergedperson"
+		:class="(inaktiv) ? 'searchbar_inaktiv' : ''"
 		:res="person"
 		:actions="actions"
 		:title="person.name"
@@ -145,19 +168,22 @@ export default {
 								<template v-if="mode == 'simple'">
 									{{ student.studiengang_kz }}
 								</template>
-								<template v-else>
+								<template v-else-if="student.status && student.stg_kuerzel">
 									{{ student.status }} ({{ student.stg_kuerzel }})
 								</template>
+								<template v-else>
+									{{ $p.t('person/student') }}
+								</template>
 							</template-action>
 						</div>
 					</div>
-					<div class="searchbar_tablerow">
+					<div v-if="student.bezeichnung" class="searchbar_tablerow">
 						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell searchbar_value">
 							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
-					<div class="searchbar_tablerow">
+					<div v-if="student.prestudent_id" class="searchbar_tablerow">
 						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
 						<div class="searchbar_tablecell searchbar_value">
 							{{ student.prestudent_id }}

From 9fe7dd069fef40a738b5ce3021c1ca91bd43c0cf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Jul 2025 15:23:57 +0200
Subject: [PATCH 0435/1357] refactor(LvPlan Lektoren in LV Ansicht): passt die
 Ansicht der Lektoren in den LVs des LvPlan an wenn mehrere Lektoren vorhanden
 sind

---
 public/css/Cis4/Cis.css                       | 18 ++++++++++++++++
 public/css/Cis4/CoreCalendarEvents.css        | 21 ++++++++++++++++++-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 19 +++++++++++------
 .../Cis/Renderer/Lehreinheit/modalContent.js  |  8 ++++---
 system/phrasesupdate.php                      | 20 ++++++++++++++++++
 5 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 99ab609b9..8311ceadb 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -807,4 +807,22 @@ html {
 
 .mylv-semester-studiengang-lv .card-header {
 	min-height: 55px;
+}
+
+#lektorenContainer{
+	display: grid;
+	grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+
+}
+
+@media(max-width: 990px) {
+	#lektorenContainer{
+		grid-template-columns: 1fr 1fr 1fr;
+	}
+}
+
+@media(max-width: 575px) {
+	#lektorenContainer {
+		grid-template-columns: 1fr 1fr;
+	}
 }
\ No newline at end of file
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index f248f4a61..d886e024e 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -16,7 +16,8 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	display:flex;
-	place-content: center space-evenly;
+	justify-content: space-evenly;
+	align-items:center;
 	
 }
 
@@ -24,6 +25,10 @@
 	display:none;
 }
 
+.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+	display: none;
+}
+
 /* Lehreinheits Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
@@ -32,6 +37,13 @@
 
 }
 
+@media(max-width: 1199px){
+	.weekPageContainer .lehreinheitEventContent {
+			grid-template-columns: 1fr;
+		}
+}
+
+
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display: grid;
 	padding: .25rem .5rem .25rem .25rem;
@@ -100,6 +112,13 @@
 	align-items:center;
 	color: var(--fhc-light);
 }
+.weekPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
 
 .weekPageContainer .feiertagEventContent #ferienEventIcon {
 	margin: 0.25rem;
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index dc3cdb443..a334ea4d4 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -15,18 +15,21 @@ export default {
 			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
 			
 			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
-			
+			tooltipString += `${this.$p.t('person', 'ort')}: ${this.event.ort_kurzbz}`;
 			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
 				lektorenEmpty = false;
 				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
-				this.event.lektor.forEach(lektor => {
+				this.event.lektor.slice(0,3).forEach(lektor => {
 					tooltipString += `${lektor.kurzbz}\n`;
 				})
+				if(this.event.lektor.length > 3){
+					tooltipString += `${this.$p.t('lehre', 'weitereLektoren', [(this.event.lektor.length - 3)])}\n`;
+				}
 			}
 			if(lektorenEmpty){
 				tooltipString += "\n";	
 			}
-			tooltipString += `${this.$p.t('person','ort')}: ${this.event.ort_kurzbz}`;
+			
 			
 			return tooltipString;
 		},
@@ -38,15 +41,19 @@ export default {
 		},
 	},
 	template: /*html*/`
-	<div class="lehreinheitEventContent h-100 w-100 p-1" >
-		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+	<div class="lehreinheitEventContent h-100 w-100 p-1" @wheel.stop >
+		<div id="lehreinheitEventHeader" class="d-none d-xl-grid h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
 			<span >{{convertTime(event.beginn.split(":"))}}</span>
 			<span >{{convertTime(event.ende.split(":"))}}</span>
 		</div>
 		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
-			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
 			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
+			<span id="lehreinheitLektoren" v-for="(lektor,index) in event.lektor.slice(0,3)">
+				{{lektor.kurzbz}}
+			</span>
+			<span id="lektorEllipsis" class="fw-bold" v-if="event.lektor.length > 3">...+ 
+		 	{{event.lektor.length-3}}</span>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 2d5f34eee..0be28962a 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -95,9 +95,11 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-								{{lektor.kurzbz}}
+							<div id="lektorenContainer">
+								<div v-for="lektor in event.lektor" class="d-block">
+									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									{{lektor.kurzbz}}
+								</div>
 							</div>
 						</td>
 					</tr>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0e9f8888..7e58d0e98 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -3064,6 +3064,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'weitereLektoren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '...und {0} weitere Lektoren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'group',
+				'description' => '...and {0} more lecturers',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From cb48c1e5e381b26570273b07cbb0edf30211c352 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:48:37 +0200
Subject: [PATCH 0436/1357] Tab Details: add tbl_benutzer to update logic

---
 .../api/frontend/v1/stv/Student.php           | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 10b972a45..d56736541 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -151,6 +151,7 @@ class Student extends FHCAPI_Controller
 	public function save($prestudent_id)
 	{
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -170,7 +171,6 @@ class Student extends FHCAPI_Controller
 		
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
-		//TODO(Manu) check with Chris: input number not allowed
 		$udf_field_validations = $this->getDataOrTerminateWithError($result);
 
 		$this->form_validation->set_rules($udf_field_validations);
@@ -225,7 +225,7 @@ class Student extends FHCAPI_Controller
 			'anmerkung',
 			'homepage'
 		];
-		
+
 		// add UDFs
 		$result = $this->udflib->getDefinitionForModel($this->PersonModel);
 
@@ -257,6 +257,15 @@ class Student extends FHCAPI_Controller
 			}
 		}
 
+		$array_allowed_props_benutzer = ['aktiv', 'alias'];
+		$update_benutzer = array();
+		foreach ($array_allowed_props_benutzer as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_benutzer[$prop] = $val;
+			}
+		}
+
 		// Check PKs
 		if (count($update_lehrverband) + count($update_student) && $uid === null) {
 			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_student')]);
@@ -264,6 +273,9 @@ class Student extends FHCAPI_Controller
 		if (count($update_person) && $person_id === null) {
 			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_person')]);
 		}
+		if (count($update_benutzer) && $uid === null) {
+			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_student')]);
+		}
 
 		// Do Updates
 		if (count($update_lehrverband)) {
@@ -316,10 +328,26 @@ class Student extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
+		if (count($update_benutzer)) {
+			$update_benutzer['updatevon'] = $authuid;
+			$update_benutzer['updateamum'] = $now;
+			if (array_key_exists("aktiv", $update_benutzer))
+			{
+				$update_benutzer['updateaktivvon'] = $authuid;
+				$update_benutzer['updateaktivam'] = $now;
+			}
+			$result = $this->BenutzerModel->update(
+				[$uid],
+				$update_benutzer
+			);
+			$this->getDataOrTerminateWithError($result);
+		}
+
 		$this->terminateWithSuccess(array_fill_keys(array_merge(
 			array_keys($update_lehrverband),
 			array_keys($update_person),
-			array_keys($update_student)
+			array_keys($update_student),
+			array_keys($update_benutzer)
 		), ''));
 	}
 

From 7aa074cdf682c70ceccda70003b9130676be1c2c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:51:42 +0200
Subject: [PATCH 0437/1357] use uselanguge when searching cms content, remove
 flags from cms content results, use cms and dms searchtypes in cis4

---
 application/config/search.php                |  5 ++--
 public/js/apps/Cis.js                        | 29 ++++++++++++++++++--
 public/js/components/searchbar/result/cms.js |  7 -----
 public/js/components/searchbar/searchbar.js  | 17 +-----------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index b4fd4a42b..ea07f6e1c 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -705,7 +705,7 @@ $config['room'] = [
 		LEFT JOIN public.tbl_adresse address
 			USING (adresse_id)"
 ];
-
+$sprache = getUserLanguage();
 $config['cms'] = [
 	'primarykey' => 'contentsprache_id',
 	'table' => 'campus.tbl_contentsprache',
@@ -785,7 +785,8 @@ $config['cms'] = [
 			SELECT content_id 
 			FROM cms_active_others
 		)
-		AND version = campus.get_highest_content_version(content_id)"
+		AND version = campus.get_highest_content_version(content_id)
+		AND contentsprache.sprache = '{$sprache}'"
 ];
 
 $config['dms'] = [
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 994efbec8..dc32511c1 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -19,7 +19,9 @@ const app = Vue.createApp({
                     "employee",
 					"studentcis",
                     "room",
-                    "active_organisationunit"
+                    "active_organisationunit",
+					"cms",
+					"dms"
                 ],
                 actions: {
                     employee: {
@@ -105,7 +107,30 @@ const app = Vue.createApp({
                             }
                         },
                         childactions: []
-                    }
+                    },
+					cms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									'/CisVue/Cms/content/' + data.content_id;
+								return link;
+							}
+						},
+						childactions: []
+					},
+					dms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									'cms/dms.php?id=' + data.dms_id;
+								return link;
+							}
+						},
+						childactions: []
+					}
                 }
             }
         };
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 591c7e79c..5eebc3826 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -10,7 +10,6 @@ export default {
 		actions: Object
 	},
 	inject: [
-		'languages',
 		'query'
 	],
 	computed: {
@@ -56,11 +55,6 @@ export default {
 			else if (url.substr(0, 3) == '../')
 				url = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/\/+$/, '') + url.substr(2);
 			return '<a href="' + url + '">' + url + '</a>';
-		},
-		flag() {
-			if (!this.languages || !this.languages[this.res.language])
-				return "";
-			return "data:image/jpeg;base64," + this.languages[this.res.language].flagge;
 		}
 	},
 	template: `
@@ -72,7 +66,6 @@ export default {
 		image-fallback="fas fa-newspaper fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
-		<img v-if="flag" :src="flag" class="ms-2">
 		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
 		<div v-else class="searchbar_table text-muted">
 			{{ $p.t('search/result_content_none') }}
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index ec08dd178..09dab9ece 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -9,13 +9,10 @@ import cms from "./result/cms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
-import ApiLanguage from "../../api/factory/language.js"
-
 export default {
     props: [ "searchoptions", "searchfunction" ],
     provide() {
         return {
-            languages: Vue.computed(() => this.languages),
             query: Vue.computed(() => this.lastQuery)
         };
     },
@@ -33,8 +30,7 @@ export default {
         searching: false,
         error: null,
             abortController: null,
-        settingsDropdown:null,
-            languages: null,
+			settingsDropdown: null,
             lastQuery: ''
       };
     },
@@ -147,17 +143,6 @@ export default {
 		},
 		
 	},
-    created() {
-        this.$api
-            .call(ApiLanguage.getAll())
-            .then(result => {
-                this.languages = result.data.reduce((a, c) => {
-                    a[c.sprache] = c;
-                    return a;
-                }, {});
-            })
-            .catch(this.$fhcAlert.handleSystemError);
-    },
     beforeMount: function() {
 		this.$watch('searchsettings.types', newValue => {
 			if (Array.isArray(newValue) && newValue.length === 0){

From 487279289080efc9f2bd21aff0f8dbfd0c958450 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 16:19:13 +0200
Subject: [PATCH 0438/1357] prevent cis search from searching in private email
 addresses and phone numbers

---
 application/config/search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/config/search.php b/application/config/search.php
index ea07f6e1c..451ae656d 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -211,7 +211,8 @@ $config['student'] = [
 ];
 
 $config['studentcis'] = $config['student'];
-unset($config['studentcis']['fields']['email']);
+unset($config['studentcis']['searchfields']['email']);
+unset($config['studentcis']['searchfields']['tel']);
 $config['studentcis']['resultfields'] = [
 	"s.student_uid AS uid",
 	"s.matrikelnr",

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

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

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

From da9f00fff03c4690d0f05ad7c1987bf742efdd3f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 11:17:49 +0200
Subject: [PATCH 0440/1357] add Calendar

---
 application/config/calendar.php               |   6 +
 public/css/components/calendar.css            | 549 ++++--------------
 public/js/components/Calendar/Base.js         | 272 +++++++++
 .../components/Calendar/Base/DragAndDrop.js   | 162 ++++++
 public/js/components/Calendar/Base/Grid.js    | 344 +++++++++++
 .../js/components/Calendar/Base/Grid/Line.js  | 111 ++++
 .../Calendar/Base/Grid/Line/Background.js     |  72 +++
 .../Calendar/Base/Grid/Line/Event.js          |  57 ++
 public/js/components/Calendar/Base/Header.js  | 118 ++++
 .../Calendar/Base/Header/Datepicker.js        | 119 ++++
 .../js/components/Calendar/Base/Label/Day.js  |  39 ++
 .../js/components/Calendar/Base/Label/Dow.js  |  35 ++
 .../js/components/Calendar/Base/Label/Time.js |  58 ++
 .../js/components/Calendar/Base/Label/Week.js |  38 ++
 public/js/components/Calendar/Base/Slider.js  | 129 ++++
 public/js/components/Calendar/Mode/Day.js     |  89 +++
 .../js/components/Calendar/Mode/Day/View.js   | 103 ++++
 public/js/components/Calendar/Mode/List.js    |  93 +++
 .../js/components/Calendar/Mode/List/View.js  |  61 ++
 public/js/components/Calendar/Mode/Month.js   | 125 ++++
 .../js/components/Calendar/Mode/Month/View.js |  87 +++
 public/js/components/Calendar/Mode/Week.js    | 108 ++++
 .../js/components/Calendar/Mode/Week/View.js  |  75 +++
 public/js/composables/EventLoader.js          | 125 ++++
 public/js/directives/Calendar/Click.js        |  49 ++
 public/js/directives/Calendar/DragAndDrop.js  | 100 ++++
 public/js/helpers/DragAndDrop.js              |  67 +++
 system/phrasesupdate.php                      |  62 ++
 28 files changed, 2826 insertions(+), 427 deletions(-)
 create mode 100644 application/config/calendar.php
 create mode 100644 public/js/components/Calendar/Base.js
 create mode 100644 public/js/components/Calendar/Base/DragAndDrop.js
 create mode 100644 public/js/components/Calendar/Base/Grid.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line/Background.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line/Event.js
 create mode 100644 public/js/components/Calendar/Base/Header.js
 create mode 100644 public/js/components/Calendar/Base/Header/Datepicker.js
 create mode 100644 public/js/components/Calendar/Base/Label/Day.js
 create mode 100644 public/js/components/Calendar/Base/Label/Dow.js
 create mode 100644 public/js/components/Calendar/Base/Label/Time.js
 create mode 100644 public/js/components/Calendar/Base/Label/Week.js
 create mode 100644 public/js/components/Calendar/Base/Slider.js
 create mode 100644 public/js/components/Calendar/Mode/Day.js
 create mode 100644 public/js/components/Calendar/Mode/Day/View.js
 create mode 100644 public/js/components/Calendar/Mode/List.js
 create mode 100644 public/js/components/Calendar/Mode/List/View.js
 create mode 100644 public/js/components/Calendar/Mode/Month.js
 create mode 100644 public/js/components/Calendar/Mode/Month/View.js
 create mode 100644 public/js/components/Calendar/Mode/Week.js
 create mode 100644 public/js/components/Calendar/Mode/Week/View.js
 create mode 100644 public/js/composables/EventLoader.js
 create mode 100644 public/js/directives/Calendar/Click.js
 create mode 100644 public/js/directives/Calendar/DragAndDrop.js
 create mode 100644 public/js/helpers/DragAndDrop.js

diff --git a/application/config/calendar.php b/application/config/calendar.php
new file mode 100644
index 000000000..99bb9b2c6
--- /dev/null
+++ b/application/config/calendar.php
@@ -0,0 +1,6 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// Define configuration parameters
+$config['timezone'] = 'Europe/Vienna';
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 85962d4e0..68181166b 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,441 +1,136 @@
-:root{
-	--fhc-calendar-pane-height: calc(100vh - 220px);
-	
-	--fhc-calendar-primary: var(--fhc-primary, #006095);
-	--fhc-calendar-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-	--fhc-calendar-text: var(--fhc-text, #212529);
-	--fhc-calendar-text-light: var(--fhc-text, #212529);
-	--fhc-calendar-background: var(--fhc-background, #fff);
-	--fhc-calendar-dark: var(--fhc-dark, #212529);
-	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
-}
-
-:root.dark{
-	--fhc-calendar-past: var(--fhc-beige-20, rgba(172, 153, 125, 0.5));
-}
-
-.fhc-calendar-pane {
-	height: var(--fhc-calendar-pane-height);
-}
-
-.fhc-calendar-hour-indicator{
-	border-top: 1px solid var(--fhc-calendar-border);
-}
-
-.fhc-calendar-hour-indicator span{
-	background-color: var(--fhc-calendar-hour-indicator-bg) !important;
-}
-
-.fhc-calendar-week-page-header{
-	color: var(--fhc-calendar-text);
-	background-color: var(--fhc-calendar-week-page-header-background);
-}
-
-.fhc-calendar-week-page-header > div {
-	border-right: 1px solid var(--fhc-calendar-border);
-}
-
-.fhc-calendar-week-page-header > div:hover{
-	background-color: var(--fhc-calendar-week-page-header-hover-background);
-}
-
-.fhc-calendar-months .col-4,
-.fhc-calendar-years .col-4 {
-  padding: 0.1875em 0;
-}
-.show-weeks .fhc-calendar-months .col-4,
-.show-weeks .fhc-calendar-years .col-4 {
-  padding: 0.1875em 0.25em;
-}
-.fhc-calendar-months .col-4 button,
-.fhc-calendar-years .col-4 button {
-  aspect-ratio: 28/18;
-}
-
-.fhc-calendar-month-page {
-  display: grid;
-  grid-template-columns: repeat(7, 1fr);
-  grid-template-rows: 1.5em repeat(6, 1fr);
-}
-.fhc-calendar-month-page.show-weeks {
-  grid-template-columns: 1.5em repeat(7, 1fr);
-  grid-template-rows: 1.5em repeat(6, 1fr);
-}
-
-.fhc-calendar-month-page-weekday,
-.fhc-calendar-month-page-day {
-  color: inherit;
-}
-
-.fhc-calendar-week .carousel-item {
-  /*padding: 0.75em;*/
-}
-
-.fhc-calendar-week-page {
-  /*aspect-ratio: 7/6;*/
-  min-height: 0;
-}
-.fhc-calendar-week-page > div {
-  /*transform: translate(-0.75em, -0.75em);*/
-  /*width: calc(100% + 1.5em);*/
-  /*height: calc(100% + 1.5em);*/
-	max-height: 100%;
-}
-.fhc-calendar-week-page > div > div {
-  padding-left: 3em;
-}
-.fhc-calendar-week-page .events {
-  display: grid;
-  grid-template-columns: 3em repeat(7, 1fr);
-  margin-left: -3em;
-  /*min-height: 266.6666666667%;*/
-}
-.fhc-calendar-week-page .events .day {
-  gap: 1px;
-}
-.fhc-calendar-week-page .events .hours, .fhc-calendar-week-page .events .day {
-  display: grid;
-}
-
-.fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-week-page .all-day-event {
-	max-height: 75px;
-	overflow: auto;
-	overscroll-behavior: none;
-}
-
-.fhc-calendar-week-page .all-day-event-container{
-	position: sticky;
-	top: 44px;
-	display:grid;
-	grid-template-columns:repeat(7,1fr);
-	width:100%;
-	z-index:3;
-	background-color:var(--fhc-calendar-all-day-event-background);
-}
-
-.fhc-calendar-week-page .all-day-event-container::before {
-	position: absolute;
-	content:'';
-	top: 0;
-	bottom: 0;
-	left: -3em;
-	right: 100%;
-	background-color: var(--fhc-calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-day-page .all-day-event {
-	grid-column:2;
-	max-height: 75px;
-	overflow: auto;
-}
-
-.fhc-calendar-day-page .all-day-event-container {
-	position: sticky;
-	top:0;
-	display: grid;
-	grid-template-columns: 3em 1fr;
-	width: 100%;
-	z-index: 3;
-	background-color:var(--fhc-calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-/* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
-.box-shadow-border{
-	box-shadow: 0 0 0 1px var(--fhc-calendar-border) !important;
-}
-
-.fhc-calendar-no-events-overlay{
-	position: relative;
-}
-
-.fhc-calendar-no-events-overlay::before {
-	content: "";
-	position: absolute;
-	top: 0;
-	left: 3rem;
-	margin:auto;
-	width: 100%;
-	height: 100%;
-	background-image: linear-gradient(120deg, var(--fhc-calendar-background), var(--fhc-calendar-dark) );
-	opacity: .7;
-}
-.fhc-calendar-day-page {
-  /*aspect-ratio: 7/6;*/
-  min-height: 0;
-}
-.fhc-calendar-day-page > div {
-  height: calc(100% + 1.5em);
-}
-.fhc-calendar-day-page .flex-column > .flex-grow-1 {
-  padding-left: 3em;
-}
-
-.fhc-calendar-day-page .events {
-  display: grid;
-  grid-template-columns: 3em 1fr;
-}
-.fhc-calendar-day-page .events .day {
-  gap: 1px;
-}
-.fhc-calendar-day-page .events .hours, .fhc-calendar-day-page .events .day {
-  display: grid;
-}
-
-.fhc-calendar-month-page-day{
-	color: var(--fhc-calendar-text) !important;
-}
-
-.fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
-	color: var(--fhc-calendar-text) !important;
-}
-
-.fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-day {
-  border: solid 1px var(--fhc-calendar-border);
-}
-
-.fhc-calendar-lg .fhc-calendar-month-page-weekday,
-.fhc-calendar-md .fhc-calendar-month-page-weekday{
-	border: solid 1px var(--fhc-secondary);
+/* Themable Variables */
+:root {
+  --fhc-calendar-pane-height: calc(100vh - 220px);
+  
+  --fhc-calendar-primary: var(--fhc-primary, #006095);
+  --fhc-calendar-border: var(--fhc-border, #dee2e6);
+  --fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+  --fhc-calendar-text: var(--fhc-text, #212529);
+  --fhc-calendar-text-light: var(--fhc-text, #212529);
+  --fhc-calendar-background: var(--fhc-background, #fff);
+  --fhc-calendar-dark: var(--fhc-dark, #212529);
+  --fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+  --fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+  --fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+  --fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+  --fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+  --fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+  --fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+  --fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
 }
 
 
-.fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-day {
-  aspect-ratio: 1;
+/* Labels */
+/* ====== */
+.fhc-calendar-base-label-dow .short,
+.fhc-calendar-base-label-dow .narrow,
+.fhc-calendar-base-label-day .full,
+.fhc-calendar-base-label-day .short,
+.fhc-calendar-base-label-day .narrow,
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-dow .long {
+  display: none;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
+.collapsed-header .fhc-calendar-base-label-day .short,
+.collapsed-header .fhc-calendar-base-label-dow .short {
+  display: block;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-day,
+.fhc-calendar-mode-week .fhc-calendar-base-label-day {
+  font-size: .875em;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week {
+  text-align: right;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week span {
+  color: var(--bs-secondary-color);
+  cursor: pointer;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week span + span:before {
+  content: "/";
+}
+
+
+/* Base Grid */
+/* ========= */
+/* Grid */
+.fhc-calendar-base-grid {
+  --fhc-calendar-axis-collapsible: .2fr;
+  background-color: var(--bs-border-color);
+  grid-gap: 2px;
+}
+.fhc-calendar-base-grid .grid-header {
+  background-color: var(--bs-gray-200);
+}
+.fhc-calendar-base-grid .grid-main {
+  grid-gap: 1px;
+}
+.fhc-calendar-base-grid-line {
+  grid-gap: 1px;
+}
+.fhc-calendar-mode-month .main-header,
+.fhc-calendar-base-grid .part-header,
+.fhc-calendar-base-grid .part-body {
+  background-color: rgba(255,255,255, 1);
+}
+.fhc-calendar-base-label-time {
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
+  align-items: end;
 }
-.fhc-calendar-lg .fhc-calendar-month-page-day.active,
-.fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--fhc-calendar-border-highlight);
-}
-/*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
-/*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
-/*  display: block;*/
-/*  overflow: auto;*/
-/*  font-size: 0.7em;*/
-/*}*/
-/*.fhc-calendar-lg .fhc-calendar-month-page-day .events span,*/
-/*.fhc-calendar-md .fhc-calendar-month-page-day .events span {*/
-/*  display: block;*/
-/*  margin: 0.2em;*/
-/*  padding: 0.1em 0.4em;*/
-/*  border-radius: 0.1em;*/
-/*}*/
-.fhc-calendar-lg .fhc-calendar-years .col-4,
-.fhc-calendar-md .fhc-calendar-years .col-4 {
-  padding: 0.09375em 0;
-}
-.show-weeks .fhc-calendar-lg .fhc-calendar-years .col-4,
-.show-weeks .fhc-calendar-md .fhc-calendar-years .col-4 {
-  padding: 0.09375em 0.25em;
-}
-.fhc-calendar-lg .fhc-calendar-years .col-4 button,
-.fhc-calendar-md .fhc-calendar-years .col-4 button {
-  aspect-ratio: 28/9;
-}
-
-.fhc-calendar-xs {
-  font-size: 0.6em;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page {
-  font-size: 0.8em;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-weekday,
-.fhc-calendar-xs .fhc-calendar-month-page-weekday {
-  font-style: italic;
-  display: flex;
-  align-items: center;
-  justify-content: end;
-}
-
-.fhc-calendar-month-page-weekday:hover {
-	background-color:var(--fhc-calendar-primary);
-	color:var(--fhc-calendar-text-light);
-	
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-day,
-.fhc-calendar-xs .fhc-calendar-month-page-day {
-  position: relative;
-  aspect-ratio: 1;
-}
-
-
-
-.fhc-calendar-past {
-	background-color: var(--fhc-calendar-past);
-	border-color: var(--fhc-calendar-border);
-	opacity: 0.5;
-}
-
-.fhc-calendar-month-page-day-focusday {
-	border-color: var(--fhc-calendar-border-highlight) !important;
-	background-color: var(--fhc-calendar-background);
-	position: relative;
-	animation: dash-animation 2.5s linear infinite;
-}
-
-@keyframes dash-animation {
-	0% {
-		border-style: dashed;
-	}
-	50% {
-		border-style: solid;
-	}
-	100% {
-		border-style: dashed;
-	}
-}
-
-.fhc-highlight-week {
-	/*border-color: black !important;*/
-}
-
-.fhc-highlight-day {
-	position:relative;
-}
-
-.fhc-highlight-day::before {
-	content:'';
-	position:absolute;
-	top:0;
-	bottom:0;
-	left:0;
-	right:0;
-	box-shadow: inset 0 0 0 2px var(--fhc-calendar-border) !important;
-	pointer-events: none;
-	z-index: 2;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
-.fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: var(--fhc-calendar-primary);
-  border-radius: 50%;
+/* Events */
+.fhc-calendar-base-grid-line-event.event-header {
   font-weight: bold;
 }
-.fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
-.fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: var(--fhc-calendar-primary);
-  border-radius: 50%;
+.fhc-calendar-base-grid-line-event.event-header .disabled {
+  opacity: .3;
 }
-/*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
-/*.fhc-calendar-xs .fhc-calendar-month-page-day .no {*/
-/*  display: flex;*/
-/*  align-items: center;*/
-/*  justify-content: center;*/
-/*  width: 80%;*/
-/*  height: 80%;*/
-/*  margin: 10%;*/
-/*}*/
-/*.fhc-calendar-sm .fhc-calendar-month-page-day .events,*/
-/*.fhc-calendar-xs .fhc-calendar-month-page-day .events {*/
-/*  position: absolute;*/
-/*  bottom: 0;*/
-/*  left: 10%;*/
-/*  width: 80%;*/
-/*  height: 10%;*/
-/*  overflow: hidden;*/
-/*  display: flex;*/
-/*}*/
-.fhc-calendar-sm .fhc-calendar-month-page-day .events span,
-.fhc-calendar-xs .fhc-calendar-month-page-day .events span {
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
+  overflow: hidden;
+  line-height: 1.5;
+  font-size: .8rem;
+  grid-auto-rows: 1.5em;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+  text-indent: .5em;
+  height: 1.5em;
   overflow: hidden;
 }
 
-.selectedEvent {
-	background-color: var(--fhc-calendar-primary) !important;
-	color: var(--fhc-calendar-text-light);
+
+/* Customize */
+/* ========= */
+/* Header */
+.fhc-calendar-base-header > .row {
+  align-items: center;
+}
+/* Events */
+.event-colored {
+  background: rgba(var(--event-color-rgb), .5);
+  min-height: 100%;
+}
+.event-colored:hover {
+  background: rgba(var(--event-color-rgb), .3);
+}
+/* Backgrounds */
+.background-past {
+  background: var(--fhc-calendar-past);
+  border-bottom: solid 1px var(--fhc-calendar-border);
+}
+.background-past > span {
+  display: none;
+}
+.background-past.bg-end > span {
+  display: block;
+  position: absolute;
+  top: 100%;
+  left: 1rem;
+  padding: 0 .5rem;
+  background-color: var(--fhc-background);
+  border: solid 1px var(--fhc-calendar-border);
+  font-size: .875em;
 }
 
-.fhc-calendar-day-page .curTimeIndicator{
-	position: absolute;
-	left: 0;
-	right: 0;
-	pointer-events: none;
-	padding-left: 7rem;
-	margin-top: -1px;
-	z-index: 2;
-	border-color: var(--fhc-calendar-border)!important;
-}
-
-.fhc-calendar-week-page .curTimeIndicator {
-	position: absolute;
-	left: 0;
-	right: 0;
-	pointer-events: none;
-	padding-left: 1rem;
-	margin-top: -1px;
-	z-index: 2;
-	border-color: var(--fhc-calendar-border) !important;
-}
-
-.fhc-calendar-week-page .past::before{
-	content:"";
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-}
-
-.fhc-calendar-week-page .overlay {
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-}
-
-.fhc-calendar-day-page .overlay {
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-}
-
-.dayPageContainer,
-.weekPageContainer {
-	container-type: inline-size;
-}
-
-#calendarHeaderTitle{
-	color: var(--fhc-text);
-}
-
-.fhc-calendar-day-page .hours,
-.fhc-calendar-day-page .curTimeIndicator,
-.fhc-calendar-day-page .fhc-calendar-hour-indicator,
-.fhc-calendar-week-page .hours,
-.fhc-calendar-week-page .curTimeIndicator,
-.fhc-calendar-week-page .fhc-calendar-hour-indicator,
-.fhc-calendar-day-page .date,
-.fhc-calendar-week-page .date {
-	color: var(--fhc-text-secondary) !important;
-}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
new file mode 100644
index 000000000..816027ade
--- /dev/null
+++ b/public/js/components/Calendar/Base.js
@@ -0,0 +1,272 @@
+import BaseDraganddrop from './Base/DragAndDrop.js';
+import BaseHeader from './Base/Header.js';
+import BaseSlider from './Base/Slider.js';
+
+import CalClick from '../../directives/Calendar/Click.js';
+
+/**
+ * TODO(chris):
+ * - check emits
+ * - event single mode (default for click:event)
+ * - get focusDate/currentDate correct
+ */
+
+export default {
+	name: "CalendarBase",
+	components: {
+		BaseDraganddrop,
+		BaseHeader,
+		BaseSlider
+	},
+	directives: {
+		CalClick
+	},
+	provide() {
+		return {
+			locale: Vue.computed(() => this.locale),
+			timezone: Vue.computed(() => this.timezone),
+			timeGrid: Vue.computed(() => this.timeGrid),
+			draggableEvents: Vue.computed(() => {
+				if (!this.draggableEvents)
+					return () => false;
+
+				if (Array.isArray(this.draggableEvents))
+					return event => this.draggableEvents.includes(event.type);
+				if (this.draggableEvents instanceof Function)
+					return this.draggableEvents;
+				
+				return () => true;
+			}),
+			dropableEvents: Vue.computed(() => {
+				if (!this.onDrop)
+					return () => false;
+
+				if (Array.isArray(this.dropableEvents))
+					return item => this.dropableEvents.includes(item.type);
+				if (this.dropableEvents instanceof Function)
+					return this.dropableEvents;
+
+				return () => true;
+			}),
+			hasDragoverFunc: Vue.computed(() => this.onDragover),
+			mode: Vue.computed(() => this.mode)
+		};
+	},
+	props: {
+		locale: {
+			type: String,
+			default: 'de'
+		},
+		timezone: {
+			type: String,
+			required: true
+		},
+		date: {
+			type: [Date, String, Number, luxon.DateTime],
+			default: luxon.DateTime.local()
+		},
+		modes: {
+			type: Object,
+			required: true,
+			default: {}
+			// TODO(chris): verfication functions
+		},
+		mode: String,
+		modeOptions: Object,
+		events: {
+			type: Array,
+			default: []
+		},
+		backgrounds: {
+			type: Array,
+			default: []
+		},
+		showBtns: Boolean,
+		btnMonth: {
+			type: Boolean,
+			default: undefined
+		},
+		btnWeek: {
+			type: Boolean,
+			default: undefined
+		},
+		btnDay: {
+			type: Boolean,
+			default: undefined
+		},
+		btnList: {
+			type: Boolean,
+			default: undefined
+		},
+		timeGrid: Array,
+		draggableEvents: [Boolean, Array, Function],
+		dropableEvents: [Boolean, Array, Function],
+		onDragover: Function,
+		onDrop: Function
+	},
+	emits: [
+		"click:next",
+		"click:prev",
+		"click:mode",
+		"click:event",
+		"click:day",
+		"click:week",
+		"update:date",
+		"update:mode",
+		"update:range",
+		"drop"
+	],
+	data() {
+		return {
+			internalView: null,
+			internalDate: null
+		};
+	},
+	computed: {
+		convertedEvents() {
+			return this.events.map(orig => ({
+				id: orig.type + orig[orig.type + '_id'],
+				type: orig.type,
+				start: luxon.DateTime.fromISO(orig.isostart).setZone(this.timezone),
+				end: luxon.DateTime.fromISO(orig.isoend).setZone(this.timezone),
+				orig
+			}));
+		},
+		convertedBackgrounds() {
+			return this.backgrounds.map(bg => {
+				const res = { ...bg };
+				if (res.start) {
+					if (Number.isInteger(res.start))
+						res.start = luxon.DateTime.fromMillis(res.start, { zone: this.timezone, locale: this.locale });
+					else if (res.start instanceof Date)
+						res.start = luxon.DateTime.fromJSDate(res.start, { zone: this.timezone, locale: this.locale });
+					else if (typeof res.start === 
+						'string' || res.start instanceof String)
+						res.start = luxon.DateTime.fromISO(res.start, { zone: this.timezone, locale: this.locale });
+				}
+				if (res.end) {
+					if (Number.isInteger(res.end))
+						res.end = luxon.DateTime.fromMillis(res.end, { zone: this.timezone, locale: this.locale });
+					else if (res.end instanceof Date)
+						res.end = luxon.DateTime.fromJSDate(res.end, { zone: this.timezone, locale: this.locale });
+					else if (typeof res.end === 
+						'string' || res.end instanceof String)
+						res.end = luxon.DateTime.fromISO(res.end, { zone: this.timezone, locale: this.locale });
+				}
+				return res;
+			});
+		},
+		cDate: {
+			get() {
+				if (this.internalDate) {
+					return this.internalDate.setLocale(this.locale);
+				}
+				return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone).setLocale(this.locale);
+			},
+			set(value) {
+				this.internalDate = value;
+				this.$emit('update:date', value);
+			}
+		},
+		cMode: {
+			get() {
+				if (!this.internalView) {
+					// choose default mode
+					let mode = this.mode;
+					if (!mode || !this.modes[mode])
+						mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
+					return mode || '';
+				}
+				return this.internalView;
+			},
+			set(value) {
+				this.internalView = value;
+				this.$emit('update:mode', value);
+			}
+		}
+	},
+	methods: {
+		clickPrev() {
+			const evt = new Event('click:prev', {cancelable: true});
+			this.$emit('click:prev', evt);
+			if (evt.defaultPrevented)
+				return;
+
+			// default: switch page
+			this.$refs.mode.prevPage();
+		},
+		clickNext() {
+			const evt = new Event('click:next', {cancelable: true});
+			this.$emit('click:next', evt);
+			if (evt.defaultPrevented)
+				return;
+
+			// default: switch page
+			this.$refs.mode.nextPage();
+		},
+		handleClickDefaults(evt) {
+			// TODO(chris): implement
+			switch (evt.detail.source) {
+			case 'day':
+				if (this.cMode != 'day' && this.modes['day']) {
+					evt.stopPropagation();
+					this.cDate = evt.detail.value;
+					this.cMode = 'day';
+				}
+				break;
+			case 'week':
+				if (this.cMode != 'week' && this.modes['week']) {
+					evt.stopPropagation();
+					this.cDate = luxon.DateTime.fromObject({
+						localWeekNumber: evt.detail.value.number,
+						localWeekYear: evt.detail.value.year
+					}, {
+						zone: this.cDate.zoneName,
+						locale: this.cDate.locale
+					});
+					this.cMode = 'week';
+				}
+				break;
+			}
+		},
+		onDropItem(evt, start, end) {
+			this.$emit('drop', evt, start, end);
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-base h-100">
+		<base-draganddrop
+			class="card h-100"
+			:events="convertedEvents"
+			:backgrounds="convertedBackgrounds"
+			@drop="onDropItem"
+			v-cal-click:container
+			@cal-click-default.capture="handleClickDefaults"
+		>
+			<base-header
+				class="card-header"
+				v-model:date="cDate"
+				v-model:mode="cMode"
+				@prev="clickPrev"
+				@next="clickNext"
+				@click:mode="$emit('click:mode', $event)"
+				:btn-day="!!modes['day'] && (btnDay || (showBtns && btnDay !== false))"
+				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
+				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
+				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
+			>
+				<slot name="actions" />
+			</base-header>
+			<component
+				:is="modes ? modes[cMode] : null || 'div'"
+				ref="mode"
+				v-model:current-date="cDate"
+				@update:range="$emit('update:range', $event)"
+				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
+			>
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</component>
+		</base-draganddrop>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/DragAndDrop.js b/public/js/components/Calendar/Base/DragAndDrop.js
new file mode 100644
index 000000000..0be17ddb4
--- /dev/null
+++ b/public/js/components/Calendar/Base/DragAndDrop.js
@@ -0,0 +1,162 @@
+import DragAndDrop from '../../../helpers/DragAndDrop.js';
+
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+
+/**
+ * TODO(chris): this needs serious rework!
+ */
+
+export default {
+	name: "CalendarDragAndDrop",
+	directives: {
+		CalDnd
+	},
+	provide() {
+		return {
+			events: Vue.computed(() => this.correctedEvents),
+			backgrounds: Vue.computed(() => this.backgrounds),
+			dropAllowed: Vue.computed(() => this.dragging && this.dropAllowed)
+		};
+	},
+	inject: {
+		mode: "mode",
+		dropableEvents: "dropableEvents"
+	},
+	props: {
+		events: Array,
+		backgrounds: Array
+	},
+	emits: [
+		"drop"
+	],
+	data() {
+		return {
+			dragging: false,
+			allowed: false,
+			draggedInternalEvent: null,
+			draggedExternalEvent: null,
+			targetTimestamp: 0,
+			targetGridEnds: null,
+			dropAllowed: false,
+
+			shadowPreview: false // TODO(chris): IMPLEMENT! (use background instead of event as preview)
+		};
+	},
+	computed: {
+		correctedEvents() {
+			if (this.dragging) {
+				if (this.draggedInternalEvent) {
+					const index = this.events.findIndex(e => e.id == this.draggedInternalEvent.id);
+					if (this.previewEvent && !this.shadowPreview)
+						return this.events.toSpliced(index, 1, this.previewEvent);
+					else
+						return this.events.toSpliced(index, 1);
+				}
+				if (this.previewEvent && !this.shadowPreview)
+					return [...this.events, this.previewEvent];
+			}
+
+			return this.events;
+		},
+		correctedBackgrounds() {
+			if (this.dragging) {
+				if (this.shadowPreview) {
+					// TODO(chris): how to get the length
+					return [...this.backgrounds, {
+						start: new Date(this.targetTimestamp),
+						class: 'shadow-preview'
+					}];
+				}
+			}
+
+			return this.backgrounds;
+		},
+		previewEvent() {
+			if (!this.dragging || !this.dropAllowed)
+				return null;
+			if (!this.targetTimestamp)
+				return null;
+
+			const event = this.draggedInternalEvent || this.draggedExternalEvent;
+
+			if (!event)
+				return null;
+			
+			// TODO(chris): calculate length correctly from orig
+			let length = event.end - event.start;
+			if (this.targetGridEnds)
+				length = this.targetGridEnds.find(end => end >= this.targetTimestamp + length) - this.targetTimestamp;
+			
+			return {
+				orig: event.orig,
+				start: this.targetTimestamp,
+				end: this.targetTimestamp + length
+			};
+		}
+	},
+	methods: {
+		onDragstart(evt) {
+			DragAndDrop.setTransferData(evt.detail.originalEvent, evt.detail.item.orig);
+			this.draggedInternalEvent = evt.detail.item;
+		},
+		onDragend() {
+			this.draggedInternalEvent = null;
+			this.dragging = false;
+		},
+		onDragenter(evt) {
+			this.dragging = true;
+
+			if (!this.draggedInternalEvent) {
+				const event = DragAndDrop.getValidTransferData(evt.detail.originalEvent);
+				if (event) {
+					this.draggedExternalEvent = {
+						id: event.id,
+						type: event.type,
+						start: event.isostart
+							? luxon.DateTime.fromISO(event.isostart).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						end: event.isoend
+							? luxon.DateTime.fromISO(event.isoend).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						orig: event
+					};
+				} else {
+					this.draggedExternalEvent = null;
+				}
+				this.dropAllowed = this.dropableEvents(event, this.mode);
+			} else {
+				this.dropAllowed = this.dropableEvents(this.draggedInternalEvent, this.mode);
+			}
+		},
+		onDragleave() {
+			this.dragging = false;
+		},
+		onDragchange(evt) {
+			this.targetTimestamp = evt.detail.timestamp;
+			
+			this.targetGridEnds = evt.detail.ends || null;
+		},
+		onDrop(evt) {
+			if (!this.dragging || !this.dropAllowed)
+				return;
+
+			this.$emit('drop', evt, this.previewEvent.start, this.previewEvent.end);
+			this.dropAllowed = false;
+			this.dragging = false;
+		}
+	},
+	template: `
+	<div
+		class="fhc-calendar-base-draganddrop"
+		@calendar-dragstart="onDragstart"
+		@calendar-dragend="onDragend"
+		v-cal-dnd:dropcage
+		@calendar-dragenter="onDragenter"
+		@calendar-dragleave="onDragleave"
+		@calendar-dragchange="onDragchange"
+		@drop="onDrop"
+	>
+		<slot />
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
new file mode 100644
index 000000000..56465c0f3
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -0,0 +1,344 @@
+import GridLine from './Grid/Line.js';
+
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+
+export default {
+	name: "CalendarGrid",
+	components: {
+		GridLine
+	},
+	directives: {
+		CalDnd
+	},
+	inject: {
+		originalEvents: "events",
+		originalBackgrounds: "backgrounds",
+		dropAllowed: "dropAllowed"
+	},
+	provide() {
+		return {
+			flipAxis: Vue.computed(() => this.flipAxis),
+			axisRow: Vue.computed(() => this.axisRow)
+		};
+	},
+	props: {
+		axisMain: {
+			type: Array,
+			required: true,
+			validator(value) {
+				return value.every(item => item instanceof luxon.DateTime);
+			}
+		},
+		axisParts: {
+			type: Array,
+			required: true,
+			validator(value) {
+				return value.every(item => 
+					item instanceof luxon.Duration
+					|| Number.isInteger(item)
+					|| (
+						(
+							item.start instanceof luxon.Duration
+							|| Number.isInteger(item.start)
+						) && (
+							item.end instanceof luxon.Duration
+							|| Number.isInteger(item.end)
+						)
+					)
+				);
+			}
+		},
+		flipAxis: Boolean,
+		allDayEvents: Boolean,
+		axisMainCollapsible: Boolean,
+		snapToGrid: Boolean
+	},
+	data() {
+		return {
+			dragging: false
+		};
+	},
+	computed: {
+		axisRow() {
+			return this.flipAxis ? 'column' : 'row';
+		},
+		axisCol() {
+			return this.flipAxis ? 'row' : 'column';
+		},
+		axisPartsWithBreaks() {
+			return this.axisParts.reduce((res, tu, index) => {
+				const start = tu.start || tu;
+				const end = tu.end;
+
+				if (res.length) {
+					const lastTuEnd = res.pop();
+					if (Array.isArray(lastTuEnd)) {
+						res.push({
+							start: lastTuEnd[0],
+							end: start,
+							index: lastTuEnd[1]
+						});
+					} else if (lastTuEnd != start) {
+						// add pause
+						res.push({
+							start: lastTuEnd,
+							end: start
+						});
+					}
+				}
+
+				if (!end) {
+					res.push([start, index]);
+				} else {
+					res.push({
+						start,
+						end,
+						index
+					});
+					res.push(end);
+				}
+				return res;
+			}, []).slice(0, -1);
+		},
+		axisPartsSave() {
+			if (!this.axisParts[this.axisParts.length - 1].end)
+				return this.axisParts.slice(0, -1);
+			return this.axisParts;
+		},
+		start() {
+			return this.axisPartsWithBreaks[0].start;
+		},
+		end() {
+			return this.axisPartsWithBreaks[this.axisPartsWithBreaks.length - 1].end;
+		},
+		ends() {
+			const ends = [];
+			const partsEnds = this.axisPartsWithBreaks
+				.filter(p => p.index !== undefined)
+				.map(p => p.end);
+			for (var date of this.axisMain)
+				for (var part of partsEnds)
+					ends.push(date.plus(part));
+			
+			return ends;
+		},
+		axisMainBorders() {
+			const lastInMainAxis = this.axisMain[this.axisMain.length - 1];
+			const extraLength = this.end;
+
+			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
+		},
+		events() {
+			return this.mapIntoMainAxis(this.originalEvents);
+		},
+		backgrounds() {
+			return this.mapIntoMainAxis(this.originalBackgrounds);
+		},
+		hasValidEvents() {
+			return this.events.find(e => e.length);
+		},
+		styleGridCols() {
+			let cols = 'repeat(' + this.axisMain.length + ', 1fr)';
+			if (this.axisMainCollapsible) {
+				if (this.hasValidEvents)
+					cols = this.events
+						.map(e => e.length
+							? '1fr'
+							: 'var(--fhc-calendar-axis-collapsible, .5fr)')
+						.join(' ');
+			}
+			return cols;
+		},
+		styleGridRows() {
+			const gridlines = {};
+
+			this.axisPartsWithBreaks.forEach(part => {
+				let ts = part.start.toMillis();
+				if (!gridlines[ts])
+					gridlines[ts] = ['t_' + ts];
+				if (part.index !== undefined)
+					gridlines[ts].push('ps_' + part.index);
+				ts = part.end.toMillis();
+				if (!gridlines[ts])
+					gridlines[ts] = ['t_' + ts];
+				if (part.index !== undefined)
+					gridlines[ts].push('pe_' + part.index);
+			});
+
+			this.events.forEach((events, mainIndex) => {
+				let day = this.axisMain[mainIndex];
+				events.forEach(event => {
+					if (!event.startsHere && !event.endsHere)
+						return;
+					if (this.allDayEvents && event.orig.allDayEvent)
+						return;
+					if (event.startsHere) {
+						let ts = event.start.diff(day).toMillis();
+						if (!gridlines[ts])
+							gridlines[ts] = ['t_' + ts, 'e_' + ts];
+					}
+					if (event.endsHere) {
+						let ts = event.end.diff(day).toMillis();
+						if (!gridlines[ts])
+							gridlines[ts] = ['t_' + ts, 'e_' + ts];
+					}
+				});
+			});
+
+			return '[allday] auto ' + Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
+				let end = keys[i + 1];
+				if (!end) {
+					gridlines[start].push('end');
+					return '[' + gridlines[start].join(' ') + ']';
+				}
+				return '[' + gridlines[start].join(' ') + '] ' + (end - start) + 'fr';
+			}).join(' ');
+		}
+	},
+	methods: {
+		mapIntoMainAxis(target) {
+			const result = Array.from({length: this.axisMain.length}, () => Array());
+			
+			target.forEach(event => {
+				// NOTE(chris): make new Date object to reset the time
+				const start = event.start || this.axisMainBorders[0].plus(-1);
+				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
+
+				for (var i = 0; i < this.axisMain.length; i++) {
+					if (start < this.axisMainBorders[i + 1] && end > this.axisMainBorders[i]) {
+						const startsHere = start >= this.axisMainBorders[i];
+						const endsHere = end <= this.axisMainBorders[i+1];
+						result[i].push({
+							...event,
+							startsHere,
+							endsHere
+						});
+					}
+				}
+			});
+
+			return result;
+		},
+
+		/* DRAG AND DROP */
+		getPageTop(el) {
+			let pageTop = el.offsetTop;
+			if (el.offsetParent)
+				pageTop += this.getPageTop(el.offsetParent);
+			return pageTop;
+		},
+		getPageLeft(el) {
+			let pageLeft = el.offsetLeft;
+			if (el.offsetParent)
+				pageLeft += this.getPageLeft(el.offsetParent);
+			return pageLeft;
+		},
+		getTimestampFromMouse(evt, dayTimestamp) {
+			let mouse, mouseFrac;
+			if (this.flipAxis) {
+				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.main.scrollLeft;
+				mouseFrac = mouse / this.$refs.body.offsetWidth;
+			} else {
+				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.main.scrollTop;
+				mouseFrac = mouse / this.$refs.body.offsetHeight;
+			}
+
+			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid"
+		style="display:grid;width:100%;height:100%"
+		:style="'grid-template-' + axisRow + 's:auto 1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
+	>
+		<div
+			class="grid-header"
+			style="display:grid"
+			:style="'grid-template-' + axisCol + 's:subgrid;grid-' + axisCol + ':1/-1'"
+		>
+			<div
+				v-for="(date, index) in axisMain"
+				:key="index"
+				class="main-header"
+				:class="{'collapsed-header': axisMainCollapsible && hasValidEvents && !events[index].length}"
+				:style="'grid-' + axisCol + ':' + (2+index)"
+			>
+				<slot name="main-header" v-bind="{ index, date }" />
+			</div>
+		</div>
+		<div
+			style="display:grid;overflow:auto"
+			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
+		>
+			<div
+				ref="main"
+				class="grid-main"
+				style="grid-column:1/-1;grid-row:1/-1;display:grid"
+				:style="'grid-template-' + axisCol + 's:subgrid;grid-template-' + axisRow + 's:' + styleGridRows"
+			>
+				<div
+					v-for="(part, index) in axisPartsSave"
+					:key="index"
+					class="part-header"
+					:style="'grid-' + axisCol + ':1;grid-' + axisRow + ': ps_' + index + '/pe_' + index"
+				>
+					<slot name="part-header" v-bind="{ index, part }" />
+				</div>
+
+				<div
+					ref="body"
+					class="grid-body"
+					style="display:grid;grid-template-rows:subgrid;grid-template-columns:subgrid"
+					:style="'grid-' + axisCol + ':2/-1;grid-' + axisRow + ':1/-1'"
+					v-cal-dnd:dropcage
+					@calendar-dragenter="dragging = true"
+					@calendar-dragleave="dragging = false"
+					@dragover="dropAllowed ? $event.preventDefault() : null"
+				>
+					<template
+						v-for="(date, index) in axisMain"
+						:key="index"
+					>
+						<div
+							v-for="(part, i) in axisPartsSave"
+							:key="i"
+							class="part-body"
+							style="position:relative"
+							:style="'grid-' + axisCol + ':' + (1+index) + ';grid-' + axisRow + ':ps_' + i + '/pe_' + i"
+						>
+							<slot name="part-body" v-bind="{ index, part }" />
+							<div
+								v-if="snapToGrid && dragging"
+								style="position:absolute;inset:0;z-index:1"
+								v-cal-dnd:dropzone.once="{date: date.plus(part.start || part), ends: ends.slice(ends.findIndex(end => end > date))}"
+							></div>
+						</div>
+						<grid-line
+							:start="date.plus(start)"
+							:end="date.plus(end)"
+							:date="date"
+							:events="events[index]"
+							:backgrounds="backgrounds[index]"
+							style="position:relative"
+							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
+							:all-day-events="allDayEvents"
+						>
+							<template #event="slot">
+								<slot name="event" v-bind="slot" />
+							</template>
+							<template #dropzone>
+								<div
+									v-if="!snapToGrid && dragging"
+									style="position:absolute;inset:0;z-index:1"
+									v-cal-dnd:dropzone="evt => getTimestampFromMouse(evt, date)"
+								></div>
+							</template>
+						</grid-line>
+					</template>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
new file mode 100644
index 000000000..41f9bd58d
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -0,0 +1,111 @@
+import LineEvent from './Line/Event.js';
+import LineBackground from './Line/Background.js';
+
+/**
+ * TODO(chris):
+ * Event overflow for Month mode (more-button)
+ */
+
+export default {
+	name: "GridLine",
+	components: {
+		LineEvent,
+		LineBackground
+	},
+	inject: {
+		axisRow: "axisRow"
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		start: {
+			type: luxon.DateTime,
+			required: true
+		},
+		end: {
+			type: luxon.DateTime,
+			required: true
+		},
+		events: {
+			type: Array,
+			default: []
+		},
+		backgrounds: {
+			type: Array,
+			default: []
+		},
+		allDayEvents: Boolean
+	},
+	computed: {
+		eventsAllDay() {
+			if (!this.allDayEvents)
+				return [];
+			return this.events.filter(event => event.orig.allDayEvent);
+		},
+		eventsNormal() {
+			if (!this.allDayEvents)
+				return this.events;
+			return this.events.filter(event => !event.orig.allDayEvent);
+		},
+		eventsWithRowInfo() {
+			const events = [];
+			this.eventsNormal.forEach(event => {
+				const rows = [2, -1];
+				if (event.startsHere) {
+					rows[0] = 't_' + event.start.diff(this.date).toMillis();
+				}
+				if (event.endsHere) {
+					rows[1] = 't_' + event.end.diff(this.date).toMillis();
+				}
+
+				events.push({
+					...event,
+					rows
+				});
+			});
+			return events;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line"
+		style="position:relative;display:grid;grid-auto-flow:dense"
+		:style="'grid-template-' + axisRow + 's:subgrid'"
+	>
+		<line-background
+			v-for="bg in backgrounds"
+			:start="start"
+			:end="end"
+			:background="bg"
+		></line-background>
+		<div
+			v-if="eventsAllDay.length"
+			:style="'grid-' + axisRow + ': allday'"
+			class="all-day-events"
+		>
+			<line-event
+				v-for="(event, i) in eventsAllDay"
+				:key="i"
+				:event="event"
+			>
+				<template v-slot="slot">
+					<slot name="event" v-bind="slot" />
+				</template>
+			</line-event>
+		</div>
+		<line-event
+			v-for="(event, i) in eventsWithRowInfo"
+			:key="i"
+			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+			:event="event"
+		>
+			<template v-slot="slot">
+				<slot name="event" v-bind="slot" />
+			</template>
+		</line-event>
+		<slot name="dropzone" />
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line/Background.js b/public/js/components/Calendar/Base/Grid/Line/Background.js
new file mode 100644
index 000000000..e87737ffc
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line/Background.js
@@ -0,0 +1,72 @@
+export default {
+	name: "GridLineBackground",
+	inject: {
+		flipAxis: "flipAxis"
+	},
+	props: {
+		start: {
+			type: luxon.DateTime,
+			required: true
+		},
+		end: {
+			type: luxon.DateTime,
+			required: true
+		},
+		background: {
+			type: Object,
+			required: true,
+			validator(value) {
+				if (!value.start && !value.end)
+					return false;
+				if (value.start && !(value.start instanceof luxon.DateTime))
+					return false;
+				if (value.end && !(value.end instanceof luxon.DateTime))
+					return false;
+				return true;
+			}
+		}
+	},
+	computed: {
+		styles() {
+			if (!this.background.endsHere && !this.background.startsHere)
+				return this.background.style;
+
+			const perc = (this.end.ts - this.start.ts) / 100;
+			
+			let border = {};
+			if (this.background.startsHere)
+				border[this.flipAxis ? 'left' : 'top'] = (this.background.start.diff(this.start)) / perc + '%';
+			if (this.background.endsHere)
+				border[this.flipAxis ? 'right' : 'bottom'] = (this.end.diff(this.background.end)) / perc + '%';
+
+			if (!this.background.style)
+				return border;
+			
+			return [this.background.style, border];
+		},
+		classes() {
+			if (!this.background.endsHere && !this.background.startsHere)
+				return this.background.class;
+			
+			const result = [];
+			if (this.background.class)
+				result.push(this.background.class);
+			if (this.background.startsHere)
+				result.push('bg-begin');
+			if (this.background.endsHere)
+				result.push('bg-end');
+			return result;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line-background"
+		:class="classes"
+		style="position:absolute;inset:0;z-index:0"
+		:style="styles"
+		:title="background.title"
+	>
+		<span v-if="background.label">{{ background.label }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line/Event.js b/public/js/components/Calendar/Base/Grid/Line/Event.js
new file mode 100644
index 000000000..5cf098eb5
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line/Event.js
@@ -0,0 +1,57 @@
+import CalDnd from '../../../../../directives/Calendar/DragAndDrop.js';
+import CalClick from '../../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "GridLineEvent",
+	directives: {
+		CalDnd,
+		CalClick
+	},
+	inject: {
+		draggableEvents: "draggableEvents",
+		mode: "mode"
+	},
+	props: {
+		event: {
+			type: Object,
+			required: true,
+			validator(value) {
+				return (value.start && value.end && value.orig);
+			}
+		}
+	},
+	computed: {
+		isHeaderOrFooter() {
+			return ['header', 'footer'].includes(this.event.orig);
+		},
+		draggable() {
+			return !this.isHeaderOrFooter && this.draggableEvents(this.event.orig, this.mode);
+		},
+		classes() {
+			const classes = [];
+			if (this.isHeaderOrFooter) {
+				classes.push('event-' + this.event.orig);
+			} else {
+				if (this.event.startsHere)
+					classes.push('event-begin');
+				if (this.event.endsHere)
+					classes.push('event-end');
+			}
+			return classes
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line-event"
+		:class="classes"
+		style="z-index: 1"
+		:draggable="draggable"
+		v-cal-dnd:draggable="event"
+		v-cal-click:event="isHeaderOrFooter ? event : event.orig"
+	>
+		<slot :event="isHeaderOrFooter ? event : event.orig">
+			{{ event.orig }}
+		</slot>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
new file mode 100644
index 000000000..6dc0d3c26
--- /dev/null
+++ b/public/js/components/Calendar/Base/Header.js
@@ -0,0 +1,118 @@
+/**
+ * TODO(chris): use click-directive
+ */
+import DatePicker from './Header/Datepicker.js';
+
+export default {
+	name: "CalendarHeader",
+	components: {
+		DatePicker
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		mode: {
+			type: String,
+			required: true
+		},
+		btnMonth: Boolean,
+		btnWeek: Boolean,
+		btnDay: Boolean,
+		btnList: Boolean
+	},
+	emits: [
+		"next",
+		"prev",
+		"click:mode",
+		"update:date",
+		"update:mode"
+	],
+	data() {
+		return {
+			open: false
+		};
+	},
+	methods: {
+		clickMode(evt, mode) {
+			this.$emit('click:mode', evt);
+			if (!evt.defaultPrevented)
+				this.$emit('update:mode', mode);
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-base-header">
+		<div class="row">
+			<div class="col">
+				<slot />
+			</div>
+			<div class="col-auto d-flex justify-content-center">
+				<div class="btn-group" role="group">
+					<button
+						class="btn btn-outline-secondary border-0"
+						@click="$emit('prev')"
+						:disabled="open"
+					>
+						<i class="fa fa-chevron-left"></i>
+					</button>
+					<date-picker
+						:mode="mode"
+						:date="date"
+						@update:date="$emit('update:date', $event)"
+						@open="open = true"
+						@closed="open = false"
+					/>
+					<button
+						class="btn btn-outline-secondary border-0"
+						@click="$emit('next')"
+						:disabled="open"
+					>
+						<i class="fa fa-chevron-right"></i>
+					</button>
+				</div>
+			</div>
+			<div class="col">
+				<div class="d-flex gap-1 justify-content-end" role="group">
+					<button
+						v-if="btnMonth"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'month'}"
+						@click="clickMode($event, 'month')"
+					>
+						<i class="fa fa-calendar-days"></i>
+					</button>
+					<button
+						v-if="btnWeek"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'week'}"
+						@click="clickMode($event, 'week')"
+					>
+						<i class="fa fa-calendar-week"></i>
+					</button>
+					<button
+						v-if="btnDay"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'day'}"
+						@click="clickMode($event, 'day')"
+					>
+						<i class="fa fa-calendar-day"></i>
+					</button>
+					<button
+						v-if="btnList"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'list'}"
+						@click="clickMode($event, 'list')"
+					>
+						<i class="fa fa-table-list"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Header/Datepicker.js b/public/js/components/Calendar/Base/Header/Datepicker.js
new file mode 100644
index 000000000..f6e521805
--- /dev/null
+++ b/public/js/components/Calendar/Base/Header/Datepicker.js
@@ -0,0 +1,119 @@
+// TODO(chris): translate aria-labels
+
+export default {
+	name: "CalendarHeaderDatepicker",
+	components: {
+		VueDatePicker
+	},
+	inject: [
+		"locale",
+		"timezone"
+	],
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		mode: {
+			type: String,
+			required: true
+		},
+		listLength: {
+			type: Number,
+			default: 7
+		}
+	},
+	emits: [
+		"update:date"
+	],
+	computed: {
+		convertedDate() {
+			// convert to target TZ then strip TZ Information
+			// so the datepicker can work with local times
+			return this.date.setZone(this.timezone).setZone('local', { keepLocalTime: true });
+		},
+		current() {
+			switch (this.mode) {
+			case "month":
+				return {month: this.convertedDate.month-1, year: this.convertedDate.year};
+			case "list":
+				return [this.convertedDate.startOf('day').ts, this.convertedDate.startOf('day').plus({ days: this.listLength }).ts - 1];
+			case "week":
+				return [this.convertedDate.startOf('week', { useLocaleWeeks: true }).ts, this.convertedDate.endOf('week', { useLocaleWeeks: true }).ts];
+			case "day":
+				return this.convertedDate;
+			default:
+				return null;
+			}
+		},
+		title() {
+			switch (this.mode) {
+			case "month":
+				return this.date.toLocaleString({ month: 'long', year: 'numeric' });
+			case "week":
+				const year = this.date.localWeekYear;
+				const week = this.date.toFormat('nn');
+				return this.$p.t('calendar/year_kw', { year, week });
+			case "list":
+			case "day":
+				return this.date.toLocaleString(luxon.DateTime.DATE_FULL);
+			default:
+				return 'View not Supported';
+			}
+		},
+		format() {
+			const title = this.title;
+			return `'${title}'`;
+		},
+		weekStart() {
+			return luxon.Info.getStartOfWeek(this.date)%7;
+		}
+	},
+	methods: {
+		update(value) {
+			let date;
+			switch (this.mode) {
+			case "month":
+				value.month++;
+				date = luxon.DateTime.fromObject(value).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			case "list":
+			case "week":
+				date = luxon.DateTime.fromJSDate(value[0]).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			case "day":
+				date = luxon.DateTime.fromJSDate(value).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			default:
+				return; // Don't update if the value is invalid!
+			}
+			this.$emit("update:date", date);
+		},
+		weekNumbers(date) {
+			return luxon.DateTime.fromJSDate(date, { locale: this.locale }).localWeekNumber;
+		}
+	},
+	template: /* html */`
+	<vue-date-picker
+		:model-value="current"
+		@update:model-value="update"
+		:format="format"
+		:month-picker="mode == 'month'"
+		:week-picker="mode == 'week'"
+		:range="mode == 'list' ? { autoRange: listLength } : false"
+		:text-input="mode == 'day'"
+		:week-start="weekStart"
+		:week-numbers="{ type: weekNumbers }"
+		:clearable="false"
+		:enable-time-picker="false"
+		:config="{ keepActionRow: mode != 'month' }"
+		:action-row="{ showSelect: false, showCancel: false, showNow: mode != 'month', showPreview: false }"
+		auto-apply
+		six-weeks
+		teleport
+		:locale="locale"
+		:now-button-label="$p.t('calendar/today')"
+		:week-num-name="$p.t('calendar/kw')"
+	/>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Day.js b/public/js/components/Calendar/Base/Label/Day.js
new file mode 100644
index 000000000..731beebd2
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Day.js
@@ -0,0 +1,39 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelDay",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		titleFull() {
+			return this.date.toLocaleString({day: 'numeric', month: 'long', year: 'numeric'});
+		},
+		titleLong() {
+			return this.date.toLocaleString({day: '2-digit', month: '2-digit', year: 'numeric'});
+		},
+		titleShort() {
+			return this.date.toLocaleString({day: 'numeric', month: 'numeric'});
+		},
+		titleNarrow() {
+			return this.date.toLocaleString({day: 'numeric'});
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-label-day"
+		v-cal-click:day="date"
+	>
+		<span class="full">{{ titleFull }}</span>
+		<span class="long">{{ titleLong }}</span>
+		<span class="short">{{ titleShort }}</span>
+		<span class="narrow">{{ titleNarrow }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Dow.js b/public/js/components/Calendar/Base/Label/Dow.js
new file mode 100644
index 000000000..4da02de64
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Dow.js
@@ -0,0 +1,35 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelDow",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		titleLong() {
+			return this.date.toLocaleString({weekday: 'long'});
+		},
+		titleShort() {
+			return this.date.toLocaleString({weekday: 'short'});
+		},
+		titleNarrow() {
+			return this.date.toLocaleString({weekday: 'narrow'});
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-label-dow"
+		v-cal-click:dow="date"
+	>
+		<b class="long">{{ titleLong }}</b>
+		<b class="short">{{ titleShort }}</b>
+		<b class="narrow">{{ titleNarrow }}</b>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Time.js b/public/js/components/Calendar/Base/Label/Time.js
new file mode 100644
index 000000000..a7fc21ae7
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Time.js
@@ -0,0 +1,58 @@
+export default {
+	name: "LabelTime",
+	props: {
+		part: {
+			type: [luxon.Duration, Number, Object],
+			required: true,
+			validator(value) {
+				if (value instanceof Object) {
+					if (value instanceof luxon.Duration)
+						return true;
+					let start_ok = true;
+					let end_ok = true;
+					if (value.start) {
+						start_ok = (
+							value.start instanceof luxon.Duration
+							|| Number.isInteger(value.start)
+						);
+					}
+					if (value.end) {
+						end_ok = (
+							value.end instanceof luxon.Duration
+							|| Number.isInteger(value.end)
+						);
+					}
+					return start_ok && end_ok;
+				}
+				return true;
+			}
+		}
+	},
+	computed: {
+		sanitizedTimestamps() {
+			return this.part.start || this.part.end ? this.part : { start: this.part };
+		},
+		start() {
+			if (!this.sanitizedTimestamps.start)
+				return null;
+			return this.formatTime(this.sanitizedTimestamps.start);
+		},
+		end() {
+			if (!this.sanitizedTimestamps.end)
+				return null;
+			return this.formatTime(this.sanitizedTimestamps.end);
+		}
+	},
+	methods: {
+		formatTime(date) {
+			return date.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: `
+	<div class="fhc-calendar-base-label-time">
+		<span v-if="start">{{ start }}</span>
+		<span v-if="end">-</span>
+		<span v-if="end">{{ end }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Week.js b/public/js/components/Calendar/Base/Label/Week.js
new file mode 100644
index 000000000..76849f2c6
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Week.js
@@ -0,0 +1,38 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelWeek",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		weeks() {
+			const firstDay = this.date.startOf('week', { useLocaleWeeks: true });
+			const lastDay = this.date.endOf('week', { useLocaleWeeks: true });
+
+			const weeks = [
+				{ number: firstDay.localWeekNumber, year: firstDay.localWeekYear },
+				{ number: lastDay.localWeekNumber, year: lastDay.localWeekYear }
+			];
+			if (weeks[0].number == weeks[1].number)
+				weeks.pop();
+			return weeks;
+		}
+	},
+	template: `
+	<div class="fhc-calendar-base-label-week">
+		<span
+			v-for="week in weeks"
+			v-cal-click:week="week"
+		>
+			{{ week.number }}
+		</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Slider.js b/public/js/components/Calendar/Base/Slider.js
new file mode 100644
index 000000000..192eccd5f
--- /dev/null
+++ b/public/js/components/Calendar/Base/Slider.js
@@ -0,0 +1,129 @@
+export default {
+	name: 'CalendarSlider',
+	inject: {
+		time: {
+			from: "sliderTime",
+			default: ".3s"
+		}
+	},
+	emits: [
+		'slid'
+	],
+	data() {
+		return {
+			target: 0,
+			extrasAfter: 0,
+			extrasBefore: 0,
+			running: false,
+			promiseResolve: null
+		}
+	},
+	computed: {
+		itemsAfter() {
+			return [...Array(this.extrasAfter)].map((i, k) => 1+k);
+		},
+		itemsBefore() {
+			return [...Array(this.extrasBefore)].map((i, k) => k-this.extrasBefore);
+		},
+		styleSlider() {
+			const style = {
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				width: '100%',
+				height: '100%'
+			};
+			if (this.running) {
+				style.left = (-this.target * 100) + '%';
+				style.transition = 'left ' + this.time + ' ease-in-out';
+			}
+			return style;
+		},
+		styleBefore() {
+			return {
+				position: 'absolute',
+				top: 0,
+				height: '100%',
+				display: 'flex',
+				right: '100%',
+				width: (this.extrasBefore * 100) + '%'
+			};
+		},
+		styleAfter() {
+			return {
+				position: 'absolute',
+				top: 0,
+				height: '100%',
+				display: 'flex',
+				left: '100%',
+				width: (this.extrasAfter * 100) + '%'
+			};
+		}
+	},
+	methods: {
+		prevPage() {
+			return this.slidePages(-1);
+		},
+		nextPage() {
+			return this.slidePages(1);
+		},
+		slidePages(dir) {
+			return new Promise(resolve => {
+				this.promiseResolve = resolve;
+				this.running = true;
+				const newTarget = this.target + dir;
+				if (newTarget > 0) {
+					if (this.extrasAfter < newTarget)
+						this.extrasAfter = newTarget;
+				} else if (newTarget < 0) {
+					if (-this.extrasBefore > newTarget)
+						this.extrasBefore = -newTarget;
+				}
+				this.target = newTarget;
+			});
+		},
+		endSlide() {
+			if (this.promiseResolve) {
+				this.promiseResolve(this.target);
+				this.promiseResolve = null;
+			}
+			this.$emit('slid', this.target);
+			this.running = false;
+			this.target = 0;
+			this.extrasAfter = this.extrasBefore = 0;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-slider h-100"
+		style="position:relative;overflow:hidden"
+	>
+		<div
+			:style="styleSlider"
+			@transitionend="endSlide"
+		>
+			<div :style="styleBefore">
+				<div
+					v-for="i in itemsBefore"
+					:key="i"
+					style="height:100%;width:100%"
+				>
+					<slot :offset="i" />
+				</div>
+			</div>
+			<div :style="styleAfter">
+				<div
+					v-for="i in itemsAfter"
+					:key="i"
+					style="height:100%;width:100%"
+				>
+					<slot :offset="i" />
+				</div>
+			</div>
+			<div style="height:100%;width:100%">
+				<slot :offset="0" />
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
new file mode 100644
index 000000000..dc697cfc0
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -0,0 +1,89 @@
+import BaseSlider from '../Base/Slider.js';
+import DayView from './Day/View.js';
+
+export default {
+	name: "ModeDay",
+	components: {
+		BaseSlider,
+		DayView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('day');
+			let last = this.focusDate.endOf('day');
+			
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ days: this.rangeOffset });
+				} else {
+					last = last.plus({ days: this.rangeOffset });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+			if (this.rangeOffset) {
+				this.$emit('update:range', this.range);
+				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(days) {
+			const newFocusDate = this.focusDate.plus({ days });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(days) {
+			const day = this.focusDate.plus({ days });
+			return { day };
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-day flex-grow-1 position-relative"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<day-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</day-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
new file mode 100644
index 000000000..cdd212b6d
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -0,0 +1,103 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelTime from '../../Base/Label/Time.js';
+
+export default {
+	name: "DayView",
+	components: {
+		CalendarGrid,
+		LabelDay,
+		LabelDow,
+		LabelTime
+	},
+	inject: {
+		timeGrid: "timeGrid",
+		originalEvents: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	data() {
+		return {
+			chosenEvent: null
+		};
+	},
+	computed: {
+		axisMain() {
+			return [this.day.startOf('day')];
+		},
+		axisParts() {
+			if (this.timeGrid) {
+				// create {start, end} array
+				return this.timeGrid.map(tu => {
+					return {
+						start: luxon.Duration.fromISOTime(tu.start),
+						end: luxon.Duration.fromISOTime(tu.end)
+					};
+				});
+			} else {
+				// create 07:00-23:00
+				return Array.from({ length: 17 }, (e, i) => luxon.Duration.fromObject({ hours: i + 7 }));
+			}
+		},
+		events() {
+			return this.originalEvents
+				.filter(event => event.start < this.day.plus({ days: 1 }) && event.end > this.day)
+				.sort((a, b) => a.start.ts - b.start.ts)
+				.map(evt => evt.orig);
+		},
+		currentEvent() {
+			if (this.chosenEvent) {
+				if (this.events.find(e => e == this.chosenEvent))
+					return this.chosenEvent;
+			}
+			if (this.events)
+				return this.events.find(Boolean); // undefined => none found
+			return null; // null => loading
+		}
+	},
+	methods: {
+		handleClickDefaults(evt) {
+			if (evt.detail.source == 'event') {
+				this.chosenEvent = evt.detail.value;
+			}
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-mode-day-view d-flex h-100"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<calendar-grid
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+			:snap-to-grid="!!timeGrid"
+			all-day-events
+		>
+			<template #main-header="{ date }">
+				<label-dow
+					@cal-click="evt => evt.detail.source = 'day'"
+					v-bind="{ date }"
+				/>
+				<label-day
+					v-bind="{ date }"
+				/>
+			</template>
+			<template #part-header="{ part }">
+				<label-time v-bind="{ part }" />
+			</template>
+			<template #event="slot">
+				<slot v-bind="slot" mode="day" />
+			</template>
+		</calendar-grid>
+		<div class="w-100">
+			<div v-if="currentEvent === null">loading...</div>
+			<slot v-else :event="currentEvent" mode="event" />
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
new file mode 100644
index 000000000..56ba7b1f9
--- /dev/null
+++ b/public/js/components/Calendar/Mode/List.js
@@ -0,0 +1,93 @@
+import BaseSlider from '../Base/Slider.js';
+import ListView from './List/View.js';
+
+export default {
+	name: "ModeList",
+	components: {
+		BaseSlider,
+		ListView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		},
+		length: {
+			type: Number,
+			default: 7
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate;
+			let last = first.plus({ days: this.length });
+
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ days: this.rangeOffset * this.length });
+				} else {
+					last = last.plus({ days: this.rangeOffset * this.length });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			this.rangeOffset = Math.floor(this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days / this.length);
+			if (this.rangeOffset) {
+				this.$emit('update:range', this.range);
+				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(offset) {
+			const newFocusDate = this.focusDate.plus({ days: offset * this.length });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(offset) {
+			const day = this.focusDate.plus({ days: offset * this.length });
+			return { day, length: this.length };
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-list flex-grow-1 position-relative"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<list-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</list-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
new file mode 100644
index 000000000..50560c0e7
--- /dev/null
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -0,0 +1,61 @@
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+
+// TODO(chris): drag and drop
+
+export default {
+	name: "ListView",
+	components: {
+		LabelDay,
+		LabelDow
+	},
+	inject: {
+		events: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		},
+		length: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			chosenEvent: null
+		};
+	},
+	computed: {
+		days() {
+			return Array.from({ length: this.length }, (e, days) => this.day.plus({ days }));
+		},
+		eventsPerDay() {
+			const eventsPerDay = this.days.map(day => {
+				return {
+					day,
+					events: this.events
+						.filter(event => event.start < day.plus({ days: 1 }) && event.end > day)
+						.sort((a, b) => a.start.ts - b.start.ts)
+				};
+			});
+			return eventsPerDay.filter(day => day.events.length);
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-mode-list-view h-100"
+	>
+		<div v-if="!eventsPerDay.length">
+			<slot :event="undefined" mode="list" />
+		</div>
+		<div v-for="{ day, events } in eventsPerDay" class="text-center">
+			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
+			<div v-for="event in events">
+				<slot :event="event.orig" mode="list" />
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Month.js b/public/js/components/Calendar/Mode/Month.js
new file mode 100644
index 000000000..038c39123
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Month.js
@@ -0,0 +1,125 @@
+import BaseSlider from '../Base/Slider.js';
+import MonthView from './Month/View.js';
+
+export default {
+	name: "ModeMonth",
+	components: {
+		BaseSlider,
+		MonthView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('month').startOf('week', { useLocaleWeeks: true });
+			let last = first.plus({ days: 41 }).endOf('day'); // NOTE(chris): 6 weeks minus 1 day
+
+			if (this.rangeOffset != 0) {
+				const nextFocusDate = this.focusDate.plus({ months: this.rangeOffset});
+				const nextRangeStart = nextFocusDate.startOf('month').startOf('week', { useLocaleWeeks: true });
+				if (this.rangeOffset < 0) {
+					first = nextRangeStart;
+				} else {
+					last = nextRangeStart.plus({ days: 41 }).endOf('day');
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
+				this.$emit('update:range', this.range);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('month').diff(this.focusDate.startOf('month'), 'months').months;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(months) {
+			const newFocusDate = this.focusDate.plus({ months });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(months) {
+			const day = this.focusDate.plus({ months });
+			return { day };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'week':
+				// default: Move to week if not in month
+				let dayInWeek = luxon.DateTime.fromObject({
+					localWeekNumber: evt.detail.value.number,
+					localWeekYear: evt.detail.value.year
+				}, {
+					zone: this.currentDate.zoneName,
+					locale: this.currentDate.locale
+				});
+
+				if (!this.focusDate.hasSame(dayInWeek.startOf('week', { useLocaleWeeks: true }), 'month')) {
+					this.$emit('update:currentDate', dayInWeek.startOf('week', { useLocaleWeeks: true }));
+				} else if (!this.focusDate.hasSame(dayInWeek.endOf('week', { useLocaleWeeks: true }), 'month')) {
+					this.$emit('update:currentDate', dayInWeek.endOf('week', { useLocaleWeeks: true }));
+				}
+				break;
+			case 'day':
+				// default: Set current-date
+				this.$emit('update:currentDate', evt.detail.value);
+				break;
+			case 'event':
+				// TODO(chris): IMPLEMENT!
+				// default: ???
+				break;
+			}
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-month flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<month-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" mode="month" /></template>
+			</month-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
new file mode 100644
index 000000000..a9f5a5008
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -0,0 +1,87 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelWeek from '../../Base/Label/Week.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelDay from '../../Base/Label/Day.js';
+
+export default {
+	name: "MonthView",
+	components: {
+		CalendarGrid,
+		LabelWeek,
+		LabelDow,
+		LabelDay
+	},
+	provide() {
+		return {
+			// NOTE(chris): snap events to day
+			events: Vue.computed(() => {
+				//const events = [];
+				const events = this.events.map(event => {
+					const start = event.start.startOf('day');
+					const end = event.end.plus({ days: 1 }).startOf('day');
+					return {
+						...event,
+						start,
+						end
+					};
+				});
+				for (var w = 5; w > -1; w--) {
+					for (var d = 6; d > -1; d--) {
+						const startdate = this.axisMain[w].plus(this.axisParts[d]);
+						events.unshift({
+							start: startdate,
+							end: startdate.plus({ days: 1 }),
+							orig: 'header'
+						});
+					}
+				}
+				return events;
+			})
+		};
+	},
+	inject: {
+		events: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		axisMain() {
+			const start = this.day.startOf('month').startOf('week', { useLocaleWeeks: true });
+			return Array.from({ length: 6 }, (e, i) => start.plus({ weeks: i }));
+		},
+		axisParts() {
+			return Array.from({ length: 8 }, (e, i) => luxon.Duration.fromObject({ days: i }));
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-mode-month-view h-100">
+		<calendar-grid
+			flip-axis
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+
+			snap-to-grid
+		>
+			<template #main-header="{ date }">
+				<label-week v-bind="{ date }" />
+			</template>
+			<template #part-header="{ part }">
+				<label-dow :date="axisMain[0].plus(part)" class="text-center" />
+			</template>
+			<template #event="slot">
+				<label-day
+					v-if="slot.event.orig == 'header'"
+					:date="slot.event.start"
+					class="text-center"
+					:class="{ disabled: day.month != slot.event.start.month }"
+				/>
+				<slot v-else v-bind="slot" />
+			</template>
+		</calendar-grid>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
new file mode 100644
index 000000000..a49f91194
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -0,0 +1,108 @@
+import BaseSlider from '../Base/Slider.js';
+import WeekView from './Week/View.js';
+
+export default {
+	name: "ModeWeek",
+	components: {
+		BaseSlider,
+		WeekView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('week', { useLocaleWeeks: true });
+			let last = this.focusDate.endOf('week', { useLocaleWeeks: true });
+
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ weeks: this.rangeOffset });
+				} else {
+					last = last.plus({ weeks: this.rangeOffset });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				console.log(this.focusDate.toISODate(), this.currentDate.toISODate());
+				this.focusDate = this.currentDate;
+				this.$emit('update:range', this.range);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('week', { useLocaleWeeks: true }).diff(this.focusDate.startOf('week', { useLocaleWeeks: true }), 'weeks').weeks;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(weeks) {
+			const newFocusDate = this.focusDate.plus({ weeks });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(weeks) {
+			const day = this.focusDate.plus({ weeks });
+			return { ...this.$attrs, day };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'day':
+				// default: Set current-date
+				this.$emit('update:currentDate', evt.detail.value);
+				break;
+			case 'event':
+				// TODO(chris): IMPLEMENT!
+				// default: ???
+				break;
+			}
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-week flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<week-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" mode="week" /></template>
+			</week-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
new file mode 100644
index 000000000..4cc2a3ae3
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -0,0 +1,75 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelTime from '../../Base/Label/Time.js';
+
+export default {
+	name: "WeekView",
+	components: {
+		CalendarGrid,
+		LabelDay,
+		LabelDow,
+		LabelTime
+	},
+	inject: {
+		timeGrid: "timeGrid"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		},
+		collapseEmptyDays: Boolean
+	},
+	computed: {
+		start() {
+			return this.day.startOf('week', { useLocaleWeeks: true });
+		},
+		axisMain() {
+			return Array.from({ length: 7 }, (e, i) => this.start.plus({ days: i }));
+		},
+		axisParts() {
+			if (this.timeGrid) {
+				// create {start, end} array
+				return this.timeGrid.map(tu => {
+					return {
+						start: luxon.Duration.fromISOTime(tu.start),
+						end: luxon.Duration.fromISOTime(tu.end)
+					};
+				});
+			} else {
+				// create 07:00-23:00
+				return Array.from({ length: 17 }, (e, i) => luxon.Duration.fromObject({ hours: i + 7 }));
+			}
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-mode-week-view h-100">
+		<calendar-grid
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+			:axis-main-collapsible="collapseEmptyDays"
+			:snap-to-grid="!!timeGrid"
+			all-day-events
+		>
+			<template #main-header="{ date }">
+				<label-dow
+					v-bind="{ date }"
+					@cal-click="evt => evt.detail.source = 'day'"
+					class="text-center"
+				/>
+				<label-day
+					v-bind="{ date }"
+					class="text-center"
+				/>
+			</template>
+			<template #part-header="{ part }">
+				<label-time v-bind="{ part }" />
+			</template>
+			<template #event="slot">
+				<slot v-bind="slot" />
+			</template>
+		</calendar-grid>
+	</div>
+	`
+}
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
new file mode 100644
index 000000000..541903012
--- /dev/null
+++ b/public/js/composables/EventLoader.js
@@ -0,0 +1,125 @@
+export function useEventLoader(rangeInterval, getPromiseFunc) {
+	const events = Vue.ref([]);
+	const lv = Vue.ref(null);
+	const eventsLoaded = [];
+
+	const mergePromiseArr = (n, o) => {
+		if (Array.isArray(n))
+			return o.concat(n);
+		return o.push(n), o;
+	};
+
+	const markEventsLoaded = (start, end) => {
+		let result = [];
+		if (!eventsLoaded.length) {
+			// empty: add new chunk
+			eventsLoaded.push(start.ts, end.ts);
+		} else {
+			if (eventsLoaded[eventsLoaded.length-1] + 1 == start.ts) {
+				// add to the end of last chunk
+				eventsLoaded[eventsLoaded.length-1] = end.ts;
+			} else if (eventsLoaded[eventsLoaded.length-1] < start.ts) {
+				// add new chunk after the last chunk
+				eventsLoaded.push(start.ts, end.ts);
+			} else if (eventsLoaded[0] == end.ts + 1) {
+				// add to the start of first chunk
+				eventsLoaded[0] = start.ts;
+			} else if (eventsLoaded[0] > end.ts) {
+				eventsLoaded.unshift(start.ts, end.ts);
+			} else {
+				let index = eventsLoaded.findIndex(e => e >= start.ts);
+
+				if (index % 2) {
+					// starts inside an existing chunk
+					if (eventsLoaded[index] >= end.ts)
+						return []; // Already loaded
+
+					let indexIsLast = (index == eventsLoaded.length - 1);
+
+					if (indexIsLast || eventsLoaded[index + 1] > end.ts) {
+						// extend an existing chunk
+						// and merge with the next if necessary
+						let nStart = eventsLoaded[index] + 1;
+						start = start.plus(nStart - start.ts);
+						if (!indexIsLast && eventsLoaded[index + 1] == end.ts + 1)
+							eventsLoaded.splice(index, 2);
+						else
+							eventsLoaded[index] = end.ts;
+					} else {
+						// merge exising chunks
+						// and load the rest if necessary
+						if (eventsLoaded[index + 2] < end.ts) {
+							let rStart = eventsLoaded[index + 2] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+
+						let nStart = eventsLoaded[index] + 1;
+						start = start.plus(nStart - start.ts);
+						let nEnd = eventsLoaded[index + 1] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded.splice(index, 2);
+					}
+				} else {
+					// starts between two chunks or before the first
+					if (!index) {
+						// extend the first chunk
+						// and load the rest if necessary
+						if (eventsLoaded[1] < end.ts) {
+							let rStart = eventsLoaded[1] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+						let nEnd = eventsLoaded[0] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded[0] = start.ts;
+					} else if (eventsLoaded[index] == start.ts) {
+						// starts at the same position as an existing chunk
+						if (eventsLoaded[index + 1] >= end.ts)
+							return []; // Already loaded
+						// load this rest
+						let rStart = eventsLoaded[index + 1] + 1;
+						result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+					} else {
+						// extend an existing chunk
+						// and load the rest if necessary
+						if (eventsLoaded[index + 1] < end.ts) {
+							let rStart = eventsLoaded[index + 1] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+						let nEnd = eventsLoaded[index] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded[index] = start.ts;
+					}
+				}
+			}
+		}
+
+		if (start.ts > end.ts)
+			return [];
+
+		return mergePromiseArr(getPromiseFunc(start, end), result);
+	};
+
+	Vue.watchEffect(() => {
+		const range = Vue.toValue(rangeInterval);
+		if (!(range instanceof luxon.Interval))
+			return;
+		const promises = markEventsLoaded(range.start, range.end);
+		Promise
+			.allSettled(promises)
+			.then(results => {
+				results.forEach(res => {
+					if (
+						res.status === 'fulfilled'
+						&& res.value.meta.status === "success"
+					) {
+						if (res.value.meta.lv)
+							lv.value = res.value.meta.lv;
+
+						events.value = events.value.concat(res.value.data);
+					}
+				})
+			});
+	})
+
+	return { events, lv }
+}
\ No newline at end of file
diff --git a/public/js/directives/Calendar/Click.js b/public/js/directives/Calendar/Click.js
new file mode 100644
index 000000000..e5de31f1a
--- /dev/null
+++ b/public/js/directives/Calendar/Click.js
@@ -0,0 +1,49 @@
+const clickListeners = [];
+
+function saveAddClickListener(el, source, value) {
+	const index = clickListeners.findIndex(data => data.el == el);
+	if (index >= 0) {
+		el.removeEventListener('click', clickListeners[index].listener);
+		clickListeners.splice(index, 1);
+	}
+	const listener = evt => {
+		evt.preventDefault();
+		evt.stopPropagation();
+		const customEvent = new CustomEvent('cal-click', {
+			cancelable: true,
+			bubbles: true,
+			detail: { source, value }
+		});
+		evt.target.dispatchEvent(customEvent);
+	}
+	clickListeners.push({el, listener});
+	el.addEventListener('click', listener);
+}
+
+export default {
+	mounted(el, binding, vnode) {
+		if (binding.arg == 'container') {
+			el.addEventListener('cal-click', evt => {
+				const customEvent = new Event('click:' + evt.detail.source, {
+					cancelable: true
+				});
+				binding.instance.$emit('click:' + evt.detail.source, customEvent, evt.detail.value);
+				if (!customEvent.defaultPrevented) {
+					const finalEvent = new CustomEvent('cal-click-default', {
+						cancelable: true,
+						bubbles: true,
+						detail: evt.detail
+					});
+					evt.target.dispatchEvent(finalEvent);
+				}
+			});
+		} else {
+			saveAddClickListener(el, binding.arg, binding.value);
+		}
+	},
+	updated(el, binding, vnode, prevVnode) {
+		if (binding.arg != 'container') {
+			saveAddClickListener(el, binding.arg, binding.value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/js/directives/Calendar/DragAndDrop.js b/public/js/directives/Calendar/DragAndDrop.js
new file mode 100644
index 000000000..b1cd015ec
--- /dev/null
+++ b/public/js/directives/Calendar/DragAndDrop.js
@@ -0,0 +1,100 @@
+/**
+ * TODO(chris): This needs serious rework!!!
+ */
+export default {
+	mounted(el, binding, vnode) {
+		if (binding.arg == 'draggable') {
+			el.addEventListener('update-my-value', evt => {
+				evt.preventDefault();
+				binding.value = evt.detail.item;
+			});
+			el.addEventListener('dragstart', evt => {
+				el.dispatchEvent(new CustomEvent('calendar-dragstart', {
+					cancelable: true,
+					bubbles: true,
+					detail: {
+						item: binding.value,
+						x: evt.offsetX / el.offsetWidth,
+						y: evt.offsetY / el.offsetHeight,
+						originalEvent: evt
+					}
+				}));
+			});
+			el.addEventListener('dragend', evt => {
+				el.dispatchEvent(new CustomEvent('calendar-dragend', {
+					cancelable: true,
+					bubbles: true,
+					detail: {
+						item: binding.value,
+						originalEvent: evt
+					}
+				}));
+			});
+		} else if (binding.arg == 'dropcage') {
+			let hitbox = null;
+			el.addEventListener('dragover', evt => {
+				if (hitbox)
+					return;
+				hitbox = el.getBoundingClientRect();
+				return el.dispatchEvent(new CustomEvent('calendar-dragenter', {
+					detail: { originalEvent: evt }
+				}));
+			});
+			window.addEventListener('dragleave', evt => {
+				if (!hitbox)
+					return;
+				let pos;
+				if (typeof evt.clientX === 'undefined')
+					pos = {
+						x: evt.pageX + document.documentElement.scrollLeft,
+						y: evt.pageY + document.documentElement.scrollTop
+					};
+				else
+					pos = {
+						x: evt.clientX + document.body.scrollLeft + document.documentElement.scrollLeft,
+						y: evt.clientY + document.body.scrollTop + document.documentElement.scrollTop
+					};
+				if (pos.x > hitbox.left + hitbox.width - 1 || pos.x < hitbox.left || pos.y > hitbox.top + hitbox.height - 1 || pos.y < hitbox.top) {
+					hitbox = null;
+					return el.dispatchEvent(new CustomEvent('calendar-dragleave', {
+						detail: { originalEvent: evt }
+					}));
+				}
+			});
+			window.addEventListener('drop', evt => {
+				if (!hitbox)
+					return;
+				
+				hitbox = null;
+				return el.dispatchEvent(new CustomEvent('calendar-dragleave', {
+					detail: { originalEvent: evt }
+				}));
+			});
+		} else if (binding.arg == 'dropzone') {
+			el.addEventListener(
+				binding.modifiers.once ? 'dragenter' : 'dragover',
+				evt => {
+					const timestamp = binding.value instanceof Function
+						? binding.value(evt)
+						: binding.value;
+					const detail = timestamp.timestamp ? timestamp : { timestamp };
+					el.dispatchEvent(new CustomEvent('calendar-dragchange', {
+						cancelable: true,
+						bubbles: true,
+						detail
+					}));
+				}
+			);
+		}
+	},
+	updated(el, binding, vnode, prevVnode) {
+		if (binding.arg == 'draggable') {
+			el.dispatchEvent(new CustomEvent('update-my-value', {
+				cancelable: true,
+				detail: {
+					item: binding.value
+				}
+			}));
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/js/helpers/DragAndDrop.js b/public/js/helpers/DragAndDrop.js
new file mode 100644
index 000000000..1160400f7
--- /dev/null
+++ b/public/js/helpers/DragAndDrop.js
@@ -0,0 +1,67 @@
+/**
+ * TODO(chris): This is only a prototype!!!
+ */
+const DragAndDrop = {
+	TYPE_LE: "lehreinheit",
+	TYPE_VEVENT: "vevent",
+
+	getValidTransferData(event, allowedTypes) {
+		const json = event.dataTransfer.getData('text');
+		let obj;
+		try {
+			obj = JSON.parse(json);
+			if (!obj.type)
+				return null;
+			if (allowedTypes && !allowedTypes.includes(obj.type))
+				return null;
+		} catch (error) {
+			return null;
+		}
+		return obj;
+	},
+	isValidTransferData(event, allowedTypes) {
+		return this.getValidTransferData(event, allowedTypes) ? true : false;
+	},
+	getTransferData(event) {
+		const json = event.dataTransfer.getData('text');
+		return JSON.parse(json);
+	},
+	setTransferData(event, data) {
+		switch (data.type) {
+			case DragAndDrop.TYPE_LE:
+				data = DragAndDrop.fromLe(data);
+				break;
+			default:
+				if (data.dtstart && data.dtend && data.uid && data.summary) {
+					data = DragAndDrop.fromVEvent(data);
+					break;
+				}
+				return false; // No type found => abort
+		}
+		
+		event.dataTransfer.setData('text', JSON.stringify(data));
+		return true;
+	},
+	fromLe(data) {
+		const {
+			type = DragAndDrop.TYPE_LE,
+			lehreinheit_id: id,
+			stundenblockung
+		} = data;
+		
+		return { type, id, stundenblockung };
+	},
+	fromVEvent(data) {
+		const {
+			type = DragAndDrop.TYPE_VEVENT,
+			uid: id,
+			dtstart,
+			dtend,
+			summary
+		} = data;
+		
+		return { type, id, dtstart, dtend, summary };
+	}
+};
+
+export default DragAndDrop;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0e9f8888..979323ab5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38499,6 +38499,68 @@ array(
 		)
 	),
 
+	//****************************	 CORE/calendar
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'kw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'W',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'W',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'year_kw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{year} KW {week}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{year} W {week}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'today',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Heute',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'today',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 	//****************************	 FHC-Core-SAP
 	array(
 		'app' => 'core',

From 77e5dfeb9aa7c9c9f067dd45e28527691103d641 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 11:18:01 +0200
Subject: [PATCH 0441/1357] add Luxon

---
 application/views/CisRouterView/CisRouterView.php |  3 ++-
 composer.json                                     | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index f70274f6e..2b2b44ee3 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -29,7 +29,8 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
-		'vendor/npm-asset/primevue/checkbox/checkbox.min.js'
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/composer.json b/composer.json
index c0dd03abf..370c2eda1 100644
--- a/composer.json
+++ b/composer.json
@@ -414,6 +414,17 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "moment/luxonjs",
+				"version": "3.6.1",
+				"dist": {
+					"url": "https://unpkg.com/luxon@3.6.1/build/global/luxon.min.js",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -462,6 +473,7 @@
 
 		"michelf/php-markdown": "1.5.0",
 		"ml/json-ld": "1.*",
+		"moment/luxonjs": "3.6.1",
 		"moment/momentjs": "2.24.0",
 		"mottie/tablesorter": "2.*",
 

From 9e06f1468ad871868b0189057bcba2791ec49040 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 12:01:46 +0200
Subject: [PATCH 0442/1357] refactor(Location change FHC Core Event): changes
 the location of the Events for the FHCore App to the original folder

---
 application/config/Events.php   | 41 +++++++++++++++++++++++++--------
 application/core/CI3_Events.php |  3 ---
 application/core/Events.php     | 36 -----------------------------
 3 files changed, 32 insertions(+), 48 deletions(-)
 delete mode 100644 application/core/Events.php

diff --git a/application/config/Events.php b/application/config/Events.php
index 191a1eb98..3e0a5248f 100644
--- a/application/config/Events.php
+++ b/application/config/Events.php
@@ -3,12 +3,35 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-/**
- * NOTE(chris): example:
-	Events::on('stv_conf_student', function (&$res) {
-		$res['test'] = [
-			'title' => 'TEST',
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
-		];
-	});
- */
+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'
+	);
+});
+
+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'
+	);
+});
+
+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'
+	);
+});
+
+
+
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index e283230c9..37f6c3f21 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -49,9 +49,6 @@ require_once(APPPATH.'config/Events.php');
 
 $active_addons_array = explode(";", ACTIVE_ADDONS);
 
-// Load Events from FHC core
-require_once APPPATH.'core/Events.php';
-
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
diff --git a/application/core/Events.php b/application/core/Events.php
deleted file mode 100644
index b689a99d3..000000000
--- a/application/core/Events.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-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'
-	);
-});
-
-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'
-	);
-});
-
-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'
-	);
-});
-
-

From c3d0f0370484520aceba7890a29751968e34db45 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 15 Jul 2025 13:06:08 +0200
Subject: [PATCH 0443/1357] remove unnecessary addMetas, add table alias to fix
 Prestudent Filters in StvTree

---
 .../controllers/api/frontend/v1/stv/Student.php      |  2 --
 .../controllers/api/frontend/v1/stv/Students.php     | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d56736541..6287ecbda 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -243,11 +243,9 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
-		$this->addMeta('bhtest1', $this->isLaufendesSemester($studiensemester_kurzbz));
 		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
 		{
 			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
-			$this->addMeta('bhtest2', $array_allowed_props_student);
 		}
 		$update_student = array();
 		foreach ($array_allowed_props_student as $prop) {
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 41c5fc613..f9ceabc3d 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -223,25 +223,25 @@ class Students extends FHCAPI_Controller
 				break;
 			case "bewerbungnichtabgeschickt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum'] = null;
+				$where['ps.bewerbung_abgeschicktamum'] = null;
 				break;
 			case "bewerbungabgeschickt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
-				$where['bestaetigtam'] = null;
+				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['ps.bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":

From c91b2481eb860fc30562ac255f649b05130ede56 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:16:39 +0200
Subject: [PATCH 0444/1357] refactor(Modal component): don't pass the properies
 to the v-bind of the bootstrap modal (title prop was added as an attribute to
 modal div, creating a tooltip)

---
 public/js/components/Cis/Mylv/LvModal.js                  | 2 +-
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 7725fa93f..3f52cec8f 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -75,7 +75,7 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
 			<slot name="modalTitle"></slot>
 		</template>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 26ab7ff1d..b490b56a5 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -189,7 +189,7 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+<bs-modal v-show="!loading" ref="modalContainer" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 	<template v-if="title" v-slot:title>{{title}}</template>
 	<template v-slot:default>
 		<div>

From c69be4762ecb8b6ce3b2ca0f6b9cf8cdd34a950e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:19:47 +0200
Subject: [PATCH 0445/1357] refactor(renderer components accessibility) adds
 the aria accessibility attributes and tooltips to the renderer components of
 the LvPlan

---
 public/js/components/Cis/Renderer/Lehreinheit/modalContent.js | 4 ++--
 .../js/components/Cis/Renderer/Reservierungen/modalContent.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 0be28962a..523a67049 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -97,7 +97,7 @@ export default {
 						<td>
 							<div id="lektorenContainer">
 								<div v-for="lektor in event.lektor" class="d-block">
-									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :title="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
 									{{lektor.kurzbz}}
 								</div>
 							</div>
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 6dcef418c..571bbde29 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -88,7 +88,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :tooltip="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>

From 08404a9440cdeb16a401c4d95790f9dc31b98ba6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 13:35:13 +0200
Subject: [PATCH 0446/1357] all-day-events not in scrollable part

---
 public/js/components/Calendar/Base/Grid.js    | 49 ++++++++++++++++---
 .../js/components/Calendar/Base/Grid/Line.js  | 30 +-----------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 56465c0f3..572068f8e 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -1,11 +1,13 @@
 import GridLine from './Grid/Line.js';
+import GridLineEvent from './Grid/Line/Event.js';
 
 import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
 
 export default {
 	name: "CalendarGrid",
 	components: {
-		GridLine
+		GridLine,
+		GridLineEvent
 	},
 	directives: {
 		CalDnd
@@ -128,6 +130,16 @@ export default {
 
 			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
 		},
+		eventsAllDay() {
+			if (!this.allDayEvents)
+				return [];
+			return this.mapIntoMainAxis(this.originalEvents.filter(event => event.orig.allDayEvent));
+		},
+		eventsNormal() {
+			if (!this.allDayEvents)
+				return this.events;
+			return this.mapIntoMainAxis(this.originalEvents.filter(event => !event.orig.allDayEvent));
+		},
 		events() {
 			return this.mapIntoMainAxis(this.originalEvents);
 		},
@@ -165,13 +177,12 @@ export default {
 					gridlines[ts].push('pe_' + part.index);
 			});
 
-			this.events.forEach((events, mainIndex) => {
+			this.eventsNormal.forEach((events, mainIndex) => {
 				let day = this.axisMain[mainIndex];
 				events.forEach(event => {
 					if (!event.startsHere && !event.endsHere)
 						return;
-					if (this.allDayEvents && event.orig.allDayEvent)
-						return;
+
 					if (event.startsHere) {
 						let ts = event.start.diff(day).toMillis();
 						if (!gridlines[ts])
@@ -185,7 +196,7 @@ export default {
 				});
 			});
 
-			return '[allday] auto ' + Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
+			return Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
 				let end = keys[i + 1];
 				if (!end) {
 					gridlines[start].push('end');
@@ -250,7 +261,7 @@ export default {
 	<div
 		class="fhc-calendar-base-grid"
 		style="display:grid;width:100%;height:100%"
-		:style="'grid-template-' + axisRow + 's:auto 1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
+		:style="'grid-template-' + axisRow + 's:auto' + (allDayEvents ? ' auto ' : ' ') + '1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
 	>
 		<div
 			class="grid-header"
@@ -267,6 +278,29 @@ export default {
 				<slot name="main-header" v-bind="{ index, date }" />
 			</div>
 		</div>
+		<div
+			v-if="allDayEvents"
+			class="grid-allday"
+			style="display:grid"
+			:style="'grid-template-' + axisCol + 's:subgrid;grid-' + axisCol + ':1/-1'"
+		>
+			<div
+				v-for="(events, index) in eventsAllDay"
+				:key="index"
+				class="all-day-events"
+				:style="'grid-' + axisCol + ':' + (2+index)"
+			>
+				<grid-line-event
+					v-for="(event, i) in events"
+					:key="i"
+					:event="event"
+				>
+					<template v-slot="slot">
+						<slot name="event" v-bind="slot" />
+					</template>
+				</grid-line-event>
+			</div>
+		</div>
 		<div
 			style="display:grid;overflow:auto"
 			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
@@ -318,11 +352,10 @@ export default {
 							:start="date.plus(start)"
 							:end="date.plus(end)"
 							:date="date"
-							:events="events[index]"
+							:events="eventsNormal[index]"
 							:backgrounds="backgrounds[index]"
 							style="position:relative"
 							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
-							:all-day-events="allDayEvents"
 						>
 							<template #event="slot">
 								<slot name="event" v-bind="slot" />
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index 41f9bd58d..cd71dcc02 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -35,23 +35,12 @@ export default {
 		backgrounds: {
 			type: Array,
 			default: []
-		},
-		allDayEvents: Boolean
+		}
 	},
 	computed: {
-		eventsAllDay() {
-			if (!this.allDayEvents)
-				return [];
-			return this.events.filter(event => event.orig.allDayEvent);
-		},
-		eventsNormal() {
-			if (!this.allDayEvents)
-				return this.events;
-			return this.events.filter(event => !event.orig.allDayEvent);
-		},
 		eventsWithRowInfo() {
 			const events = [];
-			this.eventsNormal.forEach(event => {
+			this.events.forEach(event => {
 				const rows = [2, -1];
 				if (event.startsHere) {
 					rows[0] = 't_' + event.start.diff(this.date).toMillis();
@@ -80,21 +69,6 @@ export default {
 			:end="end"
 			:background="bg"
 		></line-background>
-		<div
-			v-if="eventsAllDay.length"
-			:style="'grid-' + axisRow + ': allday'"
-			class="all-day-events"
-		>
-			<line-event
-				v-for="(event, i) in eventsAllDay"
-				:key="i"
-				:event="event"
-			>
-				<template v-slot="slot">
-					<slot name="event" v-bind="slot" />
-				</template>
-			</line-event>
-		</div>
 		<line-event
 			v-for="(event, i) in eventsWithRowInfo"
 			:key="i"

From 133a611d0e0242aba0d141e939ecd29f9accc769 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:35:38 +0200
Subject: [PATCH 0447/1357] update(Profil Modal attribute rename): refactor of
 attributes and styles

---
 public/css/components/calendar.css                          | 2 +-
 public/js/components/Cis/Profil/MitarbeiterProfil.js        | 2 +-
 .../Cis/Profil/ProfilComponents/FetchProfilUpdates.js       | 2 +-
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js   | 6 +++---
 public/js/components/Cis/Profil/StudentProfil.js            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 85962d4e0..cb570cc46 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -287,7 +287,7 @@
 .fhc-calendar-past {
 	background-color: var(--fhc-calendar-past);
 	border-color: var(--fhc-calendar-border);
-	opacity: 0.5;
+	opacity: 0.75;
 }
 
 .fhc-calendar-month-page-day-focusday {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 8eaae6dd9..78fbdb04b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -309,7 +309,7 @@ export default {
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
         <div  class="d-md-none col-12 ">
             <!--TODO: uncomment when implemented
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index d7109579e..40627d98b 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -155,7 +155,7 @@ export default {
 
 	template: /*html*/ `
 <div class="card">
-    <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
+    <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :titel="editProfilTitle"></edit-profil>
     <div class="card-header">{{$p.t('profilUpdate','profilUpdates')}}</div>
     <div class="card-body">
         <div class="table-responsive text-nowrap">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index b490b56a5..39b18c83b 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -15,7 +15,7 @@ export default {
 	mixins: [BsModal],
 	props: {
 		value: Object,
-		title: String,
+		titel: String,
 		zustelladressenCount: Function,
 		zustellkontakteCount: Function,
 		/*
@@ -189,8 +189,8 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
-	<template v-if="title" v-slot:title>{{title}}</template>
+<bs-modal v-show="!loading" ref="modalContainer" body-class="" v-bind="$props" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+	<template v-if="titel" v-slot:title>{{titel}}</template>
 	<template v-slot:default>
 		<div>
 			<nav aria-label="breadcrumb" class="ps-2">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index cc0068411..88437a0f1 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -249,7 +249,7 @@ export default {
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form">
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal"
-    :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
+    :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <!-- ROW -->
     <div class="row">
         <!-- HIDDEN QUICK LINKS -->

From 2222199b95cbc958b280a0c82b794abb728224d8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:17:44 +0200
Subject: [PATCH 0448/1357] refactor(ProfilUpdate components accessability):
 adds accessability attribute to profil update components

---
 .../EditProfilComponents/EditAdresse.js       | 12 +--
 .../EditProfilComponents/EditKontakt.js       | 28 +++----
 .../EditProfilComponents/TextInputDokument.js | 10 +--
 .../Profil/ProfilModal/EditProfilSelect.js    |  4 +-
 public/js/components/Form/Upload/Dms.js       |  2 +-
 system/phrasesupdate.php                      | 80 +++++++++++++++++++
 6 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 8f174dabc..1dcde49c9 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -152,7 +152,7 @@ export default {
       <label class="form-check-label" for="flexCheckDefault">
       {{$p.t('person','zustelladresse')}}
       </label>
-    </div>  
+    </div>
   </div>
 
   <!-- NATION -->
@@ -162,7 +162,7 @@ export default {
       <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
         <option selected></option>
         <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
-      </select> 
+      </select>
     </div>
   </div>
 
@@ -170,7 +170,7 @@ export default {
   <div class=" col-4">
     <div class="form-underline">
       <div class="form-underline-titel">{{$p.t('person','plz')}}*</div>
-      <input class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
+      <input class="form-control" :value="data.plz" :aria-label="$p.t('person','plz')" :title="$p.t('person','plz')" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
     </div>
   </div>
 
@@ -178,7 +178,7 @@ export default {
   <div class="col-lg-6">
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','gemeinde')}}*</div>
-      <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearchGemeinden" ></auto-complete>
+      <auto-complete :aria-label="$p.t('person','gemeinde')" class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearchGemeinden" ></auto-complete>
     </div>
   </div>
 
@@ -186,7 +186,7 @@ export default {
   <div  class="col-lg-6" >
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','ort')}}*</div>
-      <auto-complete class="w-100" v-model="data.ort" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="ortschaftnamen" @complete="autocompleteSearchOrtschaftsnamen" ></auto-complete>
+      <auto-complete :aria-label="$p.t('person','ort')" class="w-100" v-model="data.ort" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="ortschaftnamen" @complete="autocompleteSearchOrtschaftsnamen" ></auto-complete>
     </div>
   </div>
 
@@ -194,7 +194,7 @@ export default {
   <div  class="col-lg-8">
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','strasse')}}*</div>
-      <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
+      <input :aria-label="$p.t('person','strasse')" class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
     </div>
   </div>
   
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index ee1cc938c..4f978f636 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -68,11 +68,11 @@ export default {
     <!-- End of warning -->
 
     <div v-if="!data.kontakt_id" class="col-12">
-        
-    
+
+
         <div  class="form-underline">
             <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}</div>
-    
+
             <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
                 <option value="email">{{$p.t('person','email')}}</option>
@@ -81,37 +81,37 @@ export default {
                 <option value="mobil">{{$p.t('profilUpdate','mobiltelefonnummer')}}</option>
                 <option value="homepage">{{$p.t('profilUpdate','homepage')}}</option>
                 <option value="fax">{{$p.t('profilUpdate','faxnummer')}}</option>
-                
-            </select>    
+
+            </select>
         </div>
-        
+
     </div>
     <div class="col-12">
-        
+
         <!-- rendering KONTAKT emails -->
-   
+
 
         <div class="form-underline">
         <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:$p.t('global','kontakt')}}</div>
-    
-        <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
+
+        <input :aria-label="data.kontakttyp" :title="data.kontakttyp" :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
         </div>
 
     </div>
     <div class="col-12">
-        
+
     <div  class="form-underline">
     <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
 
-    <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
+    <input :aria-label="$p.t('global','anmerkung')" :title="$p.t('global','anmerkung')" class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
     </div>
 
     </div>
-  
+
     <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
         <span style="opacity: 0.65; font-size: .85rem; " class="px-2">{{$p.t('profilUpdate','zustellungsKontakt')}}</span>
 
-        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">   
+        <input :aria-label="$p.t('profilUpdate','zustellungsKontakt')" :title="$p.t('profilUpdate','zustellungsKontakt')" class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
     </div>
   </div>
     `,
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
index f00e9634e..c73fee86a 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
@@ -93,20 +93,20 @@ export default {
     }
   },
   template: /*html*/`
-  
+
     <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[data.titel])}}</p>
 
     <div class="form-underline">
     <div class="form-underline-titel">{{data.titel?data.titel:$p.t('global','titel')}}</div>
-    
-    <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
-  
+
+    <input  class="mb-2 form-control" @input="emitChanges" :aria-label="data.titel" :tooltip="data.titel"  v-model="data.value" :placeholder="data.value">
+
     <div class="row gx-2">
     <div class="col">
     <dms ref="update" v-if="withFiles" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
     </div>
     <div class="col-auto">
-    <button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
+    <button @click="dmsData=[]" class="btn btn-danger" :aria-label="$p.t('profilUpdate','deleteAttachment')" :title="$p.t('profilUpdate','deleteAttachment')" ><i style="color:white" class="fa fa-trash" aria-hidden="true"></i></button>
     </div>
     </div>
     </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 53a7b2a4d..53c5baf8d 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -156,12 +156,12 @@ export default {
                             <component :is="item.listview" v-bind="item"></component>
                         </div>
                     </button>
-                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i></button>
+                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
                 </div>
             </template>
         </div>
         <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
-          <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i></button>
+          <button @click="addItem" type="button" class="btn btn-primary btn-circle" :aria-label="$p.t('profilUpdate','addItem')" :title="$p.t('profilUpdate','addItem')"><i class="fa fa-plus" aria-hide="true"></i></button>
         </div>
     </template>
     <template v-else>
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 4c7a8eb3f..82333dc7f 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -92,7 +92,7 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :aria-label="$p.t('profilUpdate','documentUpload')" :title="$p.t('profilUpdate','documentUpload')" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
 			<dms-item
 				v-for="(file, index) in modelValue"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7e58d0e98..b7f6c8661 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28620,6 +28620,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteAttachment',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Anhang löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete attachment',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'documentUpload',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Dokument hochladen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Upload document',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -29261,6 +29301,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteItem',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Item löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete item',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'addItem',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Item hinzufügen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Add item',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',

From 81280a5e913b99d00e2d907e680f6f70ac81b1f2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:29:26 +0200
Subject: [PATCH 0449/1357] refactor(Studium accessibility): adds accessability
 attributes to the studium component

---
 public/js/components/Cis/Studium/Studium.js | 16 ++++----
 system/phrasesupdate.php                    | 41 +++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 246bbb296..1b7aff81b 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -281,13 +281,13 @@ export default {
 		<div>
 		<h6>Studiensemester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -296,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -311,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -326,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b7f6c8661..f4ed08415 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30161,6 +30161,7 @@ array(
 				)
 			)
 		),
+		
 
 		//ProfilUpdate Phrasen ende
 	array(
@@ -30183,6 +30184,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'previous',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'vorherige',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'previous',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'next',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nächste',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'next',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From a737dc20dc3cc1eb39d2ab872ece701e174c7a94 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:59:45 +0200
Subject: [PATCH 0450/1357] refactor(Layout Lvplan widget): margin adjustment

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

diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 1e2588161..f93b57881 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -251,7 +251,7 @@ export default {
 						<div class=" card-header d-grid p-0">
 							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
-						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
+						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="mx-1 list-group-item small" :style="getEventStyle(evt)">
 							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">

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

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

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

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

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

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

From 0aef00bd9efc81f97b75b355f03d1791633dde67 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 08:58:02 +0200
Subject: [PATCH 0453/1357] use Timezone

---
 application/controllers/Cis/LvPlan.php   |  4 ++
 application/libraries/StundenplanLib.php | 52 +++++++++++++++++++-----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/application/controllers/Cis/LvPlan.php b/application/controllers/Cis/LvPlan.php
index ea48f09f0..884c8a9a0 100644
--- a/application/controllers/Cis/LvPlan.php
+++ b/application/controllers/Cis/LvPlan.php
@@ -15,6 +15,9 @@ class LvPlan extends Auth_Controller
 		parent::__construct([
 			'index' => ['basis/cis:r']
 		]);
+
+		// Load Config
+		$this->load->config('calendar');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -28,6 +31,7 @@ class LvPlan extends Auth_Controller
 		
 		$viewData = array(
 			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
 		);
 		
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 8bc5a7c70..868d73a24 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -3,6 +3,11 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+use \DateTimeZone as DateTimeZone;
+use \DateInterval as DateInterval;
+use \DatePeriod as DatePeriod;
+
 class StundenplanLib{
 
 	private $_ci; // Code igniter instance
@@ -14,9 +19,11 @@ class StundenplanLib{
 	 *
 	 */
 	public function getStundenplan($start_date, $end_date, $lv_id = null){
-		
 		$this->_ci =& get_instance();
 
+		// Load Config
+		$this->_ci->load->config('calendar');
+
 		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -125,6 +132,10 @@ class StundenplanLib{
 
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
 		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 		if($is_mitarbeiter)
 		{
@@ -181,8 +192,15 @@ class StundenplanLib{
 
 	public function expand_object_information($data){
 		$this->_ci =& get_instance();
+		
 		foreach ($data as $item)
 		{
+			$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+			$isostart = new DateTime($item->datum . ' ' . $item->beginn, $tz);
+			$item->isostart = $isostart->format(DateTime::ATOM);
+
+			$isoend = new DateTime($item->datum . ' ' . $item->ende, $tz);
+			$item->isoend = $isoend->format(DateTime::ATOM);
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
@@ -254,9 +272,17 @@ class StundenplanLib{
 		}
 	}
 
-	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz){
+	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz)
+	{
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('organisation/Ferien_model','FerienModel');
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+
+		$this->_ci->load->model('organisation/Ferien_model', 'FerienModel');
+
+		$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
@@ -277,35 +303,41 @@ class StundenplanLib{
 	
 				$interval = new DateInterval('P1D');
 				$period = new DatePeriod($event_start, $interval, $event_end);
-				$event->dates = array_map(function($date){
-					return $date->format('Y-m-d');
-				}, iterator_to_array($period));
+				$event->dates = iterator_to_array($period);
 				return $event;
 			}, $ferienEvents);
 	
+			$start_date = new DateTime($start_date);
+			$start_date->setTime(0, 0, 0);
+			$end_date = new DateTime($end_date);
+			$end_date->setTime(23, 59, 59);
+
 			$ferienEventsFlattened=[];
 			foreach($ferienEvents as $ferien_event){
 				foreach($ferien_event->dates as $date){
+					if ($date < $start_date || $date > $end_date)
+						continue;
 					$event = new stdClass();
 					$event->bezeichnung = $ferien_event->bezeichnung;
-					$event->datum = $date;
+					$event->datum = $date->format('Y-m-d');
 					$event->type = 'ferien';
 					$ferienEventsFlattened[] = $event;
 				}
 			};
 	
 			$today=new DateTime();
-			$ferienEventsFlattened = array_map(function($event) use($today){
+			$ferienEventsFlattened = array_map(function($event) use($today, $tz){
 				$ferien_event = (object) array(
 					'type' => 'ferien',
 					'beginn' => $today->format('H:i:s'),
 					'ende' => $today->format('H:i:s'),
+					'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
+					'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
 					'allDayEvent' => true,
 					'datum' => $event->datum,
 					'topic' => $event->bezeichnung,
 					'titel' => $event->bezeichnung,
 					'farbe' => '00689E'
-					
 				);
 				return $ferien_event;
 			}, $ferienEventsFlattened);
@@ -635,7 +667,7 @@ class StundenplanLib{
 			{
 				return $sem->studiensemester_kurzbz;
 			},
-			getData($semester_range)
+			getData($semester_range) ?: []
 		);
 
 		// if no studiensemester is found for the given timespan, get the nearest studiensemester

From 90b944a047896a3abafaad200f59d42df891e9e9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 09:57:03 +0200
Subject: [PATCH 0454/1357] configureable "no-events" message

---
 public/js/components/Calendar/Base/Grid.js    |  2 +-
 public/js/components/Calendar/Mode/Day.js     |  2 +-
 .../js/components/Calendar/Mode/Day/View.js   | 30 ++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 572068f8e..c6b7dd2a3 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -308,7 +308,7 @@ export default {
 			<div
 				ref="main"
 				class="grid-main"
-				style="grid-column:1/-1;grid-row:1/-1;display:grid"
+				style="position:relative;grid-column:1/-1;grid-row:1/-1;display:grid"
 				:style="'grid-template-' + axisCol + 's:subgrid;grid-template-' + axisRow + 's:' + styleGridRows"
 			>
 				<div
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index dc697cfc0..d954f7b51 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -69,7 +69,7 @@ export default {
 		},
 		viewAttrs(days) {
 			const day = this.focusDate.plus({ days });
-			return { day };
+			return { ...this.$attrs, day };
 		}
 	},
 	mounted() {
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index cdd212b6d..72b0baa99 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -19,11 +19,14 @@ export default {
 		day: {
 			type: luxon.DateTime,
 			required: true
-		}
+		},
+		emptyMessage: String,
+		emptyMessageDetails: String
 	},
 	data() {
 		return {
-			chosenEvent: null
+			chosenEvent: null,
+			gridMainRef: null
 		};
 	},
 	computed: {
@@ -67,12 +70,16 @@ export default {
 			}
 		}
 	},
+	mounted() {
+		this.gridMainRef = this.$refs.grid.$refs.main;
+	},
 	template: /* html */`
 	<div
 		class="fhc-calendar-mode-day-view d-flex h-100"
 		@cal-click-default.capture="handleClickDefaults"
 	>
 		<calendar-grid
+			ref="grid"
 			:axis-main="axisMain"
 			:axis-parts="axisParts"
 			:snap-to-grid="!!timeGrid"
@@ -94,8 +101,23 @@ export default {
 				<slot v-bind="slot" mode="day" />
 			</template>
 		</calendar-grid>
-		<div class="w-100">
-			<div v-if="currentEvent === null">loading...</div>
+		<Teleport :disabled="!gridMainRef" :to="gridMainRef">
+			<div
+				v-if="emptyMessage && currentEvent !== null && !currentEvent"
+				class="fhc-calendar-no-events-overlay"
+				style="position:absolute;inset:0"
+			>
+				{{ emptyMessage }}
+			</div>
+		</Teleport>
+		<div class="event-details">
+			<div
+				v-if="currentEvent === null"
+				class="p-4 d-flex w-100 justify-content-center align-items-center"
+			>
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<h3 v-else-if="!currentEvent">{{ emptyMessageDetails }}</h3>
 			<slot v-else :event="currentEvent" mode="event" />
 		</div>
 	</div>

From f210bb8bbd481771ecd82a35bbe9d8194a5e3ceb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 11:06:47 +0200
Subject: [PATCH 0455/1357] refactor(NewsWidget responsive):updates the
 resonsive classes of the newsWidget

---
 public/css/components/dashboard/news.css | 65 ++++++++++++++++++++----
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index ca584c235..c8414521e 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -4,7 +4,7 @@
 	--fhc-news-widget-highlight-color: var(--fhc-primary-highlight);
 	--fhc-news-widget-border: var(--fhc-border);
 	--fhc-news-widget-border-highlight: var(--fhc-border-highlight);
-	--fhc-news-widget-text-light: var(--fhc-text);
+	--fhc-news-widget-text-light: var(--fhc-light);
 }
 
 
@@ -13,28 +13,68 @@
 @media (min-width :576px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding:0em 0em 0em 0em !important;
+		padding:0.125em 0.125em 0.125em 0.125em !important;
+		max-height:30px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		line-clamp: 1;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for md sizes */
 @media (min-width :768px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 0.3em 0.3em 0.3em 0.3em !important;
+		padding: 0.25em 0.25em 0.25em 0.25em !important;
+		max-height: 50px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		line-clamp: 1;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for lg sizes */
 @media (min-width :992px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 0.3em 0.3em 0.3em 0.3em !important;
+		padding: 0.25em 0.25em 0.25em 0.25em !important;
+		max-height: 75px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for xl sizes */
 @media (min-width :1200px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 1em 1em 0.3em 1em !important;
+		padding: 1em 0.25em 0.25em 0.25em !important;
+		height: 100px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 
@@ -42,7 +82,17 @@
 @media (min-width :1400px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 1.2em 1.2em 0.3em 1.2em !important;
+		padding: 1.2em 0.5em 0.5em 0.5em !important;
+		height: 125px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 
@@ -54,8 +104,6 @@
 .fhc-news-menu-item {
     padding: 0.375rem;
     color: var(--fhc-news-widget-text-light);
-    min-height: 5%;
-    max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
@@ -83,7 +131,6 @@
 .fhc-news-menu-item-betreff
 {
     width: 100%;
-    text-align: center;
     max-height: 100%;
     height: 100%;
 }

From ba3914c1c3b184b6bc0717e643aa7510ce55e6d1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 11:08:00 +0200
Subject: [PATCH 0456/1357] refactor(Cis4 Wave Accessability): adds more
 accessability attributes to the cis4 views

---
 .../StudiengangPerson.js                      |  2 +-
 .../StudiengangVertretung.js                  |  4 ++--
 public/js/components/DashboardWidget/Url.js   | 12 ++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 4e15e0a42..13de1e8a0 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -20,7 +20,7 @@ export default {
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
 		<div class="card-body p-2 flex-grow-0" style="min-height: 50px;">
-			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
+			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink" :aria-label="$p.t('profil','profil')" :title="$p.t('profil','profil')"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" aria-hidden="true"></i></a></h6>
 		</div>
 		<hr class="my-0">
 		<div class="card-body p-2">
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index 5fb86bba7..2914919a1 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -11,8 +11,8 @@ export default {
 		</div>
 		<div class="card-body">
 			<p v-for="vertretung in vertretungsList">
-				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)">
-					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i>
+				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)" :aria-label="$p.t('profil','profil')" :title="$p.t('profil','profil')">
+					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" aria-hidden="true"></i>
 				</a>
 				{{vertretungFormatedName(vertretung,false)}}
 			</p>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 93718a10c..2763862a9 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -204,10 +204,8 @@ export default {
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
 			</template>
 			<template #default>
-				<label class="form-label" for="editTitle">Title</label>
-				<form-input id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<label class="form-label" for="editUrl">Url</label>
-				<form-input id="editUrl" v-model="url_input" name="url"></form-input>
+				<form-input  :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
+				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
 			</template>
 			<template #footer>
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
@@ -221,10 +219,8 @@ export default {
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
 			</template>
 			<template #default>
-				<label class="form-label" for="insertTitle">Title</label>
-				<form-input id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<label class="form-label" for="insertUrl">Url</label>
-				<form-input id="insertUrl" v-model="url_input" name="url"></form-input>
+				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
+				<form-input label="Url" title="Url" id="insertUrl" v-model="url_input" name="url"></form-input>
 			</template>
 			<template #footer>
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f4ed08415..72013baac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27416,6 +27416,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'profil',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profile',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

From 1ff3f7b66dc3832b18b8e168748fa1955aada225 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 16 Jul 2025 11:41:23 +0200
Subject: [PATCH 0457/1357] Display current semester status in Detail Header -
 adapt function get - adapt functions getPrestudents, get Students, get
 Prestudent, getStudent, get Person - add Phrase Student auswaehlen

---
 .../api/frontend/v1/stv/Student.php           | 17 ++++-
 .../api/frontend/v1/stv/Students.php          | 68 ++++++++++++++++++-
 .../components/DetailHeader/DetailHeader.js   |  4 +-
 .../Stv/Studentenverwaltung/Details.js        |  2 +-
 system/phrasesupdate.php                      | 20 ++++++
 5 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d56736541..cb7dd9446 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -72,6 +72,7 @@ class Student extends FHCAPI_Controller
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
+
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 		$this->PrestudentModel->addSelect('p.person_id');
@@ -109,6 +110,16 @@ class Student extends FHCAPI_Controller
 				false
 			);
 		}
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
@@ -118,14 +129,18 @@ class Student extends FHCAPI_Controller
 			'LEFT'
 		);
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
+/*		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id = tbl_prestudent.prestudent_id
+										AND pss.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+										'LEFT');*/
 
-		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->PrestudentModel->loadWhere(['tbl_prestudent.prestudent_id' => $prestudent_id]);
 		
 		$student = $this->getDataOrTerminateWithError($result);
 		
 		if (!$student)
 			return show_404();
 
+
 		$this->terminateWithSuccess(current($student));
 	}
 
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 41c5fc613..13f69647e 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -70,7 +70,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
 	 * 														=> getStudents
-	 * /uid/(student_uid)									=> getStudent
+	 * /student/(student_uid)								=> getStudent
 	 * /prestudent/(prestudent_id)							=> getPrestudent
 	 * /person/(person_id)									=> getPerson
 	 *
@@ -358,6 +358,18 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
@@ -380,7 +392,6 @@ class Students extends FHCAPI_Controller
 	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-		
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -406,6 +417,18 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 
 		$where = [];
 
@@ -482,6 +505,19 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -527,8 +563,23 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
+
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere([
@@ -565,6 +616,19 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 6014faadd..aa0bb549d 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -155,8 +155,8 @@ export default {
 						<span>
 							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
 						</span>
-						<strong class="text-muted"> | Status </strong>
-						 {{headerData[0].status}}
+						<strong v-if="headerData[0].statusofsemester" class="text-muted"> | Status </strong>
+						 {{headerData[0].statusofsemester}}
 						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
 						  {{headerData[0].matr_nr}}
 					  </h5>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 8d6a9a7a1..8222d637e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -60,7 +60,7 @@ export default {
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
-			Bitte StudentIn auswählen!
+			{{$p.t('ui', 'chooseStudent')}}
 		</div>
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
 			<fhc-header
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 34180326d..491271a00 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44475,6 +44475,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'chooseStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte StudentIn auswählen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select a student!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
 );
 

From 99f950913448d238d8702b73e1c47ee0fd0f73e6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 12:56:49 +0200
Subject: [PATCH 0458/1357] refactor(Cis4 Wave Accessability): adds
 accessability attributes to the searchbar components

---
 public/js/components/searchbar/action.js           | 1 +
 public/js/components/searchbar/employee.js         | 2 +-
 public/js/components/searchbar/organisationunit.js | 2 +-
 public/js/components/searchbar/person.js           | 3 ++-
 public/js/components/searchbar/prestudent.js       | 1 +
 public/js/components/searchbar/raum.js             | 2 +-
 public/js/components/searchbar/student.js          | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
index e8db391c9..a19ecfa97 100644
--- a/public/js/components/searchbar/action.js
+++ b/public/js/components/searchbar/action.js
@@ -15,6 +15,7 @@ export default {
     template: `
 		<template v-if="this.renderif()">
 			<a :class="this.cssclass" :href="this.getactionhref()"
+				:alt="$p.t('ui','aktion')"
 				@click="this.execaction()">
 				<slot>Action</slot>
 			</a>
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
index f1e6a67f6..65eb93d1f 100644
--- a/public/js/components/searchbar/employee.js
+++ b/public/js/components/searchbar/employee.js
@@ -14,7 +14,7 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
+                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :alt="$p.t('profilUpdate','profilBild')" :src="res.photo_url" 
                     class="rounded" style="max-height: 120px; max-width: 90px;" />
                   <i v-else class="fas fa-user-circle fa-5x"></i>
                 </action>
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
index 09e2822a3..18e11c861 100644
--- a/public/js/components/searchbar/organisationunit.js
+++ b/public/js/components/searchbar/organisationunit.js
@@ -14,7 +14,7 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
+                  <i class="fas fa-sitemap fa-4x" aria-hidden="true"></i>
                 </action>
               </div>
               
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
index eeb476149..8e74a714f 100644
--- a/public/js/components/searchbar/person.js
+++ b/public/js/components/searchbar/person.js
@@ -14,7 +14,8 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
+                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+				    :alt="$p.t('profilUpdate','profilBild')" :src="res.foto" 
                     class="rounded" style="max-height: 120px; max-width: 90px;" />
                   <i v-else class="fas fa-user-circle fa-5x"></i>
                 </action>
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
index 99837fe4b..2887924e5 100644
--- a/public/js/components/searchbar/prestudent.js
+++ b/public/js/components/searchbar/prestudent.js
@@ -15,6 +15,7 @@ export default {
 				<div class="searchbar_icon">
 					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
 						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+							 :alt="$p.t('profilUpdate','profilBild')"
 							 :src="'data:image/jpeg;base64,' + res.foto"
 							 class="rounded-circle" height="100"/>
 						<i v-else class="fas fa-user-circle fa-5x"></i>
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 4a55b417a..a64251356 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -13,7 +13,7 @@ export default {
           <div class="searchbar_grid">
             <div class="searchbar_icon">
               <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
+                <i class="fas fa-door-open fa-4x" aria-hidden="true"></i>
               </action>
             </div>
             <div class="searchbar_data">
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
index ac7362d23..66f105c1b 100644
--- a/public/js/components/searchbar/student.js
+++ b/public/js/components/searchbar/student.js
@@ -16,6 +16,7 @@ export default {
                     <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
                         <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
                              :src="studentImage"
+							 :alt="$p.t('personUpdate','profilBild')"
                              class="rounded" style="max-height: 120px; max-width: 90px;" />
                         <i v-else class="fas fa-user-circle fa-5x"></i>
                     </action>

From 26b40866fc7364316f936393647b277f9c20024a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 13:51:37 +0200
Subject: [PATCH 0459/1357] CSS updates

---
 .../views/CisRouterView/CisRouterView.php     |   4 +-
 public/css/components/calendar.css            | 174 +++++-------------
 .../css/components/calendar/backgrounds.css   |  18 ++
 public/css/components/calendar/events.css     |  67 +++++++
 public/css/components/calendar/frame.css      | 149 +++++++++++++++
 .../js/components/Calendar/Mode/Month/View.js |   1 -
 .../js/components/Calendar/Mode/Week/View.js  |   2 -
 7 files changed, 281 insertions(+), 134 deletions(-)
 create mode 100644 public/css/components/calendar/backgrounds.css
 create mode 100644 public/css/components/calendar/events.css
 create mode 100644 public/css/components/calendar/frame.css

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 2b2b44ee3..ab22fbb81 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -15,7 +15,7 @@ $includesArray = array(
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
 		'public/css/components/dashboard.css',
-		'public/css/components/calendar.css',
+		//'public/css/components/calendar.css', <= imported in dashboard.css
 		'public/css/components/Sprachen.css',
 		'public/css/components/MyLv.css',
 		'public/css/components/FilterComponent.css',
@@ -40,7 +40,7 @@ $includesArray = array(
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
-<div id="fhccontent" route=<?php echo $route ?>>
+<div id="fhccontent" class="h-100" route=<?php echo $route ?>>
 	<router-view 
 			:view-data='<?php echo json_encode($viewData) ?>'
 	></router-view>
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 68181166b..8d349e8c2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,136 +1,52 @@
+@import './calendar/frame.css';
+@import './calendar/events.css';
+@import './calendar/backgrounds.css';
+
 /* Themable Variables */
 :root {
-  --fhc-calendar-pane-height: calc(100vh - 220px);
-  
-  --fhc-calendar-primary: var(--fhc-primary, #006095);
-  --fhc-calendar-border: var(--fhc-border, #dee2e6);
-  --fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-  --fhc-calendar-text: var(--fhc-text, #212529);
-  --fhc-calendar-text-light: var(--fhc-text, #212529);
-  --fhc-calendar-background: var(--fhc-background, #fff);
-  --fhc-calendar-dark: var(--fhc-dark, #212529);
-  --fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-  --fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-  --fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-  --fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-  --fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-  --fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-  --fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-  --fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
-}
+/*	--fhc-calendar-pane-height: calc(100vh - 220px);
+	
+	--fhc-calendar-primary: var(--fhc-primary, #006095);
+	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+	--fhc-calendar-text: var(--fhc-text, #212529);
+	--fhc-calendar-text-light: var(--fhc-text, #212529);
+	--fhc-calendar-background: var(--fhc-background, #fff);
+	--fhc-calendar-dark: var(--fhc-dark, #212529);
+	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);*/
+	
+	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
+	--fhc-calendar-bg: var(--fhc-background, #fff);
+	--fhc-calendar-border: var(--fhc-border, #dee2e6);
 
+	--fhc-calendar-bg-event: var(--fhc-white-80, #ccc);
+	--fhc-calendar-border-event: var(--bs-secondary, #6c757d);
+	--fhc-calendar-radius-event: var(--bs-border-radius, .375rem);
+	--fhc-calendar-fontsize-event: .875em;
 
-/* Labels */
-/* ====== */
-.fhc-calendar-base-label-dow .short,
-.fhc-calendar-base-label-dow .narrow,
-.fhc-calendar-base-label-day .full,
-.fhc-calendar-base-label-day .short,
-.fhc-calendar-base-label-day .narrow,
-.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
-.collapsed-header .fhc-calendar-base-label-day .long,
-.collapsed-header .fhc-calendar-base-label-dow .long {
-  display: none;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
-.collapsed-header .fhc-calendar-base-label-day .short,
-.collapsed-header .fhc-calendar-base-label-dow .short {
-  display: block;
-}
-.fhc-calendar-mode-day .fhc-calendar-base-label-day,
-.fhc-calendar-mode-week .fhc-calendar-base-label-day {
-  font-size: .875em;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week {
-  text-align: right;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week span {
-  color: var(--bs-secondary-color);
-  cursor: pointer;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week span + span:before {
-  content: "/";
-}
+	--fhc-calendar-bg-markings-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-border-markings-past: var(--fhc-calendar-border);
+	--fhc-calendar-bg-markings-past-label: var(--fhc-calendar-bg);
+	--fhc-calendar-border-markings-past-label: var(--fhc-calendar-border);
 
+	--fhc-calendar-gap-header: transparent;
+	--fhc-calendar-gap-allday: transparent;
+	--fhc-calendar-gap-body: transparent;
+	--fhc-calendar-bg-header: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
 
-/* Base Grid */
-/* ========= */
-/* Grid */
-.fhc-calendar-base-grid {
-  --fhc-calendar-axis-collapsible: .2fr;
-  background-color: var(--bs-border-color);
-  grid-gap: 2px;
+	--fhc-calendar-bg-overlay1: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-overlay2: var(--fhc-dark, #212529);
+	
+	--fhc-calendar-radius-day-event: var(--fhc-calendar-radius-event);
+	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
+	--fhc-calendar-radius-month-event: 0;
+	--fhc-calendar-radius-list-event: 0;
 }
-.fhc-calendar-base-grid .grid-header {
-  background-color: var(--bs-gray-200);
-}
-.fhc-calendar-base-grid .grid-main {
-  grid-gap: 1px;
-}
-.fhc-calendar-base-grid-line {
-  grid-gap: 1px;
-}
-.fhc-calendar-mode-month .main-header,
-.fhc-calendar-base-grid .part-header,
-.fhc-calendar-base-grid .part-body {
-  background-color: rgba(255,255,255, 1);
-}
-.fhc-calendar-base-label-time {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: end;
-}
-/* Events */
-.fhc-calendar-base-grid-line-event.event-header {
-  font-weight: bold;
-}
-.fhc-calendar-base-grid-line-event.event-header .disabled {
-  opacity: .3;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
-  overflow: hidden;
-  line-height: 1.5;
-  font-size: .8rem;
-  grid-auto-rows: 1.5em;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
-  text-indent: .5em;
-  height: 1.5em;
-  overflow: hidden;
-}
-
-
-/* Customize */
-/* ========= */
-/* Header */
-.fhc-calendar-base-header > .row {
-  align-items: center;
-}
-/* Events */
-.event-colored {
-  background: rgba(var(--event-color-rgb), .5);
-  min-height: 100%;
-}
-.event-colored:hover {
-  background: rgba(var(--event-color-rgb), .3);
-}
-/* Backgrounds */
-.background-past {
-  background: var(--fhc-calendar-past);
-  border-bottom: solid 1px var(--fhc-calendar-border);
-}
-.background-past > span {
-  display: none;
-}
-.background-past.bg-end > span {
-  display: block;
-  position: absolute;
-  top: 100%;
-  left: 1rem;
-  padding: 0 .5rem;
-  background-color: var(--fhc-background);
-  border: solid 1px var(--fhc-calendar-border);
-  font-size: .875em;
-}
-
diff --git a/public/css/components/calendar/backgrounds.css b/public/css/components/calendar/backgrounds.css
new file mode 100644
index 000000000..2524be91f
--- /dev/null
+++ b/public/css/components/calendar/backgrounds.css
@@ -0,0 +1,18 @@
+.background-past {
+	background-color: var(--fhc-calendar-bg-markings-past);
+	border-bottom: solid 1px var(--fhc-calendar-border-markings-past);
+}
+.background-past > span {
+	display: none;
+}
+.background-past.bg-end > span {
+	display: block;
+	position: absolute;
+	top: 100%;
+	left: 1rem;
+	padding: 0 .5rem;
+	background-color: var(--fhc-calendar-bg-markings-past-label);
+	border: solid 1px var(--fhc-calendar-border-markings-past-label);
+	font-size: .875em;
+}
+
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
new file mode 100644
index 000000000..5feb7b707
--- /dev/null
+++ b/public/css/components/calendar/events.css
@@ -0,0 +1,67 @@
+.fhc-calendar-base-grid-line-event {
+	cursor: pointer;
+}
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
+	padding: .25rem;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+	margin: 0 .5rem;
+	font-size: var(--fhc-calendar-fontsize-event, .875rem);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event {
+	margin: .25rem;
+}
+/* Border */
+.fhc-calendar-mode-day .grid-main .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .grid-main .fhc-calendar-base-grid-line-event > * {
+	border: solid 1px var(--fhc-calendar-border-event);
+}
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-day-event, 0);
+}
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-week-event, 0);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-month-event, 0);
+}
+.fhc-calendar-mode-list .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-list-event, 0);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-begin > *,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-begin > * {
+	border-top-left-radius: var(--event-radius);
+	border-top-right-radius: var(--event-radius);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-end > *,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-end > * {
+	border-bottom-left-radius: var(--event-radius);
+	border-bottom-right-radius: var(--event-radius);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-begin > * {
+	border-top-left-radius: var(--event-radius);
+	border-bottom-left-radius: var(--event-radius);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-end > * {
+	border-top-right-radius: var(--event-radius);
+	border-bottom-right-radius: var(--event-radius);
+}
+/* Colors */
+.fhc-calendar-base-grid-line-event {
+	--event-default-bg: var(--fhc-calendar-bg-event, #ccc);
+}
+.fhc-calendar-base-grid-line-event .event-type-reservierung {
+	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
+}
+.fhc-calendar-base-grid-line-event > * {
+	background-color: var(--event-bg, var(--event-default-bg));
+}
+.fhc-calendar-base-grid-line-event > *:hover {
+	filter: brightness(120%);
+}
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
new file mode 100644
index 000000000..3185fbdd6
--- /dev/null
+++ b/public/css/components/calendar/frame.css
@@ -0,0 +1,149 @@
+/* Labels */
+/* ====== */
+.fhc-calendar-base-label-dow .short,
+.fhc-calendar-base-label-dow .narrow,
+.fhc-calendar-base-label-day .full,
+.fhc-calendar-base-label-day .short,
+.fhc-calendar-base-label-day .narrow,
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-dow .long {
+	display: none;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
+.collapsed-header .fhc-calendar-base-label-day .short,
+.collapsed-header .fhc-calendar-base-label-dow .short {
+	display: block;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-day,
+.fhc-calendar-mode-week .fhc-calendar-base-label-day {
+	font-size: .875em;
+}
+.fhc-calendar-mode-day .main-header,
+.fhc-calendar-mode-week .main-header {
+	text-align: center;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week {
+	text-align: right;
+}
+.fhc-calendar-base-label-week {
+	margin-left: .5rem;
+}
+.fhc-calendar-base-label-time,
+.fhc-calendar-base-label-day,
+.fhc-calendar-base-label-week {
+	color: var(--bs-secondary-color);
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-dow,
+.fhc-calendar-mode-week .fhc-calendar-base-label-dow,
+.fhc-calendar-base-label-day,
+.fhc-calendar-base-label-week {
+	cursor: pointer;
+}
+.fhc-calendar-base-label-week span + span:before {
+	content: "/";
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
+	--event-bg: transparent;
+	font-weight: bold;
+	text-indent: 0;
+	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
+	opacity: .3;
+}
+
+
+/* Base Grid */
+/* ========= */
+/* Grid */
+.fhc-calendar-base-grid {
+	--fhc-calendar-axis-collapsible: .2fr;
+	background-color: var(--fhc-calendar-gap);
+	grid-gap: 2px;
+}
+.fhc-calendar-base-grid .grid-header {
+	background-color: var(--fhc-calendar-gap-header);
+}
+.fhc-calendar-base-grid .grid-header:before,
+.fhc-calendar-base-grid .grid-allday:before {
+	content: "";
+}
+.fhc-calendar-base-grid .grid-header:before,
+.fhc-calendar-base-grid .grid-header .main-header {
+	background-color: var(--fhc-calendar-bg-header);
+}
+.fhc-calendar-base-grid .grid-allday {
+	background-color: var(--fhc-calendar-gap-allday);
+}
+.fhc-calendar-base-grid .grid-allday:before,
+.fhc-calendar-base-grid .grid-allday .all-day-events {
+	background-color: var(--fhc-calendar-bg-allday);
+}
+.fhc-calendar-base-grid .grid-main {
+	grid-gap: 1px;
+	background-color: var(--fhc-calendar-gap-body);
+}
+.fhc-calendar-base-grid .grid-main .part-header,
+.fhc-calendar-base-grid .grid-main .part-body {
+	background-color: var(--fhc-calendar-bg-body);
+}
+.fhc-calendar-base-grid-line {
+	grid-gap: 1px;
+}
+.fhc-calendar-base-label-time {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: end;
+}
+/* Header */
+.fhc-calendar-base-header > .row {
+	align-items: center;
+}
+
+/* Modes */
+/* ===== */
+/* Day */
+.fhc-calendar-mode-day .event-details {
+	padding: 1.5rem;
+	width: 100%;
+	border-left: solid 1px var(--fhc-calendar-gap);
+}
+/* Month */
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
+	overflow: hidden;
+	line-height: 1.5;
+	grid-template-rows: 2em;
+	grid-auto-rows: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	font-size: var(--fhc-calendar-fontsize-event, .875rem);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+	text-indent: .5em;
+	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	overflow: hidden;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event * {
+	max-height: 100%;
+	max-width: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* Overlays */
+/* ======== */
+/* No Events */
+.fhc-calendar-no-events-overlay {
+	background: linear-gradient(120deg, var(--fhc-calendar-bg-overlay1), var(--fhc-calendar-bg-overlay2));
+	opacity: .7;
+	text-align: center;
+	padding-top: 100px;
+	font-size: 2.5rem;
+	font-weight: 500;
+	line-height: 1.2;
+}
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index a9f5a5008..b2268e43d 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -76,7 +76,6 @@ export default {
 				<label-day
 					v-if="slot.event.orig == 'header'"
 					:date="slot.event.start"
-					class="text-center"
 					:class="{ disabled: day.month != slot.event.start.month }"
 				/>
 				<slot v-else v-bind="slot" />
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 4cc2a3ae3..d110c45bc 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -56,11 +56,9 @@ export default {
 				<label-dow
 					v-bind="{ date }"
 					@cal-click="evt => evt.detail.source = 'day'"
-					class="text-center"
 				/>
 				<label-day
 					v-bind="{ date }"
-					class="text-center"
 				/>
 			</template>
 			<template #part-header="{ part }">

From 78a735f27794133be7d30c923b12d55e6c600097 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 13:52:45 +0200
Subject: [PATCH 0460/1357] Event popup inside calendar component

---
 public/js/components/Calendar/Base.js         | 31 +++++++++++++++++--
 public/js/components/Calendar/Mode/Day.js     | 10 ++++--
 .../js/components/Calendar/Mode/Day/View.js   | 29 +++++++++++++++--
 public/js/components/Calendar/Mode/Month.js   |  7 +++--
 public/js/components/Calendar/Mode/Week.js    |  7 +++--
 5 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 816027ade..298b9857e 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -1,6 +1,7 @@
 import BaseDraganddrop from './Base/DragAndDrop.js';
 import BaseHeader from './Base/Header.js';
 import BaseSlider from './Base/Slider.js';
+import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
 
@@ -16,7 +17,8 @@ export default {
 	components: {
 		BaseDraganddrop,
 		BaseHeader,
-		BaseSlider
+		BaseSlider,
+		BsModal
 	},
 	directives: {
 		CalClick
@@ -119,7 +121,8 @@ export default {
 	data() {
 		return {
 			internalView: null,
-			internalDate: null
+			internalDate: null,
+			modalEvent: null
 		};
 	},
 	computed: {
@@ -231,6 +234,20 @@ export default {
 		},
 		onDropItem(evt, start, end) {
 			this.$emit('drop', evt, start, end);
+		},
+		showEventModal(eventObj) {
+			this.modalEvent = eventObj;
+			this.$refs.modal.show();
+		},
+		hideEventModal() {
+			if (this.modalEvent)
+				this.modalEvent.closeFn = undefined;
+			this.$refs.modal.hide();
+			this.modalEvent = null;
+		},
+		onModalHidden() {
+			if (this.modalEvent.closeFn)
+				this.modalEvent.closeFn();
 		}
 	},
 	template: /* html */`
@@ -262,11 +279,21 @@ export default {
 				ref="mode"
 				v-model:current-date="cDate"
 				@update:range="$emit('update:range', $event)"
+				@request-modal-open="showEventModal"
+				@request-modal-close="hideEventModal"
 				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
 			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</component>
 		</base-draganddrop>
+		<bs-modal ref="modal" dialog-class="modal-lg" body-class="" @hidden-bs-modal="onModalHidden">
+			<template #title>
+				<slot v-if="modalEvent" v-bind="{mode: 'eventheader', event: modalEvent.event}" />
+			</template>
+			<template #default>
+				<slot v-if="modalEvent" v-bind="{mode: 'event', event: modalEvent.event}" />
+			</template>
+		</bs-modal>
 	</div>
 	`
 }
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index d954f7b51..bc0896888 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -16,7 +16,9 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen",
+		"requestModalClose"
 	],
 	data() {
 		return {
@@ -80,7 +82,11 @@ export default {
 		class="fhc-calendar-mode-day flex-grow-1 position-relative"
 	>
 		<base-slider ref="slider" v-slot="slot">
-			<day-view v-bind="viewAttrs(slot.offset)">
+			<day-view
+				v-bind="viewAttrs(slot.offset)"
+				@request-modal-open="$emit('requestModalOpen', $event)"
+				@request-modal-close="$emit('requestModalClose', $event)"
+			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</day-view>
 		</base-slider>
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 72b0baa99..8371405d3 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -21,8 +21,13 @@ export default {
 			required: true
 		},
 		emptyMessage: String,
-		emptyMessageDetails: String
+		emptyMessageDetails: String,
+		compact: Boolean
 	},
+	emits: [
+		"requestModalOpen",
+		"requestModalClose"
+	],
 	data() {
 		return {
 			chosenEvent: null,
@@ -63,10 +68,30 @@ export default {
 			return null; // null => loading
 		}
 	},
+	watch: {
+		compact() {
+			if (this.compact) {
+				if (this.chosenEvent) {
+					this.$emit('requestModalOpen', {
+						event: this.chosenEvent,
+						closeFn: () => { this.chosenEvent = null; }
+					});
+				}
+			} else {
+				this.$emit('requestModalClose');
+			}
+		}
+	},
 	methods: {
 		handleClickDefaults(evt) {
 			if (evt.detail.source == 'event') {
 				this.chosenEvent = evt.detail.value;
+				if (this.compact) {
+					this.$emit('requestModalOpen', {
+						event: this.chosenEvent,
+						closeFn: () => { this.chosenEvent = null; }
+					});
+				}
 			}
 		}
 	},
@@ -110,7 +135,7 @@ export default {
 				{{ emptyMessage }}
 			</div>
 		</Teleport>
-		<div class="event-details">
+		<div class="event-details" v-if="!compact">
 			<div
 				v-if="currentEvent === null"
 				class="p-4 d-flex w-100 justify-content-center align-items-center"
diff --git a/public/js/components/Calendar/Mode/Month.js b/public/js/components/Calendar/Mode/Month.js
index 038c39123..a352ccc98 100644
--- a/public/js/components/Calendar/Mode/Month.js
+++ b/public/js/components/Calendar/Mode/Month.js
@@ -16,7 +16,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -101,8 +102,8 @@ export default {
 				this.$emit('update:currentDate', evt.detail.value);
 				break;
 			case 'event':
-				// TODO(chris): IMPLEMENT!
-				// default: ???
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
 				break;
 			}
 		}
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
index a49f91194..8194a22cd 100644
--- a/public/js/components/Calendar/Mode/Week.js
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -16,7 +16,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -84,8 +85,8 @@ export default {
 				this.$emit('update:currentDate', evt.detail.value);
 				break;
 			case 'event':
-				// TODO(chris): IMPLEMENT!
-				// default: ???
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
 				break;
 			}
 		}

From 2f5a7addbd43c9339196357cce78914b075e6b3d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 16 Jul 2025 15:11:20 +0200
Subject: [PATCH 0461/1357] Tab Details: Bugfix use cleanedFeedback to avoid
 empty alerts because of updateam, updatevon in result.data

---
 .../Studentenverwaltung/Details/Details.js    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index a344fc951..18efcc9de 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -116,7 +116,26 @@ export default {
 				.then(result => {
 					this.original = {...this.data};
 					this.changed = {};
-					this.$refs.form.setFeedback(true, result.data);
+
+					const feedback = result.data;
+
+					//to avoid empty alert for updateam, updatevon
+					const cleanedFeedback = {};
+
+					const formElement = this.$refs.form.$el || this.$refs.form;
+					const inputElements = formElement.querySelectorAll('[name]');
+					const validFieldNames = Array.from(inputElements).map(el => el.getAttribute('name'));
+
+					for (const key in feedback) {
+						if (validFieldNames.includes(key)) {
+							cleanedFeedback[key] = feedback[key];
+						}
+					}
+
+					if (Object.keys(cleanedFeedback).length > 0) {
+						this.$refs.form.setFeedback(true, cleanedFeedback);
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From 1883e8a6f1df3acb10681fd4d90a8bba44e35a5c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 16 Jul 2025 15:19:50 +0200
Subject: [PATCH 0462/1357] moved default stunden for projektbetreuer
 (master/bachelor) to config

---
 config/global.config-default.inc.php        | 6 ++++++
 content/student/studentprojektarbeit.js.php | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 8cfc36bfb..f24a302cc 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -162,6 +162,12 @@ define('CIS_LV_LEKTORINNENZUTEILUNG_VERTRAGSPRUEFUNG_VON', '');
 // Legt fest, ob Vertragsdetails zum Projektauftrag im Reiter Projektarbeit angezeigt werden
 define('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN', false);
 
+// Legt default Stunden pro Projektarbeitsbetreuung für Bachelorarbeiten fest
+define('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR', '5.0');
+
+// Legt default Stunden pro Projektarbeitsbetreuung für Masterarbeiten fest
+define('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER', '5.0');
+
 // Anzeigeoptionen für LV-Plan Menü
 define('CIS_LVPLAN_EXPORT_ANZEIGEN',true);
 define('CIS_LVPLAN_PERSONENAUSWAHL_ANZEIGEN',true);
diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php
index 6c3919327..2005d85fc 100644
--- a/content/student/studentprojektarbeit.js.php
+++ b/content/student/studentprojektarbeit.js.php
@@ -1165,12 +1165,14 @@ function StudentProjektbetreuerDetailReset()
 
 	if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Diplom')
 	{
-		document.getElementById('student-projektbetreuer-textbox-stunden').value='5.0';
+		document.getElementById('student-projektbetreuer-textbox-stunden').value=
+			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER; ?>;
 		document.getElementById('student-projektbetreuer-menulist-betreuerart').value='Erstbegutachter';
 	}
 	else if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Bachelor')
 	{
-		document.getElementById('student-projektbetreuer-textbox-stunden').value='4.0';
+		document.getElementById('student-projektbetreuer-textbox-stunden').value=
+			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR; ?>;
 		document.getElementById('student-projektbetreuer-menulist-betreuerart').value='Begutachter';
 	}
 	else if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Praktikum')

From 94e25da6c89afb2a173bde19df662dd96cf6d07e Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 16 Jul 2025 16:13:27 +0200
Subject: [PATCH 0463/1357] Added phrases for lvevaluierung

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8ac45c0fa..417eb9110 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42322,6 +42322,86 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'spracheAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sprache auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select language',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'fhtwLogo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'FH Technikum Wien Logo',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'UAS Technikum Wien Logo',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungscodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierungscode eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter Evaluation code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'fragebogen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fragebogen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Questionnaire',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 8191c5e19f87d2640e46bf350353fb7fa991a479 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 16:47:12 +0200
Subject: [PATCH 0464/1357] CSS update

---
 public/css/components/calendar/frame.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 3185fbdd6..22f8cae37 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -142,8 +142,12 @@
 	background: linear-gradient(120deg, var(--fhc-calendar-bg-overlay1), var(--fhc-calendar-bg-overlay2));
 	opacity: .7;
 	text-align: center;
-	padding-top: 100px;
 	font-size: 2.5rem;
 	font-weight: 500;
 	line-height: 1.2;
 }
+.fhc-calendar-no-events-overlay:before {
+	content: "";
+	display: block;
+	height: 100px;
+}

From 9fa23a1471712f8e3172b196e2b66c0d9ec161e9 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 17 Jul 2025 16:21:23 +0200
Subject: [PATCH 0465/1357] fixed check permission

---
 application/controllers/api/frontend/v1/lv/DirektGruppe.php | 4 +++-
 application/controllers/api/frontend/v1/lv/Gruppe.php       | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/DirektGruppe.php b/application/controllers/api/frontend/v1/lv/DirektGruppe.php
index fe1737f6a..2dcf7d3cb 100644
--- a/application/controllers/api/frontend/v1/lv/DirektGruppe.php
+++ b/application/controllers/api/frontend/v1/lv/DirektGruppe.php
@@ -99,7 +99,9 @@ class DirektGruppe extends FHCAPI_Controller
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		$oe_array = $result;
+		$oe_array = [];
+		if (hasData($result))
+			$oe_array = getData($result);
 
 		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
 			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid'))
diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
index 09f253a59..4a1e68656 100644
--- a/application/controllers/api/frontend/v1/lv/Gruppe.php
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -181,7 +181,10 @@ class Gruppe extends FHCAPI_Controller
 
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$oe_array = $result;
+
+		$oe_array = [];
+		if (hasData($result))
+			$oe_array = getData($result);
 
 		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
 			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&

From d122a5e72dada37f2ce6dcc798842ef66bd2a919 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 07:57:18 +0200
Subject: [PATCH 0466/1357] use correct phrase for column name

---
 .../Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 451e4f5f4..758fcde2b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -172,7 +172,7 @@ export default {
 							title: this.$p.t('mobility', 'kurzbz')
 						});
 						cm.getColumnByField('insertvonma').component.updateDefinition({
-							title: this.$p.t('global', 'uploaddatum')
+							title: this.$p.t('dokumente', 'akzeptiertVon')
 						});
 						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
 							title: this.$p.t('global', 'uploaddatum')

From a22041007cc47c640809032d8635519c7466fafc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 21 Jul 2025 08:14:54 +0200
Subject: [PATCH 0467/1357] update(Cis css): updates utility classes for
 primary colors

---
 public/css/Cis4/Cis.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8311ceadb..64bf769fc 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -19,6 +19,11 @@ html {
 	filter: brightness(120%);
 }
 
+.fhc-primary{
+	background-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
 .fhc-primary-color{
 	color: var(--fhc-primary) !important;
 }
@@ -31,6 +36,10 @@ html {
 	background-color: var(--fhc-primary-highlight) !important;
 }
 
+.fhc-primary-highlight-color {
+	color: var(--fhc-primary-highlight) !important;
+}
+
 .fhc-body-bg{
 	background-color:var(--fhc-background) !important;
 }
@@ -97,6 +106,10 @@ html {
 	color: var(--fhc-text) !important;
 }
 
+.fhc-text-light{
+	color: var(--fhc-light) !important;
+}
+
 :root{	
 	/* sidebar colors */
 	--fhc-cis-sidebar-bg: var(--fhc-secondary);

From 07d610d60f0057b1e5c93558f0583f0f01ac9abb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 21 Jul 2025 08:15:19 +0200
Subject: [PATCH 0468/1357] update(PrimeVue Paginator darkmode): overwrites the
 background of the paginator component in primevue

---
 public/css/theme/default.css         |  4 ++++
 public/js/components/Cis/Cms/News.js | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index fe05d8d8a..35a0c98f9 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -262,4 +262,8 @@ html.dark .tabulator .tabulator-cell {
 
 html.dark .tabulator .tabulator-header .tabulator-col:hover {
 	background-color: var(--fhc-tertiary) !important;
+}
+
+.p-paginator{
+	background-color: var(--fhc-background) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 50310e771..bf17666a2 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -58,6 +58,20 @@ export default {
 							FHC_JS_DATA_STORAGE_OBJECT.app_root
 						);
 					});
+					Vue.nextTick(()=>{
+						document.querySelectorAll(".card-header").forEach((el) => {
+							el.classList.add("fhc-primary");
+						});
+						document.querySelectorAll(".row").forEach((el) => {
+							el.classList.add("w-100");
+							el.classList.add("align-items-center");
+							
+						});
+						document.querySelectorAll(".row h2").forEach((el) => {
+							el.classList.add("mb-0");
+						});
+
+					})
 				});
 		},
 		loadNewPageContent(data) {
@@ -66,6 +80,7 @@ export default {
 				.then(res => res.data)
 				.then(result => {
 					this.content = result;
+					
 				});
 		}
   },
@@ -80,7 +95,7 @@ export default {
 			});
   },
   template: /*html*/ `
-  	<h2 >News</h2>
+  	<h2 class="fhc-primary-color">News</h2>
 	<hr/>
 	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
 	</pagination>

From 4ae1ab88dcdd6180b22a7d594c9de20f485cf76f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 08:51:16 +0200
Subject: [PATCH 0469/1357] documents accepted tabulator bump persitence_id

---
 .../Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 758fcde2b..673c41210 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -151,7 +151,7 @@ export default {
 				height: 300,
 				selectable: true,
 				selectableRangeMode: 'click',
-				persistenceID: 'core-details-documents-accepted',
+				persistenceID: 'core-details-documents-accepted-2025072101',
 				listDocuments: [],
 			},
 			tabulatorEvents: [

From 90c30f21c1eb50a610eae9ea2ed2731969660237 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 11:34:58 +0200
Subject: [PATCH 0470/1357] Autoscroll

---
 public/js/components/Calendar/Base/Grid.js | 55 +++++++++++++++++++++-
 public/js/components/Calendar/Mode/Day.js  |  6 +++
 public/js/components/Calendar/Mode/Week.js |  8 +++-
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index c6b7dd2a3..f9f55bd63 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -57,7 +57,10 @@ export default {
 	},
 	data() {
 		return {
-			dragging: false
+			dragging: false,
+			resizeObserver: null,
+			mutationObserver: null,
+			userScroll: true
 		};
 	},
 	computed: {
@@ -255,8 +258,56 @@ export default {
 			}
 
 			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+		},
+		
+		/* SCROLLING */
+		enableAutoScroll() {
+			if (!this.resizeObserver)
+				this.resizeObserver = new ResizeObserver(this.scrollToEarliestEvent);
+			this.resizeObserver.observe(this.$refs.body);
+			
+			if (!this.mutationObserver)
+				this.mutationObserver = new MutationObserver(mutations => {
+					if (mutations.some(m => [].some.call(m.addedNodes, el => el.matches('.fhc-calendar-base-grid-line-event'))))
+						this.scrollToEarliestEvent();
+				});
+			this.mutationObserver.observe(this.$refs.body, {
+				subtree: true,
+				childList: true
+			});
+
+			this.scrollToEarliestEvent();
+		},
+		disableAutoScroll() {
+			if (this.resizeObserver)
+				this.resizeObserver.disconnect();
+			this.resizeObserver = null;
+
+			if (this.mutationObserver)
+				this.mutationObserver.disconnect();
+			this.mutationObserver = null;
+		},
+		scrollToEarliestEvent() {
+			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
+			const earliestEventOffset = eventElements.values()
+				.reduce((res, el) => {
+					const top = el.offsetTop;
+					if (!res[1] || top < res[0])
+						return [top, el];
+					return res;
+				}, [0, null]);
+			
+			this.userScroll = false;
+			if (earliestEventOffset[1]) {
+				earliestEventOffset[1].scrollIntoView({ behavior: "smooth" });
+			} else {
+				this.$refs.scroller.scrollTo(0, 0);
+			}
 		}
 	},
+	beforeUnmount() {
+		this.disableAutoScroll();
+	},
 	template: /* html */`
 	<div
 		class="fhc-calendar-base-grid"
@@ -302,6 +353,8 @@ export default {
 			</div>
 		</div>
 		<div
+			ref="scroller"
+			@scrollend="userScroll ? disableAutoScroll() : userScroll = true"
 			style="display:grid;overflow:auto"
 			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
 		>
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index bc0896888..68ca1fa89 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -46,6 +46,7 @@ export default {
 		currentDate() {
 			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
 			if (this.rangeOffset) {
+				this.$refs.view.$refs.grid.disableAutoScroll();
 				this.$emit('update:range', this.range);
 				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
 			}
@@ -54,11 +55,13 @@ export default {
 	methods: {
 		prevPage() {
 			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.prevPage().then(this.updatePage);
 		},
 		nextPage() {
 			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
@@ -68,6 +71,7 @@ export default {
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
+			this.$refs.view.$refs.grid.enableAutoScroll();
 		},
 		viewAttrs(days) {
 			const day = this.focusDate.plus({ days });
@@ -76,6 +80,7 @@ export default {
 	},
 	mounted() {
 		this.$emit('update:range', this.range);
+		this.$refs.view.$refs.grid.enableAutoScroll();
 	},
 	template: `
 	<div
@@ -83,6 +88,7 @@ export default {
 	>
 		<base-slider ref="slider" v-slot="slot">
 			<day-view
+				ref="view"
 				v-bind="viewAttrs(slot.offset)"
 				@request-modal-open="$emit('requestModalOpen', $event)"
 				@request-modal-close="$emit('requestModalClose', $event)"
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
index 8194a22cd..f8653b9e9 100644
--- a/public/js/components/Calendar/Mode/Week.js
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -44,12 +44,12 @@ export default {
 	watch: {
 		currentDate() {
 			if (this.currentDate.locale != this.focusDate.locale) {
-				console.log(this.focusDate.toISODate(), this.currentDate.toISODate());
 				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
 			} else {
 				this.rangeOffset = this.currentDate.startOf('week', { useLocaleWeeks: true }).diff(this.focusDate.startOf('week', { useLocaleWeeks: true }), 'weeks').weeks;
 				if (this.rangeOffset) {
+					this.$refs.view.$refs.grid.disableAutoScroll();
 					this.$emit('update:range', this.range);
 					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
 				}
@@ -59,11 +59,13 @@ export default {
 	methods: {
 		prevPage() {
 			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.prevPage().then(this.updatePage);
 		},
 		nextPage() {
 			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
@@ -73,6 +75,7 @@ export default {
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
+			this.$refs.view.$refs.grid.enableAutoScroll();
 		},
 		viewAttrs(weeks) {
 			const day = this.focusDate.plus({ weeks });
@@ -93,6 +96,7 @@ export default {
 	},
 	mounted() {
 		this.$emit('update:range', this.range);
+		this.$refs.view.$refs.grid.enableAutoScroll();
 	},
 	template: `
 	<div
@@ -100,7 +104,7 @@ export default {
 		@cal-click-default.capture="handleClickDefaults"
 	>
 		<base-slider ref="slider" v-slot="slot">
-			<week-view v-bind="viewAttrs(slot.offset)">
+			<week-view ref="view" v-bind="viewAttrs(slot.offset)">
 				<template v-slot="slot"><slot v-bind="slot" mode="week" /></template>
 			</week-view>
 		</base-slider>

From 5ed259522259a4928d850a72681e5a5fa2c85dd5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 21 Jul 2025 13:10:43 +0200
Subject: [PATCH 0471/1357] Tab Konto: change Dateformat to localeString

- Tabulator: column Buchungsdatum
- Modal: newCounter
- Modal: editCounter
- Tabulator: actionSlot: selected
---
 .../Stv/Studentenverwaltung/Details/Konto.js  | 23 ++++++++++++++++++-
 .../Studentenverwaltung/Details/Konto/Edit.js |  1 +
 .../Studentenverwaltung/Details/Konto/New.js  |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index afb668e4b..eb32e7102 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -62,6 +62,25 @@ export default {
 					title: '',
 					frozen: true
 				};
+
+			columns.buchungsdatum = {
+				title: 'buchungsdatum',
+				field: 'buchungsdatum',
+				hozAlign: 'center',
+				width: 180,
+				formatter: (cell) => {
+					const value = cell.getValue();
+					if (!value) return '';
+					const date = new Date(value);
+					return date.toLocaleString("de-DE", {
+						day: "2-digit",
+						month: "2-digit",
+						year: "numeric",
+						hour12: false
+					});
+				},
+			};
+
 			columns.actions.formatter = cell => {
 				let container = document.createElement('div');
 				container.className = "d-flex gap-2";
@@ -113,7 +132,7 @@ export default {
 				index: 'buchungsnr',
 				persistenceID: 'stv-details-konto'
 			};
-		}
+		},
 	},
 	watch: {
 		modelValue() {
@@ -222,6 +241,7 @@ export default {
 				</form-input>
 			</div>
 		</div>
+
 		<core-filter-cmpt
 			ref="table"
 			table-only
@@ -240,6 +260,7 @@ export default {
 						v-model="counterdate"
 						input-group
 						:enable-time-picker="false"
+						format="dd.MM.yyyy"
 						auto-apply
 						@cleared="counterdate = new Date()"
 						>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index fb02e30a2..ce926c007 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -82,6 +82,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index dc6dbb253..2afb8158d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -144,6 +144,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>

From f4f59b2fffb885f79c6001c60e062163309ca7b1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 13:49:52 +0200
Subject: [PATCH 0472/1357] Bugfix check textnodes

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

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index f9f55bd63..7800955d8 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -268,7 +268,7 @@ export default {
 			
 			if (!this.mutationObserver)
 				this.mutationObserver = new MutationObserver(mutations => {
-					if (mutations.some(m => [].some.call(m.addedNodes, el => el.matches('.fhc-calendar-base-grid-line-event'))))
+					if (mutations.some(m => m.addedNodes.length && [].some.call(m.addedNodes, el => el.matches && el.matches('.fhc-calendar-base-grid-line-event'))))
 						this.scrollToEarliestEvent();
 				});
 			this.mutationObserver.observe(this.$refs.body, {

From f1e28cec4e0be7638db018cc63aec11c4e3f46fe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 14:10:23 +0200
Subject: [PATCH 0473/1357] Bugfix eventloader

---
 public/js/composables/EventLoader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 541903012..7fc1c5abc 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -75,7 +75,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 						// starts at the same position as an existing chunk
 						if (eventsLoaded[index + 1] >= end.ts)
 							return []; // Already loaded
-						// load this rest
+						// load the rest
 						let rStart = eventsLoaded[index + 1] + 1;
 						result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
 					} else {
@@ -94,7 +94,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 		}
 
 		if (start.ts > end.ts)
-			return [];
+			return result;
 
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};

From e25687be5259db316925f6df787b81f80c111138 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:08:25 +0200
Subject: [PATCH 0474/1357] Bugfix start index of grid-line

---
 public/js/components/Calendar/Base/Grid.js      | 1 -
 public/js/components/Calendar/Base/Grid/Line.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 7800955d8..7b2d1f87b 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -214,7 +214,6 @@ export default {
 			const result = Array.from({length: this.axisMain.length}, () => Array());
 			
 			target.forEach(event => {
-				// NOTE(chris): make new Date object to reset the time
 				const start = event.start || this.axisMainBorders[0].plus(-1);
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index cd71dcc02..9a6c2f579 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -41,7 +41,7 @@ export default {
 		eventsWithRowInfo() {
 			const events = [];
 			this.events.forEach(event => {
-				const rows = [2, -1];
+				const rows = [1, -1];
 				if (event.startsHere) {
 					rows[0] = 't_' + event.start.diff(this.date).toMillis();
 				}

From ff104461af84be26368e6774f260853f74acd64e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:08:42 +0200
Subject: [PATCH 0475/1357] Bugfix missing template ref

---
 public/js/components/Calendar/Mode/Week/View.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index d110c45bc..8941a755a 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -46,6 +46,7 @@ export default {
 	template: /* html */`
 	<div class="fhc-calendar-mode-week-view h-100">
 		<calendar-grid
+			ref="grid"
 			:axis-main="axisMain"
 			:axis-parts="axisParts"
 			:axis-main-collapsible="collapseEmptyDays"

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 0476/1357] 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 4e4a7a3880e657ff59a8319ce326d5ae7e537345 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:30:34 +0200
Subject: [PATCH 0477/1357] Bugfix handle events outside of grid bounds

---
 public/js/components/Calendar/Base/Grid.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 7b2d1f87b..37b31e784 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -128,10 +128,10 @@ export default {
 			return ends;
 		},
 		axisMainBorders() {
-			const lastInMainAxis = this.axisMain[this.axisMain.length - 1];
-			const extraLength = this.end;
-
-			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
+			return this.axisMain.reduce(
+				(res, curr) => res.concat([curr.plus(this.start), curr.plus(this.end)]),
+				[]
+			);
 		},
 		eventsAllDay() {
 			if (!this.allDayEvents)
@@ -218,9 +218,9 @@ export default {
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
 				for (var i = 0; i < this.axisMain.length; i++) {
-					if (start < this.axisMainBorders[i + 1] && end > this.axisMainBorders[i]) {
-						const startsHere = start >= this.axisMainBorders[i];
-						const endsHere = end <= this.axisMainBorders[i+1];
+					if (start < this.axisMainBorders[i * 2 + 1] && end > this.axisMainBorders[i * 2]) {
+						const startsHere = start >= this.axisMainBorders[i * 2];
+						const endsHere = end <= this.axisMainBorders[i * 2 + 1];
 						result[i].push({
 							...event,
 							startsHere,

From f1971659b47ea75eb33a84ed147dc85689a98d73 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:33:35 +0200
Subject: [PATCH 0478/1357] Loading Events

---
 public/css/components/calendar/frame.css         |  3 +++
 public/js/components/Calendar/Mode/Day/View.js   | 14 +++++++++++---
 public/js/components/Calendar/Mode/List/View.js  |  5 ++++-
 public/js/components/Calendar/Mode/Month/View.js |  3 +++
 public/js/components/Calendar/Mode/Week/View.js  |  5 ++++-
 public/js/composables/EventLoader.js             | 15 +++++++++++++--
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 22f8cae37..dcad26abf 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -127,6 +127,9 @@
 	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
 	overflow: hidden;
 }
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event .placeholder-glow {
+	text-indent: 0;
+}
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event * {
 	max-height: 100%;
 	max-width: 100%;
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 8371405d3..56065bbfd 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -63,9 +63,14 @@ export default {
 				if (this.events.find(e => e == this.chosenEvent))
 					return this.chosenEvent;
 			}
+			let first = null;
 			if (this.events)
-				return this.events.find(Boolean); // undefined => none found
-			return null; // null => loading
+				first = this.events.find(Boolean); // undefined => none found
+
+			if (first && first.type == 'loading')
+				return null; // null => loading
+
+			return first;
 		}
 	},
 	watch: {
@@ -123,7 +128,10 @@ export default {
 				<label-time v-bind="{ part }" />
 			</template>
 			<template #event="slot">
-				<slot v-bind="slot" mode="day" />
+				<div v-if="slot.event.type == 'loading'" class="placeholder-glow h-100 opacity-50">
+					<span class="placeholder w-100 h-100" />
+				</div>
+				<slot v-else v-bind="slot" mode="day" />
 			</template>
 		</calendar-grid>
 		<Teleport :disabled="!gridMainRef" :to="gridMainRef">
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 50560c0e7..38b1f9855 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -53,7 +53,10 @@ export default {
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
 			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
-				<slot :event="event.orig" mode="list" />
+ 				<div v-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+					<span class="placeholder w-100" />
+				</div>
+				<slot v-else :event="event.orig" mode="list" />
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index b2268e43d..fc21e452b 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -78,6 +78,9 @@ export default {
 					:date="slot.event.start"
 					:class="{ disabled: day.month != slot.event.start.month }"
 				/>
+				<div v-else-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+					<span class="placeholder w-100 fs-1" />
+				</div>
 				<slot v-else v-bind="slot" />
 			</template>
 		</calendar-grid>
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 8941a755a..64cd4b1a6 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -66,7 +66,10 @@ export default {
 				<label-time v-bind="{ part }" />
 			</template>
 			<template #event="slot">
-				<slot v-bind="slot" />
+				<div v-if="slot.event.type == 'loading'" class="placeholder-glow h-100 opacity-50">
+					<span class="placeholder w-100 h-100" />
+				</div>
+				<slot v-else v-bind="slot" />
 			</template>
 		</calendar-grid>
 	</div>
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 7fc1c5abc..5af20f6be 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -1,5 +1,8 @@
 export function useEventLoader(rangeInterval, getPromiseFunc) {
+	let loading_id = 0;
 	const events = Vue.ref([]);
+	const loadingEvents = Vue.ref([]);
+	const allEvents = Vue.computed(() => events.value.concat(loadingEvents.value));
 	const lv = Vue.ref(null);
 	const eventsLoaded = [];
 
@@ -93,9 +96,16 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 			}
 		}
 
-		if (start.ts > end.ts)
+		if (start.ts >= end.ts)
 			return result;
 
+		loadingEvents.value.push({
+			loading_id: loading_id++,
+			type: "loading",
+			isostart: start.toISODate() + 'T' + start.toISOTime(),
+			isoend: end.toISODate() + 'T' + end.toISOTime()
+		});
+
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};
 
@@ -116,10 +126,11 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 							lv.value = res.value.meta.lv;
 
 						events.value = events.value.concat(res.value.data);
+						loadingEvents.value = [];
 					}
 				})
 			});
 	})
 
-	return { events, lv }
+	return { events: allEvents, lv }
 }
\ No newline at end of file

From 20e896427439e909aa154607cd5c6eda327ba6d8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:38:35 +0200
Subject: [PATCH 0479/1357] Comment

---
 public/js/components/Calendar/Base.js | 7 -------
 public/js/composables/EventLoader.js  | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 298b9857e..a8d668cab 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -5,13 +5,6 @@ import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
 
-/**
- * TODO(chris):
- * - check emits
- * - event single mode (default for click:event)
- * - get focusDate/currentDate correct
- */
-
 export default {
 	name: "CalendarBase",
 	components: {
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 5af20f6be..7360d0286 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -1,3 +1,5 @@
+// TODO(chris): load events that are longer than the interval without doubling it
+
 export function useEventLoader(rangeInterval, getPromiseFunc) {
 	let loading_id = 0;
 	const events = Vue.ref([]);

From 91bb167c425129ba48f8871c523f503494695483 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:40:51 +0200
Subject: [PATCH 0480/1357] Implementation CIS => LV Plan

---
 public/js/components/Cis/LvPlan/LvPlan.js | 488 ++++++++--------------
 1 file changed, 185 insertions(+), 303 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 14c9b77a2..5267fc269 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,353 +1,235 @@
-import FhcCalendar from "../../Calendar/Calendar.js";
-import CalendarDate from "../../../composables/CalendarDate.js";
+import FhcCalendar from "../../Calendar/Base.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
+import { useEventLoader } from '../../../composables/EventLoader.js';
+
+import ModeDay from '../../Calendar/Mode/Day.js';
+import ModeWeek from '../../Calendar/Mode/Week.js';
+import ModeMonth from '../../Calendar/Mode/Month.js';
+
 export const DEFAULT_MODE_LVPLAN = 'Week'
 
-const LvPlan = {
+export default {
 	name: 'LvPlan',
+	components: {
+		FhcCalendar,
+		LvModal,
+		LvMenu
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
 	data() {
 		return {
-			events: null,
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					compact: false
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-			calendarDate: new CalendarDate(new Date()),
-			eventCalendarDate: new CalendarDate(new Date()),
-			currentlySelectedEvent: null,
-			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
-			lv: null,
-			minimized: false,
+
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			isModalContentResolved: false,
-			isModalTitleResolved: false,
-			isShowModal: false,
-		}
-	},
-	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
-		propsViewData: Object,
-		rowMinHeight: {
-			type: String,
-			default: '100px'
-		},
-		eventMaxHeight: {
-			type: String,
-			default: '125px'
-		}
-	},
-	provide() {
-		return {
-			rowMinHeight: this.rowMinHeight,
-			eventMaxHeight: this.eventMaxHeight
-		}	
-	},
-	inject:["renderers"],
-	watch: {
-		/* events:{
-			handler: function(newValue){
-				if(newValue == null)
-					setTimeout(()=>{
-						if(this.events == null){
-							this.loadEvents();
-						}
-					},500);
-			},
-			immediate: true,
-		}, */
-		modalLoaded:{
-			handler: function (newValue) {
-				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
-					this.$nextTick(() => {
-						if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-						this.isShowModal = false;
-					});
-				}
-			}, 
-			immediate: true
-		},
-		weekFirstDay: {
-			handler: async function (newValue) {
-				let data = await this.fetchStudiensemesterDetails(newValue);
-				let { studiensemester_kurzbz, start, ende } = data.data;
-				this.studiensemester_kurzbz = studiensemester_kurzbz;
-				this.studiensemester_start = start;
-				this.studiensemester_ende = ende;
-			},
-			immediate: true,
-		},
-		// forward/backward on history entries happening in lvplan
-		'propsViewData.lv_id'(newVal) {
-			// relevant if lv_id can be changed from within this component
-		},
-		'propsViewData.mode'(newVal) {
-			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
-		},
-		'propsViewData.focus_date'(newVal) {
-			this.currentDate = new Date(newVal)
-		}
-	},
-	components: {
-		FhcCalendar, LvModal, LvMenu
+		};
 	},
 	computed:{
-		modalLoaded: function(){
-			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved:this.isModalTitleResolved};
-		},
-		
-		downloadLinks: function(){
-			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
-			let start = new Date(this.studiensemester_start);
-			start = Math.floor(start.getTime()/1000);
-			let ende = new Date(this.studiensemester_ende);
-			ende = Math.floor(ende.getTime() / 1000);
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+			
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=student'
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
 
-			let download_link = 
-				(format, version = "", target = "") => 
-					`${FHC_JS_DATA_STORAGE_OBJECT.app_root}cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=
-					${this.uid}&begin=${start}&ende=${ende}&format=${format}
-					${version ? '&version=' + version : ''}${target ? '&target=' + target : ''}`;
 			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link('excel') },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link('csv') },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link('ical', '1', 'ical') },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link('ical', '2', 'ical') }
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
 			];
 		},
-		weekFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
-		},
-		weekLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.eventCalendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.eventCalendarDate.cdLastDayOfCalendarMonth);
-		},
 	},
-	methods:{
-		modalTitleResolved: function () {
-			this.isModalTitleResolved = true;
-			
+	methods: {
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
 		},
-		modalContentResolved: function () {
-			this.isModalContentResolved = true;
-			
-		},
-		// component renderers fetches from different addons
-		modalTitleComponent(type){
-			return this.renderers[type]?.modalTitle;
-		},
-		modalContentComponent(type) {
-			return this.renderers[type]?.modalContent;
-		},
-		calendarEventComponent(type){
-			return this.renderers[type]?.calendarEvent;
-		},
-		
-
-		fetchStudiensemesterDetails: async function (date) {
-			return this.$api.call(ApiLvPlan.studiensemesterDateInterval(date));
-		},
-		
-		setSelectedEvent: function (event) {
-			this.currentlySelectedEvent = event;
-		},
-		selectDay: function(day){
-			const date = day.getFullYear() + "-" +
-				String(day.getMonth() + 1).padStart(2, "0") + "-" +
-				String(day.getDate()).padStart(2, "0");
-			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+		handleChangeDate(day) {
+			const focus_date = day.toISODate();
+			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
 				name: "LvPlan",
 				params: {
-					mode: capitalizedMode,
-					focus_date: date,
+					mode,
+					focus_date,
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 			
 			this.currentDay = day;
 		},
-		handleChangeMode(mode) {
-			let m = mode[0].toUpperCase() + mode.slice(1)
-			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-			
-			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
+		handleChangeMode(newMode) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = (this.currentDay instanceof luxon.DateTime)
+				? this.currentDay.toISODate()
+				: this.currentDay;
 			
 			this.$router.push({
 				name: "LvPlan",
 				params: {
-					mode: m,
-					focus_date: date,
+					mode,
+					focus_date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
-			})
-			this.calendarMode = m
-		},
-		showModal: function(event){
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(()=>{
-				if(this.isModalContentResolved && this.isModalTitleResolved){
-					if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-				} 
-				else{
-					this.isShowModal = true;
-				}
-			})
-		},
-		updateRange: function ({start,end, mounted}) {
-			let checkDate = (date) => {
-				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
-			}
-			this.calendarDate = new CalendarDate(end);
-
-			// only load month data if the month or year has changed
-			// or we receive a reload flag from the mounted routine of the components
-			// or this handler is being called from the mounted lifecycle of a component
-			if (mounted || (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end)))){
-				// reset the events before querying the new events to activate the loading spinner
-				this.events = null;
-				this.eventCalendarDate = new CalendarDate(end);
-				this.loadEvents();
-			}
-		},
-		calendarDateToString: function (calendarDate) {
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		loadEvents: function(){
-			Promise.allSettled([
-				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
-				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-						
-						if(promise_result.value.meta?.lv) this.lv = promise_result.value.meta.lv
-						
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
 			});
+
+			this.calendarMode = mode;
 		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					this.rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		}
+	},
+	setup(props) {
+		const $api = Vue.inject('$api');
+
+		const rangeInterval = Vue.ref(null);
+		
+		const { events, lv } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), props.propsViewData.lv_id)),
+				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events,
+			lv
+		};
 	},
 	created() {
-		
-
 		this.$api
 			.call(ApiAuthinfo.getAuthUID())
-			.then(res => res.data)
-			.then(data => {
-				this.uid = data.uid;
+			.then(res => {
+				this.uid = res.data.uid;
 			});
-		
-		// this.loadEvents();
-	},
-	beforeUnmount() {
-		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
+		/*window.addEventListener("resize", () => {
+			this.modeOptions.day.compact = document.body.offsetWidth < 1200;
+		});*/
 	},
 	template:/*html*/`
-	<template v-if="renderers">
-	<h2>
-		{{$p.t('lehre/stundenplan')}}
-		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
-		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
-	</h2>
-	<hr>
-	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
-		<template #modalTitle>
-		<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
-			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-		</Suspense>
-		</template>
-		<template #modalContent>
-		<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
-			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-		</Suspense>
-		</template>
-	</lv-modal>
+	<div class="d-flex flex-column h-100" v-if="renderers">
+		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
+			{{ $p.t('lehre/stundenplan') }}
+			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">
+				{{ studiensemester_kurzbz }}
+			</span>
+			<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv">
+				{{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english }}
+			</span>
+		</h2>
+		<hr>
+		<fhc-calendar
+			ref="calendar"
+			:date="currentDay"
+			:modes="modes"
+			:modeOptions="modeOptions"
+			:mode="propsViewData.mode.toLowerCase()"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			:timezone="viewData.timezone"
+			:locale="$p.user_locale.value"
+			show-btns
+			:events="events || []"
+			:backgrounds="[]"
 
-	<fhc-calendar
-		ref="calendar"
-		@selectedEvent="setSelectedEvent"
-		:initial-date="currentDay"
-		@change:range="updateRange"
-		@change:offset="handleOffset"
-		:events="events"
-		:initial-mode="propsViewData.mode"
-		show-weeks
-		@select:day="selectDay"
-		@change:mode="handleChangeMode"
-		v-model:minimized="minimized"
-	>
-		<template #calendarDownloads>
-			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary card">
-					<div class="d-flex flex-column">
-						<i aria-hidden="true" :class="icon"></i>
-						<span class="small">{{title}}</span>
+			show-weeks
+		>
+			<template v-slot="{ event, mode }">
+				<div
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+					:type="mode == 'day' ? 'button' : undefined"
+	 				:style="eventStyle(event)"
+				>
+					<component
+						v-if="mode == 'event'"
+						:is="renderers[event.type]?.modalContent"
+						:event="event"
+					></component>
+					<component
+						v-else-if="mode == 'eventheader'"
+						:is="renderers[event.type]?.modalTitle"
+						:event="event"
+					></component>
+					<component
+						v-else
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
+				</div>
+			</template>
+			<template #actions>
+				<div
+					v-if="downloadLinks"
+					class="d-flex gap-1 justify-items-start"
+				>
+					<div v-for="{ title, icon, link } in downloadLinks">
+						<a
+							:href="link"
+							:aria-label="title"
+							class="py-1 px-2 m-1 btn btn-outline-secondary card"
+						>
+							<div class="d-flex flex-column">
+								<i aria-hidden="true" :class="icon"></i>
+								<span class="small">{{ title }}</span>
+							</div>
+						</a>
 					</div>
-				</a>
-			</div>
-		</template>
-		<template #monthPage="{event,day}">
-			<div @click="showModal(event)" class="monthPageContainer " >
-				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
-			</div>
-		</template>
-		<template #weekPage="{event,day}">
-			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative h-100"
-				:class="{'p-1':event.allDayEvent}"
-				style = "overflow: auto;" >
-				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
-			</div>
-		</template>
-		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry m-0 h-100  text-center">
-				<component :is="calendarEventComponent(event.type)" :event="event"></component>
-			</div>
-		</template>
-		<template #pageMobilContent="{lvMenu, event}">
-			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="event" :event="event" :lvMenu="lvMenu" ></component>
-		</template>
-		<template #pageMobilContentEmpty >
-			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
-		</template>
-	</fhc-calendar>
-	</template>`
-}
-
-export default LvPlan;
+				</div>
+			</template>
+		</fhc-calendar>
+	</div>`
+};

From 772685019381eefff7e410ac1b47066a6a9a42aa Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 16:14:16 +0200
Subject: [PATCH 0481/1357] quick fix equal-int comparison resulting in an
 error if search string is numeric but out of range of integer column

---
 application/config/searchfunctions.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
index 898069aed..276652997 100644
--- a/application/config/searchfunctions.php
+++ b/application/config/searchfunctions.php
@@ -1,12 +1,16 @@
 <?php
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
+/*
+ * TODO: 2025-07-21 ma0080 bare integer comparision results in db error
+ *       if searchstring is numeric but out of range of int, think about 
+ *       more sophisticated solution using column data type - quick fix 
+ *       convert field and search string to text
+ */
 $config['equal-int'] = [
 	'priority' => 4,
 	'rank' => "0",
-	'compare' => "{field} = {word}",
+	'compare' => "{field}::text = {word}::text",
 	'force_integer' => true
 ];
 

From 9d809cf8439be3c1f848fc5a4230807550bb607c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 21 Jul 2025 16:33:26 +0200
Subject: [PATCH 0482/1357] Tab Dokumente

- Refactor Mapping for List Accepted for correct view Akzeptiertdatum and AkzeptiertVon
- Delete Testoutputs dokument_kurzbz List NotAccpeted
- Correct ColumnName for NachreichungAm
- Change Order Columns Uploaddatum, akzeptiertVon
---
 .../api/frontend/v1/stv/Dokumente.php         | 29 ++++++++++++-------
 .../models/crm/Dokumentprestudent_model.php   |  2 ++
 .../Details/Dokumente/List/Accepted.js        |  6 ++--
 .../Details/Dokumente/List/Unaccepted.js      |  2 --
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 686094620..18c976eb6 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -101,22 +101,29 @@ class Dokumente extends FHCAPI_Controller
 			}
 		}
 
-		//Array for total list of accepted documents
-		$newDataMap = [];
-		foreach ($arrayAccepted as $item) {
-			$newDataMap[] = (array)$item;
+		//Mapping with document_kurzbz
+		$preDocMap = [];
+		foreach ($resultPreDoc as $pre) {
+			$preDocMap[$pre->dokument_kurzbz] = $pre;
 		}
 
-		$listExistingKurzbz = array_column($newDataMap, 'dokument_kurzbz');
+		$mergedArray = [];
+		foreach ($arrayAccepted as $doc) {
+			$merged = clone $doc;
 
-		foreach ($resultPreDoc as $item)
-		{
-			if (!in_array($item->dokument_kurzbz, $listExistingKurzbz))
-			{
-				$newDataMap[] = (array)$item;
+			if (isset($preDocMap[$doc->dokument_kurzbz])) {
+				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
+				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
+				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
+			} else {
+				$merged->akzeptiertdatum = null;
+				$merged->akzeptiertvon = null;
 			}
+
+			$mergedArray[] = $merged;
 		}
-		$this->terminateWithSuccess($newDataMap);
+
+		$this->terminateWithSuccess($mergedArray);
 	}
 
 	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
index 2415ee483..6b1c222a8 100644
--- a/application/models/crm/Dokumentprestudent_model.php
+++ b/application/models/crm/Dokumentprestudent_model.php
@@ -102,6 +102,8 @@ class Dokumentprestudent_model extends DB_Model
 			$qry.="	AND (v.archivierbar = FALSE OR v.archivierbar IS NULL)";
 		}
 
+		$qry.=" ORDER BY d.bezeichnung ASC";
+
 		return $this->execQuery($qry, $parametersArray);
 	}
 }
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 673c41210..bca7e00fa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -42,7 +42,6 @@ export default {
 								hour12: false
 							});
 						}},
-					{title: "Akzeptiertvon", field: "insertvonma"},
 					{
 						title: "UploadDatum", field: "hochgeladenamum",
 						formatter: function (cell) {
@@ -57,6 +56,7 @@ export default {
 								hour12: false
 							});
 						}},
+					{title: "Akzeptiertvon", field: "insertvonma"},
 					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
 					{title: "Prestudent ID", field: "prestudent_id", visible: false},
 					{title: "nachgereicht", field: "nachgereicht", visible: false,
@@ -69,7 +69,7 @@ export default {
 					{title: "infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "dms_id", field: "dms_id", visible: false},
-					{title: "titel", field: "titel_intern"},
+					{title: "titel", field: "titel_intern", visible: false},
 					{title: "vorhanden", field: "vorhanden",
 						formatter:"tickCross",
 						hozAlign:"center",
@@ -196,7 +196,7 @@ export default {
 							title: this.$p.t('global', 'akte_id')
 						});
 						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
-							title: this.$p.t('global', 'dokument')
+							title: this.$p.t('dokumente', 'nachreichungAm')
 						});
 					}
 				},
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 21dec91e8..e1110ddf3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -349,8 +349,6 @@ export default {
 			@click:new="actionUploadFile"
 		>
 			<template #actions="{selected}">
-			<p v-for="name in selected">
-			{{name.dokument_kurzbz}}</p>
 				<button
 					class="btn btn-primary"
 					@click="acceptDocuments(selected)"

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

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

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

From 4524b9bcdca604d395a16d6c4d52ff44063e9568 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:18:31 +0200
Subject: [PATCH 0484/1357] Bugfix invalid end-tag

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

diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 06a63915d..88340f01b 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -55,7 +55,7 @@ export default {
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
-						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</p>
+						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</a>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
 						<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>

From a0721fcd9aeadc9f8905dbe1b6899780c20829bf Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:19:00 +0200
Subject: [PATCH 0485/1357] LvPlan.js remove unused imports

---
 public/js/components/Cis/LvPlan/LvPlan.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5267fc269..5797fa5df 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,6 +1,4 @@
 import FhcCalendar from "../../Calendar/Base.js";
-import LvModal from "../Mylv/LvModal.js";
-import LvMenu from "../Mylv/LvMenu.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -15,9 +13,7 @@ export const DEFAULT_MODE_LVPLAN = 'Week'
 export default {
 	name: 'LvPlan',
 	components: {
-		FhcCalendar,
-		LvModal,
-		LvMenu
+		FhcCalendar
 	},
 	inject: [
 		"renderers"

From b4f1a8a56c370618e1ee371ee630fcf6c3d759ee Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:19:51 +0200
Subject: [PATCH 0486/1357] Renderer Lehreinheit: get LvMenu inside the
 component

---
 .../Cis/Renderer/Lehreinheit/modalContent.js  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 2d5f34eee..e0436bad1 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -1,20 +1,23 @@
 import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
 import LvMenu from "../../Mylv/LvMenu.js";
 
+import ApiLvPlan from '../../../../api/factory/lvPlan.js';
+import ApiAddons from '../../../../api/factory/addons.js';
+
 export default {
+	components:{
+		LvMenu,
+	},
 	props:{
 		event: {
 			type: Object,
 			required: true,
-		},
-		lvMenu:{
-			type: Object,
-			required: false,
-			default: null,
-		},
+		}
 	},
-	components:{
-		LvMenu,
+	data() {
+		return {
+			lvMenu: []
+		};
 	},
 	computed: {
 		lektorenLinks: function () {
@@ -54,6 +57,22 @@ export default {
 			return formatDate(d);
 		},
 	},
+	created() {
+		if (this.event.type == 'lehreinheit') {
+			this.$api
+				.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
+				.then(res => res.data)
+				.then(studiensemester_kurzbz => this.$api.call(
+					ApiAddons.getLvMenu(
+						this.event.lehrveranstaltung_id,
+						studiensemester_kurzbz
+					)
+				))
+				.then(res => {
+					this.lvMenu = res.data;
+				});
+		}
+	},
 	template: `
 	<div>
 		<h5>
@@ -120,6 +139,6 @@ export default {
 				</tbody>
 		</table>
 		
-		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
+		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu.length" :menu="lvMenu" />
 	</div>`,
 }
\ No newline at end of file

From fa090153f211dcfb08694ab3e46ff41522dd8141 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:22:03 +0200
Subject: [PATCH 0487/1357] LvPlan.js Remove unused prop

---
 public/js/components/Cis/LvPlan/LvPlan.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5797fa5df..01b026fdd 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -181,8 +181,6 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="[]"
-
-			show-weeks
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 117a284dc4a35e08d1751942eb4d060de72a53c7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 09:47:45 +0200
Subject: [PATCH 0488/1357] update(News Widget/Content stylings): updates the
 style of the news widget and single news view

---
 public/css/components/dashboard/news.css      |  31 +---
 public/js/components/Cis/Cms/Content.js       |   5 +-
 .../Cis/Cms/Content_types/News_content.js     | 142 ++++++++++++++++++
 public/js/components/Dashboard/Item.js        |   4 +-
 public/js/components/DashboardWidget/News.js  |  89 +++++++----
 5 files changed, 219 insertions(+), 52 deletions(-)
 create mode 100644 public/js/components/Cis/Cms/Content_types/News_content.js

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index c8414521e..975ef7a81 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -158,32 +158,17 @@
 
 .carousel-control-prev,
 .carousel-control-next {
-    opacity: 0;
-    transition: opacity 0.3s ease;
+	top: 0.5rem !important;
+	bottom: auto !important;
+	opacity: 1 !important;
 }
 
-/* Show the buttons when the carousel is hovered */
-.carousel:hover .carousel-control-prev,
-.carousel:hover .carousel-control-next {
-    opacity: 1;
+.fhc-news-items-lg .row:hover{
+	background-color: var(--fhc-primary);
+	color: var(--fhc-light);
+	cursor: pointer;
 }
 
-.fhc-news-text{
-	font-size: 0.75em;
-}
+.fhc-news-items-sm{
 
-.fhc-news-xs {
-	font-size: 0.6em;
-}
-
-.fhc-news-sm {
-	font-size: 0.7em;
-}
-
-.fhc-news-md {
-	font-size: 1.1em;
-}
-
-.fhc-news-lg {
-	font-size: 1.4em;
 }
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 0fd08078a..470a0fa62 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,7 +1,7 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
 import BsConfirm from "../../Bootstrap/Confirm.js";
-
+import news_content from './Content_types/News_content.js';
 import ApiCms from '../../../api/factory/cms.js';
 
 export default {
@@ -22,6 +22,7 @@ export default {
 	},
 	components: {
 		raum_contentmittitel,
+		news_content,
 		general,
 	},
 	data() {
@@ -80,6 +81,8 @@ export default {
 			switch (this.content_type) {
 				case "raum_contentmittitel":
 					return "raum_contentmittitel";
+				case "news":
+					return "news_content";
 				default:
 					return "general";
 			};
diff --git a/public/js/components/Cis/Cms/Content_types/News_content.js b/public/js/components/Cis/Cms/Content_types/News_content.js
new file mode 100644
index 000000000..a4eacd332
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content_types/News_content.js
@@ -0,0 +1,142 @@
+import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js"
+export default {
+	name: "GeneralComponent",
+	props:{
+	  content:{
+		  type:String,
+		  required:true,
+	  },
+	},
+	methods: {
+		sanitizeLegacyTables(table) {
+			
+			// find nested tables and replace with p element
+			const tt = table.querySelectorAll('table')
+			tt.forEach(t => {
+				const textContent = t.textContent.trim();
+				const pElement = document.createElement('p');
+				pElement.textContent = textContent;
+				t.parentNode.replaceChild(pElement, t);
+			})
+
+			// find unordered lists, traverse li childs and replace with p element -> more readable than 1 p tag for ul
+			const ul = table.querySelectorAll('ul')
+			ul.forEach(u => {
+				Array.from(u.children).forEach(li => {
+					const p = document.createElement('p');
+					p.textContent = li.textContent
+					u.parentNode.appendChild(p)
+				})
+				u.parentNode.removeChild(u)
+				
+			})
+
+			// find bare text nodes and put into p element
+			const td = Array.from(table.querySelectorAll('td')).filter(el => el.scrollWidth > 100)
+			td.forEach(element => {
+				if (element.firstChild?.nodeType === Node.TEXT_NODE && element.firstChild.length > 10) {
+					const p = document.createElement('p');
+					p.appendChild(element.firstChild)
+					element.appendChild(p);
+				}
+			});
+
+			// flatten nested th elements
+			const ths = Array.from(table.querySelectorAll('th'))
+			ths.forEach(th => {
+
+				if(th.children.length > 1) {
+					th.innerHTML = Array.from(th.childNodes).find(cn => cn.textContent).textContent
+				}
+			})
+
+			// let p elements wrap on overflow
+			const p = table.querySelectorAll('p')
+			p.forEach(p => {
+				p.style.setProperty('word-wrap', 'break-word');
+				p.style.setProperty('white-space', 'normal');
+				p.style.setProperty('max-width', '400px');
+			})
+		}
+	},
+	mounted(){
+		// replaces the tablesorter with the tabulator
+		let tables = Array.from(document.getElementsByClassName("tablesorter"));
+
+		tables.forEach((table, index) =>  {
+			this.sanitizeLegacyTables(table)
+			
+			new Tabulator(table, {
+				index: index,
+				layout: "fitDataFill",
+
+				columnDefaults: {
+					formatter: "html",
+					resizable: true,
+					minWidth: "100px"
+				}
+			})
+		})
+
+		document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+			el.addEventListener("click", (evt) => {
+			  evt.preventDefault();
+			  BsConfirm.popup(el.dataset.confirm)
+				.then(() => {
+				  Axios.get(el.href)
+					.then((res) => {
+						// TODO(chris): check for success then show message and/or reload
+						location = location;
+					})
+					.catch((err) => console.error("ERROR:", err));
+				})
+				.catch(() => {});
+			});
+		  });
+		document.querySelectorAll("#cms [data-href]").forEach((el) => {
+			el.href = el.dataset.href.replace(
+				/^ROOT\//,
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+			);
+		});
+			
+		document.querySelectorAll("[href]").forEach((element) => {
+			let orignal_href = element.getAttribute("href");
+			let new_href = replaceRelativeLegacyLink(orignal_href);
+			element.href = new_href;
+		});
+
+		document.querySelectorAll("[style*=background-color]").forEach((element) => {
+			if (element.style.backgroundColor == "rgb(255, 255, 255)"){
+				element.style.backgroundColor = "var(--fhc-background)";
+			}
+			if(element.querySelector("*[style*=background-color]")){
+				element.style.backgroundColor = "var(--fhc-tertiary)";
+			}
+		});
+
+		Vue.nextTick(() => {
+			document.querySelectorAll(".card-header").forEach((el) => {
+				el.classList.add("fhc-primary");
+			});
+			document.querySelectorAll(".row").forEach((el) => {
+				el.classList.add("w-100");
+				el.classList.add("align-items-center");
+
+			});
+			document.querySelectorAll(".row h2").forEach((el) => {
+				el.classList.add("mb-0");
+			});
+
+		})
+
+	},
+	template: /*html*/ `
+	  <!-- div that contains the content -->
+	  <div v-if="content" class="container" style="max-width: 100%;"><div class="row"><div class="col">
+		<div v-html="content"  ></div>
+	  </div></div></div>
+	  <p v-else>Content was not found</p>
+	  `,
+  };
+  
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index e1a03e2f3..c9598ce16 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -164,7 +164,7 @@ export default {
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
 			<template v-if="isPinned">
-				<div type="button" v-if="editMode" pinned="true" @click="unpin" v-tooltip="{showDelay:1000, value: 'unpin item'}" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+				<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
 					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 				</div>
 				<div v-else class="col-auto me-2">
@@ -172,7 +172,7 @@ export default {
 				</div>
 			</template>
 			<template v-else>
-				<div type="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" v-tooltip="{showDelay:1000, value: 'pin item'}">
+				<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
 					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 				</div>
 			</template>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index c423fc11f..a683e0f72 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -36,7 +36,12 @@ export default {
 				quantity = this.height === 1 ? 4 : MAX_LOADED_NEWS;
 			}
 
-			return this.allNewsList.slice(0, quantity);
+			let slicedNews= this.allNewsList.slice(0, quantity);
+			slicedNews.sort((a,b)=>{
+				return new Date(b.insertamum) - new Date(a.insertamum);
+			});
+			
+			return slicedNews;
 		},
 		carouselItems() {
 			return this.allNewsList.reduce((acc, cur) => {
@@ -47,6 +52,14 @@ export default {
 		}
 	},
 	methods: {
+		formatDate: function (dateTime) {
+			const dt = new Date(dateTime);
+			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
+		},
+		formatTime: function (dateTime) {
+			const dt = new Date(dateTime);
+			return dt.getHours() + ':' + dt.getMinutes();
+		},
 		isString(value){
 			return Object.prototype.toString.call(value) === '[object String]';
 		},
@@ -141,6 +154,25 @@ export default {
 				this.allNewsList = Array.from(Object.values(news));
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
+
+				Vue.nextTick(() => {
+					document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
+						el.classList.add("border-0");
+					});
+
+					document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
+						el.classList.add("px-5");
+						el.classList.add("fhc-primary");
+					});
+					document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
+						el.classList.add("w-100");
+						el.classList.add("align-items-center");
+
+					});
+					document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
+						el.classList.add("mb-0");
+					});
+				})
 				
 			})
 			.catch((err) => {
@@ -167,32 +199,37 @@ export default {
 		}
 		
 		this.initCarouselInstance()
+
+	
 	},
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
     <div class="d-flex flex-column h-100">
-        <div class="h-100" style="overflow-y: auto" v-show="width == 1">
-            <div  v-for="(news, index) in newsList" :key="news.news_id" class="mt-2">
-                <div v-if="index > 0 " class="fhc-seperator"></div>
-                <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
-                <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
+        <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
+            <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
+				<div class="row m-0">
+					<div class="col-3 d-flex">
+						<span class="small">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+					</div>
+					<div class="col">
+						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a>
+					</div>
+				</div>
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;">
-        		<template v-for="news in newsList" :key="'menu-'+news.news_id">
-					<div class="position-relative">
-						<div class="row fhc-news-menu-item " @click="setSelected(news)" :class="getMenuItemClass(news)" style="margin-right: 0px; margin-left: 0px; overflow-y: hidden;">
-							<div class="col-8 fhc-news-menu-item-betreff">
-								<p class="fhc-news-text mb-0">
-									{{news.content_obj.betreff ?? ''}}
-								</p>
-							</div>
-							<span style="top:2px; right:0" class=" position-absolute d-none d-xl-block fhc-news-text fhc-news-menu-item-date fw-bold">
-								{{ news.datumformatted ?? ''}}
-							</span>
-						</div>
+        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;" class="fhc-news-items-lg border-end" >
+        		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
+				<div class="row m-0 py-2" @click="setSelected(news)">
+					<div class="col-3 d-flex">
+						<span class="small">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
+					<div class="col">
+						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
+					</div>
+				</div>
 				</template>
 			</div>
 			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
@@ -200,16 +237,16 @@ export default {
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
-							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item " style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>
+							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item fhc-news-card-item" style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>
 						</div>
-						<button @click="setPrev" @focus="$event.target.blur()" style="z-index: 100; color: black; overflow: hidden; margin-left: 10px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-prev" type="button">
-							<div class="border rounded-circle" style="padding-left: 0.4rem; padding-right: 0.4rem; background-color:rgba(138,138,138,0.4)">
-								<i class="fa fa-chevron-left"></i>
+						<button @click="setPrev" style="z-index: 100; overflow: hidden; margin-left: 4px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-prev" type="button">
+							<div style="padding-left: 0.4rem; padding-right: 0.4rem;">
+								<i class="fa fa-chevron-left fhc-text-light"></i>
 							</div>
 						</button>
-						<button @click="setNext" @focus="$event.target.blur()" style="z-index: 100; color: black; overflow: hidden; margin-right: 10px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-next"  type="button">
-							<div class="border rounded-circle" style="padding-left: 0.4rem; padding-right: 0.4rem; background-color:rgba(138,138,138,0.4)">
-								<i class="fa fa-chevron-right"></i>
+						<button @click="setNext" style="z-index: 100;  overflow: hidden; margin-right: 4px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-next"  type="button">
+							<div style="padding-left: 0.4rem; padding-right: 0.4rem;">
+								<i class="fa fa-chevron-right fhc-text-light"></i>
 							</div>
 						</button>
 					</div>

From 9855a0b45d4434a105994a68667282a9341ff89c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 10:37:45 +0200
Subject: [PATCH 0489/1357] fix(News widget style): updates the content style
 of the news when rendering new news content

---
 public/js/components/DashboardWidget/News.js | 62 ++++++++++++--------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index a683e0f72..7f4419aa6 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -52,6 +52,36 @@ export default {
 		}
 	},
 	methods: {
+		updateNewsContentClasses:function(){
+			Vue.nextTick(() => {
+				document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
+					if (!el.classList.contains("border-0")) {
+						el.classList.add("border-0");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
+					if (!el.classList.contains("px-5")) {
+						el.classList.add("px-5");
+					}
+					if (!el.classList.contains("fhc-primary")) {
+						el.classList.add("fhc-primary");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
+					if (!el.classList.contains("w-100")) {
+						el.classList.add("w-100");
+					}
+					if (!el.classList.contains("align-items-center")) {
+						el.classList.add("align-items-center");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
+					if (!el.classList.contains("mb-0")) {
+						el.classList.add("mb-0");
+					}
+				});
+			})
+		},
 		formatDate: function (dateTime) {
 			const dt = new Date(dateTime);
 			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
@@ -68,12 +98,15 @@ export default {
 			const nextIndex = thisIndex == (this.allNewsList.length - 1) ? 0 : thisIndex + 1
 
 			this.setSelected(this.allNewsList[nextIndex])
+			this.updateNewsContentClasses();
+			
 		},
 		setPrev() {
 			const thisIndex = this.allNewsList.findIndex(n=>n.news_id == this.selected.news_id)
 			const prevIndex = thisIndex ? thisIndex - 1 : this.allNewsList.length - 1
 			
 			this.setSelected(this.allNewsList[prevIndex])
+			this.updateNewsContentClasses();
 		},
 		getMenuItemClass(news) {
 			let classString = ''
@@ -155,24 +188,7 @@ export default {
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
 
-				Vue.nextTick(() => {
-					document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
-						el.classList.add("border-0");
-					});
-
-					document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
-						el.classList.add("px-5");
-						el.classList.add("fhc-primary");
-					});
-					document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
-						el.classList.add("w-100");
-						el.classList.add("align-items-center");
-
-					});
-					document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
-						el.classList.add("mb-0");
-					});
-				})
+				this.updateNewsContentClasses();
 				
 			})
 			.catch((err) => {
@@ -208,7 +224,7 @@ export default {
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
-					<div class="col-3 d-flex">
+					<div class="col-12 col-md-3 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
@@ -219,20 +235,20 @@ export default {
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;" class="fhc-news-items-lg border-end" >
+        	<div style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 col-12 col-sm-3 col-md-4 col-lg-5" >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-3 d-flex">
+					<div class="col-md-12 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
-					<div class="col">
+					<div class="col-md-12">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
-			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
+			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col-12 col-sm-9 col-md-8 col-lg-7">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 

From f9a45a4917c0e8217528386d4354e0f513481948 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 10:45:51 +0200
Subject: [PATCH 0490/1357] LvPlan Now-background

---
 public/js/components/Cis/LvPlan/LvPlan.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 01b026fdd..25538bc33 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,4 +1,5 @@
 import FhcCalendar from "../../Calendar/Base.js";
+
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -23,6 +24,7 @@ export default {
 		propsViewData: Object
 	},
 	data() {
+		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			modes: {
 				day: Vue.markRaw(ModeDay),
@@ -41,11 +43,17 @@ export default {
 			},
 			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-
+			backgrounds: [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			],
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null,
+			uid: null
 		};
 	},
 	computed:{
@@ -151,9 +159,6 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
-		/*window.addEventListener("resize", () => {
-			this.modeOptions.day.compact = document.body.offsetWidth < 1200;
-		});*/
 	},
 	template:/*html*/`
 	<div class="d-flex flex-column h-100" v-if="renderers">
@@ -171,7 +176,7 @@ export default {
 			ref="calendar"
 			:date="currentDay"
 			:modes="modes"
-			:modeOptions="modeOptions"
+			:mode-options="modeOptions"
 			:mode="propsViewData.mode.toLowerCase()"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
@@ -180,7 +185,7 @@ export default {
 			:locale="$p.user_locale.value"
 			show-btns
 			:events="events || []"
-			:backgrounds="[]"
+			:backgrounds="backgrounds"
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 0a9f4023b3af535ac8611dd68b80fc88444e62e8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 10:50:34 +0200
Subject: [PATCH 0491/1357] add component class

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

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 25538bc33..001b46f7c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -161,7 +161,7 @@ export default {
 			});
 	},
 	template:/*html*/`
-	<div class="d-flex flex-column h-100" v-if="renderers">
+	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
 		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
 			{{ $p.t('lehre/stundenplan') }}
 			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">

From ad080e61b290aad48f5a906ff2e011a1aeadf201 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 13:14:56 +0200
Subject: [PATCH 0492/1357] Implementation CIS => RoomInformation

---
 application/controllers/CisVue/Cms.php        |   9 +-
 .../controllers/api/frontend/v1/LvPlan.php    |  82 +++--
 application/libraries/StundenplanLib.php      |  63 +++-
 public/js/api/factory/lvPlan.js               |  10 +-
 public/js/api/lvPlan.js                       |  10 +-
 .../js/components/Cis/Mylv/RoomInformation.js | 345 +++++++-----------
 6 files changed, 256 insertions(+), 263 deletions(-)

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index a9ff13c53..aa07b919f 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -87,9 +87,14 @@ class Cms extends Auth_Controller
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
 	}
 	
-	public function getRoomInformation($ort_kurzbz){
+	public function getRoomInformation($ort_kurzbz)
+	{
+		// Load Config
+		$this->load->config('calendar');
+
 		$viewData = array(
-			'ort_kurzbz' => $ort_kurzbz
+			'ort_kurzbz' => $ort_kurzbz,
+			'timezone' => $this->config->item('timezone')
 		);
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'CmsRoom']);
 	}
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 69d08110a..0ccf65a0e 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -32,7 +32,7 @@ class LvPlan extends FHCAPI_Controller
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
-            'Reservierungen' => self::PERM_LOGGED,
+            'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
@@ -177,55 +177,69 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($stunden);
 	}
 
-    /**
-     * fetches room events from a certain date
-     * @access public
-     *
-     */
+	/**
+	 * fetches room events from a certain date
+	 * @access public
+	 *
+	 * @return void
+	 */
 	public function getRoomplan()
 	{
+		// form validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required");
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the post parameter in local variables
+		$ort_kurzbz = $this->input->post('ort_kurzbz', true);
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
+
+		// get data
 		$this->load->library('StundenplanLib');
-        // form validation
-        $this->load->library('form_validation');
-        $this->form_validation->set_data($_GET);
-        $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
-        $this->form_validation->set_rules('start_date',"start_date","required");
-        $this->form_validation->set_rules('end_date',"end_date","required");
-        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
-        // storing the get parameter in local variables
-        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
-
-		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
-
-        $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->stundenplanlib->expand_object_information($roomplan_data);
+		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
+		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
+		
 		$this->terminateWithSuccess($roomplan_data);
-
 	}
 	
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
-    public function Reservierungen($ort_kurzbz = null)
+	/**
+	 * gets the reservierungen of a room if the ort_kurzbz parameter is
+	 * supplied otherwise gets the reservierungen of the lvplan of a student
+	 * @access public
+	 *
+	 * @param string	$ort_kurzbz
+	 * @return void
+	 */
+	public function getReservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
+		
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
 
-		// storing the get parameter in local variables
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
+		// get data
+		$this->load->library('StundenplanLib');
+
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
+
+		$result = $this->getDataOrTerminateWithError($result);
 
-		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
-		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 868d73a24..0107ceef1 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -130,30 +130,69 @@ class StundenplanLib{
 		
 	}
 
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
+	/**
+	 * Get stundenplan for a room
+	 *
+	 * @param string	$ort_kurzbz
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @return stdClass
+	 */
+	public function getRoomplan($ort_kurzbz, $start_date, $end_date)
+	{
 		$this->_ci =& get_instance();
 
 		// Load Config
 		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$query = $this->_ci->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date);
+		$roomplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($query);
+
+		if (isError($roomplan_data))
+			return $roomplan_data;
+
+		$this->expand_object_information($roomplan_data->retval);
+
+		return $roomplan_data;
+	}
+
+	/**
+	 * Get reservations (for a room or all)
+	 *
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @param string	$ort_kurzbz
+	 * @return stdClass
+	 */
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	{
+		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-		if($is_mitarbeiter)
-		{
+		
+		if ($is_mitarbeiter) {
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
 		} else {
 			// querying the reservierungen
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
-		if(isError($reservierungen))
-		{
-			return error(getData($reservierungen));
-		}
-		$reservierungen = getData($reservierungen) ?? [];
-		$function_error = $this->expand_object_information($reservierungen);
-		if(!is_null($function_error)){
+		
+		if (isError($reservierungen))
+			return $reservierungen;
+		
+		$function_error = $this->expand_object_information($reservierungen->retval);
+		
+		if (!is_null($function_error))
 			return $function_error;
-		}
-		return success($reservierungen);
+		
+		return $reservierungen;
 	}
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index d8cad1c01..99f7961f6 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -18,7 +18,7 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
-			method: 'get',
+			method: 'post',
 			url: '/api/frontend/v1/LvPlan/getRoomplan',
 			params: { ort_kurzbz, start_date, end_date }
 		};
@@ -39,15 +39,15 @@ export default {
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return {
-			method: 'get',
-			url: `/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
+			method: 'post',
+			url: `/api/frontend/v1/LvPlan/getReservierungen/${ort_kurzbz}`,
 			params: { start_date, end_date }
 		};
 	},
 	getLvPlanReservierungen(start_date, end_date) {
 		return {
-			method: 'get',
-			url: '/api/frontend/v1/LvPlan/Reservierungen',
+			method: 'post',
+			url: '/api/frontend/v1/LvPlan/getReservierungen',
 			params: { start_date, end_date }
 		};
 	},
diff --git a/public/js/api/lvPlan.js b/public/js/api/lvPlan.js
index a1d34b37c..2939b688c 100644
--- a/public/js/api/lvPlan.js
+++ b/public/js/api/lvPlan.js
@@ -1,7 +1,7 @@
 
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
-		return this.$fhcApi.get(
+		return this.$fhcApi.post(
 			'/api/frontend/v1/LvPlan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
@@ -13,14 +13,14 @@ export default {
 		);
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
-		return this.$fhcApi.get(
-			`/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
+		return this.$fhcApi.post(
+			`/api/frontend/v1/LvPlan/getReservierungen/${ort_kurzbz}`,
 			{ start_date, end_date}
 		);
 	},
 	getLvPlanReservierungen(start_date, end_date) {
-		return this.$fhcApi.get(
-			'/api/frontend/v1/LvPlan/Reservierungen',
+		return this.$fhcApi.post(
+			'/api/frontend/v1/LvPlan/getReservierungen',
 			{ start_date, end_date }
 		);
 	},
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 6a9a7dbcd..b604ef2bb 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,259 +1,194 @@
-import FhcCalendar from "../../Calendar/Calendar.js";
+import FhcCalendar from "../../Calendar/Base.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
-import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
 import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
+import { useEventLoader } from '../../../composables/EventLoader.js';
+
+import ModeDay from '../../Calendar/Mode/Day.js';
+import ModeWeek from '../../Calendar/Mode/Week.js';
+import ModeMonth from '../../Calendar/Mode/Month.js';
+
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
-const RoomInformation = {
+export default {
 	name: "RoomInformation",
-    props:{
-		propsViewData: {
-			type: Object
-		},
-		rowMinHeight: {
-			type: String,
-			default: '100px'
-		},
-		eventMaxHeight: {
-			type: String,
-			default: '125px'
-		}
-    },
 	components: {
 		FhcCalendar,
-		LvModal,
-		LvInfo,
+		LvInfo
 	},
-	provide() {
-		return {
-			rowMinHeight: this.rowMinHeight,
-			eventMaxHeight: this.eventMaxHeight
-		}
+	inject: [
+		"renderers"
+	],
+	props:{
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
 	},
 	data() {
+		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
-			events: null,
-			calendarMode: DEFAULT_MODE_RAUMINFO,
-			calendarDate: new CalendarDate(new Date()),
-			currentlySelectedEvent: null,
-			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
-			minimized: false,
-            
-        }
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
+					compact: false
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			currentDay: this.propsViewData?.focus_date,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO,
+			backgrounds: [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			]
+		}
 	},
-    computed:{
-        currentDate: function(){
-            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
-        },
-		weekFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
+	methods:{
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
 		},
-		weekLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
-		},
-    },
-	watch: {
-		'propsViewData.ort_kurzbz'(newVal) {
-			// relevant if ort_kurzbz can be changed from within this component
-		},
-		'propsViewData.mode'(newVal) {
-			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
-		},
-		'propsViewData.focus_date'(newVal) {
-			this.currentDate = new Date(newVal)
-		}	
-	},
-    methods:{
-		setSelectedEvent: function(event){
-			this.currentlySelectedEvent = event;
-		},
-		getLvID: function () {
-			this.lv_id = window.location.pathname
-		},
-		selectDay: function(day){
-			const date = day.getFullYear() + "-" +
-				String(day.getMonth() + 1).padStart(2, "0") + "-" +
-				String(day.getDate()).padStart(2, "0");
+		handleChangeDate(day) {
+			const focus_date = day.toISODate();
+			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
 				name: "RoomInformation",
 				params: {
-					mode: this.calendarMode,
-					focus_date: date,
+					mode,
+					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-
+			
 			this.currentDay = day;
 		},
-		handleOffset: function(offset)  {
-			this.currentDay = new Date(
-				this.currentDay.getFullYear() + offset.y,
-				this.currentDay.getMonth() + offset.m,
-				this.currentDay.getDate() + offset.d
-			)
+		handleChangeMode(newMode) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = (this.currentDay instanceof luxon.DateTime)
+				? this.currentDay.toISODate()
+				: this.currentDay;
 
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.calendarMode,
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
-		},
-		handleChangeMode(mode) {
-			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-			
 			this.$router.push({
 				name: "RoomInformation",
 				params: {
-					mode: modeCapitalized,
-					focus_date: date,
+					mode,
+					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
 
 			this.calendarMode = mode
 		},
-		showModal: function (event) {
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				this.$refs.lvmodal.show();
-			});
-			
-		},
-		updateRange: function ({ start, end }) {
-
-			let checkDate = (date) => {
-				return date.m != this.calendarDate.m || date.y != this.calendarDate.y;
-			}
-
-			// only load month data if the month or year has changed
-			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))) {
-				// reset the events before querying the new events to activate the loading spinner
-				this.events = null;
-				this.calendarDate = new CalendarDate(end);
-				Vue.nextTick(() => {
-					this.loadEvents();
-				});
-			}
-		},
-		calendarDateToString: function (calendarDate) {
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		loadEvents: function(){
-
-			// bundles the room_events and the reservierungen together into the this.events array
-			Promise.allSettled([
-				this.$api.call(ApiStudenplan.getRoomInfo(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiStudenplan.getOrtReservierungen(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success"){
-						
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-								
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
-			})
-		},
-    },
-	created() {
-		this.loadEvents();
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+		}
 	},
-    template: /*html*/`
+	setup(props) {
+		const $api = Vue.inject('$api');
+
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiStudenplan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				$api.call(ApiStudenplan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events
+		};
+	},
+	template: /*html*/`
+	<div class="fhc-roominformation d-flex flex-column h-100">
 		<h2>{{ $p.t('rauminfo/rauminfo') }} {{ propsViewData.ort_kurzbz }}</h2>
 		<hr>
-		<lv-modal v-if="currentlySelectedEvent" :showMenu="false" :event="currentlySelectedEvent" ref="lvmodal" />
 		<fhc-calendar 
 			ref="calendar"
-			@selectedEvent="setSelectedEvent" 
-			:initial-date="currentDay"
-			@change:range="updateRange"
-			@change:offset="handleOffset"
-			:events="events" 
-			:initial-mode="propsViewData.mode"
-			show-weeks 
-			@select:day="selectDay"
-			@change:mode="handleChangeMode"
-			v-model:minimized="minimized"
+			:date="currentDay"
+			:modes="modes"
+			:mode-options="modeOptions"
+			:mode="propsViewData.mode.toLowerCase()"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			:timezone="viewData.timezone"
+			:locale="$p.user_locale.value"
+			show-btns
+			:events="events || []"
+			:backgrounds="backgrounds"
 		>
-            <template #monthPage="{event,day}">
-				<span >
-					{{event.topic}}
-				</span>
-			</template>
-			<template #weekPage="{event,day}">
-				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.topic}}</span>
-					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.ort_kurzbz}}</span>
+			<template v-slot="{ event, mode }">
+				<component
+					v-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<div
+					v-else-if="mode == 'month'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					class="d-flex flex-column align-items-center justify-content-evenly h-100"
+				>
+					<span>{{ event?.topic }}</span>
 				</div>
-			</template>
-			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div
+					v-else-if="mode == 'week'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					class="border border-secondary d-flex flex-column align-items-center justify-content-evenly h-100"
+					type="button"
+				>
+					<span>{{ event?.topic }}</span>
+					<span v-for="lektor in event?.lektor">{{ lektor.kurzbz }}</span>
+					<span>{{ event?.ort_kurzbz }}</span>
+				</div>
+				<div
+					v-else-if="mode == 'day'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					type="button"
+					class="border border-secondary d-flex align-items-center justify-content-center text-center h-100"
+				>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.topic}}</p>
+						<p class="m-0">
+							{{ event?.topic }}
+						</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">
+							{{ lektor.kurzbz }}
+						</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.ort_kurzbz}}</p>
+						<p class="m-0">
+							{{ event?.ort_kurzbz }}
+						</p>
 					</div>
 				</div>
 			</template>
-			<template #pageMobilContent>
-				<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-				<div class="w-100">
-					<lv-info :event="currentlySelectedEvent" />
-				</div>
-			</template>
-			<template #pageMobilContentEmpty >
-				<h3>{{$p.t('rauminfo','keineRaumReservierung')}}</h3>
-			</template>
-        </fhc-calendar>
-    `,
+		</fhc-calendar>
+	</div>`
 };
-
-export default RoomInformation
\ No newline at end of file

From 9ddb9f46fdec8a5a84d041666a230845bd6ccff8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 13:30:25 +0200
Subject: [PATCH 0493/1357] refactor(Cis4 News Widget Responsive): changes the
 responsive column layouts for the news widget

---
 public/css/components/dashboard/news.css     | 11 +++++++++--
 public/js/components/DashboardWidget/News.js | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 975ef7a81..a5bca7afe 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -169,6 +169,13 @@
 	cursor: pointer;
 }
 
-.fhc-news-items-sm{
-
+.news-truncate {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	/* number of lines to show */
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-word;
 }
+
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 7f4419aa6..a6c94b90e 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -224,7 +224,7 @@ export default {
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
-					<div class="col-12 col-md-3 d-flex">
+					<div class="col-12 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
@@ -235,20 +235,20 @@ export default {
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 col-12 col-sm-3 col-md-4 col-lg-5" >
+        	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex">
+					<div class="col-md-12 d-flex mb-2">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
-					<div class="col-md-12">
+					<div class="col-md-12 news-truncate">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
-			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col-12 col-sm-9 col-md-8 col-lg-7">
+			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 

From 6c57c17eb5d924b4be8191e5fb7005f0e918e2ea Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 13:50:34 +0200
Subject: [PATCH 0494/1357] update(News Widget 1 spaltig): adds padding and
 updates colors of the time and content when hovered

---
 public/css/components/dashboard/news.css     | 17 +++++++++++++++++
 public/js/components/Dashboard/Item.js       |  2 +-
 public/js/components/DashboardWidget/News.js |  9 +++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index a5bca7afe..0253a1789 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -96,6 +96,11 @@
 	}
 }
 
+.widgets-news{
+	padding: 0 .5rem;
+	overflow-y: auto;
+}
+
 .widgets-news img
 {
     max-width: 100%;
@@ -165,10 +170,22 @@
 
 .fhc-news-items-lg .row:hover{
 	background-color: var(--fhc-primary);
+	color: var(--fhc-light) !important;
+	cursor: pointer;
+}
+
+.fhc-news-items-lg .row .news-truncate span{
+	color: var(--fhc-primary);
+	cursor: pointer;
+}
+
+.fhc-news-items-lg .row:hover .news-truncate span {
 	color: var(--fhc-light);
 	cursor: pointer;
 }
 
+
+
 .news-truncate {
 	display: -webkit-box;
 	-webkit-line-clamp: 2;
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index c9598ce16..8e1fb2c62 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -189,7 +189,7 @@ export default {
 				</div>
 			</Transition>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
+		<div v-if="ready" class="card-body overflow-hidden" style="padding: .5em 0;">
 			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index a6c94b90e..26757d49c 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -23,9 +23,6 @@ export default {
 		sizeClass() {
 			return 'fhc-news-' + ['xs', 'sm', 'md', 'lg'][this.size];
 		},
-		getNewsWidgetStyle() {
-			return this.width == 1 ? "padding: 1rem 1rem;" : "padding: 0px;"
-		},
 		newsList() {
 			//Return news amount depending on widget width and size
 			// let quantity = this.width;
@@ -219,7 +216,7 @@ export default {
 	
 	},
 	template: /*html*/ `
-<div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
+<div ref="container" class="widgets-news h-100" :class="sizeClass" >
     <div class="d-flex flex-column h-100">
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
@@ -239,8 +236,8 @@ export default {
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
 					<div class="col-md-12 d-flex mb-2">
-						<span class="small">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+						<span class="small ">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
 					</div>
 					<div class="col-md-12 news-truncate">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>

From a13deed13f86a1079b9db0929e536be0186c0358 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Jul 2025 14:07:44 +0200
Subject: [PATCH 0495/1357] Tab Aufnahmetermine: bugfix updateAufnahmetermin

---
 application/controllers/api/frontend/v1/stv/Aufnahmetermine.php | 1 -
 .../Details/Aufnahmetermine/Aufnahmetermine.js                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 153079789..86b739c90 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -175,7 +175,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$result = $this->RtPersonModel->update(
 			[
 				'rt_person_id' => $rt_person_id,
-				'person_id' => $person_id,
 			],
 			[
 				'rt_id' => $rt_id,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 474854315..9ffddcf5a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -495,7 +495,7 @@ export default {
 		<template #footer>
 			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
-			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
+			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_person_id)"> {{$p.t('ui', 'speichern')}}</button>
 		</template>
 	    </bs-modal>
 

From 1b2d5ff6c65263702d7c37701a5345c30e21d59d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 15:43:03 +0200
Subject: [PATCH 0496/1357] update(News widget styling): makes card-header of
 the news content sticky so that the white left and right buttons don't appear
 in front of a white background

---
 public/js/components/DashboardWidget/News.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 26757d49c..0f15a165e 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -63,6 +63,14 @@ export default {
 					if (!el.classList.contains("fhc-primary")) {
 						el.classList.add("fhc-primary");
 					}
+					if (!el.classList.contains("position-sticky")) {
+						el.classList.add("position-sticky");
+					}
+					if (!el.classList.contains("top-0")) {
+						el.classList.add("top-0");
+					}
+					
+					
 				});
 				document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
 					if (!el.classList.contains("w-100")) {

From 07ba21ff3ec4bc9c49ecec85f35c9fa33f7e73a9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Jul 2025 16:03:00 +0200
Subject: [PATCH 0497/1357] Tab Details: reload DetailHeader after update
 Detaisl

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 18efcc9de..624b3d035 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -37,6 +37,10 @@ export default {
 		},
 		lists: {
 			from: 'lists'
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
 		}
 	},
 	props: {
@@ -136,6 +140,8 @@ export default {
 						this.$refs.form.setFeedback(true, cleanedFeedback);
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					}
+
+					this.$reloadList();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From db07f33e3c6b28ba658eb782cf8004957ee56dd1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 16:20:18 +0200
Subject: [PATCH 0498/1357] update(Cis Modals): makes modals scrollable by
 default and uses fhc-primary for the card-header and fhc-secondary for the
 card-footer

---
 public/css/Cis4/Cis.css            | 14 ++++++++++++++
 public/js/components/Base/Modal.js |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 64bf769fc..80784fe5d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -838,4 +838,18 @@ html {
 	#lektorenContainer {
 		grid-template-columns: 1fr 1fr;
 	}
+}
+
+#cis-main .modal-header{
+	background-color: var(--fhc-primary);
+	color: var(--fhc-light);
+}
+
+#cis-main .modal-header .btn-close{
+	filter: invert(1);
+}
+
+#cis-main .modal-footer {
+	background-color: var(--fhc-secondary);
+	
 }
\ No newline at end of file
diff --git a/public/js/components/Base/Modal.js b/public/js/components/Base/Modal.js
index ad3785e62..9a07f9c16 100644
--- a/public/js/components/Base/Modal.js
+++ b/public/js/components/Base/Modal.js
@@ -16,7 +16,7 @@ export default {
         :class="this.cModalClass"
         :id="this.id"
         :aria-labelledby="this.id + '_label'" aria-hidden="true" tabindex="-1">       
-            <div class="modal-dialog" :class="this.cModalDialogClass">
+            <div class="modal-dialog modal-dialog-scrollable" :class="this.cModalDialogClass">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title" :id="this.id + '_label'">

From 72df2cb79cfb737142ace0e73da0ef78f8f2f159 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 08:56:23 +0200
Subject: [PATCH 0499/1357] Implementation CIS => LvPlanWidget

---
 application/controllers/Cis4.php              |  12 +-
 public/css/Cis4/CoreCalendarEvents.css        |  50 ++-
 public/css/components/calendar/events.css     |   6 +-
 public/js/components/Calendar/Base.js         |   1 +
 .../Calendar/Base/Grid/Line/Event.js          |   2 +-
 public/js/components/Calendar/Base/Header.js  |   5 +
 .../Calendar/Base/Header/Datepicker.js        |  13 +-
 public/js/components/Calendar/Mode/List.js    |  22 +-
 .../js/components/Calendar/Mode/List/View.js  |  31 +-
 public/js/components/Dashboard/Dashboard.js   |   4 +-
 .../js/components/DashboardWidget/LvPlan.js   | 321 +++++-------------
 11 files changed, 190 insertions(+), 277 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index c0ca8d503..b7ba2029d 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -17,6 +17,9 @@ class Cis4 extends Auth_Controller
 			'index' => 'basis/cis:r'
 		    )
 		);
+
+		// Load Config
+		$this->load->config('calendar');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -27,15 +30,16 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
 		
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone')
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'FhcDashboard']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
-}
\ No newline at end of file
+}
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index f248f4a61..9075d89e9 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -124,27 +124,27 @@
 
 .dayPageContainer .feiertagEventContent #ferienEventTitle {}
 
-/* Minimized Container Styles */
+/* List Page Container Styles */
 
-/* Ferientage Events for Minimized */
+/* Ferientage Events for List Page */
 
-.minimizedContainer .feiertagEventContent{
+.listPageContainer .feiertagEventContent{
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	color: var(--fhc-light);
 }
 
-.minimizedContainer .feiertagEventContent #ferienEventIcon{
+.listPageContainer .feiertagEventContent #ferienEventIcon{
 	margin: 0.5rem;
 }
 
-.minimizedContainer .feiertagEventContent #ferienEventTitle{
+.listPageContainer .feiertagEventContent #ferienEventTitle{
 	flex-grow: 1;
 }
 
-/* Lehreinheits Events in Minimized */
-.dayPageContainer .lehreinheitEventContent {
+/* Lehreinheits Events in List Page */
+.listPageContainer .lehreinheitEventContent {
 	display: flex;
 	padding-left: 4rem;
 	justify-content: space-evenly;
@@ -152,15 +152,43 @@
 
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display: grid;
 	align-content: center;
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: contents;
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText * {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
 	font-weight: 500;
-}
\ No newline at end of file
+}
+
+
+/* Widget Styles */
+.dashboard-widget-lvplan .fhc-calendar-base .card {
+	--bs-card-cap-padding-x: 0;
+	--bs-card-cap-padding-y: 0;
+	--bs-card-border-radius: 0;
+	--bs-card-border-width: 0;
+	--dp-input-padding: .375rem .75rem;
+	--dp-input-icon-padding: calc(1rem + 24px);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header {
+	border-bottom-width: var(--bs-border-width);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
+	width: 100%;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
+	--dp-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
+	--bs-btn-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base-label-day {
+	cursor: initial;
+}
+
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index 5feb7b707..b29883d54 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,4 +1,4 @@
-.fhc-calendar-base-grid-line-event {
+.event {
 	cursor: pointer;
 }
 .fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
@@ -59,9 +59,9 @@
 .fhc-calendar-base-grid-line-event .event-type-reservierung {
 	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
 }
-.fhc-calendar-base-grid-line-event > * {
+.fhc-calendar-base .event > * {
 	background-color: var(--event-bg, var(--event-default-bg));
 }
-.fhc-calendar-base-grid-line-event > *:hover {
+.fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
 }
diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index a8d668cab..520948ecb 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -264,6 +264,7 @@ export default {
 				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
 				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
 				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
+				:mode-options="modeOptions ? modeOptions[cMode] : undefined"
 			>
 				<slot name="actions" />
 			</base-header>
diff --git a/public/js/components/Calendar/Base/Grid/Line/Event.js b/public/js/components/Calendar/Base/Grid/Line/Event.js
index 5cf098eb5..6512d1fa1 100644
--- a/public/js/components/Calendar/Base/Grid/Line/Event.js
+++ b/public/js/components/Calendar/Base/Grid/Line/Event.js
@@ -42,7 +42,7 @@ export default {
 	},
 	template: /* html */`
 	<div
-		class="fhc-calendar-base-grid-line-event"
+		class="fhc-calendar-base-grid-line-event event"
 		:class="classes"
 		style="z-index: 1"
 		:draggable="draggable"
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
index 6dc0d3c26..c1dae4bc0 100644
--- a/public/js/components/Calendar/Base/Header.js
+++ b/public/js/components/Calendar/Base/Header.js
@@ -17,6 +17,10 @@ export default {
 			type: String,
 			required: true
 		},
+		modeOptions: {
+			type: Object,
+			default: {}
+		},
 		btnMonth: Boolean,
 		btnWeek: Boolean,
 		btnDay: Boolean,
@@ -62,6 +66,7 @@ export default {
 						@update:date="$emit('update:date', $event)"
 						@open="open = true"
 						@closed="open = false"
+						:list-length="modeOptions.length"
 					/>
 					<button
 						class="btn btn-outline-secondary border-0"
diff --git a/public/js/components/Calendar/Base/Header/Datepicker.js b/public/js/components/Calendar/Base/Header/Datepicker.js
index f6e521805..2d3237643 100644
--- a/public/js/components/Calendar/Base/Header/Datepicker.js
+++ b/public/js/components/Calendar/Base/Header/Datepicker.js
@@ -51,20 +51,17 @@ export default {
 			case "month":
 				return this.date.toLocaleString({ month: 'long', year: 'numeric' });
 			case "week":
-				const year = this.date.localWeekYear;
-				const week = this.date.toFormat('nn');
+				var year = this.date.localWeekYear;
+				var week = this.date.toFormat('nn');
 				return this.$p.t('calendar/year_kw', { year, week });
 			case "list":
+				return this.date.toLocaleString(luxon.DateTime.DATE_FULL) + '-' + this.date.plus({ days: this.listLength - 1 }).toLocaleString(luxon.DateTime.DATE_FULL);
 			case "day":
 				return this.date.toLocaleString(luxon.DateTime.DATE_FULL);
 			default:
 				return 'View not Supported';
 			}
 		},
-		format() {
-			const title = this.title;
-			return `'${title}'`;
-		},
 		weekStart() {
 			return luxon.Info.getStartOfWeek(this.date)%7;
 		}
@@ -97,10 +94,10 @@ export default {
 	<vue-date-picker
 		:model-value="current"
 		@update:model-value="update"
-		:format="format"
+		:format="() => title"
 		:month-picker="mode == 'month'"
 		:week-picker="mode == 'week'"
-		:range="mode == 'list' ? { autoRange: listLength } : false"
+		:range="mode == 'list' ? { autoRange: listLength - 1 } : false"
 		:text-input="mode == 'day'"
 		:week-start="weekStart"
 		:week-numbers="{ type: weekNumbers }"
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
index 56ba7b1f9..97990a5a3 100644
--- a/public/js/components/Calendar/Mode/List.js
+++ b/public/js/components/Calendar/Mode/List.js
@@ -20,7 +20,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -35,9 +36,9 @@ export default {
 
 			if (this.rangeOffset != 0) {
 				if (this.rangeOffset < 0) {
-					first = first.plus({ days: this.rangeOffset * this.length });
+					first = first.plus({ days: this.rangeOffset });
 				} else {
-					last = last.plus({ days: this.rangeOffset * this.length });
+					last = first.plus({ days: this.rangeOffset + this.length });
 				}
 			}
 
@@ -46,7 +47,7 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = Math.floor(this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days / this.length);
+			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
 			if (this.rangeOffset) {
 				this.$emit('update:range', this.range);
 				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
@@ -65,15 +66,23 @@ export default {
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
 		updatePage(offset) {
-			const newFocusDate = this.focusDate.plus({ days: offset * this.length });
+			const newFocusDate = this.focusDate.plus({ days: offset });
 			this.focusDate = newFocusDate;
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
 		},
 		viewAttrs(offset) {
-			const day = this.focusDate.plus({ days: offset * this.length });
+			const day = this.focusDate.plus({ days: offset });
 			return { day, length: this.length };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'event':
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
+				break;
+			}
 		}
 	},
 	mounted() {
@@ -82,6 +91,7 @@ export default {
 	template: `
 	<div
 		class="fhc-calendar-mode-list flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
 	>
 		<base-slider ref="slider" v-slot="slot">
 			<list-view v-bind="viewAttrs(slot.offset)">
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 38b1f9855..510d821c1 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -1,6 +1,9 @@
 import LabelDay from '../../Base/Label/Day.js';
 import LabelDow from '../../Base/Label/Dow.js';
 
+import CalDnd from '../../../../directives/Calendar/DragAndDrop.js';
+import CalClick from '../../../../directives/Calendar/Click.js';
+
 // TODO(chris): drag and drop
 
 export default {
@@ -9,7 +12,12 @@ export default {
 		LabelDay,
 		LabelDow
 	},
+	directives: {
+		CalDnd,
+		CalClick
+	},
 	inject: {
+		draggableEvents: "draggableEvents",
 		events: "events"
 	},
 	props: {
@@ -43,20 +51,31 @@ export default {
 			return eventsPerDay.filter(day => day.events.length);
 		}
 	},
+	methods: {
+		draggable(event) {
+			return this.draggableEvents(event.orig, 'list');
+		},
+	},
 	template: /* html */`
-	<div
-		class="fhc-calendar-mode-list-view h-100"
-	>
-		<div v-if="!eventsPerDay.length">
+	<div class="fhc-calendar-mode-list-view h-100 overflow-auto">
+		<div v-if="!eventsPerDay.length" class="h-100">
 			<slot :event="undefined" mode="list" />
 		</div>
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
 			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
- 				<div v-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+ 				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />
 				</div>
-				<slot v-else :event="event.orig" mode="list" />
+				<div
+					v-else
+					class="event"
+					:draggable="draggable(event)"
+					v-cal-dnd:draggable="event"
+					v-cal-click:event="event.orig"
+				>
+					<slot :event="event.orig" mode="list" />
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 81eabd31c..3d781ac72 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -19,9 +19,8 @@ export default {
 		viewData: {
 			type: Object,
 			required: true,
-			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.name && value.uid && value.timezone
 			}
 		}
 	},
@@ -37,6 +36,7 @@ export default {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
 			widgetsSetup: Vue.computed(() => this.widgets),
+			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
 	computed: {
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 1e2588161..3961bae78 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -1,266 +1,115 @@
-import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
-import FhcCalendar from '../Calendar/Calendar.js';
-import LvModal from '../Cis/Mylv/LvModal.js';
-import ContentModal from '../Cis/Cms/ContentModal.js'
-import CalendarDate from '../../composables/CalendarDate.js';
+import FhcCalendar from '../Calendar/Base.js';
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
-import ApiOrt from '../../api/factory/ort.js';
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeList from '../Calendar/Mode/List.js';
 
 export default {
 	name: "LvPlanWidget",
+	components: {
+		FhcCalendar
+	},
 	mixins: [
-		Phrasen,
 		AbstractWidget
 	],
-	components: {
-		FhcCalendar,
-		LvModal,
-		ContentModal
-	},
-	
+	inject: [
+		"renderers",
+		"timezone"
+	],
 	data() {
 		return {
-			stunden: [],
-			minimized: true,
-			events: null,
-			currentDay: this.getCurrentDate(),
-			calendarDate: new CalendarDate(new Date()),
-			roomInfoContentID: null,
-			ort_kurzbz: null,
-			selectedEvent: null,
-			isModalContentResolved: false,
-			isModalTitleResolved: false,
-			isShowModal: false,
-		}
-	},
-	inject: ["renderers"],
-	watch:{
-		modalLoaded: {
-			handler: function (newValue) {
-				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
-					this.$nextTick(() => {
-						if (this.$refs.lvmodal) this.$refs.lvmodal.show();
-						this.isShowModal = false;
-					});
+			now: luxon.DateTime.now().setZone(this.timezone),
+			modes: {
+				list: Vue.markRaw(ModeList)
+			},
+			modeOptions: {
+				list: {
+					length: 7
 				}
 			},
-			immediate: true
-		},
-	},
-	computed: {
-		modalLoaded: function () {
-			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved: this.isModalTitleResolved };
-		},
-		allEventsGrouped() {
-			// groups all events of the next 7 days together
-			const currentCalendarDate = new CalendarDate(this.currentDay)
-			const mapArr = currentCalendarDate.nextSevenDays.map((d) => [new CalendarDate(d), []])
-
-			// return map of key => calendar date of next 7 days & values the respective events on that date
-			return new Map((this.events || []).filter(evt => evt.start >= this.currentDay).reduce((acc, cur) => {
-				const date = new CalendarDate(new Date(cur.datum))
-				const arr = acc.find(el => el[0].compare(date))
-				if(!arr) return acc
-				arr[1].push(cur)
-				
-				return acc
-			}, mapArr));
-		},
-		currentEvents() {
-			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
-		},
-		dayAfterCurrentDay() {
-			let currentDay = new Date(this.currentDay);
-			currentDay.setDate(currentDay.getDate() + 1);
-			return currentDay;
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfNextCalendarMonth);
-		},
+			currentDay: luxon.DateTime.now().setZone(this.timezone).startOf('day')
+		}
 	},
 	methods: {
-		showModal: function (event) {
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				if (this.isModalContentResolved && this.isModalTitleResolved) {
-					if (this.$refs.lvmodal) this.$refs.lvmodal.show();
-				}
-				else {
-					this.isShowModal = true;
-				}
-			})
-		},
-		modalTitleResolved: function () {
-			this.isModalTitleResolved = true;
-
-		},
-		modalContentResolved: function () {
-			this.isModalContentResolved = true;
-
-		},
-		modalTitleComponent(type) {
-			return this.renderers[type]?.modalTitle;
-		},
-		modalContentComponent(type) {
-			return this.renderers[type]?.modalContent;
-		},
-		calendarEventComponent(type) {
-			return this.renderers[type]?.calendarEvent;
-		},
-		getEventStyle: function(evt) {
-			const styles = {'background-color': evt.color};
-			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
+		eventStyle(event) {
+			const styles = {};
+			if (event.farbe)
+				styles['--event-bg'] = '#' + event.farbe;
+			else if (event.type == 'reservierung')
+				styles['--event-bg'] = '#ffffff';
+			else
+				styles['--event-bg'] = '#cccccc';
 
+			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
+			if (eventEnd < this.now)
+				styles['opacity'] = .5;
+			
 			return styles;
 		},
-		getCurrentDate: function() {
-			const today = new Date()
-			today.setHours(0,0,0)
-			return today
-		},
-		calendarDateToString: function (calendarDate) {
-
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		showRoomInfoModal: function(ort_kurzbz){
-			// getting the content_id of the ort_kurzbz
-			this.$api
-				.call(ApiOrt.getContentID(ort_kurzbz))
-				.then(res => {
-					this.roomInfoContentID = res.data;
-					this.ort_kurzbz = ort_kurzbz;
-
-					// only showing the modal after vue was able to set the reactive data
-					Vue.nextTick(() => { this.$refs.contentModal.show(); });
-				})
-				.catch(err => {
-					console.err(err);
-					this.ort_kurzbz = null;
-					this.roomInfoContentID = null;
-				});
-		},
-		showLvUebersicht: function (event){
-			this.selectedEvent= event;
-			Vue.nextTick(()=>{
-				this.$refs.lvmodal.show();
-			});
-		},
-		
-		selectDay(day) {
-			this.currentDay = day;
-			this.minimized = true;
-		},
-
-		updateRange: function (data) {
-			
-			let tmp_date = new CalendarDate(data.start);
-			// only load month data if the month or year has changed
-			if (tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y) {
-				this.calendarDate = tmp_date;
-				Vue.nextTick(() => {
-					this.loadEvents();
-				});
-			}
-		},
-		
-
-		loadEvents: function () {
-			Promise.allSettled([
-				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
-			});
-		},
-
-		setCalendarMaximized() {
-			this.minimized = false
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
 		}
-	
+	},
+	setup() {
+		const $api = Vue.inject('$api');
 
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
+				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events
+		};
 	},
 	created() {
 		this.$emit('setConfig', false);
-		this.loadEvents();
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  >
-			<template #modalTitle>
-				<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
-					<component :is="modalTitleComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
-				</Suspense>
-			</template>
-			<template #modalContent>
-				<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
-					<component :is="modalContentComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
-				</Suspense>
-			</template>
-		</lv-modal>
-		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
-			<template #monthPage="{event,day}">
-				<div  v-if="event.type=='moodle'">
-					<div class="d-flex small w-100" >
-						<moodle-svg></moodle-svg>
-						<span v-contrast class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-					</div>
+		<fhc-calendar
+			v-model:date="currentDay"
+			:modes="modes"
+			:mode-options="modeOptions"
+			@update:range="updateRange"
+			:timezone="timezone"
+			:locale="$p.user_locale.value"
+			:events="events"
+		>
+			<template v-slot="{ event, mode }">
+				<div
+					v-if="!event"
+					class="h-100 d-flex justify-content-center align-items-center"
+				>
+					{{ $p.t('lehre/noLvFound') }}
 				</div>
-				<span v-else class="small" >
-					{{event.topic}}
-				</span>
-			</template>
-			<template #minimizedPage >
-				<div class="minimizedContainer flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
-					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
-						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-					</div>
-					<template v-else-if="allEventsGrouped.size" v-for="([key, value], index) in allEventsGrouped" :key="index" style="margin-top: 8px;">
-						<div class=" card-header d-grid p-0">
-							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
-						</div>
-						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
-						</div>
-						<div v-if="!value.length" class="list-group-item small text-center">
-							{{ $p.t('lehre/noLvFound') }}
-						</div>
-					</template>
-					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
-						{{ $p.t('lehre/noLvFound') }}
-					</div>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<div
+					v-else
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+	 				:style="eventStyle(event)"
+				>
+					<component
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
 				</div>
 			</template>
 		</fhc-calendar>

From 36fd2dcd9032a23953bca421a3306fafd81c82ae Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:23:29 +0200
Subject: [PATCH 0500/1357] cleanup

---
 public/js/components/Cis/Mylv/RoomInformation.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index b604ef2bb..114295464 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,6 +1,4 @@
 import FhcCalendar from "../../Calendar/Base.js";
-import CalendarDate from "../../../composables/CalendarDate.js";
-import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
 import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
@@ -15,8 +13,7 @@ export const DEFAULT_MODE_RAUMINFO = 'Week'
 export default {
 	name: "RoomInformation",
 	components: {
-		FhcCalendar,
-		LvInfo
+		FhcCalendar
 	},
 	inject: [
 		"renderers"

From 132ab686c9b53f866fb185b52a542cb4fe6d9e0f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:24:16 +0200
Subject: [PATCH 0501/1357] get rid of Dashboard warnings

---
 public/js/components/Dashboard/Section.js | 8 ++++----
 public/js/components/Drop/Grid.js         | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 43031b8c1..a238de289 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -209,11 +209,11 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-		{{sectionNameTranslation()}}:
-	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+		<h4 v-if="editModeIsActive" class=" mb-2">
+			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+			{{sectionNameTranslation()}}:
+		</h4>
 		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 6955107e3..31bdeb74e 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -36,6 +36,7 @@ export default {
 		"newItem",
 		"gridHeight",
 		"draggedItem",
+		"update:additionalRow"
 	],
 	data() {
 		return {

From 4ead5907321c8d9b01ef02e0d5fdd7adffdf5316 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:25:16 +0200
Subject: [PATCH 0502/1357] Fix: negation of instanceof in Lehreinheit
 modalContent Renderer

---
 public/js/components/Cis/Renderer/Lehreinheit/modalContent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index e0436bad1..2a5670a02 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -36,14 +36,14 @@ export default {
 		},
 		start_time: function () {
 			if (!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date) {
+			if (!(this.event.start instanceof Date)) {
 				return this.event.start;
 			}
 			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
 		},
 		end_time: function () {
 			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
+			if (!(this.event.end instanceof Date)) {
 				return this.event.end;
 			}
 			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());

From d648f79ca59a861c667ecfccc235d07356df665a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:38:31 +0200
Subject: [PATCH 0503/1357] Correct click source for list mode

---
 public/js/components/Calendar/Mode/List/View.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 510d821c1..ec4ba5897 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -62,7 +62,13 @@ export default {
 			<slot :event="undefined" mode="list" />
 		</div>
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
-			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
+			<label-dow
+				:date="day"
+				class="d-inline"
+				@cal-click="evt => evt.detail.source = 'day'"
+			/>
+			, 
+			<label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
  				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />

From 66fd2e65a427d58ed0cf458d1faa099c9b9e4f19 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 10:42:12 +0200
Subject: [PATCH 0504/1357] add css class today

---
 public/css/components/calendar.css            |  3 ++
 public/css/components/calendar/frame.css      | 32 ++++++++++++++++---
 .../js/components/Calendar/Mode/Day/View.js   | 22 ++++++++-----
 .../js/components/Calendar/Mode/List/View.js  | 27 ++++++++++------
 .../js/components/Calendar/Mode/Month/View.js | 10 ++++--
 .../js/components/Calendar/Mode/Week/View.js  | 24 +++++++++-----
 6 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 8d349e8c2..d2df19c0e 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -42,6 +42,9 @@
 	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
 	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
 
+	--fhc-calendar-bg-month-today: var(--fhc-primary);
+	--fhc-calendar-color-month-today: var(--fhc-white-10);
+	
 	--fhc-calendar-bg-overlay1: var(--fhc-calendar-bg);
 	--fhc-calendar-bg-overlay2: var(--fhc-dark, #212529);
 	
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index dcad26abf..ab400c95d 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -44,15 +44,21 @@
 	content: "/";
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
-	--event-bg: transparent;
-	font-weight: bold;
-	text-indent: 0;
-	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+	height: 100%;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day {
+	width: 100%;
 	height: 100%;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 }
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
+	--event-bg: transparent;
+	font-weight: bold;
+	text-indent: 0;
+	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+}
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
 	opacity: .3;
 }
@@ -114,6 +120,15 @@
 	width: 100%;
 	border-left: solid 1px var(--fhc-calendar-gap);
 }
+.fhc-calendar-mode-day .today {
+	background-color: var(--fhc-calendar-bg-day-today);
+	color: var(--fhc-calendar-color-day-today);
+}
+/* Week */
+.fhc-calendar-mode-week .today {
+	background-color: var(--fhc-calendar-bg-week-today);
+	color: var(--fhc-calendar-color-week-today);
+}
 /* Month */
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line {
 	overflow: hidden;
@@ -137,6 +152,15 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+.fhc-calendar-mode-month .event > .today {
+	background-color: var(--fhc-calendar-bg-month-today);
+	color: var(--fhc-calendar-color-month-today);
+}
+/* List */
+.fhc-calendar-mode-list .today {
+	background-color: var(--fhc-calendar-bg-list-today);
+	color: var(--fhc-calendar-color-list-today);
+}
 
 /* Overlays */
 /* ======== */
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 56065bbfd..09738f1d0 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -13,7 +13,8 @@ export default {
 	},
 	inject: {
 		timeGrid: "timeGrid",
-		originalEvents: "events"
+		originalEvents: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -71,6 +72,9 @@ export default {
 				return null; // null => loading
 
 			return first;
+		},
+		isToday() {
+			return this.day.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
 		}
 	},
 	watch: {
@@ -116,13 +120,15 @@ export default {
 			all-day-events
 		>
 			<template #main-header="{ date }">
-				<label-dow
-					@cal-click="evt => evt.detail.source = 'day'"
-					v-bind="{ date }"
-				/>
-				<label-day
-					v-bind="{ date }"
-				/>
+				<div :class="{ today: isToday }">
+					<label-dow
+						@cal-click="evt => evt.detail.source = 'day'"
+						v-bind="{ date }"
+					/>
+					<label-day
+						v-bind="{ date }"
+					/>
+				</div>
 			</template>
 			<template #part-header="{ part }">
 				<label-time v-bind="{ part }" />
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index ec4ba5897..76b4c887d 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -18,7 +18,8 @@ export default {
 	},
 	inject: {
 		draggableEvents: "draggableEvents",
-		events: "events"
+		events: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -55,20 +56,28 @@ export default {
 		draggable(event) {
 			return this.draggableEvents(event.orig, 'list');
 		},
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
 	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-list-view h-100 overflow-auto">
 		<div v-if="!eventsPerDay.length" class="h-100">
 			<slot :event="undefined" mode="list" />
 		</div>
-		<div v-for="{ day, events } in eventsPerDay" class="text-center">
-			<label-dow
-				:date="day"
-				class="d-inline"
-				@cal-click="evt => evt.detail.source = 'day'"
-			/>
-			, 
-			<label-day :date="day" class="d-inline" />
+		<div v-for="{ day, events } in eventsPerDay">
+			<div
+				class="text-center"
+				:class="{ today: isToday(day) }"
+			>
+				<label-dow
+					:date="day"
+					class="d-inline"
+					@cal-click="evt => evt.detail.source = 'day'"
+				/>
+				, 
+				<label-day :date="day" class="d-inline" />
+			</div>
 			<div v-for="event in events">
  				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index fc21e452b..ea83b6c96 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -40,7 +40,8 @@ export default {
 		};
 	},
 	inject: {
-		events: "events"
+		events: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -57,6 +58,11 @@ export default {
 			return Array.from({ length: 8 }, (e, i) => luxon.Duration.fromObject({ days: i }));
 		}
 	},
+	methods: {
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
+	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-month-view h-100">
 		<calendar-grid
@@ -76,7 +82,7 @@ export default {
 				<label-day
 					v-if="slot.event.orig == 'header'"
 					:date="slot.event.start"
-					:class="{ disabled: day.month != slot.event.start.month }"
+					:class="{ disabled: !day.hasSame(slot.event.start, 'month'), today: isToday(slot.event.start) }"
 				/>
 				<div v-else-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100 fs-1" />
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 64cd4b1a6..612c4ad55 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -12,7 +12,8 @@ export default {
 		LabelTime
 	},
 	inject: {
-		timeGrid: "timeGrid"
+		timeGrid: "timeGrid",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -43,6 +44,11 @@ export default {
 			}
 		}
 	},
+	methods: {
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
+	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-week-view h-100">
 		<calendar-grid
@@ -54,13 +60,15 @@ export default {
 			all-day-events
 		>
 			<template #main-header="{ date }">
-				<label-dow
-					v-bind="{ date }"
-					@cal-click="evt => evt.detail.source = 'day'"
-				/>
-				<label-day
-					v-bind="{ date }"
-				/>
+				<div :class="{ today: isToday(date) }">
+					<label-dow
+						v-bind="{ date }"
+						@cal-click="evt => evt.detail.source = 'day'"
+					/>
+					<label-day
+						v-bind="{ date }"
+					/>
+				</div>
 			</template>
 			<template #part-header="{ part }">
 				<label-time v-bind="{ part }" />

From 8f73404307a394b23a5b1588395265ee70683dc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 10:50:57 +0200
Subject: [PATCH 0505/1357] truncate past-markings in month mode

---
 public/js/components/Cis/LvPlan/LvPlan.js     | 28 +++++++++++++------
 .../js/components/Cis/Mylv/RoomInformation.js | 21 +++++++++++---
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 001b46f7c..cdb2c38c1 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -43,13 +43,6 @@ export default {
 			},
 			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-			backgrounds: [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			],
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
@@ -57,6 +50,25 @@ export default {
 		};
 	},
 	computed:{
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
+
+			if (this.calendarMode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			];
+		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
@@ -82,7 +94,7 @@ export default {
 				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
 				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
 			];
-		},
+		}
 	},
 	methods: {
 		eventStyle(event) {
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 114295464..ac02a9d51 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -23,7 +23,6 @@ export default {
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			modes: {
 				day: Vue.markRaw(ModeDay),
@@ -41,14 +40,28 @@ export default {
 				}
 			},
 			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO,
-			backgrounds: [
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO
+		}
+	},
+	computed: {
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
+
+			if (this.calendarMode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
 				{
 					class: 'background-past',
 					end: now,
 					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
 				}
-			]
+			];
 		}
 	},
 	methods:{

From 0be83eedef1644c6bff024cb8e22d398ae99196b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 11:17:47 +0200
Subject: [PATCH 0506/1357] Start Translation ErrorMessage

---
 public/js/plugins/FhcAlert.js |  6 +++++-
 system/phrasesupdate.php      | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index ad3975a73..f90b61ac2 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -217,9 +217,13 @@ export default {
 			alertSystemError(message) {
 				//TODO(Manu) for translation of content of template: restructure in data
 				//and update definitions with  translations
+
 				if (Array.isArray(message))
 					return message.forEach(this.alertSystemError);
-				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
+				helperAppInstance.$refs.alert.add({
+					severity: 'error',
+					summary: Vue.computed(() => app.config.globalProperties.$p.t('alert/systemerror')),
+					detail: message});
 			},
 			confirmDelete() {
 				return new Promise((resolve, reject) => {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 491271a00..ac00fb40d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44475,6 +44475,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'systemerror',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Systemfehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'System Error',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From ae725c08a95ad8757858070b9d324b3dc69a25b5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 23 Jul 2025 11:18:38 +0200
Subject: [PATCH 0507/1357] update(News und Paginator styling): updates how the
 news widget is highlighted and adds paginator css overwrites

---
 public/css/components/dashboard/news.css      |  9 +--
 public/css/theme/default.css                  | 19 ++++++
 .../ProfilComponents/ProfilInformation.js     |  6 +-
 public/js/components/DashboardWidget/News.js  |  2 +-
 system/phrasesupdate.php                      | 60 +++++++++++++++++++
 5 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 0253a1789..8c3a090d7 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -168,19 +168,14 @@
 	opacity: 1 !important;
 }
 
-.fhc-news-items-lg .row:hover{
-	background-color: var(--fhc-primary);
-	color: var(--fhc-light) !important;
-	cursor: pointer;
-}
 
 .fhc-news-items-lg .row .news-truncate span{
 	color: var(--fhc-primary);
 	cursor: pointer;
 }
 
-.fhc-news-items-lg .row:hover .news-truncate span {
-	color: var(--fhc-light);
+.fhc-news-items-lg .row:hover .news-truncate span{
+	text-decoration: underline;
 	cursor: pointer;
 }
 
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 35a0c98f9..ba6493542 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -266,4 +266,23 @@ html.dark .tabulator .tabulator-header .tabulator-col:hover {
 
 .p-paginator{
 	background-color: var(--fhc-background) !important;
+}
+
+.p-paginator .p-paginator-pages .p-paginator-page.p-highlight,
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item.p-highlight {
+	background-color: var(--fhc-primary) !important;
+	border-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
+.p-paginator .p-paginator-pages .p-paginator-page,
+.p-paginator .p-paginator-next,
+.p-paginator .p-paginator-prev,
+.p-paginator .p-paginator-first,
+.p-paginator .p-paginator-last {
+	color: var(--fhc-primary) !important;
+}
+
+.p-link:focus {
+	box-shadow: 0 0 0 0.2rem rgba(var(--fhc-primary), 0.5) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 5dd4a6969..d714c9faa 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -73,7 +73,7 @@ export default {
 	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
-            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button" :title="$p.t('profilUpdate','profilBearbeiten')">
                 <i class="fa fa-edit"></i>
             </div>
             <div class="col">
@@ -90,10 +90,10 @@ export default {
                     <div class="col-auto profil-image" style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
-                        <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
+                        <div v-if="isEditable" role="button" type="button"  :title="FotoSperre?$p.t('profil','fotoSperren'):$p.t('profil','fotoEntsperren')" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="fotoStatus != null && !fotostatus" role="button" @click.prevent="showModal" class="image-upload">
+						<div v-if="fotoStatus != null && !fotoStatus" role="button" type="button" :title="$p.t('profil','fotoHochladen')" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 0f15a165e..247f04b40 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -243,7 +243,7 @@ export default {
         	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex mb-2">
+					<div class="col-md-12 d-flex mb-2 pe-3">
 						<span class="small ">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
 					</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72013baac..7e8dd1316 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27416,6 +27416,66 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoSperren',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild sperren',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'lock profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoEntsperren',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild entsperren',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'unlock profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoHochladen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild hochladen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'upload profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

From 92bd09355b830c5bae4f8ba3a901aa86ed65455a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 23 Jul 2025 11:25:13 +0200
Subject: [PATCH 0508/1357] update(News widget): adds number padding for the
 date and the time stamp in the news widget

---
 public/js/components/DashboardWidget/News.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 247f04b40..d86ccff0b 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -1,6 +1,6 @@
 import AbstractWidget from './Abstract.js';
 import BsModal from '../Bootstrap/Modal.js';
-
+import { numberPadding } from '../../helpers/DateHelpers.js';
 import ApiCms from '../../api/factory/cms.js';
 
 const MAX_LOADED_NEWS = 30;
@@ -89,11 +89,11 @@ export default {
 		},
 		formatDate: function (dateTime) {
 			const dt = new Date(dateTime);
-			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
+			return numberPadding(dt.getDate()) + '.' + numberPadding((dt.getMonth() + 1)) + '.' + dt.getFullYear();				
 		},
 		formatTime: function (dateTime) {
 			const dt = new Date(dateTime);
-			return dt.getHours() + ':' + dt.getMinutes();
+			return numberPadding(dt.getHours()) + ':' + numberPadding(dt.getMinutes());
 		},
 		isString(value){
 			return Object.prototype.toString.call(value) === '[object String]';

From b1fe60aab0a740311f4f1320828e07d470d56511 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 11:57:56 +0200
Subject: [PATCH 0509/1357] =?UTF-8?q?Tab=20Anrechnungen:=20Add=20Phrasen?=
 =?UTF-8?q?=20Status,=20Notiz=20hinzuf=C3=BCgen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Details/Anrechnungen/Anrechnungen.js      |  8 ++++++--
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index c11c0b39a..8f32479a9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -93,9 +93,10 @@ export default {
 							if (countNotizen > 0){
 								buttonNotes.innerHTML = countNotizen + this.$p.t('anrechnung', 'existingNotes');
 							}
-							else
+							else {
 								buttonNotes.innerHTML = '+' + this.$p.t('global', 'notiz');
-
+							}
+							buttonNotes.title = this.$p.t('ui', 'notizHinzufuegen');
 							buttonNotes.addEventListener('click', (event) =>
 								this.addNote(cell.getData().anrechnung_id)
 							);
@@ -138,6 +139,9 @@ export default {
 						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'),
 						});
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ac00fb40d..e30c2e373 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44516,6 +44516,26 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'notizHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 6994591a10d45d8bdf95acc36007254696f7c2f5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 13:39:34 +0200
Subject: [PATCH 0510/1357] better CSS file arrangement

---
 public/css/Cis4/CoreCalendarEvents.css     | 28 ----------------------
 public/css/components/calendar.css         | 17 -------------
 public/css/components/dashboard.css        |  1 +
 public/css/components/dashboard/LvPlan.css | 24 +++++++++++++++++++
 4 files changed, 25 insertions(+), 45 deletions(-)
 create mode 100644 public/css/components/dashboard/LvPlan.css

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 9075d89e9..95e1dfd39 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -164,31 +164,3 @@
 .listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
 	font-weight: 500;
 }
-
-
-/* Widget Styles */
-.dashboard-widget-lvplan .fhc-calendar-base .card {
-	--bs-card-cap-padding-x: 0;
-	--bs-card-cap-padding-y: 0;
-	--bs-card-border-radius: 0;
-	--bs-card-border-width: 0;
-	--dp-input-padding: .375rem .75rem;
-	--dp-input-icon-padding: calc(1rem + 24px);
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header {
-	border-bottom-width: var(--bs-border-width);
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
-.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
-	width: 100%;
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
-	--dp-font-size: .7em;
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
-	--bs-btn-font-size: .7em;
-}
-.dashboard-widget-lvplan .fhc-calendar-base-label-day {
-	cursor: initial;
-}
-
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index d2df19c0e..3b531cfb7 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -4,23 +4,6 @@
 
 /* Themable Variables */
 :root {
-/*	--fhc-calendar-pane-height: calc(100vh - 220px);
-	
-	--fhc-calendar-primary: var(--fhc-primary, #006095);
-	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-	--fhc-calendar-text: var(--fhc-text, #212529);
-	--fhc-calendar-text-light: var(--fhc-text, #212529);
-	--fhc-calendar-background: var(--fhc-background, #fff);
-	--fhc-calendar-dark: var(--fhc-dark, #212529);
-	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);*/
-	
 	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
 	--fhc-calendar-bg: var(--fhc-background, #fff);
 	--fhc-calendar-border: var(--fhc-border, #dee2e6);
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index ae2bb252f..8dc19128d 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,5 +1,6 @@
 @import './calendar.css';
 @import './dashboard/news.css';
+@import './dashboard/LvPlan.css';
 
 :root{
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
diff --git a/public/css/components/dashboard/LvPlan.css b/public/css/components/dashboard/LvPlan.css
new file mode 100644
index 000000000..014abebae
--- /dev/null
+++ b/public/css/components/dashboard/LvPlan.css
@@ -0,0 +1,24 @@
+.dashboard-widget-lvplan .fhc-calendar-base .card {
+	--bs-card-cap-padding-x: 0;
+	--bs-card-cap-padding-y: 0;
+	--bs-card-border-radius: 0;
+	--bs-card-border-width: 0;
+	--dp-input-padding: .375rem .75rem;
+	--dp-input-icon-padding: calc(1rem + 24px);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header {
+	border-bottom-width: var(--bs-border-width);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
+	width: 100%;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
+	--dp-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
+	--bs-btn-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base-label-day {
+	cursor: initial;
+}

From 715b48c39f7240e1fd67d1876391186cd321e0f4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 13:41:24 +0200
Subject: [PATCH 0511/1357] =?UTF-8?q?Tab=20Nachrichten:=20Relationmessage?=
 =?UTF-8?q?=20Id,=20Letzte=20=C3=84nderung,=20Status=20in=20capital=20lett?=
 =?UTF-8?q?ers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/components/Messages/Details/TableMessages.js | 4 ++--
 system/phrasesupdate.php                               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 65c090327..d2dbdb7ce 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -63,9 +63,9 @@ export default {
 					{title: "recipient", field: "recipient"},
 					{title: "senderId", field: "sender_id"},
 					{title: "recipientId", field: "recipient_id"},
-					{title: "relationmessage_id", field: "relationmessage_id"},
+					{title: "Relationmessage ID", field: "relationmessage_id"},
 					{
-						title: "status",
+						title: "Status",
 						field: "status",
 						formatterParams: [
 							"unread",
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e30c2e373..36f5f7dcc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24979,7 +24979,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'letzte Änderung',
+				'text' => 'Letzte Änderung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44516,6 +44516,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
+	// FHC-4 Finetuning START
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -44536,6 +44537,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	// FHC-4 Finetuning END
 );
 
 

From 96cb546b68477da2ef7d4ab2ab72ebb600db95aa Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 23 Jul 2025 14:14:03 +0200
Subject: [PATCH 0512/1357] permission check bug fixed

---
 application/controllers/api/frontend/v1/lv/Lehreinheit.php | 4 +++-
 application/controllers/api/frontend/v1/lv/Lektor.php      | 4 +++-
 application/models/ressource/Stundenplandev_model.php      | 5 +++--
 public/js/api/lehrveranstaltung/gruppe.js                  | 2 +-
 public/js/components/LVVerwaltung/Lektor/Daten.js          | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index d58489453..fd1c23667 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -414,7 +414,9 @@ class Lehreinheit extends FHCAPI_Controller
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		$oe_array = $result;
+		$oe_array = [];
+		if (hasData($result))
+			$oe_array = getData($result);
 
 		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
 			!$this->_ci->permissionlib->isBerechtigtMultipleOe('assistenz', $oe_array, 'suid') &&
diff --git a/application/controllers/api/frontend/v1/lv/Lektor.php b/application/controllers/api/frontend/v1/lv/Lektor.php
index 332bc47b6..4a244c1a1 100644
--- a/application/controllers/api/frontend/v1/lv/Lektor.php
+++ b/application/controllers/api/frontend/v1/lv/Lektor.php
@@ -284,7 +284,9 @@ class Lektor extends FHCAPI_Controller
 		if (isError($result))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		$oe_array = $result;
+		$oe_array = [];
+		if (hasData($result))
+			$oe_array = getData($result);
 
 		return $this->checkPermissionGenerel($permissions, $oe_array);
 	}
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 82b3779ab..e718ba073 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -223,13 +223,14 @@ class Stundenplandev_model extends DB_Model
 
 	public function deleteLektorPlanning($lehreinheit_id, $mitarbeiter_uid)
 	{
-		$this->addDistinct('mitarbeiter_uid');
+		//TODO (david) prüfen ob der check notwendig ist
+		/*$this->addDistinct('mitarbeiter_uid');
 		$this->addSelect('mitarbeiter_uid');
 		$stundenplan_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
 		$stundenplan_array = hasData($stundenplan_result) ? (getData($stundenplan_result)) : array();
 
 		if (sizeof($stundenplan_array) <= 1)
-			return error('Diese/r LektorIn kann nicht aus dem LVPlan entfernt werden da dies der/die letzte verplante LektorIn ist');
+			return error('Diese/r LektorIn kann nicht aus dem LVPlan entfernt werden da dies der/die letzte verplante LektorIn ist');*/
 
 		$this->addJoin('lehre.tbl_stundenplan_betriebsmittel', 'stundenplandev_id');
 		$betriebsmittel_result = $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'tbl_stundenplandev.mitarbeiter_uid' => $mitarbeiter_uid));
diff --git a/public/js/api/lehrveranstaltung/gruppe.js b/public/js/api/lehrveranstaltung/gruppe.js
index 12c55509c..e22fdd847 100644
--- a/public/js/api/lehrveranstaltung/gruppe.js
+++ b/public/js/api/lehrveranstaltung/gruppe.js
@@ -30,7 +30,7 @@ export default {
 	{
 		return {
 			method: 'post',
-			url: '/api/frontend/v1/lv/gruppe/deleteLVPlan/',
+			url: '/api/frontend/v1/lv/gruppe/deleteFromLVPlan/',
 			params: deleteData
 		};
 	},
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
index bb40f56fe..0f6b9e0f7 100644
--- a/public/js/components/LVVerwaltung/Lektor/Daten.js
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -253,6 +253,7 @@ export default{
 					<form-input
 						:label="$p.t('lehre', 'gesamtkosten')"
 						type="number"
+						name="gesamtkosten"
 						container-class="col-3"
 						readonly
 						v-model="berechneteGesamtkosten" 

From ccb4a72ae48209cce5723f9adcbb064a7d86738f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 09:32:18 +0200
Subject: [PATCH 0513/1357] CSS changes

---
 public/css/components/calendar.css         | 2 +-
 public/css/components/dashboard/LvPlan.css | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 3b531cfb7..f46554007 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -34,5 +34,5 @@
 	--fhc-calendar-radius-day-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-month-event: 0;
-	--fhc-calendar-radius-list-event: 0;
+	--fhc-calendar-radius-list-event: var(--fhc-calendar-radius-event);
 }
diff --git a/public/css/components/dashboard/LvPlan.css b/public/css/components/dashboard/LvPlan.css
index 014abebae..6e0e4a654 100644
--- a/public/css/components/dashboard/LvPlan.css
+++ b/public/css/components/dashboard/LvPlan.css
@@ -22,3 +22,6 @@
 .dashboard-widget-lvplan .fhc-calendar-base-label-day {
 	cursor: initial;
 }
+.dashboard-widget-lvplan .fhc-calendar-mode-list-view {
+	padding: 0 1rem;
+}
\ No newline at end of file

From 3a8984a8c3788fc241743455b8f83dd5ba998dc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 09:39:47 +0200
Subject: [PATCH 0514/1357] CSS improvements for events

---
 public/css/components/calendar/events.css | 49 ++++++++++++-----------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index b29883d54..f996b7339 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,62 +1,65 @@
 .event {
 	cursor: pointer;
 }
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
+.fhc-calendar-mode-week .all-day-events .event .weekPageContainer {
 	padding: .25rem;
 }
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .event,
+.fhc-calendar-mode-week .event {
 	margin: 0 .5rem;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .all-day-events .event,
+.fhc-calendar-mode-week .all-day-events .event {
 	margin: .25rem;
 }
 /* Border */
-.fhc-calendar-mode-day .grid-main .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .grid-main .fhc-calendar-base-grid-line-event > * {
+.fhc-calendar-mode-day .grid-main .event > *,
+.fhc-calendar-mode-week .grid-main .event > * {
 	border: solid 1px var(--fhc-calendar-border-event);
 }
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .event {
 	--event-radius: var(--fhc-calendar-radius-day-event, 0);
 }
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-week .event {
 	--event-radius: var(--fhc-calendar-radius-week-event, 0);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-month .event {
 	--event-radius: var(--fhc-calendar-radius-month-event, 0);
 }
-.fhc-calendar-mode-list .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-list .event {
 	--event-radius: var(--fhc-calendar-radius-list-event, 0);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-begin > *,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-begin > * {
+.fhc-calendar-mode-day .all-day-events .event > *,
+.fhc-calendar-mode-week .all-day-events .event > *,
+.fhc-calendar-mode-day .event.event-begin > *,
+.fhc-calendar-mode-week .event.event-begin > * {
 	border-top-left-radius: var(--event-radius);
 	border-top-right-radius: var(--event-radius);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-end > *,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-end > * {
+.fhc-calendar-mode-day .all-day-events .event > *,
+.fhc-calendar-mode-week .all-day-events .event > *,
+.fhc-calendar-mode-day .event.event-end > *,
+.fhc-calendar-mode-week .event.event-end > * {
 	border-bottom-left-radius: var(--event-radius);
 	border-bottom-right-radius: var(--event-radius);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-begin > * {
+.fhc-calendar-mode-month .event.event-begin > * {
 	border-top-left-radius: var(--event-radius);
 	border-bottom-left-radius: var(--event-radius);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-end > * {
+.fhc-calendar-mode-month .event.event-end > * {
 	border-top-right-radius: var(--event-radius);
 	border-bottom-right-radius: var(--event-radius);
 }
+.fhc-calendar-mode-list .event > * {
+	border-radius: var(--event-radius);
+}
 /* Colors */
-.fhc-calendar-base-grid-line-event {
+.fhc-calendar-base .event {
 	--event-default-bg: var(--fhc-calendar-bg-event, #ccc);
 }
-.fhc-calendar-base-grid-line-event .event-type-reservierung {
+.fhc-calendar-base .event .event-type-reservierung {
 	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
 }
 .fhc-calendar-base .event > * {

From d024d57ef552d356a02b2cab3579a9b36c374a5a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 24 Jul 2025 10:21:50 +0200
Subject: [PATCH 0515/1357] fix carousel switching to wrong index, news widget
 styling

---
 public/css/components/dashboard/news.css     |  1 +
 public/js/components/DashboardWidget/News.js | 26 +++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 8c3a090d7..f1adb2b65 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -177,6 +177,7 @@
 .fhc-news-items-lg .row:hover .news-truncate span{
 	text-decoration: underline;
 	cursor: pointer;
+	font-weight: bold;
 }
 
 
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index d86ccff0b..f0b6ec75a 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -33,11 +33,8 @@ export default {
 				quantity = this.height === 1 ? 4 : MAX_LOADED_NEWS;
 			}
 
-			let slicedNews= this.allNewsList.slice(0, quantity);
-			slicedNews.sort((a,b)=>{
-				return new Date(b.insertamum) - new Date(a.insertamum);
-			});
-			
+			let slicedNews = this.allNewsList.slice(0, quantity);
+
 			return slicedNews;
 		},
 		carouselItems() {
@@ -190,6 +187,9 @@ export default {
 			.then(res => res.data)
 			.then((news) => {
 				this.allNewsList = Array.from(Object.values(news));
+				this.allNewsList.sort((a, b) => {
+					return new Date(b.datum) - new Date(a.datum);
+				});
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
 
@@ -230,32 +230,30 @@ export default {
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
 					<div class="col-12 d-flex">
-						<span class="small">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+						<span class="small">{{ formatDate(news.datum) }} </span>
 					</div>
 					<div class="col">
-						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a>
+						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.datum) }}</a>
 					</div>
 				</div>
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
+		<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto; overscroll-behavior: none;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex mb-2 pe-3">
-						<span class="small ">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
+					<div class="col-md-12 d-flex pe-3">
+						<span class="small ">{{ formatDate(news.datum) }} </span>
 					</div>
 					<div class="col-md-12 news-truncate">
-						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
+						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.datum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
 			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
-					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
+					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel ms-2" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
 							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item fhc-news-card-item" style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>

From d5f2f3d787e4b18b25e7d385701524ca047f520a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 10:45:53 +0200
Subject: [PATCH 0516/1357] add luxon to composer.lock

---
 composer.lock | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 70044eb58..f2ce3923c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1b8a408a43c62cb966fa89af338564a7",
+    "content-hash": "1de37a74ba51a66057eb2712b21340c8",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1296,6 +1296,15 @@
             },
             "time": "2022-09-29T08:45:17+00:00"
         },
+        {
+            "name": "moment/luxonjs",
+            "version": "3.6.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/luxon@3.6.1/build/global/luxon.min.js"
+            },
+            "type": "library"
+        },
         {
             "name": "moment/momentjs",
             "version": "2.24.0",

From 1d63b8de4417f86d3d742c6e614300861a52b7a6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 24 Jul 2025 11:18:58 +0200
Subject: [PATCH 0517/1357] schluesselverwaltung & kontaktdatenverwaltung gui
 hinzugefuegt betriebsmittel einschraenkung ueber prop moeglich (nur anzeige)

---
 .../v1/betriebsmittel/BetriebsmittelP.php     |  12 +-
 .../ressource/Betriebsmittelperson_model.php  |  15 ++-
 .../js/api/factory/betriebsmittel/person.js   |  14 ++-
 .../Betriebsmittel/Betriebsmittel.js          |  16 ++-
 system/filtersupdate.php                      | 103 ++++++++++++++++++
 5 files changed, 149 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8e9d931f2..b8979d99a 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -60,7 +60,11 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function getAllBetriebsmittel($type_id, $id)
 	{
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
+		$betriebsmitteltypes = null;
+		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
+			$betriebsmitteltypes = $this->input->get('betriebsmitteltypes');
+
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id, $betriebsmitteltypes);
 
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -366,6 +370,12 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
 
 		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+
+		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
+		{
+			$this->BetriebsmitteltypModel->db->where_in('betriebsmitteltyp', $this->input->get('betriebsmitteltypes'));
+		}
+
 		$result = $this->BetriebsmitteltypModel->load(); // load All
 
 		if (isError($result)) {
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 6da9a384d..219af51b8 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -97,7 +97,7 @@ class Betriebsmittelperson_model extends DB_Model
 		return $this->loadWhere($condition);
 	}
 
-	public function getBetriebsmittelData($id, $type_id)
+	public function getBetriebsmittelData($id, $type_id, $betriesmitteltypes = null)
 	{
 		switch ($type_id) {
 			case 'person_id':
@@ -113,6 +113,15 @@ class Betriebsmittelperson_model extends DB_Model
 				return error("ID nicht gültig");
 		}
 
+		$cond .= " = ? ";
+		$params[] = $id;
+
+		if ($betriesmitteltypes && !isEmptyArray($betriesmitteltypes))
+		{
+			$cond .= " AND bm.betriebsmitteltyp IN ?";
+			$params[] = $betriesmitteltypes;
+		}
+
 		$query = "
 			SELECT 
 			bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung,
@@ -126,9 +135,9 @@ class Betriebsmittelperson_model extends DB_Model
 			JOIN 
 				wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
 			WHERE 
-				" . $cond . " = ? ";
+				" . $cond;
 
-		return $this->execQuery($query, array($id));
+		return $this->execQuery($query, $params);
 	}
 
 	/**
diff --git a/public/js/api/factory/betriebsmittel/person.js b/public/js/api/factory/betriebsmittel/person.js
index 912a5df31..504e755b6 100644
--- a/public/js/api/factory/betriebsmittel/person.js
+++ b/public/js/api/factory/betriebsmittel/person.js
@@ -16,10 +16,13 @@
  */
 
 export default {
-	getAllBetriebsmittel(type, id) {
+	getAllBetriebsmittel(type, id, betriebsmitteltypes) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + type + '/' + id
+			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + type + '/' + id,
+			params: {
+				betriebsmitteltypes
+			}
 		};
 	},
 	addNewBetriebsmittel(person_id, params) {
@@ -48,10 +51,13 @@ export default {
 			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/deleteBetriebsmittel/' +	betriebsmittelperson_id
 		};
 	},
-	getTypenBetriebsmittel() {
+	getTypenBetriebsmittel(betriebsmitteltypes) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/'
+			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/',
+			params: {
+				betriebsmitteltypes
+			}
 		};
 	},
 	loadInventarliste(query) {
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 39681ffb4..d1188b371 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -29,14 +29,24 @@ export default {
 		uid: {
 			type: [Number, String],
 			required: true
-		}
+		},
+		/** List of types to allow for creation */
+		betriebsmittelTypes: {
+			type: Array,
+			default: null
+		},
+		/**
+		 * If true: only show the types specified in 'betriebsmittelTypes'.
+		 * If false: show all available types.
+		 */
+		filterByProvidedTypes: Boolean
 	},
 	data() {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-					this.endpoint.getAllBetriebsmittel(this.typeId, this.id)
+					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
@@ -296,7 +306,7 @@ export default {
 	},
 	created() {
 		return this.$api
-			.call(this.endpoint.getTypenBetriebsmittel())
+			.call(this.endpoint.getTypenBetriebsmittel(this.betriebsmittelTypes))
 			.then(result => {
 				this.listBetriebsmitteltyp = result.data;
 			})
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 51dd86314..9e3c62a33 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1456,6 +1456,109 @@ $filters = array(
 			',
 			'oe_kurzbz' => null,
 		),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'schluesselverwaltung',
+		'filter_kurzbz' => 'ma4schluesselverwaltung',
+		'description' => '{MA Schluesselverwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "MA Schlüsselverwaltung",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "EMail"}, 
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Wochenstunden"}, 
+					{"name": "WS_von"}, 
+					{"name": "WS_bis"}, 
+					{"name": "Standardkostenstelle"},
+					{"name": "DV_status"}
+				],
+				"filters": [
+					{
+						"name": "DV_status",
+						"option": "",
+						"operation": "nequal",
+						"condition": "beendet"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'schluesselverwaltung',
+		'filter_kurzbz' => 'ma4schluesselverwaltung_beendet',
+		'description' => '{MA Schluesselverwaltung (DV beendet)}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "MA Schlüsselverwaltung (DV beendet)",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "EMail"}, 
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Wochenstunden"}, 
+					{"name": "WS_von"}, 
+					{"name": "WS_bis"}, 
+					{"name": "Standardkostenstelle"},
+					{"name": "DV_status"}
+				],
+				"filters": [
+					{
+						"name": "DV_status",
+						"option": "",
+						"operation": "equal",
+						"condition": "beendet"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'kontaktdatenverwaltung',
+		'filter_kurzbz' => 'ma4kontaktdaten',
+		'description' => '{MA Kontaktdatenverwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "MA Kontaktdatenverwaltung",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Disziplinaere_Zuordnung"},
+					{"name": "DV_status"}
+				],
+				"filters": []
+			}',
+		'oe_kurzbz' => null,
+	),
+
 );
 
 // Loop through the filters array

From 611a6204cd29580470feab5627dd20f2220cad65 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 14:15:20 +0200
Subject: [PATCH 0518/1357] compare AllDayEvents to whole day

---
 public/js/components/Calendar/Base/Grid.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 37b31e784..ad0d9ec51 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -218,9 +218,15 @@ export default {
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
 				for (var i = 0; i < this.axisMain.length; i++) {
-					if (start < this.axisMainBorders[i * 2 + 1] && end > this.axisMainBorders[i * 2]) {
-						const startsHere = start >= this.axisMainBorders[i * 2];
-						const endsHere = end <= this.axisMainBorders[i * 2 + 1];
+					let laneStart = this.axisMainBorders[i * 2];
+					let laneEnd = this.axisMainBorders[i * 2 + 1];
+					if (event.orig?.allDayEvent) {
+						laneStart = laneStart.startOf('day');
+						laneEnd = laneEnd.endOf('day');
+					}
+					if (start < laneEnd && end > laneStart) {
+						const startsHere = start >= laneStart;
+						const endsHere = end <= laneEnd;
 						result[i].push({
 							...event,
 							startsHere,

From 53e395aca4fa74e0b49d41d7bf9471f0b077765e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Jul 2025 14:40:48 +0200
Subject: [PATCH 0519/1357] =?UTF-8?q?Tab=20Notizen,=20Messages:=20use=20HT?=
 =?UTF-8?q?ML-Entities=20Tab=20Abschlusspr=C3=BCfung,=20Prestudent,=20Prue?=
 =?UTF-8?q?fung,=20Dokument:=20Phrasen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Messages/Details/TableMessages.js         |  2 +-
 public/js/components/Notiz/Notiz.js           |  1 +
 .../Abschlusspruefung/Abschlusspruefung.js    |  2 +-
 .../Details/Dokumente/List/Accepted.js        |  2 +-
 .../Details/Dokumente/List/Unaccepted.js      |  5 +-
 .../Studentenverwaltung/Details/Prestudent.js |  4 +-
 .../Details/Prestudent/History.js             |  6 ++-
 .../Details/Pruefung/Pruefunglist.js          |  5 +-
 system/phrasesupdate.php                      | 50 +++++++++++++++++--
 9 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index d2dbdb7ce..a21073855 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -41,7 +41,7 @@ export default {
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				columns: [
 					{title: "subject", field: "subject"},
-					{title: "body", field: "body", visible: false},
+					{title: "body", field: "body", formatter: "html", visible: false},
 					{title: "message_id", field: "message_id", visible: false},
 					{
 						title: "Datum",
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 783987363..8b37cd6e3 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -81,6 +81,7 @@ export default {
 						title: "Text",
 						field: "text_stripped",
 						width: 250,
+						formatter: "html",
 						clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5184de62d..26bea210d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -225,7 +225,7 @@ export default {
 							title: this.$p.t('global', 'typ')
 						});
 						cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'abschlusspruefung_id')
+							title: this.$p.t('abschlusspruefung', 'abschlusspruefung_id')
 						});
 						/*
 						cm.getColumnByField('actions').component.updateDefinition({
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 bca7e00fa..e07d1a45d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -66,7 +66,7 @@ export default {
 							tickElement: '<i class="fa fa-check text-secondary"></i>',
 							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
 						}},
-					{title: "infotext", field: "infotext"},
+					{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},
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 e1110ddf3..93b3a1b70 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -77,7 +77,7 @@ export default {
 						},
 						hozAlign: "center"
 						},
-					{title: "infotext", field: "infotext"},
+					{title: "Infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "titel_intern", field: "titel_intern"},
 					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
@@ -194,6 +194,9 @@ export default {
 						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')
 						});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a8c0f985b..ef7eb141a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -197,7 +197,7 @@ export default {
 					<form-input
 					v-if="!config.hiddenFields.includes('prestudent_id')"
 						container-class="col-3 stv-details-prestudent-prestudent_id"
-						label="Prestudent_id"
+						:label="$p.t('ui', 'prestudent_id')"
 						type="text"
 						v-model="data.prestudent_id"
 						name="prestudent_id"
@@ -207,7 +207,7 @@ export default {
 					<form-input
 						v-if="!config.hiddenFields.includes('person_id')"
 						container-class="col-3 stv-details-prestudent-person_id"
-						label="Person_id"
+						:label="$p.t('person', 'person_id')"
 						type="text"
 						v-model="data.person_id"
 						name="person_id"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 0bcb8be72..44b318f5b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -25,7 +25,7 @@ export default{
 					{title:"Studienplan", field:"bezeichnung"},
 					{title:"UID", field:"student_uid"},
 					{title:"Status", field:"status"},
-					{title:"PrestudentId", field:"prestudent_id", visible:false}
+					{title:"Prestudent ID", field:"prestudent_id", visible:false}
 				],
 				rowFormatter: row => {
 					const rowData = row.getData();
@@ -58,6 +58,10 @@ export default{
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('lehre', 'studienplan')
 						});
+
+						cm.getColumnByField('prestudent_id').component.updateDefinition({
+							title: this.$p.t('ui', 'prestudent_id')
+						});
 					}
 				}
 			]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 6f0cb2e43..799578a70 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -92,7 +92,8 @@ export default{
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
-				persistenceID:'stv-details-pruefung-pruefung-list'
+				index: 'pruefung_id',
+				persistenceID: 'stv-details-pruefung-list'
 			},
 			tabulatorEvents: [
 				{
@@ -123,7 +124,7 @@ export default{
 							title: this.$p.t('ui', 'pruefung_id')
 						});
 						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'lehreinheit_id')
+							title: this.$p.t('global', 'lehreinheit_id')
 						});
 						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
 							title: this.$p.t('ui', 'mitarbeiter_uid')
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 36f5f7dcc..355ed7186 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40096,7 +40096,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Abschlusspruefung ID',
+				'text' => 'Abschlussprüfung ID',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -40660,13 +40660,13 @@ array(
 	'phrases' => array(
 		array(
 			'sprache' => 'German',
-			'text' => 'Firma Id',
+			'text' => 'Firma ID',
 			'description' => '',
 			'insertvon' => 'system'
 		),
 		array(
 			'sprache' => 'English',
-			'text' => 'Company Id',
+			'text' => 'Company ID',
 			'description' => '',
 			'insertvon' => 'system'
 		)
@@ -43209,13 +43209,13 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Dms ID',
+				'text' => 'DMS ID',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Dms ID',
+				'text' => 'DMS ID',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44537,6 +44537,46 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'mitarbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'pruefung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfung ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Examination ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From d101b53d3de2c80cfa54f89bcb3fff67d808f294 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 09:27:56 +0200
Subject: [PATCH 0520/1357] Calendar: ResizeObserver for compact day mode

---
 .../js/components/Calendar/Mode/Day/View.js   | 15 +++-
 public/js/components/Cis/LvPlan/LvPlan.js     |  3 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  3 +-
 public/js/composables/Responsive.js           | 85 +++++++++++++++++++
 4 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 public/js/composables/Responsive.js

diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 09738f1d0..cd953f33a 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -3,6 +3,8 @@ import LabelDay from '../../Base/Label/Day.js';
 import LabelDow from '../../Base/Label/Dow.js';
 import LabelTime from '../../Base/Label/Time.js';
 
+import { useResizeObserver } from '../../../../composables/Responsive.js';
+
 export default {
 	name: "DayView",
 	components: {
@@ -22,8 +24,7 @@ export default {
 			required: true
 		},
 		emptyMessage: String,
-		emptyMessageDetails: String,
-		compact: Boolean
+		emptyMessageDetails: String
 	},
 	emits: [
 		"requestModalOpen",
@@ -104,11 +105,21 @@ export default {
 			}
 		}
 	},
+	setup() {
+		const container = Vue.ref(null); // use useTemplateRef when updating to Vue 3.5
+		const { compact } = useResizeObserver(container, 750);
+
+		return {
+			container, // must be exposed or it won't be set in Vue < 3.5
+			compact
+		};
+	},
 	mounted() {
 		this.gridMainRef = this.$refs.grid.$refs.main;
 	},
 	template: /* html */`
 	<div
+		ref="container"
 		class="fhc-calendar-mode-day-view d-flex h-100"
 		@cal-click-default.capture="handleClickDefaults"
 	>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index cdb2c38c1..4fbb7c871 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -34,8 +34,7 @@ export default {
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					compact: false
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
 				},
 				week: {
 					collapseEmptyDays: false
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index ac02a9d51..0f4fa0603 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -32,8 +32,7 @@ export default {
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					compact: false
+					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung'))
 				},
 				week: {
 					collapseEmptyDays: false
diff --git a/public/js/composables/Responsive.js b/public/js/composables/Responsive.js
new file mode 100644
index 000000000..f1761d870
--- /dev/null
+++ b/public/js/composables/Responsive.js
@@ -0,0 +1,85 @@
+/**
+ * size returns the key of smallest threshold array (integer converts to
+ * { compact: threshold }) entry that is bigger than the current width of
+ * the element or 'full' if none is found.
+ * compact is true if the smallest threshold array entry is bigger than the
+ * current width or false otherwise.
+ *
+ * @param DOMElement|VueTemplateRef		element
+ * @param object|array|integer			threshold
+ * @return object						{ compact:Boolean, size:String }
+ */
+export function useResizeObserver(element, threshold) {
+	/* Result Vars */
+	const compact = Vue.ref(false);
+	const size = Vue.ref(false);
+
+	/* Helper Vars */
+	const mounted = Vue.ref(false);
+	const elementRef = Vue.computed(() => {
+		if (!Vue.isRef(element))
+			return element;
+		
+		if (!element.value)
+			return element.value;
+		
+		if (element.value.$el) // Maybe there is a better test
+			return element.value.$el;
+
+		return element.value;
+	});
+	const compareArray = Vue.computed(() => {
+		const input = Vue.isRef(threshold) ? threshold.value : threshold;
+		if (Number.isInteger(input))
+			return [['compact', input]];
+		if (Array.isArray(input))
+			return input.map((value, key) => [key, value]).sort((a, b) => a[1]-b[1]);
+		return Object.entries(input).sort((a, b) => a[1]-b[1]);
+	});
+
+	/* Helper Functions */
+	function updateResultVars() {
+		const compare = threshold.value || threshold;
+		if (elementRef.value.offsetWidth === undefined)
+			return;
+
+		const found = compareArray.value.find(compare => compare[1] > elementRef.value.offsetWidth);
+
+		size.value = found ? found[0] : 'full';
+		compact.value = (size.value == compareArray.value[0][0]);
+	}
+
+	/* Observer */
+	const observer = new ResizeObserver(() => {
+		if (elementRef.value) {
+			updateResultVars();
+		}
+	});
+	/* Observer Helper Functions */
+	function addObserver() {
+		if (!elementRef.value)
+			return;
+
+		updateResultVars();
+		observer.observe(elementRef.value);
+		mounted.value = true;
+	}
+	function removeObserver() {
+		if (mounted.value) {
+			observer.disconnect()
+		}
+	}
+
+	/* Main Logic */
+	Vue.onMounted(addObserver);
+	Vue.onUnmounted(removeObserver);
+	
+	Vue.watchEffect(() => {
+		if (elementRef.value) {
+			removeObserver();
+			addObserver();
+		}
+	});
+
+	return { compact, size };
+}
\ No newline at end of file

From 76248175f7709165835bf23830a5f0be0f3a1335 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 09:33:27 +0200
Subject: [PATCH 0521/1357] News padding not hardcoded in Dashboard Item
 Container but in the News CSS

---
 public/css/components/dashboard/news.css | 2 +-
 public/js/components/Dashboard/Item.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index f1adb2b65..6b42f6160 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -97,7 +97,7 @@
 }
 
 .widgets-news{
-	padding: 0 .5rem;
+	padding: .5rem;
 	overflow-y: auto;
 }
 
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 8e1fb2c62..eccc8242e 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -189,7 +189,7 @@ export default {
 				</div>
 			</Transition>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden" style="padding: .5em 0;">
+		<div v-if="ready" class="card-body overflow-hidden p-0">
 			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>

From 58a85432caf78ef5125a473422d38e72b1090ded Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Jul 2025 10:50:48 +0200
Subject: [PATCH 0522/1357] enable text-input in datepicker

---
 public/js/components/Betriebsmittel/Betriebsmittel.js       | 2 ++
 public/js/components/Funktionen/Funktionen.js               | 2 ++
 .../Details/Abschlusspruefung/Abschlusspruefung.js          | 2 ++
 .../Details/Aufnahmetermine/Aufnahmetermine.js              | 1 +
 .../components/Stv/Studentenverwaltung/Details/Details.js   | 1 +
 .../Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js | 1 +
 .../js/components/Stv/Studentenverwaltung/Details/Konto.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Konto/Edit.js           | 1 +
 .../components/Stv/Studentenverwaltung/Details/Konto/New.js | 6 ++++--
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js    | 2 ++
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 2 ++
 .../Studentenverwaltung/Details/Pruefung/Pruefunglist.js    | 5 +++--
 .../Stv/Studentenverwaltung/Details/Status/Modal.js         | 3 +++
 13 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 95678d8dd..d197c341e 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -434,6 +434,7 @@ export default {
 						v-model="formData.ausgegebenam"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
@@ -449,6 +450,7 @@ export default {
 						v-model="formData.retouram"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 4fc7706de..0b5a71155 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -555,6 +555,7 @@ export default {
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
@@ -569,6 +570,7 @@ export default {
 							:label="$p.t('global/bis')"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 26bea210d..a9cae9bc5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -717,6 +717,7 @@ export default {
 						v-model="formData.datum"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="datum"
 						:teleport="true"
@@ -740,6 +741,7 @@ export default {
 						v-model="formData.sponsion"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="sponsion"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 9ffddcf5a..fe667aa74 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -429,6 +429,7 @@ export default {
 							v-model="formData.anmeldedatum"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							name="anmeldedatum"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 624b3d035..eacabccc0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -281,6 +281,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						teleport
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 29c98020e..c96dcfd78 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -107,6 +107,7 @@ export default {
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index eb32e7102..a5532addc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -260,6 +260,7 @@ export default {
 						v-model="counterdate"
 						input-group
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						auto-apply
 						@cleared="counterdate = new Date()"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index ce926c007..200a15a0d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -82,6 +82,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					auto-apply
 					>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 2afb8158d..313d34c67 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -38,7 +38,7 @@ export default {
 	data() {
 		return {
 			loading: false,
-			data: {}
+			data: {},
 		};
 	},
 	computed: {
@@ -47,7 +47,7 @@ export default {
 		},
 		activeBuchungstypen() {
 			return this.lists.buchungstypen.filter(e => e.aktiv);
-		}
+		},
 	},
 	methods: {
 		save() {
@@ -144,10 +144,12 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>
+
 				<form-input
 					v-model="data.buchungstext"
 					name="buchungstext"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 44f6b72fb..7ea34497b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -464,6 +464,7 @@ export default {
 						v-model="formData.von"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="von"
 						:teleport="true"
@@ -497,6 +498,7 @@ export default {
 						v-model="formData.bis"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="bis"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index ef7eb141a..da5aea29e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -245,6 +245,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
@@ -292,6 +293,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 799578a70..5a427fcd4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -350,7 +350,7 @@ export default{
 			else {
 				this.$refs.table.tabulator.clearFilter("studiensemester_kurzbz");
 			}
-		},
+		}
 	},
 	watch: {
 		//adaption to go directly through different semesters
@@ -433,7 +433,7 @@ export default{
 				<p v-else class="fw-bold mt-3">{{ $p.t('exam', 'edit_pruefung') }}</p>
 			</template>
 	
-			<form-form class="row pt-3" ref="examData">
+			<form-form class="row pt-3" ref="examData" @submit.prevent>
 				<legend>Details</legend>
 				
 				<!--DropDown Lehrveranstaltung-->
@@ -537,6 +537,7 @@ export default{
 					:label="$p.t('global/datum')"
 					auto-apply
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					preview-format="dd.MM.yyyy"
 					:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 1a3fb40d2..c0ec2cfad 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -294,6 +294,7 @@ export default{
 				:label="$p.t('global/datum')"
 				auto-apply
 				:enable-time-picker="false"
+				text-input
 				format="dd.MM.yyyy"
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
@@ -308,6 +309,7 @@ export default{
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
 				:enable-time-picker="false"
+				text-input
 				format="dd.MM.yyyy"
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
@@ -323,6 +325,7 @@ export default{
 				auto-apply
 				:enable-time-picker="false"
 				format="dd.MM.yyyy"
+				text-input
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"

From d59b623cb4163bb65e0d5b9b8944807ef042192c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 13:17:41 +0200
Subject: [PATCH 0523/1357] Bugfix: Return no events instead of error if the
 student is/was not enrolled in a timeframe

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

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 0107ceef1..50835873e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -109,7 +109,7 @@ class StundenplanLib{
 			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
 			if(!$stundenplan_query)
 			{
-				return error([]);
+				return success([]);
 			}
 			
 			

From 1b8ab88820d3b71d6cc7f1952ccd7c4a878cf8bd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 13:31:56 +0200
Subject: [PATCH 0524/1357] Fix: Browser back

---
 public/js/components/Calendar/Base.js         | 39 +++++++++++++------
 public/js/components/Cis/LvPlan/LvPlan.js     | 18 ++++-----
 .../js/components/Cis/Mylv/RoomInformation.js | 20 +++++-----
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 520948ecb..94ad3ef05 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -152,28 +152,33 @@ export default {
 				return res;
 			});
 		},
+		sDate() {
+			if (this.date instanceof luxon.DateTime)
+				return this.date;
+			return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone);
+		},
 		cDate: {
 			get() {
-				if (this.internalDate) {
-					return this.internalDate.setLocale(this.locale);
-				}
-				return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone).setLocale(this.locale);
+				const date = this.internalDate ? this.internalDate : this.sDate;
+				return date.setLocale(this.locale);
 			},
 			set(value) {
 				this.internalDate = value;
 				this.$emit('update:date', value);
 			}
 		},
+		sMode() {
+			// choose default mode
+			let mode = this.mode;
+			if (mode)
+				mode = mode.toLowerCase();
+			if (!mode || !this.modes[mode])
+				mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
+			return mode || '';
+		},
 		cMode: {
 			get() {
-				if (!this.internalView) {
-					// choose default mode
-					let mode = this.mode;
-					if (!mode || !this.modes[mode])
-						mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
-					return mode || '';
-				}
-				return this.internalView;
+				return this.internalView ? this.internalView : this.sMode;
 			},
 			set(value) {
 				this.internalView = value;
@@ -181,6 +186,16 @@ export default {
 			}
 		}
 	},
+	watch: {
+		sDate(n, o) {
+			if (this.sDate.isValid && !this.sDate.hasSame(this.internalDate, 'day'))
+				this.internalDate = this.sDate;
+		},
+		sMode() {
+			if (this.sMode)
+				this.internalView = this.sMode;
+		}
+	},
 	methods: {
 		clickPrev() {
 			const evt = new Event('click:prev', {cancelable: true});
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 4fbb7c871..cf190d1c5 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -40,8 +40,6 @@ export default {
 					collapseEmptyDays: false
 				}
 			},
-			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
@@ -49,10 +47,16 @@ export default {
 		};
 	},
 	computed:{
+		currentDay() {
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+		},
+		currentMode() {
+			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
+		},
 		backgrounds() {
 			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
 
-			if (this.calendarMode == 'Month')
+			if (this.currentMode == 'Month')
 				return [
 					{
 						class: 'background-past',
@@ -103,7 +107,7 @@ export default {
 		},
 		handleChangeDate(day) {
 			const focus_date = day.toISODate();
-			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const mode = this.currentMode;
 
 			this.$router.push({
 				name: "LvPlan",
@@ -113,8 +117,6 @@ export default {
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
-			
-			this.currentDay = day;
 		},
 		handleChangeMode(newMode) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
@@ -130,8 +132,6 @@ export default {
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			});
-
-			this.calendarMode = mode;
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
@@ -188,7 +188,7 @@ export default {
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
-			:mode="propsViewData.mode.toLowerCase()"
+			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 0f4fa0603..d8d2ff074 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -37,16 +37,20 @@ export default {
 				week: {
 					collapseEmptyDays: false
 				}
-			},
-			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO
+			}
 		}
 	},
 	computed: {
+		currentDay() {
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+		},
+		currentMode() {
+			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
+		},
 		backgrounds() {
 			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
 
-			if (this.calendarMode == 'Month')
+			if (this.currentMode == 'Month')
 				return [
 					{
 						class: 'background-past',
@@ -71,7 +75,7 @@ export default {
 		},
 		handleChangeDate(day) {
 			const focus_date = day.toISODate();
-			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const mode = this.currentMode;
 
 			this.$router.push({
 				name: "RoomInformation",
@@ -81,8 +85,6 @@ export default {
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-			
-			this.currentDay = day;
 		},
 		handleChangeMode(newMode) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
@@ -98,8 +100,6 @@ export default {
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-
-			this.calendarMode = mode
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
@@ -131,7 +131,7 @@ export default {
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
-			:mode="propsViewData.mode.toLowerCase()"
+			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"

From e2df03debfe9eb2db75815ce47d29f6c58070a44 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Jul 2025 14:05:37 +0200
Subject: [PATCH 0525/1357] Tab Prestudent: ZGVFields: Add Autocomplete
 function with strike through for not active entries

---
 .../api/frontend/v1/stv/Prestudent.php        |  18 ++-
 .../Studentenverwaltung/Details/Prestudent.js | 113 +++++++++++++++---
 2 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 0b06b9667..b433702b6 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -174,7 +174,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 
-		$this->ZgvModel->addOrder('zgv_code');
+		$this->ZgvModel->addSelect('zgv_code');
+		$this->ZgvModel->addSelect('zgv_bez');
+		$this->ZgvModel->addSelect('aktiv');
+		$this->ZgvModel->addSelect('zgv_bez as label');
+		$this->ZgvModel->addOrder('zgv_bez');
 
 		$result = $this->ZgvModel->load();
 		if (isError($result))
@@ -188,7 +192,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
 
-		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_code');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_bez');
+		$this->ZgvdoktorModel->addSelect('aktiv');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_bez as label');
+		$this->ZgvdoktorModel->addOrder('zgvdoktor_bez');
 
 		$result = $this->ZgvdoktorModel->load();
 		if (isError($result))
@@ -202,7 +210,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 
-		$this->ZgvmasterModel->addOrder('zgvmas_code');
+		$this->ZgvmasterModel->addSelect('zgvmas_code');
+		$this->ZgvmasterModel->addSelect('zgvmas_bez');
+		$this->ZgvmasterModel->addSelect('aktiv');
+		$this->ZgvmasterModel->addSelect('zgvmas_bez as label');
+		$this->ZgvmasterModel->addOrder('zgvmas_bez');
 
 		$result = $this->ZgvmasterModel->load();
 		if (isError($result))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index da5aea29e..e782a6936 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -60,7 +60,13 @@ export default {
 			listBisStandort: [],
 			initialFormData: {},
 			deltaArray: {},
-			actionUpdate: false
+			actionUpdate: false,
+			filteredZgvs: [],
+			selectedZgv: null,
+			filteredMasterZgvs: [],
+			selectedMasterZgv: null,
+			filteredDoktorZgvs: [],
+			selectedDoktorZgv: null
 		};
 	},
 	computed: {
@@ -86,7 +92,16 @@ export default {
 		},
 		modelValue(n){
 			this.loadPrestudent(n);
-		}
+		},
+		selectedZgv(newVal) {
+			this.data.zgv_code = newVal?.zgv_code || null;
+		},
+		selectedMasterZgv(newVal) {
+			this.data.zgvmas_code = newVal?.zgvmas_code || null;
+		},
+		selectedDoktorZgv(newVal) {
+			this.data.zgvdoktor_code = newVal?.zgvdoktor_code || null;
+		},
 	},
 
 	methods: {
@@ -96,6 +111,7 @@ export default {
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
+
 					//neue DataVariable um ein Delta der vorgenommenen Änderungen berechnen zu können
 					this.initialFormData = {...this.data};
 				})
@@ -118,6 +134,24 @@ export default {
 					window.scrollTo(0, 0);
 				});
 		},
+		filterZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredZgvs = this.listZgvs.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
+		filterMasterZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredMasterZgvs = this.listZgvsmaster.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
+		filterDoktorZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredDoktorZgvs = this.listZgvsdoktor.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
 	},
 	created() {
 		this.loadPrestudent();
@@ -126,6 +160,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvs = result;
+				this.selectedZgv = this.listZgvs.find(
+					item => item.zgv_code === this.data.zgv_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -133,6 +170,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvsmaster = result;
+				this.selectedMasterZgv = this.listZgvsmaster.find(
+					item => item.zgvmas_code === this.data.zgvmas_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -140,6 +180,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvsdoktor = result;
+				this.selectedDoktorZgv = this.listZgvsdoktor.find(
+					item => item.zgvdoktor_code === this.data.zgvdoktor_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -220,11 +263,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgv_code')"
 						container-class="col-3 stv-details-prestudent-zgv_code"
 						label="ZGV"
-						type="select"
-						v-model="data.zgv_code"
-						name="zgvcode"
+						type="autocomplete"
+						v-model="selectedZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgv_code"
+						:suggestions="filteredZgvs"
+						dropdown
+						name="zgv_code"
+						@complete="filterZgvs"
 						>
-					<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvOrt')"
@@ -234,7 +291,7 @@ export default {
 						v-model="data.zgvort"
 						name="zgvort"
 						>
-					</form-input>
+					</form-input>	
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvDatum')"
 						container-class="col-3 stv-details-prestudent-zgvDatum"
@@ -268,11 +325,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgvmas_code')"
 						container-class="col-3 stv-details-prestudent-zgvmas_code"
 						:label="$p.t('lehre', 'zgvMaster')"
-						type="select"
-						v-model="data.zgvmas_code"
-						name="zgvmascode"
+						type="autocomplete"
+						v-model="selectedMasterZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgvmas_code"
+						:suggestions="filteredMasterZgvs"
+						dropdown
+						name="zgvmas_code"
+						@complete="filterMasterZgvs"
 						>
-						<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmaort')"
@@ -317,11 +388,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgvdoktor_code')"
 						container-class="col-3 stv-details-prestudent-zgvdoktor_code"
 						:label="$p.t('lehre', 'zgvDoktor')"
-						type="select"
-						v-model="data.zgvdoktor_code"
+						type="autocomplete"
+						v-model="selectedDoktorZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgvdoktor_code"
+						:suggestions="filteredDoktorZgvs"
+						dropdown
 						name="zgvdoktor_code"
+						@complete="filterDoktorZgvs"
 						>
-						<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktorort')"

From 24df22ba240318fe0e272dcab7d506149bc01574 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 08:40:45 +0200
Subject: [PATCH 0526/1357] enable text-input zgv-master and enable remove
 dates ZGV

---
 application/controllers/api/frontend/v1/stv/Prestudent.php  | 6 ++++++
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index b433702b6..ed48e6d9a 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -140,6 +140,12 @@ class Prestudent extends FHCAPI_Controller
 			if ($val !== null || $prop == 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
+			if (($prop == 'zgvdatum' && $val == '')
+				|| ($prop == 'zgvmadatum' && $val == '')
+				|| ($prop == 'zgvdoktordatum' && $val == '')
+				) {
+				$update_prestudent[$prop] = null;
+			}
 		}
 
 		$update_prestudent['updateamum'] = date('c');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index e782a6936..a36b355b1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -426,6 +426,7 @@ export default {
 						name="zgvdoktordatum"
 						no-today
 						auto-apply
+						text-input
 						:enable-time-picker="false"
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"

From 5e0ef4ebabace0c6edc4816a89afca37a271beb5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 28 Jul 2025 09:39:32 +0200
Subject: [PATCH 0527/1357] Fix send mode on date update and vice versa to fix
 multiple router pushes

---
 public/js/components/Calendar/Base.js         |  4 ++--
 public/js/components/Cis/LvPlan/LvPlan.js     | 20 ++++-------------
 .../js/components/Cis/Mylv/RoomInformation.js | 22 +++++--------------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 94ad3ef05..9d344ca09 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -164,7 +164,7 @@ export default {
 			},
 			set(value) {
 				this.internalDate = value;
-				this.$emit('update:date', value);
+				this.$emit('update:date', value, this.cMode);
 			}
 		},
 		sMode() {
@@ -182,7 +182,7 @@ export default {
 			},
 			set(value) {
 				this.internalView = value;
-				this.$emit('update:mode', value);
+				this.$emit('update:mode', value, this.cDate);
 			}
 		}
 	},
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index cf190d1c5..4555f18aa 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -105,24 +105,12 @@ export default {
 				return undefined;
 			return '--event-bg:#' + event.farbe;
 		},
-		handleChangeDate(day) {
-			const focus_date = day.toISODate();
-			const mode = this.currentMode;
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode,
-					focus_date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
 		},
-		handleChangeMode(newMode) {
+		handleChangeMode(newMode, day) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
-			const focus_date = (this.currentDay instanceof luxon.DateTime)
-				? this.currentDay.toISODate()
-				: this.currentDay;
+			const focus_date = day.toISODate();
 			
 			this.$router.push({
 				name: "LvPlan",
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index d8d2ff074..72d489023 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -73,24 +73,12 @@ export default {
 				return undefined;
 			return '--event-bg:#' + event.farbe;
 		},
-		handleChangeDate(day) {
-			const focus_date = day.toISODate();
-			const mode = this.currentMode;
-
-			this.$router.push({
-				name: "RoomInformation",
-				params: {
-					mode,
-					focus_date,
-					ort_kurzbz: this.propsViewData.ort_kurzbz
-				}
-			})
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
 		},
-		handleChangeMode(newMode) {
+		handleChangeMode(newMode, day) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
-			const focus_date = (this.currentDay instanceof luxon.DateTime)
-				? this.currentDay.toISODate()
-				: this.currentDay;
+			const focus_date = day.toISODate();
 
 			this.$router.push({
 				name: "RoomInformation",
@@ -99,7 +87,7 @@ export default {
 					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
-			})
+			});
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;

From cc0572b386e54f03c822d0b5dc3c46153cd27b0e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 11:44:06 +0200
Subject: [PATCH 0528/1357] use endpoint for Messages, refactor component
 Vorlagendropdown to fhcapi

---
 public/js/api/factory/vorlagen.js             | 32 +++++++++++++++++++
 .../Messages/Details/NewMessage/Modal.js      | 24 +++++++-------
 .../Messages/Details/NewMessage/NewDiv.js     | 21 ++++++------
 .../Messages/Details/TableMessages.js         | 10 +++---
 public/js/components/Messages/Messages.js     |  2 +-
 .../Studentenverwaltung/Details/Messages.js   |  8 ++++-
 .../VorlagenDropdown/VorlagenDropdown.js      |  8 +++--
 7 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 public/js/api/factory/vorlagen.js

diff --git a/public/js/api/factory/vorlagen.js b/public/js/api/factory/vorlagen.js
new file mode 100644
index 000000000..f62f65e47
--- /dev/null
+++ b/public/js/api/factory/vorlagen.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getVorlagen() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vorlagen/vorlagen/getVorlagen/'
+		};
+	},
+	getVorlagenByLoggedInUser() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vorlagen/vorlagen/getVorlagenByLoggedInUser/'
+		};
+	},
+
+};
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 57573a9ba..24c282cb4 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -4,8 +4,6 @@ import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
-import ApiMessages from '../../../../api/factory/messages/messages.js';
-
 export default {
 	name: "ModalNewMessages",
 	components: {
@@ -17,7 +15,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: String,
@@ -124,7 +122,7 @@ export default {
 			data.append('data', JSON.stringify(merged));
 
 			return this.$refs.formMessage
-				.call(ApiMessages.sendMessageFromModalContext(this.uid, data))
+				.call(this.endpoint.sendMessageFromModalContext(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -140,7 +138,7 @@ export default {
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$api
-				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -155,7 +153,7 @@ export default {
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$api
-				.call(ApiMessages.getPreviewText({
+				.call(this.endpoint.getPreviewText({
 					id: this.id,
 					type_id: this.typeId}, data))
 				.then(response => {
@@ -214,7 +212,7 @@ export default {
 				type_id: typeId
 			};
 			this.$api
-				.call(ApiMessages.getUid(params))
+				.call(this.endpoint.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -252,7 +250,7 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
+					const result = await this.$api.call(this.endpoint.getReplyData(newMessageId));
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
@@ -275,7 +273,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMessageVarsPerson(params))
+				.call(this.endpoint.getMessageVarsPerson(params))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -293,7 +291,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMsgVarsPrestudent(params))
+				.call(this.endpoint.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -306,7 +304,7 @@ export default {
 		}
 
 		this.$api
-			.call(ApiMessages.getMsgVarsLoggedInUser())
+			.call(this.endpoint.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -318,7 +316,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiMessages.getNameOfDefaultRecipient({
+			.call(this.endpoint.getNameOfDefaultRecipient({
 				id: this.id,
 				type_id: this.typeId}))
 			.then(result => {
@@ -332,7 +330,7 @@ export default {
 		//case of reply
 		if(this.messageId) {
 			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
+				.call(this.endpoint.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d070ff379..7622f0928 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,7 +2,6 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
-import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "ComponentNewMessages",
@@ -14,7 +13,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		openMode: String,
@@ -119,7 +118,7 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 			return this.$api
-				.call(ApiMessages.sendMessage(this.uid, data))
+				.call(this.endpoint.sendMessage(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
@@ -139,7 +138,7 @@ export default {
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$api
-				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -152,7 +151,7 @@ export default {
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$api
-				.call(ApiMessages.getPreviewText({
+				.call(this.endpoint.getPreviewText({
 					id: this.id,
 					type_id: this.typeId}, data))
 				.then(response => {
@@ -226,7 +225,7 @@ export default {
 				type_id: typeId
 			};
 			this.$api
-				.call(ApiMessages.getUid(params))
+				.call(this.endpoint.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -264,7 +263,7 @@ export default {
 				};
 
 				this.$api
-				.call(ApiMessages.getMessageVarsPerson(params))
+				.call(this.endpoint.getMessageVarsPerson(params))
 					.then(result => {
 						this.fieldsPerson = result.data;
 						const person = this.fieldsPerson[0];
@@ -282,7 +281,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMsgVarsPrestudent(params))
+				.call(this.endpoint.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -296,7 +295,7 @@ export default {
 		}
 
 		this.$api
-			.call(ApiMessages.getMsgVarsLoggedInUser())
+			.call(this.endpoint.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -308,7 +307,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiMessages.getNameOfDefaultRecipient({
+			.call(this.endpoint.getNameOfDefaultRecipient({
 				id: this.id,
 				type_id: this.typeId}))
 			.then(result => {
@@ -322,7 +321,7 @@ export default {
 		//case of reply
 		if(this.messageId != null) {
 			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
+				.call(this.endpoint.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index a21073855..8d539983f 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,8 +1,6 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 
-import ApiMessages from '../../../api/factory/messages/messages.js';
-
 export default {
 	name: "TableMessages",
 	components: {
@@ -16,7 +14,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: String,
@@ -257,7 +255,7 @@ export default {
 		},
 		deleteMessage(message_id){
 			return this.$api
-				.call(ApiMessages.deleteMessage(message_id))
+				.call(this.endpoint.deleteMessage(message_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -318,7 +316,7 @@ export default {
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				ApiMessages.getMessages(params)
+				this.endpoint.getMessages(params)
 			);
 		}
 	},
@@ -349,7 +347,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getPersonId(params))
+				.call(this.endpoint.getPersonId(params))
 				.then(result => {
 					this.personId = result.data;
 				})
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 337883be3..176c05b6b 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -15,7 +15,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 49600fe20..59650eaab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,4 +1,5 @@
 import CoreMessages from "../../../Messages/Messages.js";
+import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "TabMessages",
@@ -8,13 +9,18 @@ export default {
 	props: {
 		modelValue: Object
 	},
+	data(){
+		return {
+			endpoint: ApiMessages
+		};
+	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
+			:endpoint="endpoint"
 			type-id="prestudent_id"
 			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index 0071d4a1d..d7c73a9e5 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../filter/Filter.js";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
+import ApiVorlage from '../../api/factory/vorlagen.js';
+
 export default {
 	components: {
 		FormForm,
@@ -39,7 +41,8 @@ export default {
 	},
 	created() {
 		if(this.isAdmin) {
-			this.$fhcApi.factory.vorlagen.getVorlagen()
+			this.$api
+				.call(ApiVorlage.getVorlagen())
 				.then(result => {
 					this.vorlagen = result.data;
 				})
@@ -47,7 +50,8 @@ export default {
 		}
 
 		if(this.useLoggedInUserOe){
-			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
+			this.$api
+				.call(ApiVorlage.getVorlagenByLoggedInUser())
 				.then(result => {
 					//console.log(this.vorlagenOe);
 					this.vorlagenOe = result.data;

From dcb9fad0d2b79103f0f39a62fdc62fff74fd9442 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 12:11:45 +0200
Subject: [PATCH 0529/1357] remove not existing tinymce-plugin linktitle

---
 public/js/components/Messages/Details/NewMessage/Modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 24c282cb4..b0d8cca7d 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -67,7 +67,7 @@ export default {
 				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
-				plugins: 'link linktitle',
+				plugins: 'link',
 				link_context_toolbar: true,
 				automatic_uploads: true,
 				default_link_target: "_blank",

From 4d1c4bf7abc8ad78176b2dd7f18a0a19c2139c7c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 28 Jul 2025 15:04:15 +0200
Subject: [PATCH 0530/1357] add css rules to show vue-datepicker svg icons
 inside of elements with bootstrap input-group or primevue p-component css
 class

---
 public/css/components/vue-datepicker.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
index c2551b9d8..efca42f4f 100644
--- a/public/css/components/vue-datepicker.css
+++ b/public/css/components/vue-datepicker.css
@@ -43,4 +43,12 @@
     --dp-border-color-hover: var(--bs-success);
 }
 .form-control.is-invalid ~ .dp__clear_icon,
-.was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
+.was-validated .form-control:invalid ~ .dp__clear_icon {
+	margin-right: calc(1.5em + .75rem - 12px);
+}
+.p-component .dp__input_icons {
+	box-sizing: content-box !important;
+}
+.input-group .dp__input_icons {
+	z-index: 3;
+}
\ No newline at end of file

From d76a5965db16127d98b970734cf9b7079796319f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 08:54:16 +0200
Subject: [PATCH 0531/1357] CSS improvements Calendar

---
 public/css/Cis4/Cis.css                       |   2 +
 public/css/Cis4/Cis/Calendar.css              |  13 ++
 public/css/Cis4/CoreCalendarEvents.css        | 216 +++++-------------
 public/css/components/calendar.css            |  11 +-
 public/css/components/calendar/events.css     |  17 +-
 public/css/components/calendar/frame.css      |  25 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   1 +
 .../js/components/Cis/Mylv/RoomInformation.js |   1 +
 8 files changed, 106 insertions(+), 180 deletions(-)
 create mode 100644 public/css/Cis4/Cis/Calendar.css

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 80784fe5d..ff1b181dd 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,6 +1,7 @@
 /* basic */
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
+@import './Cis/Calendar.css';
 
 html {
   font-size: 0.875em;
@@ -567,6 +568,7 @@ html {
 @media (max-width: 991.98px) {
   #cis-main{
     padding: 0.75rem 0.75rem;
+    height: calc(100vh - var(--fhc-cis-header-height));
   }
   #cis-main > :first-child {
     margin-top: var(--fhc-cis-header-height);
diff --git a/public/css/Cis4/Cis/Calendar.css b/public/css/Cis4/Cis/Calendar.css
new file mode 100644
index 000000000..c8483dd0f
--- /dev/null
+++ b/public/css/Cis4/Cis/Calendar.css
@@ -0,0 +1,13 @@
+/* mobile */
+@media (max-width: 991.98px) {
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-day .short,
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-dow .short,
+	.responsive-calendar .fhc-calendar-mode-month .fhc-calendar-base-label-dow .short {
+		display: block;
+	}
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-day .long,
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-dow .long,
+	.responsive-calendar .fhc-calendar-mode-month .fhc-calendar-base-label-dow .long {
+		display: none;
+	}
+}
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index c990c93d2..7b43603da 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,185 +1,93 @@
-/* Lehreinheits Events in Month Page */
-.monthPageContainer .lehreinheitEventContent{
-	display: flex;
-	border-bottom: 1px solid var(--bs-border-color);	
-}
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:none;
-}
-
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	width: 100%;
-	font-size: .875em;
-	overflow:hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	display:flex;
-	justify-content: space-evenly;
-	align-items:center;
-	
-}
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText #lehreinheitLektoren{
-	display:none;
-}
-
-.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
-	display: none;
-}
-
-/* Lehreinheits Events in Week Page */
-.weekPageContainer .lehreinheitEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	grid-template-rows: 1fr;
-
-}
-
-@media(max-width: 1199px){
-	.weekPageContainer .lehreinheitEventContent {
-			grid-template-columns: 1fr;
-		}
-}
-
-
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display: grid;
-	padding: .25rem .5rem .25rem .25rem;
-	margin-right: .25rem;
-	align-content: center;
-	border-right: 1px solid var(--bs-secondary);
-}
-
-
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: flex;
-	flex-direction: column;
-	column-gap: 5px;
-	overflow-y: scroll;
+/* All */
+.weekPageContainer,
+.dayPageContainer {
 	height: 100%;
-	min-height:auto;
-	justify-content: space-between;
-	align-items:center;
-
 }
 
-/* Lehreinheits Events in Day Page */
-.dayPageContainer .lehreinheitEventContent {
-	display: flex;
-	padding-left:4rem;
-	justify-content: space-evenly;
-	align-items: center;
-
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:grid;
-	align-content: center;
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: contents;
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText *{
-	font-weight: 500;
-}
-
-/* Ferientage Events in Month Page */
-.monthPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
-	align-items:center;
-	color: var(--fhc-light);
-}
-
-.monthPageContainer .feiertagEventContent #ferienEventIcon{
-	margin: 0.5rem;
-}
-
-.monthPageContainer .feiertagEventContent #ferienEventTitle {
-
-}
-
-/* Ferientage Events in Week Page */
-.weekPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
-	align-items:center;
-	color: var(--fhc-light);
-}
-.weekPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
+/* Feiertag */
+.feiertagEventContent {
 	align-items: center;
 	color: var(--fhc-light);
 }
-
-.weekPageContainer .feiertagEventContent #ferienEventIcon {
-	margin: 0.25rem;
-}
-
-.weekPageContainer .feiertagEventContent #ferienEventTitle {
-	
-}
-
-/* Ferientage Events in Day Page */
+.monthPageContainer .feiertagEventContent,
+.weekPageContainer .feiertagEventContent,
 .dayPageContainer .feiertagEventContent {
 	display: grid;
 	grid-template-columns: auto 1fr;
 	justify-items: center;
-	align-items: center;
-	color: var(--fhc-light);
 }
-
-.dayPageContainer .feiertagEventContent #ferienEventIcon {
-	margin: 0.5rem;
-}
-
-.dayPageContainer .feiertagEventContent #ferienEventTitle {}
-
-/* List Page Container Styles */
-
-/* Ferientage Events for List Page */
-
 .listPageContainer .feiertagEventContent{
 	display: flex;
 	justify-content: center;
-	align-items: center;
-	color: var(--fhc-light);
 }
 
-.listPageContainer .feiertagEventContent #ferienEventIcon{
-	margin: 0.5rem;
+.monthPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0 .5rem;
+}
+.weekPageContainer .feiertagEventContent #ferienEventIcon,
+.dayPageContainer .feiertagEventContent #ferienEventIcon,
+.listPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: .5rem;
 }
 
-.listPageContainer .feiertagEventContent #ferienEventTitle{
+.listPageContainer .feiertagEventContent #ferienEventTitle {
 	flex-grow: 1;
 }
 
-/* Lehreinheits Events in List Page */
-.listPageContainer .lehreinheitEventContent {
+/* Lehreinheit */
+.monthPageContainer .lehreinheitEventContent {
+	padding: 0!important;
+}
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
+.monthPageContainer .lehreinheitEventContent #lehreinheitLektoren,
+.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+	display: none!important;
+}
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
-	padding-left: 4rem;
 	justify-content: space-evenly;
 	align-items: center;
-
 }
-
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	justify-content: center;
+	grid-template-columns: repeat(2, auto);
+	border-bottom: solid 1px;
+	height: auto!important;
+}
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader :last-child:not(:first-child):before {
+	content: "-";
+	margin-inline-start: .15em;
+}
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+	align-items: center;
+}
+.dayPageContainer .lehreinheitEventContent,
+.listPageContainer .lehreinheitEventContent {
+	display: flex;
+	align-items: center;
+}
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
 .listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display: grid;
 	align-content: center;
+	padding-inline-end: .5em;
+	border-inline-end: solid 1px;
+	margin-inline-end: .5em;
 }
-
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText,
 .listPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: contents;
+	flex: 1 1 auto;
+	display: flex;
+	flex-wrap: wrap;
+	gap: .25em;
+	justify-content: center;
 }
-
-.listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
-	font-weight: 500;
+.dayPageContainer .lehreinheitEventContent #lehreinheitTopic,
+.dayPageContainer .lehreinheitEventContent #lehreinheitOrt,
+.listPageContainer .lehreinheitEventContent #lehreinheitTopic,
+.listPageContainer .lehreinheitEventContent #lehreinheitOrt {
+	flex: 0 0 100%;
+	text-align: center;
 }
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index f46554007..1c78ccc6c 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -4,26 +4,27 @@
 
 /* Themable Variables */
 :root {
-	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
+	--fhc-calendar-gap: var(--bs-border-width, 1px);
+
 	--fhc-calendar-bg: var(--fhc-background, #fff);
 	--fhc-calendar-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-bg-gap: var(--fhc-border, #dee2e6);
 
 	--fhc-calendar-bg-event: var(--fhc-white-80, #ccc);
 	--fhc-calendar-border-event: var(--bs-secondary, #6c757d);
 	--fhc-calendar-radius-event: var(--bs-border-radius, .375rem);
-	--fhc-calendar-fontsize-event: .875em;
 
 	--fhc-calendar-bg-markings-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
 	--fhc-calendar-border-markings-past: var(--fhc-calendar-border);
 	--fhc-calendar-bg-markings-past-label: var(--fhc-calendar-bg);
 	--fhc-calendar-border-markings-past-label: var(--fhc-calendar-border);
 
-	--fhc-calendar-gap-header: transparent;
-	--fhc-calendar-gap-allday: transparent;
-	--fhc-calendar-gap-body: transparent;
 	--fhc-calendar-bg-header: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-header-gap: transparent;
 	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-allday-gap: transparent;
 	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-body-gap: transparent;
 
 	--fhc-calendar-bg-month-today: var(--fhc-primary);
 	--fhc-calendar-color-month-today: var(--fhc-white-10);
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index f996b7339..5bdbb1b46 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,17 +1,17 @@
 .event {
 	cursor: pointer;
-}
-.fhc-calendar-mode-week .all-day-events .event .weekPageContainer {
-	padding: .25rem;
-}
-.fhc-calendar-mode-day .event,
-.fhc-calendar-mode-week .event {
-	margin: 0 .5rem;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line {
+	padding: 0 var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
+}
 .fhc-calendar-mode-day .all-day-events .event,
 .fhc-calendar-mode-week .all-day-events .event {
-	margin: .25rem;
+	margin: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px)) 0;
+}
+.fhc-calendar-mode-list .event {
+	margin-bottom: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
 }
 /* Border */
 .fhc-calendar-mode-day .grid-main .event > *,
@@ -64,6 +64,7 @@
 }
 .fhc-calendar-base .event > * {
 	background-color: var(--event-bg, var(--event-default-bg));
+	color: var(--event-color, var(--fhc-calendar-color-event, #000));
 }
 .fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index ab400c95d..843e95cf6 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -56,7 +56,6 @@
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
 	--event-bg: transparent;
 	font-weight: bold;
-	text-indent: 0;
 	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
@@ -69,11 +68,11 @@
 /* Grid */
 .fhc-calendar-base-grid {
 	--fhc-calendar-axis-collapsible: .2fr;
-	background-color: var(--fhc-calendar-gap);
-	grid-gap: 2px;
+	background-color: var(--fhc-calendar-bg-gap);
+	grid-gap: var(--fhc-calendar-gap-header, calc(var(--fhc-calendar-gap, 1px) * 2));
 }
 .fhc-calendar-base-grid .grid-header {
-	background-color: var(--fhc-calendar-gap-header);
+	background-color: var(--fhc-calendar-bg-header-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-header:before,
 .fhc-calendar-base-grid .grid-allday:before {
@@ -84,22 +83,22 @@
 	background-color: var(--fhc-calendar-bg-header);
 }
 .fhc-calendar-base-grid .grid-allday {
-	background-color: var(--fhc-calendar-gap-allday);
+	background-color: var(--fhc-calendar-bg-allday-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-allday:before,
 .fhc-calendar-base-grid .grid-allday .all-day-events {
 	background-color: var(--fhc-calendar-bg-allday);
 }
 .fhc-calendar-base-grid .grid-main {
-	grid-gap: 1px;
-	background-color: var(--fhc-calendar-gap-body);
+	grid-gap: var(--fhc-calendar-gap, 1px);
+	background-color: var(--fhc-calendar-bg-body-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-main .part-header,
 .fhc-calendar-base-grid .grid-main .part-body {
 	background-color: var(--fhc-calendar-bg-body);
 }
 .fhc-calendar-base-grid-line {
-	grid-gap: 1px;
+	grid-gap: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
 }
 .fhc-calendar-base-label-time {
 	display: flex;
@@ -118,7 +117,7 @@
 .fhc-calendar-mode-day .event-details {
 	padding: 1.5rem;
 	width: 100%;
-	border-left: solid 1px var(--fhc-calendar-gap);
+	border-left: solid 1px var(--fhc-calendar-bg-gap);
 }
 .fhc-calendar-mode-day .today {
 	background-color: var(--fhc-calendar-bg-day-today);
@@ -132,14 +131,14 @@
 /* Month */
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line {
 	overflow: hidden;
-	line-height: 1.5;
+	line-height: 1.8;
 	grid-template-rows: 2em;
-	grid-auto-rows: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	grid-auto-rows: 1.8em;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
-	text-indent: .5em;
-	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	font-size: 1em;
+	height: 1.8em;
 	overflow: hidden;
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event .placeholder-glow {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 4555f18aa..5a276b889 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -173,6 +173,7 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
+			class="responsive-calendar"
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 72d489023..307b535f5 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -116,6 +116,7 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
+			class="responsive-calendar"
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"

From 31fb649cac1a59786b6963a0852c42920ab39daa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:40:24 +0200
Subject: [PATCH 0532/1357] Bugfix: moodle start/end dates lost timezones and
 end time

---
 .../controllers/api/frontend/v1/LvPlan.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 0ccf65a0e..a1d40cb81 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -19,6 +19,8 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
+use \DateTime as DateTime;
+use \DateTimeZone as DateTimeZone;
 
 class LvPlan extends FHCAPI_Controller
 {
@@ -89,16 +91,22 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		// fetching moodle events
+		$this->load->config('calendar');
+		$tz = new DateTimeZone($this->config->item('timezone'));
+		$start = new DateTime($start_date);
+		$start->setTimezone($tz);
+		$end = new DateTime($end_date);
+		$end->setTimezone($tz);
+		$end->modify('+1 day -1 second');
 		$moodle_events = [];
 		Events::trigger(
 			'moodleCalendarEvents',
-			function & () use (&$moodle_events)
-			{
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
-				'start_date' => $start_date,
-				'end_date' => $end_date, 
+				'start_date' => $start->format('c'),
+				'end_date' => $end->format('c'),
 				'username' => getAuthUID()
 			]
 		);

From fd04b26af441e5e2e9219c89fac82941d387a0eb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:40:40 +0200
Subject: [PATCH 0533/1357] code quality

---
 public/css/Cis4/CoreCalendarEvents.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 7b43603da..82e7a3a31 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -16,7 +16,7 @@
 	grid-template-columns: auto 1fr;
 	justify-items: center;
 }
-.listPageContainer .feiertagEventContent{
+.listPageContainer .feiertagEventContent {
 	display: flex;
 	justify-content: center;
 }

From d262c5106c3ce85d297a030ff36a201ff401f5d9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:52:36 +0200
Subject: [PATCH 0534/1357] add zgv-fields to allow null values for update

---
 .../api/frontend/v1/stv/Prestudent.php          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index ed48e6d9a..369c8eabd 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -136,14 +136,19 @@ class Prestudent extends FHCAPI_Controller
 		$update_prestudent = array();
 		foreach ($array_allowed_props_prestudent as $prop)
 		{
-			$val = $this->input->post($prop);
-			if ($val !== null || $prop == 'foerderrelevant') {
+			$val = $this->input->post($prop, true);
+
+			if ($val !== null || $prop === 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
-			if (($prop == 'zgvdatum' && $val == '')
-				|| ($prop == 'zgvmadatum' && $val == '')
-				|| ($prop == 'zgvdoktordatum' && $val == '')
-				) {
+
+			// allowed to be null, but has to be in postparameter
+			if (
+				in_array($prop, ['zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
+				&& !isset($update_prestudent[$prop])
+				&& array_key_exists($prop, $_POST)
+			) 
+			{
 				$update_prestudent[$prop] = null;
 			}
 		}

From c1ca8c78aff82215acbb1b2ac30136397daa4aa4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:13:15 +0200
Subject: [PATCH 0535/1357] bugfix field gsstudientyp_kurzbz

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a36b355b1..01f31b696 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -573,7 +573,7 @@ export default {
 						v-model="data.gsstudientyp_kurzbz"
 						name="gsstudientyp_kurzbz"
 						>
-						<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}}</option>
+						<option v-for="typ in listStgTyp" :key="typ.gsstudientyp_kurzbz" :value="typ.gsstudientyp_kurzbz">{{typ.bezeichnung}}</option>
 					</form-input>
 				</div>
 				

From 2442c16eebaed0838456f4678709ed66d1cbae8b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:24:49 +0200
Subject: [PATCH 0536/1357] Calendar header CSS

---
 public/css/components/calendar/frame.css     | 38 ++++++++++++-
 public/js/components/Calendar/Base/Header.js | 58 ++++++++++----------
 public/js/components/Cis/LvPlan/LvPlan.js    |  4 +-
 3 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 843e95cf6..e5ed19385 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -107,8 +107,44 @@
 	align-items: end;
 }
 /* Header */
-.fhc-calendar-base-header > .row {
+.fhc-calendar-base-header .header-picker {
+	display: flex;
+	justify-content: center;
+}
+.fhc-calendar-base-header .header-actions {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-around;
 	align-items: center;
+	margin-bottom: .5rem;
+	row-gap: .5rem;
+}
+.fhc-calendar-base-header .header-userdefined:empty {
+	display: none;
+}
+@media (min-width: 768px) {
+	.fhc-calendar-base-header {
+		display: grid;
+		grid-template-columns: [userdefined] 1fr [picker] max-content [modes] 1fr;
+		align-items: center;
+	}
+	.fhc-calendar-base-header .header-actions {
+		grid-column: 1 / -1;
+		grid-row: 1;
+		display: grid;
+		grid-template-columns: subgrid;
+		margin-bottom: 0;
+	}
+	.fhc-calendar-base-header .header-userdefined {
+		grid-column: userdefined;
+	}
+	.fhc-calendar-base-header .header-modes {
+		grid-column: modes;
+	}
+	.fhc-calendar-base-header .header-picker {
+		grid-column: picker;
+		grid-row: 1;
+	}
 }
 
 /* Modes */
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
index c1dae4bc0..46b5843f9 100644
--- a/public/js/components/Calendar/Base/Header.js
+++ b/public/js/components/Calendar/Base/Header.js
@@ -47,37 +47,11 @@ export default {
 	},
 	template: /* html */`
 	<div class="fhc-calendar-base-header">
-		<div class="row">
-			<div class="col">
+		<div class="header-actions">
+			<div class="header-userdefined">
 				<slot />
 			</div>
-			<div class="col-auto d-flex justify-content-center">
-				<div class="btn-group" role="group">
-					<button
-						class="btn btn-outline-secondary border-0"
-						@click="$emit('prev')"
-						:disabled="open"
-					>
-						<i class="fa fa-chevron-left"></i>
-					</button>
-					<date-picker
-						:mode="mode"
-						:date="date"
-						@update:date="$emit('update:date', $event)"
-						@open="open = true"
-						@closed="open = false"
-						:list-length="modeOptions.length"
-					/>
-					<button
-						class="btn btn-outline-secondary border-0"
-						@click="$emit('next')"
-						:disabled="open"
-					>
-						<i class="fa fa-chevron-right"></i>
-					</button>
-				</div>
-			</div>
-			<div class="col">
+			<div class="header-modes">
 				<div class="d-flex gap-1 justify-content-end" role="group">
 					<button
 						v-if="btnMonth"
@@ -118,6 +92,32 @@ export default {
 				</div>
 			</div>
 		</div>
+		<div class="header-picker">
+			<div class="btn-group" role="group">
+				<button
+					class="btn btn-outline-secondary border-0"
+					@click="$emit('prev')"
+					:disabled="open"
+				>
+					<i class="fa fa-chevron-left"></i>
+				</button>
+				<date-picker
+					:mode="mode"
+					:date="date"
+					@update:date="$emit('update:date', $event)"
+					@open="open = true"
+					@closed="open = false"
+					:list-length="modeOptions.length"
+				/>
+				<button
+					class="btn btn-outline-secondary border-0"
+					@click="$emit('next')"
+					:disabled="open"
+				>
+					<i class="fa fa-chevron-right"></i>
+				</button>
+			</div>
+		</div>
 	</div>
 	`
 }
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5a276b889..e35cd5739 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -219,11 +219,11 @@ export default {
 						<a
 							:href="link"
 							:aria-label="title"
-							class="py-1 px-2 m-1 btn btn-outline-secondary card"
+							class="py-1 btn btn-outline-secondary"
 						>
 							<div class="d-flex flex-column">
 								<i aria-hidden="true" :class="icon"></i>
-								<span class="small">{{ title }}</span>
+								<span style="font-size:.5rem">{{ title }}</span>
 							</div>
 						</a>
 					</div>

From 602a5725181e84f068572cf2f284ff99a6de082a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:48:54 +0200
Subject: [PATCH 0537/1357] max height for all-day container, rearange zeitraum
 / frist in lehreinheit modal

---
 public/css/components/calendar.css            |  2 ++
 public/css/components/calendar/frame.css      |  4 +++
 .../Cis/Renderer/Lehreinheit/modalContent.js  | 34 +++++++++---------
 .../Renderer/Reservierungen/modalContent.js   | 35 ++++++++++---------
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1c78ccc6c..1550b2a9c 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -36,4 +36,6 @@
 	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-month-event: 0;
 	--fhc-calendar-radius-list-event: var(--fhc-calendar-radius-event);
+
+	--fhc-calendar-maxheight-allday: 7.125rem;
 }
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index e5ed19385..d17cc06b4 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -89,6 +89,10 @@
 .fhc-calendar-base-grid .grid-allday .all-day-events {
 	background-color: var(--fhc-calendar-bg-allday);
 }
+.fhc-calendar-base-grid .grid-allday .all-day-events {
+	max-height: var(--fhc-calendar-maxheight-allday);
+	overflow-y: auto;
+}
 .fhc-calendar-base-grid .grid-main {
 	grid-gap: var(--fhc-calendar-gap, 1px);
 	background-color: var(--fhc-calendar-bg-body-gap, var(--fhc-calendar-bg-gap));
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 0a2066d0c..d773a52ed 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -35,18 +35,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!(this.event.start instanceof Date)) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!(this.event.beginn instanceof Date)) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!(this.event.end instanceof Date)) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!(this.event.ende instanceof Date)) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -88,6 +90,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -122,14 +132,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
 					<tr>
 						<th>{{
 							$p.t('lehre','organisationseinheit')?
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 571bbde29..66428e37f 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -32,18 +32,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!this.event.beginn instanceof Date) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!this.event.ende instanceof Date) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -69,6 +71,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -93,15 +103,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
-					
 				</tbody>
 		</table>
 		

From ee5391f11abe40491c21497e416ca26c4ccc0a5c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Jul 2025 14:27:46 +0200
Subject: [PATCH 0538/1357] place timeinterval left of eventtext, add missing
 success wrapper in stundenplanlib

---
 application/libraries/StundenplanLib.php |  3 +--
 public/css/Cis4/CoreCalendarEvents.css   | 17 +++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 50835873e..488fff45a 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -70,8 +70,7 @@ class StundenplanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $stundenplan_data;
-			
+			return success($stundenplan_data);
 		}
 		
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 82e7a3a31..908e23305 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -48,15 +48,16 @@
 	justify-content: space-evenly;
 	align-items: center;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	justify-content: center;
-	grid-template-columns: repeat(2, auto);
-	border-bottom: solid 1px;
-	height: auto!important;
+.weekPageContainer .lehreinheitEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader :last-child:not(:first-child):before {
-	content: "-";
-	margin-inline-start: .15em;
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	border-inline-end: solid 1px var(--bs-secondary);
+	align-self: stretch;
+	align-content: center;
+	padding: .25em .5em .25em .25em;
+	margin-inline-end: .25rem;
 }
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;

From 3cd00a5e5f9a54e3a87c0066e9c09a3e47b33cc0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:27:09 +0200
Subject: [PATCH 0539/1357] Cleanup

---
 public/js/components/Calendar/Abstract.js   |  17 -
 public/js/components/Calendar/Calendar.js   | 301 ------------
 public/js/components/Calendar/Day.js        |  61 ---
 public/js/components/Calendar/Day/Page.js   | 490 --------------------
 public/js/components/Calendar/Header.js     |  99 ----
 public/js/components/Calendar/Minimized.js  |  26 --
 public/js/components/Calendar/Month.js      | 103 ----
 public/js/components/Calendar/Month/Page.js | 170 -------
 public/js/components/Calendar/Months.js     |  37 --
 public/js/components/Calendar/Pane.js       |  94 ----
 public/js/components/Calendar/Week.js       |  83 ----
 public/js/components/Calendar/Week/Page.js  | 387 ----------------
 public/js/components/Calendar/Weeks.js      |  69 ---
 public/js/components/Calendar/Years.js      |  61 ---
 public/js/components/Calendar/Years/Page.js |  36 --
 public/js/components/Cis/Mylv/LvModal.js    |  96 ----
 public/js/composables/CalendarDate.js       | 274 -----------
 public/js/composables/CalendarDates.js      |  16 -
 18 files changed, 2420 deletions(-)
 delete mode 100644 public/js/components/Calendar/Abstract.js
 delete mode 100644 public/js/components/Calendar/Calendar.js
 delete mode 100644 public/js/components/Calendar/Day.js
 delete mode 100644 public/js/components/Calendar/Day/Page.js
 delete mode 100644 public/js/components/Calendar/Header.js
 delete mode 100644 public/js/components/Calendar/Minimized.js
 delete mode 100644 public/js/components/Calendar/Month.js
 delete mode 100644 public/js/components/Calendar/Month/Page.js
 delete mode 100644 public/js/components/Calendar/Months.js
 delete mode 100644 public/js/components/Calendar/Pane.js
 delete mode 100644 public/js/components/Calendar/Week.js
 delete mode 100644 public/js/components/Calendar/Week/Page.js
 delete mode 100644 public/js/components/Calendar/Weeks.js
 delete mode 100644 public/js/components/Calendar/Years.js
 delete mode 100644 public/js/components/Calendar/Years/Page.js
 delete mode 100644 public/js/components/Cis/Mylv/LvModal.js
 delete mode 100644 public/js/composables/CalendarDate.js
 delete mode 100644 public/js/composables/CalendarDates.js

diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
deleted file mode 100644
index 54b0304c7..000000000
--- a/public/js/components/Calendar/Abstract.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import CalendarHeader from './Header.js';
-
-export default {
-	components: {
-		CalendarHeader
-	},
-	inject: [
-		'date',
-		'focusDate',
-		'size'
-	],
-	emits: [
-		'updateMode',
-		'change:range',
-		'input'
-	]
-}
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
deleted file mode 100644
index ab7dac2b3..000000000
--- a/public/js/components/Calendar/Calendar.js
+++ /dev/null
@@ -1,301 +0,0 @@
-import CalendarMonth from './Month.js';
-import CalendarMonths from './Months.js';
-import CalendarYears from './Years.js';
-import CalendarWeek from './Week.js';
-import CalendarWeeks from './Weeks.js';
-import CalendarDay from './Day.js';
-import CalendarMinimized from './Minimized.js';
-import CalendarDate from '../../composables/CalendarDate.js';
-import CalendarDates from '../../composables/CalendarDates.js';
-
-const todayDate = new Date(new Date().setHours(0, 0, 0, 0));
-const today = todayDate.getTime()
-
-export default {
-	components: {
-		CalendarMonth,
-		CalendarMonths,
-		CalendarYears,
-		CalendarWeek,
-		CalendarWeeks,
-		CalendarDay,
-		CalendarMinimized,
-	},
-	provide() {
-		return {
-			today,
-			todayDate,
-			date: this.date,
-			focusDate: this.focusDate,
-			size: Vue.computed({ get: () => this.size }),
-			containerHeight: Vue.computed({ get: () => this.containerHeight }),
-			containerWidth: Vue.computed({ get: () => this.containerWidth }),
-			
-			events: Vue.computed(() => this.eventsPerDay),
-			filteredEvents: Vue.computed(() => this.filteredEvents),
-			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized', v) }),
-			showWeeks: this.showWeeks,
-			noMonthView: this.noMonthView,
-			noWeekView: this.noWeekView,
-			eventsAreNull: Vue.computed(() => this.events === null),
-			mode: Vue.computed(()=>this.mode),
-			selectedEvent: Vue.computed(() => this.selectedEvent),
-			setSelectedEvent: (event)=>{this.selectedEvent = event;},
-		};
-	},
-	props: {
-		events: Array,
-		initialDate: {
-			type: [Date, String],
-			default: new Date()
-		},
-		showWeeks: {
-			type: Boolean,
-			default: true
-		},
-		initialMode: {
-			type: String,
-			default: 'month'
-		},
-		minimized: Boolean,
-		noWeekView: Boolean,
-		noMonthView: Boolean
-	},
-	watch:{
-		mode(newVal) {
-			this.$emit('change:mode', newVal)
-		},
-		selectedEvent:{
-			handler(newSelectedEvent) {
-				this.$emit('selectedEvent', newSelectedEvent);
-			},
-			immediate: true,
-		},
-		// scroll to the first event if the html element was found
-		scrollTime(newValue,oldValue){
-			// return early if the scrollTime is not set
-			if (!newValue.scrollTime || !newValue?.doScroll) return;
-			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
-				return;
-			}
-			// scroll the LvPlan to the closest event
-			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
-			if (previousScrollAnchor) {
-				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-			}
-			else {
-				if (scrollAnchor) {
-					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-				}
-			}
-			
-		},
-	},
-	emits: [
-		'select:day',
-		'select:event',
-		'change:range',
-		'change:mode',
-		'update:minimized',
-		'selectedEvent',
-		'change:offset'
-	],
-	data() {
-		return {
-			header: '',
-			prevMode: null,
-			currMode: null,
-			date: new CalendarDate(),
-			focusDate: new CalendarDate(),
-			size: 0,
-			containerWidth: 0,
-			containerHeight: 0,
-			selectedEvent:null,
-		}
-	},
-	computed: {
-		sizeClass() { 
-			// mainly determines calendar font-size
-			return 'fhc-calendar-' + ['xs', 'sm', 'md', 'lg'][this.size];
-		},
-		mode: {
-			get() { return this.minimized ? 'minimized' : this.currMode; },
-			set(v) {
-				if (!v && this.prevMode) {
-					this.currMode = this.prevMode;
-					this.prevMode = null;
-				} else {
-					this.prevMode = this.currMode;
-					this.currMode = v;
-				}
-			}
-		},
-		eventsPerDay() {
-			if (!this.events)
-				return {};
-			return this.events.reduce((result, event) => {
-				let days = Math.ceil((event.end - event.start) / 86400000) || 1;
-				while (days-- > 0) {
-					let day = (new Date(event.start.getFullYear(), event.start.getMonth(), event.start.getDate() + days)).toDateString();
-					if (!result[day])
-						result[day] = [];
-					result[day].push(event);
-				}
-				return result;
-			}, {});
-		},
-		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
-		scrollTime() {
-				let doScroll = true;	
-				// return the first beginning time of the filtered events
-				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
-				{
-					let scrollTimeEvents = this.filteredEvents.filter(event=>{
-						return event.type !== 'moodle';
-					});
-					// do not compute a new scroll time if there are no other events than moodle events
-					if(!(scrollTimeEvents.length >0)){
-						doScroll = false;
-					}
-					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
-					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w}, doScroll, scrollTime };	
-				}
-				// there is no event that matches the current view mode constraints
-				else 
-				{
-					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w }, doScroll,scrollTime: null };
-				}
-			},
-		// filters the events based on the current calendar view mode
-		// week view - filter events based on their week
-		// day view - filter events based on their day and week
-		// month view - does not filter the events
-		filteredEvents: function(){
-			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
-				let filteredEvents = this.events.filter(event => {
-					let eventDate = new CalendarDate(new Date(event.datum));
-					if (this.mode == 'week' || this.mode == 'Week')
-					{
-						// week view filters the elements only for the same week
-						return this.focusDate.w == eventDate.w;
-					}
-					else if (this.mode == 'day' || this.mode == 'Day')
-					{
-						// day view filters the elements for the same day and the same week
-						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
-					}
-					else
-					{
-						// returns all the events, does not filter the events
-						return true;
-					}
-				})
-				
-				return filteredEvents;
-			}
-			else
-			{
-				return null;
-			}
-		},
-	},
-	methods: {
-		handleRangeOffset(event){
-			
-			let date = new Date(
-				this.focusDate.y,
-				this.focusDate.m,
-				this.focusDate.d
-			);
-			
-			date = date.getFullYear() + "-" +
-				String(date.getMonth() + 1).padStart(2, "0") + "-" +
-				String(date.getDate()).padStart(2, "0");
-
-			
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.mode[0].toUpperCase() + this.mode.slice(1),
-					focus_date: date,
-					lv_id: this.$route.params.lv_id || null
-				}
-			});
-
-			this.$emit('change:range',event);
-		},
-		setMode(mode) {
-			this.mode = mode
-		},
-		handleInput(day) {
-			this.$emit(day[0], day[1]);
-		},
-	},
-	created() {
-		const initMode = this.initialMode.toLowerCase()
-		const allowedInitialModes = ['day'];
-		if (!this.noWeekView)
-			allowedInitialModes.push('week');
-		if (!this.noMonthView)
-			allowedInitialModes.push('month');
-		this.mode = allowedInitialModes[allowedInitialModes.indexOf(initMode)] || allowedInitialModes.pop();
-		this.date.set(new Date(this.initialDate));
-		this.focusDate.set(this.date);
-	},
-	mounted() {
-		if (this.$refs.container) {
-			new ResizeObserver(entries => {
-				for (const entry of entries) {
-					const w = entry.contentBoxSize ? entry.contentBoxSize[0].inlineSize : entry.contentRect.width;
-					const h = entry.contentBoxSize ? entry.contentBoxSize[0].blockSize : entry.contentRect.height;
-
-					// https://getbootstrap.com/docs/5.0/layout/breakpoints/
-					// bootstrap breakpoints watch window size and this function monitors container size of calendar itself.
-					// calendar is using bootstrap breakpoints which influence layout, which retriggers this function 
-					// -> some width constellations will loop so we dont use values around bs5 breakpoints
-					// ['xs', 'sm', 'md', 'lg'][this.size]
-					if (w >= 600)
-						this.size = 3;
-					else if (w >= 350)
-						this.size = 2;
-					else if (w >= 250)
-						this.size = 1;
-					else
-						this.size = 0;
-					
-					this.containerWidth = w
-					this.containerHeight = h
-				}
-			}).observe(this.$refs.container);
-		}
-	},
-	unmounted(){
-		CalendarDates.cleanup();
-	},
-	template: /*html*/`
-	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="handleRangeOffset"
-		 @input="handleInput" >
-			<template #calendarDownloads>
-				<slot name="calendarDownloads" ></slot>
-			</template>
-			<template #monthPage="{event,day}">
-				<slot name="monthPage" :event="event" :day="day" ></slot>
-			</template>
-			<template #weekPage="{event,day}">
-				<slot name="weekPage" :event="event" :day="day" ></slot>
-			</template>
-			<template #dayPage="{event,day,mobile}">
-				<slot name="dayPage" :event="event" :day="day" :mobile="mobile"></slot>
-			</template>
-			<template #pageMobilContent="{lvMenu, event}">
-				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
-			</template>
-			<template #minimizedPage="{event,day}">
-				<slot name="minimizedPage" :event="event" :day="day"></slot>
-			</template>
-		</component>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
deleted file mode 100644
index 13128a520..000000000
--- a/public/js/components/Calendar/Day.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarDayPage from './Day/Page.js';
-import CalendarDate from '../../composables/CalendarDate.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarDayPage,
-		CalendarPane
-	},
-	computed: {
-		title() {
-			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
-		}
-	},
-	methods: {
-		paneChanged(dir) {
-			let previousDate = new CalendarDate(this.focusDate);
-			this.focusDate.d += dir;
-			this.emitRangeChanged(previousDate);
-		},
-		emitRangeChanged(previousDate, mounted) {
-			this.$emit('change:range', { start: previousDate, end:this.focusDate });
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: 0, d: -1 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 0, d: 1 });
-		},
-		selectEvent(event) {
-			this.$emit('input', ['select:event', event]);
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(new CalendarDate(this.focusDate.y, this.focusDate.m, this.focusDate.d -1), true);
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-day">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'week')">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-day-page :active="slot.active" :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<template #dayPage="{event,day,mobile}">
-					<slot name="dayPage" :event="event" :day="day" :mobile="mobile" ></slot>
-				</template>
-				<template #pageMobilContent="{lvMenu, event}">
-					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
-				</template>
-			</calendar-day-page>
-		</calendar-pane>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
deleted file mode 100644
index 43154aa0a..000000000
--- a/public/js/components/Calendar/Day/Page.js
+++ /dev/null
@@ -1,490 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-import LvModal from "../../../components/Cis/Mylv/LvModal.js";
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiAddons from '../../../api/factory/addons.js';
-
-function ggt(m, n) {
-	return n == 0 ? m : ggt(n, m % n);
-}
-
-function kgv(m, n) {
-	return (m * n) / ggt(m, n);
-}
-
-export default {
-	name: 'DayPage',
-	components: {
-		LvModal,
-	},
-	data() {
-		return {
-			hourPosition: null,
-			curHourPosition: null,
-			hourPositionTime: null,
-			lvMenu: null,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'noMonthView',
-		'filteredEvents',
-		'isSliding',
-		'calendarScrollTop',
-		'calendarClientHeight',
-		'setSelectedEvent',
-		'selectedEvent',
-		'rowMinHeight'
-	],
-	props: {
-		year: Number,
-		week: Number,
-		active: Boolean,
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input'
-	],
-	watch: {
-		//TODO: on first render non of the day-page components are active and the watcher on selectedEvent does not fetch the lvMenu
-		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
-		activeAndEventsReady: {
-			handler({active,events}) {
-				// handles fetching the lvMenu
-				if (active) {
-					if (!this.lvMenu) {
-						this.fetchLvMenu(this.selectedEvent);
-					}
-				
-					if(events){
-						// if no event is selected, select the first event of the day
-						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
-							let events = this.events[this.day.toDateString()].sort((a,b)=>{
-								let [a_stunde,a_minute,a_sekunden]= a.beginn.split(":");
-								let [b_stunde, b_minute, b_sekunden] = b.beginn.split(":");
-								a_stunde = Number(a_stunde);
-								a_minute = Number(a_minute);
-								a_sekunden= Number(a_sekunden);
-								b_stunde = Number(b_stunde);
-								b_minute = Number(b_minute);
-								b_sekunden = Number(b_sekunden);
-								if(a_stunde > b_stunde){
-									return 1;
-								}
-								else if(b_stunde > a_stunde){
-									return -1;
-								}
-								else if(a_minute > b_minute){
-									return 1;
-								}
-								else if (b_minute > a_minute){
-									return -1;
-								}
-								else{
-									return a_sekunden > b_sekunden? 1:-1;
-								}
-								
-							});
-							if (Array.isArray(events) && events.length > 0) {
-								this.setSelectedEvent(events[0]);
-							}
-						}
-					}
-				}
-			},
-			immediate: true,
-		},
-		selectedEvent: {
-			handler(event) {
-				// return early if the day-page component is not the active carousel item
-				if (!this.active) {
-					return;
-				}
-				this.lvMenu = null;
-				this.fetchLvMenu(event);
-			},
-			immediate: true,
-		},
-		isSliding: {
-			handler(value) {
-				if (value) {
-					this.setSelectedEvent(null);
-				}
-			}
-		}
-	},
-	computed: {
-		activeAndEventsReady(){
-			return {
-				active: this.active,
-				events: this.events,
-			}
-		},
-		allDayEvents() {
-			let allDayEvents = {};
-			for (let day in this.events) {
-				const filteredAllDayEvents = this.events[day].filter(event => event.allDayEvent);
-				if (filteredAllDayEvents.length > 0) {
-					allDayEvents[day] = filteredAllDayEvents;
-				}
-			};
-			return allDayEvents;
-		},
-		overlayStyle() {
-			return {
-				height:  this.getDayTimePercent + '%',
-			}
-		},
-		pageHeaderStyle() {
-			return {
-				'z-index': 4,
-				'grid-template-columns': 'repeat(' + this.day.length + ', 1fr)',
-				'grid-template-rows': 1,
-				position: 'sticky',
-				top: 0,
-			}
-		},
-		dayText(){
-			if(!this.day)return {};
-			return {
-				heading: this.day.toLocaleString(this.$p.user_locale.value, { dateStyle: 'short' }),
-				tag: this.day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 2 ? 'narrow' : (this.size < 3 ? 'short' : 'long') }),
-				datum: this.day.toLocaleString(this.$p.user_locale.value, [{ day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { dateStyle: 'short' }][this.size]),
-			}
-		},
-		noLvStyle() {
-			return {
-				top: (this.calendarScrollTop + 100) + 'px',
-				position: 'absolute',
-				left: 0,
-				'text-align': 'center',
-				width: '100%',
-				'z-index': 1,
-			}
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': 'var(--fhc-border)',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
-			}
-		},
-		curTime() {
-			const now = new Date();
-			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
-		},
-		curIndicatorStyle() {
-			return {
-				top:  this.getDayTimePercent + '%',
-			}
-		},
-		noEventsCondition() {
-			return !this.isSliding && (this.filteredEvents?.length === 0 || !this.filteredEvents);
-		},
-		hours() {
-			// returns an array with elements starting at 7 and ending at 24
-			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
-		},
-		day() {
-			return new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
-		},
-		eventsPerDayAndHour() {
-			// return early if the calendar pane is sliding
-			if (this.isSliding) return {};
-
-			const res = {};
-
-			let key = this.day.toDateString();
-
-			let nextDay = new Date(this.day);
-			nextDay.setDate(nextDay.getDate() + 1);
-			nextDay.setMilliseconds(nextDay.getMilliseconds() - 1);
-			let d = {events: [], lanes: 1};
-			if (this.events[key]) {
-				this.events[key].forEach(evt => {
-					if (evt.allDayEvent) return;
-					let event = {
-						orig: evt,
-						lane: 1,
-						maxLane: 1,
-						start: evt.start < this.day ? this.day : evt.start,
-						end: evt.end > nextDay ? nextDay : evt.end,
-						shared: [],
-						setSharedMaxRecursive(doneItems) {
-							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
-							doneItems.push(this);
-							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
-						}
-					};
-					event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
-					event.shared.forEach(other => other.shared.push(event));
-					let occupiedLanes = event.shared.map(other => other.lane);
-					while (occupiedLanes.includes(event.lane))
-						event.lane++;
-					event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
-					if (event.maxLane > 1) {
-						event.setSharedMaxRecursive([event]);
-					}
-					d.events.push(event);
-				});
-				d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
-			}
-			res[key] = d;
-
-			return res;
-		},
-		smallestTimeFrame() {
-			return [30, 15, 10, 5][this.size];
-		},
-		lookingAtToday() {
-			return this.date.compare(this.todayDate)
-		},
-		getDayTimePercent() {
-			const now = new Date(Date.now())
-			const currentMinutes = now.getMinutes() + now.getHours() * 60
-			let timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-
-			return timePercentage
-		}
-	},
-	methods: {
-		dayScrollBehavior(event){
-			this.$refs.dayScrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
-		dayGridStyle(day) {
-			const styleObj = {
-				'grid-template-columns': '1 1fr',
-				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
-			}
-
-			if(this.date.compare(this.todayDate)) {
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
-				// styleObj.opacity = 0.5; // would opaque the whole column
-			}
-
-			return styleObj
-		},
-		fetchLvMenu(event) {
-			if (event && event.type == 'lehreinheit') {
-				this.$api
-					.call(ApiLvPlan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
-					.then(res => res.data)
-					.then(studiensemester_kurzbz => this.$api.call(
-						ApiAddons.getLvMenu(
-							event.lehrveranstaltung_id,
-							studiensemester_kurzbz
-						)
-					))
-					.then(res => {
-						if (res.data) {
-							this.lvMenu = res.data;
-						}
-					});
-			}
-		},
-		hourGridIdentifier(hour) {
-			// this is the id attribute that is responsible to scroll the calender to the first event
-			return 'scroll' + hour + this.focusDate.d + this.week;
-		},
-		hourGridStyle(hour) {
-			return {
-				'pointer-events': 'none',
-				top: this.getAbsolutePositionForHour(hour),
-				left: 0,
-				right: 0,
-				'z-index': 0,
-			}
-		},
-		eventGridStyle(day, event) {
-			return {
-				'z-index': 1,
-				'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-				'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-				'grid-row-start': this.dateToMinutesOfDay(event.start),
-				'grid-row-end': this.dateToMinutesOfDay(event.end),
-				'background-color': event.orig.color,
-				'--test': this.dateToMinutesOfDay(event.end),
-			}
-		},
-		eventClick(evt) {
-			let event = evt.orig || evt;
-			this.setSelectedEvent(event);
-			this.$emit('input', event);
-		},
-		calcHourPosition(event) {
-			let height = this.$refs.events.getBoundingClientRect().height;
-			let top = this.$refs.events.getBoundingClientRect().top;
-			let position = event.clientY - top;
-			// position percentage of total height
-			let timePercentage = (position / height) * 100;
-			// minute percentage of total minutes
-			let result = (this.hours.length * 60) * (timePercentage / 100);
-			// calculate time in float
-			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
-			// get hour part of time
-			let currentHour = Math.floor(currentMinutes);
-			// get float part of time
-			let minutePercentage = currentMinutes % currentHour;
-			// calculate minutes from float part of time
-			let minute = Math.round(60 * minutePercentage);
-			// convert minutes to 5 minute interval
-			if (minute % 5 != 0) {
-				minute = Math.round(minute / 5) * 5;
-			}
-			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if (minute == 60) {
-				currentHour++;
-				minute = 0;
-			}
-
-			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
-			// convert current time in minutes
-			currentMinutes = currentHour * 60 + minute;
-			// calculate the minutes percentage of the total minutes 
-			timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-			// calculate the relative position of the time percentage
-			position = height * (timePercentage / 100);
-			this.hourPosition = position;
-
-			// add padding to minutes that consist of only one digit
-			minute.toString().length == 1 ? minute = "0" + minute : minute;
-			this.hourPositionTime = currentHour + ":" + minute;
-		},
-		getAbsolutePositionForHour(hour) {
-			// used for the absolute positioning of the gutters of hours
-			return (100 / this.hours.length) * (hour - (24 - this.hours.length)) + '%';
-		},
-		changeToMonth(day) {
-			if (!this.noMonthView) {
-				this.date.set(day);
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'month');
-			}
-		},
-		dateToMinutesOfDay(day) {
-			return Math.floor(((day.getHours() - 7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
-		}
-
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-day-page h-100">
-		<div class="row m-0 h-100">
-			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
-				<div class="d-flex flex-column h-100 border">
-					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
-						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
-							<div class="day fw-bold">{{dayText.tag}}</div>
-							<a href="#" class="small date text-decoration-none" >{{dayText.datum}}</a>
-						</div>
-					</div>
-					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
-
-						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
-							<div class="all-day-event-container" >
-								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-									<template v-for="(events,_day) in allDayEvents" :key="_day">
-										<div
-											v-if="dayindex == _day"
-											v-for="event in events"
-											:key="event"
-											style="top:0;"
-											@click.prevent="eventClick(event)"
-											:selected="event == selectedEvent"
-											:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-											class="d-grid m-1 small rounded overflow-hidden fhc-entry"
-											v-contrast
-											>
-											<div class="d-none d-xl-block">
-													<slot name="dayPage" :event="event" :day="day" :mobile="false">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
-												</div>
-												<div class="d-block d-xl-none">
-													<slot name="dayPage" :event="event" :day="day" :mobile="true">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
-												</div>
-										</div>
-									</template>
-								</div>
-							</div>
-
-
-
-							<div >
-								<h1 v-if="noEventsCondition" class="m-0 bs-body" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
-								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-									<Transition>
-										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-											<span class="border border-top-0 px-2">{{hourPositionTime}}</span>
-										</div>
-									</Transition>
-									<Transition>
-										<div v-if="lookingAtToday && !noEventsCondition" class="curTimeIndicator border-top small"  :style="curIndicatorStyle">
-											<span class="border border-top-0 px-2">{{curTime}}</span>
-										</div>
-									</Transition>
-									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
-									<div class="hours">
-										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-									</div>
-									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-
-										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
-										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast
-											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small border border-secondary rounded overflow-hidden" >
-											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
-											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
-													<p>this is a slot placeholder</p>
-												</slot>
-											</div>
-											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
-											<div class="d-block d-xl-none h-100 " @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
-													<p>this is a slot placeholder</p>
-												</slot>
-											</div>
-
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
-					<div @wheel.stop style="max-height: 100%; overflow-y:auto;" class="w-100">
-						<template v-if="selectedEvent ">
-							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
-								<p>this is a slot placeholder</p>
-							</slot>
-						</template>
-						<template v-else-if="noEventsCondition">
-							<h3>Keine Lehrveranstaltungen</h3>
-						</template>
-						<template v-else>
-							<div class="p-4 d-flex w-100 justify-content-center align-items-center">
-								<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-							</div>
-						</template>
-					</div>
-			</div>
-		</div>	
-	</div>
-
-`
-}
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
deleted file mode 100644
index 7ddb384f2..000000000
--- a/public/js/components/Calendar/Header.js
+++ /dev/null
@@ -1,99 +0,0 @@
-export default {
-	data(){
-		return{
-			selected: this.mode,
-			modes:{
-				day: { mode_bezeichnung: "day", icon: "fa-calendar-day" , condition:true}, 
-				week: { mode_bezeichnung: "week", icon: "fa-calendar-week", condition: !this.noWeekView }, 
-				month: { mode_bezeichnung: "month", icon: "fa-calendar-days", condition: !this.noMonthView }, 
-			},
-			headerPadding:null,
-		}
-	},
-	inject: [
-		'eventsAreNull',
-		'size',
-		'mode',
-		'noWeekView',
-		'noMonthView',
-		'containerWidth'
-	],
-	props: {
-		title: String
-	},
-	emits: [
-		'updateMode',
-		'prev',
-		'next',
-		'click'
-	],
-	methods:{
-		modeAriaLabelText(mode) {
-			switch (mode.toLowerCase()) {
-				case "day": return this.$p.t('LvPlan', 'modeDay');
-				case "week": return this.$p.t('LvPlan', 'modeWeek');
-				case "month": return this.$p.t('LvPlan', 'modeMonth');
-			}
-		},
-	},
-	computed: {
-		getHeaderClassSide() {
-			return this.containerWidth > 780 ? 'col-3' : 'col-12'
-		},
-		getHeaderClassMiddle() {
-			return this.containerWidth > 780 ? 'col-6' : 'col-12'
-		},
-		previousButtonAriaLabelText(){
-			switch(this.mode.toLowerCase()){
-				case "day": return this.$p.t('LvPlan', 'previousDay');
-				case "week": return this.$p.t('LvPlan', 'previousWeek');
-				case "weeks": return this.$p.t('LvPlan', 'previousYear');
-				case "month": return this.$p.t('LvPlan', 'previousMonth');
-			}
-		},
-		nextButtonAriaLabelText() {
-			switch (this.mode.toLowerCase()) {
-				case "day": return this.$p.t('LvPlan', 'nextDay');
-				case "week": return this.$p.t('LvPlan', 'nextWeek');
-				case "weeks": return this.$p.t('LvPlan', 'nextYear');
-				case "month": return this.$p.t('LvPlan', 'nextMonth');
-			}
-		},
-		
-	},
-	template: /*html*/`
-	<div class="calendar-header card-header w-100">
-		<div class="row align-items-center ">
-			<div :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-start align-items-center">
-				<slot name="calendarDownloads"></slot>
-			</div>
-			<div :class="getHeaderClassMiddle" :style="{'padding-left':headerPadding}">
-				<div class="row align-items-center justify-content-center">
-					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')" v-tooltip.top="{ value: previousButtonAriaLabelText, showDelay: 1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-left" aria-hidden="true"></i></button>
-					</div>
-					<div class="justify-content-center text-center col-auto">
-						<div class="d-flex justify-content-center align-items-center">
-							<button id="calendarHeaderTitle" class="btn btn-link text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
-								{{ title }}
-								<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
-							</button>
-						</div>
-					</div>
-					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')" v-tooltip.top="{value:nextButtonAriaLabelText, showDelay:1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-right" aria-hide="true"></i></button>
-					</div>
-				</div>
-			</div>
-			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
-				<div  style="pointer-events: all;">
-					<div  role="group" aria-label="Kalender Modus">
-						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary card d-inline-block" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
-							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
-						</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>`
-}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
deleted file mode 100644
index 96db36ada..000000000
--- a/public/js/components/Calendar/Minimized.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	inject: [
-		'size',
-		'minimized',
-		'date',
-	],
-	data() {
-		return {
-			start: 0
-		}
-	},
-	methods: {
-		maximize() {
-			this.minimized = false;
-		}
-	},
-	template: `
-	<div class="fhc-calendar-minimized h-100 d-flex flex-column">
-		<slot name="minimizedPage"></slot>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
deleted file mode 100644
index 27ec50fbf..000000000
--- a/public/js/components/Calendar/Month.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarMonthPage from './Month/Page.js';
-import BsModal from "../Bootstrap/Modal.js";
-import Months from "./Months.js";
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarMonthPage,
-		CalendarPane,
-		BsModal,
-		Months
-	},
-	emits: [
-		"change:offset"
-	],
-	data() {
-		return {
-			syncOnNextChange: false
-		}
-	},
-	computed: {
-		title() {
-			return this.focusDate.format({month: ['short','long','long','long'][this.size], year: 'numeric'}, this.$p.user_locale.value);
-		}
-	},
-	methods: {
-		handleMonthChanged(month) {
-			this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		hideMonthsModal() {
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		handleHeaderClickMonth() {
-			this.$refs.modalDatepickerContainer.show()
-		},
-		paneChanged(dir) {
-			if (this.syncOnNextChange) {
-				this.syncOnNextChange = false;
-				this.focusDate.set(this.date);
-			} else {
-				this.focusDate.moveMonthInDirection(dir)
-			}
-			this.emitRangeChanged()
-		},
-		emitRangeChanged(mounted = false) {
-			this.$emit('change:range', {
-				start: new Date(this.focusDate.y, this.focusDate.m, 1),
-				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
-				mounted
-			});
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: -1, d: 0 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 1, d: 0 });
-		},
-		selectDay(day) {
-			let m = day.getMonth();
-			if (this.focusDate.m != m) {
-				this.syncOnNextChange = true;
-				if (this.focusDate.m-1 == m || (m == 11 && !this.focusDate.m))
-					this.$refs.pane.prev();
-				else
-					this.$refs.pane.next();
-			} else {
-				this.focusDate.set(this.date);
-			}
-			this.$emit('input', ['select:day',day])
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(true)
-	},
-	template: `
-	<div class="fhc-calendar-month">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickMonth">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" >
-				<template #monthPage="{event,day}">
-					<slot name="monthPage" :event="event" :day="day" ></slot>
-				</template>
-			</calendar-month-page>
-		</calendar-pane>
-	</div>
-
-	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
-		<template v-slot:default>
-			<months @change="handleMonthChanged"></months>
-		</template>
-	</bs-modal>
-`
-}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
deleted file mode 100644
index bd974afde..000000000
--- a/public/js/components/Calendar/Month/Page.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-
-export default {
-	name: 'MonthPage',
-	data(){
-		return{
-			highlightedWeek: null,
-			highlightedDay: null,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'showWeeks',
-		'noWeekView',
-		'selectedEvent',
-		'setSelectedEvent'
-	],
-	props: {
-		year: Number,
-		month: Number
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input'
-	],
-	computed: {
-		dayText(){
-			if (!this.size || !this.weeks[0]?.days) return {};
-			let dayTextMap ={};
-			this.weeks[0].days.forEach((day)=>{
-				dayTextMap[day] = day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 1 ? 'narrow' : (this.size < 3 ? 'short' : 'long') });
-			});
-			return dayTextMap;
-		},
-		weeks() {
-			let firstDayOfMonth = new CalendarDate(this.year, this.month, 1);
-			let startDay = firstDayOfMonth.firstDayOfCalendarMonth;
-			let endDay = firstDayOfMonth.lastDayOfCalendarMonth;
-			
-			let res = [];
-			let week = {no:0,y:0,days:[]};
-			while (startDay <= endDay) {
-				week.days.push(new Date(startDay));
-				
-				if (week.days.length == 7) {
-					let d = new CalendarDate(week.days[5]);
-					week.no = d.w;
-					week.y = d.y;
-					res.push(week);
-					week = {no:0,y:0,days:[]};
-				}
-				startDay.setDate(startDay.getDate() + 1);
-			}
-			return res;
-		},
-		
-	},
-	methods: {
-		getDayClass(week, day) {
-			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
-			const isHighlightedWeek = this.isHighlightedWeek(week)
-			const isHighlightedDay = this.isHighlightedDay(day)
-			const isThisDate = this.focusDate.compare(day)
-
-			const isNotThisMonth = day.getMonth() != this.month
-			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
-			
-			if(isThisDate) classstring += ' fhc-calendar-month-page-day-focusday'
-			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
-			if(isHighlightedDay) classstring += ' fhc-highlight-day'
-			
-			if(isNotThisMonth) classstring += ' opacity-25'
-			if(isInThePast) classstring += ' fhc-calendar-past'
-			return classstring
-		},
-		selectDay(day, event) {
-			this.setSelectedEvent(event);
-			this.date.set(day);
-			this.$emit('input', day);
-		},
-		changeToWeek(week) {
-			if (!this.noWeekView) {
-				if (!this.focusDate.isInWeek(week.no, week.y))
-					this.focusDate.set(week.days[0]);
-				this.$emit('updateMode', 'week');
-			}
-		},
-		highlight(week, day){
-			this.highlightedWeek = week.no; 
-			this.highlightedDay = day;
-		},
-		isHighlightedDay(day) {
-			return day == this.highlightedDay
-		},
-		isHighlightedWeek(week) {
-			return  week.no == this.highlightedWeek
-		},
-		clickEvent(day,week) {
-			if(!this.noWeekView)
-			{
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'day');
-			}
-			this.selectDay(day);
-		},
-		getNumberStyle(day) {
-			
-			const styleObj = {}
-			styleObj.display = 'inline-block';
-			styleObj.height = '32px';
-			styleObj['line-height'] = '32px';
-			styleObj['text-align'] = 'center';
-			styleObj['font-weight'] = 'bold';
-			styleObj['font-size'] = '14px';
-
-			if(day.getDate() === this.todayDate.getDate() 
-				&& day.getMonth() === this.todayDate.getMonth() 
-				&& day.getFullYear() === this.todayDate.getFullYear()) {
-				styleObj['background-color'] = 'var(--fhc-primary)'; 
-				styleObj.color = 'white';
-			}
-			
-			return styleObj
-		} 
-	},
-	mounted() {
-		const container = document.getElementById("calendarContainer")
-		if(container) container.style['overflow-y'] = 'auto'
-		
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
-		<div v-if="showWeeks" class=" fw-bold border-top border-bottom text-center"></div>
-		<div v-for="day in weeks[0].days" :key="day" class=" fw-bold border-top border-bottom text-center">
-			{{dayText[day]}}
-		</div>
-		<template v-for="week in weeks"
-		:key="week.no">
-			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end "
-			@click.prevent="changeToWeek(week)">{{week.no}}</a>
-			<a href="#"
-			@click.prevent="clickEvent(day,week)"
-			@mouseover="highlight(week,day)"
-			@mouseleave="highlightedWeek = null; highlightedDay = null"
-			v-for="day in week.days"
-			:key="day"
-			:class="getDayClass(week, day)" 
-			>
-				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
-				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
-					<div v-for="event in events[day.toDateString()]" :key="event.id" 
-					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click.stop="selectDay(day,event)">
-						<slot  name="monthPage" :event="event" :day="day" >
-							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-						</slot>
-					</div>
-				</span>
-			</a>
-		</template>
-	</div>
-`
-}
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
deleted file mode 100644
index 6263e1b01..000000000
--- a/public/js/components/Calendar/Months.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	emits: [
-		'change'
-	],
-	inject: [
-		'size'
-	],
-	data() {
-		return {
-			// TODO: 36, 24, 16 (2+ 12 + 2) months to enable year switch?
-			monthIndices: [...Array(12).keys()]
-		}
-	},
-	computed: {
-		title() {
-			return this.focusDate.format({year: 'numeric'});
-		},
-		months() {
-			return this.monthIndices.map(i => (new Date(0, i, 1)).toLocaleString(this.$p.user_locale.value, {month: this.size < 2 ? 'short' : 'long'}));
-		}
-	},
-	template: `
-	<div class="fhc-calendar-months">
-		<div class="d-flex flex-wrap">
-			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
-				<button @click=" $emit('change', key); focusDate.m = key;" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
-					{{month}}
-				</button>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
deleted file mode 100644
index 6bc00752b..000000000
--- a/public/js/components/Calendar/Pane.js
+++ /dev/null
@@ -1,94 +0,0 @@
-export default {
-	name: 'Pane',
-	emits: [
-		'slid'
-	],
-	data() {
-		return {
-			carousel: null,
-			queue: 0,
-			offset: 0,
-			slideAnimation:false,
-			scrollTop:null,
-			clientHeight:null,
-			carouselItems:null,
-		}
-	},
-	provide() {
-		return {
-			isSliding: Vue.computed(() => this.slideAnimation),
-			calendarScrollTop: Vue.computed(() =>this.scrollTop),
-			calendarClientHeight: Vue.computed(() => this.clientHeight),
-		}
-	},
-	computed: {
-		offsets() {
-			return [...Array(3).keys()].map(i => (3+i-this.offset)%3-1);
-		},
-		activeCarouselItemIndex() {
-			if (Array.isArray(this.carouselItems) && this.carouselItems.length > 0) {
-				for(let index=0; index < this.carouselItems.length; index++){
-					if (this.carouselItems[index] == true){
-						return index;
-					}
-				}
-
-			}
-			return -1;
-		}
-		
-	},
-	methods: {
-		scrollBehavior(event){
-			this.$refs.calendarContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
-		scrollCalendar(event){
-			this.scrollTop = this.$refs.calendarContainer.scrollTop;
-			this.clientHeight = this.$refs.calendarContainer.clientHeight;
-		},
-		prev() {
-			if (!this.queue--)
-				this.carousel.prev();
-		},
-		next() {
-			if (!this.queue++)
-				this.carousel.next();
-		},
-		slid(evt) {
-			let dir = evt.direction == 'left' ? 1 : -1;
-			this.queue -= dir;
-			this.$emit('slid', dir);
-			this.offset = (3+this.offset+dir)%3;
-			if (this.queue) {
-				if (this.queue > 0)
-					this.carousel.next();
-				else
-					this.carousel.prev();
-			}
-			this.carouselItems = this.$refs.carouselItems.map((item) => { return item.classList.contains('active') });
-			this.slideAnimation = false;
-		},
-		slide(evt) {
-			this.slideAnimation = true;
-		}
-	},
-	mounted() {
-		if (this.$refs.carousel) {
-			this.$refs.carousel.children[0].children[1].classList.add('active');
-			this.carousel = new window.bootstrap.Carousel(this.$refs.carousel, {
-				interval: false
-			});
-		}
-		this.carouselItems = this.$refs.carouselItems.map((item)=>{return item.classList.contains('active')});
-		this.scrollTop = this.$refs.calendarContainer.scrollTop;
-		this.clientHeight = this.$refs.calendarContainer.clientHeight;
-	},
-	template: `
-	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner fhc-calendar-pane">
-			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item fhc-calendar-pane">
-				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
deleted file mode 100644
index 2cca97a27..000000000
--- a/public/js/components/Calendar/Week.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarWeekPage from './Week/Page.js';
-import BsModal from "../Bootstrap/Modal.js";
-import Weeks from "./Weeks.js";
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarWeekPage,
-		CalendarPane,
-		BsModal,
-		Weeks
-	},
-	emits: [
-		"change:offset"
-	],
-	computed: {
-		title() {
-			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
-		}
-	},
-	methods: {
-		handleWeekChanged(week) {
-			// this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		hideMonthsModal() {
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		handleHeaderClickWeek() {
-			this.$emit('updateMode', 'weeks');//
-			//this.$refs.modalDatepickerContainer.show()
-		},
-		paneChanged(dir) {
-			this.focusDate.d += dir * 7;
-			this.emitRangeChanged();
-		},
-		emitRangeChanged(mounted = false) {
-			let start = this.focusDate.firstDayOfWeek;
-			let end = this.focusDate.lastDayOfWeek;
-			this.$emit('change:range', { start, end, mounted });
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: 0, d: -7 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 0, d: 7 });
-		},
-		selectEvent(event) {
-			this.$emit('input', ['select:event',event]);
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(true);
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-week">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickWeek">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page :active="slot.active" :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<template #weekPage="{event,day}">
-					<slot name="weekPage" :event="event" :day="day" ></slot>
-				</template>
-			</calendar-week-page>
-		</calendar-pane>
-	</div>
-
-	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
-		<template v-slot:default>
-			<weeks :header="false" @change="handleWeekChanged"></weeks>
-		</template>
-	</bs-modal>
-`
-}
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
deleted file mode 100644
index b5bfcd3c3..000000000
--- a/public/js/components/Calendar/Week/Page.js
+++ /dev/null
@@ -1,387 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-
-function ggt(m,n) { return n==0 ? m : ggt(n, m%n); }
-function kgv(m,n) { return (m*n) / ggt(m,n); }
-
-export default {
-	name: 'WeekPage',
-	data(){
-		return{
-			hourPosition:null,
-			hourPositionTime:null,
-			resizeObserver: null,
-			width: 0,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'noMonthView',
-		'isSliding',
-		'selectedEvent',
-		'setSelectedEvent',
-		'rowMinHeight'
-	],
-	props: {
-		year: Number,
-		week: Number,
-		active: Boolean
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input',
-	],
-	computed: {
-		allDayEvents(){
-			let allDayEvents = {};
-			for(let day in this.events){
-				const filteredAllDayEvents = this.events[day].filter(event=>event.allDayEvent);
-				if (filteredAllDayEvents.length > 0){
-					allDayEvents[day]=filteredAllDayEvents;
-				}
-			};
-			return allDayEvents;
-		},
-		getGridStyle() {
-			return {
-				'min-height': this.rowMinHeight,
-				// this.size is the magic number anyway which directs font-size,
-				// which in turn influences a lot of layout
-				width: '42px'
-			}
-		},
-		laneWidth() {
-			return (this.width - 42) / this.days.length
-		},
-		curTime() {
-			const now = new Date();
-			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
-		},
-		curIndicatorStyle() {
-			return {
-				top: this.getDayTimePercent + '%',
-			}
-		},
-		pageHeaderStyle(){
-			return {
-				'z-index': 4,
-				'grid-template-columns': 'repeat(' + this.days.length + ', 1fr)',
-				'grid-template-rows': 1,
-				position: 'sticky',
-				top: 0,
-			}
-		},
-		overlayStyle() {
-			return {
-				height:  this.getDayTimePercent + '%',
-				width: this.laneWidth + 'px',
-			}
-		},
-		
-		hours(){
-			// returns an array with elements starting at 7 and ending at 24
-			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
-		},
-		dayText() {
-			if (!this.size || !this.days) return {};
-			let dayTextMap ={};
-			this.days.forEach((day)=>{
-				dayTextMap[day] = {
-					heading: day.toLocaleString(this.$p.user_locale.value, { dateStyle: 'short' }),
-					tag: day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 2 ? 'narrow' : (this.size < 3 ? 'short' : 'long') }),
-					datum: day.toLocaleString(this.$p.user_locale.value, [{ day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { dateStyle: 'short' }][this.size]),
-				};
-			});
-			return dayTextMap;
-		},
-		days() {
-			
-			let tmpDate = new CalendarDate(this.year,1,1); // NOTE(chris): somewhere in the middle of the year
-			tmpDate.w = this.week;
-			let startDay = tmpDate.firstDayOfWeek;
-			let result = [];
-			for (let i = 0; i < 7; i++) {
-				result.push(new Date(startDay.getFullYear(), startDay.getMonth(), startDay.getDate() + i));
-			}
-			return result;
-
-		},
-		eventsPerDayAndHour() {
-			// return early if the calendar pane is sliding
-			if (this.isSliding) return {};
-			const res = {};
-			this.days.forEach(day => {
-				let key = day.toDateString();
-				
-				let nextDay = new Date(day);
-				nextDay.setDate(nextDay.getDate()+1);
-				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
-				let d = {events:[],lanes:1, isPast: false};
-				d.isPast = nextDay.getTime() < this.today
-				d.isToday = nextDay.getFullYear() === this.todayDate.getFullYear() && nextDay.getMonth() === this.todayDate.getMonth() && nextDay.getDate() === this.todayDate.getDate()
-				if (this.events[key]) {
-					this.events[key].forEach(evt => {
-						if (evt.allDayEvent) return;
-						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
-							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
-							doneItems.push(this);
-							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
-						}};
-						event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
-						event.shared.forEach(other => other.shared.push(event));
-						let occupiedLanes = event.shared.map(other => other.lane);
-						while (occupiedLanes.includes(event.lane))
-							event.lane++;
-						event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
-						if (event.maxLane > 1) {
-							event.setSharedMaxRecursive([event]);
-						}
-						d.events.push(event);
-					});
-					d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
-				}
-				res[key] = d;
-			});
-			return res;
-		},
-		smallestTimeFrame() {
-			return [30,15,10,5][this.size];
-		},
-		lookingAtToday() {
-			return this.days.some(d => 
-				d.getFullYear() === this.todayDate.getFullYear() &&
-				d.getMonth() === this.todayDate.getMonth() &&
-				d.getDate() === this.todayDate.getDate()
-			)
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': 'var(--fhc-border)',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
-			}
-		},
-		getDayTimePercent() {
-			const now = new Date(Date.now())
-			const currentMinutes = now.getMinutes() + now.getHours() * 60
-			let timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-
-			return timePercentage
-		}
-	}, 
-	methods: {
-		hourGridIdentifier(hour) {
-			// this is the id attribute that is responsible to scroll the calender to the first event
-			return 'scroll' + hour + this.focusDate.d + this.week;
-		},
-		hourGridStyle(hour) {
-			return {
-				'pointer-events': 'none',
-				top: this.getAbsolutePositionForHour(hour),
-				left: 0,
-				right: 0,
-				'z-index': 0
-			}
-		},
-		dayGridStyle(day) {
-			const styleObj = {
-				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
-				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
-			}
-			if(day.isPast) {
-				//styleObj['background-color'] = 'var(--calendar-past)'
-				styleObj['border-color'] = 'var(--fhc-border)';
-			} else if (day.isToday) {
-				
-				//styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = 'var(--fhc-border)';
-			}
-			
-			return styleObj
-		},
-		eventGridStyle(day, event) {
-			return {
-					'z-index': 1,
-					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-					'grid-row-start': this.dateToMinutesOfDay(event.start),
-					'grid-row-end': this.dateToMinutesOfDay(event.end),
-					'background-color': event.orig.color,
-					'max-height': '75px'
-			};
-		},
-		calcHourPosition(event) {
-			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;
-			let top = this.$refs['eventsRef' + this.week].getBoundingClientRect().top;
-			let position = event.clientY - top;
-			// position percentage of total height
-			let timePercentage = (position / height) * 100;
-			// minute percentage of total minutes
-			let result = (this.hours.length * 60) * (timePercentage / 100);
-			// calculate time in float
-			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
-			// get hour part of time
-			let currentHour = Math.floor(currentMinutes);
-			// get float part of time
-			let minutePercentage = currentMinutes % currentHour;
-			// calculate minutes from float part of time
-			let minute = Math.round(60 * minutePercentage);
-			// convert minutes to 5 minute interval
-			if (minute % 5 != 0) {
-				minute = Math.round(minute / 5) * 5;
-			}
-			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if (minute == 60) {
-				currentHour++;
-				minute = 0;
-			}
-
-			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
-			// convert current time in minutes
-			currentMinutes = currentHour * 60 + minute;
-			// calculate the minutes percentage of the total minutes 
-			timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-			// calculate the relative position of the time percentage
-			position = height * (timePercentage / 100);
-			this.hourPosition = position;
-
-			// add padding to minutes that consist of only one digit
-			minute.toString().length == 1 ? minute = "0" + minute : minute;
-			this.hourPositionTime = currentHour + ":" + minute;
-		},
-		getAbsolutePositionForHour(hour){
-			// used for the absolute positioning of the gutters of hours
-			return (100 / this.hours.length) * (hour - (24-this.hours.length)) + '%';
-		},
-		changeToMonth(day) {
-			if (!this.noMonthView) {
-				this.date.set(day);
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'month');
-			}
-		},
-		changeToDay(day) {
-			this.date.set(day);
-			this.focusDate.set(day);
-			this.$emit('updateMode', 'day');
-		},
-		dateToMinutesOfDay(day) {
-			// subtract 7 from the total hours because the hours range from 7 to 24
-			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
-		},
-		weekPageClick(event, day) {
-			this.setSelectedEvent(event);
-			this.focusDate.set(new CalendarDate(new Date(event.datum)));
-			this.$emit('input', event)
-		},
-		initResizeObserver() {
-			const events = this.$refs['eventsRef'+this.week];
-			if (!events) return;
-
-			this.resizeObserver = new ResizeObserver((entries) => {
-				for (let entry of entries) {
-					const { width, height } = entry.contentRect;
-					if(width > 0) this.width = width
-				}
-			});
-
-			this.resizeObserver.observe(events);
-		},
-		destroyResizeObserver() {
-			if (this.resizeObserver) {
-				this.resizeObserver.disconnect();
-				this.resizeObserver = null;
-			}
-		},
-	},
-	mounted() {
-
-		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
-
-		const container = document.getElementById("calendarContainer")
-		if(container) {
-			container.style['overflow-y'] = 'scroll'
-			container.style['overflow-x'] = 'auto'
-		}
-		
-		this.initResizeObserver();
-	},
-	beforeUnmount() {
-		this.destroyResizeObserver();
-	},
-	template: /*html*/`
-	<div ref="page" class="fhc-calendar-week-page" style="min-width: 700px;">
-	<div class="d-flex flex-column">
-			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
-				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
-					<div class="day fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="date small text-decoration-none" >{{dayText[day]?.datum}}</a>
-				</div>
-			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
-				<div class="all-day-event-container" >
-					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-						<template v-for="(events,_day) in allDayEvents" :key="_day">
-
-							<div
-								v-if="dayindex == _day"
-								v-for="event in events"
-								:key="event"
-								style="top:0;"
-								@click.prevent="weekPageClick(event, _day)"
-								:selected="event == selectedEvent"
-								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
-								v-contrast
-								>
-								<slot class="p-1" name="weekPage" :event="event" :day="day">
-									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-								</slot>
-							</div>
-						</template>
-					</div>
-				</div>
-				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour" class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
-					<Transition>
-						<div v-if="hourPosition" class="fhc-calendar-hour-indicator position-absolute small" :style="indicatorStyle" >
-							<span class=" border border-top-0 px-2 ">{{hourPositionTime}}</span>
-						</div>
-					</Transition>
-					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
-						<Transition>
-							<div v-if="day.isToday" class="border-top small curTimeIndicator" :style="curIndicatorStyle">
-								<span class="fhc-body-bg border border-top-0 px-2">{{curTime}}</span>
-							</div>
-						</Transition>
-						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
-						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)"
-						:selected="event.orig == selectedEvent"
-						:style="eventGridStyle(day,event)"
-						class="mx-2 small rounded overflow-hidden fhc-entry border border-secondary"
-						v-contrast >
-							<slot name="weekPage" :event="event.orig" :day="day">
-								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-							</slot>		
-						</div>
-						
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
deleted file mode 100644
index 057889e83..000000000
--- a/public/js/components/Calendar/Weeks.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	emits: [
-		'change'
-	],
-	inject: [
-		'size',
-		'focusDate',
-		'mode',
-	],
-	props: {
-		header: {
-			type: Boolean,
-			default: true
-		}
-	},
-	computed: {
-		weeks(){
-			return [...Array(this.focusDate.numWeeks).keys()].map(i => i + 1);
-		},
-		title() {
-			return this.focusDate.format({year: 'numeric'});
-		}
-	},
-	methods: {
-		setWeek(week) {
-			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
-			this.focusDate.w = week;
-			this.$emit('updateMode', 'week');
-			Vue.nextTick(()=>{
-				let date = new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
-				date = date.getFullYear() + "-" +
-					String(date.getMonth() + 1).padStart(2, "0") + "-" +
-					String(date.getDate()).padStart(2, "0");
-				this.$router.push({
-					name: "LvPlan",
-					params: {
-						mode: this.mode[0].toUpperCase() + this.mode.slice(1),
-						focus_date: date,
-						lv_id: this.$route.params.lv_id || null
-					}
-				})
-			})
-		},
-		prev(){
-			this.focusDate.y--;
-			this.focusDate._clean();
-		},
-		next() {
-			this.focusDate.y++;
-			this.focusDate._clean();
-		},
-	},
-	template: `
-	<div class="fhc-calendar-weeks h-100">
-		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
-		<div class="d-flex flex-wrap">
-			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
-				<button @click="setWeek(week)" class="btn btn-outline-secondary card" :class="{'border-0': week != focusDate.w}">
-					{{week}}
-				</button>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
deleted file mode 100644
index baff2eb6c..000000000
--- a/public/js/components/Calendar/Years.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarYearsPage from './Years/Page.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarYearsPage,
-		CalendarPane
-	},
-	inject: [
-		'size'
-	],
-	data() {
-		return {
-			start: 0
-		}
-	},
-	computed: {
-		range() {
-			switch (this.size) {
-			case 3:
-			// eslint-disable-next-line
-			case 2:
-				return 24;
-			}
-			return 12;
-		},
-		end() {
-			return this.start + this.range - 1;
-		},
-		title() {
-			return this.start + ' - ' + this.end;
-		}
-	},
-	methods: {
-		paneChanged(dir) {
-			this.start += this.range * dir;
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: -1, m: 0, d: 0 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 1, m: 0, d: 0 });
-		}
-	},
-	created() {
-		this.start = this.focusDate.y - this.focusDate.y%this.range;
-	},
-	template: `
-	<div class="fhc-calendar-years">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" />
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @updateMode="$emit('updateMode')"/>
-		</calendar-pane>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
deleted file mode 100644
index b7461cd03..000000000
--- a/public/js/components/Calendar/Years/Page.js
+++ /dev/null
@@ -1,36 +0,0 @@
-export default {
-	inject: [
-		'focusDate'
-	],
-	props: {
-		start: Number,
-		end: Number
-	},
-	emits: [
-		'updateMode'
-	],
-	data() {
-		return {
-		}
-	},
-	computed: {
-		years() {
-			return [...Array(this.end - this.start).keys()].map(i => i + this.start);
-		}
-	},
-	mounted() {
-		const container = document.getElementById("calendarContainer")
-		if(container) {
-			container.style['overflow-y'] = 'scroll'
-			container.style['overflow-x'] = 'auto'
-		}
-	},
-	template: `
-	<div class="fhc-calendar-years-page d-flex flex-wrap">
-		<div v-for="year in years" :key="year" class="d-grid col-4">
-			<button class="btn btn-outline-secondary card justify-content-center" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
-				{{year}}
-			</button>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
deleted file mode 100644
index 3f52cec8f..000000000
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import BsModal from "../../Bootstrap/Modal.js";
-import Alert from "../../Bootstrap/Alert.js";
-import LvMenu from "./LvMenu.js"
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiAddons from '../../../api/factory/addons.js';
-
-export default {
-	components: {
-		BsModal,
-		Alert,
-		LvMenu,
-	},
-	mixins: [BsModal],
-	props: {
-		event:Object,
-		title:{
-			type:String,
-			default:"title"
-		},
-		showMenu:{
-			type:Boolean,
-			default:true,
-		},
-	/*
-	* NOTE(chris):
-	* Hack to expose in "emits" declared events to $props which we use
-	* in the v-bind directive to forward all events.
-	* @see: https://github.com/vuejs/core/issues/3432
-	*/
-		onHideBsModal: Function,
-		onHiddenBsModal: Function,
-		onHidePreventedBsModal: Function,
-		onShowBsModal: Function,
-		onShownBsModal: Function,
-	},
-	data() {
-		return {
-			menu: null,
-			result: false,
-			info: null,
-		};
-	},
-	methods:{
-		onHideModal: function(){
-			this.menu = null;
-		},
-		onModalShow: function()
-		{
-			// do not load the menu if the menu is not getting rendered
-			if(!this.showMenu) return;
-
-			if (this.event.type == 'lehreinheit') {
-				this.$api
-					.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
-					.then(res => res.data)
-					.then(studiensemester_kurzbz => this.$api.call(
-						ApiAddons.getLvMenu(
-							this.event.lehrveranstaltung_id,
-							studiensemester_kurzbz
-						)
-					))
-					.then(res => {
-						if (res.data) {
-							this.menu = res.data;
-						}
-					});
-			}
-		}
-	},
-	mounted() {
-		this.modal = this.$refs.modalContainer.modal;
-	},
-	popup(options) {
-		return BsModal.popup.bind(this)(null, options);
-	},
-	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
-		<template v-slot:title>
-			<slot name="modalTitle"></slot>
-		</template>
-		<template v-slot:default>
-			<slot name="modalContent"></slot>
-			
-			<template v-if="showMenu && this.menu">
-				<h5>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h5>
-				<lv-menu :menu="menu"></lv-menu>
-			</template>
-		</template>
-		<!-- optional footer -->
-		<template  v-slot:footer >
-			<button class="btn btn-outline-secondary card" @click="hide">{{$p.t('ui','cancel')}}</button>    
-		</template>
-		<!-- end of optional footer --> 
-	</bs-modal>`,
-};
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
deleted file mode 100644
index e85cbeeac..000000000
--- a/public/js/composables/CalendarDate.js
+++ /dev/null
@@ -1,274 +0,0 @@
-import {user_locale} from "../plugin/Phrasen.js";
-import CalendarDates from "./CalendarDates.js";
-
-const monthDayRanges = []
-for(let i = 1; i < 13; i++) {
-	monthDayRanges.push(new Date(new Date(Date.now()).getFullYear(), i, 0).getDate())
-}
-
-class CalendarDate {
-	constructor(y, m, d) {
-		this.weekStart = CalendarDate.getWeekStart();
-		this.watchLocale = Vue.watch(
-			user_locale,
-			(newLocale, oldLocale, onCleanup) =>{
-				this.weekStart = CalendarDate.getWeekStart();
-				this._clean();
-				onCleanup((cleanup)=>{
-					// do clean up
-				});
-			},
-			
-		);
-		this.set(y, m, d);
-		this._clean();
-		CalendarDates.subscribe(this);
-	}
-	get y() { return this._y }
-	set y(v) { this._y = v; this._clean() }
-	get m() { return this._m }
-	set m(v) { this._m = v; this._clean() }
-	get d() { return this._d }
-	set d(v) { this._d = v; this._clean() }
-	/**
-	 * @see https://www.smart-rechner.de/kalenderwochen/rechner.php
-	 */
-	get w() {
-		if (this._w === null) {
-			if (this.weekStart == 1 && this._m == 11 && this._d > 28 && this.wd <= this._d-29) {
-				this._w = 1;
-			} else if (this.weekStart == 1 && this._m == 0 && this._d < 4 && 3-this.wd <= -this._d) {
-				let weekStartOfTheYear = new Date(this.y-1, 0, this.weekStart == 1 ? 4 : 1);
-				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
-				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
-			} else {
-				let weekStartOfTheYear = new Date(this.y, 0, this.weekStart == 1 ? 4 : 1);
-				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
-				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
-			}
-		}
-		return this._w;
-	}
-	set w(v) {
-		if (this.w != v) {
-			let lw = this.numWeeks;
-			
-			this.d += (v - this.w) * 7;
-
-			if (v > 0 && v <= lw && this.w != v) {
-				if (this.weekStart != 1) {
-					if (this.w == 1) {
-						this.set(this.firstDayOfWeek);
-					} else {
-						this.set(this.lastDayOfWeek);
-					}
-				}
-				if (this.w != v) {
-					console.error('couldn\'t set the week', this, v);
-				}
-			}
-		}
-	}
-	get wYear() {
-		if( this.w === 1 ) {
-			return this.cdLastDayOfWeek.y;
-		}
-		return this.cdFirstDayOfWeek.y;
-	}
-	get wd() {
-		if (this._wd === null) {
-			// the .getDay() method from js Date object ALWAYS returns values from 0 to 6, where 0 is Sunday and 6 is Saturday
-			// aligns the getDay() result of the Date to the weekStart of the CalendarDate
-			this._wd = ((new Date(this.y, this.m, this.d)).getDay()+7-this.weekStart)%7;
-		}
-		return this._wd;
-	}
-	get firstDayOfWeek() {
-		let firstDayOfWeek = new Date(this.y, this.m, this.d);
-		// to ensure that firstDayOfWeek.getDay() is always greater than this.weekStart we add 7 and wrap the result around with %7 to avoid negative numbers
-		firstDayOfWeek.setDate(this.d -(firstDayOfWeek.getDay()+7-this.weekStart)%7);
-		return firstDayOfWeek;
-	}
-	get cdFirstDayOfWeek() {
-		let FirstDayOfWeek = new CalendarDate(this.firstDayOfWeek);
-		return FirstDayOfWeek;
-	}
-	get lastDayOfWeek() {
-		let lastDayOfWeek = new Date(this.y, this.m, this.d);
-		// uses the calculation from firstDayOfWeek and adds 6 days to the result to get the last day of the week
-		lastDayOfWeek.setDate(this.d -(lastDayOfWeek.getDay()+7-this.weekStart)%7 +6);
-		return lastDayOfWeek;
-	}
-	get wholeWorkWeek() {
-		const days = []
-		const date = new Date(this.y, this.m, this.d);
-		for(let i = 0; i < 5; i++) {
-			days[i] = new Date(this.y, this.m, this.d)
-			days[i].setDate(this.d -(date.getDay()+7-this.weekStart)%7 + i)
-		}
-		return days
-	}
-	get cdLastDayOfWeek() {
-		let LastDayOfWeek = new CalendarDate(this.lastDayOfWeek);
-		return LastDayOfWeek;
-	}
-	get firstDayOfCalendarMonth() {
-		let firstDayOfMonth = new Date(this.y, this.m, 1);
-		let offset = (firstDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		// offset will be greater than 1 most of the time, using a negative number for a date returns a date in the past
-		return new Date(this.y, this.m, 1-offset);
-	}
-	get cdFirstDayOfCalendarMonth() {
-		let firstDayOfMonth = new Date(this.y, this.m, 1);
-		let offset = (firstDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let FirstDayOfCalendarMonth = new CalendarDate(this.y, this.m, 1 - offset);
-		return FirstDayOfCalendarMonth;
-	}
-	get lastDayOfCalendarMonth() {
-		// In JavaScript, the Date constructor interprets: A day of 0 as the last day of the previous month 
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		return new Date(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate()+6-offset);
-	}
-	get cdLastDayOfCalendarMonth() {
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let LasyDayOfCalendarMonth = new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate() + 6 - offset);
-		return LasyDayOfCalendarMonth;
-	}
-	get cdLastDayOfNextCalendarMonth() {
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let LastDayOfNextCalendarMonth = new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth() + 1, lastDayOfMonth.getDate() + 6 - offset);
-		return LastDayOfNextCalendarMonth;
-	}
-	get nextSevenDays() {
-		const days = []
-		
-		for(let i = 0; i < 7; i++) {
-			days[i] = new Date(this.y, this.m, this.d + i)
-		}
-		return days
-	}
-	get numWeeks() {
-		// if the week starts with Monday we have to go 3 days in the past from the start of the next year to get the correct numWeek of the current year
-		// this is because for example 30.12.2024 - 05.01.2025 is the first calendarWeek of 2025 
-		let lastCalendarWeek = new CalendarDate(this.y + 1, 0, this.weekStart == 1 ? -3 : 0);
-		return lastCalendarWeek.w;
-	}
-	set(y,m,d,noClean) {
-
-		if (y !== undefined && (m === undefined || m === true) && d === undefined) {
-			if (this.isDate(y))
-			{
-				// set year/month/day from date object
-				return this.set(y.getFullYear(), y.getMonth(), y.getDate(), m);
-			}
-			if (y.y !== undefined && y.m !== undefined && y.d !== undefined)
-			{
-				// set year/month/day from CalendarDate object
-				return this.set(y.y, y.m, y.d, m);
-			}
-		}
-		// initialize year/month/day
-		this._y = y ?? 0;
-		this._m = m ?? 0;
-		this._d = d ?? 0;
-		
-		if (!noClean)
-			this._clean();
-	}
-	_clean() {
-		this.set(new Date(this._y, this._m, this._d), true);
-		this._w = null;
-		this._wd = null;
-	}
-	format(options, lang=undefined) {
-		return (new Date(this._y, this._m, this._d)).toLocaleString(lang, options);
-	}
-	compare(d) {
-		if (this.isDate(d))
-			return (this.y === d.getFullYear() && this.m === d.getMonth() && this.d === d.getDate());
-		return (this.y === d.y && this.m === d.m && this.d === d.d);
-	}
-	isInWeek(w, y) {
-		if (this.y == y && this.w == w)
-			return true;
-		if (this.weekStart == 1)
-			return false;
-		let edgeDay = this.cdFirstDayOfWeek;console.log(edgeDay);
-		if (edgeDay.y == y && edgeDay.w == w)
-			return true;
-		edgeDay = this.cdLastDayOfWeek;
-		if (edgeDay.y == y && edgeDay.w == w)
-			return true;
-		return false;
-	}
-	
-	setLocale(locale) {
-		this.weekStart = CalendarDate.getWeekStart(locale);
-	}
-	// method that checks if the parameter is of type Date
-	isDate(obj){
-		return Object.prototype.toString.call(obj) === '[object Date]';
-	}
-	cleanup(){
-		if(this.watchLocale && this.watchLocale.stop) this.watchLocale.stop(); // TODO: ?
-	}
-	moveMonthInDirection (dir) {
-		// avoid setting date in wrong month if we try to create a date which does not exist like 30th of february
-		const newM = this.m + dir
-		const maxDaysTarget = monthDayRanges[newM]
-
-		if (this.d > maxDaysTarget) this.d = maxDaysTarget
-		
-		this.m = newM // calls _clean which sets a new Date
-	}
-}
-/**
- * Returns the weekday number (Date.getDay()) on which the week starts depending on the locale.
- * This can be Saturday(6), Sunday(0) or Monday(1)
- * 
- * @see https://stackoverflow.com/questions/53382465/how-can-i-determine-if-week-starts-on-monday-or-sunday-based-on-locale-in-pure-j
- * 
- * @param string locale
- * 
- * @return integer
- */
-CalendarDate.getWeekStart = function(locale) {
-
-	locale = user_locale.value || locale || navigator.language;
-	const parts = locale.match(/^([a-z]{2,3})(?:-([a-z]{3})(?=$|-))?(?:-([a-z]{4})(?=$|-))?(?:-([a-z]{2}|\d{3})(?=$|-))?/i);
-
-	const language_code = parts[1];
-	const language_starting_Sat = ['ar','arq','arz','fa'];
-	const language_starting_Sun = 'amasbndzengnguhehiidjajvkmknkolomhmlmrmtmyneomorpapssdsmsnsutatethtnurzhzu'.match(/../g);
-	
-	const region_code = parts[4];
-	const region_starting_Sat = 'AEAFBHDJDZEGIQIRJOKWLYOMQASDSY'.match(/../g);
-	const region_starting_Sun = 'AGARASAUBDBRBSBTBWBZCACNCODMDOETGTGUHKHNIDILINJMJPKEKHKRLAMHMMMOMTMXMZNINPPAPEPHPKPRPTPYSASGSVTHTTTWUMUSVEVIWSYEZAZW'.match(/../g);
-
-	if (region_code){
-		if (region_starting_Sun.includes(region_code))
-			return 0;
-		else if (region_starting_Sat.includes(region_code))
-			return 6;
-		else
-			return 1;
-	}
-	else if(language_code)
-	{
-		if (language_starting_Sun.includes(language_code))
-			return 0;
-		else if (language_starting_Sat.includes(language_code)) 
-			return 6;
-		else
-			return 1;
-	}
-	else
-	{
-		return 1;
-	}
-}
-
-export default CalendarDate
diff --git a/public/js/composables/CalendarDates.js b/public/js/composables/CalendarDates.js
deleted file mode 100644
index a34198441..000000000
--- a/public/js/composables/CalendarDates.js
+++ /dev/null
@@ -1,16 +0,0 @@
-class CalendarDates{
-	
-	static subscribers_array = [];
-	
-	static subscribe(subscriber){
-		this.subscribers_array.push(subscriber);
-	}
-	static unsubscribe(subscriber){
-		this.subscribers_array = this.subscribers_array.filter(sub => !sub.compare(subscriber));
-	}
-	static cleanup(){
-		this.subscribers_array.forEach(sub => { sub.cleanup() });
-	}
-}
-
-export default CalendarDates;
\ No newline at end of file

From b0f8b316af0bfa341a4d11bc0899c917523a3202 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:36:29 +0200
Subject: [PATCH 0540/1357] Use renderers in roominformation component

---
 public/css/Cis4/CoreCalendarEvents.css        |  5 ++
 .../js/components/Cis/Mylv/RoomInformation.js | 68 +++++--------------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 908e23305..df451ebf1 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -92,3 +92,8 @@
 	flex: 0 0 100%;
 	text-align: center;
 }
+
+.fhc-roominformation .lehreinheitEventContent #lehreinheitOrt {
+	display: none;
+}
+
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 307b535f5..264e1e840 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -131,60 +131,26 @@ export default {
 			:backgrounds="backgrounds"
 		>
 			<template v-slot="{ event, mode }">
-				<component
-					v-if="mode == 'event'"
-					:is="renderers[event.type]?.modalContent"
-					:event="event"
-				></component>
-				<component
-					v-else-if="mode == 'eventheader'"
-					:is="renderers[event.type]?.modalTitle"
-					:event="event"
-				></component>
 				<div
-					v-else-if="mode == 'month'"
-					:class="'event-type-' + event.type"
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+					:type="mode == 'day' ? 'button' : undefined"
 	 				:style="eventStyle(event)"
-					class="d-flex flex-column align-items-center justify-content-evenly h-100"
 				>
-					<span>{{ event?.topic }}</span>
-				</div>
-				<div
-					v-else-if="mode == 'week'"
-					:class="'event-type-' + event.type"
-	 				:style="eventStyle(event)"
-					class="border border-secondary d-flex flex-column align-items-center justify-content-evenly h-100"
-					type="button"
-				>
-					<span>{{ event?.topic }}</span>
-					<span v-for="lektor in event?.lektor">{{ lektor.kurzbz }}</span>
-					<span>{{ event?.ort_kurzbz }}</span>
-				</div>
-				<div
-					v-else-if="mode == 'day'"
-					:class="'event-type-' + event.type"
-	 				:style="eventStyle(event)"
-					type="button"
-					class="border border-secondary d-flex align-items-center justify-content-center text-center h-100"
-				>
-					<div class="col ">
-						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">
-							{{ event?.topic }}
-						</p>
-					</div>
-					<div class="col ">
-						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.lektor">
-							{{ lektor.kurzbz }}
-						</p>
-					</div>
-					<div class="col ">
-						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">
-							{{ event?.ort_kurzbz }}
-						</p>
-					</div>
+					<component
+						v-if="mode == 'event'"
+						:is="renderers[event.type]?.modalContent"
+						:event="event"
+					></component>
+					<component
+						v-else-if="mode == 'eventheader'"
+						:is="renderers[event.type]?.modalTitle"
+						:event="event"
+					></component>
+					<component
+						v-else
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
 				</div>
 			</template>
 		</fhc-calendar>

From 868c15f47d3fd2a4007d18f2bb886e6225973e8c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:47:17 +0200
Subject: [PATCH 0541/1357] use teaching units for calendar

---
 public/js/components/Cis/LvPlan/LvPlan.js     | 13 +++++++++++-
 .../js/components/Cis/Mylv/RoomInformation.js | 21 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index e35cd5739..73c91734c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -43,7 +43,8 @@ export default {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			teachingunits: null
 		};
 	},
 	computed:{
@@ -158,6 +159,15 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
 	},
 	template:/*html*/`
 	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
@@ -186,6 +196,7 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="backgrounds"
+			:time-grid="teachingunits"
 		>
 			<template v-slot="{ event, mode }">
 				<div
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 264e1e840..1a1d1543d 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,6 +1,6 @@
 import FhcCalendar from "../../Calendar/Base.js";
 
-import ApiStudenplan from '../../../api/factory/lvPlan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../../composables/EventLoader.js';
 
@@ -37,7 +37,8 @@ export default {
 				week: {
 					collapseEmptyDays: false
 				}
-			}
+			},
+			teachingunits: null
 		}
 	},
 	computed: {
@@ -100,8 +101,8 @@ export default {
 		
 		const { events } = useEventLoader(rangeInterval, (start, end) => {
 			return [
-				$api.call(ApiStudenplan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
-				$api.call(ApiStudenplan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+				$api.call(ApiLvPlan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				$api.call(ApiLvPlan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
 			];
 		});
 
@@ -110,6 +111,17 @@ export default {
 			events
 		};
 	},
+	created() {
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
+	},
 	template: /*html*/`
 	<div class="fhc-roominformation d-flex flex-column h-100">
 		<h2>{{ $p.t('rauminfo/rauminfo') }} {{ propsViewData.ort_kurzbz }}</h2>
@@ -129,6 +141,7 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="backgrounds"
+			:time-grid="teachingunits"
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 30b895ad04b9cb39ede6dd904a35cc8daf143caa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:07:15 +0200
Subject: [PATCH 0542/1357] use renderers in search config

---
 application/config/search.php                 |  3 +
 application/libraries/SearchLib.php           |  2 +
 public/js/apps/Cis.js                         |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  |  2 +-
 public/js/components/searchbar/searchbar.js   | 64 ++++++++++---------
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 451ae656d..220d5e435 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -225,6 +225,7 @@ $config['studentcis']['resultfields'] = [
 		AS photo_url",
 	"b.aktiv"
 ];
+$config['studentcis']['renderer'] = 'student';
 
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
@@ -538,6 +539,7 @@ $config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";
+$config['unassigned_employee']['renderer'] = 'employee';
 
 $config['organisationunit'] = [
 	'alias' => ['ou', 'organisationseinheit', 'oe'],
@@ -674,6 +676,7 @@ $config['active_organisationunit'] = $config['organisationunit'];
 $config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
 $config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
 $config['active_organisationunit']['table'] = 'active_organisationseinheit';
+$config['active_organisationunit']['renderer'] = 'organisationunit';
 
 $config['room'] = [
 	'alias' => ['raum'],
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index 0c942c436..659e5e78c 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -231,8 +231,10 @@ class SearchLib
 				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)";
 
+			$renderer = $table_config['renderer'] ?? $type;
 			$selects[] = "
 				SELECT
+					" . $this->_ci->db->escape($renderer) . " AS renderer,
 					" . $this->_ci->db->escape($type) . " AS type,
 					rank,
 					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index dc32511c1..65ee6c45a 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -45,7 +45,7 @@ const app = Vue.createApp({
 						},
 						childactions: []
 					},
-                    raum: {
+                    room: {
                         defaultaction: {
                             type: "link",
 							renderif: function(data) {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 13a0369ba..c7a4ce15a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -100,7 +100,7 @@ export default {
 						childactions: [
 						]
 					},
-					mergedperson: {
+					mergedPerson: {
 						defaultaction: {
 							type: "link",
 							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 09dab9ece..0b30bd12f 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,5 +1,5 @@
 import person from "./result/person.js";
-import raum from "./result/room.js";
+import room from "./result/room.js";
 import employee from "./result/employee.js";
 import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
@@ -34,19 +34,19 @@ export default {
             lastQuery: ''
       };
     },
-    components: {
-      person: person,
-      raum: raum,
-      employee: employee,
-      organisationunit: organisationunit,
-      student: student,
-      prestudent: prestudent,
-      dms,
-      cms,
-      mergedStudent,
-      mergedPerson
-    },
-    template: /*html*/`
+	components: {
+		person,
+		room,
+		employee,
+		organisationunit,
+		student,
+		prestudent,
+		dms,
+		cms,
+		mergedStudent,
+		mergedPerson
+	},
+	template: /*html*/`
         <form
             ref="searchform"
             class="d-flex me-3"
@@ -92,17 +92,15 @@ export default {
                   </div>
                   <div v-else-if="this.error !== null">{{ error }}</div>
                   <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
-                  <template v-else="" v-for="res in searchresult">
-                    <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv' || res.type === 'studentcis'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
-                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
-                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit' || res.type === 'active_organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
-                    <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
-                    <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
+                  <template v-else v-for="res in searchresult">
+                    <component
+                        v-if="isValidRenderer(res.renderer)"
+                        :is="res.renderer"
+                        :mode="searchmode"
+                        :res="res"
+                        :actions="searchoptions.actions[dash2camelCase(res.renderer)]"
+                        @actionexecuted="hideresult"
+                    ></component>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
                   </template>
                 </div>
@@ -279,17 +277,17 @@ export default {
                     if (this.searchoptions.mergeResults) {
                         let counter = 0;
                         let mergeTypes = [];
-                        let mergedType = 'merged';
+                        let mergedType = 'merged-';
                         let mergeKey = '';
 
                         switch (this.searchoptions.mergeResults) {
                         case 'student':
-                            mergeTypes = ['student', 'studentStv', 'prestudent'];
+                            mergeTypes = ['student', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'uid';
                             break;
                         case 'person':
-                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'studentStv', 'prestudent'];
+                            mergeTypes = ['person', 'employee', 'student', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'person_id';
                             break;
@@ -297,13 +295,14 @@ export default {
 
                         if (mergeTypes.length) {
                             res = Object.values(res.reduce((a, c) => {
-                                if (!mergeTypes.includes(c.type)) {
+                                if (!mergeTypes.includes(c.renderer)) {
                                     a['nomerge' + counter++] = c;
                                 } else if (c[mergeKey] === null) {
                                     a['nomerge' + counter++] = c;
                                 } else if (a[c[mergeKey]] === undefined) {
                                     a[c[mergeKey]] = {
                                         rank: c.rank,
+                                        renderer: mergedType,
                                         type: mergedType,
                                         list: [c]
                                     };
@@ -365,6 +364,13 @@ export default {
                 this.hideresult,
                 100
             );
+        },
+        dash2camelCase(string) {
+            return string.replace(/-([a-z])/g, g => g[1].toUpperCase());
+        },
+        isValidRenderer(renderer) {
+            const camelCaseRenderer = this.dash2camelCase(renderer);
+            return Object.keys(this.$.components).includes(camelCaseRenderer);
         }
     }
 };

From 386ae594280f87a965d63e2e4a20241bbed4c8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:46:12 +0200
Subject: [PATCH 0543/1357] Archivierung von MC Zertifikaten/Zeugnissen

---
 content/student/studentoverlay.js.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d2030f493..d8cb1fc56 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3553,6 +3553,15 @@ function StudentZeugnisDokumentArchivieren()
 			xml = 'abschlussdokument_lehrgaenge.xml.php';
 			break;
 
+		case 'microcredentialzertifikat_1':
+		case 'microcredentialzertifikat_2':
+		case 'microcredentialzertifikat_3':
+		case 'microcredential_1':
+		case 'microcredential_2':
+		case 'microcredential_3':
+			xml = 'microcredential.xml.php';
+			break;
+			
 		default:
 			alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt');
 			return
@@ -4783,7 +4792,7 @@ function StudentNotenMoveFromAntrag()
 
 	var uid = document.getElementById('student-detail-textbox-uid').value;
 	req.add('student_uid', uid);
-	
+
 	var txt = "?";
 	for(var q in req.parms) {
 		txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value);

From 1005963179094bf08273ec43c535841f9882ba21 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:52:29 +0200
Subject: [PATCH 0544/1357] Each searchbar it's own config

---
 application/config/search.php                 | 24 +------------
 application/config/searchcis.php              | 35 +++++++++++++++++++
 application/config/searchstv.php              | 11 ++++++
 .../controllers/api/frontend/v1/Searchbar.php | 23 ++++++++++--
 application/libraries/SearchLib.php           | 12 +++++--
 public/js/api/factory/searchbar.js            | 11 ++++--
 public/js/apps/Cis.js                         |  6 ++--
 .../js/components/Stv/Studentenverwaltung.js  |  2 +-
 8 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 application/config/searchcis.php
 create mode 100644 application/config/searchstv.php

diff --git a/application/config/search.php b/application/config/search.php
index 220d5e435..1450dff7b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -210,23 +210,6 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
-$config['studentcis'] = $config['student'];
-unset($config['studentcis']['searchfields']['email']);
-unset($config['studentcis']['searchfields']['tel']);
-$config['studentcis']['resultfields'] = [
-	"s.student_uid AS uid",
-	"s.matrikelnr",
-	"p.person_id",
-	"(p.vorname || ' ' || p.nachname) AS name",
-	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
-	"CASE
-		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-		ELSE NULL END
-		AS photo_url",
-	"b.aktiv"
-];
-$config['studentcis']['renderer'] = 'student';
-
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -511,6 +494,7 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];
 
+// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -672,12 +656,6 @@ $config['organisationunit'] = [
 			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
 ];
 
-$config['active_organisationunit'] = $config['organisationunit'];
-$config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
-$config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
-$config['active_organisationunit']['table'] = 'active_organisationseinheit';
-$config['active_organisationunit']['renderer'] = 'organisationunit';
-
 $config['room'] = [
 	'alias' => ['raum'],
 	'primarykey' => 'ort_kurzbz',
diff --git a/application/config/searchcis.php b/application/config/searchcis.php
new file mode 100644
index 000000000..ce385338f
--- /dev/null
+++ b/application/config/searchcis.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+
+$config['employee'] = $CI->config->item('employee', 'search');
+
+$config['student'] = $CI->config->item('student', 'search');
+unset($config['student']['searchfields']['email']);
+unset($config['student']['searchfields']['tel']);
+$config['student']['resultfields'] = [
+	"s.student_uid AS uid",
+	"s.matrikelnr",
+	"p.person_id",
+	"(p.vorname || ' ' || p.nachname) AS name",
+	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
+	"CASE
+		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+		ELSE NULL END
+		AS photo_url",
+	"b.aktiv"
+];
+
+$config['organisationunit'] = $CI->config->item('organisationunit', 'search');
+$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['organisationunit']['table'] = 'active_organisationseinheit';
+
+$config['room'] = $CI->config->item('room', 'search');
+
+$config['cms'] = $CI->config->item('cms', 'search');
+
+$config['dms'] = $CI->config->item('dms', 'search');
diff --git a/application/config/searchstv.php b/application/config/searchstv.php
new file mode 100644
index 000000000..96c118ac8
--- /dev/null
+++ b/application/config/searchstv.php
@@ -0,0 +1,11 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+
+$config['student'] = $CI->config->item('student', 'search');
+
+$config['prestudent'] = $CI->config->item('prestudent', 'search');
diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 1f51334fc..363b6e534 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -36,7 +36,8 @@ class Searchbar extends FHCAPI_Controller
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
-			'searchAdvanced' => self::PERM_LOGGED
+			'searchCis' => self::PERM_LOGGED,
+			'searchStv' => self::PERM_LOGGED
 		]);
 	}
 
@@ -71,9 +72,25 @@ class Searchbar extends FHCAPI_Controller
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
-	public function searchAdvanced()
+	public function searchCis()
 	{
-		$this->load->library('SearchLib');
+		return $this->searchAdvanced([ 'config' => 'searchcis' ]);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchStv()
+	{
+		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	private function searchAdvanced($config)
+	{
+		$this->load->library('SearchLib', $config);
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index 659e5e78c..24894eab5 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -40,17 +40,25 @@ class SearchLib
 	
 	/**
 	 * Gets the CI instance and loads model
+	 *
+	 * @param array		$params
+	 * @return void
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
+		$config = $params['config'] ?? null;
 		// It is loaded only to have the DB functions available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
 
 		// Load Config
-		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('search', true, (boolean)$config);
 		$this->_ci->load->config('searchfunctions', true);
+		if ($config) {
+			$this->_ci->load->config($config, true);
+			$this->_ci->config->set_item('search', $this->_ci->config->item($config));
+		}
 
 		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
 
diff --git a/public/js/api/factory/searchbar.js b/public/js/api/factory/searchbar.js
index 6bff98cbc..6bcf577b4 100644
--- a/public/js/api/factory/searchbar.js
+++ b/public/js/api/factory/searchbar.js
@@ -23,10 +23,17 @@ export default {
 			params
 		};
 	},
-	searchAdvanced(params) {
+	searchCis(params) {
 		return {
 			method: 'post',
-			url: '/api/frontend/v1/searchbar/searchAdvanced',
+			url: '/api/frontend/v1/searchbar/searchCis',
+			params
+		};
+	},
+	searchStv(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
 	}
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 65ee6c45a..efc104d69 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -17,9 +17,9 @@ const app = Vue.createApp({
 				calcheightonly: true,
                 types: [
                     "employee",
-					"studentcis",
+					"student",
                     "room",
-                    "active_organisationunit",
+                    "organisationunit",
 					"cms",
 					"dms"
                 ],
@@ -137,7 +137,7 @@ const app = Vue.createApp({
     },
     methods: {
         searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchAdvanced(searchsettings));
+        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
         }
     }
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c7a4ce15a..e37122427 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -147,7 +147,7 @@ export default {
 			this.$refs.stvList.reload();
 		},
 		searchfunction(params, config) {
-			return this.$api.call(ApiSearchbar.searchAdvanced(params), config);
+			return this.$api.call(ApiSearchbar.searchStv(params), config);
 		}
 	},
 	created() {

From 91624a3e53e120aa4cd6a7481244639809713a36 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 09:42:47 +0200
Subject: [PATCH 0545/1357] searchbar clear button, searchbar z-indexes

---
 public/css/components/searchbar/searchbar.css | 11 ++++++++
 public/js/components/searchbar/searchbar.js   | 25 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index c55e13f7e..a27ffe224 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -10,6 +10,17 @@
 }
 
 
+.searchbar_input:focus,
+.searchbar_input:focus ~ .searchbar_input_clear {
+	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
+}
+
+
+.searchbar_searchbox.open {
+	z-index: 10000;
+}
+
+
 .searchbar_settings {
     position: absolute; 
     z-index: 9999; 
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 0b30bd12f..afaf93782 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -55,19 +55,35 @@ export default {
             @focusin="searchfocusin"
             @focusout="searchfocusout"
         >
-			<div ref="searchbox" class="h-100 input-group me-2">
+			<div
+				ref="searchbox"
+				class="h-100 input-group me-2 searchbar_searchbox"
+				:class="showresult ? 'open' : 'closed'"
+			>
 				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
                 <input
+                	ref="input"
                     @keyup="search"
                     @focus="showsearchresult"
                     v-model="searchsettings.searchstr"
-                    class="form-control"
+                    class="form-control searchbar_input"
                     type="search"
                     :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
                     :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
                 >
+				<span
+					v-if="searchsettings.searchstr"
+					class="w-0 position-relative searchbar_input_clear"
+				>
+					<button
+						class="position-absolute end-0 btn bg-transparent"
+						@click="clearInput"
+					>
+						<i class="fas fa-close"></i>
+					</button>
+				</span>
                 <span
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"
@@ -170,6 +186,11 @@ export default {
 		}
 	},
     methods: {
+    	clearInput() {
+    		this.searchsettings.searchstr = "";
+    		this.hideresult();
+    		this.$refs.input.focus()
+    	},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
 			if (this.searchoptions.origin) {

From cb1ff2ef1ab5ae896f620fc7c09a7faea78eec0b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:03:42 +0200
Subject: [PATCH 0546/1357] remove unused function

---
 public/js/components/searchbar/searchbar.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index afaf93782..96a38d860 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -228,12 +228,6 @@ export default {
 			// removes the event listener checkSettingsVisibility when the collapsible is hidden
 			document.removeEventListener("click", this.checkSettingsVisibility);
 		},
-        allSearchOptions: function() {
-            this.searchsettings.types = [];
-            for( const idx in this.searchoptions.types ) {
-                this.searchsettings.types.push(this.searchoptions.types[idx]);
-            }
-        },
 		calcSearchResultHeight: function() {
 			const rect = this.$refs.results.getBoundingClientRect();
 			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {

From 62aa022c690463a26999565a566c62fa8669483e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:13:46 +0200
Subject: [PATCH 0547/1357] Tab Details: add missing person attributes to
 modelValue

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

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 369c8eabd..4d0aa5fe1 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -147,7 +147,7 @@ class Prestudent extends FHCAPI_Controller
 				in_array($prop, ['zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
 				&& !isset($update_prestudent[$prop])
 				&& array_key_exists($prop, $_POST)
-			) 
+			)
 			{
 				$update_prestudent[$prop] = null;
 			}

From 4e7ae928b5bd0a7f379737946641e4d60cb2c009 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:19:21 +0200
Subject: [PATCH 0548/1357] Tab Details: add missing person attributes to
 modelValue.. second try

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index deafb7762..7c1589dd7 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -95,6 +95,14 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect('b.alias');
+		$this->PrestudentModel->addSelect('p.geburtsnation');
+		$this->PrestudentModel->addSelect('p.sprache');
+		$this->PrestudentModel->addSelect('p.gebort');
+		$this->PrestudentModel->addSelect('p.homepage');
+		$this->PrestudentModel->addSelect('p.anmerkung');
+		$this->PrestudentModel->addSelect('p.familienstand');
+		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
+		$this->PrestudentModel->addSelect('p.matr_nr');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

From ba23a6496c0bd53ce3bcb1226a5e33907de04c74 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:22:39 +0200
Subject: [PATCH 0549/1357] Tab Exam: change layout to fitDataStretchFrozen

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 5a427fcd4..f90aa298d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -89,7 +89,7 @@ export default{
 						},
 						frozen: true
 					}],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				index: 'pruefung_id',

From a7698b9af85e76407c1c3eb8faf475b5859c1105 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:23:00 +0200
Subject: [PATCH 0550/1357] searchbar clear button stretch height

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 96a38d860..fd19a22ab 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -78,7 +78,7 @@ export default {
 					class="w-0 position-relative searchbar_input_clear"
 				>
 					<button
-						class="position-absolute end-0 btn bg-transparent"
+						class="position-absolute top-0 bottom-0 end-0 btn bg-transparent"
 						@click="clearInput"
 					>
 						<i class="fas fa-close"></i>

From 79720a77c29e33ba43b6d65c288adf0b7935ed7f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:23:48 +0200
Subject: [PATCH 0551/1357] searchbar: allow labels for types

---
 public/js/components/searchbar/searchbar.js | 144 ++++++++++++--------
 1 file changed, 90 insertions(+), 54 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index fd19a22ab..86602bec2 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -10,6 +10,18 @@ import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
 export default {
+	components: {
+		person,
+		room,
+		employee,
+		organisationunit,
+		student,
+		prestudent,
+		dms,
+		cms,
+		mergedStudent,
+		mergedPerson
+	},
     props: [ "searchoptions", "searchfunction" ],
     provide() {
         return {
@@ -22,7 +34,7 @@ export default {
         hidetimer: null,
         searchsettings: {
             searchstr: this.getSearchStr(),
-            types: this.getSearchTypes(),
+            types: this.getInitiallySelectedTypes(),
         },
         searchresult: [],
         searchmode: '',
@@ -34,17 +46,31 @@ export default {
             lastQuery: ''
       };
     },
-	components: {
-		person,
-		room,
-		employee,
-		organisationunit,
-		student,
-		prestudent,
-		dms,
-		cms,
-		mergedStudent,
-		mergedPerson
+	computed:{
+		searchTypesPlaceholder() {
+			if (!this.searchsettings.types.length) {
+				return Object.values(this.typeLabels).join(' / ');
+			}
+			return this.searchsettings.types.map(type => this.typeLabels[type]).join(' / ');
+		},
+		types() {
+			if (!this.searchoptions.types)
+				return [];
+			if (Array.isArray(this.searchoptions.types))
+				return this.searchoptions.types;
+			return Object.keys(this.searchoptions.types);
+		},
+		typeLabels() {
+			if (!this.searchoptions.types)
+				return {};
+			if (Array.isArray(this.searchoptions.types)) {
+				return this.searchoptions.types.reduce((res, type) => {
+					res[type] = type;
+					return res
+				}, {});
+			}
+			return this.searchoptions.types;
+		}
 	},
 	template: /*html*/`
         <form
@@ -70,8 +96,8 @@ export default {
                     v-model="searchsettings.searchstr"
                     class="form-control searchbar_input"
                     type="search"
-                    :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
-                    :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
+                    :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+                    :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                 >
 				<span
 					v-if="searchsettings.searchstr"
@@ -123,22 +149,45 @@ export default {
               </div>
             </div>
 
-            <div id="searchSettings"  ref="settings"
+			<div
+				id="searchSettings"
+				ref="settings"
 				@[\`shown.bs.collapse\`]="handleShowSettings"
 				@[\`hide.bs.collapse\`]="handleHideSettings"
-                class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
-              <div class="d-flex flex-column m-3" v-if="searchoptions.types.length > 0">
-              <span class="fw-light mb-2">{{ $p.t('search/applyfilter_label') }}</span>  
-              <template v-for="(type, index) in searchoptions.types" :key="type">
-                    <div class="form-check form-switch">
-                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types">
-                        <label class="ps-2 form-check-label non-selectable" :for="$.uid + 'search_type_' + index">{{ type }}</label>
-                    </div>
-                </template>
-              </div>
+				class="top-100 end-0 searchbar_settings text-white collapse"
+				tabindex="-1"
+			>
+				<div
+					v-if="types.length > 0"
+					class="d-flex flex-column m-3"
+				>
+					<span class="fw-light mb-2">
+						{{ $p.t('search/applyfilter_label') }}
+					</span>
+					<template
+						v-for="(label, value) in typeLabels"
+						:key="value"
+					>
+						<div class="form-check form-switch">
+							<input
+								class="fhc-switches form-check-input"
+								type="checkbox"
+								role="switch"
+								:id="$.uid + 'search_type_' + value"
+								:value="value"
+								v-model="searchsettings.types"
+							>
+							<label
+								class="ps-2 form-check-label non-selectable"
+								:for="$.uid + 'search_type_' + value"
+							>
+								{{ label }}
+							</label>
+						</div>
+					</template>
+				</div>
             </div>
-        
-          </form>
+		</form>
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue) {
@@ -146,28 +195,16 @@ export default {
 				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 			}
 		},
-    },
-	computed:{
-		search_types_string(){
-			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
-				return this.searchsettings.types.join(' / ');
-			}else{
-				return JSON.stringify(this.searchsettings.types);
-			}
-		},
-		
-	},
-    beforeMount: function() {
-		this.$watch('searchsettings.types', newValue => {
-			if (Array.isArray(newValue) && newValue.length === 0){
-				this.searchsettings.types = this.allSearchTypes();
+		'searchsettings.types'(newValue) {
+			if (Array.isArray(newValue) && newValue.length === 0) {
+				this.searchsettings.types = [...this.types];
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue) && this.searchoptions.origin){
+			if (Array.isArray(newValue) && this.searchoptions.origin) {
 				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
-		});
+		}
     },
 	mounted(){
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
@@ -191,22 +228,21 @@ export default {
     		this.hideresult();
     		this.$refs.input.focus()
     	},
-		getSearchTypes: function () {
-			let result = this.allSearchTypes();
+		getInitiallySelectedTypes() {
+			let result = false;
 			if (this.searchoptions.origin) {
 				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
 				if (localStorageValue) {
 					result = JSON.parse(localStorageValue);
 				}
 			}
-			return result;
-		},
-		allSearchTypes() {
-			let allTypes = [];
-			for (const idx in this.searchoptions.types) {
-				allTypes.push(this.searchoptions.types[idx]);
-			};
-			return allTypes;
+			if (result)
+				return result;
+			if (!this.searchoptions.types)
+				return [];
+			if (Array.isArray(this.searchoptions.types))
+				return [...this.searchoptions.types];
+			return Object.keys(this.searchoptions.types);
 		},
 		getSearchStr: function(){
 			if (!this.searchoptions.origin)

From ee13cfadba0e384051148c773b1c69310340ccc1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 12:33:48 +0200
Subject: [PATCH 0552/1357] Use labels for types in CIS & StV searchbar

---
 public/js/apps/Cis.js                         |  16 +-
 .../js/components/Stv/Studentenverwaltung.js  |   8 +-
 system/phrasesupdate.php                      | 140 ++++++++++++++++++
 3 files changed, 152 insertions(+), 12 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index efc104d69..14dd7d853 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -15,14 +15,14 @@ const app = Vue.createApp({
 				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
-                types: [
-                    "employee",
-					"student",
-                    "room",
-                    "organisationunit",
-					"cms",
-					"dms"
-                ],
+				types: {
+					employee: Vue.computed(() => this.$p.t("search/type_employee")),
+					student: Vue.computed(() => this.$p.t("search/type_student")),
+					room: Vue.computed(() => this.$p.t("search/type_room")),
+					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					cms: Vue.computed(() => this.$p.t("search/type_cms")),
+					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+				},
                 actions: {
                     employee: {
                         defaultaction: {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e37122427..280ab8ebf 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -75,10 +75,10 @@ export default {
 				origin: 'stv',
 				cssclass: "position-relative",
 				calcheightonly: true,
-				types: [
-					"student",
-					"prestudent"
-				],
+				types: {
+					student: Vue.computed(() => this.$p.t('search/type_student')),
+					prestudent: Vue.computed(() => this.$p.t('search/type_prestudent'))
+				},
 				actions: {
 					student: {
 						defaultaction: {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 88ef35fff..4e334cf18 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41897,6 +41897,146 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_student',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'prestudents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_room',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Räume',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'rooms',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_organisationunit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Organisationseinheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'organisation units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_cms',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Inhalte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sites',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_dms',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From 2755a194eb094a09d2031137d66fb768c10b55a8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 15:12:20 +0200
Subject: [PATCH 0553/1357] searchbar remove redundant cssclass option

---
 public/js/apps/Cis.js                           |  1 -
 public/js/components/Stv/Studentenverwaltung.js |  7 +++++--
 public/js/components/searchbar/searchbar.js     | 15 +++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 14dd7d853..98c8ad65d 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -13,7 +13,6 @@ const app = Vue.createApp({
         return {
             searchbaroptions: {
 				origin: "cis",
-				cssclass: "",
 				calcheightonly: true,
 				types: {
 					employee: Vue.computed(() => this.$p.t("search/type_employee")),
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 280ab8ebf..4770df72f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -73,7 +73,6 @@ export default {
 			selected: [],
 			searchbaroptions: {
 				origin: 'stv',
-				cssclass: "position-relative",
 				calcheightonly: true,
 				types: {
 					student: Vue.computed(() => this.$p.t('search/type_student')),
@@ -233,7 +232,11 @@ export default {
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
-			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
+			<core-searchbar
+				:searchoptions="searchbaroptions"
+				:searchfunction="searchfunction"
+				class="searchbar position-relative w-100"
+			></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 86602bec2..a63365d29 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -73,14 +73,13 @@ export default {
 		}
 	},
 	template: /*html*/`
-        <form
-            ref="searchform"
-            class="d-flex me-3"
-            :class="searchoptions.cssclass"
-            action="javascript:void(0);"
-            @focusin="searchfocusin"
-            @focusout="searchfocusout"
-        >
+		<form
+			ref="searchform"
+			class="d-flex me-3"
+			action="javascript:void(0);"
+			@focusin="searchfocusin"
+			@focusout="searchfocusout"
+		>
 			<div
 				ref="searchbox"
 				class="h-100 input-group me-2 searchbar_searchbox"

From 16db622bc98635dfad92f49e97768dcd336a1bd5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 17:55:59 +0200
Subject: [PATCH 0554/1357] Tab Details

- add anrede to modelValue
- add Validations Alias and Lehrverbandsgruppe
- add Phrase invalidAlias
- add translation to validation Integer for field semester
---
 .../api/frontend/v1/stv/Student.php           | 38 ++++++++++++++++++-
 system/phrasesupdate.php                      | 20 ++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 7c1589dd7..17cec8b26 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -103,6 +103,7 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.familienstand');
 		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
 		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('p.anrede');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
@@ -178,6 +179,7 @@ class Student extends FHCAPI_Controller
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 
 		$this->load->library('form_validation');
 
@@ -188,7 +190,15 @@ class Student extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
-		$this->form_validation->set_rules('semester', 'Semester', 'integer');
+		$this->form_validation->set_rules('semester', 'Semester', 'integer', [
+				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+			]
+		);
+
+		$this->form_validation->set_rules('alias', 'Alias', 'regex_match[/^[-a-z0-9\_\.]*[a-z0-9]{1,}\.[-a-z0-9\_]{1,}$/]',
+		[
+			'regex_match' => $this->p->t('ui', 'error_fieldInvalidAlias')
+		]);
 
 		$this->load->library('UDFLib');
 		
@@ -300,11 +310,37 @@ class Student extends FHCAPI_Controller
 
 		// Do Updates
 		if (count($update_lehrverband)) {
+
 			$curstudlvb = $this->StudentlehrverbandModel->load([
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'student_uid' => $uid
 			]);
 
+			$data = $this->getDataOrTerminateWithError($curstudlvb);
+			$data = current($data);
+
+			$verbandCurrent = $data->verband;
+			$studiengang_kz = $data->studiengang_kz;
+			$semesterCurrent = $data->semester;
+			$gruppeCurrent = $data->gruppe;
+
+			$verband = isset($update_lehrverband['verband']) ? $update_lehrverband['verband'] : $verbandCurrent;
+			$gruppe = isset($update_lehrverband['gruppe']) ? $update_lehrverband['gruppe'] : $gruppeCurrent;
+			$semester = isset($update_lehrverband['semester']) ? $update_lehrverband['semester'] : $semesterCurrent;
+
+			//check if existing Lehrverband of new data to avoid Error
+			$result = $this->LehrverbandModel->loadWhere([
+				'verband' => $verband,
+				'gruppe' => $gruppe,
+				'semester' => $semester,
+				'studiengang_kz' => $studiengang_kz,
+			]);
+
+			if(!hasData($result))
+			{
+				$this->terminateWithError($this->p->t('lehre', 'error_noLehrverband'), self::ERROR_TYPE_GENERAL);
+			}
+
 			if(hasData($curstudlvb) && count(getData($curstudlvb)) > 0 )
 			{
 				$update_lehrverband['updatevon'] = $authuid;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 355ed7186..c190d7b4f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44577,6 +44577,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldInvalidAlias',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alias ist ungültig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Alias is invalid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From fa97116ec45e0d4042b500310a693f51aec51bdd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 30 Jul 2025 18:08:04 +0200
Subject: [PATCH 0555/1357] replace backend var semester_aktuell with api
 parameter in grades, student and status endpoints, adapt old and new js api
 definitions, adapt frontend, add validation method to studiensemester_model

---
 .../api/frontend/v1/stv/Grades.php            | 46 ++++++++++++-------
 .../api/frontend/v1/stv/Status.php            | 11 +++--
 .../api/frontend/v1/stv/Student.php           | 20 +++++---
 application/libraries/PrestudentLib.php       |  9 +---
 .../organisation/Studiensemester_model.php    |  6 +++
 public/js/api/factory/stv/details.js          | 14 ++++--
 public/js/api/factory/stv/grades.js           | 35 +++++++++-----
 public/js/api/factory/stv/prestudent.js       |  7 ++-
 public/js/api/stv/details.js                  | 18 +++++---
 public/js/api/stv/grades.js                   | 38 ++++++++++-----
 public/js/api/stv/prestudent.js               |  9 +++-
 .../Studentenverwaltung/Details/Details.js    | 12 ++++-
 .../Details/Noten/Repeater.js                 |  8 +++-
 .../Details/Noten/Teacher.js                  |  8 +++-
 .../Details/Noten/Zeugnis.js                  | 19 ++++++--
 .../Details/Noten/Zeugnis/Actions.js          | 17 +++++--
 .../Details/Noten/Zeugnis/Documents.js        |  1 +
 .../Studentenverwaltung/Details/Prestudent.js |  7 +--
 .../Details/Status/Dropdown.js                |  5 ++
 19 files changed, 205 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Grades.php b/application/controllers/api/frontend/v1/stv/Grades.php
index 61d797495..dd8f53a27 100644
--- a/application/controllers/api/frontend/v1/stv/Grades.php
+++ b/application/controllers/api/frontend/v1/stv/Grades.php
@@ -74,14 +74,15 @@ class Grades extends FHCAPI_Controller
 	 * (Entries in lehre.tbl_zeugnisnote)
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|null			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getCertificate($prestudent_id, $all = null)
+	public function getCertificate($prestudent_id, $studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$result = $this->StudentModel->loadWhere([
 			'prestudent_id' => $prestudent_id
@@ -91,12 +92,13 @@ class Grades extends FHCAPI_Controller
 		if (!$student)
 			$this->terminateWithSuccess([]);
 		
-		
 		$student_uid = current($student)->student_uid;
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -109,14 +111,15 @@ class Grades extends FHCAPI_Controller
 	 * (Entries in campus.tbl_lvgesamtnote)
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|null			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getTeacherProposal($prestudent_id, $all = null)
+	public function getTeacherProposal($prestudent_id, $studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$result = $this->StudentModel->loadWhere([
 			'prestudent_id' => $prestudent_id
@@ -129,9 +132,11 @@ class Grades extends FHCAPI_Controller
 		
 		$student_uid = current($student)->student_uid;
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->LvgesamtnoteModel->getLvGesamtNoten(null, $student_uid, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -144,17 +149,20 @@ class Grades extends FHCAPI_Controller
 	 * or as not allowed because of the repeating of a semester.
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|false			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getRepeaterGrades($prestudent_id, $all = null)
+	public function getRepeaterGrades($prestudent_id, $studiensemester_kurzbz = false)
 	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->library('AntragLib');
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : false;
+		if ($studiensemester_kurzbz !== false && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -456,13 +464,19 @@ class Grades extends FHCAPI_Controller
 	
 		$this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
 		$this->form_validation->set_rules("points", $this->p->t("stv", "grades_points"), "required|numeric");
+		$this->form_validation->set_rules("studiensemester_kurzbz", $this->p->t("lehre", "studiensemester"), "required|regex_match[/^[WS]S[0-9]{4}$/]");
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		
-		$this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel');
 
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel');
 		
 		$result = $this->NotenschluesselaufteilungModel->getNote(
 			$this->input->post('points'),
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index fcc8007cd..629d5512a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -30,6 +30,7 @@ class Status extends FHCAPI_Controller
 		//Load Models
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -189,9 +190,13 @@ class Status extends FHCAPI_Controller
 		$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
 		if ($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT
 			|| $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND
-		) {
-			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-			$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		)
+		{
+			$studiensemester_kurzbz = $this->input->post('currentSemester');
+			if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+			{
+				$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+			}
 		}
 
 		$ausbildungssemester = $lastStatusData->ausbildungssemester;
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index deafb7762..784227ae0 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -68,12 +68,14 @@ class Student extends FHCAPI_Controller
 	 * @param string			$prestudent_id
 	 * @return void
 	 */
-	public function get($prestudent_id)
+	public function get($prestudent_id, $studiensemester_kurzbz)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-
 		$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'));
+		}
 
 		$this->PrestudentModel->addSelect('p.person_id');
 		$this->PrestudentModel->addSelect('p.titelpre');
@@ -163,21 +165,25 @@ class Student extends FHCAPI_Controller
 	 * @param string			$prestudent_id
 	 * @return void
 	 */
-	public function save($prestudent_id)
+	public function save($prestudent_id, $studiensemester_kurzbz)
 	{
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$this->load->library('form_validation');
 
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
 		$authuid = getAuthUID();
 		$now = date('c');
 
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
 		$this->form_validation->set_rules('semester', 'Semester', 'integer');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ef5e2e3a9..2d795369f 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -500,11 +500,6 @@ class PrestudentLib
 
 		$student = current(getData($result));
 
-
-		$this->_ci->load->library('VariableLib', ['uid' => $authUID]);
-		$semester_aktuell = $this->_ci->variablelib->getVar('semester_aktuell');
-
-
 		// Update Aktionen
 
 		// Status updaten
@@ -545,8 +540,8 @@ class PrestudentLib
 		// Studentlehrverband updaten
 		$result = $this->_ci->StudentlehrverbandModel->update([
 			'student_uid' => $student->student_uid,
-			'studiensemester_kurzbz' => $semester_aktuell
-		], [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+			], [
 			'semester' => $ausbildungssemester,
 			'verband' => '',
 			'gruppe' => '',
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index f29ab223c..5fa6ffb14 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -341,4 +341,10 @@ class Studiensemester_model extends DB_Model
 		WHERE studiensemester_kurzbz = ?",[$studiensemester_kurzbz]);
 
 	}
+
+	public function isValidStudiensemester($studiensemester_kurzbz)
+	{
+		$result = $this->load($studiensemester_kurzbz);
+		return hasData($result);
+	}
 }
diff --git a/public/js/api/factory/stv/details.js b/public/js/api/factory/stv/details.js
index 282b0003e..1077de22d 100644
--- a/public/js/api/factory/stv/details.js
+++ b/public/js/api/factory/stv/details.js
@@ -16,16 +16,22 @@
  */
 
 export default {
-	get(prestudent_id) {
+	get(prestudent_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/student/get/' + prestudent_id
+			url: 'api/frontend/v1/stv/student/get/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz)
 		};
 	},
-	save(prestudent_id, params) {
+	save(prestudent_id, studiensemester_kurzbz, params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/student/save/' + prestudent_id,
+			url: 'api/frontend/v1/stv/student/save/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz),
 			params
 		};
 	},
diff --git a/public/js/api/factory/stv/grades.js b/public/js/api/factory/stv/grades.js
index ea0d025eb..c42d202e3 100644
--- a/public/js/api/factory/stv/grades.js
+++ b/public/js/api/factory/stv/grades.js
@@ -22,25 +22,34 @@ export default {
 			url: 'api/frontend/v1/stv/grades/list'
 		};
 	},
-	getCertificate(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getCertificate(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getCertificate/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getCertificate/' + prestudent_id + all
+			url: url
 		};
 	},
-	getTeacherProposal(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getTeacherProposal(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getTeacherProposal/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getTeacherProposal/' + prestudent_id + all
+			url: url
 		};
 	},
-	getRepeaterGrades(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getRepeaterGrades(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getRepeaterGrades/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getRepeaterGrades/' + prestudent_id + all
+			url: url
 		};
 	},
 	updateCertificate({lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note, lehrveranstaltung_bezeichnung}) {
@@ -86,11 +95,15 @@ export default {
 			}
 		};
 	},
-	getGradeFromPoints(points, lehrveranstaltung_id) {
+	getGradeFromPoints(points, lehrveranstaltung_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/grades/getGradeFromPoints',
-			params: { points, lehrveranstaltung_id }
+			params: {
+				"points": points,
+				"lehrveranstaltung_id": lehrveranstaltung_id,
+				"studiensemester_kurzbz": studiensemester_kurzbz
+			}
 		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/api/factory/stv/prestudent.js b/public/js/api/factory/stv/prestudent.js
index a49dd1d7a..0112ff49b 100644
--- a/public/js/api/factory/stv/prestudent.js
+++ b/public/js/api/factory/stv/prestudent.js
@@ -17,10 +17,13 @@
 
 export default {
 	//------------- Prestudent.js------------------------------------------------------
-	get(prestudent_id) {
+	get(prestudent_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/prestudent/get/' + prestudent_id
+			url: 'api/frontend/v1/stv/prestudent/get/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz)
 		};
 	},
 	updatePrestudent(prestudent_id, params) {
diff --git a/public/js/api/stv/details.js b/public/js/api/stv/details.js
index a56de9494..501204c08 100644
--- a/public/js/api/stv/details.js
+++ b/public/js/api/stv/details.js
@@ -1,10 +1,16 @@
 export default {
-	get(prestudent_id) {
-		return this.$fhcApi.post('api/frontend/v1/stv/student/get/' + prestudent_id);
+	get(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/student/get/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz);
+		return this.$fhcApi.post(url);
 	},
-	save(form, prestudent_id, data) {
-		return this.$fhcApi.post(form, 'api/frontend/v1/stv/student/save/' + prestudent_id,
-			data
-		);
+	save(form, prestudent_id, studiensemester_kurzbz, data) {
+		let url = 'api/frontend/v1/stv/student/save/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz);
+		return this.$fhcApi.post(form, url, data);
 	},
 }
diff --git a/public/js/api/stv/grades.js b/public/js/api/stv/grades.js
index 135cd836c..625c3f8e3 100644
--- a/public/js/api/stv/grades.js
+++ b/public/js/api/stv/grades.js
@@ -2,17 +2,26 @@ export default {
 	list() {
 		return this.$fhcApi.get('api/frontend/v1/stv/grades/list');
 	},
-	getCertificate(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getCertificate/' + prestudent_id + all);
+	getCertificate(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getCertificate/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
-	getTeacherProposal(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getTeacherProposal/' + prestudent_id + all);
+	getTeacherProposal(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getTeacherProposal/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
-	getRepeaterGrades(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getRepeaterGrades/' + prestudent_id + all);
+	getRepeaterGrades(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getRepeaterGrades/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
 	updateCertificate({lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note, lehrveranstaltung_bezeichnung}) {
 		return this.$fhcApi.post(
@@ -65,8 +74,15 @@ export default {
 			}
 		);
 	},
-	getGradeFromPoints(points, lehrveranstaltung_id, manualErrorHandling) {
+	getGradeFromPoints(points, lehrveranstaltung_id, studiensemester_kurzbz, manualErrorHandling) {
 		const config = manualErrorHandling ? {errorHandling: false} : {};
-		return this.$fhcApi.post('api/frontend/v1/stv/grades/getGradeFromPoints', {points, lehrveranstaltung_id}, config);
+		return this.$fhcApi.post('api/frontend/v1/stv/grades/getGradeFromPoints',
+			{
+				"points": points,
+				"lehrveranstaltung_id": lehrveranstaltung_id,
+				"studiensemester_kurzbz": studiensemester_kurzbz
+			},
+			config
+			);
 	}
 }
\ No newline at end of file
diff --git a/public/js/api/stv/prestudent.js b/public/js/api/stv/prestudent.js
index 25b4c85ad..8b2a5255b 100644
--- a/public/js/api/stv/prestudent.js
+++ b/public/js/api/stv/prestudent.js
@@ -2,8 +2,13 @@ export default {
 
 //------------- Prestudent.js------------------------------------------------------
 
-	get(prestudent_id){
-		return 	this.$fhcApi.post('api/frontend/v1/stv/prestudent/get/' + prestudent_id);
+	get(prestudent_id, studiensemester_kurzbz) {
+		return 	this.$fhcApi.post(
+			'api/frontend/v1/stv/prestudent/get/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			);
 	},
 	updatePrestudent(form, prestudent_id, data){
 		return this.$fhcApi.post(form, 'api/frontend/v1/stv/prestudent/updatePrestudent/' + prestudent_id,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index eacabccc0..45ee3bdd5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -41,6 +41,10 @@ export default {
 		$reloadList: {
 			from: '$reloadList',
 			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	props: {
@@ -101,7 +105,7 @@ export default {
 	methods: {
 		updateStudent(n) {
 			return this.$api
-				.call(ApiStvDetails.get(n.prestudent_id))
+				.call(ApiStvDetails.get(n.prestudent_id, this.currentSemester))
 				.then(result => {
 					this.data = result.data;
 					if (!this.data.familienstand)
@@ -116,7 +120,11 @@ export default {
 
 			this.$refs.form.clearValidation();
 			return this.$refs.form
-				.call(ApiStvDetails.save(this.modelValue.prestudent_id, this.changed))
+				.call(ApiStvDetails.save(
+					this.modelValue.prestudent_id,
+					this.currentSemester,
+					this.changed
+					))
 				.then(result => {
 					this.original = {...this.data};
 					this.changed = {};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
index ee70a721c..a4cfeaafb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
@@ -9,6 +9,12 @@ export default {
 	emits: [
 		"copied"
 	],
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -24,7 +30,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getRepeaterGrades(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index 171202163..4b0df9686 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -9,6 +9,12 @@ export default {
 	emits: [
 		"copied"
 	],
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -24,7 +30,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getTeacherProposal(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 81745897d..6ee4d0386 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -5,14 +5,22 @@ import ZeugnisDocuments from './Zeugnis/Documents.js';
 import ApiStvGrades from '../../../../../api/factory/stv/grades.js';
 
 export default {
+	name: 'Zeugnis',
 	components: {
 		CoreFilterCmpt,
 		ZeugnisActions,
 		ZeugnisDocuments
 	},
-	inject: [
-		'config'
-	],
+	inject: {
+		config: {
+			from: 'config',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -103,7 +111,8 @@ export default {
 									.call(
 										ApiStvGrades.getGradeFromPoints(
 											filterTerm,
-											cell.getData().lehrveranstaltung_id
+											cell.getData().lehrveranstaltung_id,
+											this.currentSemester
 										),
 										{ errorHandling: false }
 									)
@@ -201,7 +210,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getCertificate(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
index 303098cf9..1ffa47a30 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
@@ -5,6 +5,7 @@ import ZeugnisDocuments from './Documents.js';
 import ApiStvGrades from '../../../../../../api/factory/stv/grades.js';
 
 export default {
+	name: 'ZeugnisActions',
 	components: {
 		CoreForm,
 		FormInput,
@@ -14,9 +15,16 @@ export default {
 		'setGrade',
 		'deleteGrade'
 	],
-	inject: [
-		'config'
-	],
+	inject: {
+		config: {
+			from: 'config',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		selected: Array
 	},
@@ -66,7 +74,8 @@ export default {
 			this.$refs.points
 				.call(ApiStvGrades.getGradeFromPoints(
 					query,
-					this.selected.find(Boolean)?.lehrveranstaltung_id
+					this.selected.find(Boolean)?.lehrveranstaltung_id,
+					this.currentSemester
 				))
 				.then(result => {
 					if (result.data === null) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
index ed27dc283..121efddbf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
@@ -8,6 +8,7 @@ async function callPermissionUrl($api, url) {
 }
 
 export default {
+	name: 'ZeugnisDocuments',
 	components: {
 		PvTieredMenu: primevue.tieredmenu
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a36b355b1..b73d2effc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -30,8 +30,9 @@ export default {
 			from: 'hasAdminPermission',
 			default: false
 		},
-		defaultSemester: {
-			from: 'defaultSemester',
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	props: {
@@ -107,7 +108,7 @@ export default {
 	methods: {
 		loadPrestudent() {
 			return this.$api
-				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id))
+				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id, this.currentSemester))
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index ab8f83fab..d72c36b7c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -14,6 +14,10 @@ export default {
 		$reloadList: {
 			from: '$reloadList',
 			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	emits: [
@@ -242,6 +246,7 @@ export default {
 			return askForSemester();
 		},
 		changeStatus(data) {
+			data.currentSemester = this.currentSemester;
 			Promise
 				.allSettled(
 					this.prestudentIds.map(prestudent_id => this.$api.call(

From c876179762df3f4aa2ea1297148d85dcb9dd2bba Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 30 Jul 2025 18:15:09 +0200
Subject: [PATCH 0556/1357] adapt Students api endpoints, use ci routing, adapt
 frontend

---
 application/config/routes.php                 |  47 +++
 .../api/frontend/v1/stv/Students.php          | 334 +++++++++++-------
 .../js/components/Stv/Studentenverwaltung.js  |   9 +-
 3 files changed, 257 insertions(+), 133 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index eb4c267ce..943e7164f 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -63,6 +63,53 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
 
+// Studierendenverwaltung List Routes
+$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
+
+// (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
+
+// (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
+
+// (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+
+// (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+
+// // (studiensemester_kurzbz)/student/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/student/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/prestudent/(prestudent_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
+// // (studiensemester_kurzbz)/person/(person_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
+
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index df8793368..68e7407bf 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -48,139 +48,108 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
-	 * Remap calls:
-	 * /													=> return []
-	 * /inout												=> return []
-	 * /inout/incoming										=> getIncoming
-	 * /inout/outgoing										=> getOutgoing
-	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
-	 * /(studiengang_kz)									=> getStudents
-	 * /(studiengang_kz)/prestudent							=> getPrestudents
-	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
-	 * /(studiengang_kz)/(semester)							=> getStudents
-	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
-	 * /(studiengang_kz)/(org_form)							=> getStudents
-	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
-	 * 														=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
-	 * 														=> getStudents
-	 * /student/(student_uid)								=> getStudent
-	 * /prestudent/(prestudent_id)							=> getPrestudent
-	 * /person/(person_id)									=> getPerson
+	 * Routing
 	 *
-	 * @param string		$method
-	 * @param array			$params				(optional)
+	 * /inout												=> index
+	 * /(studiensemester_kurzbz)							=> index
+	 * /(studiensemester_kurzbz)/inout						=> index
 	 *
+	 * /(studiensemester_kurzbz)/inout/incoming				=> getIncoming
+	 * /(studiensemester_kurzbz)/inout/outgoing				=> getOutgoing
+	 * /(studiensemester_kurzbz)/inout/gemeinsamestudien	=> getGemeinsamestudien
+	 *
+	 * /(studiengang_kz)/prestudent													=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)						=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)/(filter)				=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudents
+	 *
+	 * /(studiengang_kz)/(orgform)/prestudent													=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)							=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)					=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudentsOrgform
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/(verband)			=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/(verband)/(gruppe) => getStudents
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe) => getStudentsOrgformSpezialgruppe
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)									=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)						=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)			=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)/(gruppe)	=> getStudentsOrgform
+	 *
+	 * /(studiensemester_kurzbz)/student/(student_uid)		=> getStudent
+	 * /(studiensemester_kurzbz)/prestudent/(prestudent_id)	=> getPrestudent
+	 * /(studiensemester_kurzbz)/person/(person_id)			=> getPerson
+	 */
+
+	public function index()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
 	 * @return void
 	 */
-	public function _remap($method, $params = [])
+	public function getIncoming()
 	{
-		if ($method == '' || $method == 'index')
-			return $this->terminateWithSuccess([]);
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		if ($method == 'inout') {
-			if (!count($params))
-				return $this->terminateWithSuccess([]);
-			switch ($params[0]) {
-				case 'incoming':
-					return $this->getIncoming();
-				case 'outgoing':
-					return $this->getOutgoing();
-				case 'gemeinsamestudien':
-					return $this->getGemeinsamestudien();
-				default:
-					return show_404();
-			}
-		}
+	/**
+	 * @return void
+	 */
+	public function getOutgoing()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		$count = count($params);
-		if (!$count)
-			return $this->getStudents($method);
+	/**
+	 * @return void
+	 */
+	public function getGemeinsamestudien()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		if ($method == 'uid' && $count == 1)
-			return $this->getStudent($params[0]);
-
-		if ($method == 'prestudent' && $count == 1)
-			return $this->getPrestudent($params[0]);
-
-		if ($method == 'person' && $count == 1)
-			return $this->getPerson($params[0]);
-
-		if (is_numeric($params[0])) {
-			$sem = $params[0];
-			if ($count == 3 && $params[1] == 'grp') {
-				$g = $params[2];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 1 ? $params[1] : null;
-				$grp = $count > 2 ? $params[2] : null;
-			}
-			return $this->getStudents($method, $sem, $ver, $grp, $g);
-		} elseif ($params[0] == 'prestudent') {
-			if ($count == 1)
-				return $this->getPrestudents($method);
-			if ($count == 2)
-				return $this->getPrestudents($method, $params[1]);
-			return $this->getPrestudents($method, $params[1], $params[$count-1]);
-		} else {
-			$org = $params[0];
-			if ($count > 1 && $params[1] == 'prestudent') {
-				if ($count == 2)
-					return $this->getPrestudents($method, null, null, $org);
-				if ($count == 3)
-					return $this->getPrestudents($method, $params[2], null, $org);
-				return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
-			}
-			$sem = $count > 1 ? $params[1] : null;
-			if ($count == 4 && $params[2] == 'grp') {
-				$g = $params[3];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 2 ? $params[2] : null;
-				$grp = $count > 3 ? $params[3] : null;
-			}
-
-			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
-		}
+	public function getPrestudents($studiengang_kz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiengang_kz' => $studiengang_kz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'filter' => $filter
+		));
 		
-		show_404();
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}
 
-	/**
-	 * @return void
-	 */
-	protected function getIncoming()
+	public function getPrestudentsOrgform($studiengang_kz, $orgform_kurzbz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
 	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getOutgoing()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getGemeinsamestudien()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiengang_kz' => $studiengang_kz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'filter' => $filter,
+			'orgform_kurzbz' => $orgform_kurzbz
+		));
+		
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
 	}
 
 	/**
@@ -191,7 +160,7 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -379,8 +348,73 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	public function getStudents($studiensemester_kurzbz,
+		$studiengang_kz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'verband' => $verband,
+			'gruppe' => $gruppe
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
+	}
+
+	public function getStudentsOrgform($studiensemester_kurzbz,
+		$studiengang_kz, $orgform_kurzbz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'semester' => $semester,
+			'verband' => $verband,
+			'gruppe' => $gruppe
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
+	}
+
+	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
+		$studiengang_kz, $semester, $gruppe_kurzbz,
+		$orgform_kurzbz = null)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
+	}
+
+	public function getStudentsOrgformSpezialgruppe($studiensemester_kurzbz,
+		$orgform_kurzbz, $studiengang_kz, $semester, $gruppe_kurzbz
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
+	}
+
 	/**
 	 * @param integer		$studiengang_kz
+	 * @param string		$studiensemester_kurzbz
 	 * @param integer		$semester						(optional)
 	 * @param string		$verband						(optional)
 	 * @param integer		$gruppe							(optional)
@@ -389,11 +423,15 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getStudents($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)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$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'));
+		}
 
 		/*
 			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
@@ -478,9 +516,20 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getPrestudent($prestudent_id)
+	public function getPrestudent($studiensemester_kurzbz, $prestudent_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'prestudent_id' => $prestudent_id,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -536,9 +585,20 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getStudent($student_uid)
+	public function getStudent($studiensemester_kurzbz, $student_uid)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student_uid,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -592,13 +652,25 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
+	 * @param string		$studiensemester_kurzbz
 	 * @param integer		$person_id
 	 *
 	 * @return void
 	 */
-	protected function getPerson($person_id)
+	public function getPerson($studiensemester_kurzbz, $person_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'person_id' => $person_id,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 96846f76d..9c53dc529 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -114,10 +114,15 @@ export default {
 		}
 	},
 	methods: {
-		onSelectVerband({link, studiengang_kz}) {
+		onSelectVerband( {link, studiengang_kz}) {
+			let urlpath = String(link);
+			if (!urlpath.match(/\/prestudent/))
+			{
+				urlpath = this.studiensemesterKurzbz + '/' + urlpath;
+			}
 			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.verband(link)
+				ApiStv.students.verband(urlpath)
 			);
 		},
 		studiensemesterChanged(v) {

From f12db529e0c781d953e7e5bba3ae3e70fefd1440 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 07:40:07 +0200
Subject: [PATCH 0557/1357] Tab Notizen: remove clipContents

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

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 8b37cd6e3..a2702c7f0 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -82,7 +82,7 @@ export default {
 						field: "text_stripped",
 						width: 250,
 						formatter: "html",
-						clipContents: true,
+						//clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -254,7 +254,7 @@ export default {
 							title: this.$p.t('global', 'text'),
 							width: 250,
 							tooltip: true,
-							clipContents: true,
+							//clipContents: true,
 						});
 
 						// Force layout recalculation for handling overflow text

From 2f10a3a3e9d13b0db906f1e169b9c0e7290d99db Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 31 Jul 2025 07:50:17 +0200
Subject: [PATCH 0558/1357] adapt single person routes, old and new js api
 files and frontend usage

---
 application/config/routes.php                 |  4 ++--
 .../api/frontend/v1/stv/Students.php          |  2 +-
 public/js/api/factory/stv/students.js         | 24 ++++++++++++++-----
 public/js/api/stv/students.js                 | 24 ++++++++++++++-----
 .../js/components/Stv/Studentenverwaltung.js  |  6 ++---
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 943e7164f..c129c7b3b 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -103,8 +103,8 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:nu
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
-// // (studiensemester_kurzbz)/student/(uid)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/student/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/uid/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
 // // (studiensemester_kurzbz)/prestudent/(prestudent_id)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
 // // (studiensemester_kurzbz)/person/(person_id)
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 68e7407bf..12785d6d7 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -82,7 +82,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)			=> getStudentsOrgform
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)/(gruppe)	=> getStudentsOrgform
 	 *
-	 * /(studiensemester_kurzbz)/student/(student_uid)		=> getStudent
+	 * /(studiensemester_kurzbz)/uid/(student_uid)		=> getStudent
 	 * /(studiensemester_kurzbz)/prestudent/(prestudent_id)	=> getPrestudent
 	 * /(studiensemester_kurzbz)/person/(person_id)			=> getPerson
 	 */
diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js
index 582ba04e8..18f3b1743 100644
--- a/public/js/api/factory/stv/students.js
+++ b/public/js/api/factory/stv/students.js
@@ -16,22 +16,34 @@
  */
 
 export default {
-	uid(uid) {
+	uid(uid, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/uid/'
+			+ encodeURIComponent(uid);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/uid/' + uid
+			url: url
 		};
 	},
-	prestudent(prestudent_id) {
+	prestudent(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/prestudent/'
+			+ encodeURIComponent(prestudent_id);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/prestudent/' + prestudent_id
+			url: url
 		};
 	},
-	person(person_id) {
+	person(person_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/person/'
+			+ encodeURIComponent(person_id);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/person/' + person_id
+			url: url
 		};
 	},
 	verband(relative_path) {
diff --git a/public/js/api/stv/students.js b/public/js/api/stv/students.js
index 797a13bb3..5a6c13922 100644
--- a/public/js/api/stv/students.js
+++ b/public/js/api/stv/students.js
@@ -1,12 +1,24 @@
 export default {
-	uid(uid) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/uid/' + uid);
+	uid(uid, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/uid/'
+			+ encodeURIComponent(uid);
+		return this.$fhcApi.getUri(url);
 	},
-	prestudent(prestudent_id) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/prestudent/' + prestudent_id);
+	prestudent(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/prestudent/'
+			+ encodeURIComponent(prestudent_id);
+		return this.$fhcApi.getUri(url);
 	},
-	person(person_id) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/person/' + person_id);
+	person(person_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/person/'
+			+ encodeURIComponent(person_id);
+		return this.$fhcApi.getUri(url);
 	},
 	verband(relative_path) {
 		return this.$fhcApi.getUri('api/frontend/v1/stv/students/' + relative_path);
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9c53dc529..34622f406 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -201,17 +201,17 @@ export default {
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.uid(this.$route.params.id),
+				ApiStv.students.uid(this.$route.params.id, this.studiensemesterKurzbz),
 				true
 			);
 		} else if (this.$route.params.prestudent_id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.prestudent(this.$route.params.prestudent_id),
+				ApiStv.students.prestudent(this.$route.params.prestudent_id, this.studiensemesterKurzbz),
 				true
 			);
 		} else if (this.$route.params.person_id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.person(this.$route.params.person_id),
+				ApiStv.students.person(this.$route.params.person_id, this.studiensemesterKurzbz),
 				true
 			);
 		}

From f9f0748b89c1b83cb82a354892ae567bf1ded1f5 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:10:11 +0200
Subject: [PATCH 0559/1357] studiensemester_kurzbz aus dem fronted
 beruecksichtigen extendedHeaderFilter suche in mehreren spalten moeglich
 getAllOe sql abfrage richtig gestellt

---
 .../api/frontend/v1/Lehrveranstaltung.php     |  38 ++++--
 .../models/education/Lehreinheit_model.php    |   6 +
 .../education/Lehrveranstaltung_model.php     |  16 ++-
 public/js/api/lehrveranstaltung.js            |  20 +++-
 public/js/apps/LVVerwaltung.js                |  66 ++++++++++-
 .../components/LVVerwaltung/LVVerwaltung.js   | 112 ++++++++++--------
 .../js/components/LVVerwaltung/Setup/Table.js |  64 ++--------
 .../tabulator/filters/extendedHeaderFilter.js |  11 ++
 8 files changed, 201 insertions(+), 132 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
index 098d44712..2e254bfc8 100644
--- a/application/controllers/api/frontend/v1/Lehrveranstaltung.php
+++ b/application/controllers/api/frontend/v1/Lehrveranstaltung.php
@@ -27,8 +27,8 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'loadByEmployee' => ['admin:r', 'assistenz:r'],
-			'loadByStudiengang' => ['admin:r', 'assistenz:r'],
+			'getByEmp' => ['admin:r', 'assistenz:r'],
+			'getByStg' => ['admin:r', 'assistenz:r'],
 			'loadByLV' => ['admin:r', 'assistenz:r'],
 		]);
 
@@ -37,6 +37,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->_ci->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$this->_ci->load->library('VariableLib', ['uid' => $this->_uid]);
 
@@ -46,12 +47,14 @@ class Lehrveranstaltung extends FHCAPI_Controller
 			)
 		);
 	}
-	public function loadByEmployee($mitarbeiter_uid = null, $stg_kz = null)
-	{
-		if (is_null($mitarbeiter_uid))
-			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-		$studiensemester_kurzbz = $this->_ci->variablelib->getVar('semester_aktuell');
+	public function getByEmp($studiensemester_kurzbz = null, $mitarbeiter_uid = null, $stg_kz = null)
+	{
+
+		if (is_null($mitarbeiter_uid))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz);
 		$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
@@ -72,8 +75,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($tree);
 	}
-
-	public function loadByStudiengang($studiengang_kz = null, $semester = null)
+	public function getByStg($studiensemester_kurzbz = null, $studiengang_kz = null, $semester = null)
 	{
 		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
@@ -87,7 +89,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
-		$studiensemester_kurzbz = $this->_ci->variablelib->getVar('semester_aktuell');
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
 
 		$studienplan_ids = array();
@@ -107,7 +109,6 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
 		$lehrveranstaltungen_data = hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
 
-
 		$tree = [];
 		foreach ($lehrveranstaltungen_data as $row)
 		{
@@ -246,4 +247,19 @@ class Lehrveranstaltung extends FHCAPI_Controller
 			}
 		}
 	}
+
+	private function getStudiensemesterKurzbz($studiensemester_kurzbz = null)
+	{
+		if (!is_null($studiensemester_kurzbz))
+		{
+			$studiensemester_result = $this->_ci->StudiensemesterModel->load($studiensemester_kurzbz);
+
+			if (isError($studiensemester_result) || !hasData($studiensemester_result))
+				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+			return getData($studiensemester_result)[0]->studiensemester_kurzbz;
+		}
+
+		$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+	}
 }
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index ce414bad2..c33b87ad4 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -356,6 +356,8 @@ EOSQL;
 						gruppen.gruppen,
 						mitarbeiter.lektoren,
 						mitarbeiter.le_planstunden,
+						mitarbeiter.vorname,
+						mitarbeiter.nachname,
 						mitarbeiter.semesterstunden,
 						fachbereich.bezeichnung as fachbereich,
 						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
@@ -659,11 +661,15 @@ EOSQL;
 					 SELECT
 						tbl_lehreinheitmitarbeiter.lehreinheit_id,
 						STRING_AGG(m.kurzbz, ' ') AS lektoren,
+						STRING_AGG(tbl_person.vorname, ' ') AS vorname,
+						STRING_AGG(tbl_person.nachname, ' ') AS nachname,
 						STRING_AGG(tbl_lehreinheitmitarbeiter.semesterstunden::text, ' ') AS semesterstunden,
 						STRING_AGG(tbl_lehreinheitmitarbeiter.planstunden::text, ' ') AS le_planstunden
 					FROM lehre.tbl_lehreinheitmitarbeiter
 						JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
 						JOIN lehreinheiten USING(lehreinheit_id)
+						JOIN public.tbl_benutzer ON mitarbeiter_uid = uid
+						JOIN public.tbl_person ON tbl_benutzer.person_id = tbl_person.person_id
 					GROUP BY tbl_lehreinheitmitarbeiter.lehreinheit_id
 				)";
 	}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 121de9233..303bebe1e 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1200,19 +1200,29 @@ class Lehrveranstaltung_model extends DB_Model
 
 	public function getAllOe($lv_id, $stg_kz = null)
 	{
-		$qry = "SELECT DISTINCT oe_kurzbz
+		$qry = "(SELECT DISTINCT oe_kurzbz
 			FROM lehre.tbl_studienplan_lehrveranstaltung
 			JOIN lehre.tbl_studienplan USING(studienplan_id)
 			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
 			JOIN public.tbl_studiengang USING(studiengang_kz)
-			WHERE lehrveranstaltung_id = ? ";
+			WHERE lehrveranstaltung_id = ?)";
 
 		$params = array($lv_id);
 		if (!is_null($stg_kz))
 		{
-			$qry .= ' OR studiengang_kz = ?';
+			$qry .= ' UNION 
+					(SELECT oe_kurzbz
+					FROM public.tbl_studiengang WHERE studiengang_kz = ?)';
 			$params[] = $stg_kz;
 		}
+		else
+		{
+			$qry .= ' UNION
+					(SELECT oe_kurzbz
+					FROM public.tbl_studiengang WHERE studiengang_kz = (SELECT tbl_lehrveranstaltung.studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id = ?))
+			';
+			$params[] = $lv_id;
+		}
 
 		return $this->execReadOnlyQuery($qry, $params);
 	}
diff --git a/public/js/api/lehrveranstaltung.js b/public/js/api/lehrveranstaltung.js
index 0499572ba..8aa6becaf 100644
--- a/public/js/api/lehrveranstaltung.js
+++ b/public/js/api/lehrveranstaltung.js
@@ -7,16 +7,24 @@ export default {
 			url: '/api/frontend/v1/Lehrveranstaltung/loadByLV/' + encodeURIComponent(lehrveranstaltung_id)
 		};
 	},
-	getByStg(studiengang_kz, semester)
+	getByStg(studiensemester_kurzbz, studiengang_kz, semester = null)
 	{
-		return ("/api/frontend/v1/Lehrveranstaltung/loadByStudiengang/" + encodeURIComponent(studiengang_kz) + "/" + encodeURIComponent(semester));
-	},
+		let path = "/api/frontend/v1/Lehrveranstaltung/getByStg/" + encodeURIComponent(studiensemester_kurzbz) + "/" + encodeURIComponent(studiengang_kz);
 
-	getByEmpStg(mitarbeiter_uid, stg)
+		if (semester)
+			path += "/" + encodeURIComponent(semester);
+
+		return path;
+	},
+	getByEmp(studiensemester_kurzbz, mitarbeiter_uid, stg = null)
 	{
-		return ("/api/frontend/v1/Lehrveranstaltung/loadByEmployee/" + encodeURIComponent(mitarbeiter_uid) + "/" + encodeURIComponent(stg));
-	},
+		let path = "/api/frontend/v1/Lehrveranstaltung/getByEmp/" + encodeURIComponent(studiensemester_kurzbz) + "/" + encodeURIComponent(mitarbeiter_uid);
 
+		if (stg)
+			path += "/" + encodeURIComponent(stg);
+
+		return path;
+	},
 	getTable(url)
 	{
 		return {
diff --git a/public/js/apps/LVVerwaltung.js b/public/js/apps/LVVerwaltung.js
index c582f817e..2ab3fd98c 100644
--- a/public/js/apps/LVVerwaltung.js
+++ b/public/js/apps/LVVerwaltung.js
@@ -1,5 +1,6 @@
 import LVVerwaltung from "../components/LVVerwaltung/LVVerwaltung.js";
 import Phrasen from "../plugins/Phrasen.js";
+import {DEFAULT_MODE_RAUMINFO} from "../components/Cis/Mylv/RoomInformation";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -13,8 +14,35 @@ const router = VueRouter.createRouter({
 		},
 		{
 			name: `byEmp`,
-			path: `/emp/:emp/:stg?`,
-			component: LVVerwaltung
+			path: `/emp/:studiensemester_kurzbz/:emp/:stg?/:semester?`,
+			component: LVVerwaltung,
+			props: route => {
+				let {emp, stg, semester, studiensemester_kurzbz} = route.params;
+
+				if (emp === '')
+					emp = undefined;
+
+				if (stg === '')
+					stg = undefined;
+
+				if (studiensemester_kurzbz === '')
+					studiensemester_kurzbz = undefined;
+
+				return {
+					studiensemester_kurzbz: studiensemester_kurzbz,
+					emp: emp,
+					stg: stg,
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const { studiensemester_kurzbz } = to.params;
+				const isSemester = /^(SS|WS)\d{4}$/.test(studiensemester_kurzbz);
+
+				if (!isSemester)
+					return next({ path: '/' });
+				else
+					next();
+			}
 		},
 		/*{
 			name: `byFachbereich`,
@@ -23,13 +51,41 @@ const router = VueRouter.createRouter({
 		},*/
 		{
 			name: `byStg`,
-			path: `/stg/:stg/:semester?`,
-			component: LVVerwaltung
+			path: '/stg/:studiensemester_kurzbz/:stg?/:semester?/',
+			component: LVVerwaltung,
+			props: route => {
+				let { studiensemester_kurzbz, stg, semester } = route.params;
+
+				if (semester === '')
+					semester = undefined;
+
+				if (studiensemester_kurzbz === '')
+					studiensemester_kurzbz = undefined;
+
+				if (stg === '')
+					semester = undefined;
+
+				return {
+					studiensemester_kurzbz: studiensemester_kurzbz,
+					stg: stg,
+					semester: semester != null ? Number(semester) : null,
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const studiensemester_kurzbz = to.params?.studiensemester_kurzbz
+				const isSemester = /^(SS|WS)\d{4}$/.test(studiensemester_kurzbz);
+
+				if (!isSemester)
+					return next({ path: '/' });
+				else
+					next();
+			}
 		},
 		{
 			path: '/:pathMatch(.*)*',
 			redirect: '/'
-		}
+		},
+
 	]
 });
 
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index c7c34802d..7b8921c80 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -26,16 +26,22 @@ export default {
 		defaultSemester: String,
 		lvRoot: String,
 		permissions: Object,
-		config: Object
+		config: Object,
+		stg: { type: String, required: false },
+		semester: { type: Number, required: false, default: null },
+		studiensemester_kurzbz: { type: String, required: false, default: null },
+		emp: { type: String, required: false, default: null }
 	},
 	computed: {
-		type(){
-			return this.$route.params.type
+		selectedStudiensemester() {
+			return this.studiensemester_kurzbz != null
+				? this.studiensemester_kurzbz
+				: this.defaultSemester;
 		}
 	},
 	provide() {
 		return {
-			currentSemester: Vue.computed(() => this.studiensemesterKurzbz),
+			currentSemester: Vue.computed(() => this.selectedStudiensemester),
 			dropdowns: this.dropdowns,
 			configShowVertragsdetails: this.config.showVertragsdetails,
 			configShowGewichtung: this.config.showGewichtung,
@@ -49,18 +55,26 @@ export default {
 		}
 	},
 	mounted() {
-		this.updateFilter(this.$route);
+		this.updateFilter();
 	},
 	watch: {
-		'$route'(to) {
-			this.updateFilter(to);
+		stg() {
+			this.updateFilter();
+		},
+		semester() {
+			this.updateFilter();
+		},
+		selectedStudiensemester() {
+			this.updateFilter();
+		},
+		emp() {
+			this.updateFilter();
 		},
 	},
 	data() {
 		return {
 			selected: [],
-			studiensemesterKurzbz: this.defaultSemester,
-			stg: "",
+			studiengang: "",
 			filter: {},
 			endpoint: ApiStudiengangTree,
 			dropdowns: {
@@ -95,20 +109,16 @@ export default {
 		}
 	},
 	methods: {
-		updateFilter(route)
+		updateFilter()
 		{
-			let filter = { ...route.params, ...route.query };
-			if (!filter.activeFilter)
-			{
-				if (filter.emp)
-				{
-					filter.activeFilter = 'employee';
-				}
-				else if (filter.stg)
-				{
-					filter.activeFilter = 'verband';
-				}
+			const filter = {
+				stg: this.stg,
+				emp: this.emp,
+				semester: this.semester,
+				studiensemester_kurzbz: this.selectedStudiensemester,
+				activeFilter: this.emp ? 'employee' : this.stg ? 'verband' : null
 			}
+
 			this.filter = filter;
 		},
 		handleRowClicked(data)
@@ -117,18 +127,26 @@ export default {
 		},
 		onSelectEmployee(emp)
 		{
-			let stg = this.stg === '' ? null : this.stg;
+			const { stg, semester } = this.filter;
 
-			this.$router.push({
-				name: 'byEmp',
-				params: { emp, stg, activeFilter: 'employee'},
-			});
+			let studiensemester_kurzbz = this.selectedStudiensemester;
+			const params = { emp };
+
+			if (stg)
+				params.stg = stg;
+			if (semester !== null)
+				params.semester = semester;
+			if (studiensemester_kurzbz)
+				params.studiensemester_kurzbz = studiensemester_kurzbz;
+
+			this.$router.push({ name: 'byEmp', params })
 		},
 
 		onSelectVerband({link})
 		{
 			let stg = null;
 			let semester = null;
+			let studiensemester_kurzbz = this.selectedStudiensemester;
 
 			if (typeof link === 'number')
 				stg = link;
@@ -137,28 +155,22 @@ export default {
 				[stg, semester] = link.split('/');
 			}
 
-			this.stg = stg;
+			const routeName = this.filter.emp ? 'byEmp' : 'byStg';
+			const params = { stg };
 
-			if (this.filter && this.filter.emp)
-			{
-				this.$router.push({
-					name: 'byEmp',
-					params: { emp: this.filter.emp, stg, activeFilter: 'employee' },
-				});
-			}
-			else
-			{
-				this.$router.push({
-					name: 'byStg',
-					params: { stg, semester, activeFilter: 'verband' },
-				});
-			}
+			if (semester !== null)
+				params.semester = Number(semester);
+			if (studiensemester_kurzbz)
+				params.studiensemester_kurzbz = studiensemester_kurzbz;
+			if (this.filter.emp)
+				params.emp = this.filter.emp;
 
+			this.$router.push({ name: routeName, params });
 			this.selected = [];
 		},
 		resetEmployeeFilter()
 		{
-			const newParams = { ...this.$route.params, activeFilter: 'verband' };
+			const newParams = { ...this.filter, activeFilter: 'verband' };
 			if (newParams.stg === '')
 				this.$router.replace({ name: 'index' });
 			else
@@ -166,24 +178,24 @@ export default {
 				delete newParams.emp;
 				newParams.semester = null;
 				this.$router.replace({ name: 'byStg', params: newParams });
-
 			}
 		},
 		searchfunction(params) {
 			return this.$api.call(ApiSearchbar.search(params));
 		},
 		studiensemesterChanged(newValue) {
-			this.studiensemesterKurzbz = newValue;
-			this.$refs.lvTable.reload();
+			const routeName = this.filter.activeFilter === 'employee' ? 'byEmp' : 'byStg';
+			const newParams = {...this.filter, studiensemester_kurzbz: newValue};
+			this.$router.push({ name: routeName, params: newParams });
 			this.selected = [];
 		},
 	},
 	created() {
-		if (this.$route.params.stg !== undefined)
+		if (this.stg !== undefined)
 		{
-			this.selectedStudiengang = this.$route.params?.semester !== '' && this.$route.params?.semester
-				? `${this.$route.params.stg}/${this.$route.params.semester}`
-				: this.$route.params.stg;
+			this.selectedStudiengang = this.semester !== '' && this.semester
+				? `${this.stg}/${this.semester}`
+				: this.stg;
 		}
 
 		this.$p.loadCategory(['lehre', 'person', 'global'])
@@ -250,7 +262,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%" :preselectedKey="selectedStudiengang" :endpoint="endpoint"></stv-verband>
-					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester :default="selectedStudiensemester" @changed="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index a1b2830f1..5b4d45c24 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -61,42 +61,6 @@ export default {
 	},
 	data() {
 		return {
-			fieldTitleMap: {
-				lv_kurzbz: ['lehre', 'kurzbz'],
-				tags: ['ui', 'tags'],
-				lehrveranstaltung_id: ['lehre', 'lehrveranstaltung_id'],
-				lv_bezeichnung: ['ui', 'bezeichnung'],
-				lv_bezeichnung_english: ['lehre', 'bezeichnungeng'],
-				lv_studiengang_kz: ['lehre', 'studiengangskennzahlLehre'],
-				studiengang: ['lehre', 'studiengang'],
-				semester: ['lehre', 'semester'],
-				sprache: ['global', 'sprache'],
-				lv_ects: ['lehre', 'ects'],
-				semesterstunden: ['lehre', 'semesterstunden'],
-				anmerkung: ['global', 'anmerkung'],
-				lehre: ['lehre', 'lehre'],
-				lehreverzeichnis: ['ui', 'lehreverzeichnis'],
-				aktiv: ['person', 'aktiv'],
-				planfaktor: ['ui', 'planfaktor'],
-				planlektoren: ['ui', 'planlektoren'],
-				planpersonalkosten: ['ui', 'planpersonalkosten'],
-				plankostenprolektor: ['ui', 'plankostenprolektor'],
-				orgform_kurzbz: ['lehre', 'organisationsform'],
-				studienplan_id: ['ui', 'studienplan_id'],
-				studienplan_bezeichnung: ['ui', 'studienplan_bezeichnung'],
-				lehrtyp_kurzbz: ['ui', 'lehrtyp_kurzbz'],
-				lehrform_kurzbz: ['lehre', 'lehrform'],
-				le_planstunden: ['lehre', 'leplanstunden'],
-				lehreinheit_id: ['lehre', 'lehreinheit_id'],
-				stundenblockung: ['lehre', 'stundenblockung'],
-				wochenrythmus: ['lehre', 'wochenrhytmus'],
-				startkw: ['lehre', 'startkw'],
-				raumtyp: ['lehre', 'raumtyp'],
-				raumtypalternativ: ['lehre', 'raumtypalternativ'],
-				gruppen: ['lehre', 'gruppen'],
-				lektoren: ['lehre', 'lehrende'],
-			},
-
 			expanded: [],
 			selectedColumnValues: [],
 			tagEndpoint: ApiTag,
@@ -168,7 +132,7 @@ export default {
 					headerFilterFunc: extendedHeaderFilter,
 				},
 				layout: 'fitDataStretch',
-				persistenceID: 'lehrveranstaltungen_2025_07_11_v1',
+				persistenceID: 'lehrveranstaltungen_2025_07_31_v1',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
@@ -348,7 +312,7 @@ export default {
 					{title: this.$p.t('lehre', 'raumtyp'), field: "raumtyp", headerFilter: true, headerFilterFuncParams: {field: 'raumtyp'}, visible: false},
 					{title: this.$p.t('lehre', 'raumtypalternativ'), field: "raumtypalternativ", headerFilter: true, headerFilterFuncParams: {field: 'raumtypalternativ'}, visible: false},
 					{title: this.$p.t('lehre', 'gruppen'), field: "gruppen", headerFilter: true, headerFilterFuncParams: {field: 'gruppen'}},
-					{title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: 'lektoren'}},
+					{title: this.$p.t('lehre', 'lehrende'), field: "lektoren", headerFilter: true, headerFilterFuncParams: {field: ['lektoren', 'vorname', 'nachname']}},
 				],
 			}
 
@@ -417,18 +381,14 @@ export default {
 		{
 			if (this.filter.activeFilter === 'employee' && this.filter.emp)
 			{
-				return this.$api.getUri(ApiLv.getByEmpStg(
-					this.filter.emp,
-					this.filter.stg
-				));
+				const { emp, stg, studiensemester_kurzbz } = this.filter;
+				return this.$api.getUri(ApiLv.getByEmp(studiensemester_kurzbz, emp, stg));
 			}
 
 			if (this.filter.activeFilter === 'verband' && this.filter.stg)
 			{
-				return this.$api.getUri(ApiLv.getByStg(
-					this.filter.stg,
-					this.filter.semester
-				));
+				const { stg, semester, studiensemester_kurzbz } = this.filter;
+				return this.$api.getUri(ApiLv.getByStg(studiensemester_kurzbz, stg, semester));
 			}
 		},
 		resetEmployeeFilter()
@@ -437,16 +397,6 @@ export default {
 			delete newFilter.emp;
 			newFilter.activeFilter = 'verband';
 		},
-		buildParams()
-		{
-			const params = {};
-			for (const [key, value] of Object.entries(this.filter)) {
-				if (value !== undefined && value !== null) {
-					params[key] = value;
-				}
-			}
-			return params;
-		},
 		showLehreinheitModal() {
 			this.resetModal();
 			this.$refs.lehreinheitModal.show();
@@ -649,7 +599,7 @@ export default {
 
 			let rootRows = this.$refs.table.tabulator.getRows(true);
 			var lastRow = rootRows[rootRows.length - 1];
-			lastRow.treeCollapse(true)
+			lastRow?.treeCollapse(true)
 
 			this.currentTreeLevel = 0;
 		},
diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 5dfcce205..1112d36f3 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -41,6 +41,17 @@ function parseFilterExpression(expression)
 
 export function extendedHeaderFilter(headerValue, rowValue, rowData, filterParams)
 {
+	const fields = Array.isArray(filterParams?.field)
+		? filterParams.field
+		: [filterParams?.field];
+
+	if (fields.length > 1 && rowData)
+	{
+		rowValue = fields
+			.map(f => rowData[f] ?? '')
+			.filter(Boolean)
+			.join(' ');
+	}
 	if (typeof headerValue === 'boolean')
 	{
 		return rowValue === headerValue;

From 9a5790edf0152d08691aaef96217ec84edbc706a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:24:33 +0200
Subject: [PATCH 0560/1357] searchbar: better layout for clear button

---
 public/css/components/searchbar/searchbar.css | 12 ++++++++++++
 public/js/components/searchbar/searchbar.js   | 14 +++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index a27ffe224..dfb222c2a 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -10,6 +10,18 @@
 }
 
 
+.searchbar_input_clear {
+	/* 1rem * 5 / 8 = width of icon */
+	margin-inline-start: calc(-1rem * 5 / 8 - var(--bs-btn-padding-x) * 2 - var(--bs-border-width)) !important;
+	border: 0;
+	margin-inline-end: 1px;
+	z-index: 1;
+}
+.searchbar_input_clear:hover,
+.searchbar_input_clear:focus {
+	color: var(--bs-body-color);
+	background-color: transparent;
+}
 .searchbar_input:focus,
 .searchbar_input:focus ~ .searchbar_input_clear {
 	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index a63365d29..18d596cef 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -98,17 +98,13 @@ export default {
                     :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                     :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                 >
-				<span
+				<button
 					v-if="searchsettings.searchstr"
-					class="w-0 position-relative searchbar_input_clear"
+					class="searchbar_input_clear btn btn-outline-secondary"
+					@click="clearInput"
 				>
-					<button
-						class="position-absolute top-0 bottom-0 end-0 btn bg-transparent"
-						@click="clearInput"
-					>
-						<i class="fas fa-close"></i>
-					</button>
-				</span>
+					<i class="fas fa-close"></i>
+				</button>
                 <span
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"

From bc7c811227c8c494e08ce64d5aa0427a48b622f9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:29:43 +0200
Subject: [PATCH 0561/1357] searchbar: filter btn accessisible (real button)

---
 public/css/components/searchbar/searchbar.css | 6 ++++++
 public/js/components/searchbar/searchbar.js   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index dfb222c2a..41bc6fa8f 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -27,6 +27,12 @@
 	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
 }
 
+.searchbar_setting_btn {
+	--bs-btn-color: var(--bs-body-color);
+	--bs-btn-bg: var(--bs-tertiary-bg);
+	--bs-btn-border-color: var(--bs-border-color);
+}
+
 
 .searchbar_searchbox.open {
 	z-index: 10000;
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 18d596cef..c828182f0 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -105,19 +105,19 @@ export default {
 				>
 					<i class="fas fa-close"></i>
 				</button>
-                <span
+                <button
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"
                     aria-expanded="false"
                     aria-controls="searchSettings"
                     ref="settingsbutton"
-                    class="input-group-text"
+                    class="searchbar_setting_btn btn btn-secondary"
                     type="button"
                     :title="$p.t('search/button_filter_label')"
                     :aria-label="$p.t('search/button_filter_label')"
                 >
                     <i class="fas fa-cog"></i>
-                </span>
+                </button>
             </div>
 
             <div v-show="showresult"

From 4d3ad0008ea3a12d56ca16ff554093768f92cafe Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:33:11 +0200
Subject: [PATCH 0562/1357] deleted automated added import

---
 public/js/apps/LVVerwaltung.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/LVVerwaltung.js b/public/js/apps/LVVerwaltung.js
index 2ab3fd98c..c72f9fc9e 100644
--- a/public/js/apps/LVVerwaltung.js
+++ b/public/js/apps/LVVerwaltung.js
@@ -1,6 +1,5 @@
 import LVVerwaltung from "../components/LVVerwaltung/LVVerwaltung.js";
 import Phrasen from "../plugins/Phrasen.js";
-import {DEFAULT_MODE_RAUMINFO} from "../components/Cis/Mylv/RoomInformation";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 

From c4bb543c0a8679125ed3d7305c405f1251a53813 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:37:13 +0200
Subject: [PATCH 0563/1357] HeaderDetails: delete empty space before titelpost

---
 public/js/components/DetailHeader/DetailHeader.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index aa0bb549d..5c1573753 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -132,8 +132,7 @@ export default {
 						<h2 class="h4">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
-							{{headerData[0].nachname}}
-							<span v-if="headerData[0].titelpost">, </span>
+							{{headerData[0].nachname}}<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
 

From 9c3c8cd186a01a0ca21dc0abe408ecf85e63ff14 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 10:33:25 +0200
Subject: [PATCH 0564/1357] status sorting in mergedperson search results

---
 application/config/search.php                 | 20 ++++++++++++++++++-
 .../searchbar/result/mergedperson.js          |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 1450dff7b..bedf8d888 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -210,6 +210,23 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
+$prestudent_sort = [
+	"Student",
+	"Incoming",
+	"Outgoing",
+	"Diplomand",
+	"Unterbrecher",
+	"Aufgenommener",
+	"Wartender",
+	"Bewerber",
+	"Interessent",
+	"Abgewiesener",
+	"Absolvent",
+	"Abbrecher",
+	"Ausserordentlicher",
+	"Praktikant"
+];
+$prestudent_sort_array = "array['" . implode("','", $prestudent_sort) . "']";
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -322,7 +339,8 @@ $config['prestudent'] = [
 			),
 			sg.orgform_kurzbz
 		) AS orgform",
-		"b.aktiv"
+		"b.aktiv",
+		"array_position(" . $prestudent_sort_array . ", public.get_rolle_prestudent(ps.prestudent_id, NULL)) AS sort"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 0f6f3f0ee..bb395cb45 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -64,7 +64,7 @@ export default {
 						return false;
 					}
 					return true;
-				});
+				}).sort((a, b) => (a.sort || 0) - (b.sort || 0));
 			return students.length ? students : null;
 		},
 		emails() {

From 9a231d4bb4d0bd74dacf899331d9238ae23e8a91 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:09:09 +0200
Subject: [PATCH 0565/1357] name for searchbar components

---
 public/css/components/searchbar/searchbar.css             | 4 ++--
 public/js/components/searchbar/result/cms.js              | 1 +
 public/js/components/searchbar/result/dms.js              | 1 +
 public/js/components/searchbar/result/employee.js         | 1 +
 public/js/components/searchbar/result/mergedperson.js     | 1 +
 public/js/components/searchbar/result/mergedstudent.js    | 3 ++-
 public/js/components/searchbar/result/organisationunit.js | 1 +
 public/js/components/searchbar/result/person.js           | 1 +
 public/js/components/searchbar/result/prestudent.js       | 1 +
 public/js/components/searchbar/result/room.js             | 1 +
 public/js/components/searchbar/result/student.js          | 1 +
 public/js/components/searchbar/result/template/action.js  | 3 ++-
 public/js/components/searchbar/result/template/actions.js | 3 ++-
 public/js/components/searchbar/result/template/frame.js   | 3 ++-
 public/js/components/searchbar/searchbar.js               | 1 +
 15 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 41bc6fa8f..7dc653cb8 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -135,13 +135,13 @@
 
 /* new variant with template/frame */
 
-.searchbar-result {
+.searchbar-result-template-frame {
 	border-bottom: 1px solid lightgrey;
 	margin-bottom: 1rem;
 	padding-bottom: 1rem;
 }
 
-.searchbar-actions {
+.searchbar-result-template-actions {
 	display: flex;
 	flex-wrap: wrap;
 	gap: .5rem;
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 5eebc3826..dfd2b575a 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultCms',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 8516c1555..adb0172a3 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultDms',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index b86aa3ca5..d9d2332a5 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultEmployee',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index bb395cb45..2b3397fde 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -2,6 +2,7 @@ import TemplateFrame from "./template/frame.js";
 import TemplateAction from "./template/action.js";
 
 export default {
+	name: 'SearchbarResultMergedperson',
 	components: {
 		TemplateFrame,
 		TemplateAction
diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
index e8ed89b65..7c59b0bf8 100644
--- a/public/js/components/searchbar/result/mergedstudent.js
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -2,7 +2,8 @@ import ResultPrestudent from "./prestudent.js";
 import ResultStudent from "./student.js";
 
 export default {
-	components: {
+name: 'SearchbarResultMergedstudent',
+		components: {
 		ResultPrestudent,
 		ResultStudent
 	},
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 66dda9726..d0b191da4 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultOrganistationunit',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f255caffe..da920be2c 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultPerson',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 574f9c4fb..f142fcdaa 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultPrestudent',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 03c59deb5..39e50395d 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultRoom',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 6a38ba9bc..db31bb689 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultStudent',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index f41d9925f..7c50eb134 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -1,4 +1,5 @@
 export default {
+	name: 'SearchbarResultTemplateAction',
 	emits: [ 'actionexecuted' ],
 	props: { 
 		res: Object,
@@ -22,7 +23,7 @@ export default {
 		}
 	},
 	template: `
-	<a :href="actionHref" @click="actionFunc">
+	<a class="searchbar-result-template-action" :href="actionHref" @click="actionFunc">
 		<slot>{{ $p.t('search/action_default_label') }}</slot>
 	</a>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
index 5849594ed..726fef4dd 100644
--- a/public/js/components/searchbar/result/template/actions.js
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -1,6 +1,7 @@
 import ResultAction from "./action.js";
 
 export default {
+	name: 'SearchbarResultTemplateActions',
 	components: {
 		ResultAction
 	},
@@ -10,7 +11,7 @@ export default {
 		actions: Array
 	},
 	template: `
-	<div v-if="actions.length" class="searchbar-actions">
+	<div v-if="actions.length" class="searchbar-result-template-actions">
 		<result-action
 			v-for="(action, index) in actions"
 			:key="action.label"
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
index 336c2d9f9..5c8f8aa02 100644
--- a/public/js/components/searchbar/result/template/frame.js
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -2,6 +2,7 @@ import ResultAction from "./action.js";
 import ResultActions from "./actions.js";
 
 export default {
+	name: 'SearchbarResultTemplateFrame',
 	components: {
 		ResultAction,
 		ResultActions
@@ -15,7 +16,7 @@ export default {
 		imageFallback: String
 	},
 	template: `
-	<div class="searchbar-result">
+	<div class="searchbar-result-template-frame">
 		<div class="searchbar_grid">
 			<div class="searchbar_icon">
 				<result-action
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index c828182f0..6a41fe2f5 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -10,6 +10,7 @@ import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
 export default {
+	name: "FhcSearchbar",
 	components: {
 		person,
 		room,

From 25da0d6865017abf24c6a8bc3970420575374eaf Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:12:58 +0200
Subject: [PATCH 0566/1357] cleanup - remove old/unused searchbar files

---
 public/js/components/searchbar/action.js      | 43 ---------
 public/js/components/searchbar/actions.js     | 37 --------
 public/js/components/searchbar/employee.js    | 89 ------------------
 .../components/searchbar/organisationunit.js  | 83 -----------------
 public/js/components/searchbar/person.js      | 55 -----------
 public/js/components/searchbar/prestudent.js  | 88 ------------------
 public/js/components/searchbar/raum.js        | 54 -----------
 public/js/components/searchbar/student.js     | 91 -------------------
 8 files changed, 540 deletions(-)
 delete mode 100644 public/js/components/searchbar/action.js
 delete mode 100644 public/js/components/searchbar/actions.js
 delete mode 100644 public/js/components/searchbar/employee.js
 delete mode 100644 public/js/components/searchbar/organisationunit.js
 delete mode 100644 public/js/components/searchbar/person.js
 delete mode 100644 public/js/components/searchbar/prestudent.js
 delete mode 100644 public/js/components/searchbar/raum.js
 delete mode 100644 public/js/components/searchbar/student.js

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
deleted file mode 100644
index d13cd0551..000000000
--- a/public/js/components/searchbar/action.js
+++ /dev/null
@@ -1,43 +0,0 @@
-export default {
-    props: { 
-        res: {
-            type: Object
-        }, 
-        action: {
-            type: Object
-        }, 
-        cssclass: {
-            type: String,
-            default: ''
-        }
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-		<template v-if="this.renderif()">
-			<a :class="this.cssclass" :href="this.getactionhref()"
-				@click="this.execaction()">
-				<slot>Action</slot>
-			</a>
-		</template>
-		<template v-else>
-			<slot>Action</slot>
-		</template>
-    `,
-    methods: {
-        getactionhref: function() {
-            return (this.action.type === 'link') ? this.action.action(this.res) 
-                : 'javascript:void(0);';
-        },
-        execaction: function() { 
-            this.action.action(this.res);
-            this.$emit('actionexecuted');
-        },
-		renderif: function() {
-			if(this.action?.renderif === undefined) {
-				return true;
-			}
-
-			return this.action.renderif(this.res);
-		}
-    }
-};
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
deleted file mode 100644
index c4e99f2b9..000000000
--- a/public/js/components/searchbar/actions.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import action from "./action.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <ul class="searchbar_actions" v-if="this.actions.length > 0">
-		<template v-for="(action, index) in this.actions" :key="action.label">
-          <li v-if="this.renderif(action)">
-            <action :res="this.res" :action="action" :cssclass="'btn btn-primary btn-sm'" @actionexecuted="$emit('actionexecuted')">
-                <i v-if="this.hasicon(index)" :class="this.geticonclass(index)"></i>
-                <span class="p-2">{{ action.label }}</span>
-            </action>
-          </li>
-		</template>
-        </ul>
-        <div class="mb-3" v-else=""></div>
-    `,
-    methods: {
-        hasicon: function(index) {
-            return (typeof this.actions[index].icon !== "undefined");
-        },
-        geticonclass: function(index) {            
-            return this.actions[index].icon;
-        },
-		renderif: function(action) {
-			if(action?.renderif === undefined) {
-				return true;
-			}
-
-			return action.renderif(this.res);
-		}
-    }
-};
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
deleted file mode 100644
index f1e6a67f6..000000000
--- a/public/js/components/searchbar/employee.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_employee">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Standard-Kostenstelle</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
-                          <li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
-                        </ul>
-                        <span v-else="">keine</span>
-                    </div>
-                  </div>
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Organisations-Einheit</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
-                          <li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
-                        </ul>
-                        <span v-else="">keine</span> 
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl">
-                          {{ res.email }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Telefon</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.telurl">
-                          {{ res.phone }}
-                        </a>
-                    </div>
-                  </div>        
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
deleted file mode 100644
index 09e2822a3..000000000
--- a/public/js/components/searchbar/organisationunit.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_organisationunit">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">übergeordnete OrgEinheit</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                          {{ res.parentoe_name }}
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Gruppen-EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl" v-if="res.mailgroup">
-                          {{ res.mailgroup }}
-                        </a>
-                        <span v-else>-</span>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Leiter</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
-                          <li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
-                        </ul>
-                        <span v-else="">N.N.</span>                                
-                    </div>
-                  </div>        
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Mitarbeiter-Anzahl</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        {{ res.number_of_people }}
-                    </div>
-                  </div>
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mailgroup;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
deleted file mode 100644
index eeb476149..000000000
--- a/public/js/components/searchbar/person.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_person">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.gn }} {{ res.sn }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl">
-                          {{ res.mail }}
-                        </a>
-                    </div>
-                  </div>
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mail;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
deleted file mode 100644
index 99837fe4b..000000000
--- a/public/js/components/searchbar/prestudent.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-	props: [ "res", "actions" ],
-	components: {
-		action: action,
-		actions: actions
-	},
-	emits: [ 'actionexecuted' ],
-	template: `
-		<div class="searchbar_result searchbar_prestudent">
-		
-			<div class="searchbar_grid">
-				<div class="searchbar_icon">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-							 :src="'data:image/jpeg;base64,' + res.foto"
-							 class="rounded-circle" height="100"/>
-						<i v-else class="fas fa-user-circle fa-5x"></i>
-					</action>
-				</div>
-		
-				<div class="searchbar_data">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<span class="fw-bold">{{ res.name }}</span>
-					</action>
-		
-					<div class="mb-3"></div>
-		
-					<div class="searchbar_table">
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Prestudent_id</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.prestudent_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Student_uid</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.uid }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Person_id</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.person_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Studiengang</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.bezeichnung }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">EMail</div>
-							<div class="searchbar_tablecell searchbar_value">
-								<a :href="this.mailtourl">
-									{{ res.email }}
-								</a>
-							</div>
-						</div>
-		
-		
-					</div>
-		
-					<actions :res="this.res" :actions="this.actions.childactions"
-							 @actionexecuted="$emit('actionexecuted')"></actions>
-		
-				</div>
-			</div>
-		
-		</div>
-    `,
-	methods: {
-	},
-	computed: {
-		mailtourl: function() {
-			return 'mailto:' + this.res.email;
-		}
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
deleted file mode 100644
index 4a55b417a..000000000
--- a/public/js/components/searchbar/raum.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action, 
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: /*html*/`
-        <div class="searchbar_result searchbar_raum">
-          <div class="searchbar_grid">
-            <div class="searchbar_icon">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
-              </action>
-            </div>
-            <div class="searchbar_data">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <span class="fw-bold">{{ res.ort_kurzbz }}</span>
-              </action>
-        
-              <div class="mb-3"></div>
-        
-              <div class="searchbar_table">
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Standort</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.standort }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Sitzplätze</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.sitzplaetze }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Gebäude</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.building }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Zusatz Informationen</div>
-                  <div class="searchbar_tablecell searchbar_value"><div v-html="res.austattung.replace('<br />','')"></div></div>
-                </div>
-              </div>
-        
-              <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-            </div>
-          </div>
-        
-        </div>
-    `,
-    methods: {
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
deleted file mode 100644
index ac7362d23..000000000
--- a/public/js/components/searchbar/student.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_student" :class="(!res?.aktiv) ? 'searchbar_inaktiv' : ''">
-        
-            <div class="searchbar_grid">
-                <div class="searchbar_icon">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-                             :src="studentImage"
-                             class="rounded" style="max-height: 120px; max-width: 90px;" />
-                        <i v-else class="fas fa-user-circle fa-5x"></i>
-                    </action>
-                </div>
-        
-                <div class="searchbar_data">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <span class="fw-bold">{{ res.name }}</span>
-                    </action>
-        
-                    <div class="mb-3"></div>
-                
-                    <div class="searchbar_table">
-
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">Student UID</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.uid }}
-                            </div>
-                        </div>
-
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('lehre','studiengang')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.studiengang }}
-                            </div>
-                        </div>
-
-						<div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">Verband</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.verband }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('person','personenkennzeichen')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.matrikelnr }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('person','email')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                <a :href="this.mailtourl">
-                                    {{ res.email }}
-                                </a>
-                            </div>
-                        </div>
-        
-                    </div>
-        
-                    <actions :res="this.res" :actions="this.actions.childactions"
-                             @actionexecuted="$emit('actionexecuted')"></actions>
-        
-                </div>
-            </div>
-        
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-		studentImage: function () {
-			if (!this.res.foto) return;
-			return 'data:image/jpeg;base64,'.concat(this.res.foto);
-		},
-    }
-};
\ No newline at end of file

From 9c1eb35e884ee498d1e8155ba541e8115fef16be Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:18:37 +0200
Subject: [PATCH 0567/1357] Tab Contact: Phrase for Validation Length PLZ

---
 .../api/frontend/v1/stv/Address.php           | 11 +++++++++-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Address.php b/application/controllers/api/frontend/v1/stv/Address.php
index 324e306f3..d14111e99 100644
--- a/application/controllers/api/frontend/v1/stv/Address.php
+++ b/application/controllers/api/frontend/v1/stv/Address.php
@@ -31,6 +31,11 @@ class Address extends FHCAPI_Controller
 			'getNations' => self::PERM_LOGGED,
 			'getPlaces' => self::PERM_LOGGED
 		]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
 	}
 
 	public function getNations()
@@ -53,7 +58,11 @@ class Address extends FHCAPI_Controller
 		
 		$this->form_validation->set_data(['address.plz' => $plz]);
 
-		$this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric|less_than[10000]');
+		$this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric|less_than[10000]', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ']),
+			'less_than' => $this->p->t('ui', 'error_fieldLessThan10000', ['field' => 'PLZ'])
+		]);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c190d7b4f..5ca44148d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44597,6 +44597,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldLessThan10000',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} darf maximal 4-stellig sein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Field {Field} must contain a number less then 10000.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From 7755e2c7a6638957bf913cd1d38d689d856223f7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 15:20:05 +0200
Subject: [PATCH 0568/1357] searchbar: code quality

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 6a41fe2f5..8c85ceaec 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -47,7 +47,7 @@ export default {
             lastQuery: ''
       };
     },
-	computed:{
+	computed: {
 		searchTypesPlaceholder() {
 			if (!this.searchsettings.types.length) {
 				return Object.values(this.typeLabels).join(' / ');

From 6217309c6f58be0d8aed12fb39a83d9308b7d635 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 16:34:24 +0200
Subject: [PATCH 0569/1357] add infotext to reload button filtercomponent tab
 archive: add infotext to reload button, edit and delete button

---
 public/js/components/Betriebsmittel/Betriebsmittel.js         | 1 +
 public/js/components/Funktionen/Funktionen.js                 | 1 +
 public/js/components/Messages/Details/TableMessages.js        | 1 +
 public/js/components/Notiz/Notiz.js                           | 1 +
 .../Details/Abschlusspruefung/Abschlusspruefung.js            | 1 +
 .../Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js  | 1 +
 .../js/components/Stv/Studentenverwaltung/Details/Archiv.js   | 3 +++
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 1 +
 .../Studentenverwaltung/Details/Dokumente/List/Accepted.js    | 1 +
 .../Studentenverwaltung/Details/Dokumente/List/Unaccepted.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js        | 1 +
 .../Studentenverwaltung/Details/JointStudies/JointStudies.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js        | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js    | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js        | 1 +
 public/js/components/Stv/Studentenverwaltung/Details/Konto.js | 1 +
 .../ListLehrveranstaltungstermine.js                          | 1 +
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js      | 1 +
 .../Stv/Studentenverwaltung/Details/Noten/Teacher.js          | 1 +
 .../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js          | 1 +
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 1 +
 .../Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js  | 1 +
 public/js/components/filter/Filter.js                         | 4 ++--
 23 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index d197c341e..5ef85369c 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -317,6 +317,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('ui', 'betriebsmittel')"
 			@click:new="actionNewBetriebsmittel"
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 0b5a71155..e83eca7e4 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -444,6 +444,7 @@ export default {
 				table-only
 				:side-menu="false"
 				:reload= "!this.stylePv21"
+				:reload-btn-infotext="this.$p.t('table', 'reload')"
 				new-btn-show
 				:new-btn-class="this.newBtnStyle"
 				:new-btn-label="this.$p.t('person', 'funktion')"
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 8d539983f..5095f4223 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -401,6 +401,7 @@ export default {
 						table-only
 						:side-menu="false"
 						reload
+						:reload-btn-infotext="this.$p.t('table', 'reload')"
 						new-btn-show
 						:new-btn-label="this.$p.t('global', 'nachricht')"
 						@click:new="actionNewMessage"
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index a2702c7f0..33abdd2db 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1268,6 +1268,7 @@ export default {
 					table-only
 					:side-menu="false"
 					reload
+					:reload-btn-infotext="this.$p.t('table', 'reload')"
 					new-btn-show
 					:new-btn-label="this.$p.t('global', 'notiz')"
 					@click:new="actionNewNotiz"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index a9cae9bc5..c95d29705 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -542,6 +542,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('stv', 'tab_finalexam')"
 			@click:new="actionNewAbschlusspruefung"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 8f32479a9..4c29cec3e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -357,6 +357,7 @@ export default {
 							table-only
 							:side-menu="false"
 							reload
+							:reload-btn-infotext="this.$p.t('table', 'reload')"
 						>
 						</core-filter-cmpt>
 					</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 7f615f8b5..5bd20e154 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -130,6 +130,7 @@ export default {
 							let editButton = document.createElement('button');
 							editButton.className = 'btn btn-outline-secondary';
 							editButton.innerHTML = '<i class="fa fa-edit"></i>';
+							editButton.title = this.$p.t('ui', 'bearbeiten');
 							editButton.addEventListener('click', () =>
 								this.$refs.edit.open(cell.getData())
 							);
@@ -139,6 +140,7 @@ export default {
 						let deleteButton = document.createElement('button');
 						deleteButton.className = 'btn btn-outline-secondary';
 						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+						deleteButton.title = this.$p.t('ui', 'loeschen');
 						deleteButton.addEventListener('click', evt => {
 							evt.stopPropagation();
 							this.$fhcAlert
@@ -262,6 +264,7 @@ export default {
 			:tabulator-options="tabulatorOptions"
 			:tabulator-events="tabulatorEvents"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template #actions>
 				<div class="input-group w-auto">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index fe667aa74..955ca1a9d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -358,6 +358,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
 			@click:new="actionNewPlacementTest"
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 e07d1a45d..d8bd2ed82 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -336,6 +336,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 	 	>
 			<template #actions="{selected}">
 				<button
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 93b3a1b70..95880e233 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -347,6 +347,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'dokument')"
 			@click:new="actionUploadFile"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 4ecf26d6e..e89564c2d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -180,6 +180,7 @@ export default {
 						table-only
 						:side-menu="false"
 						reload
+						:reload-btn-infotext="this.$p.t('table', 'reload')"
 					>
 					</core-filter-cmpt>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index c24e4cba5..d8cd0aacd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -329,6 +329,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('jointstudies', 'gemeinsamesStudium')"
 			@click:new="actionNewJointStudy"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index d0c7fbd04..491714520 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -610,6 +610,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('person', 'adresse')"
 			@click:new="actionNewAdress"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 6c02677ce..40a629bcf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -348,6 +348,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('person', 'bankverbindung')"
 			@click:new="actionNewBankverbindung"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index ee37427b1..622aa61e7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -449,6 +449,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'kontakt')"
 			@click:new="actionNewContact"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index a5532addc..54c1db6c4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -248,6 +248,7 @@ export default {
 			:side-menu="false"
 			:tabulator-options="tabulatorOptions"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="$p.t('konto/buchung')"
 			:new-btn-disabled="stg_kz === ''"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 0f1c2f2f0..20cb95fbd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -175,6 +175,7 @@ export default {
 				table-only
 				:side-menu="false"
 				reload
+				:reload-btn-infotext="this.$p.t('table', 'reload')"
 				>
 					<template #actions>	
 						<button
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 7ea34497b..1399d76e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -436,6 +436,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('stv', 'tab_mobility')"
 			@click:new="actionNewMobility"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index 171202163..54342a955 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -95,6 +95,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template #actions="{selected}">
 				<button class="btn btn-primary" :disabled="!selected.length" @click="copyGrades(selected)">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 81745897d..0cc30f606 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -264,6 +264,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template v-if="['both', 'header'].includes(config.edit) || ['both', 'header'].includes(config.delete)" #actions="{selected}">
 				<zeugnis-actions :selected="selected" @set-grade="setGrade" @delete-grade="deleteGrade"></zeugnis-actions>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index b6480c583..15664665f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -428,6 +428,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'status')"
 			@click:new="actionNewStatus"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index f90aa298d..4dd3139ab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -420,6 +420,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'pruefung')"
 			@click:new="actionNewPruefung"
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2602a26c2..fc4ed81c5 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -66,6 +66,7 @@ export const CoreFilterCmpt = {
 		tableOnly: Boolean,
 		noColumnFilter:Boolean,
 		reload: Boolean,
+		reloadBtnInfotext: String,
 		download: {
 			type: [Boolean, String, Function, Array, Object],
 			default: false
@@ -648,7 +649,6 @@ export const CoreFilterCmpt = {
 				</h3>
 			</div>
 		</div>
-
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
@@ -658,7 +658,7 @@ export const CoreFilterCmpt = {
 						{{ newBtnLabel }}
 					</button>
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
-						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+						<span class="fa-solid fa-rotate-right" aria-hidden="true"  :title="reloadBtnInfotext ? reloadBtnInfotext : 'Reload'" ></span>
 					</button>
 					<span v-if="$slots.actions && tabulatorHasSelector">
 						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>

From 38fe68362d2b14854687003062ec8e9cd48fce3e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 31 Jul 2025 16:40:33 +0200
Subject: [PATCH 0570/1357] use correct function in routing

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

diff --git a/application/config/routes.php b/application/config/routes.php
index c129c7b3b..b42ae89eb 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -98,7 +98,7 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:a
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';

From 562eb0a890d2512674b5d4fb33146a8966776ae2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 17:00:11 +0200
Subject: [PATCH 0571/1357] remove selectable from tables with not selectable
 rows

---
 public/js/components/Betriebsmittel/Betriebsmittel.js           | 2 --
 public/js/components/Notiz/Notiz.js                             | 2 --
 .../Details/Abschlusspruefung/Abschlusspruefung.js              | 1 -
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js      | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js        | 1 -
 8 files changed, 10 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 5ef85369c..502ede059 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -137,8 +137,6 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '550',
-				selectableRangeMode: 'click',
-				selectable: true,
 				persistenceID: 'core-betriebsmittel'
 			},
 			tabulatorEvents: [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 33abdd2db..5a3944803 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -178,8 +178,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				//responsiveLayout: "collapse",
 				maxHeight: '200px',
-				//selectableRangeMode: 'click',
-				//selectable: true,
 				index: 'notiz_id',
 				persistenceID: 'core-notiz'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index c95d29705..e5c4cade1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -168,7 +168,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '200',
-				selectable: true,
 				index: 'abschlusspruefung_id',
 				persistenceID: 'stv-details-finalexam'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index e89564c2d..ab0c8d8e4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -78,7 +78,6 @@ export default {
 				],
 				layout: 'fitDataFill',
 				height: 'auto',
-				selectable: true,
 				index: 'group_id',
 				persistenceID: 'stv-details-gruppe'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 491714520..7bb8080e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -123,7 +123,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'adresse_id',
 				persistenceID: 'stv-details-kontakt-address'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 40a629bcf..d937d3d1c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -87,7 +87,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'bankverbindung_id',
 				persistenceID: 'stv-details-kontakt-bankaccount'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 622aa61e7..e429e5933 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -95,7 +95,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'kontakt_id',
 				persistenceID: 'stv-details-kontakt-contact'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 1399d76e1..a2b54e7b5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -113,7 +113,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: 200,
-				selectable: true,
 				index: 'bisio_id',
 				persistenceID: 'stv-details-table_mobiliy'
 			},

From 913b218fcac54aeac6260762769f641795d66fda Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 1 Aug 2025 10:53:15 +0200
Subject: [PATCH 0572/1357] phrasenupdate Stundenplan -> LV-Plan; tooltip
 update/remove;

---
 system/phrasesupdate.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 26472be29..034e4aca5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31627,12 +31627,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termine',
+		'phrase' => 'termineV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Unterricht laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -31652,7 +31652,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Unterricht laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32107,12 +32107,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanBeginn',
+		'phrase' => 'zeitNichtAusStundenplanBeginnV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32127,12 +32127,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanEnde',
+		'phrase' => 'zeitNichtAusStundenplanEndeV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32147,12 +32147,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'datumNichtAusStundenplan',
+		'phrase' => 'datumNichtAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum entspricht keinem Stundenplan Termin.',
+				'text' => 'Datum entspricht keinem LV-Plan Termin.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32323,14 +32323,14 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipLektorStartKontrolleV2',
+		'phrase' => 'tooltipLektorStartKontrolleV4',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
+				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem LV-Plan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
 
-				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
+				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im LV-Plan halten.
 
 				Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.',
 				'description' => '',
@@ -32599,12 +32599,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termineAusStundenplan',
+		'phrase' => 'termineAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht Termine laut Stundenplan',
+				'text' => 'Unterricht Termine laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32619,12 +32619,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtZeitCustom',
+		'phrase' => 'tooltipUnterrichtZeitCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtszeiten werden aus dem Stundenplan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
+				'text' => 'Unterrichtszeiten werden aus dem LV-Plan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32639,12 +32639,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtDatumCustom',
+		'phrase' => 'tooltipUnterrichtDatumCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtsdaten werden aus dem Stundenplan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
+				'text' => 'Unterrichtsdaten werden aus dem LV-Plan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -40200,7 +40200,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stundenplan',
+				'text' => 'LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 1cb637cb7f7ea3ffac32f0e8d3c2872fbcb14c21 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 1 Aug 2025 10:55:11 +0200
Subject: [PATCH 0573/1357] Tab Betriebsmittel: change type kaution to text,
 edit validations and add translations

---
 .../v1/betriebsmittel/BetriebsmittelP.php     | 35 +++++++++++++------
 .../Betriebsmittel/Betriebsmittel.js          |  9 +----
 system/phrasesupdate.php                      | 24 +++++++++++--
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 4405952a4..05d7c66c2 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -75,8 +75,9 @@ class BetriebsmittelP extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
+		$this->form_validation->set_rules('kaution', 'Kaution', 'callback_valid_number|callback_not_less_than_equal', [
+			'valid_number' => $this->p->t('ui', 'error_fieldNoValidNumber'),
+			'not_less_than_equal' => $this->p->t('ui', 'error_fieldLessThan1000'),
 		]);
 
 		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
@@ -159,10 +160,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
 		]);
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -172,6 +169,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
+		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 		$uid = $this->input->post('uid');
@@ -246,10 +244,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -259,6 +253,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
+		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 
@@ -391,6 +386,26 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
+
+	public function valid_number($number)
+	{
+		if(is_null($number)) return true;
+		$number = str_replace(',', '.', $number);
+		if (!is_numeric($number))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	public function not_less_than_equal($number)
+	{
+		$number = str_replace(',', '.', $number);
+		if ($number < 1000)
+			return true;
+		return false;
+
+	}
 }
 
 
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 502ede059..6d976a1fa 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -290,12 +290,6 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
 			this.statusNew = true;
-		},
-		//helper function: workaround to trigger validation if input is not a number
-		normalizeKaution() {
-			if (this.formData.kaution === null || this.formData.kaution === '') {
-				this.formData.kaution = 'xxx'
-			}
 		}
 	},
 	created() {
@@ -406,10 +400,9 @@ export default {
 				
 				<div class="row mb-3">
 					<form-input
-						type="number"
+						type="text"
 						:label="$p.t('infocenter/kaution')"
 						name="kaution"
-						@blur="normalizeKaution"
 						v-model="formData.kaution"
 						>
 					</form-input>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5ca44148d..b3af0d059 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44600,12 +44600,12 @@ and represent the current state of research on the topic. The prescribed citatio
 	array(
 		'app' => 'core',
 		'category' => 'ui',
-		'phrase' => 'error_fieldLessThan10000',
+		'phrase' => 'error_fieldLessThan1000',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld {field} darf maximal 4-stellig sein.',
+				'text' => 'Das Eingabefeld {field} muss kleiner als 1000 sein.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44617,6 +44617,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNoValidNumber',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} muss eine gültige Zahl sein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Input Field {field} has to be a valid number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From 5d07879ebdfedae988508c96db1a078cd89099a1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 1 Aug 2025 11:44:23 +0200
Subject: [PATCH 0574/1357] org form hinzugefuegt im stree gruppe autocomplete
 auch auf die bezeichnung getalloe sql angepasst

---
 .../api/frontend/v1/lv/Lehreinheit.php        |  2 +-
 .../api/frontend/v1/lv/StgTree.php            | 26 +++++++++++
 .../models/education/Lehreinheit_model.php    |  2 +-
 .../education/Lehrveranstaltung_model.php     | 46 +++++++++----------
 .../models/organisation/Studienplan_model.php |  2 +
 public/js/apps/LVVerwaltung.js                |  5 +-
 .../LVVerwaltung/Details/Gruppen.js           |  2 +-
 .../components/LVVerwaltung/LVVerwaltung.js   |  6 +--
 8 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index fd1c23667..b851f8c22 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -80,7 +80,7 @@ class Lehreinheit extends FHCAPI_Controller
 
 		$lehrveranstaltung = getData($lehrveranstaltung_result)[0];
 
-		$oe_result = $this->_ci->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id, $lehrveranstaltung->studiengang_kz);
+		$oe_result = $this->_ci->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id);
 		$oe_array = hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array();
 
 		if (!$this->_ci->permissionlib->isBerechtigtMultipleOe('admin', $oe_array, 'suid') &&
diff --git a/application/controllers/api/frontend/v1/lv/StgTree.php b/application/controllers/api/frontend/v1/lv/StgTree.php
index fe3047902..8272da978 100644
--- a/application/controllers/api/frontend/v1/lv/StgTree.php
+++ b/application/controllers/api/frontend/v1/lv/StgTree.php
@@ -86,6 +86,32 @@ class StgTree extends FHCAPI_Controller
 		]);
 		$list = $this->getDataOrTerminateWithError($result);
 
+		$result = $this->StudiengangModel->load($studiengang_kz);
+		$result = $this->getDataOrTerminateWithError($result);
+		if ($result)
+		{
+			if (current($result)->mischform)
+			{
+				$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
+
+				$this->StudienordnungModel->addDistinct();
+				$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
+				$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+				$this->StudienordnungModel->addSelect("TRUE as leaf", false);
+
+				$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
+
+				$result = $this->StudienordnungModel->loadWhere([
+					'aktiv' => true,
+					'studiengang_kz' => $studiengang_kz,
+					'p.orgform_kurzbz !=' => 'DDP'
+				]);
+				$result = $this->getDataOrTerminateWithError($result);
+
+				$list = array_merge($list, $result);
+			}
+		}
+
 		$this->terminateWithSuccess($list);
 	}
 }
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index c33b87ad4..c373f5449 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -322,7 +322,7 @@ EOSQL;
 		if (hasData($result))
 		{
 			$lehrveranstaltung = getData($result)[0];
-			$oe_result = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id, $lehrveranstaltung->studiengang_kz);
+			$oe_result = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung->lehrveranstaltung_id);
 			return success(hasData($oe_result) ? array_column(getData($oe_result), 'oe_kurzbz') : array(''));
 		}
 	}
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 303bebe1e..31ec2901f 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1161,7 +1161,7 @@ class Lehrveranstaltung_model extends DB_Model
 		}
 		if (!is_null($verband))
 		{
-			$qry .= ' AND (orgform_kurzbz = ? OR orgform_kurzbz IS NULL)';
+			$qry .= ' AND (tbl_lehrveranstaltung.orgform_kurzbz = ? OR tbl_lehrveranstaltung.orgform_kurzbz IS NULL)';
 			$params[] = $verband;
 		}
 
@@ -1198,31 +1198,29 @@ class Lehrveranstaltung_model extends DB_Model
 		";
 	}
 
-	public function getAllOe($lv_id, $stg_kz = null)
+	public function getAllOe($lv_id)
 	{
-		$qry = "(SELECT DISTINCT oe_kurzbz
-			FROM lehre.tbl_studienplan_lehrveranstaltung
-			JOIN lehre.tbl_studienplan USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung USING(studienordnung_id)
-			JOIN public.tbl_studiengang USING(studiengang_kz)
-			WHERE lehrveranstaltung_id = ?)";
+		$qry = "SELECT DISTINCT oe_kurzbz
+				FROM lehre.tbl_studienplan_lehrveranstaltung
+					JOIN lehre.tbl_studienplan USING(studienplan_id)
+					JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+					JOIN public.tbl_studiengang USING(studiengang_kz)
+				WHERE lehrveranstaltung_id = ?
 
-		$params = array($lv_id);
-		if (!is_null($stg_kz))
-		{
-			$qry .= ' UNION 
-					(SELECT oe_kurzbz
-					FROM public.tbl_studiengang WHERE studiengang_kz = ?)';
-			$params[] = $stg_kz;
-		}
-		else
-		{
-			$qry .= ' UNION
-					(SELECT oe_kurzbz
-					FROM public.tbl_studiengang WHERE studiengang_kz = (SELECT tbl_lehrveranstaltung.studiengang_kz FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id = ?))
-			';
-			$params[] = $lv_id;
-		}
+				UNION
+
+				(
+					SELECT oe_kurzbz
+					FROM public.tbl_studiengang 
+					WHERE studiengang_kz = (
+						SELECT tbl_lehrveranstaltung.studiengang_kz 
+						FROM lehre.tbl_lehrveranstaltung 
+						WHERE lehrveranstaltung_id = ?
+					)
+				)
+			";
+
+		$params = array($lv_id, $lv_id);
 
 		return $this->execReadOnlyQuery($qry, $params);
 	}
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 5a9097d9a..0b41a8c39 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -107,6 +107,8 @@ class Studienplan_model extends DB_Model
 		));
 	}
 
+	// Deprecated
+	// im Lehrveranstaltung_model vorhanden
 	public function getAllOesForLv($lehrveranstaltung_id)
 	{
 		$this->addDistinct('oe_kurzbz');
diff --git a/public/js/apps/LVVerwaltung.js b/public/js/apps/LVVerwaltung.js
index c72f9fc9e..f365b74a8 100644
--- a/public/js/apps/LVVerwaltung.js
+++ b/public/js/apps/LVVerwaltung.js
@@ -31,6 +31,7 @@ const router = VueRouter.createRouter({
 					studiensemester_kurzbz: studiensemester_kurzbz,
 					emp: emp,
 					stg: stg,
+					semester: semester
 				};
 			},
 			beforeEnter: (to, from, next) => {
@@ -62,12 +63,12 @@ const router = VueRouter.createRouter({
 					studiensemester_kurzbz = undefined;
 
 				if (stg === '')
-					semester = undefined;
+					stg = undefined;
 
 				return {
 					studiensemester_kurzbz: studiensemester_kurzbz,
 					stg: stg,
-					semester: semester != null ? Number(semester) : null,
+					semester: semester,
 				};
 			},
 			beforeEnter: (to, from, next) => {
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index 62dae172f..219b956d8 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -103,7 +103,7 @@ export default{
 		{
 			const query = event.query.toLowerCase().trim();
 			this.filteredGroups = this.dropdowns.gruppen_array.filter(gruppe => {
-				return gruppe.gruppe_kurzbz.toLowerCase().includes(query);
+				return gruppe.gruppe_kurzbz.toLowerCase().includes(query) || gruppe?.bezeichnung?.toLowerCase().includes(query);
 			}).map(gruppe => ({
 				label: gruppe.bezeichnung
 					? `${gruppe.gruppe_kurzbz.trim()} (${gruppe.bezeichnung})`
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 7b8921c80..7bfb3ec82 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -28,7 +28,7 @@ export default {
 		permissions: Object,
 		config: Object,
 		stg: { type: String, required: false },
-		semester: { type: Number, required: false, default: null },
+		semester: { type: [Number, String], required: false, default: null },
 		studiensemester_kurzbz: { type: String, required: false, default: null },
 		emp: { type: String, required: false, default: null }
 	},
@@ -159,7 +159,7 @@ export default {
 			const params = { stg };
 
 			if (semester !== null)
-				params.semester = Number(semester);
+				params.semester = semester;
 			if (studiensemester_kurzbz)
 				params.studiensemester_kurzbz = studiensemester_kurzbz;
 			if (this.filter.emp)
@@ -176,7 +176,7 @@ export default {
 			else
 			{
 				delete newParams.emp;
-				newParams.semester = null;
+
 				this.$router.replace({ name: 'byStg', params: newParams });
 			}
 		},

From 247de82e8162769315e621d6253e2c79cfe8e4de Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 11:59:29 +0200
Subject: [PATCH 0575/1357] add config
 number_displayed_past_studiensemester_default and use it in api endpoint

---
 application/config/stv.php                              | 1 +
 application/controllers/api/frontend/v1/stv/Verband.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 1fdd5b28a..aa885c9e1 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -1,5 +1,6 @@
 <?php
 
+$config['number_displayed_past_studiensemester_default'] = 5;
 $config['tabs'] =
 	[
 		'details' => [
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index e8c532652..4060704de 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -355,7 +355,11 @@ class Verband extends FHCAPI_Controller
 		$this->load->model('system/Variable_model', 'VariableModel');
 		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
 		$data = $this->getDataOrTerminateWithError($result);
-		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? null;
+
+		$this->load->config('stv');
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? $number_displayed_past_studiensemester_default;
 
 		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
 		$this->StudiensemesterModel->addOrder('ende');

From 472fceaf625b34c4ae5f2d90816f4e202bfa8aa7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 12:22:27 +0200
Subject: [PATCH 0576/1357] changes to support studiensemester_kurz as part of
 the url

---
 public/js/apps/Studentenverwaltung.js         | 115 +++++++++++++++++-
 .../js/components/Stv/Studentenverwaltung.js  | 102 ++++++++++++----
 .../Stv/Studentenverwaltung/List.js           |  28 ++++-
 .../Studentenverwaltung/Studiensemester.js    |  15 ++-
 4 files changed, 218 insertions(+), 42 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index bef605a10..a4dafc5bc 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -26,14 +26,119 @@ const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
-		{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/person/:person_id`, component: FhcStudentenverwaltung }
+		{
+			name: 'index',
+			path: `/${ciPath}/studentenverwaltung`,
+			component: FhcStudentenverwaltung
+		},
+		{
+			name: 'studiensemester',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'prestudent',
+					url_prestudent_id: route.params.prestudent_id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id/:tab`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'prestudent',
+					url_prestudent_id: route.params.prestudent_id,
+					url_tab: route.params.tab
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/student/:id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'student',
+					url_student_id: route.params.id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/person/:person_id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'person',
+					url_prestudent_id: route.params.person_id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: '/:pathMatch(.*)*',
+			redirect: {
+				name: 'index'
+			}
+		}
 	]
 });
 
+router.afterEach((to, from, failure) => {
+	console.log('vue router afterEach: ' + to.params.studiensemester_kurzbz);
+	if (to.params.studiensemester_kurzbz) {
+		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
+	} else {
+		document.title = 'Studierendenverwaltung FH-Complete';
+	}
+});
+
 const app = Vue.createApp({
 	name: 'StudentenverwaltungApp'
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 34622f406..c6f271a50 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -85,9 +85,7 @@ export default {
 					student: {
 						defaultaction: {
 							type: "link",
-							action: function(data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/student/' + data.uid;
-							}
+							action: this.buildStudentSearchResultLink
 						},
 						childactions: [
 						]
@@ -95,9 +93,7 @@ export default {
 					prestudent: {
 						defaultaction: {
 							type: "link",
-							action: function(data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/prestudent/' + data.prestudent_id;
-							}
+							action: this.buildPrestudentSearchResultLink
 						},
 						childactions: [
 						]
@@ -113,20 +109,61 @@ export default {
 			}
 		}
 	},
+	watch: {
+		'$attrs.url_studiensemester_kurzbz': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				this.studiensemesterKurzbz = newVal;
+				this.$refs.stvList.updateUrl();
+				this.$refs.details.reload();
+			}
+		},
+		'$attrs.url_mode': function () {
+			this.handlePersonUrl();
+		}
+	},
 	methods: {
+		buildPrestudentSearchResultLink(data) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/prestudent/'
+				+ data.prestudent_id;
+		},
+		buildStudentSearchResultLink(data) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/student/'
+				+ data.uid;
+		},
 		onSelectVerband( {link, studiengang_kz}) {
 			let urlpath = String(link);
 			if (!urlpath.match(/\/prestudent/))
 			{
-				urlpath = this.studiensemesterKurzbz + '/' + urlpath;
+				urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
 			}
 			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(
 				ApiStv.students.verband(urlpath)
-			);
+				);
+			this.$router.push({
+				name: 'studiensemester',
+				params: {
+					studiensemester_kurzbz: this.studiensemesterKurzbz
+				}
+			});
 		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
+
+			this.$router.push({
+				params: {
+					studiensemester_kurzbz: v
+				}
+			});
+
 			this.$refs.stvList.updateUrl();
 			this.$refs.details.reload();
 		},
@@ -135,9 +172,38 @@ export default {
 		},
 		searchfunction(params) {
 			return this.$api.call(ApiSearchbar.search(params));
+		},
+		handlePersonUrl() {
+			if (this.$route.params.id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.uid(this.$route.params.id, 'CURRENT_SEMESTER'),
+					true
+					);
+			} else if (this.$route.params.prestudent_id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.prestudent(this.$route.params.prestudent_id, 'CURRENT_SEMESTER'),
+					true
+					);
+			} else if (this.$route.params.person_id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.person(this.$route.params.person_id, 'CURRENT_SEMESTER'),
+					true
+					);
+			}
 		}
 	},
 	created() {
+		if (!this.$attrs?.url_studiensemester_kurzbz) {
+			this.$router.replace({
+				name: 'studiensemester',
+				params: {
+					studiensemester_kurzbz: this.defaultSemester
+				}
+			});
+		} else {
+			this.studiensemesterKurzbz = this.$attrs.url_studiensemester_kurzbz;
+		}
+
 		this.$api
 			.call(ApiStv.kontakt.address.getNations())
 			.then(result => {
@@ -199,23 +265,7 @@ export default {
 	mounted() {
 		//Test manu Systemerror
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
-		if (this.$route.params.id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.uid(this.$route.params.id, this.studiensemesterKurzbz),
-				true
-			);
-		} else if (this.$route.params.prestudent_id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.prestudent(this.$route.params.prestudent_id, this.studiensemesterKurzbz),
-				true
-			);
-		} else if (this.$route.params.person_id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.person(this.$route.params.person_id, this.studiensemesterKurzbz),
-				true
-			);
-		}
-
+		this.handlePersonUrl();
 	},
 	template: `
 	<div class="stv">
@@ -231,7 +281,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 					<vertical-split>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c5f7a07c0..5de57bf77 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -8,9 +8,16 @@ export default {
 		CoreFilterCmpt,
 		ListNew
 	},
-	inject: [
-		'lists'
-	],
+	inject: {
+		'lists': {
+			from: 'lists',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		selected: Array,
 		studiengangKz: Number,
@@ -155,7 +162,8 @@ export default {
 			filterKontoMissingCounter: undefined,
 			count: 0,
 			filteredcount: 0,
-			selectedcount: 0
+			selectedcount: 0,
+			currentEndpointRawUrl: ''
 		}
 	},
 	methods: {
@@ -192,13 +200,21 @@ export default {
 
 			if( endpoint === undefined ) 
 			{
-				endpoint = { url: '' };
+				endpoint = {url: this.currentEndpointRawUrl};
 			} 
 			else if( endpoint.url === undefined ) 
 			{
-				endpoint.url = '';
+				endpoint.url = this.currentEndpointRawUrl;
+			} else
+			{
+				this.currentEndpointRawUrl = endpoint.url;
 			}
 
+			endpoint.url = endpoint.url.replace(
+				'CURRENT_SEMESTER',
+				encodeURIComponent(this.currentSemester)
+				);
+
 			const params = {}, filter = {};
 			if (this.filterKontoCount0)
 				filter.konto_count_0 = this.filterKontoCount0;
diff --git a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
index c52d584fd..32b0a831d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
+++ b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
@@ -2,12 +2,12 @@ import {CoreRESTClient} from '../../../RESTClient.js';
 
 export default {
 	emits: [
-		'changed'
+		'update:studiensemesterKurzbz'
 	],
 	props: {
-		default: {
+		studiensemesterKurzbz: {
 			type: String,
-			default: ''
+			required: true
 		}
 	},
 	data() {
@@ -68,7 +68,7 @@ export default {
 				})
 				.then(() => {
 					this.loading = false;
-					this.$emit('changed', this.list[this.current]);
+					this.$emit('update:studiensemesterKurzbz', this.list[this.current]);
 				})
 				.catch(error => {
 					this.current = fallback;
@@ -77,6 +77,11 @@ export default {
 				});
 		}
 	},
+	watch: {
+		'studiensemesterKurzbz': function () {
+			this.current = this.list.indexOf(this.studiensemesterKurzbz);
+		}
+	},
 	created() {
 		CoreRESTClient
 			.get('components/stv/studiensemester')
@@ -84,7 +89,7 @@ export default {
 			.then(result => {
 				this.list = result.map(el => el.studiensemester_kurzbz);
 				this.loading = false;
-				this.current = this.list.indexOf(this.default);
+				this.current = this.list.indexOf(this.studiensemesterKurzbz);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From cf073d04b400b53f960f54ab52e4f7773ebb9d85 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 12:27:00 +0200
Subject: [PATCH 0577/1357] remove console.log

---
 public/js/apps/Studentenverwaltung.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index a4dafc5bc..8be451297 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -131,7 +131,6 @@ const router = VueRouter.createRouter({
 });
 
 router.afterEach((to, from, failure) => {
-	console.log('vue router afterEach: ' + to.params.studiensemester_kurzbz);
 	if (to.params.studiensemester_kurzbz) {
 		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
 	} else {

From e326c9483dd6269fc1219c5c47de268acbda09d6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 1 Aug 2025 15:10:04 +0200
Subject: [PATCH 0578/1357] correct default value for calender date prop

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

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 9d344ca09..2069347da 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -58,7 +58,7 @@ export default {
 		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
-			default: luxon.DateTime.local()
+			default: props => luxon.DateTime.now().setZone(props.timezone).startOf('day')
 		},
 		modes: {
 			type: Object,

From 219507ffa3ed17cef35dc16995452c630efbb604 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 1 Aug 2025 15:22:34 +0200
Subject: [PATCH 0579/1357] Shareable calendar components

---
 public/js/components/Calendar/LvPlan.js       | 164 ++++++++++++++++++
 public/js/components/Calendar/Widget.js       | 106 +++++++++++
 public/js/components/Cis/LvPlan/LvPlan.js     | 129 ++------------
 .../js/components/Cis/Mylv/RoomInformation.js | 126 +-------------
 .../js/components/DashboardWidget/LvPlan.js   | 100 +----------
 5 files changed, 302 insertions(+), 323 deletions(-)
 create mode 100644 public/js/components/Calendar/LvPlan.js
 create mode 100644 public/js/components/Calendar/Widget.js

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
new file mode 100644
index 000000000..c1cffb5be
--- /dev/null
+++ b/public/js/components/Calendar/LvPlan.js
@@ -0,0 +1,164 @@
+import FhcCalendar from "./Base.js";
+
+import ApiLvPlan from '../../api/factory/lvPlan.js';
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeDay from './Mode/Day.js';
+import ModeWeek from './Mode/Week.js';
+import ModeMonth from './Mode/Month.js';
+
+export default {
+	name: "CalendarLvPlan",
+	components: {
+		FhcCalendar
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
+		date: {
+			type: [Date, String, Number, luxon.DateTime],
+			default: luxon.DateTime.local()
+		},
+		mode: {
+			type: String,
+			default: 'Week'
+		},
+		getPromiseFunc: {
+			type: Function,
+			required: true
+		}
+	},
+	emits: [
+		"update:date",
+		"update:mode",
+		"update:range"
+	],
+	data() {
+		return {
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			teachingunits: null
+		};
+	},
+	computed: {
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.timezone);
+
+			if (this.mode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			];
+		}
+	},
+	methods: {
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
+		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+			this.$emit('update:range', rangeInterval);
+		}
+	},
+	setup(props, context) {
+		const rangeInterval = Vue.ref(null);
+		
+		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
+
+		Vue.watch(lv, newValue => {
+			context.emit('update:lv', newValue);
+		});
+
+		return {
+			rangeInterval,
+			events,
+			lv
+		};
+	},
+	created() {
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
+	},
+	template: /* html */`
+	<fhc-calendar
+		ref="calendar"
+		class="fhc-calendar-lvplan"
+		:date="date"
+		:modes="modes"
+		:mode-options="modeOptions"
+		:mode="mode"
+		:timezone="timezone"
+		:locale="$p.user_locale.value"
+		:events="events || []"
+		:backgrounds="backgrounds"
+		:time-grid="teachingunits"
+		show-btns
+		@update:date="$emit('update:date', $event)"
+		@update:mode="$emit('update:mode', $event)"
+		@update:range="updateRange"
+	>
+		<template v-slot="{ event, mode }">
+			<div
+				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+				:type="mode == 'day' ? 'button' : undefined"
+ 				:style="eventStyle(event)"
+			>
+				<component
+					v-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<component
+					v-else
+					:is="renderers[event.type]?.calendarEvent"
+					:event="event"
+				></component>
+			</div>
+		</template>
+		<template #actions>
+			<slot />
+		</template>
+	</fhc-calendar>`
+}
diff --git a/public/js/components/Calendar/Widget.js b/public/js/components/Calendar/Widget.js
new file mode 100644
index 000000000..f9d641d4e
--- /dev/null
+++ b/public/js/components/Calendar/Widget.js
@@ -0,0 +1,106 @@
+import FhcCalendar from "./Base.js";
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeList from '../Calendar/Mode/List.js';
+
+export default {
+	name: "CalendarWidget",
+	components: {
+		FhcCalendar
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
+		getPromiseFunc: {
+			type: Function,
+			required: true
+		}
+	},
+	data() {
+		return {
+			now: luxon.DateTime.now().setZone(this.timezone),
+			modes: {
+				list: Vue.markRaw(ModeList)
+			},
+			modeOptions: {
+				list: {
+					length: 7
+				}
+			}
+		};
+	},
+	methods: {
+		eventStyle(event) {
+			const styles = {};
+			if (event.farbe)
+				styles['--event-bg'] = '#' + event.farbe;
+			else if (event.type == 'reservierung')
+				styles['--event-bg'] = '#ffffff';
+			else
+				styles['--event-bg'] = '#cccccc';
+
+			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
+			if (eventEnd < this.now)
+				styles['opacity'] = .5;
+			
+			return styles;
+		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+		}
+	},
+	setup(props) {
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
+
+		return {
+			rangeInterval,
+			events
+		};
+	},
+	template: /* html */`
+	<fhc-calendar
+		:modes="modes"
+		:mode-options="modeOptions"
+		:timezone="timezone"
+		:locale="$p.user_locale.value"
+		:events="events || []"
+		@update:range="updateRange"
+	>
+		<template v-slot="{ event, mode }">
+			<div
+				v-if="!event"
+				class="h-100 d-flex justify-content-center align-items-center"
+			>
+				{{ $p.t('lehre/noLvFound') }}
+			</div>
+			<component
+				v-else-if="mode == 'eventheader'"
+				:is="renderers[event.type]?.modalTitle"
+				:event="event"
+			></component>
+			<component
+				v-else-if="mode == 'event'"
+				:is="renderers[event.type]?.modalContent"
+				:event="event"
+			></component>
+			<div
+				v-else
+				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+ 				:style="eventStyle(event)"
+			>
+				<component
+					:is="renderers[event.type]?.calendarEvent"
+					:event="event"
+				></component>
+			</div>
+		</template>
+	</fhc-calendar>`
+}
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 73c91734c..2fbac0e3a 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,14 +1,8 @@
-import FhcCalendar from "../../Calendar/Base.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-import { useEventLoader } from '../../../composables/EventLoader.js';
-
-import ModeDay from '../../Calendar/Mode/Day.js';
-import ModeWeek from '../../Calendar/Mode/Week.js';
-import ModeMonth from '../../Calendar/Mode/Month.js';
-
 export const DEFAULT_MODE_LVPLAN = 'Week'
 
 export default {
@@ -16,9 +10,6 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
@@ -26,25 +17,11 @@ export default {
 	data() {
 		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
-			modes: {
-				day: Vue.markRaw(ModeDay),
-				week: Vue.markRaw(ModeWeek),
-				month: Vue.markRaw(ModeMonth)
-			},
-			modeOptions: {
-				day: {
-					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
-				},
-				week: {
-					collapseEmptyDays: false
-				}
-			},
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			teachingunits: null
+			lv: null
 		};
 	},
 	computed:{
@@ -54,25 +31,6 @@ export default {
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
 		},
-		backgrounds() {
-			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
-
-			if (this.currentMode == 'Month')
-				return [
-					{
-						class: 'background-past',
-						end: now.startOf('day')
-					}
-				];
-
-			return [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			];
-		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
@@ -101,11 +59,6 @@ export default {
 		}
 	},
 	methods: {
-		eventStyle(event) {
-			if (!event.farbe)
-				return undefined;
-			return '--event-bg:#' + event.farbe;
-		},
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
 		},
@@ -123,35 +76,22 @@ export default {
 			});
 		},
 		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
 			this.$api
 				.call(ApiLvPlan.studiensemesterDateInterval(
-					this.rangeInterval.end.startOf('week').toISODate()
+					rangeInterval.end.startOf('week').toISODate()
 				))
 				.then(res => {
 					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
 					this.studiensemester_start = res.data.start;
 					this.studiensemester_ende = res.data.ende;
 				});
-		}
-	},
-	setup(props) {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events, lv } = useEventLoader(rangeInterval, (start, end) => {
+		},
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), props.propsViewData.lv_id)),
-				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), this.propsViewData.lv_id)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events,
-			lv
-		};
+		}
 	},
 	created() {
 		this.$api
@@ -159,19 +99,10 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
-		this.$api
-			.call(ApiLvPlan.getStunden())
-			.then(res => {
-				return this.teachingunits = res.data.map(el => ({
-					id: el.stunde,
-					start: el.beginn,
-					end: el.ende
-				}));
-			});
 	},
-	template:/*html*/`
-	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
-		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
 			{{ $p.t('lehre/stundenplan') }}
 			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">
 				{{ studiensemester_kurzbz }}
@@ -183,45 +114,17 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
-			class="responsive-calendar"
+			v-model:lv="lv"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
 			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"
-			:timezone="viewData.timezone"
-			:locale="$p.user_locale.value"
-			show-btns
-			:events="events || []"
-			:backgrounds="backgrounds"
-			:time-grid="teachingunits"
+			class="responsive-calendar"
 		>
-			<template v-slot="{ event, mode }">
-				<div
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-					:type="mode == 'day' ? 'button' : undefined"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						v-if="mode == 'event'"
-						:is="renderers[event.type]?.modalContent"
-						:event="event"
-					></component>
-					<component
-						v-else-if="mode == 'eventheader'"
-						:is="renderers[event.type]?.modalTitle"
-						:event="event"
-					></component>
-					<component
-						v-else
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-			<template #actions>
+			<template>
 				<div
 					v-if="downloadLinks"
 					class="d-flex gap-1 justify-items-start"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 1a1d1543d..2dd3d518d 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,13 +1,7 @@
-import FhcCalendar from "../../Calendar/Base.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
-import { useEventLoader } from '../../../composables/EventLoader.js';
-
-import ModeDay from '../../Calendar/Mode/Day.js';
-import ModeWeek from '../../Calendar/Mode/Week.js';
-import ModeMonth from '../../Calendar/Mode/Month.js';
-
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
 export default {
@@ -15,65 +9,19 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props:{
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
-	data() {
-		return {
-			modes: {
-				day: Vue.markRaw(ModeDay),
-				week: Vue.markRaw(ModeWeek),
-				month: Vue.markRaw(ModeMonth)
-			},
-			modeOptions: {
-				day: {
-					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung'))
-				},
-				week: {
-					collapseEmptyDays: false
-				}
-			},
-			teachingunits: null
-		}
-	},
 	computed: {
 		currentDay() {
 			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
-		},
-		backgrounds() {
-			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
-
-			if (this.currentMode == 'Month')
-				return [
-					{
-						class: 'background-past',
-						end: now.startOf('day')
-					}
-				];
-
-			return [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			];
 		}
 	},
 	methods:{
-		eventStyle(event) {
-			if (!event.farbe)
-				return undefined;
-			return '--event-bg:#' + event.farbe;
-		},
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
 		},
@@ -90,37 +38,12 @@ export default {
 				}
 			});
 		},
-		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
-		}
-	},
-	setup(props) {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events } = useEventLoader(rangeInterval, (start, end) => {
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
-				$api.call(ApiLvPlan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.getRoomInfo(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getOrtReservierungen(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events
-		};
-	},
-	created() {
-		this.$api
-			.call(ApiLvPlan.getStunden())
-			.then(res => {
-				return this.teachingunits = res.data.map(el => ({
-					id: el.stunde,
-					start: el.beginn,
-					end: el.ende
-				}));
-			});
+		}
 	},
 	template: /*html*/`
 	<div class="fhc-roominformation d-flex flex-column h-100">
@@ -128,44 +51,13 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
-			class="responsive-calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
 			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
-			@update:range="updateRange"
-			:timezone="viewData.timezone"
-			:locale="$p.user_locale.value"
-			show-btns
-			:events="events || []"
-			:backgrounds="backgrounds"
-			:time-grid="teachingunits"
-		>
-			<template v-slot="{ event, mode }">
-				<div
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-					:type="mode == 'day' ? 'button' : undefined"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						v-if="mode == 'event'"
-						:is="renderers[event.type]?.modalContent"
-						:event="event"
-					></component>
-					<component
-						v-else-if="mode == 'eventheader'"
-						:is="renderers[event.type]?.modalTitle"
-						:event="event"
-					></component>
-					<component
-						v-else
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-		</fhc-calendar>
+			class="responsive-calendar"
+		></fhc-calendar>
 	</div>`
 };
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 3961bae78..c82db2e0c 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -1,12 +1,8 @@
 import AbstractWidget from './Abstract.js';
-import FhcCalendar from '../Calendar/Base.js';
+import FhcCalendar from '../Calendar/Widget.js';
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
-import { useEventLoader } from '../../composables/EventLoader.js';
-
-import ModeList from '../Calendar/Mode/List.js';
-
 export default {
 	name: "LvPlanWidget",
 	components: {
@@ -16,103 +12,21 @@ export default {
 		AbstractWidget
 	],
 	inject: [
-		"renderers",
 		"timezone"
 	],
-	data() {
-		return {
-			now: luxon.DateTime.now().setZone(this.timezone),
-			modes: {
-				list: Vue.markRaw(ModeList)
-			},
-			modeOptions: {
-				list: {
-					length: 7
-				}
-			},
-			currentDay: luxon.DateTime.now().setZone(this.timezone).startOf('day')
-		}
-	},
 	methods: {
-		eventStyle(event) {
-			const styles = {};
-			if (event.farbe)
-				styles['--event-bg'] = '#' + event.farbe;
-			else if (event.type == 'reservierung')
-				styles['--event-bg'] = '#ffffff';
-			else
-				styles['--event-bg'] = '#cccccc';
-
-			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
-			if (eventEnd < this.now)
-				styles['opacity'] = .5;
-			
-			return styles;
-		},
-		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
-		}
-	},
-	setup() {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events } = useEventLoader(rangeInterval, (start, end) => {
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
-				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events
-		};
+		}
 	},
 	created() {
 		this.$emit('setConfig', false);
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<fhc-calendar
-			v-model:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
-			@update:range="updateRange"
-			:timezone="timezone"
-			:locale="$p.user_locale.value"
-			:events="events"
-		>
-			<template v-slot="{ event, mode }">
-				<div
-					v-if="!event"
-					class="h-100 d-flex justify-content-center align-items-center"
-				>
-					{{ $p.t('lehre/noLvFound') }}
-				</div>
-				<component
-					v-else-if="mode == 'eventheader'"
-					:is="renderers[event.type]?.modalTitle"
-					:event="event"
-				></component>
-				<component
-					v-else-if="mode == 'event'"
-					:is="renderers[event.type]?.modalContent"
-					:event="event"
-				></component>
-				<div
-					v-else
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-		</fhc-calendar>
-	</div>
-`
+		<fhc-calendar :timezone="timezone" :get-promise-func="getPromiseFunc" />
+	</div>`
 }
\ No newline at end of file

From 5329fadbac58c4b69a2eb83733327f0f480513c9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 17:25:30 +0200
Subject: [PATCH 0580/1357] add searchresultlink function to generate urls with
 current studiensemester in extended search

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 55892c02b..05b71aa48 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -101,19 +101,11 @@ export default {
 					mergedPerson: {
 						defaultaction: {
 							type: "link",
-							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
+							action: this.buildPersonSearchResultLink
 						},
 						defaultactionstudent: {
 							type: "link",
-							action: data => {
-								if (data.prestudent_id) {
-									return this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id);
-								} else if (data.uid) {
-									return this.$fhcApi.getUri('/studentenverwaltung/student/' + data.uid);
-								} else {
-									return this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id);
-								}
-							}
+							action: this.buildMergedPersonSearchResultLink
 						},
 						childactions: []
 					}
@@ -142,21 +134,38 @@ export default {
 		}
 	},
 	methods: {
+		buildMergedPersonSearchResultLink(data) {
+			if (data.prestudent_id) {
+				return this.buildPrestudentSearchResultLink(data);
+			} else if (data.uid) {
+				return this.buildStudentSearchResultLink(data);
+			} else {
+				return this.buildPersonSearchResultLink(data);
+			}
+		},
 		buildPrestudentSearchResultLink(data) {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/studentenverwaltung'
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/prestudent/'
-				+ data.prestudent_id;
+				+ data.prestudent_id
+				);
 		},
 		buildStudentSearchResultLink(data) {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/studentenverwaltung'
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/student/'
-				+ data.uid;
+				+ data.uid
+				);
+		},
+		buildPersonSearchResultLink(data) {
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/person/'
+				+ data.person_id
+				);
 		},
 		onSelectVerband( {link, studiengang_kz}) {
 			let urlpath = String(link);

From 9999cb47c2ae66894f6ebe02eefe50c91402c343 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 17:32:54 +0200
Subject: [PATCH 0581/1357] use extende Verband component from branch
 feature/60973, add route for studiengang kuerzel in url, adapt for switching
 studiengang also via url

---
 public/js/apps/Studentenverwaltung.js         | 38 ++++++++-
 .../js/components/Stv/Studentenverwaltung.js  | 79 +++++++++++++++----
 .../Stv/Studentenverwaltung/Verband.js        | 77 +++++++++++++++---
 3 files changed, 162 insertions(+), 32 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 8be451297..5eda16dd6 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -48,6 +48,33 @@ const router = VueRouter.createRouter({
 				next();
 			}
 		},
+		{
+			name: 'studiengang',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/:studiengang`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_studiengang: route.params.studiengang,
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				const isStudiengang = /^[A-Z]{3}/.test(to.params.studiengang);
+				if (!isStudiengang) {
+					return next({
+						name: 'studiensemester',
+						params: {
+							studiensemester_kurzbz: to.params.studiensemester_kurzbz
+						}
+					});
+				}
+				next();
+			}
+		},
 		{
 			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id`,
 			component: FhcStudentenverwaltung,
@@ -131,11 +158,14 @@ const router = VueRouter.createRouter({
 });
 
 router.afterEach((to, from, failure) => {
-	if (to.params.studiensemester_kurzbz) {
-		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
-	} else {
-		document.title = 'Studierendenverwaltung FH-Complete';
+	let title = 'Studierendenverwaltung FH-Complete';
+	if (to.params.studiengang) {
+		title = to.params.studiengang + ' ' + title;
 	}
+	if (to.params.studiensemester_kurzbz) {
+		title = to.params.studiensemester_kurzbz + ' ' + title;
+	}
+	document.title = title;
 });
 
 const app = Vue.createApp({
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c6f271a50..e590f0606 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -24,6 +24,7 @@ import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
 
 import ApiSearchbar from "../../api/factory/searchbar.js";
 import ApiStv from "../../api/factory/stv.js";
+import ApiStvVerband from '../../api/factory/stv/verband.js';
 
 
 export default {
@@ -42,7 +43,12 @@ export default {
 		permissions: Object,
 		stvRoot: String,
 		cisRoot: String,
-		activeAddons: String // semicolon separated list of active addons
+		activeAddons: String, // semicolon separated list of active addons
+		url_studiensemester_kurzbz: String,
+		url_mode: String,
+		url_prestudent_id: String,
+		url_tab: String,
+		url_studiengang: String
 	},
 	provide() {
 		return {
@@ -101,23 +107,37 @@ export default {
 				}
 			},
 			studiengangKz: undefined,
+			studiengangKuerzel: '',
 			studiensemesterKurzbz: this.defaultSemester,
 			lists: {
 				nations: [],
 				sprachen: [],
 				geschlechter: []
-			}
+			},
+			verbandEndpoint: ApiStvVerband
 		}
 	},
 	watch: {
-		'$attrs.url_studiensemester_kurzbz': function (newVal, oldVal) {
+		'url_studiensemester_kurzbz': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
 				this.studiensemesterKurzbz = newVal;
 				this.$refs.stvList.updateUrl();
 				this.$refs.details.reload();
 			}
 		},
-		'$attrs.url_mode': function () {
+		'url_studiengang': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				const stg = this.lists.stgs.find((element) => {
+					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+					return (this.url_studiengang === kuerzel);
+				});
+				if (stg) {
+					this.studiengangKz = stg.studiengang_kz;
+					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+				}
+			}
+		},
+		'url_mode': function () {
 			this.handlePersonUrl();
 		}
 	},
@@ -144,16 +164,32 @@ export default {
 			{
 				urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
 			}
+			this.$refs.stvList.updateUrl(ApiStv.students.verband(urlpath));
+
 			this.studiengangKz = studiengang_kz;
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.verband(urlpath)
-				);
-			this.$router.push({
-				name: 'studiensemester',
-				params: {
-					studiensemester_kurzbz: this.studiensemesterKurzbz
-				}
+			const stg = this.lists.stgs.find((element) => {
+				return (element.studiengang_kz === this.studiengangKz);
 			});
+			if (stg)
+			{
+				this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase()
+				this.$router.push({
+					name: 'studiengang',
+					params: {
+						studiensemester_kurzbz: this.studiensemesterKurzbz,
+						studiengang: this.studiengangKuerzel
+					}
+				});
+			} else
+			{
+				this.studiengangKuerzel = '';
+				this.$router.push({
+					name: 'studiensemester',
+					params: {
+						studiensemester_kurzbz: this.studiensemesterKurzbz
+					}
+				});
+		}
 		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
@@ -193,7 +229,7 @@ export default {
 		}
 	},
 	created() {
-		if (!this.$attrs?.url_studiensemester_kurzbz) {
+		if (!this.url_studiensemester_kurzbz) {
 			this.$router.replace({
 				name: 'studiensemester',
 				params: {
@@ -201,7 +237,7 @@ export default {
 				}
 			});
 		} else {
-			this.studiensemesterKurzbz = this.$attrs.url_studiensemester_kurzbz;
+			this.studiensemesterKurzbz = this.url_studiensemester_kurzbz;
 		}
 
 		this.$api
@@ -237,6 +273,17 @@ export default {
 			.then(result => {
 				this.lists.stgs = result.data;
 				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
+
+				if (this.url_studiengang) {
+					const stg = this.lists.stgs.find((element) => {
+						const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+						return (this.url_studiengang === kuerzel);
+					});
+					if (stg) {
+						this.studiengangKz = stg.studiengang_kz;
+						this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+					}
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -270,7 +317,7 @@ export default {
 	template: `
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
+			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
 			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
 		</header>
@@ -280,7 +327,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-verband :preselectedKey="'' + studiengangKz" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ae2b6b40..a5d0e55a8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -5,8 +5,6 @@ import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tr
 import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
 import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
 
-import ApiStvVerband from '../../../api/factory/stv/verband.js';
-
 export default {
 	components: {
 		PvTree,
@@ -16,11 +14,22 @@ export default {
 	emits: [
 		'selectVerband'
 	],
+	props: {
+		endpoint: {
+			type: Object,
+			required: true,
+		},
+		preselectedKey: {
+			type: String,
+			default: null
+		}
+	},
 	data() {
 		return {
 			loading: true,
 			nodes: [],
 			selectedKey: [],
+			expandedKeys: {},
 			filters: {}, // TODO(chris): filter only 1st level?
 			favnodes: [],
 			favorites: {on: false, list: []}
@@ -32,6 +41,13 @@ export default {
 			return this.favorites.on ? this.favnodes : this.nodes;
 		}
 	},
+	watch: {
+		'preselectedKey': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				this.setPreselection();
+			}
+		}
+	},
 	methods: {
 		findNodeByKey(key, arr) {
 			if (!arr)
@@ -44,7 +60,7 @@ export default {
 				return res.pop();
 			return null;
 		},
-		onExpandTreeNode(node) {
+		async onExpandTreeNode(node) {
 			if (!node.children) {
 				if (node.data.link) {
 					let activeEl = null;
@@ -55,8 +71,8 @@ export default {
 					});
 					this.loading = true;
 					
-					this.$api
-						.call(ApiStvVerband.get(node.data.link))
+					return this.$api
+						.call(this.endpoint.get(node.data.link))
 						.then(result => result.data)
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
@@ -68,7 +84,7 @@ export default {
 
 							let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
 							treeitem = treeitem.closest('[role="row"]');
-							
+
 							this.$nextTick(() => {
 								if (activeEl == document.activeElement)
 									treeitem.dispatchEvent(new KeyboardEvent('keydown', {
@@ -108,7 +124,7 @@ export default {
 			}
 			this.favorites.on = !this.favorites.on;
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 			this.loading = false;
@@ -135,7 +151,7 @@ export default {
 			for (let parent in sortedInParents)
 				promises.push(
 					this.$api
-						.call(ApiStvVerband.get(parent == '_' ? '' : parent))
+						.call(this.endpoint.get(parent == '_' ? '' : parent))
 						.then(res => res.data)
 						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
 				);
@@ -160,9 +176,9 @@ export default {
 					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
 				this.favorites.list.push(key.data.link + '');
 			}
-			
+
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 		},
@@ -181,19 +197,55 @@ export default {
 				let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
 				items.forEach(el => el.tabIndex = 0);
 			}
+		},
+		async setPreselection()
+		{
+			if (!this.preselectedKey)
+				return;
+
+			let rawKey = this.preselectedKey
+
+			if (!rawKey || typeof rawKey !== 'string')
+				return;
+
+			const parts = this.preselectedKey.split('/');
+			let currentKey = parts[0];
+			let currentNode = this.findNodeByKey(currentKey);
+
+			if (!currentNode)
+				return;
+
+			for (let i = 1; i < parts.length; i++)
+			{
+				this.expandedKeys[currentNode.key] = true;
+
+				await this.onExpandTreeNode(currentNode);
+
+				currentKey += '-' + parts[i];
+				currentNode = this.findNodeByKey(currentKey);
+
+				if (!currentNode)
+				{
+					return;
+				}
+			}
+
+			this.selectedKey = {[currentNode.key]: true};
+			this.onSelectTreeNode(currentNode);
 		}
 	},
 	mounted() {
 		this.$api
-			.call(ApiStvVerband.get())
+			.call(this.endpoint.get())
 			.then(result => {
 				this.nodes = result.data.map(this.mapResultToTreeData);
+				this.setPreselection();
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiStvVerband.favorites.get())
+			.call(this.endpoint.favorites.get())
 			.then(result => {
 				if (result.data) {
 					let f = JSON.parse(result.data);
@@ -218,6 +270,7 @@ export default {
 			:value="filteredNodes"
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
+			v-model:expanded-keys="expandedKeys"
 			v-model:selection-keys="selectedKey"
 			@node-select="onSelectTreeNode"
 			scrollable

From 6714432c3078fe230b2803e0ea72f756c457298a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 18:02:01 +0200
Subject: [PATCH 0582/1357] handle no existing stgs from url

---
 .../js/components/Stv/Studentenverwaltung.js  | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e590f0606..0652ace05 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -127,14 +127,7 @@ export default {
 		},
 		'url_studiengang': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
-				const stg = this.lists.stgs.find((element) => {
-					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
-					return (this.url_studiengang === kuerzel);
-				});
-				if (stg) {
-					this.studiengangKz = stg.studiengang_kz;
-					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
-				}
+				this.checkUrlStudiengang();
 			}
 		},
 		'url_mode': function () {
@@ -226,6 +219,25 @@ export default {
 					true
 					);
 			}
+		},
+		checkUrlStudiengang() {
+			if (this.url_studiengang) {
+				const stg = this.lists.stgs.find((element) => {
+					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+					return (this.url_studiengang === kuerzel);
+				});
+				if (stg) {
+					this.studiengangKz = stg.studiengang_kz;
+					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+				} else {
+					this.$router.replace({
+						name: 'studiensemester',
+						params: {
+							studiensemester_kurzbz: this.studiensemesterKurzbz
+						}
+					});
+				}
+			}
 		}
 	},
 	created() {
@@ -273,17 +285,7 @@ export default {
 			.then(result => {
 				this.lists.stgs = result.data;
 				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
-
-				if (this.url_studiengang) {
-					const stg = this.lists.stgs.find((element) => {
-						const kuerzel = (element.typ + element.kurzbz).toUpperCase();
-						return (this.url_studiengang === kuerzel);
-					});
-					if (stg) {
-						this.studiengangKz = stg.studiengang_kz;
-						this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
-					}
-				}
+				this.checkUrlStudiengang();
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 

From 02a52d1aee531cb9c24596acd2d4e8b7ed7a2999 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 08:44:27 +0200
Subject: [PATCH 0583/1357] Bugfix: forward both params in LvPlan update:date
 and update:mode events

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

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index c1cffb5be..e0e918f01 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -130,8 +130,8 @@ export default {
 		:backgrounds="backgrounds"
 		:time-grid="teachingunits"
 		show-btns
-		@update:date="$emit('update:date', $event)"
-		@update:mode="$emit('update:mode', $event)"
+		@update:date="(newDate, newMode) => $emit('update:date', newDate, newMode)"
+		@update:mode="(newMode, newDate) => $emit('update:mode', newMode, newDate)"
 		@update:range="updateRange"
 	>
 		<template v-slot="{ event, mode }">

From 502942deb3b7cca782d0865a2d0622b9a0bd0580 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 09:28:50 +0200
Subject: [PATCH 0584/1357] Remove template from slot

---
 public/js/components/Cis/LvPlan/LvPlan.js | 34 +++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 2fbac0e3a..f7763c54b 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -124,25 +124,23 @@ export default {
 			@update:range="updateRange"
 			class="responsive-calendar"
 		>
-			<template>
-				<div
-					v-if="downloadLinks"
-					class="d-flex gap-1 justify-items-start"
-				>
-					<div v-for="{ title, icon, link } in downloadLinks">
-						<a
-							:href="link"
-							:aria-label="title"
-							class="py-1 btn btn-outline-secondary"
-						>
-							<div class="d-flex flex-column">
-								<i aria-hidden="true" :class="icon"></i>
-								<span style="font-size:.5rem">{{ title }}</span>
-							</div>
-						</a>
-					</div>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+			>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
 				</div>
-			</template>
+			</div>
 		</fhc-calendar>
 	</div>`
 };

From be2419063651d3ceac7baafaa14883ca7f8117d6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 4 Aug 2025 10:15:07 +0200
Subject: [PATCH 0585/1357] studiensemester auswahl abhaengig von url

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

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 7bfb3ec82..faecbf71f 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -262,7 +262,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%" :preselectedKey="selectedStudiengang" :endpoint="endpoint"></stv-verband>
-					<stv-studiensemester :default="selectedStudiensemester" @changed="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">

From 89c64cadc7a28eaa63f4b5c7cc870d2dae86cda3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 10:20:11 +0200
Subject: [PATCH 0586/1357] calc current Studiensemester by start_date, to
 avoid gap and error msg during summer

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

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index a1d40cb81..6a1f9bf7f 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -115,7 +115,7 @@ class LvPlan extends FHCAPI_Controller
 
 		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$current_Studiensemester = $this->StudiensemesterModel->getAkt();
+		$current_Studiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
 		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
 		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);

From 8bcd0961f6c4c2a131032bdb3de968f6d9381a86 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 13:06:32 +0200
Subject: [PATCH 0587/1357] remove unused empty file

---
 ...55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung

diff --git a/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung b/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung
deleted file mode 100644
index e69de29bb..000000000

From e727c03a422e325579cb4e896ede9b291581c6bf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 13:42:51 +0200
Subject: [PATCH 0588/1357] fix current simple search with modified searchbar,
 let action always emit actionexecuted event on click to close search in
 combination with vue router

---
 application/libraries/SearchBarLib.php               |  7 +++++++
 .../components/searchbar/result/template/action.js   |  5 ++---
 public/js/components/searchbar/searchbar.js          | 12 ++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 13b0efdbb..f19365c02 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -115,6 +115,7 @@ class SearchBarLib
 
 		$sql = '
 			SELECT
+				\'employee\' AS renderer,
 				\''.$type.'\' AS type,
 				b.uid AS uid,
 				p.person_id AS person_id,
@@ -205,6 +206,7 @@ EOSC;
 
 		$employees = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'employee\' AS renderer,
 				\''.$type.'\' AS type,
 				b.uid AS uid,
 				p.person_id AS person_id,
@@ -268,6 +270,7 @@ EOSC;
 
 		$ous = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'' . $type . '\' AS renderer,
 				\''.$type.'\' AS type,
 				o.oe_kurzbz AS oe_kurzbz,
 				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
@@ -365,6 +368,7 @@ EOSC;
 		$gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
 		$students = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'' . $type . '\' AS renderer,
 			\''.$type.'\' AS type,
 			s.student_uid AS uid,
 			CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
@@ -413,6 +417,7 @@ EOSC;
 
 		$students = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'student\' AS renderer,
 			\''.$type.'\' AS type,
 			s.student_uid AS uid,
 			s.matrikelnr,
@@ -458,6 +463,7 @@ EOSC;
 
 		$prestudent = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'' . $type . '\' AS renderer,
 			\''.$type.'\' AS type,
 			ps.prestudent_id,
 			ps.studiengang_kz,
@@ -517,6 +523,7 @@ EOSC;
 
 		$rooms = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'room\' AS renderer,
 				\''.$type.'\' AS type,
 				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
 				COALESCE(ort.gebteil, \'N/A\') as building,
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index 7c50eb134..eb4b1db3a 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -16,9 +16,8 @@ export default {
 	},
 	methods: {
 		actionFunc() {
-			if (this.action.type !== 'function')
-				return;
-			this.action.action(this.res);
+			if (this.action.type === 'function')
+				this.action.action(this.res);
 			this.$emit('actionexecuted');
 		}
 	},
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 6a41fe2f5..f571b733b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -77,6 +77,7 @@ export default {
 		<form
 			ref="searchform"
 			class="d-flex me-3"
+			:class="searchoptions.cssclass"
 			action="javascript:void(0);"
 			@focusin="searchfocusin"
 			@focusout="searchfocusout"
@@ -136,7 +137,7 @@ export default {
                         :is="res.renderer"
                         :mode="searchmode"
                         :res="res"
-                        :actions="searchoptions.actions[dash2camelCase(res.renderer)]"
+                        :actions="getActions(res)"
                         @actionexecuted="hideresult"
                     ></component>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
@@ -418,6 +419,13 @@ export default {
         isValidRenderer(renderer) {
             const camelCaseRenderer = this.dash2camelCase(renderer);
             return Object.keys(this.$.components).includes(camelCaseRenderer);
-        }
+        },
+		getActions(res) {
+			let actions = this.searchoptions.actions[this.dash2camelCase(res.renderer)];
+			if (actions) {
+				return actions;
+			}
+			return this.searchoptions.actions[res.type];
+		}
     }
 };

From b76bdfa4314cb4d365590aa61f544e6b6c69a511 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 14:08:59 +0200
Subject: [PATCH 0589/1357] Close calendar modal on unmount

---
 public/js/components/Calendar/Base.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 2069347da..36d9877da 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -258,6 +258,9 @@ export default {
 				this.modalEvent.closeFn();
 		}
 	},
+	beforeUnmount() {
+		this.hideEventModal();
+	},
 	template: /* html */`
 	<div class="fhc-calendar-base h-100">
 		<base-draganddrop

From 9b396088c33e8cef06efcea66e2f26c73cf21573 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 14:09:27 +0200
Subject: [PATCH 0590/1357] Refactor LvPlan endpoints to be more granular

---
 .../controllers/api/frontend/v1/LvPlan.php    | 218 +++++----
 application/libraries/StundenplanLib.php      | 423 ++++++++++--------
 public/js/api/factory/lvPlan.js               |  17 +-
 3 files changed, 397 insertions(+), 261 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 6a1f9bf7f..b6c629fe1 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -36,6 +36,8 @@ class LvPlan extends FHCAPI_Controller
             'Stunden' => self::PERM_LOGGED,
             'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
+			'eventsPersonal' => self::PERM_LOGGED,
+			'eventsLv' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
@@ -51,100 +53,95 @@ class LvPlan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
-
-		//load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	 /**
+	/**
      * fetches LvPlan and Moodle events together
      * @access public
      *
      */
-	public function LvPlanEvents(){
+	public function LvPlanEvents()
+	{
+		$hasLv = $this->input->post('lv_id');
+
+		return $hasLv ? $this->eventsLv() : $this->eventsPersonal();
+	}
+
+	/**
+	 * fetches LvPlan, Moodle and Ferien events together for the logged in user
+	 *
+	 * @access public
+	 */
+	public function eventsPersonal()
+	{
 		$this->load->library('StundenplanLib');
 
 		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-		if ($this->form_validation->run() === FALSE)
+		
+		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		// storing the get parameter in local variables
-		$start_date = $this->input->get('start_date', TRUE);
-		$end_date = $this->input->get('end_date', TRUE);
-		$lv_id = $this->input->get('lv_id', TRUE);
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
 
-		$res_lvplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
-		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
-		{
-			$lvplan_events = array();
-		}
+		// fetching lvplan events
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
+		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$this->load->config('calendar');
-		$tz = new DateTimeZone($this->config->item('timezone'));
-		$start = new DateTime($start_date);
-		$start->setTimezone($tz);
-		$end = new DateTime($end_date);
-		$end->setTimezone($tz);
-		$end->modify('+1 day -1 second');
-		$moodle_events = [];
-		Events::trigger(
-			'moodleCalendarEvents',
-			function & () use (&$moodle_events) {
-				return $moodle_events;
-			},
-			[
-				'start_date' => $start->format('c'),
-				'end_date' => $end->format('c'),
-				'username' => getAuthUID()
-			]
-		);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
 
-		$lvAndMoodleEvents = array_merge($lvplan_events,$moodle_events);
+		// fetching ferien events
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
-		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$current_Studiensemester = $this->StudiensemesterModel->getByDate($start_date);
-		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
-		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
-		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
-		$studiengang = $this->getDataOrTerminateWithError($studiengang);
-		if(!empty($studiengang)){
-			$studiengang = current($studiengang)->studiengang_kz;
-		}else{
-			$studiengang = 0;
-		}
+		$this->terminateWithSuccess(array_merge(
+			$lvplanEvents,
+			$moodleEvents,
+			$ferienEvents
+		));
+	}
 
-		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
-		$ferienEvents = $this->getDataOrTerminateWithError($ferienEvents);
-		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
-		// sort array with moodle events first
-		usort($lvAndMoodleEvents, function($a, $b){
-			if ($a->type === 'moodle' && $b->type !== 'moodle') {
-				return -1;
-			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
-				return 1;
-			} elseif ($a->type === 'ferien' && ($b->type !== 'moodle' && $b->type !== 'ferien')) {
-				return -1;
-			} elseif (($a->type !== 'ferien' && $a->type !== 'moodle') && $b->type === 'ferien') {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
+	/**
+	 * fetches LvPlan and Ferien events together for the lv
+	 *
+	 * @access public
+	 */
+	public function eventsLv()
+	{
+		$this->load->library('StundenplanLib');
 
-		$this->terminateWithSuccess($allEvents);
+		// form validation
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
+		$lv_id = $this->input->post('lv_id', true);
+
+		// fetching lvplan events
+		$result = $this->stundenplanlib->getEventsLv($lv_id, $start_date, $end_date);
+		$lvplanEvents = $this->getDataOrTerminateWithError($result);
+
+		// fetching ferien events
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
+
+		$this->terminateWithSuccess(array_merge(
+			$lvplanEvents,
+			$ferienEvents
+		));
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
@@ -193,9 +190,6 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	public function getRoomplan()
 	{
-		// form validation
-		$this->load->library('form_validation');
-
 		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required");
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
@@ -228,9 +222,6 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	public function getReservierungen($ort_kurzbz = null)
 	{
-		//form validation
-		$this->load->library('form_validation');
-		
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
 		
@@ -259,6 +250,77 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	
+	/**
+	 * fetch moodle events
+	 *
+	 * @param string		$start_date
+	 * @param string		$end_date
+	 * @return array
+	 */
+	private function fetchMoodleEvents($start_date, $end_date)
+	{
+		$this->load->config('calendar');
 
+		$tz = new DateTimeZone($this->config->item('timezone'));
+		
+		$start = new DateTime($start_date);
+		$start->setTimezone($tz);
+		
+		$end = new DateTime($end_date);
+		$end->setTimezone($tz);
+		$end->modify('+1 day -1 second');
+		
+		$moodle_events = [];
+		
+		Events::trigger(
+			'moodleCalendarEvents',
+			function & () use (&$moodle_events) {
+				return $moodle_events;
+			},
+			[
+				'start_date' => $start->format('c'),
+				'end_date' => $end->format('c'),
+				'username' => getAuthUID()
+			]
+		);
+
+		return $moodle_events;
+	}
+
+	/**
+	 * fetch ferien events
+	 *
+	 * @param string		$start_date
+	 * @param string		$end_date
+	 * @return array
+	 */
+	private function fetchFerienEvents($start_date, $end_date)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
+
+		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
+		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
+		
+		if ($currentStudiensemester) {
+			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
+
+			$studiengang = $this->StudentLehrverbandModel->loadWhere([
+				"student_uid" => getAuthUID(),
+				"studiensemester_kurzbz" => $studentsemester_kurzbz
+			]);
+			$studiengang = $this->getDataOrTerminateWithError($studiengang);
+			
+			if ($studiengang)
+				$studiengang_kz = current($studiengang)->studiengang_kz;
+			else
+				$studiengang_kz = 0;
+		} else {
+			$studiengang_kz = 0;
+		}
+
+		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
+		
+		return $this->getDataOrTerminateWithError($ferienEvents);
+	}
 }
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 488fff45a..6d53a2e2e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -8,125 +8,177 @@ use \DateTimeZone as DateTimeZone;
 use \DateInterval as DateInterval;
 use \DatePeriod as DatePeriod;
 
-class StundenplanLib{
+class StundenplanLib
+{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches Stundenplan events from a UID and start/end date
-	 * @access public
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 * or for a lv
 	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @param string|null	$lehrveranstaltung_id
+	 * @return stdClass
+	 * @access public
 	 */
-	public function getStundenplan($start_date, $end_date, $lv_id = null){
+	public function getStundenplan($start, $end, $lehrveranstaltung_id = null)
+	{
+		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0)
+			return $this->getEventsUser($start, $end);
+
+		return $this->getEventsLv($lehrveranstaltung_id, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsUser($start, $end)
+	{
 		$this->_ci =& get_instance();
 
-		// Load Config
-		$this->_ci->load->config('calendar');
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
-
-		$student_uid = getAuthUID();
-		if(is_null($student_uid))
-		{
+		$uid = getAuthUID();
+		if (is_null($uid))
 			return error("No UID");
-		}
 		
-		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
-		if(isError($semester_range))
-		{
-			return error(getData($semester_range));
-		}
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid));
+
+		if ($is_mitarbeiter)
+			return $this->getEventsEmployee($uid, $start, $end);
+
+		return $this->getEventsStudent($uid, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for a student between start and end
+	 *
+	 * @param string		$student_uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsStudent($student_uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$semester_range = $this->studienSemesterErmitteln($start, $end);
+		if (isError($semester_range))
+			return $semester_range;
 		$semester_range = getData($semester_range);
+
 		$this->sortStudienSemester($semester_range);
+
 		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
-		if(!is_null($function_error)){
+		if ($function_error)
 			return $function_error;
-		}
 		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+		// getting the gruppen_kurzbz of the student in the different studiensemester
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range);
+		if (isError($benutzer_gruppen))
+			return $benutzer_gruppen;
+		$benutzer_gruppen = getData($benutzer_gruppen);
 
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return $function_error;
-			}
-
-			// query lv itself in case its Stundenplan is being queried and it has no entries
-			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
-			if(isError($lv_result))
-			{
-				return error(getData($lv_result));
-			}
-			$lv = getData($lv_result)[0];
-			return success($stundenplan_data);
-		}
+		// getting the student_lehrverbaende of the student in the different studiensemester
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
+		if (isError($student_lehrverband))
+			return $student_lehrverband;
+		$student_lehrverband = getData($student_lehrverband);
 		
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
-		if($is_mitarbeiter)
-		{
-			
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return error($function_error);
-			}
-			return success($stundenplan_data);
-		} else {
-			// getting the gruppen_kurzbz of the student in the different studiensemester
-			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
-			if(isError($benutzer_gruppen))
-			{
-				return error(getData($benutzer_gruppen));
-			}
-			$benutzer_gruppen = getData($benutzer_gruppen);
-
-			// getting the student_lehrverbaende of the student in the different studiensemester
-			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
-			if(isError($student_lehrverband))
-			{
-				return error(getData($student_lehrverband));
-			}
-			$student_lehrverband = getData($student_lehrverband);
-			
-			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
-			{
-				return success([]);
-			}
-			
-			
-			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return $function_error;
-			}
-			
-			return success($stundenplan_data);
-		}
+		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
+			$start,
+			$end,
+			$semester_range,
+			$benutzer_gruppen,
+			$student_lehrverband
+		);
+		if (!$stundenplan_query)
+			return success([]);
 		
+		$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for an employee between start and end
+	 *
+	 * @param string		$uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsEmployee($uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start, $end, $uid);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for a LV between start and end
+	 *
+	 * @param integer		$lehrveranstaltung_id
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsLv($lehrveranstaltung_id, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start, $end, $lehrveranstaltung_id);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+
+		// query lv itself in case its Stundenplan is being queried and it has no entries
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$lv_result = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
+		if (isError($lv_result))
+			return $lv_result;
+		if (!hasData($lv_result))
+			return error('LV not found');
+		
+		return success($stundenplan_data);
 	}
 
 	/**
@@ -152,7 +204,7 @@ class StundenplanLib{
 		if (isError($roomplan_data))
 			return $roomplan_data;
 
-		$this->expand_object_information($roomplan_data->retval);
+		$this->expandObjectInformation($roomplan_data->retval);
 
 		return $roomplan_data;
 	}
@@ -173,6 +225,8 @@ class StundenplanLib{
 		$this->_ci->load->config('calendar');
 		// Load Models
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 		
@@ -186,7 +240,7 @@ class StundenplanLib{
 		if (isError($reservierungen))
 			return $reservierungen;
 		
-		$function_error = $this->expand_object_information($reservierungen->retval);
+		$function_error = $this->expandObjectInformation($reservierungen->retval);
 		
 		if (!is_null($function_error))
 			return $function_error;
@@ -228,9 +282,15 @@ class StundenplanLib{
 		return success($lektoren);
 	}
 
-	public function expand_object_information($data){
+	public function expandObjectInformation($data)
+	{
 		$this->_ci =& get_instance();
 		
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Model
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
 		foreach ($data as $item)
 		{
 			$tz = new DateTimeZone($this->_ci->config->item('timezone'));
@@ -324,69 +384,64 @@ class StundenplanLib{
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
-		WHERE (bisdatum >= ? AND vondatum <= ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
-		",[$start_date, $end_date, $studiengang_kz]);
+		WHERE (bisdatum >= ? AND vondatum < ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		", [$start_date, $end_date, $studiengang_kz]);
 
-		if (isError($ferienEvents)) {
-			return error(getData($ferienEvents));
-		}
+		if (isError($ferienEvents))
+			return $ferienEvents;
+		
 		$ferienEvents = getData($ferienEvents);
-		
-		if(is_array($ferienEvents) && count($ferienEvents) > 0){
-			
-			$ferienEvents = array_map(function($event){
-				$event_start = new DateTime($event->vondatum);
-				$event_end = new DateTime($event->bisdatum);
-				$event_end->modify('+1 day');
-	
-				$interval = new DateInterval('P1D');
-				$period = new DatePeriod($event_start, $interval, $event_end);
-				$event->dates = iterator_to_array($period);
-				return $event;
-			}, $ferienEvents);
-	
-			$start_date = new DateTime($start_date);
-			$start_date->setTime(0, 0, 0);
-			$end_date = new DateTime($end_date);
-			$end_date->setTime(23, 59, 59);
 
-			$ferienEventsFlattened=[];
-			foreach($ferienEvents as $ferien_event){
-				foreach($ferien_event->dates as $date){
-					if ($date < $start_date || $date > $end_date)
-						continue;
-					$event = new stdClass();
-					$event->bezeichnung = $ferien_event->bezeichnung;
-					$event->datum = $date->format('Y-m-d');
-					$event->type = 'ferien';
-					$ferienEventsFlattened[] = $event;
-				}
-			};
-	
-			$today=new DateTime();
-			$ferienEventsFlattened = array_map(function($event) use($today, $tz){
-				$ferien_event = (object) array(
-					'type' => 'ferien',
-					'beginn' => $today->format('H:i:s'),
-					'ende' => $today->format('H:i:s'),
-					'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
-					'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
-					'allDayEvent' => true,
-					'datum' => $event->datum,
-					'topic' => $event->bezeichnung,
-					'titel' => $event->bezeichnung,
-					'farbe' => '00689E'
-				);
-				return $ferien_event;
-			}, $ferienEventsFlattened);
-			
-			return success($ferienEventsFlattened);
-		}
-		else{
+		if (!$ferienEvents)
 			return success([]);
-		}
-
 		
+		$ferienEvents = array_map(function ($event) {
+			$event_start = new DateTime($event->vondatum);
+			$event_end = new DateTime($event->bisdatum);
+			$event_end->modify('+1 day');
+
+			$interval = new DateInterval('P1D');
+			$period = new DatePeriod($event_start, $interval, $event_end);
+			$event->dates = iterator_to_array($period);
+			return $event;
+		}, $ferienEvents);
+
+		$start_date = new DateTime($start_date);
+		$start_date->setTime(0, 0, 0);
+		$end_date = new DateTime($end_date);
+		$end_date->setTime(23, 59, 59);
+
+		$ferienEventsFlattened = [];
+		foreach ($ferienEvents as $ferien_event) {
+			foreach ($ferien_event->dates as $date) {
+				if ($date < $start_date || $date > $end_date)
+					continue;
+				$event = new stdClass();
+				$event->bezeichnung = $ferien_event->bezeichnung;
+				$event->datum = $date->format('Y-m-d');
+				$event->type = 'ferien';
+				$ferienEventsFlattened[] = $event;
+			}
+		};
+
+		$today = new DateTime();
+		$ferienEventsFlattened = array_map(function ($event) use ($today, $tz) {
+			$ferien_event = (object)array(
+				'type' => 'ferien',
+				'beginn' => $today->format('H:i:s'),
+				'ende' => $today->format('H:i:s'),
+				'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
+				'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
+				'allDayEvent' => true,
+				'datum' => $event->datum,
+				'topic' => $event->bezeichnung,
+				'titel' => $event->bezeichnung,
+				'farbe' => '00689E'
+			);
+			return $ferien_event;
+		}, $ferienEventsFlattened);
+		
+		return success($ferienEventsFlattened);
 	}
 
 	// start of the private functions ########################################################################################################
@@ -437,8 +492,10 @@ class StundenplanLib{
 
 	
 
-	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
+	private function fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
 		$benutzer_gruppen = [];
 		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
 		/*
@@ -499,8 +556,10 @@ class StundenplanLib{
 		return success($benutzer_gruppen);
 	}
 
-	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
+	private function fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
 		$student_lehrverband = [];
 		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
 		/*
@@ -566,7 +625,10 @@ class StundenplanLib{
 		return success($student_lehrverband);
 	}
 
-	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		/*
 		@var($semester_collection)
 		convert the array of studiensemester into an associative array with the studiensemester as the key 
@@ -692,30 +754,29 @@ class StundenplanLib{
 		}
 	}
 
-	private function studienSemesterErmitteln($start_date,$end_date){
-		
+	private function studienSemesterErmitteln($start_date, $end_date)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		// gets all studiensemester from the student from start_date to end_date
-		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date,$end_date);
-		if(isError($semester_range))
-		{
-			return error(getData($semester_range));
-		}
-		$semester_range = array_map( 
-			function($sem)
-			{
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		if (isError($semester_range))
+			return $semester_range;
+		
+		$semester_range = array_map(
+			function ($sem) {
 				return $sem->studiensemester_kurzbz;
 			},
 			getData($semester_range) ?: []
 		);
 
 		// if no studiensemester is found for the given timespan, get the nearest studiensemester
-		if(count($semester_range) == 0)
+		if (count($semester_range) == 0)
 		{
 			$aktuelle_studiensemester = $this->_ci->StudiensemesterModel->getNearest();
-			if(isError($aktuelle_studiensemester))
-			{
-				return error(getData($aktuelle_studiensemester));
-			}
+			if (isError($aktuelle_studiensemester))
+				return $aktuelle_studiensemester;
+			
 			$aktuelle_studiensemester = getData($aktuelle_studiensemester);
 			if (count($aktuelle_studiensemester) == 0) {
 				return error("No aktuelles semester");
@@ -723,8 +784,8 @@ class StundenplanLib{
 			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
 			// push aktuelles semester in active semester array
 			array_push($semester_range, $aktuelle_studiensemester);
-
 		}
+
 		return success($semester_range);
 	}
 }
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 99f7961f6..87e74cff5 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -30,8 +30,21 @@ export default {
 			params: { start_date, end_date, lv_id }
 		};
 	},
+	eventsPersonal(start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsPersonal',
+			params: { start_date, end_date }
+		};
+	},
+	eventsLv(lv_id, start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsLv',
+			params: { lv_id, start_date, end_date }
+		};
+	},
 	getStunden() {
-		// TODO(chris): seems to be called from nowhere?
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/LvPlan/Stunden'
@@ -65,7 +78,7 @@ export default {
 	},
 	LvPlanEvents(start_date, end_date, lv_id) {
 		return {
-			method: 'get',
+			method: 'post',
 			url: '/api/frontend/v1/LvPlan/LvPlanEvents',
 			params: { 
 				start_date: start_date, 

From 4a692043843a40b69915c1962729970950020676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 15:53:22 +0200
Subject: [PATCH 0591/1357] Bugfix for Firefox ESR 128 Bug where Reduce
 Function is not always available

---
 public/js/components/Calendar/Base/Grid.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index ad0d9ec51..da160ff5c 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -35,7 +35,7 @@ export default {
 			type: Array,
 			required: true,
 			validator(value) {
-				return value.every(item => 
+				return value.every(item =>
 					item instanceof luxon.Duration
 					|| Number.isInteger(item)
 					|| (
@@ -124,7 +124,7 @@ export default {
 			for (var date of this.axisMain)
 				for (var part of partsEnds)
 					ends.push(date.plus(part));
-			
+
 			return ends;
 		},
 		axisMainBorders() {
@@ -212,7 +212,7 @@ export default {
 	methods: {
 		mapIntoMainAxis(target) {
 			const result = Array.from({length: this.axisMain.length}, () => Array());
-			
+
 			target.forEach(event => {
 				const start = event.start || this.axisMainBorders[0].plus(-1);
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
@@ -264,13 +264,13 @@ export default {
 
 			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
 		},
-		
+
 		/* SCROLLING */
 		enableAutoScroll() {
 			if (!this.resizeObserver)
 				this.resizeObserver = new ResizeObserver(this.scrollToEarliestEvent);
 			this.resizeObserver.observe(this.$refs.body);
-			
+
 			if (!this.mutationObserver)
 				this.mutationObserver = new MutationObserver(mutations => {
 					if (mutations.some(m => m.addedNodes.length && [].some.call(m.addedNodes, el => el.matches && el.matches('.fhc-calendar-base-grid-line-event'))))
@@ -294,14 +294,22 @@ export default {
 		},
 		scrollToEarliestEvent() {
 			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
-			const earliestEventOffset = eventElements.values()
+			let elements = [];
+
+			// Firefox ESR 128 Workaround ArrayIterator Reduce not available
+			if (typeof eventElements.values().reduce == 'function')
+				elements = eventElements.values();
+			else
+				elements = [...eventElements.values()];
+
+			const earliestEventOffset = elements
 				.reduce((res, el) => {
 					const top = el.offsetTop;
 					if (!res[1] || top < res[0])
 						return [top, el];
 					return res;
 				}, [0, null]);
-			
+
 			this.userScroll = false;
 			if (earliestEventOffset[1]) {
 				earliestEventOffset[1].scrollIntoView({ behavior: "smooth" });

From e9807a210bbcab91dad1dae022b8041c52d10fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:00:53 +0200
Subject: [PATCH 0592/1357] Removed Error Logs

---
 rdf/reihungstest.rdf.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
index 15860d025..cb4ebf8dc 100644
--- a/rdf/reihungstest.rdf.php
+++ b/rdf/reihungstest.rdf.php
@@ -73,23 +73,18 @@ $rt = new reihungstest();
 
 if(isset($_GET['include_id']) && isset($_GET['studiengang_kz']))
 {
-	error_log("in zweig get zukuenfigte");
 	$include_id=$_GET['include_id'];
-	error_log("include_Id:" . $include_id);
 	$studiengang_kz=$_GET['studiengang_kz'];
-	error_log(" stg_kz: " . $studiengang_kz);
 	$rt->getZukuenftige($include_id, $studiengang_kz);
 }
 elseif(isset($_GET['prestudent_id']))
 {
 	$include_ids=array();
-	error_log("prestudent");
 	$prestudent = new prestudent();
 	$prestudent->getPrestudentRolle($_GET['prestudent_id'], 'Interessent');
 	$studienplan_arr = array();
 	foreach($prestudent->result as $row)
 	{
-		error_log( $row->studienplan_id);
 		$studienplan_arr[] = $row->studienplan_id;
 	}
 

From cc91fe7588e1325fc7c6287aebd4655c03e11c8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:17:38 +0200
Subject: [PATCH 0593/1357] searchcis only students and employees with active
 useraccount

---
 application/config/searchcis.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/application/config/searchcis.php b/application/config/searchcis.php
index ce385338f..8546d3ee9 100644
--- a/application/config/searchcis.php
+++ b/application/config/searchcis.php
@@ -7,6 +7,15 @@ $CI =& get_instance();
 
 
 $config['employee'] = $CI->config->item('employee', 'search');
+$config['employee']['resultjoin'] = "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)";
 
 $config['student'] = $CI->config->item('student', 'search');
 unset($config['student']['searchfields']['email']);
@@ -23,6 +32,10 @@ $config['student']['resultfields'] = [
 		AS photo_url",
 	"b.aktiv"
 ];
+$config['student']['resultjoin'] = "
+		JOIN public.tbl_student s USING (student_uid)
+		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)";
 
 $config['organisationunit'] = $CI->config->item('organisationunit', 'search');
 $config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';

From cba5b39e293f5e97f3aad242e0bc8f1b0abcf3e4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:28:31 +0200
Subject: [PATCH 0594/1357] searchcis do not search for
 organisationeinheittyp_kurzbz Container

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

diff --git a/application/config/searchcis.php b/application/config/searchcis.php
index 8546d3ee9..e3d1e2213 100644
--- a/application/config/searchcis.php
+++ b/application/config/searchcis.php
@@ -38,7 +38,7 @@ $config['student']['resultjoin'] = "
 		JOIN public.tbl_person p USING(person_id)";
 
 $config['organisationunit'] = $CI->config->item('organisationunit', 'search');
-$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true AND organisationseinheittyp_kurzbz <> \'Container\')';
 $config['organisationunit']['table'] = 'active_organisationseinheit';
 
 $config['room'] = $CI->config->item('room', 'search');

From 0516fa2ff55ec13e2352d5660062a7d1035188fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:19:44 +0200
Subject: [PATCH 0595/1357] Alert CSS fixed, Legacy Icons aus Alerts entfernt

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

diff --git a/public/js/DialogLib.js b/public/js/DialogLib.js
index f594ae67c..9a4f179c6 100644
--- a/public/js/DialogLib.js
+++ b/public/js/DialogLib.js
@@ -95,10 +95,9 @@ var FHC_DialogLib = {
 	 */
 	_displayDialog: function(heading, message, icon, colorClass)
 	{
-		var html = "<p class='dialogmessage'><i class='glyphicon glyphicon-"+icon+"'></i>&nbsp;&nbsp;"+message+"</p>";
+		var html = "<p class='dialogmessage'>"+message+"</p>";
 		FHC_DialogLib.alertDefault(heading, html);
-		$(".ui-dialog-titlebar").addClass(colorClass+" text-center");
-		$(".glyphicon-"+icon).addClass(colorClass);
+		$(".ui-dialog-titlebar").addClass(colorClass+" alert text-center");
 		FHC_DialogLib._formatShortDialog();
 	},
 
@@ -113,7 +112,6 @@ var FHC_DialogLib = {
 		$(".ui-dialog-buttonpane.ui-widget-content").css("padding", ".3em .4em .5em .4em");
 		$(".ui-dialog .ui-dialog-content").css("padding", "0");
 		$(".ui-dialog-buttonset button").css("margin", "0");
-		$(".dialogmessage i.glyphicon").css("background-color", "transparent");
 	}
 
 };

From b8de3110159f7759664be76ff00f722879e3e7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:33:52 +0200
Subject: [PATCH 0596/1357] Umlaute in Navigation Component gefixed

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

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 2327513ad..5cbb6512c 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -93,7 +93,7 @@ $config['navigation_header'] = array(
 				),
 				'zverfueg' => array(
 					'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
-					'description' => 'Zeitverf&uuml;gbarkeit',
+					'description' => 'Zeitverfügbarkeit',
 					'expand' => true,
 					'sort' => 45,
 					'requiredPermissions' => array(
@@ -325,4 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-);
\ No newline at end of file
+);

From ecc7e4672f6b18cad801a9e9e53702c33173834f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:34:19 +0200
Subject: [PATCH 0597/1357] Styling in Navigation Component korrigiert

---
 public/css/components/NavigationComponent.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index 4799e2f26..911470fe9 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -4,7 +4,7 @@
 
  :root{
 	--fhc-nav-component-bg: var(--fhc-tertiary, #f8f8f8);
-	--fhc-nav-component-border: var(--fhc-border, #5e5e5e);
+	--fhc-nav-component-border: var(--fhc-border, #e7e7e7);
 	--fhc-nav-component-color: var(--fhc-text, #5e5e5e);
 	--fhc-nav-left-component-border: var(--fhc-border, #e7e7e7);
 	--fhc-nav-left-component-bg: var(--fhc-tertiary, #f8f8f8);
@@ -99,4 +99,3 @@
 	margin: 0 0 0 250px;
 	padding: 30px 30px;
 }
-

From 459d445f2f564386b5eac722f711b99b83568191 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 06:59:21 +0200
Subject: [PATCH 0598/1357] trigger search when searchfield gets focus a
 searchstr is there and the searchresult is empty

---
 public/js/components/searchbar/searchbar.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index f571b733b..9f255d607 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -404,6 +404,10 @@ export default {
             if( this.hidetimer !== null ) {
                 clearTimeout(this.hidetimer);
             }
+			if (this.searchsettings.searchstr.length >= 2
+				&& this.searchresult.length === 0) {
+				this.search();
+			}
         },
         searchfocusout: function(e) {
             e.preventDefault();

From 52e05353121548e5af76fa02ba53c32af6fdf46a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 07:21:09 +0200
Subject: [PATCH 0599/1357] use existing phrase

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

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 6878cefc2..3f66a5508 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -197,7 +197,7 @@ export const Raumsuche =  {
 		this.setupMounted()
 	},
 	template: `
-	<h1 class="h3">{{$p.t('lvplan/raumsuche')}}</h1>
+	<h1 class="h3">{{$p.t('rauminfo/roomSearch')}}</h1>
 	<hr>
 	<div class="row">
 		<div class="col-12 col-lg-2">

From 30cc798c0b97853b5a50a554ec79ec498fe896f3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 08:35:37 +0200
Subject: [PATCH 0600/1357] Endpoint to get lv details

---
 .../controllers/api/frontend/v1/LvPlan.php    | 36 +++++++++++++++++++
 public/js/api/factory/lvPlan.js               |  6 ++++
 2 files changed, 42 insertions(+)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index b6c629fe1..3b6b55911 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -41,6 +41,7 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);
 
         $this->load->library('LogLib');
@@ -250,6 +251,41 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * get details for a lv
+	 * @access public
+	 *
+	 * @param integer		$lehrveranstaltung_id
+	 * @return void
+	 */
+	public function getLv($lehrveranstaltung_id)
+	{
+		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0 && $lehrveranstaltung_id !== '0')
+			return show_404();
+
+		// Load Phrases
+		$this->loadPhrases(['lehre']);
+
+		// Validation
+		$this->form_validation->set_data([
+			'lehrveranstaltung_id' => $lehrveranstaltung_id
+		]);
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung_id'), 'integer');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// Get Data
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($result));
+	}
+
 	/**
 	 * fetch moodle events
 	 *
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 87e74cff5..0b179c9ba 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -87,4 +87,10 @@ export default {
 			}
 		};
 	},
+	getLv(lehrveranstaltung_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
+		};
+	}
 };
\ No newline at end of file

From 72bb465ecf2e111080ee0b91c7be2e3327e5f6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:25:34 +0200
Subject: [PATCH 0601/1357] Fixed Document Archive und Signature

---
 .../controllers/api/frontend/v1/Documents.php | 12 ++++-----
 application/libraries/DocumentExportLib.php   | 27 +++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index ebd1b269b..2d2c410cf 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -152,7 +152,7 @@ class Documents extends FHCAPI_Controller
 	 * @param string				$xml
 	 * @param string				$xsl
 	 * @param string				$sign_user (optional)
-	 * 
+	 *
 	 * @return array with Akte data and export data
 	 */
 	private function _getAkteExportData($xml, $xsl, $sign_user = null)
@@ -235,7 +235,7 @@ class Documents extends FHCAPI_Controller
 			$student = current($this->getDataOrTerminateWithError($result));
 
 			$ss = $this->input->post_get('ss');
-			
+
 			if ($ss !== null) {
 				$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 				$result = $this->PrestudentstatusModel->getLastStatus($student->prestudent_id, $ss);
@@ -334,7 +334,7 @@ class Documents extends FHCAPI_Controller
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
-				
+
 				$studiengang_kz = $prestudent->studiengang_kz;
 				$akteData['person_id'] = $prestudent->person_id;
 				$akteData['titel'] = mb_substr($xsl . "_" . $prestudent->kuerzel, 0, 64);
@@ -380,7 +380,7 @@ class Documents extends FHCAPI_Controller
 			// TODO: was bedeutet wenn keine berechtigung?
 			if (!$access_rights || !$access_rights->berechtigung)
 				return show_404();
-			
+
 			$allowed = false;
 			foreach ($access_rights->berechtigung as $access_right) {
 				if ($this->permissionlib->isBerechtigt($access_right)) {
@@ -454,11 +454,11 @@ class Documents extends FHCAPI_Controller
 
 		if (!$vorlage->archivierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_archive"));
-		
+
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));
 
-		
+
 		$this->load->library('DocumentExportLib');
 
 		// XML Data
diff --git a/application/libraries/DocumentExportLib.php b/application/libraries/DocumentExportLib.php
index 595ac461a..a75047cf9 100644
--- a/application/libraries/DocumentExportLib.php
+++ b/application/libraries/DocumentExportLib.php
@@ -55,7 +55,7 @@ use SimpleXMLElement as SimpleXMLElement;
  * $doc->create($outputformat);
  * $doc->output(true);
  * $doc->close();
- * 
+ *
  * New:
  * $xml_data = $this->documentexportlib->getDataXML($data);
  * $images = [[
@@ -397,20 +397,24 @@ class DocumentExportLib
 		$vorlage_stg = current(getData($result));
 		foreach ($vorlage_stg as $k => $v)
 			$vorlage->$k = $v;
-		
+
+		if ($sign_user)
+		{
+			$this->addSignToData($xml_data);
+		}
+
 		$result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images);
 		if (isError($result))
 			return $result;
-		
+
 		$temp_filename = getData($result);
 
-		if ($sign_user) {
-			$this->addSignToData($xml_data);
-
+		if ($sign_user)
+		{
 			$result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile);
 			if (isError($result))
 				return $result;
-			
+
 			$temp_filename = getData($result);
 		}
 
@@ -445,6 +449,7 @@ class DocumentExportLib
 		if ($xml_data->firstChild->tagName == 'error')
 			return error($xml_data->firstChild->textContent);
 
+		$styles_xsl = null;
 		// styles.xml erstellen
 		if ($vorlage->style) {
 			$styles_xsl = new DOMDocument();
@@ -461,7 +466,7 @@ class DocumentExportLib
 		// Template holen
 		$vorlage_found = false;
 		$vorlage_filename = $vorlage->vorlage_kurzbz . ($vorlage->mimetype == 'application/vnd.oasis.opendocument.spreadsheet' ? '.ods' : '.odt');
-		
+
 		$aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
 		foreach($aktive_addons as $addon) {
 			$zipfile = DOC_ROOT . 'addons/' . $addon . '/system/vorlage_zip/' . $vorlage_filename;
@@ -652,7 +657,7 @@ class DocumentExportLib
 		foreach ($files as $file)
 			if (is_file($file))
 				unlink($file);
-		
+
 		chdir($source_folder);
 		rmdir($temp_folder);
 	}
@@ -703,12 +708,12 @@ class DocumentExportLib
 	{
 		if ($outputformat)
 			return $outputformat;
-		
+
 		if ($mimetype == 'application/vnd.oasis.opendocument.spreadsheet')
 			return 'ods';
 		if ($mimetype == 'application/vnd.oasis.opendocument.text')
 			return 'odt';
-		
+
 		return 'pdf';
 	}
 }

From 8f44a8b33e68d257a5e4ec2d0a8a48c86e68d04f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:31:20 +0200
Subject: [PATCH 0602/1357] use for-loop instead of reduce to get rid of
 Firefox ESR 128 Workaround

---
 public/js/components/Calendar/Base/Grid.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index da160ff5c..c232dd955 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -294,21 +294,13 @@ export default {
 		},
 		scrollToEarliestEvent() {
 			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
-			let elements = [];
 
-			// Firefox ESR 128 Workaround ArrayIterator Reduce not available
-			if (typeof eventElements.values().reduce == 'function')
-				elements = eventElements.values();
-			else
-				elements = [...eventElements.values()];
-
-			const earliestEventOffset = elements
-				.reduce((res, el) => {
-					const top = el.offsetTop;
-					if (!res[1] || top < res[0])
-						return [top, el];
-					return res;
-				}, [0, null]);
+			let earliestEventOffset = [0, null];
+			for (var el of eventElements.values()) {
+				const top = el.offsetTop;
+				if (!earliestEventOffset[1] || top < earliestEventOffset[0])
+					earliestEventOffset = [top, el];
+			}
 
 			this.userScroll = false;
 			if (earliestEventOffset[1]) {

From 043c9fd5f39667769304ec55bc1946888d682b40 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:33:11 +0200
Subject: [PATCH 0603/1357] split LvPlan into MyLvPlan (personal calendar) and
 LvPlan (lv calendar)

---
 application/config/routes.php                 |   1 +
 application/controllers/Cis/MyLvPlan.php      |  39 +++++
 public/js/apps/Dashboard/Fhc.js               |  55 +++----
 .../Cis/LvPlan/Lehrveranstaltung.js           |  96 ++++++++++++
 public/js/components/Cis/LvPlan/Personal.js   | 143 ++++++++++++++++++
 5 files changed, 298 insertions(+), 36 deletions(-)
 create mode 100644 application/controllers/Cis/MyLvPlan.php
 create mode 100644 public/js/components/Cis/LvPlan/Lehrveranstaltung.js
 create mode 100644 public/js/components/Cis/LvPlan/Personal.js

diff --git a/application/config/routes.php b/application/config/routes.php
index 798d29ad0..af6b563d3 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -62,6 +62,7 @@ $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/b
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
+$route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/MyLvPlan.php b/application/controllers/Cis/MyLvPlan.php
new file mode 100644
index 000000000..366ce8e65
--- /dev/null
+++ b/application/controllers/Cis/MyLvPlan.php
@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class MyLvPlan extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
+	}
+}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 075a399d8..b3ffa4315 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,7 +3,8 @@ import PluginsPhrasen from '../../plugins/Phrasen.js';
 import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import LvPlan, {DEFAULT_MODE_LVPLAN} from "../../components/Cis/LvPlan/LvPlan.js";
+import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
@@ -154,10 +155,14 @@ const router = VueRouter.createRouter({
 			path: "/Cis/LvPlan/:lv_id(\\d+)", 
 			name: "LvPlanOld",
 			component: LvPlan,
-			redirect: (to) => {
+			redirect(to) {
+				const route = Vue.unref(router.currentRoute);
+				const { mode, focus_date } = route.params; // keep mode and focus_date if available
 				return { // redirect to longer LvPlan url and map params
 					name: "LvPlan",
 					params: {
+						mode,
+						focus_date,
 						lv_id: to.params.lv_id
 					},
 				};
@@ -167,42 +172,20 @@ const router = VueRouter.createRouter({
 			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
 			name: 'LvPlan',
 			component: LvPlan,
-			props: (route) => { // validate and set mode/focus date if for some reason missing
-				const validModes = ["Month", "Week", "Day"];
-
-				// check mode string
-				const mode = route.params.mode &&
-					validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
-						? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-						: DEFAULT_MODE_LVPLAN;
-
-				// default to today date if not provided or string forms invalid date
-				const d = new Date(route.params.focus_date)
-				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
-				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
-				// existing viewData declaration written from codeigniter 3 into routerview tag
+			props(route) {
 				return {
-					propsViewData: {
-						mode,
-						focus_date,
-						lv_id: route.params.lv_id
-					}
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
+			name: 'MyLvPlan',
+			component: MyLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
 				};
-			},
-			beforeEnter: (to, from, next) => {
-				//  missing mode or focus_date -> set defaults
-				if (!to.params.mode || !to.params.focus_date) {
-					next({
-						name: "LvPlan",
-						params: {
-							mode: to.params.mode || DEFAULT_MODE_LVPLAN,
-							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
-							lv_id: to.params.lv_id
-						}
-					});
-				} else {
-					next();
-				}
 			}
 		},
 		{
diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
new file mode 100644
index 000000000..70773dce6
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -0,0 +1,96 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week'
+
+export default {
+	name: 'LvPlanLehrveranstaltung',
+	components: {
+		FhcCalendar
+	},
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
+	data() {
+		return {
+			lv: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		currentLv() {
+			if (isNaN(parseInt(this.propsViewData?.lv_id)))
+				return null;
+			return this.propsViewData.lv_id;
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+			
+			this.$router.push({
+				name: "LvPlan",
+				params: {
+					mode,
+					focus_date,
+					lv_id: this.currentLv
+				}
+			});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsLv(this.propsViewData.lv_id, start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		}
+	},
+	created() {
+		if (this.currentLv === null)
+			return;
+		this.$api
+			.call(ApiLvPlan.getLv(this.propsViewData?.lv_id))
+			.then(res => {
+				this.lv = res.data;
+			});
+	},
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
+			{{ $p.t('lehre/stundenplan') }}
+			<span v-if="lv" class="ps-3">
+				{{ $p.user_language.value === 'German' ? lv.bezeichnung : lv.bezeichnung_english }}
+			</span>
+		</h2>
+		<hr>
+		<div v-if="currentLv === null || lv === false">
+			{{ $p.t('lehre/noLvFound') }}
+		</div>
+		<fhc-calendar
+			v-else-if="lv"
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			class="responsive-calendar"
+		/>
+	</div>`
+};
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
new file mode 100644
index 000000000..5c4be5c23
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -0,0 +1,143 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week'
+
+export default {
+	name: 'LvPlanPersonal',
+	components: {
+		FhcCalendar
+	},
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
+	data() {
+		return {
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+			
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=student'
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+			
+			this.$router.push({
+				name: "MyLvPlan",
+				params: {
+					mode,
+					focus_date
+				}
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsPersonal(start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiAuthinfo.getAuthUID())
+			.then(res => {
+				this.uid = res.data.uid;
+			});
+	},
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
+			{{ $p.t('lehre/stundenplan') }}
+			<span v-if="studiensemester_kurzbz" class="ps-3">
+				{{ studiensemester_kurzbz }}
+			</span>
+		</h2>
+		<hr>
+		<fhc-calendar
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			class="responsive-calendar"
+		>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+			>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
+				</div>
+			</div>
+		</fhc-calendar>
+	</div>`
+};

From db30fa0d9683746845546136b46fe619b19a3110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:42:00 +0200
Subject: [PATCH 0604/1357] Sorting Akte Results if creation date is the same

---
 application/models/crm/Akte_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 601019d3a..b945f414a 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -298,6 +298,7 @@ class Akte_model extends DB_Model
 			$this->db->where('person_id', $person_id);
 
 		$this->addOrder('erstelltam', 'DESC');
+		$this->addOrder('akte_id', 'DESC');
 
 		return $this->loadWhere([
 			'archiv' => true

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

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

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

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

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index f9c884782..ec92539db 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -63,8 +63,12 @@ export default {
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
 				]
-			},
-			tabulatorOptions: {
+			}
+		};
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 						ApiStvArchiv.getArchiv(

From c728f60ec5161253171c2c4fff331ae66a614c65 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:28:18 +0200
Subject: [PATCH 0607/1357] fix cherry picked Archiv.js

---
 .../Stv/Studentenverwaltung/Details/Archiv.js | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index ec92539db..632a14088 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -71,11 +71,14 @@ export default {
 			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-						ApiStvArchiv.getArchiv(
-							this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
-						)
-					),
+					ApiStvArchiv.getArchiv(
+						this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
+					)
+				),
 				ajaxResponse: (url, params, response) => response.data,
+				layout:"fitDataTable",
+				index: 'akte_id',
+				persistenceID: 'stv-details-archiv',
 				columns: [
 					{title: "Akte Id", field: "akte_id", visible: false},
 					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
@@ -147,8 +150,8 @@ export default {
 								evt.stopPropagation();
 								this.$fhcAlert
 									.confirmDelete()
-									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz : this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-									.then(params => this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz)))
+									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+									.then(this.$fhcApi.factory.stv.archiv.delete)
 									.then(() => {
 										//cell.getRow().delete();
 										this.reload();
@@ -163,22 +166,22 @@ export default {
 						maxWidth: 150,
 						frozen: true
 					}
-				],
-				layout:"fitDataTable",
-				index: 'akte_id',
-				persistenceID: 'stv-details-archiv'
-			},
-			tabulatorEvents: [
+				]
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: "rowDblClick",
 					handler: (e, row) => {
 						this.actionDownload(row.getData().akte_id);
 					}
 				}
-			]
-		};
-	},
-	computed: {
+			];
+
+			return events;
+		}
 	},
 	watch: {
 		modelValue() {

From 70274eef3a3098a69c45f1b2430cb705bb606e36 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:33:25 +0200
Subject: [PATCH 0608/1357] remove console.log

---
 public/js/api/factory/stv/archiv.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/api/factory/stv/archiv.js b/public/js/api/factory/stv/archiv.js
index 4205a5ecc..ca8f25116 100644
--- a/public/js/api/factory/stv/archiv.js
+++ b/public/js/api/factory/stv/archiv.js
@@ -1,6 +1,5 @@
 export default {
 	getArchiv(person_id) {
-		console.log(person_id);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/stv/archiv/getArchiv',

From 41a46aa7b28c0aea2019732e24048fbc80ec2ac6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:59:07 +0200
Subject: [PATCH 0609/1357] add component name, cssclass name, replace old
 delete api call with new one

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 632a14088..3eca6d47e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -5,6 +5,7 @@ import AkteEdit from "./Archiv/Edit.js";
 import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
 
 export default {
+	name: 'Archiv',
 	components: {
 		CoreFilterCmpt,
 		FormInput,
@@ -151,7 +152,9 @@ export default {
 								this.$fhcAlert
 									.confirmDelete()
 									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-									.then(this.$fhcApi.factory.stv.archiv.delete)
+									.then((params) => {
+										return this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz))
+									})
 									.then(() => {
 										//cell.getRow().delete();
 										this.reload();
@@ -256,7 +259,7 @@ export default {
 
 	},
 	template: `
-	<div class="stv-details-konto h-100 d-flex flex-column">
+	<div class="stv-details-archiv h-100 d-flex flex-column">
 		<core-filter-cmpt
 			ref="table"
 			table-only

From 133e1f08f63e7760964cabed4b7e9554081f8326 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 12:20:29 +0200
Subject: [PATCH 0610/1357] use currentSemester instead of defaultSemester

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 3eca6d47e..7a156965f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -12,8 +12,8 @@ export default {
 		AkteEdit
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester'
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	props: {
@@ -217,7 +217,7 @@ export default {
 					archiveFunction({
 						xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
 						xsl: this.selectedVorlage.vorlage_kurzbz,
-						ss: this.defaultSemester,
+						ss: this.currentSemester,
 						uid: archiveData.uid,
 						prestudent_id: archiveData.prestudent_id
 					})

From e241b586a8b6f69164f9c24f7ec3ebd7c8365b47 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 13:28:15 +0200
Subject: [PATCH 0611/1357] use currentSemester instead of defaultSemester
 because of vuerouter

---
 .../components/Stv/Studentenverwaltung/Details/Konto/New.js | 6 +++---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 3 ---
 .../Stv/Studentenverwaltung/Details/Status/Modal.js         | 6 +++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 313d34c67..cdb32de99 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -17,8 +17,8 @@ export default {
 		lists: {
 			from: 'lists'
 		},
-		defaultSemester: {
-			from: 'defaultSemester'
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	props: {
@@ -89,7 +89,7 @@ export default {
 				buchungsdatum: new Date(),
 				buchungstext: '',
 				mahnspanne: 30,
-				studiensemester_kurzbz: this.defaultSemester,
+				studiensemester_kurzbz: this.currentSemester,
 				credit_points: null,
 				anmerkung: ''
 			};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 15664665f..593914916 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -16,9 +16,6 @@ export default{
 		StatusDropdown
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester',
-		},
 		hasPermissionToSkipStatusCheck: {
 			from: 'hasPermissionToSkipStatusCheck',
 			default: false
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index c0ec2cfad..edbd3b6ea 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -13,8 +13,8 @@ export default{
 		FormInput
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester',
+		currentSemester: {
+			from: 'currentSemester',
 		},
 		hasPermissionToSkipStatusCheck: {
 			from: 'hasPermissionToSkipStatusCheck',
@@ -106,7 +106,7 @@ export default{
 				this.statusId = prestudent.prestudent_id;
 				this.formData = {
 					status_kurzbz: 'Interessent',
-					studiensemester_kurzbz: this.defaultSemester,
+					studiensemester_kurzbz: this.currentSemester,
 					ausbildungssemester: 1,
 					datum: new Date(),
 					bestaetigtam: new Date(),

From aded9067e56971f9262294e11dae49073597bf04 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:37:36 +0200
Subject: [PATCH 0612/1357] remove id-attribute from calendar renderer
 templates

---
 public/css/Cis4/CoreCalendarEvents.css        |  60 ++++----
 .../Cis/Renderer/Feiertage/calendarEvent.js   |   8 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 129 +++++++++++-------
 .../Renderer/Reservierungen/calendarEvent.js  |  95 ++++++++++---
 4 files changed, 189 insertions(+), 103 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index df451ebf1..3941872ef 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -4,96 +4,96 @@
 	height: 100%;
 }
 
-/* Feiertag */
-.feiertagEventContent {
+/* Feiertage */
+.cis-renderer-feiertage-calendar-event {
 	align-items: center;
 	color: var(--fhc-light);
 }
-.monthPageContainer .feiertagEventContent,
-.weekPageContainer .feiertagEventContent,
-.dayPageContainer .feiertagEventContent {
+.monthPageContainer .cis-renderer-feiertage-calendar-event,
+.weekPageContainer .cis-renderer-feiertage-calendar-event,
+.dayPageContainer .cis-renderer-feiertage-calendar-event {
 	display: grid;
 	grid-template-columns: auto 1fr;
 	justify-items: center;
 }
-.listPageContainer .feiertagEventContent {
+.listPageContainer .cis-renderer-feiertage-calendar-event {
 	display: flex;
 	justify-content: center;
 }
 
-.monthPageContainer .feiertagEventContent #ferienEventIcon {
+.monthPageContainer .cis-renderer-feiertage-calendar-event .event-icon {
 	margin: 0 .5rem;
 }
-.weekPageContainer .feiertagEventContent #ferienEventIcon,
-.dayPageContainer .feiertagEventContent #ferienEventIcon,
-.listPageContainer .feiertagEventContent #ferienEventIcon {
+.weekPageContainer .cis-renderer-feiertage-calendar-event .event-icon,
+.dayPageContainer .cis-renderer-feiertage-calendar-event .event-icon,
+.listPageContainer .cis-renderer-feiertage-calendar-event .event-icon {
 	margin: .5rem;
 }
 
-.listPageContainer .feiertagEventContent #ferienEventTitle {
+.listPageContainer .cis-renderer-feiertage-calendar-event .event-title {
 	flex-grow: 1;
 }
 
 /* Lehreinheit */
-.monthPageContainer .lehreinheitEventContent {
+/* Reservierungen */
+.monthPageContainer .calendar-event-default {
 	padding: 0!important;
 }
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
-.monthPageContainer .lehreinheitEventContent #lehreinheitLektoren,
-.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+.monthPageContainer .calendar-event-default .event-time,
+.monthPageContainer .calendar-event-default .event-lectors {
 	display: none!important;
 }
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.monthPageContainer .calendar-event-default .event-text {
 	display: flex;
 	justify-content: space-evenly;
 	align-items: center;
 }
-.weekPageContainer .lehreinheitEventContent {
+.weekPageContainer .calendar-event-default {
 	display: grid;
 	grid-template-columns: auto 1fr;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.weekPageContainer .calendar-event-default .event-time {
 	border-inline-end: solid 1px var(--bs-secondary);
 	align-self: stretch;
 	align-content: center;
 	padding: .25em .5em .25em .25em;
 	margin-inline-end: .25rem;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.weekPageContainer .calendar-event-default .event-text {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-evenly;
 	align-items: center;
 }
-.dayPageContainer .lehreinheitEventContent,
-.listPageContainer .lehreinheitEventContent {
+.dayPageContainer .calendar-event-default,
+.listPageContainer .calendar-event-default {
 	display: flex;
 	align-items: center;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
-.listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.dayPageContainer .calendar-event-default .event-time,
+.listPageContainer .calendar-event-default .event-time {
 	align-content: center;
 	padding-inline-end: .5em;
 	border-inline-end: solid 1px;
 	margin-inline-end: .5em;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText,
-.listPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.dayPageContainer .calendar-event-default .event-text,
+.listPageContainer .calendar-event-default .event-text {
 	flex: 1 1 auto;
 	display: flex;
 	flex-wrap: wrap;
 	gap: .25em;
 	justify-content: center;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitTopic,
-.dayPageContainer .lehreinheitEventContent #lehreinheitOrt,
-.listPageContainer .lehreinheitEventContent #lehreinheitTopic,
-.listPageContainer .lehreinheitEventContent #lehreinheitOrt {
+.dayPageContainer .calendar-event-default .event-topic,
+.dayPageContainer .calendar-event-default .event-place,
+.listPageContainer .calendar-event-default .event-topic,
+.listPageContainer .calendar-event-default .event-place {
 	flex: 0 0 100%;
 	text-align: center;
 }
 
-.fhc-roominformation .lehreinheitEventContent #lehreinheitOrt {
+.fhc-roominformation .calendar-event-default .event-place {
 	display: none;
 }
 
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index ffc164117..d226e935a 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -7,8 +7,8 @@ export default {
 		},
 	},
 	template: `
-		<div class="feiertagEventContent " >
-			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
-			<span id="ferienEventTitle" class="fw-bold text-center">{{event.titel}}</span>
-		</div>`,
+	<div class="cis-renderer-feiertage-calendar-event">
+		<i class="event-icon" class="fa-regular fa-calendar"></i>
+		<span class="event-title fw-bold text-center">{{ event.titel }}</span>
+	</div>`,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index a334ea4d4..ca8d470e2 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -1,59 +1,92 @@
 export default {
-	methods:{
-		convertTime: function ([hour, minute]) {
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
-
-		},
-	},
-	computed:{
-		calendarEventTooltip: function(){
-			let lektorenEmpty = true;
-			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
-			
-			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
-			tooltipString += `${this.$p.t('person', 'ort')}: ${this.event.ort_kurzbz}`;
-			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
-				lektorenEmpty = false;
-				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
-				this.event.lektor.slice(0,3).forEach(lektor => {
-					tooltipString += `${lektor.kurzbz}\n`;
-				})
-				if(this.event.lektor.length > 3){
-					tooltipString += `${this.$p.t('lehre', 'weitereLektoren', [(this.event.lektor.length - 3)])}\n`;
-				}
-			}
-			if(lektorenEmpty){
-				tooltipString += "\n";	
-			}
-			
-			
-			return tooltipString;
-		},
-	},
 	props:{
 		event: {
-			type:Object,
-			required:true,
+			type: Object,
+			required: true
+		}
+	},
+	computed:{
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+
+			this.event.lektor = [
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+			];
+			
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {console.log(this.event.lektor);
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+			
+			return tooltipArray.join("\n");
 		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
 	},
 	template: /*html*/`
-	<div class="lehreinheitEventContent h-100 w-100 p-1" @wheel.stop >
-		<div id="lehreinheitEventHeader" class="d-none d-xl-grid h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span >{{convertTime(event.beginn.split(":"))}}</span>
-			<span >{{convertTime(event.ende.split(":"))}}</span>
+	<div
+		class="cis-renderer-lehreinheit-calendar-event calendar-event-default h-100 w-100 p-1"
+		@wheel.stop
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-none d-xl-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
 		</div>
-		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
-			<span id="lehreinheitTopic">{{event.topic}}</span>
-			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
-			<span id="lehreinheitLektoren" v-for="(lektor,index) in event.lektor.slice(0,3)">
-				{{lektor.kurzbz}}
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
+			<span
+				v-for="(lektor,index) in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
 			</span>
-			<span id="lektorEllipsis" class="fw-bold" v-if="event.lektor.length > 3">...+ 
-		 	{{event.lektor.length-3}}</span>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
index c6b8054c2..2447c4f61 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
@@ -1,30 +1,83 @@
 export default {
-	methods: {
-		convertTime: function ([hour, minute]) {
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
-
-		},
-	},
 	props: {
 		event: {
 			type: Object,
-			required: true,
-		},
+			required: true
+		}
 	},
-	template: `
-	<div class="lehreinheitEventContent h-100 w-100 p-1" >
-		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	computed: {
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+			
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+			
+			return tooltipArray.join("\n");
+		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: /* html */`
+	<div
+		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1"
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
 		</div>
-		<div id="lehreinheitEventText">
-			<span>{{event.topic}}</span>
-			<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-			<span>{{event.ort_kurzbz}}</span>
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span
+				v-for="lektor in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
+			</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
 		</div>
 	</div>
 	`,

From 6391e58f7466ef5c947061c4ecbc7e7b56fcac95 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:37:57 +0200
Subject: [PATCH 0613/1357] Bugfix: negation of instanceof

---
 .../js/components/Cis/Renderer/Reservierungen/modalContent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 66428e37f..0d6c62672 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -34,7 +34,7 @@ export default {
 		start_time: function () {
 			if (!this.event.beginn)
 				return 'N/A';
-			if (!this.event.beginn instanceof Date) {
+			if (!(this.event.beginn instanceof Date)) {
 				return this.event.beginn;
 			}
 			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
@@ -42,7 +42,7 @@ export default {
 		end_time: function () {
 			if (!this.event.ende)
 				return 'N/A';
-			if (!this.event.ende instanceof Date) {
+			if (!(this.event.ende instanceof Date)) {
 				return this.event.ende;
 			}
 			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());

From 603622a3f19aaa45b86c487ce49f1348dabf931e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:38:59 +0200
Subject: [PATCH 0614/1357] LvPlan use computed for lv title

---
 .../js/components/Cis/LvPlan/Lehrveranstaltung.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 70773dce6..4364a5df4 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -34,6 +34,17 @@ export default {
 			if (isNaN(parseInt(this.propsViewData?.lv_id)))
 				return null;
 			return this.propsViewData.lv_id;
+		},
+		lvTitle() {
+			if (this.currentLv === null)
+				return '';
+			if (!this.lv)
+				return '';
+
+			if (this.$p.user_language.value === 'English')
+				return this.lv.bezeichnung_english;
+
+			return this.lv.bezeichnung;
 		}
 	},
 	methods: {
@@ -73,8 +84,8 @@ export default {
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
 		<h2>
 			{{ $p.t('lehre/stundenplan') }}
-			<span v-if="lv" class="ps-3">
-				{{ $p.user_language.value === 'German' ? lv.bezeichnung : lv.bezeichnung_english }}
+			<span v-if="lvTitle" class="ps-3">
+				{{ lvTitle }}
 			</span>
 		</h2>
 		<hr>

From 9de0a41035a8dbf61ddf96aab20fdba0d21b6db9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 18:36:07 +0200
Subject: [PATCH 0615/1357] move Theme plugin to plugins folder

---
 public/js/apps/Cis.js                  | 2 +-
 public/js/apps/Dashboard/Fhc.js        | 2 +-
 public/js/{plugin => plugins}/Theme.js | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename public/js/{plugin => plugins}/Theme.js (100%)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 6a5418c96..73703b42b 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -2,7 +2,7 @@ import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
 import PluginsPhrasen from '../plugins/Phrasen.js';
 import ApiSearchbar from '../api/factory/searchbar.js';
-import Theme from "../plugin/Theme.js";
+import Theme from "../plugins/Theme.js";
 
 const app = Vue.createApp({
     name: 'CisApp',
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b3ffa4315..473e1cf67 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,6 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import PluginsPhrasen from '../../plugins/Phrasen.js';
-import Theme from '../../plugin/Theme.js';
+import Theme from '../../plugins/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
diff --git a/public/js/plugin/Theme.js b/public/js/plugins/Theme.js
similarity index 100%
rename from public/js/plugin/Theme.js
rename to public/js/plugins/Theme.js

From 49ddf568e101f9c7d89a571a5e6bd6ada3ed3d1f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 6 Aug 2025 08:46:02 +0200
Subject: [PATCH 0616/1357] filter component: keep column visibility on reload

---
 public/js/components/filter/Filter.js | 58 ++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index fc4ed81c5..07f88cccc 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -91,7 +91,6 @@ export const CoreFilterCmpt = {
 			dataset: null,
 			datasetMetadata: null,
 			selectedFields: null,
-			notSelectedFields: null,
 			filterFields: null,
 
 			availableFilters: null,
@@ -103,6 +102,8 @@ export const CoreFilterCmpt = {
 			fetchCmptApiFunctionParams: null,
 			fetchCmptDataFetched: null,
 
+			fetchResult: null,
+
 			tabulator: null,
 			tableBuilt: false,
 			tabulatorHasSelector: false,
@@ -118,6 +119,11 @@ export const CoreFilterCmpt = {
 		};
 	},
 	computed: {
+		notSelectedFields() {
+			if (!this.fields || !this.selectedFields)
+				return null;
+			return this.fields.filter(x => this.selectedFields.indexOf(x) === -1)
+		},
 		filteredData() {
 			if (!this.dataset)
 				return [];
@@ -215,6 +221,32 @@ export const CoreFilterCmpt = {
 				await this.$p.loadCategory('ui');
 				placeholder = this.$p.t('ui/keineDatenVorhanden');
 			}
+
+			if (!this.tableOnly) {
+				// prefetch data to get fields & selectedFields for filteredColumns & filteredData
+				await new Promise(resolve => {
+					const filterId = window.location.hash ? window.location.hash.slice(1) : null;
+
+					const resolvePromiseFunc = data => {
+						this.setRenderData(data);
+						resolve();
+					};
+					// get the filter data
+					if (filterId === null)
+						this.startFetchCmpt(
+							wsParams => this.$api.call(ApiFilter.getFilter(wsParams)),
+							null,
+							resolvePromiseFunc
+						);
+					else
+						this.startFetchCmpt(
+							wsParams => this.$api.call(ApiFilter.getFilterById(wsParams)),
+							{ filterId },
+							resolvePromiseFunc
+						);
+				});
+			}
+
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
 					layout: "fitDataStretchFrozen",
@@ -236,6 +268,11 @@ export const CoreFilterCmpt = {
 			if (!this.tableOnly) {
 				tabulatorOptions.data = this.filteredData;
 				tabulatorOptions.columns = this.filteredColumns;
+			} else {
+				tabulatorOptions.columns.forEach(col => {
+					if (col.visible === undefined)
+						col.visible = true;
+				});
 			}
 
 			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
@@ -355,18 +392,14 @@ export const CoreFilterCmpt = {
 					this.render
 				);
 		},
-		/**
-		 *
-		 */
-		render(response) {
-			let data = response;
+		setRenderData(data) {
+			this.fetchResult = data;
 			this.filterName = data.filterName;
 			this.dataset = data.dataset;
 			this.datasetMetadata = data.datasetMetadata;
 
 			this.fields = data.fields;
 			this.selectedFields = data.selectedFields;
-			this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
 			this.filterFields = [];
 
 			for (let i = 0; i < data.datasetMetadata.length; i++)
@@ -383,6 +416,14 @@ export const CoreFilterCmpt = {
 					}
 				}
 			}
+		},
+		/**
+		 *
+		 */
+		render(response) {
+			let data = response;
+
+			this.setRenderData(data);
 
 			// If the side menu is active
 			if (this.sideMenu === true)
@@ -623,11 +664,10 @@ export const CoreFilterCmpt = {
 		this.$emit('uuidDefined', this.uuid)
 	},
 	mounted() {
-
 		this.initTabulator().then(() => {
 			if (!this.tableOnly) {
 				this.selectedFilter = window.location.hash ? window.location.hash.slice(1) : null;
-				this.getFilter(); // get the filter data
+				this.render(this.fetchResult);
 			}
 		});
 

From 0605baf68f5bc9fef210b8827f8b95f8c51707cc Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 6 Aug 2025 10:45:37 +0200
Subject: [PATCH 0617/1357] capitalize tab phrases; style&phrase change for
 Attendance Check Date Datepicker; Picture col min width icrease so the title
 is readable in english;

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 034e4aca5..01e4fcdfe 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31767,7 +31767,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'kontrolldatum',
+		'phrase' => 'kontrolldatumV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -31778,7 +31778,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Attendance Check Date',
+				'text' => 'Check Date',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 42a40072fa0eb741a767b3fb00dc9b3f272d7e46 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 6 Aug 2025 10:55:58 +0200
Subject: [PATCH 0618/1357] show all errors in one alert

- refactor Dropdown.js: use new factory for overwriting errors
- move functionaliy to show Errors and InfoAlerts to Api.js
- extend FhcAlert (primeVue) with slot for toast for ability to use html
---
 .../api/frontend/v1/stv/Status.php            |  7 +-
 .../Details/Status/Dropdown.js                | 49 +++++-------
 public/js/plugins/Api.js                      | 76 ++++++++++++++++++-
 public/js/plugins/FhcAlert.js                 | 19 +++--
 4 files changed, 110 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index fcc8007cd..7e649f3cf 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -24,7 +24,6 @@ class Status extends FHCAPI_Controller
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
 			'advanceStatus' => ['admin:rw', 'assistenz:rw'],
 			'confirmStatus' => ['admin:rw', 'assistenz:rw'],
-
 		]);
 
 		//Load Models
@@ -435,9 +434,10 @@ class Status extends FHCAPI_Controller
 		]);
 
 		if (!$this->form_validation->run())
+		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
 
-		
 		$this->load->library('PrestudentLib');
 
 		$this->db->trans_start();
@@ -623,8 +623,9 @@ class Status extends FHCAPI_Controller
 		]);
 
 		if (!$this->form_validation->run())
+		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
+		}
 
 		// Start DB transaction
 		$this->db->trans_start();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index ab8f83fab..cff6b2be6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -142,14 +142,15 @@ export default {
 			this.addStudent({status_kurzbz: 'student', statusgrund_id});
 		},
 		addStudent(data) {
-			Promise
-				.allSettled(
-					this.prestudentIds.map(prestudent_id => this.$api.call(
-						ApiStvStatus.addStudent(prestudent_id, data),
-						{ errorHeader: prestudent_id }
-					))
-				)
-				.then(res => this.showFeedback(res, data.status_kurzbz));
+			this.$api.call(this.prestudentIds.map(prestudent_id => [
+				prestudent_id,
+				ApiStvStatus.addStudent(prestudent_id, data),
+				{ errorHeader: prestudent_id }
+			]))
+			.then(() => {
+				this.$emit('reloadTable');
+				this.$reloadList();
+			});
 		},
 		changeStatusToAbbrecher(statusgrund_id) {
 			this
@@ -242,31 +243,15 @@ export default {
 			return askForSemester();
 		},
 		changeStatus(data) {
-			Promise
-				.allSettled(
-					this.prestudentIds.map(prestudent_id => this.$api.call(
-						ApiStvStatus.changeStatus(prestudent_id, data),
-						{ errorHeader: prestudent_id }
-					))
-				)
-				.then(res => this.showFeedback(res, data.status_kurzbz));
-		},
-		showFeedback(results, status_kurzbz) {
-			const countSuccess = results.filter(result => result.status == "fulfilled").length;
-			const countError = results.length - countSuccess;
-			
-			//Feedback Success als infoalert
-			this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-				countSuccess,
-				status: status_kurzbz,
-				countError
-			}));
-
-			if(results.length == 1 && countSuccess > 0){
+			this.$api.call(this.prestudentIds.map(prestudent_id => [
+				prestudent_id,
+				ApiStvStatus.changeStatus(prestudent_id, data)
+			]))
+			.then(() => {
 				this.$emit('reloadTable');
-			}
-			this.$reloadList();
-		}
+				this.$reloadList();
+			});
+		},
 	},
 	created() {
 		this.$api
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index d0ffaa439..47139b79f 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -42,10 +42,13 @@ export default {
 		}
 
 		function _clean_return_value(response) {
+			if (typeof response.data === 'string' || response.data instanceof String)
+				return _clean_return_value({ data: response });
+
 			const result = response.data;
 			delete response.data;
 			if (!result.meta)
-				result.meta = {response};
+				result.meta = { response };
 			else
 				result.meta.response = response;
 			return result;
@@ -159,6 +162,77 @@ export default {
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
+				if (Array.isArray(factory)) {
+					const $fhcAlert = app.config.globalProperties.$fhcAlert;
+					const $api = app.config.globalProperties.$api;
+
+					Promise
+						.allSettled(factory.map((config, index) => {
+							if (Array.isArray(config))
+								return $api.call(config[1], {
+									errorHeader: config[0],
+									errorHandling: false
+								});
+							else
+								return $api.call(config, {
+									errorHeader: '#' + index,
+									errorHandling: false
+								});
+						}))
+						.then(res => {
+							// TODO(chris): obey form & configoverwrite
+							let messagesError = [];
+							let messagesSuccessful = [];
+
+							res.forEach(result => {
+								if (result.status === 'fulfilled') {
+									//console.log(JSON.parse(result.value.data));
+									const successTitle = "<dt>" + result.value.data + "</dt>";
+									messagesSuccessful.push(successTitle + "ok");
+								} else {
+									const errorTitle = "<dt>" + result.reason.config.errorHeader + "</dt>";
+									const errorMsg = JSON.parse(result.reason.request.response);
+									const fullMessage = errorMsg.errors.map(error => {
+										if (error.type == 'validation') {
+											// TODO(chris): do we want the keys?
+											return '<dd>' + Object.values(error.messages).join("</dd><dd>") + '</dd>';
+										}
+										// TODO(chris): other types
+										if (error.message)
+											return '<dd>' + error.message + '</dd>';
+										if (error.messages)
+											return '<dd>' + error.messages.join("\n") + '</dd>';
+										// TODO(chris): what to do here
+										return '<dd>' + "Generic Error" + '</dd>'; // TODO(chris): translate
+									}).join("\n");
+									messagesError.push(errorTitle + fullMessage);
+								}
+							});
+
+							if (messagesError.length)
+							{
+								const test = document.createElement('b');
+								$fhcAlert.alertDefault(
+									'error',
+									messagesError.length + " Fehler", // TODO(chris): translate
+									'<dl>' + messagesError.join("") + '</dl>',
+									true,
+									true
+								);
+							}
+							if (messagesSuccessful.length)
+							{
+								const test = document.createElement('b');
+								$fhcAlert.alertDefault(
+									'info',
+									'Feedback',
+								messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
+									false,
+									true
+								);
+							}
+						});
+				}
 				let {method, url, params, config} = factory;
 				if (configoverwrite !== undefined) {
 					config = configoverwrite;
diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index f90b61ac2..5d84b1de9 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -140,7 +140,16 @@ const helperApp = Vue.createApp({
 		}
 	},
 	template: /* html */`
-	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
+	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999">
+		<template #message="{ message }">
+			<!--span :class="slotProps.iconClass"></span-->
+			<div class="p-toast-message-text">
+				<span class="p-toast-summary">{{ message.summary }}</span>
+				<div v-if="message.detail && message.html" class="p-toast-detail" v-html="message.detail"></div>
+				<div v-else-if="message.detail" class="p-toast-detail">{{ message.detail }}</div>
+			</div>
+		</template>
+	</pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
 		<template #message="slotProps">
 			<i class="fa fa-circle-exclamation fa-2xl mt-3"></i>
@@ -263,18 +272,18 @@ export default {
 					});
 				});
 			},
-			alertDefault(severity, title, message, sticky = false) {
-				let options = { severity: severity, summary: title, detail: message};
+			alertDefault(severity, title, message, sticky = false, html = false) {
+				let options = { severity: severity, summary: title, detail: message, html };
 				
 				if (!sticky)
 					options.life = 3000;
 
 				helperAppInstance.$refs.toast.add(options);
 			},
-			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
+			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false, html = false){
 				// Check, if array has only string values
 				if (messageArray.every(message => typeof message === 'string')) {
-					messageArray.forEach(message => this.alertDefault(severity, title, message, sticky));
+					messageArray.forEach(message => this.alertDefault(severity, title, message, sticky, html));
 					return true;
 				}
 				return false;

From c96db9f57337a7c621cfd0d7bdb1fbfda15dfcbe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:06:57 +0200
Subject: [PATCH 0619/1357] reworked StV favorites (only 1st tier version)

---
 .../api/frontend/v1/stv/Favorites.php         |  13 +-
 .../Stv/Studentenverwaltung/Verband.js        | 162 +++++++++---------
 system/phrasesupdate.php                      |  20 +++
 3 files changed, 110 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index b8fe6f3d7..ca8b62da6 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -35,8 +35,6 @@ class Favorites extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('system/Variable_model', 'VariableModel');
-
-		// TODO(chris): variable table might be to small to store favorites!
 	}
 
 	public function index()
@@ -62,6 +60,17 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
+		$removed = [];
+		while (strlen($favorites) > 64) {
+			$favObj = json_decode($favorites);
+			if (!$favObj->list)
+				break;
+			$removed[] = array_shift($favObj->list);
+			$favorites = json_encode($favObj);
+		}
+		if ($removed)
+			$this->addMeta('removed', $removed);
+
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ae2b6b40..762d92858 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -1,17 +1,9 @@
-import {CoreRESTClient} from '../../../RESTClient.js';
-
-
-import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tree/tree.esm.min.js";
-import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
-import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
-
 import ApiStvVerband from '../../../api/factory/stv/verband.js';
 
 export default {
 	components: {
-		PvTree,
-		PvTreetable,
-		PvColumn
+		PvTreetable: primevue.treetable,
+		PvColumn: primevue.column
 	},
 	emits: [
 		'selectVerband'
@@ -22,14 +14,15 @@ export default {
 			nodes: [],
 			selectedKey: [],
 			filters: {}, // TODO(chris): filter only 1st level?
-			favnodes: [],
 			favorites: {on: false, list: []}
 		}
 	},
 	computed: {
 		filteredNodes() {
-			// TODO(chris): what to display actually?
-			return this.favorites.on ? this.favnodes : this.nodes;
+			if (this.favorites.on)
+				return this.nodes.filter(node => this.favorites.list.includes(node.key));
+			
+			return this.nodes;
 		}
 	},
 	methods: {
@@ -102,69 +95,49 @@ export default {
 			return cp;
 		},
 		async filterFav() {
-			if (!this.favorites.on && !this.favnodes.length && this.favorites.list.length) {
-				this.loading = true;
-				this.favnodes = await this.loadNodes(this.favorites.list);
-			}
 			this.favorites.on = !this.favorites.on;
 			this.$api
 				.call(ApiStvVerband.favorites.set(
 					JSON.stringify(this.favorites)
-				));
-			this.loading = false;
-		},
-		async loadNodes(links) {
-			let sortedInParents = links.reduce((o, link) => {
-				link = link + '';
-				let parent,
-					parts = link.split('/');
-				if (parts.length == 1) {
-					parent = '_';
-				} else {
-					parts.pop();
-					parent = parts.join('/');
-				}
-				if (!o[parent])
-					o[parent] = [link];
-				else
-					o[parent].push(link);
-				return o;
-			}, {});
-			
-			let promises = [];
-			for (let parent in sortedInParents)
-				promises.push(
-					this.$api
-						.call(ApiStvVerband.get(parent == '_' ? '' : parent))
-						.then(res => res.data)
-						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
-				);
-			
-			// NOTE(chris): merge the resulting arrays and transform them to an associative one
-			let result = [].concat.apply([], await Promise.all(promises)).reduce((o, node) => {
-				o[node.link + ''] = this.mapResultToTreeData({...node, leaf: true, children: undefined});
-				return o;
-			}, {});
-
-			return links.map(link => result[link]);
+				))
+				.then(result => {
+					if (result.meta?.removed) {
+						this.favorites.list = this.favorites.list
+							.filter(fav => !result.meta.removed.includes(fav));
+						const items = result.meta.removed.map(
+							rem => this.nodes.find(
+								node => node.data.link == rem
+							).label
+						).join(',\n');
+						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
+					}
+				});
 		},
 		async markFav(key) {
 			let index = this.favorites.list.indexOf(key.data.link + '');
 
 			if (index != -1) {
-				if (this.favnodes.length)
-					this.favnodes = this.favnodes.filter(node => node.data.link != key.data.link);
 				this.favorites.list.splice(index, 1);
 			} else {
-				if (this.favnodes.length || this.favorites.on)
-					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
 				this.favorites.list.push(key.data.link + '');
 			}
 			
 			this.$api
 				.call(ApiStvVerband.favorites.set(
 					JSON.stringify(this.favorites)
-				));
+				))
+				.then(result => {
+					if (result.meta?.removed) {
+						this.favorites.list = this.favorites.list
+							.filter(fav => !result.meta.removed.includes(fav));
+						const items = "\n" + result.meta.removed.map(
+							rem => this.nodes.find(
+								node => node.data.link == rem
+							).label
+						).join(",\n");
+						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
+					}
+				});
 		},
 		unsetFavFocus(e) {
 			if (e.target.dataset?.linkFavAdd !== undefined) {
@@ -187,7 +160,10 @@ export default {
 		this.$api
 			.call(ApiStvVerband.get())
 			.then(result => {
-				this.nodes = result.data.map(this.mapResultToTreeData);
+				this.nodes = result.data.map(el => {
+					el.root = true;
+					return this.mapResultToTreeData(el);
+				});
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
@@ -196,21 +172,12 @@ export default {
 			.call(ApiStvVerband.favorites.get())
 			.then(result => {
 				if (result.data) {
-					let f = JSON.parse(result.data);
-					if (f.on) {
-						this.loading = true;
-						this.favorites = f;
-						this.loadNodes(this.favorites.list).then(res => {
-							this.favnodes = res;
-							this.loading = false;
-						});
-					} else
-						this.favorites = f;
+					this.favorites = JSON.parse(result.data);
 				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="overflow-auto" tabindex="-1">
 		<pv-treetable
 			ref="tree"
@@ -225,35 +192,64 @@ export default {
 			@focusin="setFavFocus"
 			@focusout="unsetFavFocus"
 			:filters="filters"
+		>
+			<pv-column
+				field="name"
+				expander
+				class="text-break"
 			>
-			<pv-column field="name" expander>
 				<template #header>
 					<div class="text-right">
 						<div class="p-input-icon-left">
 							<i class="pi pi-search"></i>
-							<input type="text" v-model="filters['global']" class="form-control ps-5" placeholder="Search" />
+							<input
+								type="text"
+								v-model="filters['global']"
+								class="form-control ps-5"
+								placeholder="Search"
+							>
 						</div>
 					</div>
 				</template>
-				<template #body="{node}">
-					<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">
+				<template #body="{ node }">
+					<span
+						:data-tree-item-key="node.key"
+						:title="node.data.studiengang_kz"
+					>
 						{{node.data.name}}
 					</span>
 				</template>
 			</pv-column>
-			<pv-column field="fav" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
+			<pv-column
+				field="fav"
+				class="flex-shrink-0 flex-grow-0"
+				header-class="flex-shrink-0 flex-grow-0"
+			>
 				<template #header>
-					<a href="#" @click.prevent="filterFav"><i :class="favorites.on ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
-				</template>
-				<template #body="{node, column}">
 					<a
+						v-if="favorites.on || favorites.list.length"
+						href="#"
+						@click.prevent="filterFav"
+					>
+						<i
+							:class="favorites.on ? 'fa-solid' : 'fa-regular'"
+							class="fa-star"
+						></i>
+					</a>
+				</template>
+				<template #body="{ node }">
+					<a
+						v-if="node.data.root"
 						href="#"
-						@click.prevent="markFav(node)"
-						@keydown.enter.stop.prevent="markFav(node)"
 						tabindex="-1"
 						data-link-fav-add
-						>
-						<i :class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'" class="fa-star"></i>
+						@click.prevent="markFav(node)"
+						@keydown.enter.stop.prevent="markFav(node)"
+					>
+						<i
+							:class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'"
+							class="fa-star"
+						></i>
 					</a>
 				</template>
 			</pv-column>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b3af0d059..f653df2a1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -36650,6 +36650,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'warn_removed_favs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zu viele Favoriten! Die folgenden Einträge wurden entfernt: {items}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Too many favorites! The following entries were removed: {items}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From 8104d77399105f9bd365482127216c5779ff5d81 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:07:59 +0200
Subject: [PATCH 0620/1357] improve styling of deactivated lines in stv
 students list

---
 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 5de57bf77..965395556 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -111,7 +111,7 @@ export default {
 				],
 				rowFormatter(row) {
 					if (row.getData().bnaktiv === false) {
-						row.getElement().classList.add('text-muted');
+						row.getElement().classList.add('text-black','text-opacity-50','fst-italic');
 					}
 				},
 
@@ -362,4 +362,4 @@ export default {
 		</div>
 		<list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
 	</div>`
-};
\ No newline at end of file
+};

From 9ad2198b02a09a9fd2253cdb79a59328806f1555 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:14:37 +0200
Subject: [PATCH 0621/1357] update phrase Stundenplan => LV-Plan, Feiertag =>
 Ferien / Feiertag, Holiday => Holidays

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 37a305a94..4a3cfd7ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -216,13 +216,13 @@ $phrases = array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Feiertag',
+				'text' => 'Ferien / Feiertag',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Holiday',
+				'text' => 'Holidays',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -40857,7 +40857,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stundenplan',
+				'text' => 'LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 9e3ebca0a4c7de976a9eabb3f0db20fd59bf8d9d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:20:24 +0200
Subject: [PATCH 0622/1357] fix vue warning duplicate attribute class

---
 public/js/components/Cis/Renderer/Feiertage/calendarEvent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index d226e935a..79e3c8568 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -8,7 +8,7 @@ export default {
 	},
 	template: `
 	<div class="cis-renderer-feiertage-calendar-event">
-		<i class="event-icon" class="fa-regular fa-calendar"></i>
+		<i class="event-icon fa-regular fa-calendar"></i>
 		<span class="event-title fw-bold text-center">{{ event.titel }}</span>
 	</div>`,
 };
\ No newline at end of file

From 954cd16d100aeab58e4d49f8fcbeb6d69badfb94 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:21:12 +0200
Subject: [PATCH 0623/1357] use getAktOrNextSemester to determine preselected
 semester

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

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index fb4d3ce3c..d17f0c1a1 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -58,8 +58,8 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
-		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
-		
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester()));
+
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
 			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));

From 8048b9d9c35328a9027680d8ce76c8a0b6212971 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:30:57 +0200
Subject: [PATCH 0624/1357] use light text color in language selector

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

diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js
index b4db0315a..51dfa4669 100644
--- a/public/js/components/Cis/Sprachen.js
+++ b/public/js/components/Cis/Sprachen.js
@@ -23,7 +23,7 @@ export default {
 	template:/*html*/`
 	<div class="container">
 		<div class="row justify-content-center align-items-center flex-nowrap overflow-hidden">
-			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
+			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text-light sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
 		</div>
 	</div>
 	`,

From 4f2499862fa66f1c072eae451dbc66be3b9d6834 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:45:19 +0200
Subject: [PATCH 0625/1357] scale height of images in news widget

---
 public/css/components/dashboard/news.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 6b42f6160..4c4616aa5 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -103,7 +103,8 @@
 
 .widgets-news img
 {
-    max-width: 100%;
+	max-width: 100%;
+	height: auto;
 }
 
 .fhc-news-menu-item {

From 8494033bda777ba02cd258999f0c4143f36f9b95 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 13:35:47 +0200
Subject: [PATCH 0626/1357] CIS4 Dashboard: add workaround for chrome fireing
 event dragend when styles are manipulated during dragging

---
 public/js/components/Drop/Grid.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 31bdeb74e..74d67e49d 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -408,16 +408,19 @@ export default {
 			
 			this.draggedItem = item;
 			
-			this.$emit('draggedItem',item);
-			
-			this.draggedNode = evt.target.closest(".drop-grid-item");
-			//clones the widget for the drag Image
-			let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
-			
-			clone.style.zIndex = 5;
-			clone.classList.add("widgetClone");
-			this.$refs.container.appendChild(clone);
-			this.clonedWidget = clone;
+			this.$emit('draggedItem', item);
+			// workaround for chrome fireing event dragend when styles are manipulated during dragging
+			setTimeout(() => {
+				this.draggedNode = evt.target.closest(".drop-grid-item");
+				//clones the widget for the drag Image
+				let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
+
+				clone.style.zIndex = 5;
+				clone.classList.add("widgetClone");
+				this.$refs.container.appendChild(clone);
+				this.clonedWidget = clone;
+			}, 0);
+
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},

From d071d0d9febb0effe2d6f4dce0bf99d28f31de14 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 14:25:22 +0200
Subject: [PATCH 0627/1357] fix theme switch position in chrome based browsers

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

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index ee1b671e6..f073d5a38 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -117,7 +117,7 @@ export default {
     </button>
 	<fhc-searchbar ref="searchbar" id="nav-search" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
     <div id="nav-logo" class="d-none d-lg-block">
-		<div class="d-flex h-100">
+		<div class="d-flex h-100 justify-content-between">
 			<a :href="rootUrl">
 				<img :src="logoUrl" alt="Corporate Identity Logo">
 			</a>

From 73d269d54b2f8802d0907cf0c3c648b87834987a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 14:42:59 +0200
Subject: [PATCH 0628/1357] adapt media breakpoints for degree programs view

---
 public/css/Cis4/Studium.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/Cis4/Studium.css b/public/css/Cis4/Studium.css
index c0c58e1d0..cb249b5a4 100644
--- a/public/css/Cis4/Studium.css
+++ b/public/css/Cis4/Studium.css
@@ -3,13 +3,13 @@
 	gap: 1rem;
 }
 
-@media (min-width: 992px) {
+@media (min-width: 1440px) {
 	.lvUebersicht {
 		grid-template-columns: 1fr 1fr 1fr;
 	}
 }
 
-@media (max-width: 992px){
+@media (max-width: 1439px){
 	.lvUebersicht{
 		grid-template-columns: 1fr 1fr;
 	}
@@ -38,13 +38,13 @@
 
 }
 
-@media (min-width: 1200px) {
+@media (min-width: 1440px) {
 	.lvOptions {
 		grid-template-columns: 1fr 1fr 1fr 1fr;
 	}
 }
 
-@media (max-width: 1200px) {
+@media (max-width: 1439px) {
 	.lvOptions {
 		grid-template-columns: 1fr 1fr;
 	}

From b2d8b81ab5e5c25d96b46be6d0d42069dbde4be4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 7 Aug 2025 15:30:04 +0200
Subject: [PATCH 0629/1357] Changes for Tab Notes - change layout to classicFas
 to enable input note with one click less - extend Tab component: add
 headerSuffix - show count of messages in header

---
 application/config/stv.php                    |  4 ++
 .../api/frontend/v1/stv/Config.php            |  7 +-
 application/core/Notiz_Controller.php         | 17 +++++
 public/js/api/factory/notiz/person.js         |  6 ++
 public/js/components/Notiz/Notiz.js           | 33 ++++++++--
 .../Studentenverwaltung/Details/Notizen.js    | 39 ++++++-----
 public/js/components/Tabs.js                  | 66 +++++++++++++------
 7 files changed, 128 insertions(+), 44 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 1fdd5b28a..30181d651 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -57,6 +57,10 @@ $config['tabs'] =
 			//if true, Anrechnungen can be added and edited in tab Anrechnungen
 			'editableAnrechnungen' => false,
 		],
+		'notes' => [
+			//if true, the count of Messages will be shown in the header of the Tab Messages
+			'showCountNotes' => true
+		]
 	];
 	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index adf9f729e..935928c81 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -62,10 +62,15 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Details.js',
 			'config' => $config['details']
 		];
+
+		$showSuffix = $config['notes']['showCountNotes'] ?? false;
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
+			'config'	=> $config['notes'],
+			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false)
 		];
+
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 472ac7669..c2bb03267 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -21,6 +21,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			'loadDokumente' => self::DEFAULT_PERMISSION_R,
 			'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
 			'isBerechtigt' => self::DEFAULT_PERMISSION_R,
+			'getCountNotes' => self::DEFAULT_PERMISSION_R,
 		];
 		
 		if(!is_array($permissions))
@@ -459,4 +460,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
+	public function getCountNotes($person_id)
+	{
+		$this->NotizzuordnungModel->addSelect('COUNT(*) AS anzahl', false);
+
+		$result = $this->NotizzuordnungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$anzahl = current(getData($result));
+		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/person.js b/public/js/api/factory/notiz/person.js
index 33b572d1a..c75e79acf 100644
--- a/public/js/api/factory/notiz/person.js
+++ b/public/js/api/factory/notiz/person.js
@@ -83,5 +83,11 @@ export default {
 			method: 'get',
 			url: 'api/frontend/v1/notiz/notizPerson/isBerechtigt/'
 		};
+	},
+	getCountNotes(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizPerson/getCountNotes/' + person_id
+		};
 	}
 };
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 5a3944803..ab4230681 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -296,6 +296,7 @@ export default {
 				showId: false,
 				showLastupdate: false
 			},
+			newCount: null
 		}
 	},
 	methods: {
@@ -367,6 +368,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		deleteNotiz(notiz_id) {
@@ -381,6 +383,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		loadNotiz(notiz_id) {
@@ -424,6 +427,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		reload() {
@@ -464,7 +468,6 @@ export default {
 				});
 		},
 		initTinyMCE() {
-
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
@@ -503,15 +506,30 @@ export default {
 				this.showVariables[columnToShow] = true;
 			});
 		},
+		getCountNotes(){
+			return this.$api
+				.call(this.endpoint.getCountNotes(this.id))
+				.then(
+					result => {
+						this.newCount = result.data;
+						this.$nextTick(() => {
+							this.$emit('updateCount', this.newCount);
+						});
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	created() {
 		this.initializeShowVariables();
 		this.getUid();
 	},
 	async mounted() {
-		if(this.showTinyMce){
-			this.initTinyMCE();
+		if (this.showTinyMce) {
+			await this.initTinyMCE();
 		}
+		this.$nextTick(() => {
+			this.getCountNotes();
+		});
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
@@ -548,16 +566,17 @@ export default {
 			this.reload();
 		}
 	},
-	beforeDestroy() {
-		if(this.showTinyMce) {
-			this.editor.destroy();
+	beforeUnmount() {
+		if (this.editor && tinymce.get(this.editor.id)) {
+			tinymce.get(this.editor.id).remove();
+			this.editor = null;
 		}
 	},
 	template: `
 	<div class="core-notiz">
 	
 		<div v-if="notizLayout=='classicFas'">
-		
+
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index d5f9174d2..6d7033012 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -12,26 +12,35 @@ export default {
 	},
 	data() {
 		return {
-			endpoint: ApiNotizPerson
+			endpoint: ApiNotizPerson,
+			countNotiz: ''
 		};
 	},
+	methods: {
+		updateCountNotes(countNew){
+			this.headerSuffix = "(" +  countNew + ")";
+			this.$emit('update:suffix', this.headerSuffix);
+		}
+	},
 	template: `
 	<div class="stv-details-notizen h-100 pb-3">
-<!--	mit factory als endpoint	-->
-		<core-notiz
-			class="overflow-hidden"
-			:endpoint="endpoint"
-			ref="formc"
-			notiz-layout="popupModal"
-			type-id="person_id"
-			:id="modelValue.person_id"
-			show-document
-			show-tiny-mce
-			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
-			>
-		</core-notiz>
-		
 	
+
+<!--	Test Version classicFas for enter with one click vs popupModal-->
+	<core-notiz
+		class="overflow-hidden"
+		:endpoint="endpoint"
+		ref="formc"
+		notiz-layout="classicFas"
+		type-id="person_id"
+		:id="modelValue.person_id"
+		show-document
+		show-tiny-mce
+		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+		@updateCount="updateCountNotes"
+		>
+</core-notiz>
+
 <!--		
 ---------------------------------------------------------------------------------------------
 -------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 5c2a5a3d9..349fcf01c 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -14,7 +14,7 @@ export default {
 	emits: [
 		'update:modelValue',
 		'change',
-		'changed'
+		'changed',
 	],
 	props: {
 		config: {
@@ -40,7 +40,7 @@ export default {
 		currentTab() {
 			if (this.tabs[this.current])
 				return this.tabs[this.current];
-			
+
 			return { component: 'div' };
 		},
 		value: {
@@ -97,13 +97,19 @@ export default {
 				if (!item.component)
 					return console.error('Component missing for ' + key);
 
+				//making it reactive for showing headerSuffix
+				const value = Vue.reactive({
+					suffix: '',
+					showSuffix: item.showSuffix || false
+				});
+
 				tabs[key] = {
 					component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
 					key,
-					value: {}
-				}
+					value
+				};
 			}
 
 			if (Array.isArray(config))
@@ -118,6 +124,11 @@ export default {
 					this.current = Object.keys(tabs)[0];
 			}
 			this.tabs = tabs;
+		},
+		updateSuffix(event) {
+			if (this.currentTab?.value) {
+				this.currentTab.value.suffix = event;
+			}
 		}
 	},
 	created() {
@@ -126,28 +137,34 @@ export default {
 	template: `
 	<template v-if="useprimevue">
 
-	<tabview 
-		:scrollable="true" 
-		:lazy="true"
-		:activeIndex="calcActiveIndex"
-		@tab-click="handleTabClick"
-	>
-		<tabpanel 
-			v-for="tab in tabs" 
-			:key="tab.key" 
-			:header="tab.title"
+		<tabview 
+			:scrollable="true"
+			:lazy="true"
+			:activeIndex="calcActiveIndex"
+			@tab-click="handleTabClick"
 		>
-			<keep-alive>
-				<component :is="tab.component" v-model="value" :config="tab.config"></component>
-			</keep-alive>
-		</tabpanel>
-	</tabview>
+			<tabpanel
+				v-for="tab in tabs"
+				:key="tab.key"
+				:header="tab.title + (tab.value.showSuffix && tab.value.suffix ? tab.value.suffix : '')"
+			>
+				<keep-alive>
+					<component
+						:is="tab.component"
+						v-model="value"
+						:config="tab.config"
+						@update:suffix="updateSuffix($event)"
+						></component>
+				</keep-alive>
+			</tabpanel>
+		</tabview>
 
 	</template>
 	<template v-else="">
 
 	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch gap-3' : (border ? 'flex-column' : 'flex-column gap-3')" v-if="Object.keys(tabs).length">
 		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
+
 			<div
 				v-for="tab in tabs"
 				:key="tab.key"
@@ -157,15 +174,22 @@ export default {
 				:aria-current="tab.key == current ? 'page' : ''"
 				v-accessibility:tab.[vertical]
 				>
-				{{tab.title}}
+				{{tab.title}} <span v-if="tab.value.showSuffix && tab.value.suffix"> {{ tab.value.suffix }}</span>
 			</div>
 		</div>
 		<div :style="vertical ? '' : 'flex: 1 1 0%; height: 0%'" class="overflow-auto flex-grow-1" :class="vertical || !border ? '' : 'p-3 border-bottom border-start border-end'">
 			<keep-alive>
-				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
+				<component
+					ref="current"
+					:is="currentTab.component"
+					v-model="value"
+					:config="currentTab.config"
+					@update:suffix="updateSuffix($event)"
+					></component>
 			</keep-alive>
 		</div>
 	</div>
 
 	</template>`
 };
+

From 8c797fb212eca6e940a5c348cb8b259d71f38f94 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 15:34:23 +0200
Subject: [PATCH 0630/1357] Personal LVPlan: generate download links also for
 employees not only for students

---
 .../controllers/api/frontend/v1/AuthInfo.php  | 20 ++++++++++++++++++-
 public/js/api/authinfo.js                     |  7 ++++++-
 public/js/api/factory/authinfo.js             |  6 ++++++
 public/js/components/Cis/LvPlan/Personal.js   | 20 +++++++++++++++----
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/AuthInfo.php b/application/controllers/api/frontend/v1/AuthInfo.php
index 1362aee18..72f396b4f 100644
--- a/application/controllers/api/frontend/v1/AuthInfo.php
+++ b/application/controllers/api/frontend/v1/AuthInfo.php
@@ -20,6 +20,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class AuthInfo extends FHCAPI_Controller
 {
+	protected $uid;
+	protected $pid;
+	protected $isMitarbeiter;
+	protected $isStudent;
 
 	/**
 	 * Object initialization
@@ -28,10 +32,16 @@ class AuthInfo extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getAuthUID' => self::PERM_LOGGED,
+			'getAuthInfo' => self::PERM_LOGGED,
 		]);
 
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+		$this->isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($this->uid)) ?? false;
+		$this->isStudent = getData($this->StudentModel->isStudent($this->uid)) ?? false;
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -47,6 +57,14 @@ class AuthInfo extends FHCAPI_Controller
 		$this->terminateWithSuccess(['uid'=>$this->uid]);
 	}
 	
-	
+	public function getAuthInfo()
+	{
+		$data = (object) array(
+				'uid' => $this->uid,
+				'isMitarbeiter' => $this->isMitarbeiter,
+				'isStudent' => $this->isStudent
+		);
+		$this->terminateWithSuccess($data);
+	}
 }
 
diff --git a/public/js/api/authinfo.js b/public/js/api/authinfo.js
index 618cf2e26..cb79ac144 100644
--- a/public/js/api/authinfo.js
+++ b/public/js/api/authinfo.js
@@ -6,5 +6,10 @@ export default {
 			{ }
 		);
 	},
-	
+	getAuthInfo() {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/AuthInfo/getAuthInfo',
+			{}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/api/factory/authinfo.js b/public/js/api/factory/authinfo.js
index 5cf88604f..80cec2649 100644
--- a/public/js/api/factory/authinfo.js
+++ b/public/js/api/factory/authinfo.js
@@ -21,5 +21,11 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/AuthInfo/getAuthUID'
 		};
+	},
+	getAuthInfo() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/AuthInfo/getAuthInfo'
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
index 5c4be5c23..f6fd462da 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -19,7 +19,9 @@ export default {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false
 		};
 	},
 	computed:{
@@ -36,7 +38,15 @@ export default {
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
-			
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
 			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
@@ -47,7 +57,7 @@ export default {
 
 			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
 				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=student'
+				+ '?type=' + type
 				+ '&pers_uid=' + this.uid
 				+ '&begin=' + start
 				+ '&ende=' + ende;
@@ -96,9 +106,11 @@ export default {
 	},
 	created() {
 		this.$api
-			.call(ApiAuthinfo.getAuthUID())
+			.call(ApiAuthinfo.getAuthInfo())
 			.then(res => {
 				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
 			});
 	},
 	template: /*html*/`

From 04cce2af4cb03be8cda3ab2af81f2a9b60eb1c11 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 8 Aug 2025 12:26:39 +0200
Subject: [PATCH 0631/1357] CSS fix primevue box-sizing

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

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index fbbae4e58..8af7b8049 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -3973,6 +3973,9 @@
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
+.p-tabview-panel * {
+  box-sizing: initial;
+}
 
 .p-toolbar {
   background: #efefef;

From f6432cdcd05322ae500017dbd1ce56ded3d6548a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 8 Aug 2025 12:26:51 +0200
Subject: [PATCH 0632/1357] accummulate multiple setFeedback calls in
 Form/Valdation

---
 public/js/components/Form/Validation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
index 75fd7d724..530f6b514 100644
--- a/public/js/components/Form/Validation.js
+++ b/public/js/components/Form/Validation.js
@@ -23,7 +23,8 @@ export default {
 			if (!Array.isArray(feedback))
 				feedback = [feedback];
 			const ts = Date.now();
-			this.feedback[valid ? 'success' : 'danger'] = feedback.map(msg => [msg, ts]);
+			this.feedback[valid ? 'success' : 'danger']
+				.push(...feedback.map(msg => [msg, ts]));
 		}
 	},
 	mounted() {

From 9ae78f2de673b62e4100b223219304b5a392d636 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 11 Aug 2025 09:23:18 +0200
Subject: [PATCH 0633/1357] master gemerged

---
 application/models/person/Notiz_model.php        |  2 +-
 .../js/components/LVVerwaltung/LVVerwaltung.js   | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index b524451cb..bc4494f57 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -198,7 +198,7 @@ class Notiz_model extends DB_Model
 				   z.$type  = ?";
 
 		if ($withoutTags)
-			$qry .= " AND tbl_notiz.typ IS NULL";
+			$qry .= " AND n.typ IS NULL ";
 
 			$qry .= "GROUP BY 
 					notiz_id, z.notizzuordnung_id,
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index faecbf71f..e9d132848 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -119,6 +119,12 @@ export default {
 				activeFilter: this.emp ? 'employee' : this.stg ? 'verband' : null
 			}
 
+			if (this.stg !== undefined)
+			{
+				this.selectedStudiengang = this.semester !== '' && this.semester
+					? `${this.stg}/${this.semester}`
+					: this.stg;
+			}
 			this.filter = filter;
 		},
 		handleRowClicked(data)
@@ -164,7 +170,6 @@ export default {
 				params.studiensemester_kurzbz = studiensemester_kurzbz;
 			if (this.filter.emp)
 				params.emp = this.filter.emp;
-
 			this.$router.push({ name: routeName, params });
 			this.selected = [];
 		},
@@ -191,13 +196,6 @@ export default {
 		},
 	},
 	created() {
-		if (this.stg !== undefined)
-		{
-			this.selectedStudiengang = this.semester !== '' && this.semester
-				? `${this.stg}/${this.semester}`
-				: this.stg;
-		}
-
 		this.$p.loadCategory(['lehre', 'person', 'global'])
 
 		this.$api.call(ApiDetails.getStudiensemester())
@@ -261,7 +259,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%" :preselectedKey="selectedStudiengang" :endpoint="endpoint"></stv-verband>
+					<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				

From c109d844924a12f199bdf4a5988a5207ef283aec Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 11 Aug 2025 10:13:42 +0200
Subject: [PATCH 0634/1357] Tab Details: bugfix: show Zugangscode

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 17cec8b26..c789d7369 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -104,6 +104,7 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
+		$this->PrestudentModel->addSelect('p.zugangscode');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

From 3c3038362a0db114bd95ea932d703bdacd1fe2d5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Aug 2025 10:38:26 +0200
Subject: [PATCH 0635/1357] update(MyLv VueRouter Studiensemester): adds the
 Studiensemester to the url of the vue router in the mylv view

---
 application/config/routes.php            |  1 +
 public/js/apps/Dashboard/Fhc.js          |  5 +++--
 public/js/components/Cis/Mylv/Student.js | 13 ++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 360005db7..3cba72628 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -63,6 +63,7 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
+$route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 
 // Studierendenverwaltung List Routes
 $route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 473e1cf67..da1d8e39f 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -137,11 +137,12 @@ const router = VueRouter.createRouter({
 			component: CmsNews,
 			props: true
 		},
+		//dafadsdafadsdafadsdafadsdafadsdafadsdafadsdafads
 		{
-			path: `/Cis/MyLv`,
+			path: `/Cis/MyLv/:studiensemester?`,
 			name: 'MyLv',
 			component: MylvStudent,
-			props: true
+			props: true,
 		},
 		{
 			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 508acb883..e70cd065d 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -75,17 +75,16 @@ export default {
 			this.$refs.studiensemester.selectedIndex++;
 			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
 		},
-		setHash(val) {
-			// TODO: make this a router param to enable history
-			location.hash = val;
+		updateRouter(val) {
+			this.$router.push(`/Cis/MyLv/${val}`);
 		}
 	},
 	created() {
 		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Mylv/Studiensemester').then(res => {
 			this.studiensemester = res.data.retval || [];
-			const hash = location.hash.substring(1);
-			if (hash && this.studiensemester.filter(s => s.studiensemester_kurzbz == hash).length)
-				this.currentSemester = hash;
+			const routerStudiensemester = this.$route.params.studiensemester;
+			if (routerStudiensemester && this.studiensemester.filter(s => s.studiensemester_kurzbz == routerStudiensemester).length)
+				this.currentSemester = routerStudiensemester;
 			else
 				this.currentSemester = this.nearestSem;
 		});
@@ -104,7 +103,7 @@ export default {
 					<button :aria-label="$p.t('lehre','previousStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','previousStudSemester')}" class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
 						<i class="fa fa-caret-left" aria-hidden="true"></i>
 					</button>
-					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="updateRouter($event.target.value)">
 						<option v-for="semester in studiensemester" :key="semester.studiensemester_kurzbz">{{semester.studiensemester_kurzbz}}</option>
 					</select>
 					<button class="btn btn-outline-secondary" :aria-label="$p.t('lehre','nextStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','nextStudSemester')}" type="button" :disabled="currentIsLast" @click="nextSem">

From 03397b7272717cadf57abfbbc06cb8fe13403a9d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Aug 2025 11:17:59 +0200
Subject: [PATCH 0636/1357] update(MyLv VueRouter History): update the
 currentSemester based on the studiensemester param of the VueRouter history

---
 public/js/components/Cis/Mylv/Student.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index e70cd065d..4cc45b85f 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -89,6 +89,12 @@ export default {
 				this.currentSemester = this.nearestSem;
 		});
 	},
+	beforeRouteUpdate(to, from, next){
+		if (to.params.studiensemester && this.studiensemester.filter(s => s.studiensemester_kurzbz == to.params.studiensemester).length && to.params.studiensemester != this.currentSemester)
+			this.currentSemester = to.params.studiensemester;
+		next();
+
+	},
 	template: `
 
 	<h2>{{$p.t('lehre/myLV')}}</h2>

From c8c3361783843f69ea1995fe403ecd1a3d6f0ae8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 11 Aug 2025 11:26:01 +0200
Subject: [PATCH 0637/1357] use getAktOrNextSemester instead of getNearest to
 use next semester in summer

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 2518e9af9..ac09f39bb 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -159,7 +159,7 @@ class Student extends FHCAPI_Controller
 	{
 		$laufendesStudiensemester = '';
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$result = $this->StudiensemesterModel->getNearest();
+		$result = $this->StudiensemesterModel->getAktOrNextSemester();
 		if(hasData($result)) {
 			$laufendesStudiensemester = (getData($result))[0]->studiensemester_kurzbz;
 		}

From 8e6a103340a6476caf3c5292595eeda0fe18087f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 11 Aug 2025 11:33:37 +0200
Subject: [PATCH 0638/1357] update(MyLv remove comment): removes unnecessary
 comment from the FHC.js file

---
 public/js/apps/Dashboard/Fhc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index da1d8e39f..6d62ef947 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -137,7 +137,6 @@ const router = VueRouter.createRouter({
 			component: CmsNews,
 			props: true
 		},
-		//dafadsdafadsdafadsdafadsdafadsdafadsdafadsdafads
 		{
 			path: `/Cis/MyLv/:studiensemester?`,
 			name: 'MyLv',

From 3fad0fd69a03d68d24d6ac519bc2f1cf8065a13f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 11 Aug 2025 13:00:26 +0200
Subject: [PATCH 0639/1357] CSS fix primevue/bootstrap box-sizing

---
 public/css/components/primevue.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 8af7b8049..5949d6ecc 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -3973,8 +3973,9 @@
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-.p-tabview-panel * {
-  box-sizing: initial;
+.p-tabview-panel .btn-close,
+.p-tabview-panel .carousel-indicators [data-bs-target] {
+  box-sizing: content-box;
 }
 
 .p-toolbar {

From 57bc4d7b9230e25801a4939db2ef60af7205bd62 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 12 Aug 2025 08:51:55 +0200
Subject: [PATCH 0640/1357] load phraseslib in students

---
 application/controllers/api/frontend/v1/stv/Students.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 12785d6d7..26b5000bb 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -45,6 +45,13 @@ class Students extends FHCAPI_Controller
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'lehre'
+			)
+		);
+
 	}
 
 	/**

From 3e694958420082b102b1a8ec9a702eba7dae9358 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Aug 2025 09:53:45 +0200
Subject: [PATCH 0641/1357] fix(Dashboard drag&drop): behavior of dragged
 widgets when they exceed the grid limits, and ensures all widget clones are
 always deleted

---
 public/js/components/Drop/Grid.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 74d67e49d..ae1a6504c 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -439,7 +439,7 @@ export default {
 				})
 				this.dragEnd();
 				this.dragCancel();
-			} 
+			}
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
@@ -454,14 +454,14 @@ export default {
 						let x = this.x + this.draggedOffset[0];
 						let y = this.y + this.draggedOffset[1];
 						if (x < 0) {
-							this.draggedOffset[0] -= x;
+							this.draggedOffset[0] += x;
 							x = 0;
 						} else if (x + this.draggedItem.w > this.cols) {
 							this.draggedOffset[0] += this.cols - this.draggedItem.w - x;
 							x = this.cols - this.draggedItem.w;
 						}
 						if (y < 0) {
-							this.draggedOffset[1] -= y;
+							this.draggedOffset[1] += y;
 							y = 0;
 						}
 						this.positionUpdates = this.dragGrid.move(this.draggedItem, x, y);
@@ -481,6 +481,7 @@ export default {
 			}
 		},
 		dragCancel() {
+			this.removeWidgetClones();
 			this.additionalRowComputed = false;
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
@@ -492,6 +493,7 @@ export default {
 			
 		},
 		dragEnd() {
+			this.removeWidgetClones();
 			if (this.mode == MODE_IDLE)
 				return;
 			// clean up unused classes
@@ -501,10 +503,7 @@ export default {
 				ele.classList.remove("denied-dragging-animation");
 			})
 			
-			let widgetClones = document.getElementsByClassName("widgetClone");
-			for (let i=0; i <widgetClones.length; i++){ 
-				this.$refs.container.removeChild(widgetClones[i]);
-			}
+			
 			
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
 				return this.dragCancel();
@@ -597,6 +596,12 @@ export default {
 				draggedItemNode.classList.remove("border-danger");
 			}
 		},
+		removeWidgetClones(){
+			let widgetClones = Array.from(document.getElementsByClassName("widgetClone"));
+			for (let i = 0; i < widgetClones.length; i++) {
+				this.$refs.container.removeChild(widgetClones[i]);
+			}
+		},
 		mouseDown(){
 			this.mode = MODE_MOUSE_DOWN;
 		},

From 4eab58177a15c12b48fd04adc5d7a201e4ad5063 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 12 Aug 2025 11:41:14 +0200
Subject: [PATCH 0642/1357] update(disabled widget background): updates the
 background of disabled widgets in the dashboard by giving them more opacity

---
 public/css/components/dashboard.css    | 11 +++++++++++
 public/css/theme/default.css           |  4 +++-
 public/js/components/Dashboard/Item.js |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 8dc19128d..88d136b55 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -203,3 +203,14 @@
 	}
 
 }
+
+.hiddenWidget{
+	background: var(--fhc-disabled-background);
+	opacity: 40%;
+}
+
+.hiddenWidget .card,
+.hiddenWidget .card-body,
+.hiddenWidget .card-body *{
+	background: inherit !important;
+}
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index ba6493542..a0f366174 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -89,7 +89,8 @@
 	--fhc-link: var(--fhc-blue-10);
 
 	/* disabled */
-	--fhc-disabled: var(--fhc-gray-10);
+	--fhc-disabled: var(--fhc-gray-90);
+	--fhc-disabled-background: var(--fhc-gray-30);
 
 	/* status colors */
 	--fhc-danger: var(--fhc-red-10);
@@ -135,6 +136,7 @@
 
 	/* disabled */
 	--fhc-disabled: var(--fhc-gray-10);
+	--fhc-disabled-background: var(--fhc-gray-120);
 
 	/* status colors */
 	--fhc-danger: var(--fhc-red-10);
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index eccc8242e..d2ad4ae75 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -156,7 +156,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
 	<div v-show="!dragstate" class="h-100 card border-0">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>

From 50b2334e5cbe76005c72ed275a3c031b3b2b05db Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 10:38:30 +0200
Subject: [PATCH 0643/1357] work in progess, calc tabs title suffix when
 component is not rendered

---
 .../api/frontend/v1/stv/Config.php            |  3 ++-
 public/js/components/Notiz/Notiz.js           |  3 +++
 public/js/components/Tabs.js                  | 22 ++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 935928c81..a6a66e670 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -68,7 +68,8 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
-			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false)
+			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false),
+			'suffixhelper' => APP_ROOT . 'public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index ab4230681..03e3d0c4a 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -517,6 +517,9 @@ export default {
 						});
 					})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getSuffix() {
+			return '(bhtest)';
 		}
 	},
 	created() {
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 349fcf01c..e52c724b3 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -67,9 +67,9 @@ export default {
 		}
 	},
 	methods: {
-		handleTabClick: function(index) {
+		handleTabClick: function (e) {
 			let keys = Object.keys(this.tabs);
-			this.change(keys[index]);
+			this.change(keys[e.index]);
 		},
 		change(key) {
 			this.$emit("change", key)
@@ -108,8 +108,24 @@ export default {
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
 					key,
-					value
+					value,
+					suffixhelper: null
 				};
+
+				const fetchhelper = async function (tab, item) {
+					if (!item.showSuffix)
+						return null;
+
+					const mod = await import(item.suffixhelper);
+					tab.suffixhelper = mod.getSuffix;
+					// TODO call suffixhelper with modelValue - but modelValue not defined in this scope
+					/*
+					tab.suffixhelper(modelValue).then((response) => {
+						tab.value.suffix = response.data;
+					});
+					 */
+				};
+				fetchhelper(tabs[key], item);
 			}
 
 			if (Array.isArray(config))

From 645da5a5bf4ed8a195eeb8949c73e1f208c38954 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 13 Aug 2025 12:09:34 +0200
Subject: [PATCH 0644/1357] fix(Dashboard drag&drop): ensures dragend events
 trigger correctly in chrome

---
 public/js/components/Drop/Grid.js  | 27 +++++++++++++++------------
 public/js/composables/GridLogic.js |  3 ++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index ae1a6504c..cfe5747d4 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -434,11 +434,8 @@ export default {
 		},
 		dragOver(evt) {
 			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
-				this.positionUpdates = this.positionUpdates?.filter(item => {
-					return item.widgetid == this.draggedItem.data.widgetid;
-				})
-				this.dragEnd();
 				this.dragCancel();
+				
 			}
 			if (!this.active)
 				return this.dragCancel();
@@ -464,7 +461,7 @@ export default {
 							this.draggedOffset[1] += y;
 							y = 0;
 						}
-						this.positionUpdates = this.dragGrid.move(this.draggedItem, x, y);
+						this.positionUpdates= this.dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
 					case MODE_RESIZE: {
@@ -494,8 +491,11 @@ export default {
 		},
 		dragEnd() {
 			this.removeWidgetClones();
-			if (this.mode == MODE_IDLE)
+			this.toggleDraggedItemOverlay(false);
+			
+			if (this.mode == MODE_IDLE){
 				return;
+			}
 			// clean up unused classes
 			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
 			draggedItemNode.classList.remove("border-danger");
@@ -503,16 +503,19 @@ export default {
 				ele.classList.remove("denied-dragging-animation");
 			})
 			
-			
-			
-			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
-				return this.dragCancel();
+			//if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
+				//return this.dragCancel();
+
 			this.mode = MODE_IDLE;
 			let updated = [];
 			this.convertGridResultToUpdate(this.positionUpdates, updated);
 			updated = this._updateFixedPositions(updated);
 			if (updated.length)
 				this.$emit('rearrangeItems', updated.filter(v => v));
+
+			this.draggedItem = null;
+			this.draggedNode = null;
+			this.$emit('draggedItem', null);
 		},
 		_updateFixedPositions(updated) {
 			updated.forEach((item, index) => {
@@ -617,7 +620,7 @@ export default {
 		@touchmove="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
-		@drop="dragEnd"
+		@drop="dragEnd($event)"
 		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
@@ -631,7 +634,7 @@ export default {
 				@mouse-up="mouseUp"
 				@start-resize="startResize"
 				@dragging="dragging"
-				@end-drag="dragCancel"
+				@end-drag="dragEnd"
 				@touch-end="dragEnd();mouseUp();"
 				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
 				class="position-absolute"
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 93c662eb5..ff8ae0c39 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -116,7 +116,7 @@ class GridLogic {
 				prefer = DIR_RIGHT;
 		}
 
-		const originalFrame = [...item.frame];
+		const originalFrame = Array.isArray(item.frame) ? [...item.frame] : [item.frame];
 
 		const currItem = {...item};
 		currItem.x = x;
@@ -146,6 +146,7 @@ class GridLogic {
 				}
 			}
 			replaceUpdate[item.index] = { index: item.index, x, y };
+			
 			return replaceUpdate;
 		}
 		

From 34a239a823ffdea8b6dac04b5471d0e0bcb74179 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 13 Aug 2025 14:54:43 +0200
Subject: [PATCH 0645/1357] Set Foto to null instead of empty String when
 Deleted

---
 application/controllers/api/frontend/v1/stv/Student.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index ac09f39bb..70970d8b5 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -276,9 +276,14 @@ class Student extends FHCAPI_Controller
 		$update_person = array();
 		foreach ($array_allowed_props_person as $prop) {
 			$val = $this->input->post($prop);
-			if ($val !== null) {
+			if ($val !== null)
+			{
 				$update_person[$prop] = $val;
 			}
+			if($prop == 'foto' && $val == '')
+			{
+				$update_person[$prop] = null;
+			}
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];

From d4f5a7c92f8d9948b1fa07502d923cfb9443d0f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 16:37:28 +0200
Subject: [PATCH 0646/1357] add missing helper js file

---
 .../Details/Notizen/NotizenSuffixHelper.js                | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
new file mode 100644
index 000000000..4fef188eb
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
@@ -0,0 +1,8 @@
+import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
+
+export async function getSuffix(modelValue) {
+	const response = await this.$api
+		.call(ApiNotizPerson.getCountNotes(modelValue.person_id));
+	const suffix = ' (' + response.data + ')';
+	return suffix;
+}
\ No newline at end of file

From e11ff91b53e1f1d78bbcdadbe80619e57696128c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 18:45:58 +0200
Subject: [PATCH 0647/1357] use (:any) for studiengang_kz since it can be
 negative

---
 application/config/routes.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 360005db7..a255321b2 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -87,22 +87,22 @@ $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-
 $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
 // (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
 // // (studiensemester_kurzbz)/uid/(uid)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
@@ -131,4 +131,4 @@ if ($dirlist)
 			}
 		}
 	}
-}
\ No newline at end of file
+}

From a51f587da71a988e8db0ce6967a4bfca37278954 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 10:29:16 +0200
Subject: [PATCH 0648/1357] match negative studiengang_kz explicitly

---
 application/config/routes.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index a255321b2..da3a45f03 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -87,22 +87,22 @@ $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-
 $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
 // (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
 // // (studiensemester_kurzbz)/uid/(uid)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';

From 4d78abf9ec2586e99b02c72f369fabd86814332e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Aug 2025 13:15:10 +0200
Subject: [PATCH 0649/1357] Tab Prestudent: use false for boolean and null for
 other variables for update if field is empty

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

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 4d0aa5fe1..2a427e569 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -142,15 +142,15 @@ class Prestudent extends FHCAPI_Controller
 				$update_prestudent[$prop] = $val;
 			}
 
-			// allowed to be null, but has to be in postparameter
-			if (
-				in_array($prop, ['zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
-				&& !isset($update_prestudent[$prop])
-				&& array_key_exists($prop, $_POST)
-			)
-			{
+			//set null instead of empty string
+			if ($val === ''  && ($prop != 'dual' || $prop != 'bismelden')){
 				$update_prestudent[$prop] = null;
 			}
+
+			//set false instead of empty string if boolean
+			if ($val === '' && ($prop === 'dual' || $prop === 'bismelden')) {
+				$update_prestudent[$prop] = false;
+			}
 		}
 
 		$update_prestudent['updateamum'] = date('c');

From e46f46c95bc41204e44d62010daf23cc10fe957e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 14 Aug 2025 15:07:38 +0200
Subject: [PATCH 0650/1357] update(Dashboard grid): doesnt allow the user to
 drag a widget outside of the grid boundaries

---
 public/js/components/DashboardWidget/Url.js |  2 +-
 public/js/components/Drop/Grid.js           | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 2763862a9..16eacab90 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -159,7 +159,7 @@ export default {
 		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
 	},
 	template: /*html*/ `
-    <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
+    <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
         	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index cfe5747d4..d11e4c249 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -274,8 +274,23 @@ export default {
 		dragging(event){
 			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
-				this.clonedWidget.style.top = `${this.clientY-20}px`;
-				this.clonedWidget.style.left = `${this.clientX-15}px`;
+				
+				const containerRect = this.$refs.container.getBoundingClientRect();
+				const clonedWidgetRect = this.clonedWidget.getBoundingClientRect();
+				
+				let desiredTop = this.clientY - 20;
+				let desiredLeft = this.clientX - 15;
+				
+				const minTop = 0;
+				const maxTop = containerRect.height - clonedWidgetRect.height;
+				const minLeft = 0;
+				const maxLeft = containerRect.width - clonedWidgetRect.width;
+				
+				const constrainedTop = Math.max(minTop, Math.min(maxTop, desiredTop));
+				const constrainedLeft = Math.max(minLeft, Math.min(maxLeft, desiredLeft));
+				
+				this.clonedWidget.style.top = `${constrainedTop}px`;
+				this.clonedWidget.style.left = `${constrainedLeft}px`;
 			}
 		},
 		createNewGrid(items) {
@@ -413,6 +428,7 @@ export default {
 			setTimeout(() => {
 				this.draggedNode = evt.target.closest(".drop-grid-item");
 				//clones the widget for the drag Image
+				
 				let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
 
 				clone.style.zIndex = 5;

From 1092463beb20c520500b2cdac16c2d40970c6738 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 15:23:42 +0200
Subject: [PATCH 0651/1357] show count of notes in tab title

---
 .../api/frontend/v1/stv/Config.php            |  5 +-
 public/js/components/Notiz/Notiz.js           | 24 +---------
 .../Studentenverwaltung/Details/Notizen.js    |  8 +---
 public/js/components/Tabs.js                  | 47 ++++++++++---------
 .../Details/Notizen/NotizenSuffixHelper.js    |  6 +--
 5 files changed, 33 insertions(+), 57 deletions(-)
 rename public/js/{components => helpers}/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js (55%)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index a6a66e670..2fb436384 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -63,13 +63,12 @@ class Config extends FHCAPI_Controller
 			'config' => $config['details']
 		];
 
-		$showSuffix = $config['notes']['showCountNotes'] ?? false;
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
-			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => APP_ROOT . 'public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
+			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
+			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 03e3d0c4a..58168fbc7 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -295,8 +295,7 @@ export default {
 				showType_id: false,
 				showId: false,
 				showLastupdate: false
-			},
-			newCount: null
+			}
 		}
 	},
 	methods: {
@@ -368,7 +367,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		deleteNotiz(notiz_id) {
@@ -383,7 +381,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		loadNotiz(notiz_id) {
@@ -427,7 +424,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		reload() {
@@ -505,21 +501,6 @@ export default {
 				const columnToShow = "show" + column.charAt(0).toUpperCase() + column.slice(1);
 				this.showVariables[columnToShow] = true;
 			});
-		},
-		getCountNotes(){
-			return this.$api
-				.call(this.endpoint.getCountNotes(this.id))
-				.then(
-					result => {
-						this.newCount = result.data;
-						this.$nextTick(() => {
-							this.$emit('updateCount', this.newCount);
-						});
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		getSuffix() {
-			return '(bhtest)';
 		}
 	},
 	created() {
@@ -530,9 +511,6 @@ export default {
 		if (this.showTinyMce) {
 			await this.initTinyMCE();
 		}
-		this.$nextTick(() => {
-			this.getCountNotes();
-		});
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 6d7033012..ea6776dce 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -16,12 +16,6 @@ export default {
 			countNotiz: ''
 		};
 	},
-	methods: {
-		updateCountNotes(countNew){
-			this.headerSuffix = "(" +  countNew + ")";
-			this.$emit('update:suffix', this.headerSuffix);
-		}
-	},
 	template: `
 	<div class="stv-details-notizen h-100 pb-3">
 	
@@ -37,7 +31,7 @@ export default {
 		show-document
 		show-tiny-mce
 		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-		@updateCount="updateCountNotes"
+		@reload="$emit('update:suffix')"
 		>
 </core-notiz>
 
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index e52c724b3..aedd5c1c9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -14,7 +14,7 @@ export default {
 	emits: [
 		'update:modelValue',
 		'change',
-		'changed',
+		'changed'
 	],
 	props: {
 		config: {
@@ -109,23 +109,8 @@ export default {
 					config: item.config,
 					key,
 					value,
-					suffixhelper: null
+					suffixhelper: item.suffixhelper ?? null
 				};
-
-				const fetchhelper = async function (tab, item) {
-					if (!item.showSuffix)
-						return null;
-
-					const mod = await import(item.suffixhelper);
-					tab.suffixhelper = mod.getSuffix;
-					// TODO call suffixhelper with modelValue - but modelValue not defined in this scope
-					/*
-					tab.suffixhelper(modelValue).then((response) => {
-						tab.value.suffix = response.data;
-					});
-					 */
-				};
-				fetchhelper(tabs[key], item);
 			}
 
 			if (Array.isArray(config))
@@ -141,15 +126,35 @@ export default {
 			}
 			this.tabs = tabs;
 		},
-		updateSuffix(event) {
-			if (this.currentTab?.value) {
-				this.currentTab.value.suffix = event;
+		updateSuffix() {
+			this.getTabSuffix(this.currentTab);
+		},
+		async getTabSuffix(tab) {
+			if (!tab.value.showSuffix) {
+				return;
 			}
+
+			if (tab.suffixhelper !== null) {
+				const suffixhelper = await import(tab.suffixhelper);
+				const suffix = await suffixhelper.getSuffix(this.$api, this.modelValue);
+				tab.value.suffix = suffix;
+			} else {
+				tab.value.suffix = '';
+			}
+		},
+		getTabSuffixes() {
+			Object.entries(this.tabs).forEach(([key, item]) => this.getTabSuffix(item));
 		}
 	},
 	created() {
 		this.initConfig(this.config);
 	},
+	mounted() {
+		this.getTabSuffixes();
+	},
+	updated() {
+		this.getTabSuffixes();
+	},
 	template: `
 	<template v-if="useprimevue">
 
@@ -162,7 +167,7 @@ export default {
 			<tabpanel
 				v-for="tab in tabs"
 				:key="tab.key"
-				:header="tab.title + (tab.value.showSuffix && tab.value.suffix ? tab.value.suffix : '')"
+				:header="tab.title + ((tab.value.showSuffix && tab.value.suffix !== '') ? ' ' + tab.value.suffix : '')"
 			>
 				<keep-alive>
 					<component
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js b/public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
similarity index 55%
rename from public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
rename to public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
index 4fef188eb..541570645 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
+++ b/public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
@@ -1,8 +1,8 @@
 import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
 
-export async function getSuffix(modelValue) {
-	const response = await this.$api
+export async function getSuffix(api, modelValue) {
+	const response = await api
 		.call(ApiNotizPerson.getCountNotes(modelValue.person_id));
-	const suffix = ' (' + response.data + ')';
+	const suffix = '(' + response.data + ')';
 	return suffix;
 }
\ No newline at end of file

From 729618cbe7327da8dcc35b00dc04aa3e0cf166e7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Aug 2025 15:38:03 +0200
Subject: [PATCH 0652/1357] Tab Status: change format for Date for Check
 Bismeldestichtag

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

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 629d5512a..7edb0305c 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -287,11 +287,11 @@ class Status extends FHCAPI_Controller
 		]);
 
 		$this->form_validation->set_rules('_default', '', [
-			['meldestichtag_not_exceeded', function () use ($datum, $isBerechtigtNoStudstatusCheck) {
+			['meldestichtag_not_exceeded', function () use ($datum_string, $isBerechtigtNoStudstatusCheck) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
 
-				$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum);
+				$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($datum_string);
 
 				return !$this->getDataOrTerminateWithError($result);
 			}],
@@ -733,6 +733,7 @@ class Status extends FHCAPI_Controller
 
 			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
 
+			//TODO(Manu) comment out: should not appear during delete (shiva)
 			if (!$this->getDataOrTerminateWithError($result))
 				$this->terminateWithError(
 					$this->p->t('lehre', 'error_dataVorMeldestichtag'),

From aaf9e8c8850c0efd42f2d14defa3ad3cd4f53c51 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:16:53 +0200
Subject: [PATCH 0653/1357] revert to popupModal to stay consistent with other
 stv tabs

---
 .../js/components/Stv/Studentenverwaltung/Details/Notizen.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index ea6776dce..de6470d7e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -12,8 +12,7 @@ export default {
 	},
 	data() {
 		return {
-			endpoint: ApiNotizPerson,
-			countNotiz: ''
+			endpoint: ApiNotizPerson
 		};
 	},
 	template: `
@@ -25,7 +24,7 @@ export default {
 		class="overflow-hidden"
 		:endpoint="endpoint"
 		ref="formc"
-		notiz-layout="classicFas"
+		notiz-layout="popupModal"
 		type-id="person_id"
 		:id="modelValue.person_id"
 		show-document

From a42e70e2fef192977b63926f64975f15070aa308 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:28:20 +0200
Subject: [PATCH 0654/1357] comment out check Bismeldestichtag for deleteStatus

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

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 7edb0305c..fdf2bc66a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -731,15 +731,15 @@ class Status extends FHCAPI_Controller
 					REST_Controller::HTTP_FORBIDDEN
 				);
 
-			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
+			//TODO(Manu) check this check, meanwhile not active
+/*			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
 
-			//TODO(Manu) comment out: should not appear during delete (shiva)
 			if (!$this->getDataOrTerminateWithError($result))
 				$this->terminateWithError(
 					$this->p->t('lehre', 'error_dataVorMeldestichtag'),
 					self::ERROR_TYPE_GENERAL,
 					REST_Controller::HTTP_FORBIDDEN
-				);
+				);*/
 		}
 
 		// Start DB transaction

From 83d98c258e49db798946c87199fb42a854a293d9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:36:00 +0200
Subject: [PATCH 0655/1357] stv Notiz Controller add permission for new
 function getCountNotes

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

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 19e568f33..ba7cd1928 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -16,7 +16,8 @@ class Notiz extends Notiz_Controller
 			'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
 			'deleteNotiz' => ['admin:r', 'assistenz:r'],
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r']
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
+			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models

From ed00c8d0aee82b08d146d51ab11220ba88af1421 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:45:52 +0200
Subject: [PATCH 0656/1357] add permission for new function in
 Core_Notizcontroller to NotizPerson Controller

---
 application/controllers/api/frontend/v1/notiz/NotizPerson.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index cb9d31024..23a8fd199 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -18,6 +18,7 @@ class NotizPerson extends Notiz_Controller
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
 	}
 

From f695d8b66a2437420e0e831d0a7d967dd61ba3ce Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 18 Aug 2025 10:21:18 +0200
Subject: [PATCH 0657/1357] update(Dashboard Widget Drag): shows hidden widget
 when dragging the widget on the dashboard

---
 public/js/components/Drop/Grid.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d11e4c249..a7bea64e3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -434,6 +434,8 @@ export default {
 				clone.style.zIndex = 5;
 				clone.classList.add("widgetClone");
 				this.$refs.container.appendChild(clone);
+				const hiddenWidget = clone.querySelector("[style='display: none;']");
+				hiddenWidget.style.removeProperty("display");
 				this.clonedWidget = clone;
 			}, 0);
 

From 42a81a4558e8448b6b752158ad00929b26a4fabe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 18 Aug 2025 13:06:59 +0200
Subject: [PATCH 0658/1357] API error clustering

---
 public/js/plugins/Api.js | 648 ++++++++++++++++++++++++---------------
 system/phrasesupdate.php |  20 ++
 2 files changed, 423 insertions(+), 245 deletions(-)

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 43c2b3064..091a81717 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -10,7 +10,232 @@ export default {
 		if (!app.config.globalProperties.$fhcAlert)
 			app.use(FhcAlert);
 
-		function _get_config(form, uri, data, config) {
+		const $fhcAlert = app.config.globalProperties.$fhcAlert;
+
+		function _send_array_or_object(errors, func) {
+			if (Array.isArray(errors))
+				errors.forEach(func);
+			else
+				Object.entries(errors).forEach(
+					([title, errs]) => errs.forEach(
+						error => func(error, title)
+					)
+				);
+		}
+		let DEFAULT_ERROR_CONFIG = {
+			success: true,
+			fail: true,
+			combine: {
+				form: ['validation', 'general'],
+				toast: ['validation', 'general', 'not_found', 'site_failed']
+			},
+			handler: {
+				form(form, errors) {
+					form.clearValidation();
+					errors.forEach(err => form.setFeedback(
+						false,
+						err.messages || err.message
+					));
+				},
+				async toast(errors) {
+					const $p = app.config.globalProperties.$p;
+					if (!$p)
+						return Promise.reject('Phrasen plugin not loaded!');
+				
+					async function _format_toast(errors) {
+						errors = errors.reduce((result, err) => {
+							switch (err.type) {
+							case 'not_found':
+							case 'site_failed':
+								if (err.message)
+									result[err.message] = [err.url];
+								else
+									result._default = [err.url];
+								break;
+							case 'general':
+								if (!result._default)
+									result._default = [];
+								result._default.push(err.message);
+								break;
+							case 'validation':
+								Object.entries(err.messages)
+									.forEach(([field, msg]) => {
+										if (!result[field])
+											result[field] = [];
+										if (Array.isArray(msg))
+											result[field].push(...msg);
+										else
+											result[field].push(msg);
+									});
+								break;
+							}
+							return result;
+						}, {});
+						let counter = 0;
+						const msgs = await Promise.all(Object.entries(errors)
+							.sort((a, b) => ['_default'].indexOf(b[0]) - ['_default'].indexOf(a[0])) // sort _default first
+							.map(async ([field, msgs]) => {
+								if (field == '_default') {
+									await $p.loadCategory('dashboard');
+									const general = $p.t('dashboard/general');
+									field = '<dt class="d-none">' + general + '</dt>';
+								} else {
+									field = '<dt>' + field + '</dt>';
+								}
+								counter += msgs.length;
+								return field
+									+ '<dd>'
+									+ msgs.join('</dd><dd>')
+									+ '</dd>';
+							}));
+						return {
+							counter,
+							msgs
+						}
+					}
+
+					let counter, msgs;
+					if (Array.isArray(errors)) {
+						({ counter, msgs } = await _format_toast(errors));
+					} else {
+						({ counter, msgs } = await Object.entries(errors)
+							.reduce(async (res, [title, errs]) => {
+								const result = await res;
+								const { counter, msgs } = await _format_toast(errs);
+								result.counter += counter;
+								result.msgs.push('<dt>'
+									+ title
+									+ '</dt><dd><dl>'
+									+ msgs.join('')
+									+ '</dl></dd>');
+								return result;
+							}, Promise.resolve({ counter: 0, msgs: []})));
+					}
+
+					await $p.loadCategory('ui');
+					const n_errors = $p.t('ui/n_errors', { n: counter });
+
+					$fhcAlert.alertDefault(
+						'error',
+						n_errors,
+						'<dl>' + msgs.join('') + '</dl>',
+						true,
+						true
+					);
+				},
+				php(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						message += 'Message: ' + error.message + '\n\n';
+						message += 'Filename: ' + error.filename + '\n';
+						message += 'Line Number: ' + error.line + '\n';
+						if (error.backtrace && error.backtrace.length) {
+							message += '\nBacktrace: ';
+							error.backtrace.forEach(err => {
+								message += '\n\tFile: ' + err.file + '\n';
+								message += '\tLine: ' + err.line + '\n';
+								message += '\tFunction: ' + err.function + '\n';
+							});
+						}
+						switch (error.severity) {
+							case 'Warning':
+							case 'Core Warning':
+							case 'Compile Warning':
+							case 'User Warning':
+								if (title)
+									title += ': PHP ' + error.severity;
+								else
+									title = 'PHP ' + error.severity;
+								$fhcAlert.alertDefault('warn', title, message, true);
+								break;
+							case 'Notice':
+							case 'User Notice':
+							case 'Runtime Notice':
+								if (title)
+									title += ': PHP ' + error.severity;
+								else
+									title = 'PHP ' + error.severity;
+								$fhcAlert.alertDefault('info', title, message, true);
+								break;
+							default:
+								message = 'Type: PHP ' + error.severity + '\n\n' + message;
+								if (title)
+									message = title + '\n\n' + message;
+								$fhcAlert.alertSystemError(message);
+								break;
+						}
+					});
+				},
+				exception(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						if (title)
+							message += title + '\n\n';
+						message += 'Type: ' + error.class + '\n\n';
+						message += 'Message: ' + error.message + '\n\n';
+						message += 'Filename: ' + error.filename + '\n';
+						message += 'Line Number: ' + error.line + '\n';
+						if (error.backtrace && error.backtrace.length) {
+							message += '\nBacktrace: ';
+							error.backtrace.forEach(err => {
+								message += '\n\tFile: ' + err.file + '\n';
+								message += '\tLine: ' + err.line + '\n';
+								message += '\tFunction: ' + err.function + '\n';
+							});
+						}
+						$fhcAlert.alertSystemError(message);
+					});
+				},
+				db(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						var message = '';
+						if (title)
+							message += title + '\n\n';
+						if (error.heading !== undefined)
+							message += error.heading + '\n\n';
+						if (error.code !== undefined)
+							message += 'Code: ' + error.code + '\n\n';
+						if (error.sql !== undefined)
+							message += 'SQL: ' + error.sql + '\n\n';
+						if (error.message !== undefined)
+							message += 'Message: ' + error.message + '\n\n';
+						else if (error.messages !== undefined)
+							message += 'Messages: ' + error.messages.join('\n\t') + '\n\n';
+						if (error.filename !== undefined)
+							message += 'Filename: ' + error.filename + '\n';
+						if (error.line !== undefined)
+							message += 'Line Number: ' + error.line + '\n';
+
+						$fhcAlert.alertSystemError(message);
+					});
+				},
+				auth(errors) {
+					_send_array_or_object(errors, (error, title) => {
+						if (title)
+							title += ': ' + error.message;
+						else
+							title = error.message;
+
+						var message = '';
+						message += 'Controller name: ' + error.controller + '\n';
+						message += 'Method name: ' + error.method + '\n';
+						message += 'Required permissions: ' + error.required_permissions;
+
+						$fhcAlert.alertDefault(
+							'error',
+							title,
+							message,
+							true
+						);
+					});
+				}
+			}
+		};
+
+		if (options?.errorHandling !== undefined)
+			DEFAULT_ERROR_CONFIG = _merge_error_config(options.errorHandling);
+		
+		function get_config(form, uri, data, config) {
 			if (typeof form == 'string' && config === undefined) {
 				[uri, data, config] = [form, uri, data];
 				form = undefined;
@@ -40,10 +265,9 @@ export default {
 
 			return [uri, data, config];
 		}
-
-		function _clean_return_value(response) {
+		function clean_return_value(response) {
 			if (typeof response.data === 'string' || response.data instanceof String)
-				return _clean_return_value({ data: response });
+				return clean_return_value({ data: response });
 
 			const result = response.data;
 			delete response.data;
@@ -55,10 +279,111 @@ export default {
 				result.meta.response = response;
 			return result;
 		}
-		const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/";
+		function _merge_error_config(config) {
+			if (config === false || config === 'off')
+				return { ...DEFAULT_ERROR_CONFIG, success: false, fail: false };
+			
+			if (!config || config === true)
+				return { ...DEFAULT_ERROR_CONFIG };
+
+			if (config === 'success')
+				return { ...DEFAULT_ERROR_CONFIG, fail: false };
+			
+			if (config === 'fail')
+				return { ...DEFAULT_ERROR_CONFIG, success: false };
+			
+			const { success, fail, handler, combine } = config;
+			
+			config = { ...DEFAULT_ERROR_CONFIG };
+
+			Object.entries({ fail, success }).forEach(([key, value]) => {
+				if (value !== undefined)
+					config[key] = value;
+			});
+			Object.entries({ handler, combine }).forEach(([key, value]) => {
+				if (value !== undefined)
+					config[key] = { ...config[key], ...value };
+			});
+
+			return config;
+		}
+		function get_error_handler(config) {
+			const result = _merge_error_config(config?.errorHandling);
+
+			if (!config?.form) {
+				result.combine.form = [];
+			} else {
+				const formHandler = result.handler.form;
+				result.handler.form = errors => formHandler(config.form, errors);
+			}
+
+			return result;
+		}
+		function get_error_list(error) {
+			if (error.response) {
+				if (error.response.status == 404) {
+					return [{
+						type: 'not_found',
+						message: error.message,
+						url: error.request.responseURL
+					}];
+				} else {
+					return error.response.data.errors;
+				}
+			} else if (error.request) {
+				return [{
+					type: 'site_failed',
+					message: error.message,
+					url: error.request.responseURL
+				}];
+			} else {
+				return [{
+					type: 'script',
+					message: error.message
+				}];
+			}
+		}
+		function popHandleableErrors(errorHandling, errors) {
+			const result = {};
+			const copy = [];
+			while (errors.length)
+				copy.push(errors.pop());
+			for (var error of copy) {
+				let type = error.type;
+				let newType = null;
+				for (var t in errorHandling.combine) {
+					let newTypeCombinesType = errorHandling
+						.combine[t]
+						.includes(type);
+					let newTypeHasHandler = errorHandling.handler[t];
+					if (newTypeCombinesType && newTypeHasHandler) {
+						newType = t;
+						if (newType == 'form')
+							break;
+					}
+				}
+				if (newType)
+					type = newType;
+				const handler = errorHandling.handler[type];
+				if (handler) {
+					if (!result[type])
+						result[type] = [];
+					if (Array.isArray(error))
+						result[type].push(...error);
+					else
+						result[type].push(error);
+					continue;
+				}
+				errors.push(error);
+			}
+			return result;
+		}
+
 		const fhcApiAxios = axios.create({
 			timeout: 500000,
-			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"
+			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ "/"
 		});
 
 		fhcApiAxios.interceptors.request.use(config => {
@@ -100,57 +425,51 @@ export default {
 			return config;
 		});
 
-		fhcApiAxios.interceptors.response.use(response => {
-			if (response.config?.errorHandling == 'off'
-				|| response.config?.errorHandling === false
-				|| response.config?.errorHandling == 'fail')
-				return _clean_return_value(response);
-
-			// NOTE(chris): loop through errors
-			if (response.data.errors)
-				response.data.errors = response.data.errors.filter(
-					err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
-				);
-
-			return _clean_return_value(response);
-		}, error => {
-			if (error.code == 'ERR_CANCELED')
-				return Promise.reject({...{handled: true}, ...error});
-
-			if (error.config?.errorHandling == 'off'
-				|| error.config?.errorHandling === false
-				|| error.config?.errorHandling == 'success')
-				return Promise.reject(error);
-
-			if (error.response) {
-				if (error.response.status == 404) {
-					app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true);
-					return Promise.reject({...{handled: true}, ...error});
-				}
+		fhcApiAxios.interceptors.response.use(
+			response => {
+				if (response.config?.errorHandling == 'off'
+					|| response.config?.errorHandling === false
+					|| response.config?.errorHandling == 'fail')
+					return clean_return_value(response);
 
 				// NOTE(chris): loop through errors
-				error.response.data.errors = error.response.data.errors.filter(
-					err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, error.config)
-				);
-				if (!error.response.data.errors.length)
-					return Promise.reject({...{handled: true}, ...error});
-			} else if (error.request) {
-				app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL);
-				return Promise.reject({...{handled: true}, ...error});
-			} else {
-				app.config.globalProperties.$fhcAlert.alertError(error.message);
-				return Promise.reject({...{handled: true}, ...error});
-			}
+				if (response.data.errors)
+					response.data.errors = response.data.errors.filter(
+						err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
+					);
 
-			return Promise.reject(error);
-		});
+				return clean_return_value(response);
+			},
+			error => {
+				if (error.code == 'ERR_CANCELED')
+					return Promise.reject({ handled: true, ...error });
+
+				const errorConfig = get_error_handler(error.config);
+
+				if (!errorConfig.fail)
+					return Promise.reject(error);
+
+				const remaining = get_error_list(error);
+
+				const errors = popHandleableErrors(errorConfig, remaining);
+
+				for (var type in errors) {
+					errorConfig.handler[type](errors[type]);
+				}
+
+				if (remaining.length)
+					return Promise.reject(error);
+				
+				return Promise.reject({ handled: true, ...error });
+			}
+		);
 
 		app.config.globalProperties.$api = {
 			getUri(url) {
 				return fhcApiAxios.getUri({url});
 			},
 			get(form, uri, params, config) {
-				[uri, params, config] = _get_config(form, uri, params, config);
+				[uri, params, config] = get_config(form, uri, params, config);
 				if (params) {
 					if (config)
 						config.params = params;
@@ -160,82 +479,56 @@ export default {
 				return fhcApiAxios.get(uri, config);
 			},
 			post(form, uri, data, config) {
-				[uri, data, config] = _get_config(form, uri, data, config);
+				[uri, data, config] = get_config(form, uri, data, config);
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
 				if (Array.isArray(factory)) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 					const $api = app.config.globalProperties.$api;
 
 					Promise
 						.allSettled(factory.map((config, index) => {
-							if (Array.isArray(config))
-								return $api.call(config[1], {
-									errorHeader: config[0],
-									errorHandling: false
-								});
-							else
-								return $api.call(config, {
-									errorHeader: '#' + index,
-									errorHandling: false
-								});
-						}))
-						.then(res => {
-							// TODO(chris): obey form & configoverwrite
-							let messagesError = [];
-							let messagesSuccessful = [];
-
-							res.forEach(result => {
-								if (result.status === 'fulfilled') {
-									//console.log(JSON.parse(result.value.data));
-									const successTitle = "<dt>" + result.value.data + "</dt>";
-									messagesSuccessful.push(successTitle + "ok");
-								} else {
-									const errorTitle = "<dt>" + result.reason.config.errorHeader + "</dt>";
-									const errorMsg = JSON.parse(result.reason.request.response);
-									const fullMessage = errorMsg.errors.map(error => {
-										if (error.type == 'validation') {
-											// TODO(chris): do we want the keys?
-											return '<dd>' + Object.values(error.messages).join("</dd><dd>") + '</dd>';
-										}
-										// TODO(chris): other types
-										if (error.message)
-											return '<dd>' + error.message + '</dd>';
-										if (error.messages)
-											return '<dd>' + error.messages.join("\n") + '</dd>';
-										// TODO(chris): what to do here
-										return '<dd>' + "Generic Error" + '</dd>'; // TODO(chris): translate
-									}).join("\n");
-									messagesError.push(errorTitle + fullMessage);
-								}
+							if (!Array.isArray(config))
+								config = ['#' + index, config];
+							return $api.call(config[1], {
+								errorHeader: config[0],
+								errorHandling: false
 							});
+						}))
+						.then(result => {
+							const [ , , config ] = get_config(form, undefined, undefined, configoverwrite || {});
+							const errorConfig = get_error_handler(config);
 
-							if (messagesError.length)
-							{
-								const test = document.createElement('b');
-								$fhcAlert.alertDefault(
-									'error',
-									messagesError.length + " Fehler", // TODO(chris): translate
-									'<dl>' + messagesError.join("") + '</dl>',
-									true,
-									true
-								);
+							if (!errorConfig.success && !errorConfig.fail) {
+								return result;
 							}
-							if (messagesSuccessful.length)
-							{
-								const test = document.createElement('b');
-								$fhcAlert.alertDefault(
-									'info',
-									'Feedback',
-								messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
-									false,
-									true
-								);
+
+							const typedErrors = {};
+							for (var res of result) {
+								const [ allowed, item ] = res.status === 'fulfilled'
+									? [ errorConfig.success, res.value ]
+									: [ errorConfig.fail, res.reason ];
+								if (!allowed)
+									return;
+
+								const errors = popHandleableErrors(errorConfig, get_error_list(item));
+
+								for (var type in errors) {
+									if (!typedErrors[type])
+										typedErrors[type] = {
+											[item.config.errorHeader]: errors[type]
+										};
+									else
+										typedErrors[type][item.config.errorHeader] = errors[type];
+								}
+							};
+
+							for (var errType in typedErrors) {
+								errorConfig.handler[errType](typedErrors[errType]);
 							}
 						});
 				}
-				let {method, url, params, config} = factory;
+				let { method, url, params, config } = factory;
 				if (configoverwrite !== undefined) {
 					config = configoverwrite;
 				}
@@ -251,141 +544,6 @@ export default {
 				} else {
 					console.error("FhcApi: method not allowed:", method);
 				}
-			},
-			_defaultErrorHandlers: {
-				validation(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					if (config?.form) {
-						config.form.clearValidation();
-						config.form.setFeedback(false, error.messages);
-						return false;
-					}
-					if (Array.isArray(error.messages)) {
-						error.messages.forEach($fhcAlert.alertError);
-						return false;
-					} else if (typeof error.messages == 'object') {
-						if (config?.errorHeader)
-							Object.values(error.messages).forEach(
-								value => $fhcAlert.alertDefault(
-									'error',
-									Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-									value,
-									true
-								)
-							);
-						else
-							Object.entries(error.messages).forEach(
-								([key, value]) => $fhcAlert.alertDefault('error', key, value, true)
-							);
-						return false;
-					}
-					return true;
-				},
-				general(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					if (config?.form)
-						config.form.setFeedback(false, error.message);
-					else if (config?.errorHeader)
-						$fhcAlert.alertDefault(
-							'error',
-							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-							error.message,
-							true
-						);
-					else
-						$fhcAlert.alertError(error.message);
-				},
-				php(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Message: ' + error.message + '\n\n';
-					message += 'Filename: ' + error.filename + '\n';
-					message += 'Line Number: ' + error.line + '\n';
-					if (error.backtrace && error.backtrace.length) {
-						message += '\nBacktrace: ';
-						error.backtrace.forEach(err => {
-							message += '\n\tFile: ' + err.file + '\n';
-							message += '\tLine: ' + err.line + '\n';
-							message += '\tFunction: ' + err.function + '\n';
-						});
-					}
-					switch (error.severity) {
-						case 'Warning':
-						case 'Core Warning':
-						case 'Compile Warning':
-						case 'User Warning':
-							$fhcAlert.alertDefault('warn', 'PHP ' + error.severity, message, true);
-							break;
-						case 'Notice':
-						case 'User Notice':
-						case 'Runtime Notice':
-							$fhcAlert.alertDefault('info', 'PHP ' + error.severity, message, true);
-							break;
-						default:
-							message = 'Type: PHP ' + error.severity + '\n\n' + message;
-							$fhcAlert.alertSystemError(message);
-							break;
-					}
-				},
-				exception(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Type: ' + error.class + '\n\n';
-					message += 'Message: ' + error.message + '\n\n';
-					message += 'Filename: ' + error.filename + '\n';
-					message += 'Line Number: ' + error.line + '\n';
-					if (error.backtrace && error.backtrace.length) {
-						message += '\nBacktrace: ';
-						error.backtrace.forEach(err => {
-							message += '\n\tFile: ' + err.file + '\n';
-							message += '\tLine: ' + err.line + '\n';
-							message += '\tFunction: ' + err.function + '\n';
-						});
-					}
-					$fhcAlert.alertSystemError(message);
-				},
-				db(error) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					if (error.heading !== undefined)
-						message += error.heading + '\n\n';
-					if (error.code !== undefined)
-						message += 'Code: ' + error.code + '\n\n';
-					if (error.sql !== undefined)
-						message += 'SQL: ' + error.sql + '\n\n';
-					if (error.message !== undefined)
-						message += 'Message: ' + error.message + '\n\n';
-					else if (error.messages !== undefined)
-						message += 'Messages: ' + error.messages.join('\n\t') + '\n\n';
-					if (error.filename !== undefined)
-						message += 'Filename: ' + error.filename + '\n';
-					if (error.line !== undefined)
-						message += 'Line Number: ' + error.line + '\n';
-
-					$fhcAlert.alertSystemError(message);
-				},
-				auth(error, config) {
-					const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
-					var message = '';
-					message += 'Controller name: ' + error.controller + '\n';
-					message += 'Method name: ' + error.method + '\n';
-					message += 'Required permissions: ' + error.required_permissions;
-					if (config?.errorHeader)
-						$fhcAlert.alertDefault(
-							'error',
-							Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader,
-							error.message,
-							true
-						);
-					else
-						$fhcAlert.alertDefault('error', error.message, message);
-				}
 			}
 		};
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 23eb39a21..cb1a8756b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1475,6 +1475,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'n_errors',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{n} Fehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{n} Error(s)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From f50171ad9aed21448f96087ad325359ace78901b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 18 Aug 2025 15:38:35 +0200
Subject: [PATCH 0659/1357] Calender: track locale change for day & list mode

---
 public/js/components/Calendar/Mode/Day.js  | 13 +++++++++----
 public/js/components/Calendar/Mode/List.js | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index 68ca1fa89..e9764b495 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -44,11 +44,16 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
-				this.$refs.view.$refs.grid.disableAutoScroll();
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$refs.view.$refs.grid.disableAutoScroll();
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
index 97990a5a3..76acfc610 100644
--- a/public/js/components/Calendar/Mode/List.js
+++ b/public/js/components/Calendar/Mode/List.js
@@ -47,10 +47,15 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},

From eb8c3213dfb3628ba3a9cbd737ff463e1841b716 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 19 Aug 2025 07:37:33 +0200
Subject: [PATCH 0660/1357] - ects angabe bei der anmeldung - tablesorter
 hinzugefuegt - pruefungsort anderer raum moeglich (text) -
 pruefungsanmeldungen nur noch studiensemester dropdown - kompatible lvs
 vergleichen

---
 cis/private/lehre/pruefung/pruefung.js.php    | 119 ++-
 .../pruefung/pruefungsanmeldung.json.php      |  78 +-
 .../lehre/pruefung/pruefungsanmeldung.php     |  14 +
 .../pruefung/pruefungsanmeldungen_liste.php   |  10 +-
 .../pruefungsanmeldungen_liste_ohne_namen.php |   7 +
 .../pruefungsanmeldungen_verwalten.php        |  59 +-
 config/global.config-default.inc.php          |   3 +
 include/pruefungCis.class.php                 |  32 +
 include/pruefungsanmeldung.class.php          |  12 +-
 include/pruefungstermin.class.php             |   6 +-
 locale/de-AT/pruefung.php                     |   2 +
 locale/en-US/pruefung.php                     |   1 +
 system/dbupdate_3.4.php                       |   6 +-
 .../47972_pruefungsverwaltung_ects_angabe.php |  22 +
 ...hrveranstaltung_kompatibel_vergleichen.php | 682 ++++++++++++++++++
 vilesci/lehre/studienordnung.js               |   5 +-
 16 files changed, 1006 insertions(+), 52 deletions(-)
 create mode 100644 system/dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php
 create mode 100644 vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php

diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
index 4142e413c..f2fc2dc7e 100644
--- a/cis/private/lehre/pruefung/pruefung.js.php
+++ b/cis/private/lehre/pruefung/pruefung.js.php
@@ -382,7 +382,7 @@ function writePruefungsTable(e, data, anmeldung)
 			}
 			else if(new Date() > minimumFrist)
 			{
-				button = "<p><a href='#' title='<?php echo $p->t('pruefung/anmeldenMoeglichBis'); ?> "+frist+"'><input style='width: 140px; background-color: green;' type='button' value='"+termin+" "+time+"' onclick='openDialog(\""+e.lehrveranstaltung[0].lehrveranstaltung_id+"\", \""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung[0].bezeichnung.replace("'", "&apos;")+"\", \""+d.von+"\", \""+d.bis+"\");'></a></p>";
+				button = "<p><a href='#' title='<?php echo $p->t('pruefung/anmeldenMoeglichBis'); ?> "+frist+"'><input style='width: 140px; background-color: green;' type='button' value='"+termin+" "+time+"' onclick='openDialog(\""+e.lehrveranstaltung[0].lehrveranstaltung_id+"\", \""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung[0].bezeichnung.replace("'", "&apos;")+"\", \""+d.von+"\", \""+d.bis+"\", \""+e.lehrveranstaltung[0].ects +"\");'></a></p>";
 			}
 		}
 		else
@@ -479,13 +479,15 @@ function showPruefungsDetails(prfId, lvId)
  * @param {type} lvBezeichnung Bezeichnung der Lehrveranstaltung
  * @param {type} terminVon Beginn der Prüfung
  * @param {type} terminBis Ende der Prüfung
+ * @param {type} ects der LV
  * @returns {undefined}
  */
-function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, terminBis)
+function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, terminBis, ects)
 {
 	$("#lehrveranstaltungHidden").val(lehrveranstaltung_id);
 	$("#terminHidden").val(termin_id);
 	$("#lehrveranstaltung").html(lvBezeichnung);
+	$("#ectsangabe").val(ects);
 
 	$.ajax({
 		dataType: 'json',
@@ -582,6 +584,12 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
 	if($('#prestudent_studiengang').length)
 		studiengang_kz =   $('#prestudent_studiengang option:selected').val();
 
+	var ects = null;
+	if ($('#ectsangabe').length)
+	{
+		ects = $('#ectsangabe').val();
+	}
+
 	$.ajax({
 		dataType: 'json',
 		url: "./pruefungsanmeldung.json.php",
@@ -593,7 +601,8 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
 			bemerkung: bemerkungen,
 			uid: uid,
 			studienverpflichtung_id: studienverpflichtung_id,
-			studiengang_kz: studiengang_kz
+			studiengang_kz: studiengang_kz,
+			ects: ects
 		},
 		error: loadError,
 		success: function(data){
@@ -804,6 +813,7 @@ function writeAnmeldungen(data, showMessage = true)
 		var pruefung_id = data.result.anmeldungen[0].pruefung_id;
 		var lehrveranstaltung_id = data.result.anmeldungen[0].lehrveranstaltung_id;
 		var ort_kurzbz = data.result.ort_kurzbz;
+		var anderer_raum = data.result.anderer_raum;
 		var lv_bezeichnung = data.result.lv_bezeichnung;
 		var lv_lehrtyp = data.result.lv_lehrtyp;
 		var prf_termin = data.result.datum;
@@ -816,24 +826,33 @@ function writeAnmeldungen(data, showMessage = true)
 			count++;
 			var vorname = d.student.vorname !== "null" ? d.student.vorname : "";
 			var nachname = d.student.nachname !== "null" ? d.student.nachname : "";
+
+			let ects = "";
+			<?php if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)): ?>
+				ects = d.ects !== null ? "(" + d.ects + " ECTS) ": "";
+
+			<?php endif; ?>
+
 			switch(d.status_kurzbz)
 			{
 				case 'angemeldet':
-					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+vorname+" "+nachname+"</a>";
+					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+ects+vorname+" "+nachname+"</a>";
 					liste += "<div style='width: 3%; text-align: right;'>"+count+"</div><div style='text-align: center; width: 34%;'><input style='vertical-align: top; height: 24px;' type='button' value='<?php echo $p->t('pruefung/bestaetigen'); ?>' onclick='anmeldungBestaetigen(\""+d.pruefungsanmeldung_id+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>";
 					liste += "<input style='vertical-align: top; height: 24px; background-color: #dd514c;' type='button' value='X' onclick='anmeldungLoeschen(\""+d.pruefungsanmeldung_id+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'></div>";
 					if(d.wuensche !== null)
 					{
-						liste += "<div class='anmerkungInfo'><a href='#' title='<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>"+d.wuensche+"'><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>";
+						let msg = $('<div>').text(d.wuensche).html();
+						liste += `<div class='anmerkungInfo'><a href='#' data-msg="${msg}" onclick="openKommentarDialog(this.dataset.msg)"><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>`;
 					}
 					liste += "</li>";
 					break;
 				case 'bestaetigt':
-					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+vorname+" "+nachname+"</a>";
+					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+ects+vorname+" "+nachname+"</a>";
 					liste += "<div style='width: 2%; text-align: right;'>"+count+"</div><div style='text-align: center; width: 20%;'><a href='#' title='<?php echo $p->t('pruefung/statusAenderungVon'); ?>: "+d.statusupdatevon+"'><?php echo $p->t('pruefung/bestaetigt'); ?></a></div>";
 					if(d.wuensche !== null)
 					{
-						liste += "<div class='anmerkungInfo'><a href='#' title='<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>"+d.wuensche+"'><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>";
+						let msg = $('<div>').text(d.wuensche).html();
+						liste += `<div class='anmerkungInfo'><a href='#' data-msg="${msg}" onclick="openKommentarDialog(this.dataset.msg)"><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>`;
 					}
 
 					break;
@@ -848,9 +867,9 @@ function writeAnmeldungen(data, showMessage = true)
 		$("#lvdaten").html(lv_bezeichnung+" ("+prf_termin+")");
 		$("#anmeldeDaten").html(liste);
 		$("#listeDrucken").html(listenLinks);
-		if(ort_kurzbz !== null)
+		if(ort_kurzbz !== null || anderer_raum !== null)
 		{
-			$("#raumLink").html("<span><?php echo $p->t('pruefung/pruefungsraum'); ?></span>"+ort_kurzbz);
+			$("#raumLink").html("<span><?php echo $p->t('pruefung/pruefungsraum'); ?></span>"+ (ort_kurzbz ?? anderer_raum));
 		}
 		else
 		{
@@ -883,11 +902,17 @@ function writeAnmeldungen(data, showMessage = true)
 function openRaumDialog(terminId, lehrveranstaltung_id)
 {
 	getRaeume(terminId);
-	$("#raum").html('<h2><?php echo $p->t('pruefung/pruefungsraum'); ?></h2><input onChange="changeStateOfRaumDropdown();" type="checkbox" /><span><?php echo $p->t('pruefung/imBuero'); ?></span><br /><span style="font-weight: bold;"><?php echo $p->t('pruefung/raum'); ?>: </span><select id="raeumeDropdown"></select>');
+	$("#raum").html('<h2><?php echo $p->t('pruefung/pruefungsraum'); ?></h2><div id="raumInfos"><input onChange="changeStateOfRaumDropdown();" type="checkbox" /><span><?php echo $p->t('pruefung/imBuero'); ?></span><br /><span style="font-weight: bold;"><?php echo $p->t('pruefung/raum'); ?>: </span><select id="raeumeDropdown"></select><br /></div><input onChange="changeStateOfRaumInputs();" id="andererRaum" type="checkbox"/><span><?php echo $p->t('pruefung/andererRaum'); ?></span> <input type="text" id="andereRaumInput" placeholder="<?php echo $p->t('pruefung/andererRaum'); ?>"/><br />');
 	$("#raumSpeichernButton").html("<input type='button' value='<?php echo $p->t('pruefung/raumSpeichern'); ?>' onclick='saveRaum(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'/>");
 	$("#raumDialog").dialog("open");
 }
 
+function openKommentarDialog(text)
+{
+	$('#kommentarimDialog').text(text);
+	$('#kommentarDialog').dialog('open');
+}
+
 /**
  * speichert die Reihung der Studenten einer Prüfungsanmeldung
  * @param {type} terminId ID des Prüfungstermines
@@ -1118,25 +1143,49 @@ function loadPruefungStudiengang(studiengang_kz, studiensemester)
 				$("#pruefungenListe").empty();
 				if(data.result.length > 0)
 				{
-					var liste = "";
-					data.result.forEach(function(e){
-						liste += "<ul><li>"+e.bezeichnung+"<ul>";
-						try
+					$('#table4').show()
+					let rows = '';
+
+					data.result.forEach(function(e)
+					{
+						let termine = e?.pruefung[0]?.termine || [];
+
+						if (termine.length === 0)
 						{
-							e.pruefung[0].termine.forEach(function(d){
-								liste += "<li> <a onclick='showAnmeldungen(\""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung_id+"\");'>"+convertDateTime(d.von)+" "+convertDateTime(d.von, "time")+" - "+convertDateTime(d.bis, "time")+"</a></li>";
+							rows += `
+								  <tr>
+									<td></td>
+									<td>${e.bezeichnung}</td>
+									<td colspan="5">Keine Termine</td>
+								  </tr>`;
+						}
+						else
+						{
+							termine.forEach(function(d) {
+								let vonDate = convertDateTime(d.von);
+								let vonTime = convertDateTime(d.von, 'time');
+								let bisTime = convertDateTime(d.bis, 'time');
+								let onClick = `showAnmeldungen(${d.pruefungstermin_id}, ${e.lehrveranstaltung_id})`;
+
+								rows += `
+									<tr>
+										<td><input type="checkbox" /></td>
+										<td>${e.studiengang}</td>
+										<td>${e.bezeichnung}</td>
+										<td>${vonDate}</td>
+										<td>${vonTime}</td>
+										<td>${bisTime}</td>
+										<td><a onclick="${onClick}"><?php echo $p->t('pruefung/pruefungsbewertungAnmeldungen'); ?></a></td>
+									</tr>`;
 							});
 						}
-						catch(err)
-						{
-							var errmsg = err.message;
-						}
-						liste += "</ul></li></ul>";
 					});
-					$("#pruefungenListe").append(liste);
+					$("#pruefungenListe").html(rows);
+					setTablesorter('table4')
 				}
 				else
 				{
+					$('#table4').hide()
 					$("#pruefungenListe").html("<?php echo $p->t('pruefung/keinePruefungenVorhanden'); ?>");
 				}
 			}
@@ -1241,6 +1290,7 @@ function loadStudiensemester()
 			data.result.forEach(function(d){
 				selectData += "<option "+((d.studiensemester_kurzbz === data.aktSem) ? "selected" : "")+" value='"+d.studiensemester_kurzbz+"'>"+d.studiensemester_kurzbz+"</option>";
 			});
+
 			$('#studiensemester').html(selectData);
 			loadPruefungsfenster();
 			loadLehrveranstaltungen();
@@ -1540,7 +1590,7 @@ function loadPruefungsDetails(prfId)
 			if(data.result.length === 0)
 			{
 				messageBox("message", "<?php echo $p->t('pruefung/keinePruefungsfensterGespeichert'); ?>", "red", "highlight", 10000);
-				$("#pruefungsfenster").html("<option value='null'></option>");
+				$("#pruefungsfenster").html("<option value='null'><?php echo $p->t('pruefung/keinePruefungsfensterGespeichert'); ?></option>");
 			}
 			else
 			{
@@ -2188,10 +2238,28 @@ function changeStateOfRaumDropdown()
 	}
 }
 
+function changeStateOfRaumInputs()
+{
+	if ($("#andererRaum").prop("checked") === true)
+	{
+		$("#raumInfos").hide();
+	}
+	else
+	{
+		$("#raumInfos").show();
+	}
+}
+
 function saveRaum(terminId, lehrveranstaltung_id)
 {
 	var ort_kurzbz;
-	if($("#raum input[type=checkbox]").prop("checked") === true)
+	let anderer_raum = '';
+	if ($("#andererRaum").prop("checked") === true && $('#andereRaumInput').val() !== '')
+	{
+		ort_kurzbz = "";
+		anderer_raum = $('#andereRaumInput').val();
+	}
+	else if($("#raum input[type=checkbox]").prop("checked") === true)
 	{
 		ort_kurzbz = "buero";
 	}
@@ -2206,7 +2274,8 @@ function saveRaum(terminId, lehrveranstaltung_id)
 		data: {
 			method: "saveRaum",
 			ort_kurzbz: ort_kurzbz,
-			terminId: terminId
+			terminId: terminId,
+			anderer_raum: anderer_raum
 		},
 		error: loadError
 	}).done(function(data){
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
index 6757cf391..54c064d14 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
@@ -108,7 +108,7 @@ switch($method)
 		break;
 	case 'getPruefungenStudiengang':
 		$studiensemester = filter_input(INPUT_POST,"studiensemester");
-		$data = getPruefungenStudiengang($uid, $studiensemester);
+		$data = getPruefungenStudiengangBySemester($studiensemester);
 		break;
 	case 'saveKommentar':
 		$data = saveKommentar();
@@ -120,7 +120,8 @@ switch($method)
 	case 'saveRaum':
 		$terminId = $_REQUEST["terminId"];
 		$ort_kurzbz = $_REQUEST["ort_kurzbz"];
-		$data = saveRaum($terminId, $ort_kurzbz, $uid);
+		$anderer_raum = $_REQUEST["anderer_raum"];
+		$data = saveRaum($terminId, $ort_kurzbz, $uid, $anderer_raum);
 		break;
 	case 'getLvKompatibel':
 		$lvid = filter_input(INPUT_POST, "lehrveranstaltung_id");
@@ -397,6 +398,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
 	$lv_besucht = false;
 	$studienverpflichtung_id = filter_input(INPUT_POST, "studienverpflichtung_id");
 	$studiengang_kz = filter_input(INPUT_POST, "studiengang_kz");
+	$ects = filter_input(INPUT_POST, "ects");
 
 	//Defaulteinstellung für Anzahlprüfungsversuche (wird durch Addon "ktu" überschrieben)
 	$maxAnzahlVersuche = 0;
@@ -731,6 +733,10 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
 					else
 						$anmeldung->anrechnung_id = $anrechnung->anrechnung_id;
 
+					if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
+					{
+						$anmeldung->ects = $ects;
+					}
 					if($anmeldung->save(true))
 					{
 						$pruefung = new pruefungCis($termin->pruefung_id);
@@ -1166,6 +1172,53 @@ function getPruefungenStudiengang($uid, $aktStudiensemester)
 	return $data;
 }
 
+function getPruefungenStudiengangBySemester($aktStudiensemester)
+{
+	$result = array();
+	$pruefungen = new pruefungCis();
+	$pruefungen->getPruefungByStudiensemester($aktStudiensemester);
+
+	if((!empty($pruefungen->lehrveranstaltungen)))
+	{
+		$lehrveranstaltungen = [];
+		foreach ($pruefungen->lehrveranstaltungen as $prf)
+		{
+			$pruefung = new pruefungCis();
+			$pruefung->load($prf->pruefung_id);
+
+			if ($pruefung->storniert)
+				continue;
+
+			$pruefung->getTermineByPruefung();
+
+			$lvid = $prf->lehrveranstaltung_id;
+
+			if (!isset($lehrveranstaltungen[$lvid]))
+			{
+				$lv = new stdClass();
+				$lehrveranstaltung = new lehrveranstaltung();
+				$lehrveranstaltung->load($lvid);
+
+				$studiengang = new studiengang();
+				$studiengang->load($lehrveranstaltung->studiengang_kz);
+
+				$lv->bezeichnung = $lehrveranstaltung->bezeichnung;
+				$lv->lehrveranstaltung_id = $lvid;
+				$lv->studiengang = $studiengang->kuerzel;
+				$lv->pruefung = [];
+				$lehrveranstaltungen[$lvid] = $lv;
+			}
+
+			$lehrveranstaltungen[$lvid]->pruefung[] = $pruefung;
+		}
+		$result = array_values($lehrveranstaltungen);
+	}
+	$data['result']=$result;
+	$data['error']='false';
+	$data['errormsg']='';
+	return $data;
+}
+
 /**
  *
  * @return typespeichert ein Kommentar zu einer Prüfungsanmeldung
@@ -1246,7 +1299,7 @@ function compareRaeume($a, $b)
 	return strcmp($a->ort_kurzbz, $b->ort_kurzbz);
 }
 
-function saveRaum($terminId, $ort_kurzbz, $uid)
+function saveRaum($terminId, $ort_kurzbz, $uid, $anderer_raum = '')
 {
 	$terminkollision = defined('CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION') ? CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION : false;
 	$pruefungstermin = new pruefungstermin($terminId);
@@ -1265,7 +1318,24 @@ function saveRaum($terminId, $ort_kurzbz, $uid)
 	{
 	$pruefung = new pruefungCis($pruefungstermin->pruefung_id);
 	$mitarbeiter = new mitarbeiter($pruefung->mitarbeiter_uid);
-	if($ort_kurzbz === "buero")
+
+	if ($ort_kurzbz === "" && $anderer_raum !== "")
+	{
+		$pruefungstermin->anderer_raum = $anderer_raum;
+
+		if($pruefungstermin->save(false))
+		{
+			$data['result']="reserviert";
+			$data['error']='false';
+			$data['errormsg']='';
+		}
+		else
+		{
+			$data['error']='true';
+			$data['errormsg']=$pruefungstermin->errormsg;
+		}
+	}
+	else if($ort_kurzbz === "buero")
 	{
 		$pruefungstermin->ort_kurzbz = $mitarbeiter->ort_kurzbz;
 		if($pruefungstermin->save(false))
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.php b/cis/private/lehre/pruefung/pruefungsanmeldung.php
index c969c51aa..837e0c227 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.php
@@ -321,6 +321,20 @@ $studiensemester->getAll();
 				</td>
 			</tr>
 			<?php endif; ?>
+
+			<?php
+			if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE')
+				&& CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true):
+			?>
+			<tr>
+				<td style="vertical-align: top; font-weight: bold;">
+					<?php echo $p->t('pruefung/ects'); ?>:
+				</td>
+				<td>
+					<input type="number" size="3" id="ectsangabe" placeholder="<?php echo $p->t('pruefung/ects'); ?>"/>
+				</td>
+			</tr>
+			<?php endif; ?>
 			<tr id="studiengang">
 			</tr>
 			<tr>
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
index 39ec68ad4..91c2ea084 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php
@@ -235,12 +235,18 @@ $rechte->getBerechtigungen($uid);
 			<th><?php echo $p->t('global/datum'); ?></th>
 			<th><?php echo $p->t('benotungstool/note'); ?></th>
 			<th><?php echo $p->t('global/anmerkung'); ?></th>
+
+			<?php
+				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)):
+			?>
+				<th><?php echo $p->t('pruefung/ects'); ?></th>
+			<?php endif; ?>
+
 			</tr>
 		</thead>
 		<tbody>
 			<?php
 			$count = 0;
-			/*@var $anmeldung pruefungsanmeldung */
 			foreach($anmeldungen as $anmeldung)
 			{
 				$student = new student($anmeldung->uid);
@@ -269,6 +275,8 @@ $rechte->getBerechtigungen($uid);
 				echo '<td>'.$date.'</td>';
 				echo '<td></td>';
 				echo '<td></td>';
+				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
+					echo '<td>'. $anmeldung->ects .'</td>';
 				echo '</tr>';
 			}
 			?>
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
index 207ba4dd7..414ebdf15 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php
@@ -233,6 +233,11 @@ $rechte->getBerechtigungen($uid);
 			<th><?php echo $p->t('global/datum'); ?></th>
 			<th><?php echo $p->t('benotungstool/note'); ?></th>
 			<th><?php echo $p->t('global/anmerkung'); ?></th>
+			<?php
+				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)):
+			?>
+				<th><?php echo $p->t('pruefung/ects'); ?></th>
+			<?php endif; ?>
 			</tr>
 		</thead>
 		<tbody>
@@ -265,6 +270,8 @@ $rechte->getBerechtigungen($uid);
 				echo '<td>'.$date.'</td>';
 				echo '<td></td>';
 				echo '<td></td>';
+				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
+					echo '<td>'. $anmeldung->ects .'</td>';
 				echo '</tr>';
 			}
 			?>
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index 22bca21cc..dd38950b1 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -95,7 +95,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		#prfWrapper {
 		position: absolute;
 		height: 70%;
-		width: 300px;
+		width: 40%;
 		top: 180px;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
@@ -117,9 +117,9 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		#anmWrapper {
 		position: absolute;
 		/*top: 45px;*/
-		left: 350px;
+		left: 45%;
 		top: 180px;
-		width: 500px;
+		width: 40%;
 		height: 70%;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
@@ -228,7 +228,6 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 	<script>
 		$(document).ready(function()
 		{
-			loadStudiengaenge();
 			$("#filter_studiensemester").css("visibility","visible");
 
 			$("#raumDialog").dialog({
@@ -236,17 +235,36 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				autoOpen: false,
 				width: "400px"
 			});
+
+			$("#kommentarDialog").dialog({
+				modal: true,
+				autoOpen: false,
+				width: "400px",
+				buttons: {
+					Ok: function() {
+						$(this).dialog('close');
+					}
+				}
+			});
+
+			$("#table4").tablesorter(
+				{
+
+					widgets: ["zebra"],
+					headers: {
+						0: { sorter: false },
+						3: { sorter: 'shortDate',
+							dateFormat: 'ddmmyyyy' },
+						4: { sorter: 'time' },
+						5: { sorter: 'time' }
+					}
+				});
+
 		});
 	</script>
 	<h1><?php echo $p->t('pruefung/anmeldungenVerwalten'); ?></h1>
 	<div id='stgWrapper'>
-		<div id='studiengaenge'>
-		<div>
-			<h2><?php echo $p->t('global/studiengang'); ?></h2>
-			<div id='stgListe'>
 
-			</div>
-		</div>
 		<div>
 			<h2><?php echo $p->t('global/studiensemester'); ?></h2>
 			<?php
@@ -255,7 +273,6 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 			$studiensemester->getPlusMinus(null, 5);
 			foreach($studiensemester->studiensemester as $sem)
 			{
-				/*@var $sem studiensemester */
 				if ($aktuellesSemester == $sem->studiensemester_kurzbz)
 				{
 				echo '<option selected value="'.$sem->studiensemester_kurzbz.'">'.$sem->bezeichnung.'</option>';
@@ -273,9 +290,20 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 	<div id='prfWrapper'>
 		<div id='pruefungen'>
 		<h2><?php echo $p->t('pruefung/pruefungPruefungenTitle'); ?></h2>
-		<ul id="pruefungenListe">
-
-		</ul>
+		<table id="table4" class="tablesorter" style="display:none">
+			<thead>
+				<tr>
+					<th></th>
+					<th><?php echo $p->t('global/studiengang'); ?></th>
+					<th><?php echo $p->t('global/lehrveranstaltung'); ?></th>
+					<th><?php echo $p->t('global/datum'); ?></th>
+					<th><?php echo $p->t('global/von'); ?></th>
+					<th><?php echo $p->t('global/bis'); ?></th>
+					<th><?php echo $p->t('pruefung/pruefungsbewertungAnmeldungen'); ?></th>
+				</tr>
+			</thead>
+			<tbody id="pruefungenListe"></tbody>
+		</table>
 		</div>
 	</div>
 	<div id='anmWrapper'>
@@ -311,6 +339,9 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 			</div>
 		</div>
 		</div>
+		<div id="kommentarDialog" title="<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>" style="display:none;">
+			<div id="kommentarimDialog"></div>
+		</div>
 	</div>
 
 	<div id="message"></div>
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 8cfc36bfb..89b02a8ce 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -263,6 +263,9 @@ define('CIS_SAALPLAN_ALLERAEUME_OPTION', false);
 //Legt fest ob Bestätigungsmails über eine Anmelung zu einer Prüfung an eine einzelne Person erfolgt oder an den jeweiligen Lektor. (Leerstring für jeweiligen Lektor | uid);
 define('CIS_PRUEFUNG_MAIL_EMPFAENGER_ANMEDLUNG',"");
 
+//Gibt an, ob die Studierenden bei der Anmeldung zu einer Prüfung den Ausmas an ECTS angeben können
+define('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE', false);
+
 // Username fuer STIP Schnittstelle
 define('STIP_USER_NAME','stipendienstelle');
 // Passwort fuer STIP Schnittstelle
diff --git a/include/pruefungCis.class.php b/include/pruefungCis.class.php
index ec402ed5d..29b0c425d 100644
--- a/include/pruefungCis.class.php
+++ b/include/pruefungCis.class.php
@@ -464,6 +464,7 @@ class pruefungCis extends basis_db
 		$obj->anmeldung_von= $row->anmeldung_von;
                 $obj->anmeldung_bis = $row->anmeldung_bis;
 		$obj->ort_kurzbz = $row->ort_kurzbz;
+		$obj->anderer_raum = $row->anderer_raum;
 		$obj->sammelklausur = $row->sammelklausur;
                 array_push($this->termine, $obj);
             }
@@ -646,6 +647,37 @@ class pruefungCis extends basis_db
         return false;
     }
 
+	public function getPruefungByStudiensemester($studiensemester_kurzbz)
+    {
+        if(empty($studiensemester_kurzbz))
+        {
+           $this->errormsg = "Kein Studiensemester übergeben.</br>";
+           return false;
+        }
+
+		$qry = 'SELECT * 
+				FROM campus.tbl_lehrveranstaltung_pruefung
+				JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				JOIN campus.tbl_pruefung USING (pruefung_id)
+				WHERE tbl_pruefung.studiensemester_kurzbz = ' . $this->db_add_param($studiensemester_kurzbz);
+
+        if($this->db_query($qry))
+        {
+            while($row = $this->db_fetch_object())
+            {
+                $obj = new stdClass();
+                $obj->lehrveranstaltung_pruefung_id = $row->lehrveranstaltung_pruefung_id;
+                $obj->lehrveranstaltung_id = $row->lehrveranstaltung_id;
+                $obj->pruefung_id = $row->pruefung_id;
+                $obj->storniert = $row->storniert;
+				$obj->bezeichnung = $row->bezeichnung;
+                array_push($this->lehrveranstaltungen, $obj);
+            }
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Lädt alle Prüfung-Lehrveranstaltung Kombinationen
      * @return boolean true, wenn ok; false, im Fehlerfall
diff --git a/include/pruefungsanmeldung.class.php b/include/pruefungsanmeldung.class.php
index e4fbec506..c23b0212b 100644
--- a/include/pruefungsanmeldung.class.php
+++ b/include/pruefungsanmeldung.class.php
@@ -39,6 +39,7 @@ class pruefungsanmeldung extends basis_db {
     public $statusupdatevon;		//varchar(32)
     public $statusupdateamum;		//timestamp
     public $anrechnung_id;		//integer
+    public $ects;		//integer
     public $pruefungstyp_kurzbz;		//varchar(32)
     public $insertamum; // timestamp
 
@@ -94,7 +95,7 @@ class pruefungsanmeldung extends basis_db {
 
         if($new)
         {
-            $qry = 'INSERT INTO campus.tbl_pruefungsanmeldung (uid, pruefungstermin_id, lehrveranstaltung_id, status_kurzbz, wuensche, reihung, kommentar, anrechnung_id, pruefungstyp_kurzbz) VALUES ('
+            $qry = 'INSERT INTO campus.tbl_pruefungsanmeldung (uid, pruefungstermin_id, lehrveranstaltung_id, status_kurzbz, wuensche, reihung, kommentar, anrechnung_id, pruefungstyp_kurzbz, ects) VALUES ('
                     . $this->db_add_param($this->uid).', '
                     . $this->db_add_param($this->pruefungstermin_id).', '
                     . $this->db_add_param($this->lehrveranstaltung_id).', '
@@ -103,7 +104,8 @@ class pruefungsanmeldung extends basis_db {
                     . $this->db_add_param($this->reihung).', '
                     . $this->db_add_param($this->kommentar).', '
 		    . $this->db_add_param($this->anrechnung_id).', '
-		    . $this->db_add_param($this->pruefungstyp_kurzbz).');';
+		    . $this->db_add_param($this->pruefungstyp_kurzbz).', '
+		    . $this->db_add_param($this->ects).');';
         }
         else
         {
@@ -116,7 +118,8 @@ class pruefungsanmeldung extends basis_db {
 		    . 'reihung='.$this->db_add_param($this->reihung).', '
 		    . 'kommentar='.$this->db_add_param($this->kommentar).', '
 		    . 'anrechnung_id='.$this->db_add_param($this->anrechnung_id).', '
-		    . 'pruefungstyp_kurzbz='.$this->db_add_param($this->pruefungstyp_kurzbz)
+		    . 'pruefungstyp_kurzbz='.$this->db_add_param($this->pruefungstyp_kurzbz).', '
+		    . 'ects='.$this->db_add_param($this->ects)
 		    . ' WHERE pruefungsanmeldung_id='.$this->db_add_param($this->pruefungsanmeldung_id).';';
         }
 
@@ -167,6 +170,7 @@ class pruefungsanmeldung extends basis_db {
 		$this->statusupdatevon = $row->statusupdatevon;
 		$this->anrechnung_id = $row->anrechnung_id;
 		$this->pruefungstyp_kurzbz = $row->pruefungstyp_kurzbz;
+		$this->ects = $row->ects;
         $this->insertamum = $row->insertamum;
             }
             return true;
@@ -221,6 +225,7 @@ class pruefungsanmeldung extends basis_db {
 				$anmeldung->statusupdatevon = $row->statusupdatevon;
 				$anmeldung->anrechnung_id = $row->anrechnung_id;
 				$anmeldung->pruefungstyp_kurzbz = $row->pruefungstyp_kurzbz;
+				$anmeldung->ects = $row->ects;
                 array_push($anmeldungen, $anmeldung);
             }
             return $anmeldungen;
@@ -280,6 +285,7 @@ class pruefungsanmeldung extends basis_db {
 		$anmeldung->statusupdatevon = $row->statusupdatevon;
 		$anmeldung->anrechnung_id = $row->anrechnung_id;
 		$anmeldung->pruefungstyp_kurzbz = $row->pruefungstyp_kurzbz;
+		$anmeldung->ects = $row->ects;
         $anmeldung->datum_anmeldung = $row->datum_anmeldung;
                 array_push($anmeldungen, $anmeldung);
             }
diff --git a/include/pruefungstermin.class.php b/include/pruefungstermin.class.php
index 74222cceb..c7eb0b085 100644
--- a/include/pruefungstermin.class.php
+++ b/include/pruefungstermin.class.php
@@ -37,6 +37,7 @@ class pruefungstermin extends basis_db{
     public $anmeldung_von;	    //date
     public $anmeldung_bis;	    //date
     public $ort_kurzbz;		    //varchar(16)
+    public $anderer_raum;		    //text
     public $sammelklausur;		//boolean
     
     /**
@@ -93,6 +94,7 @@ class pruefungstermin extends basis_db{
 		$this->anmeldung_von= $row->anmeldung_von;
                 $this->anmeldung_bis = $row->anmeldung_bis;
 		$this->ort_kurzbz = $row->ort_kurzbz;
+		$this->anderer_raum = $row->anderer_raum;
 		$this->sammelklausur = $row->sammelklausur;
             }
             return true;
@@ -179,7 +181,8 @@ class pruefungstermin extends basis_db{
 		    . 'teilnehmer_min='.$this->db_add_param($this->teilnehmer_min).', '
 		    . 'anmeldung_von='.$this->db_add_param($this->anmeldung_von).', '
 		    . 'anmeldung_bis='.$this->db_add_param($this->anmeldung_bis).', '
-		    . 'ort_kurzbz='.$this->db_add_param($this->ort_kurzbz).' '
+		    . 'ort_kurzbz='.$this->db_add_param($this->ort_kurzbz).', '
+		    . 'anderer_raum='.$this->db_add_param($this->anderer_raum).' '
 		    . 'WHERE pruefungstermin_id='.$this->db_add_param($this->pruefungstermin_id).';';
 	}
 	
@@ -228,6 +231,7 @@ class pruefungstermin extends basis_db{
 		$obj->anmeldung_von= $row->anmeldung_von;
                 $obj->anmeldung_bis = $row->anmeldung_bis;
 		$obj->ort_kurzbz = $row->ort_kurzbz;
+		$obj->anderer_raum = $row->anderer_raum;
 		$obj->sammelklausur = $row->sammelklausur;
 		array_push($this->result, $obj);
 	    }
diff --git a/locale/de-AT/pruefung.php b/locale/de-AT/pruefung.php
index 93b7039e0..9e75fa89e 100644
--- a/locale/de-AT/pruefung.php
+++ b/locale/de-AT/pruefung.php
@@ -57,6 +57,7 @@ $this->phrasen['pruefung/listeOhneNamenDrucken'] = 'Liste ohne Namen drucken';
 $this->phrasen['pruefung/pruefungsraum'] = 'Prüfungsraum: ';
 $this->phrasen['pruefung/pruefungsort'] = 'Prüfungsort ';
 $this->phrasen['pruefung/imBuero'] = ' im Büro';
+$this->phrasen['pruefung/andererRaum'] = 'anderer Raum';
 $this->phrasen['pruefung/raum'] = ' Raum';
 $this->phrasen['pruefung/raumSpeichern'] = ' Raum speichern';
 $this->phrasen['pruefung/reihunghErfolgreichGeaendert'] = 'Reihung erfolgreich geändert.';
@@ -95,6 +96,7 @@ $this->phrasen['pruefung/lvVonStudiengang'] = 'Lehrveranstaltungen von Studienga
 $this->phrasen['pruefung/lvAlle'] = 'Alle Lehrveranstaltungen';
 $this->phrasen['pruefung/anmeldungSpeichern'] = 'Anmeldung speichern';
 $this->phrasen['pruefung/studienverpflichtung'] = 'Studienverpflichtung';
+$this->phrasen['pruefung/ects'] = 'ECTS';
 
 // liste
 $this->phrasen['pruefung/anmeldungsliste'] = 'Anmeldungsliste';
diff --git a/locale/en-US/pruefung.php b/locale/en-US/pruefung.php
index cd5175c13..7b0cec97e 100644
--- a/locale/en-US/pruefung.php
+++ b/locale/en-US/pruefung.php
@@ -57,6 +57,7 @@ $this->phrasen['pruefung/listeOhneNamenDrucken'] = 'Liste ohne Namen drucken';
 $this->phrasen['pruefung/pruefungsraum'] = 'Prüfungsraum: ';
 $this->phrasen['pruefung/pruefungsort'] = 'Prüfungsort ';
 $this->phrasen['pruefung/imBuero'] = ' im Büro';
+$this->phrasen['pruefung/andererRaum'] = 'other Room';
 $this->phrasen['pruefung/raum'] = ' Raum';
 $this->phrasen['pruefung/raumSpeichern'] = ' Raum speichern';
 $this->phrasen['pruefung/reihunghErfolgreichGeaendert'] = 'Reihung erfolgreich geändert.';
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index cf2f40ca8..3a743f065 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -77,6 +77,8 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
+require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
+require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -159,8 +161,8 @@ $tabellen=array(
 	"campus.tbl_paabgabe"  => array("paabgabe_id","projektarbeit_id","paabgabetyp_kurzbz","fixtermin","datum","kurzbz","abgabedatum", "insertvon","insertamum","updatevon","updateamum"),
 	"campus.tbl_pruefungsfenster" => array("pruefungsfenster_id","studiensemester_kurzbz","oe_kurzbz","start","ende"),
 	"campus.tbl_pruefung" => array("pruefung_id","mitarbeiter_uid","studiensemester_kurzbz","pruefungsfenster_id","pruefungstyp_kurzbz","titel","beschreibung","methode","einzeln","storniert","insertvon","insertamum","updatevon","updateamum","pruefungsintervall"),
-	"campus.tbl_pruefungstermin" => array("pruefungstermin_id","pruefung_id","von","bis","teilnehmer_max","teilnehmer_min","anmeldung_von","anmeldung_bis","ort_kurzbz","sammelklausur"),
-	"campus.tbl_pruefungsanmeldung" => array("pruefungsanmeldung_id","uid","pruefungstermin_id","lehrveranstaltung_id","status_kurzbz","wuensche","reihung","kommentar","statusupdatevon","statusupdateamum","anrechnung_id","pruefungstyp_kurzbz","insertamum"),
+	"campus.tbl_pruefungstermin" => array("pruefungstermin_id","pruefung_id","von","bis","teilnehmer_max","teilnehmer_min","anmeldung_von","anmeldung_bis","ort_kurzbz","sammelklausur", "anderer_raum"),
+	"campus.tbl_pruefungsanmeldung" => array("pruefungsanmeldung_id","uid","pruefungstermin_id","lehrveranstaltung_id","status_kurzbz","wuensche","reihung","kommentar","statusupdatevon","statusupdateamum","anrechnung_id","pruefungstyp_kurzbz","insertamum", "ects"),
 	"campus.tbl_pruefungsstatus" => array("status_kurzbz","bezeichnung"),
 	"campus.tbl_reservierung"  => array("reservierung_id","ort_kurzbz","studiengang_kz","uid","stunde","datum","titel","beschreibung","semester","verband","gruppe","gruppe_kurzbz","veranstaltung_id","insertamum","insertvon"),
 	"campus.tbl_studierendenantrag" => array("studierendenantrag_id","prestudent_id","studiensemester_kurzbz","datum","typ","insertamum","insertvon","datum_wiedereinstieg","grund","dms_id"),
diff --git a/system/dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php b/system/dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php
new file mode 100644
index 000000000..7b961fa3d
--- /dev/null
+++ b/system/dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php
@@ -0,0 +1,22 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if(!@$db->db_query("SELECT ects FROM campus.tbl_pruefungsanmeldung LIMIT 1"))
+{
+	$qry = 'ALTER TABLE campus.tbl_pruefungsanmeldung ADD COLUMN ects numeric(5,2);';
+
+	if(!$db->db_query($qry))
+		echo '<strong> campus.tbl_pruefungsanmeldung '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_pruefungsanmeldung: Neue Spalte ects hinzugefügt';
+}
+
+if(!@$db->db_query("SELECT anderer_raum FROM campus.tbl_pruefungstermin LIMIT 1"))
+{
+	$qry = 'ALTER TABLE campus.tbl_pruefungstermin ADD COLUMN anderer_raum text NULL;';
+
+	if(!$db->db_query($qry))
+		echo '<strong> campus.tbl_pruefungstermin '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_pruefungstermin: Neue Spalte anderer_raum hinzugefügt';
+}
diff --git a/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
new file mode 100644
index 000000000..94e1af155
--- /dev/null
+++ b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
@@ -0,0 +1,682 @@
+<?php
+require_once('../../config/vilesci.config.inc.php');
+require_once('../../include/studiengang.class.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
+require_once('../../include/fachbereich.class.php');
+require_once('../../include/lvinfo.class.php');
+require_once('../../include/lehrveranstaltung.class.php');
+require_once('../../include/organisationsform.class.php');
+require_once('../../include/organisationseinheit.class.php');
+
+if (!$db = new basis_db())
+	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+
+$getKompatibleLVs = filter_input(INPUT_POST, 'getKompatibleLVs', FILTER_VALIDATE_BOOLEAN);
+
+if ($getKompatibleLVs)
+{
+	if (isset($_POST['lv_id']))
+	{
+		$lv = new lehrveranstaltung();
+		$lv->load($_POST['lv_id']);
+
+		$kompatibleLvs = $lv->loadLVkompatibel($_POST['lv_id']);
+		if (is_array($kompatibleLvs) && count($kompatibleLvs) > 0)
+		{
+			$result = array();
+			foreach($kompatibleLvs as $lvId)
+			{
+				$lv->load($lvId);
+				$studiengang = new studiengang();
+				$studiengang->load($lv->studiengang_kz);
+				$oe = new organisationseinheit();
+				$oe->load($lv->oe_kurzbz);
+
+
+				$result[] = array(
+					"lehrveranstaltung_id" => $lv->lehrveranstaltung_id,
+					"kurzbz" => $lv->kurzbz,
+					"bezeichnung" => $lv->bezeichnung,
+					"ects" => $lv->ects,
+					"studiengang_kuerzel" => $studiengang->kuerzel,
+					"oe_bezeichnung" => $oe->bezeichnung
+				);
+			}
+			echo json_encode(["result" => $result]);
+			exit();
+		}
+		echo json_encode(["result" => array()]);
+		exit();
+	}
+}
+
+if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' || $_REQUEST['autocomplete'] === 'To'))
+{
+	$search = trim((isset($_REQUEST['term']) ? $_REQUEST['term'] : ''));
+	if (is_null($search) || $search == '')
+	{
+		exit();
+	}
+
+	$qry = "SELECT lehre.tbl_lehrveranstaltung.*
+		FROM lehre.tbl_lehrveranstaltung
+		WHERE
+			lower(bezeichnung) like '%" . $db->db_escape(mb_strtolower($search)) . "%' OR
+			lehrveranstaltung_id::text like '%" . $db->db_escape(mb_strtolower($search)) . "%' OR
+			studiengang_kz::text like '%" . $db->db_escape(mb_strtolower($search)) . "%'
+		ORDER BY lehrveranstaltung_id DESC
+		LIMIT 10
+	";
+
+	if ($result = $db->db_query($qry))
+	{
+		$result_obj = array();
+		while ($row = $db->db_fetch_object($result))
+		{
+			$item['lehrveranstaltung_id'] = html_entity_decode($row->lehrveranstaltung_id);
+			$item['bezeichnung'] = html_entity_decode($row->bezeichnung);
+			$item['oe_kurzbz'] = html_entity_decode($row->oe_kurzbz);
+			$result_obj[] = $item;
+		}
+		echo json_encode($result_obj);
+	}
+	exit();
+}
+?><!DOCTYPE html>
+<html>
+<head>
+	<title>Lehrveranstaltung Verwaltung</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<link rel="stylesheet" href="../../skin/jquery.css" type="text/css"/>
+	<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+	<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
+	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
+	<style>
+		.container {
+			display: flex;
+			gap: 20px;
+			width: 100%;
+		}
+		.box {
+			flex: 1;
+			padding: 20px;
+			border: 1px solid #333;
+			text-align: center;
+			width: 50%;
+		}
+		.lvDropdown {
+			width: 100%;
+		}
+		.missing-in-to td {
+			background-color: #fff3cd !important;
+		}
+		.autocomplete {
+			width: 100%;
+			box-sizing: border-box;
+		}
+		.hidden {
+			visibility: hidden;
+		}
+	</style>
+	<script>
+		$(document).ready(function () {
+
+			initBox("From");
+			initBox("To");
+
+			searchDropdownCleaner("From")
+			searchDropdownCleaner("To")
+
+			$('#kompatibleLVsUbernehmen').on("click", function() {
+
+				let lvidFrom = $('#lvDropdownFrom').val();
+				let lvidTo = $('#lvDropdownTo').val();
+				let uebernahmenCheckboxen = $("input[name='lvUebernehmenCheckbox']:checked");
+				let checkboxenUebernahmeCount = uebernahmenCheckboxen.length;
+
+				if (!lvidFrom || !lvidTo)
+				{
+					alert("Bitte in beiden Dropdowns eine LV auswählen!");
+					return;
+				}
+
+				if (checkboxenUebernahmeCount === 0)
+				{
+					alert("Bitte Kompatible LV´s auswählen die übernommen werden sollen!");
+					return;
+				}
+
+				let done = 0;
+				uebernahmenCheckboxen.each(function()
+				{
+					saveKompatibleLv(lvidTo, this.value, function() {
+						done++;
+						if (done === checkboxenUebernahmeCount)
+						{
+							$('#lvDropdownTo').trigger('change');
+						}
+					});
+				});
+			})
+		});
+
+		function searchDropdownCleaner(side)
+		{
+			let search = $("#autocomplete" + side);
+			let studiengang = $("#stgDropdown" + side);
+			let oe = $("#oeDropdown" + side);
+			let semester = $("#semDropdown" + side);
+			let lvDropdown = $("#lvDropdown" + side);
+
+			let dropdowns = [studiengang, oe, semester, lvDropdown];
+			search.on("input", function() {
+
+				if (search.val().trim().length > 0)
+				{
+					dropdowns.forEach(element => {
+						element.closest("tr").addClass("hidden");
+					});
+				}
+				else
+				{
+					dropdowns.forEach(element => {
+						element.closest("tr").removeClass("hidden");
+					});
+				}
+			})
+		}
+		function initBox(side)
+		{
+			loadSemester(side);
+
+			$('#stgDropdown' + side).on("change", function() {
+				loadSemester(side)
+			})
+
+			$('#oeDropdown' + side).on("change", function() {
+				loadLehrveranstaltungen(side)
+			})
+
+			$('#semDropdown' + side).on("change", function() {
+				loadLehrveranstaltungen(side)
+			})
+
+			$('#lvDropdown' + side).on("change", function() {
+				loadKompatibleLvs(side)
+			})
+
+			$('#kompatibleLVs' + side).tablesorter({
+				widgets: ["zebra"]
+			});
+
+			$("#autocomplete" + side).autocomplete({
+				source: "lehrveranstaltung_kompatibel_vergleichen.php?autocomplete=" + side,
+				minLength: 3,
+				response: function(event, ui) {
+					for (let i in ui.content) {
+						if (ui.content.hasOwnProperty(i))
+						{
+							let option = ui.content[i];
+							option.value = option.bezeichnung + " (" + option.lehrveranstaltung_id + "/" + option.oe_kurzbz + ")";
+							option.label = option.bezeichnung + " (" + option.lehrveranstaltung_id + "/" + option.oe_kurzbz + ")";
+						}
+					}
+				},
+				select: function(event, ui) {
+					callLoadKompatibleLvs(ui.item.lehrveranstaltung_id, side)
+					$("#lvBezeichnung" + side).html(ui.item.bezeichnung);
+				}
+			});
+
+
+		}
+
+		function loadSemester(side)
+		{
+			var studiengang_kz = $("#stgDropdown" + side).val();
+			$.ajax(
+				{
+					dataType: "json",
+					url: "../../soap/studienplan.json.php",
+					data: {
+						"method": "getSemesterFromStudiengang",
+						"studiengang_kz": studiengang_kz
+					}
+				}).success(function(data)
+			{
+				let html = "";
+
+
+				let result =  Array.isArray(data?.result) ? data.result : [];
+
+				if (result.length > 0)
+				{
+					result.forEach(function(option)
+					{
+						html+="<option value='"+ option +"'>Semester "+ option +"</option>";
+					});
+					$("#semDropdown" + side).html(html);
+				}
+
+
+				loadLehrveranstaltungen(side);
+
+
+			});
+		}
+
+
+		function loadKompatibleLvs(side)
+		{
+			let lv_id = $("#lvDropdown" + side).val();
+
+			if (lv_id == "null")
+				$("#lvBezeichnung" + side).html("")
+			else
+			{
+				let bezeichnung = $("#lvDropdown" + side + " option:selected").text();
+				$("#lvBezeichnung" + side).html(bezeichnung);
+				callLoadKompatibleLvs(lv_id, side)
+			}
+		}
+
+		function callLoadKompatibleLvs(lv_id, side)
+		{
+			$.ajax({
+				url: "lehrveranstaltung_kompatibel_vergleichen.php",
+				data: {
+					'getKompatibleLVs': true,
+					'lv_id' : lv_id
+				},
+				type: "POST",
+				dataType: "json",
+				success: function(data)
+				{
+					var html = "";
+					data.result.forEach(function(option)
+					{
+						html += "<tr data-lv-id='" + option.lehrveranstaltung_id + "'>" +
+							"<td>"+ option.lehrveranstaltung_id +"</td>" +
+							"<td>"+ option.kurzbz +"</td>" +
+							"<td>"+ option.bezeichnung +"</td>" +
+							"<td>"+ option.ects +"</td>" +
+							"<td>"+ option.studiengang_kuerzel +"</td>" +
+							"<td>"+ option.oe_bezeichnung +"</td>" +
+							(side === "From" ? "<td><input type='checkbox' name='lvUebernehmenCheckbox' value='" + option.lehrveranstaltung_id + "'></td>" : "") +
+							"<td>" +
+							"<a href='#' onclick=\"deleteKompatibleLv('" + lv_id + "', '" + option.lehrveranstaltung_id + "', '" + side + "')\">" +
+							"<img height='20' src='../../skin/images/false.png' alt='Delete'></a>" +
+							"</td>" +
+							"</tr>";
+
+					});
+					$("#kompatibleLVs" + side + " tbody").html(html);
+
+					markDifferences();
+				},
+				error: function(jqXHR, textStatus, errorThrown)
+				{
+
+				}
+			});
+		}
+
+		function markDifferences() {
+			const fromVal = $("#lvDropdownFrom").val();
+			const toVal   = $("#lvDropdownTo").val();
+
+			if (!fromVal || fromVal === "null" || !toVal || toVal === "null")
+			{
+				$("#kompatibleLVsFrom tbody tr").removeClass("missing-in-to");
+				return;
+			}
+
+			$("#kompatibleLVsFrom tbody tr").removeClass("missing-in-to");
+
+			$("#kompatibleLVsFrom tbody tr").each(function ()
+			{
+				const id = $(this).data("lv-id");
+				const existsInTo = $("#kompatibleLVsTo tbody tr[data-lv-id='" + id + "']").length > 0;
+
+				if (!existsInTo)
+				{
+					$(this).addClass("missing-in-to")
+				}
+			});
+		}
+
+
+
+		function loadLehrveranstaltungen(side)
+		{
+			let studiengang_kz = $("#stgDropdown" + side).val();
+			let semester = $("#semDropdown" + side).val();
+			let oe_kurzbz = $("#oeDropdown" + side).val();
+
+			if(oe_kurzbz === "null")
+			{
+				$.ajax(
+					{
+						dataType: "json",
+						url: "../../soap/fhcomplete.php",
+						type: "POST",
+						data: {
+							"typ": "json",
+							"class": "lehrveranstaltung",
+							"method": "load_lva",
+							"parameter_0": studiengang_kz,
+							"parameter_1": semester,
+							"parameter_2": "null",
+							"parameter_3": "null",
+							"parameter_4": "true"
+						}
+					}).success(function(data)
+				{
+					let html = "";
+					let result =  Array.isArray(data?.result) ? data.result : [];
+					if (result.length > 0)
+					{
+						result.forEach(function(option)
+						{
+							if (option.lehrveranstaltung_id !== null)
+								html+="<option value='"+ option.lehrveranstaltung_id +"'>"+ option.bezeichnung + " (" + option.lehrveranstaltung_id + "/" + option.oe_kurzbz + ") </option>";
+						});
+						$("#lvDropdown" + side).html(html);
+
+					}
+					loadKompatibleLvs(side);
+
+				});
+			}
+			else
+			{
+				$.ajax(
+					{
+						dataType: "json",
+						url: "../../soap/fhcomplete.php",
+						type: "POST",
+						data: {
+							"typ": "json",
+							"class": "lehrveranstaltung",
+							"method": "load_lva_oe",
+							"parameter_0": oe_kurzbz,
+							"parameter_1": true,
+							"parameter_2": "null",
+							"parameter_3": "bezeichnung"
+						}
+					}).success(function(data)
+				{
+					let html = "";
+					let result =  Array.isArray(data?.result) ? data.result : [];
+					if (result.length > 0)
+					{
+						result.forEach(function(option)
+						{
+							if (option.lehrveranstaltung_id !== null)
+								html+="<option value='"+ option.lehrveranstaltung_id +"'>"+ option.bezeichnung +"</option>";
+						});
+						$("#lvDropdown" + side).html(html);
+					}
+					loadKompatibleLvs(side);
+
+
+				});
+			}
+		}
+
+		function loadOrganisationseinheiten(side)
+		{
+			$.ajax(
+				{
+					dataType: "json",
+					url: "../../soap/fhcomplete.php",
+					type: "POST",
+					data: {
+						"typ": "json",
+						"class": "lehrveranstaltung",
+						"method": "load_lva",
+						"parameter_0": studiengang_kz,
+						"parameter_1": semester,
+						"parameter_2": "null",
+						"parameter_3": "null",
+						"parameter_4": "true"
+					}
+				}).success(function(data)
+			{
+				var html = "";
+				data.result.forEach(function(option)
+				{
+					html+="<option value='"+ option.lehrveranstaltung_id +"'>"+ option.bezeichnung +"</option>";
+				});
+				$("#lvDropdown" +side).html(html);
+			});
+		}
+
+		function saveKompatibleLv(lehrveranstaltung_id, kompatible_id, onComplete)
+		{
+			$.ajax(
+				{
+					dataType: "json",
+					url: "../../soap/lehrveranstaltung.json.php",
+					type: "POST",
+					data: {
+						"typ": "json",
+						"class": "lehrveranstaltung",
+						"method": "saveKompatibleLehrveranstaltung",
+						"lehrveranstaltung_id":lehrveranstaltung_id,
+						"lehrveranstaltung_id_kompatibel": kompatible_id
+					}
+				}).success(function(data)
+			{
+				if(data.error === "true")
+				{
+					alert(data.errormsg);
+				}
+
+				if (onComplete)
+					onComplete();
+
+			}).error(function(data)
+			{
+				alert(data.responseText);
+				if (onComplete)
+					onComplete();
+			});
+		}
+
+		function deleteKompatibleLv(lehrveranstaltung_id, lehrveranstaltung_id_kompatibel, side)
+		{
+			$.ajax(
+				{
+					dataType: "json",
+					url: "../../soap/lehrveranstaltung.json.php",
+					type: "POST",
+					data: {
+						"typ": "json",
+						"class": "lehrveranstaltung",
+						"method": "deleteKompatibleLehrveranstaltung",
+						"lehrveranstaltung_id":lehrveranstaltung_id,
+						"lehrveranstaltung_id_kompatibel":lehrveranstaltung_id_kompatibel
+					}
+				}).success(function(data)
+			{
+				if(data.error === "true")
+				{
+					alert(data.errormsg);
+				}
+
+				if ($('#lvDropdownFrom').val() === $('#lvDropdownTo').val())
+				{
+					$('#lvDropdownFrom').trigger('change');
+					$('#lvDropdownTo').trigger('change');
+				}
+				else
+					$('#lvDropdown' + side).trigger('change');
+			}).error(function(data)
+			{
+				alert(data.responseText);
+			});
+		}
+	</script>
+</head>
+<body>
+
+<?php
+$user = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
+if(!$rechte->isBerechtigt('lehre/lehrveranstaltung', 'suid'))
+	die('Sie haben keine Berechtigung fuer diese Seite');
+
+$studiengang = new studiengang();
+$studiengang->getAll("kurzbzlang");
+
+$organisationseinheit = new organisationseinheit();
+$organisationseinheit->getAll(true, true);
+
+echo "<div class='container'>
+		<div class='box'>
+			<div style='padding-top: 1em;'>
+					<table>
+					<tr>
+						<td><b>Suche: </b></td>
+						<td colspan='3'>
+							<input type='text' class='autocomplete' id='autocompleteFrom' placeholder='Suche...'/>
+						</td>
+					</tr>
+					<tr>
+						<td><b>Studiengang: </b></td>
+						<td>
+							<select id='stgDropdownFrom' style='margin-right: 1em;'>";
+							foreach($studiengang->result as $stg)
+							{
+								echo "<option value=".$stg->studiengang_kz.">".$stg->kuerzel." - ".$stg->kurzbzlang."</option>";
+							}
+							echo "</select>
+						</td>
+						<td><b>OE:</b></td>";
+				echo "<td>
+						<select id='oeDropdownFrom' style='margin-right: 1em;'>
+							<option value='null'>-- Keine --</option>";
+							foreach($organisationseinheit->result as $oe)
+							{
+								echo "<option value=".$oe->oe_kurzbz.">".$oe->organisationseinheittyp_kurzbz." ".$oe->bezeichnung."</option>";
+							}
+				echo "</select></td>
+				</tr>
+				<tr>
+					<td><b>Semester: </b></td>
+					<td>
+						<select id='semDropdownFrom' style='margin-right: 1em;'>
+						
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td><b>Lehrveranstaltungen: </b></td>
+					<td colspan='3'>
+						<select class='lvDropdown' id='lvDropdownFrom'></select>
+					</td>
+				</tr>
+				
+			</table>
+	</div>
+	Kompatible Lehrveranstaltungen - <span id='lvBezeichnungFrom'></span>
+	
+	<table style='width: auto;' class='tablesorter' id='kompatibleLVsFrom'>
+			<thead>
+				<tr>
+					<th>ID</th>
+					<th>Kurzbezeichnung</th>
+					<th>Bezeichnung</th>
+					<th>ECTS</th>
+					<th>Studiengang</th>
+					<th>Organisationseiheit</th>
+					<th>Übernehmen?</th>
+					<th>Löschen?</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+	</table>
+	<input type='button' id='kompatibleLVsUbernehmen' value='Übernehmen'/>
+	
+
+</div>
+<div class='box'>
+			<div style='padding-top: 1em;'>
+		
+					<table>
+					<tr>
+						<td><b>Suche: </b></td>
+						<td colspan='3'>
+							<input type='text' class='autocomplete' id='autocompleteTo' placeholder='Suche...'/>
+						</td>
+					</tr>
+					<tr>
+						<td><b>Studiengang: </b></td>
+						<td>
+							<select id='stgDropdownTo' style='margin-right: 1em;'>";
+								foreach($studiengang->result as $stg)
+								{
+									echo "<option value=".$stg->studiengang_kz.">".$stg->kuerzel." - ".$stg->kurzbzlang."</option>";
+								}
+							echo "</select>
+						</td>
+						<td><b>OE:</b></td>";
+						echo "<td>
+						<select id='oeDropdownTo' style='margin-right: 1em;'>
+							<option value='null'>-- Keine --</option>";
+							foreach($organisationseinheit->result as $oe)
+							{
+								echo "<option value=".$oe->oe_kurzbz.">".$oe->organisationseinheittyp_kurzbz." ".$oe->bezeichnung."</option>";
+							}
+						echo "</select></td>
+				</tr>
+				<tr>
+					<td><b>Semester: </b></td>
+					<td>
+						<select id='semDropdownTo' style='margin-right: 1em;'>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td><b>Lehrveranstaltungen: </b></td>
+					<td colspan='3'>
+						<select class='lvDropdown' id='lvDropdownTo'></select>
+					</td>
+				</tr>
+				
+			</table>
+	</div>
+	Kompatible Lehrveranstaltungen - <span id='lvBezeichnungTo'></span>
+	<table style='width: auto;' class='tablesorter' id='kompatibleLVsTo'>
+		<thead>
+			<tr>
+				<th>ID</th>
+				<th>Kurzbezeichnung</th>
+				<th>Bezeichnung</th>
+				<th>ECTS</th>
+				<th>Studiengang</th>
+				<th>Organisationseiheit</th>
+				<th>Löschen?</th>
+			</tr>
+		</thead>
+		<tbody></tbody>
+		
+	</table>
+</div>
+";
+
+
+echo "</body>
+	</html>";
+
+?>
diff --git a/vilesci/lehre/studienordnung.js b/vilesci/lehre/studienordnung.js
index 54fa9e81b..bf7ff34e7 100644
--- a/vilesci/lehre/studienordnung.js
+++ b/vilesci/lehre/studienordnung.js
@@ -695,15 +695,16 @@ function loadLVKompatibilitaet(lvid)
 	}).success(function(data)
 	{
 		var html='';
+		html = html+'<a href="lehrveranstaltung_kompatibel_vergleichen.php" target="_blank">kompatible Lehrveranstaltungen vergleichen</a><br><br>';
+		html = html+'<a href="lehrveranstaltung_kompatibel.php?lehrveranstaltung_id='+lvid+'&type=edit" target="_blank">kompatible Lehrveranstaltungen hinzufügen</a><br>';
 		for(i in data.result)
 		{
 			if(data.result[i])
 			{
 				lvdata = data.result[i];
 				if(!(lvdata.kurzbz===null && lvdata.bezeichnung===null && lvdata.studiengang_kz===null && lvdata.semester===null))
-					html = html+'<br>'+lvdata.kurzbz+' - '+lvdata.bezeichnung+' (Studiengang '+lvdata.studiengang_kz+', Semester '+lvdata.semester+')';
+					html = html+'<br>'+lvdata.kurzbz+' - '+lvdata.bezeichnung+' (Studiengang '+lvdata.studiengang_kz+', Semester '+lvdata.semester+')<br>';
 			}
-			html = html+'<br><br><a href="lehrveranstaltung_kompatibel.php?lehrveranstaltung_id='+lvid+'&type=edit" target="_blank">kompatible Lehrveranstaltungen hinzufügen</a>';
 		}
 		$("#tab-kompatibel").html(html);
 

From c5001f87bda7556c148332babd1efdb9647f5a05 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Aug 2025 11:03:23 +0200
Subject: [PATCH 0661/1357] modal header flex container for buttons (close,
 expand);

---
 public/js/components/Bootstrap/Modal.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 4487127de..61c5c6857 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -135,12 +135,13 @@ export default {
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<slot name="popoutButton"></slot>
-					<button type="button" class="btn ms-2" v-if="allowFullscreenExpand" @click="toggleFullscreen">
-					  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
-					  <i v-else class="fa-solid fa-compress"></i>
-					</button>
-					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<div class="d-flex align-items-center ms-auto">
+						<button type="button" class="btn ms-auto" style="filter: invert(1)" v-if="allowFullscreenExpand" @click="toggleFullscreen">
+						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+						  <i v-else class="fa-solid fa-compress"></i>
+						</button>
+						<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
 					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">

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

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

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

From ef80a19a2478ae840166c0f7d3ca3d186f6cb3a6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:22:59 +0200
Subject: [PATCH 0663/1357] allow negative studiengang_kz in prestudent and
 orgform urls

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

diff --git a/application/config/routes.php b/application/config/routes.php
index da3a45f03..f6eafbcd2 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -75,16 +75,16 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
 
 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
 
 // (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';

From 2198ea95e413d2a48334e2c2089d4935ff66737a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:51:09 +0200
Subject: [PATCH 0664/1357] use form.post instead of form.send since latter
 expects a promise

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index dc78aedb6..74b8b49bf 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -193,7 +193,7 @@ export default {
 
 			// TODO(chris): move to fhcapi.factory
 			this.$refs.form
-				.send('api/frontend/v1/stv/student/add', data)
+				.post('api/frontend/v1/stv/student/add', data)
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
 					this.$refs.modal.hide();

From a482016deec26c1281beae682b59037bbe0bdfe5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:58:41 +0200
Subject: [PATCH 0665/1357] modal-dialog-scrollable

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 74b8b49bf..8de217e00 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -213,7 +213,7 @@ export default {
 	},
 	template: `
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
+		<bs-modal ref="modal" dialog-class="modal-lg modal-dialog-scrollable" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>

From 1c86a6ad55f6f165b2e8bdc2ce5a9734cef1cd31 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 16:05:47 +0200
Subject: [PATCH 0666/1357] add validation callback wrapper method

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 21b07b755..506417ecc 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -710,4 +710,9 @@ class Student extends FHCAPI_Controller
 			return true;
 		return !!$value;
 	}
+
+	public function isValidDate($value)
+	{
+		return isValidDate($value);
+	}
 }

From 905a2dadff8ed2855d8878bbb7e11e57cf97e078 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 17:18:57 +0200
Subject: [PATCH 0667/1357] terminate with error if receiver person_id or
 prestudent_id is not found

---
 .../controllers/api/frontend/v1/messages/Messages.php  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index dbc11735a..fa6748f6a 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -418,6 +418,10 @@ class Messages extends FHCAPI_Controller
 		}
 
 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no person_id found.');
+		}
 		$person = current($data);
 
 		return $person->person_id;
@@ -432,8 +436,12 @@ class Messages extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no prestudent_id found.');
+		}
 		$student = current($data);
-	//	$this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL);
+
 		return $student->prestudent_id;
 	}
 

From ad8322839653f11c54d22c6de8edd970f66f0328 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 17:34:23 +0200
Subject: [PATCH 0668/1357] do not terminatewithsuccess in function called in
 db transaction because this results in the transaction being rollbacked

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 506417ecc..4309e88a4 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -694,7 +694,7 @@ class Student extends FHCAPI_Controller
 			return $result;
 		}*/
 
-		$this->terminateWithSuccess(true);
+		return success(true);
 	}
 
 	public function requiredIfNotPersonId($value)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From fb9f2e86fc0bacc1610125b4a70e0fce3df8c1f8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 21 Aug 2025 13:46:30 +0200
Subject: [PATCH 0678/1357] StV: tab ordering

---
 application/config/stv.php                    | 29 ++++++++++++++
 .../api/frontend/v1/stv/Config.php            | 38 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 675899108..295bb2544 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -83,3 +83,32 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 		$fieldsZgvDoktor
 	);
 }
+
+$config['student_tab_order'] = [
+	'messages',
+	'details',
+	'notes',
+	'contact',
+	'prestudent',
+	'status',
+	'documents',
+	'archive',
+	'banking',
+	'grades',
+	'exam',
+	'exemptions',
+	'finalexam',
+	'mobility',
+	'jointstudies',
+	'admissionDates',
+	'functions',
+	'resources',
+	'groups',
+	'coursedates',
+];
+$config['students_tab_order'] = [
+	'banking',
+	'status',
+	'finalexam',
+	'archive',
+];
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 2fb436384..d52016943 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -184,7 +184,9 @@ class Config extends FHCAPI_Controller
 			return $result;
 		});
 
-		$this->terminateWithSuccess($result);
+		$sortConfig = $this->config->item('student_tab_order');
+
+		$this->terminateWithSuccess($this->sortTabList($result, $sortConfig));
 	}
 
 	public function students()
@@ -231,7 +233,9 @@ class Config extends FHCAPI_Controller
 			return $result;
 		});
 
-		$this->terminateWithSuccess($result);
+		$sortConfig = $this->config->item('students_tab_order');
+
+		$this->terminateWithSuccess($this->sortTabList($result, $sortConfig));
 	}
 
 	protected function kontoColumns()
@@ -507,4 +511,34 @@ class Config extends FHCAPI_Controller
 
 		return $list;
 	}
+
+	/**
+	 * Sort tab list
+	 *
+	 * @param array		$input
+	 * @param array		$config
+	 *
+	 * @return array
+	 */
+	protected function sortTabList($input, $config)
+	{
+		// prepare config
+		if (!$config || !is_array($config))
+			$config = [];
+		else
+			$config = array_flip($config);
+
+		// fill missing items in config
+		foreach (array_keys($input) as $key) {
+			if (!isset($config[$key]))
+				$config[$key] = count($config);
+		}
+
+		// do the sorting
+		uksort($input, function ($a, $b) use ($config) {
+			return $config[$a] - $config[$b];
+		});
+		
+		return $input;
+	}
 }

From 11868d94967572ffc8ad6a7dc42c45af18aba1fc Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 21 Aug 2025 15:00:18 +0200
Subject: [PATCH 0679/1357] StV: tab final ordering

---
 application/config/stv.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 295bb2544..42afc318c 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -85,9 +85,9 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 }
 
 $config['student_tab_order'] = [
-	'messages',
 	'details',
 	'notes',
+	'messages',
 	'contact',
 	'prestudent',
 	'status',
@@ -101,14 +101,15 @@ $config['student_tab_order'] = [
 	'mobility',
 	'jointstudies',
 	'admissionDates',
-	'functions',
-	'resources',
 	'groups',
+	'functions',
 	'coursedates',
+	'resources',
 ];
 $config['students_tab_order'] = [
 	'banking',
 	'status',
+	'groups',
 	'finalexam',
 	'archive',
 ];

From 483662726deded3970b676dd4cf88da2dd21755c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 22 Aug 2025 14:40:58 +0200
Subject: [PATCH 0680/1357] abgabetool api/controller refactor; quality gates
 dbupdate script; load types from backend instead of hardcoded; WIP email
 check for externe betreuer;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 647 ++++++++++++++++++
 .../controllers/api/frontend/v1/Lehre.php     | 579 +---------------
 .../models/education/Paabgabetyp_model.php    |   6 +
 public/js/api/factory/abgabe.js               |  96 +++
 public/js/api/lehre.js                        |  75 --
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |   8 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   9 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  17 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   4 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 .../61164_abgabetool_quality_gates.php        |  29 +
 11 files changed, 805 insertions(+), 667 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Abgabe.php
 create mode 100644 public/js/api/factory/abgabe.js
 create mode 100644 system/dbupdate_3.4/61164_abgabetool_quality_gates.php

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
new file mode 100644
index 000000000..61a3b4c44
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+//require_once('../../../include/studiengang.class.php');
+//require_once('../../../include/student.class.php');
+//require_once('../../../include/datum.class.php');
+//require_once('../../../include/mail.class.php');
+//require_once('../../../include/benutzerberechtigung.class.php');
+//require_once('../../../include/phrasen.class.php');
+//require_once('../../../include/projektarbeit.class.php');
+//require_once('../../../include/projektbetreuer.class.php');
+
+class Lehre extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
+			'getStudentProjektabgaben' => self::PERM_LOGGED,
+			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
+			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
+			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
+			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'postSerientermin' => self::PERM_LOGGED,
+			'fetchDeadlines' => self::PERM_LOGGED, // TODO: mitarbeiter recht prüfen
+			'getPaAbgabetypen' => self::PERM_LOGGED
+		]);
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'abgabetool'
+			)
+		);
+
+		$this->load->helper('hlp_sancho_helper');
+
+		require_once(FHCPATH . 'include/studiengang.class.php');
+		require_once(FHCPATH . 'include/student.class.php');
+		require_once(FHCPATH . 'include/projektarbeit.class.php');
+		require_once(FHCPATH . 'include/projektbetreuer.class.php');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
+	 */
+	public function getStudentProjektabgaben() {
+		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
+
+		// TODO: error messages
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$projektarbeit_obj = new projektarbeit();
+		if($projektarbeit_id==-1)
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
+
+		// TODO: fetch zweitbetreuer
+
+		$this->terminateWithSuccess(array($ret, $paIsCurrent));
+	}
+
+	/**
+	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
+	 */
+	public function getStudentProjektarbeiten($uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		if (!isset($uid) || isEmptyString($uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+
+		if ($isMitarbeiter && $isZugeteilterBetreuer){
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
+		} else {
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
+	}
+
+
+
+	/**
+	 * projektarbeit - upload for zwischenabgaben in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitZwischenabgabe()
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
+
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
+
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+
+		} else {
+			$this->terminateWithError('File missing');
+		}
+
+	}
+
+	/**
+	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitEndupload()
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$sprache = $_POST['sprache'];
+		$abstract = $_POST['abstract'];
+		$abstract_en = $_POST['abstract_en'];
+		$schlagwoerter = $_POST['schlagwoerter'];
+		$schlagwoerter_en = $_POST['schlagwoerter_en'];
+		$seitenanzahl = $_POST['seitenanzahl'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// TODO: maybe check for other params aswell?
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				// Loads Libraries
+				$this->load->library('SignatureLib');
+
+				// Check if the document is signed
+				$signaturVorhanden = true;
+				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+				if (is_array($signList) && count($signList) > 0)
+				{
+					// The document is signed
+					$uploadedDocumentSigned = 'The document is signed';
+				}
+				elseif ($signList === null)
+				{
+					$uploadedDocumentSigned = 'WARNING: signature server error';
+				}
+				else
+				{
+					$signaturVorhanden = false;
+					$uploadedDocumentSigned = 'No document signature found';
+				}
+				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
+
+				if ($signaturVorhanden === false)
+				{
+					$this->signaturFehltEmail($student_uid);
+				}
+
+				// TODO error handle get data has data the updates
+				// update projektarbeit cols
+				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
+					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
+
+
+				// update paabgabe datum
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
+
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+
+		} else {
+			$this->terminateWithError('File missing');
+		}
+
+	}
+
+	private function signaturFehltEmail($student_uid) {
+
+
+		// Mail an Studiengang wenn keine Signatur gefunden wurde
+		$student = new student();
+		if(!$student->load($student_uid))
+			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+
+		$stg_obj = new studiengang();
+		if(!$stg_obj->load($student->studiengang_kz))
+			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
+
+		$subject = 'Abgabe ohne Signatur';
+		$tomail = $stg_obj->email;
+		$data = array(
+			'vorname' => $student->vorname,
+			'nachname' => $student->nachname,
+			'studiengang' => $stg_obj->bezeichnung
+		);
+
+		$mailres = sendSanchoMail(
+			'ParbeitsbeurteilungSiganturFehlt',
+			$data,
+			$tomail,
+			$subject,
+			'sancho_header_min_bw.jpg',
+			'sancho_footer_min_bw.jpg'
+		);
+	}
+
+	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
+
+		$projektarbeit_obj = new projektarbeit();
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError('Ungueltiger Eintrag');
+
+		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+
+		if( null === $num_rows_sem || false === $num_rows_sem )
+		{
+			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
+		}
+
+		foreach($resBetr->retval as $betreuerRow) {
+
+			// query student benutzer view for every betreuer row
+			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
+
+			// TODO: hasdata, getData etc
+
+			// 1. Begutachter mail ohne Token
+			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
+			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
+			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
+			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
+
+			$maildata = array();
+			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
+			$maildata['anrede'] = $betreuerRow->anrede;
+			$maildata['betreuer_voller_name'] = $betreuerRow->first;
+			$maildata['student_anrede'] = $studentUser->anrede;
+			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
+			$maildata['abgabetyp'] = $abgabetyp;
+			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
+			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
+			$maildata['token'] = "";
+
+			$email = $this->getBetreuerEmail($bperson_id);
+			
+			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+
+			$mailres = sendSanchoMail(
+				'ParbeitsbeurteilungEndupload',
+				$maildata,
+				$email,
+//				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
+				$subject,
+				'sancho_header_min_bw.jpg',
+				'sancho_footer_min_bw.jpg',
+				get_uid()."@".DOMAIN);
+
+			if(!$mailres)
+			{
+				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			}
+
+			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
+			if ($paabgabetyp_kurzbz == 'end')
+			{
+				// Zweitbegutachter holen
+				$zweitbegutachter = new projektbetreuer();
+				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
+
+				if ($zweitbegutachterRes)
+				{
+					$zweitbegutachterResults = $zweitbegutachter->result;
+
+					foreach ($zweitbegutachterResults as $begutachter)
+					{
+						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
+						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
+
+						if (!$tokenGenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+
+						// Zweitbegutachter (evtl. mit Token) holen
+						$zweitbegutachterMitToken = new projektbetreuer();
+						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+
+						if (!$begutachterMitTokenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+
+						// Email an Zweitbegutachter senden
+						if (isset($zweitbegutachterMitToken->result[0]))
+						{
+							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
+
+							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
+							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
+							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+							$intern = isset($begutachterMitToken->uid);
+							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
+
+							$zweitbetmaildata = array();
+							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
+							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
+							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
+							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
+							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
+							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
+							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
+							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+
+							$mailres = sendSanchoMail(
+								'ParbeitsbeurteilungEndupload',
+								$zweitbetmaildata,
+								$begutachterMitToken->email,
+								$subject,
+								'sancho_header_min_bw.jpg',
+								'sancho_footer_min_bw.jpg',
+								get_uid()."@".DOMAIN
+							);
+
+							if (!$mailres)
+							{
+								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public function getMitarbeiterProjektarbeiten() {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$boolParamStr = $this->input->get('showall');
+		$trueStrings = ['true', '1'];
+		$falseStrings = ['false', '0'];
+
+		// Handle missing or invalid parameter
+		if ($boolParamStr === null) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		$boolParamStrLower = strtolower($boolParamStr);
+
+		if (in_array($boolParamStrLower, $trueStrings, true)) {
+			$showAllBool = true;
+		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
+			$showAllBool = false;
+		} else {
+//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
+	}
+
+	public function postProjektarbeitAbgabe() {
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$datum = $_POST['datum'];
+		$fixtermin = $_POST['fixtermin'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		if($paabgabe_id == -1) {
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => $fixtermin,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			$this->terminateWithSuccess($result);
+		} else {
+			$result = $this->PaabgabeModel->update(
+				$paabgabe_id,
+				array(
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			$this->terminateWithSuccess($result);
+		}
+	}
+
+	public function deleteProjektarbeitAbgabe() {
+		$paabgabe_id = $_POST['paabgabe_id'];
+
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$result = $this->PaabgabeModel->load($paabgabe_id);
+		$result = $this->getDataOrTerminateWithError($result);
+
+		if(count($result) == 0)
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// TODO: berechtigung?
+		if($result[0]->insertvon === getAuthUID()) {
+			$result = $this->PaabgabeModel->delete($paabgabe_id);
+			$result = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithSuccess($result);
+		}
+
+		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+	}
+
+	/**
+	 * endpoint for adding the same paabgabe for multiple projektarbeiten
+	 * can be slow for large n since it queries twice per projektarbeit_id
+	 */
+	public function postSerientermin() {
+		$projektarbeit_ids = $_POST['projektarbeit_ids'];
+		$datum = $_POST['datum'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$bezeichnung = $_POST['bezeichnung'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($kurzbz) || isEmptyString($kurzbz)
+			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
+		// for each termin - good to check that in principle but should not matter in this place. if necessary
+		// duplicate abgabetermine can be easily deleted manually, also via cronjob@night.
+
+		// since this entry includes the kurzbz string match, it should have only ever mattered when there were
+		// multiple users entering the exact same set of (date, type, kurzbz) - which is a much more narrow case than the
+		// general "saveMultiple" function should handle
+
+		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
+		// and should never unintentionally happen
+
+		// TODO: check berechtigung &/|| zuordnung?
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$res = [];
+		foreach ($projektarbeit_ids as $projektarbeit_id) {
+
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => false,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			$data = $this->getDataOrTerminateWithError($result);
+
+//			$res[] = $data;
+
+			// send mail to student
+			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
+
+			$datetime = new DateTime($datum);
+			$dateEmailFormatted = $datetime->format('d.m.Y');
+
+			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
+
+			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
+			$res[] = $fullFormattedNameString;
+
+			// Prepare mail content
+			$body_fields = array(
+				'anrede' => $data[0]->anrede,
+				'anredeFillString' => $anredeFillString,
+				'datum' => $dateEmailFormatted,
+				'bezeichnung' => $bezeichnung,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'kurzbz' => $kurzbz
+			);
+
+			$email = $data[0]->uid."@".DOMAIN;
+
+			sendSanchoMail(
+				'neuerAbgabetermin',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
+			);
+		}
+
+		$this->terminateWithSuccess($res);
+
+	}
+
+	public function fetchDeadlines() {
+		$person_id = $_POST['person_id'];
+
+		if (!isset($person_id) || isEmptyString($person_id))
+			$person_id = getAuthPersonId();
+
+
+		if($person_id !== getAuthPersonId()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$result = $this->PaabgabeModel->getDeadlines($person_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getPaAbgabetypen() {
+		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
+
+		$result = $this->PaabgabetypModel->getAll();
+		$paabgabetypen = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($paabgabetypen);
+	}
+	
+	private function getBetreuerEmail($person_id) {
+		// check if betreuer is intern (fixangestellt = true)
+		// -> email: uid@DOMAIN
+		
+		// if betreuer is extern, check if there are private email contacts 
+		// in tbl_kontakt. if so, return them
+		
+		return null;
+	}
+}
+
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index d5d0282bd..10d945a3e 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -38,34 +38,9 @@ class Lehre extends FHCAPI_Controller
 		parent::__construct([
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
-			'Pruefungen' => self::PERM_LOGGED,
-			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
-			'getStudentProjektabgaben' => self::PERM_LOGGED,
-			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
-			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
-			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
-			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'postSerientermin' => self::PERM_LOGGED,
-			'fetchDeadlines' => self::PERM_LOGGED // TODO: mitarbeiter recht prüfen
+			'Pruefungen' => self::PERM_LOGGED
 		]);
-
-		$this->load->library('PhrasesLib');
-
-		$this->loadPhrases(
-			array(
-				'global',
-				'ui',
-				'abgabetool'
-			)
-		);
-
-		$this->load->helper('hlp_sancho_helper');
 		
-		require_once(FHCPATH . 'include/studiengang.class.php');
-		require_once(FHCPATH . 'include/student.class.php');
-		require_once(FHCPATH . 'include/projektarbeit.class.php');
-		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -125,557 +100,5 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
-
-	/**
-	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
-	 */
-	public function getStudentProjektabgaben() {
-		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
-
-		// TODO: error messages
-		
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$projektarbeit_obj = new projektarbeit();
-		if($projektarbeit_id==-1)
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
-		
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
-		
-		// TODO: fetch zweitbetreuer
-		
-		$this->terminateWithSuccess(array($ret, $paIsCurrent));
-	}
-
-	/**
-	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
-	 */
-	public function getStudentProjektarbeiten($uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		if (!isset($uid) || isEmptyString($uid))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
-		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
-		
-		if ($isMitarbeiter && $isZugeteilterBetreuer){
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
-		} else {
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
-		}
-
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));	
-	}
-	
-	
-
-	/**
-	 * projektarbeit - upload for zwischenabgaben in cis4 student abgabetool
-	 */
-	public function postStudentProjektarbeitZwischenabgabe() 
-	{
-
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-			
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
-
-				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
-
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-				
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-				$this->terminateWithSuccess($res);
-			} else {
-				$this->terminateWithError('Error moving File');
-			}
-			
-		} else {
-			$this->terminateWithError('File missing');
-		}
-		
-	}
-
-	/**
-	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
-	 */
-	public function postStudentProjektarbeitEndupload() 
-	{
-
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$sprache = $_POST['sprache'];
-		$abstract = $_POST['abstract'];
-		$abstract_en = $_POST['abstract_en'];
-		$schlagwoerter = $_POST['schlagwoerter'];
-		$schlagwoerter_en = $_POST['schlagwoerter_en'];
-		$seitenanzahl = $_POST['seitenanzahl'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		// TODO: maybe check for other params aswell?
-
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
-
-				// Loads Libraries
-				$this->load->library('SignatureLib');
-				
-				// Check if the document is signed
-				$signaturVorhanden = true;
-				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-				if (is_array($signList) && count($signList) > 0)
-				{
-					// The document is signed
-					$uploadedDocumentSigned = 'The document is signed';
-				}
-				elseif ($signList === null)
-				{
-					$uploadedDocumentSigned = 'WARNING: signature server error';
-				}
-				else
-				{
-					$signaturVorhanden = false;
-					$uploadedDocumentSigned = 'No document signature found';
-				}
-				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
-
-				if ($signaturVorhanden === false)
-				{
-					$this->signaturFehltEmail($student_uid);
-				}
-				
-				// TODO error handle get data has data the updates
-				// update projektarbeit cols
-				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
-					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
-
-				
-				// update paabgabe datum
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-				
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-
-				$this->terminateWithSuccess($res);
-			} else {
-				$this->terminateWithError('Error moving File');
-			}
-
-		} else {
-			$this->terminateWithError('File missing');
-		}
-		
-	}
-
-	private function signaturFehltEmail($student_uid) {
-		
-		
-		// Mail an Studiengang wenn keine Signatur gefunden wurde
-		$student = new student();
-		if(!$student->load($student_uid))
-			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
-
-		$stg_obj = new studiengang();
-		if(!$stg_obj->load($student->studiengang_kz))
-			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
-
-		$subject = 'Abgabe ohne Signatur';
-		$tomail = $stg_obj->email;
-		$data = array(
-			'vorname' => $student->vorname,
-			'nachname' => $student->nachname,
-			'studiengang' => $stg_obj->bezeichnung
-		);
-
-		$mailres = sendSanchoMail(
-			'ParbeitsbeurteilungSiganturFehlt',
-			$data,
-			$tomail,
-			$subject,
-			'sancho_header_min_bw.jpg',
-			'sancho_footer_min_bw.jpg'
-		);
-	}
-	
-	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
-
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		
-		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
-
-		$projektarbeit_obj = new projektarbeit();
-
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError('Ungueltiger Eintrag');
-
-		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
-
-		if( null === $num_rows_sem || false === $num_rows_sem )
-		{
-			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
-		}
-		
-		foreach($resBetr->retval as $betreuerRow) {
-
-			// query student benutzer view for every betreuer row
-			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
-			
-			// TODO: hasdata, getData etc
-
-			// 1. Begutachter mail ohne Token
-			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
-			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
-			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
-			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
-
-			$maildata = array();
-			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
-			$maildata['anrede'] = $betreuerRow->anrede;
-			$maildata['betreuer_voller_name'] = $betreuerRow->first;
-			$maildata['student_anrede'] = $studentUser->anrede;
-			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
-			$maildata['abgabetyp'] = $abgabetyp;
-			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
-			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
-			$maildata['token'] = "";
-			
-			$mailres = sendSanchoMail(
-				'ParbeitsbeurteilungEndupload',
-				$maildata,
-				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
-				$subject,
-				'sancho_header_min_bw.jpg',
-				'sancho_footer_min_bw.jpg',
-				get_uid()."@".DOMAIN);
-
-			if(!$mailres)
-			{
-				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-			}
-
-			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
-			if ($paabgabetyp_kurzbz == 'end')
-			{
-				// Zweitbegutachter holen
-				$zweitbegutachter = new projektbetreuer();
-				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
-
-				if ($zweitbegutachterRes)
-				{
-					$zweitbegutachterResults = $zweitbegutachter->result;
-
-					foreach ($zweitbegutachterResults as $begutachter)
-					{
-						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
-						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
-
-						if (!$tokenGenRes)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						// Zweitbegutachter (evtl. mit Token) holen
-						$zweitbegutachterMitToken = new projektbetreuer();
-						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
-
-						if (!$begutachterMitTokenRes)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						// Email an Zweitbegutachter senden
-						if (isset($zweitbegutachterMitToken->result[0]))
-						{
-							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
-
-							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
-							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-							$intern = isset($begutachterMitToken->uid);
-							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
-
-							$zweitbetmaildata = array();
-							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
-							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
-							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
-							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
-							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
-							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
-							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
-							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
-							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-							
-							$mailres = sendSanchoMail(
-								'ParbeitsbeurteilungEndupload',
-								$zweitbetmaildata,
-								$begutachterMitToken->email,
-								$subject,
-								'sancho_header_min_bw.jpg',
-								'sancho_footer_min_bw.jpg',
-								get_uid()."@".DOMAIN
-							);
-
-							if (!$mailres)
-							{
-								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public function getMitarbeiterProjektarbeiten() {
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		$boolParamStr = $this->input->get('showall');
-		$trueStrings = ['true', '1'];
-		$falseStrings = ['false', '0'];
-
-		// Handle missing or invalid parameter
-		if ($boolParamStr === null) {
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		}
-		$boolParamStrLower = strtolower($boolParamStr);
-
-		if (in_array($boolParamStrLower, $trueStrings, true)) {
-			$showAllBool = true;
-		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
-			$showAllBool = false;
-		} else {
-//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		}
-		
-		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
-		
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
-	}
-	
-	public function postProjektarbeitAbgabe() {
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$datum = $_POST['datum'];
-		$fixtermin = $_POST['fixtermin'];
-		$kurzbz = $_POST['kurzbz'];
-
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		
-		if($paabgabe_id == -1) {
-			$result = $this->PaabgabeModel->insert(
-				array(
-					'projektarbeit_id' => $projektarbeit_id,
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'fixtermin' => $fixtermin,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'insertvon' => getAuthUID(),
-					'insertamum' => date('Y-m-d H:i:s')
-				)
-			);
-			
-			$this->terminateWithSuccess($result);
-		} else {
-			$result = $this->PaabgabeModel->update(
-				$paabgabe_id,
-				array(
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				)
-			);
-
-			$this->terminateWithSuccess($result);
-		}
-	}
-	
-	public function deleteProjektarbeitAbgabe() {
-		$paabgabe_id = $_POST['paabgabe_id'];
-		
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		$result = $this->PaabgabeModel->load($paabgabe_id);
-		$result = $this->getDataOrTerminateWithError($result);
-		
-		if(count($result) == 0) 
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		// TODO: berechtigung?
-		if($result[0]->insertvon === getAuthUID()) {
-			$result = $this->PaabgabeModel->delete($paabgabe_id);
-			$result = $this->getDataOrTerminateWithError($result);
-			$this->terminateWithSuccess($result);
-		}
-
-		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-	}
-
-	/**
-	 * endpoint for adding the same paabgabe for multiple projektarbeiten
-	 * can be slow for large n since it queries twice per projektarbeit_id
-	 */
-	public function postSerientermin() {
-		$projektarbeit_ids = $_POST['projektarbeit_ids'];
-		$datum = $_POST['datum'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$bezeichnung = $_POST['bezeichnung'];
-		$kurzbz = $_POST['kurzbz'];
-
-		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($kurzbz) || isEmptyString($kurzbz)
-			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
-		// for each termin - good to check that in principle but should not matter in this place. if necessary
-		// duplicate abgabetermine can be easily deleted manually, also via cronjob@night.
-		
-		// since this entry includes the kurzbz string match, it should have only ever mattered when there were
-		// multiple users entering the exact same set of (date, type, kurzbz) - which is a much more narrow case than the
-		// general "saveMultiple" function should handle
-		
-		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
-		// and should never unintentionally happen
-		
-		// TODO: check berechtigung &/|| zuordnung?
-		
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		
-		$res = [];
-		foreach ($projektarbeit_ids as $projektarbeit_id) {
-			
-			$result = $this->PaabgabeModel->insert(
-				array(
-					'projektarbeit_id' => $projektarbeit_id,
-					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'fixtermin' => false,
-					'datum' => $datum,
-					'kurzbz' => $kurzbz,
-					'insertvon' => getAuthUID(),
-					'insertamum' => date('Y-m-d H:i:s')
-				)
-			);
-			
-			$data = $this->getDataOrTerminateWithError($result);
-			
-//			$res[] = $data;
-
-			// send mail to student
-			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
-			$data = $this->getDataOrTerminateWithError($result);
-
-//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
-			
-			$datetime = new DateTime($datum);
-			$dateEmailFormatted = $datetime->format('d.m.Y');
-			
-			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
-			
-			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
-			$res[] = $fullFormattedNameString;
-			
-			// Prepare mail content
-			$body_fields = array(
-				'anrede' => $data[0]->anrede,
-				'anredeFillString' => $anredeFillString,
-				'datum' => $dateEmailFormatted,
-				'bezeichnung' => $bezeichnung,
-				'fullFormattedNameString' => $fullFormattedNameString,
-				'kurzbz' => $kurzbz
-			);
-
-			$email = $data[0]->uid."@".DOMAIN;
-			
-			sendSanchoMail(
-				'neuerAbgabetermin',
-				$body_fields,
-				$email,
-				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
-			);
-		}
-		
-		$this->terminateWithSuccess($res);
-		
-	}
-	
-	public function fetchDeadlines() {
-		$person_id = $_POST['person_id'];
-		
-		if (!isset($person_id) || isEmptyString($person_id))
-			$person_id = getAuthPersonId();
-		
-		
-		if($person_id !== getAuthPersonId()) {
-			$this->load->library('PermissionLib');
-			$isAdmin = $this->permissionlib->isBerechtigt('admin');
-			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
-		}
-
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$result = $this->PaabgabeModel->getDeadlines($person_id);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }
 
diff --git a/application/models/education/Paabgabetyp_model.php b/application/models/education/Paabgabetyp_model.php
index b672a3f0e..fce46b3a0 100644
--- a/application/models/education/Paabgabetyp_model.php
+++ b/application/models/education/Paabgabetyp_model.php
@@ -11,4 +11,10 @@ class Paabgabetyp_model extends DB_Model
 		$this->dbTable = 'campus.tbl_paabgabetyp';
 		$this->pk = 'paabgabetyp_kurzbz';
 	}
+	
+	public function getAll() {
+		$qry = "SELECT * FROM campus.tbl_paabgabetyp";
+
+		return $this->execReadOnlyQuery($qry);
+	}
 }
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
new file mode 100644
index 000000000..15c7dee43
--- /dev/null
+++ b/public/js/api/factory/abgabe.js
@@ -0,0 +1,96 @@
+export default {
+	getStudentProjektarbeiten(uid) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getStudentProjektarbeiten',
+			params: { uid }
+		};
+	},
+	getStudentProjektabgaben(detail) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getStudentProjektabgaben',
+			params: { projektarbeit_id: detail.projektarbeit_id, student_uid: detail.student_uid }
+		};
+	},
+	postStudentProjektarbeitEndupload(formData) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitEndupload',
+			params: { formData },
+			config: {Headers: { "Content-Type": "multipart/form-data" }}
+		};
+		
+		// const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitEndupload';
+		// const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		// return this.$fhcApi.post(url, formData, headers)
+	},
+	postStudentProjektarbeitZwischenabgabe(formData) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitZwischenabgabe',
+			params: { formData },
+			config: {Headers: { "Content-Type": "multipart/form-data" }}
+		};
+		
+		// const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitZwischenabgabe';
+		// const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		// return this.$fhcApi.post(url, formData, headers)
+	},
+	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
+		// TODO: check if this is fine with new api scheme
+		
+		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
+
+		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
+	},
+	getMitarbeiterProjektarbeiten(all) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getMitarbeiterProjektarbeiten',
+			params: { showall: all }
+		};
+	},
+	postProjektarbeitAbgabe(termin) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postProjektarbeitAbgabe',
+			params: { 
+				paabgabe_id: termin.paabgabe_id,
+				paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
+				datum: termin.datum,
+				fixtermin: termin.fixtermin,
+				insertvon: termin.insertvon,
+				kurzbz: termin.kurzbz,
+				projektarbeit_id: termin.projektarbeit_id 
+			}
+		};
+	},
+	deleteProjektarbeitAbgabe(paabgabe_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabe',
+			params: { paabgabe_id }
+		};
+	},
+	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postSerientermin',
+			params: { datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids }
+		};
+	},
+	fetchDeadlines(person_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/fetchDeadlines',
+			params: { person_id }
+		};
+	},
+	getPaAbgabetypen() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getPaAbgabetypen'
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 5797a2c75..cd7129d61 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -18,80 +18,5 @@ export default {
 			`/api/frontend/v1/Lehre/Pruefungen/${lehrveranstaltung_id}`
 			, {}
 		);
-	},
-	getStudentProjektarbeiten(uid) {
-		return this.$fhcApi.get(
-			`/api/frontend/v1/Lehre/getStudentProjektarbeiten/${uid}`
-			, {}
-		);
-	},
-	getStudentProjektabgaben(detail) {
-		return this.$fhcApi.get(
-			`/api/frontend/v1/Lehre/getStudentProjektabgaben`
-			, {
-				projektarbeit_id: detail.projektarbeit_id,
-				student_uid: detail.student_uid
-			}
-		);
-	},
-	postStudentProjektarbeitEndupload(formData) {
-		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitEndupload';
-		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
-		return this.$fhcApi.post(url, formData, headers)
-	},
-	postStudentProjektarbeitZwischenabgabe(formData) {
-		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitZwischenabgabe';
-		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
-		return this.$fhcApi.post(url, formData, headers)
-	},
-	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
-		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
-
-		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
-	},
-	getMitarbeiterProjektarbeiten(uid, all) {
-		return this.$fhcApi.get(
-			`/api/frontend/v1/Lehre/getMitarbeiterProjektarbeiten?showall=${all}`
-			, {}
-		);
-	},
-	postProjektarbeitAbgabe(termin) {
-		const payload = {
-			paabgabe_id: termin.paabgabe_id,
-			paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
-			datum: termin.datum,
-			fixtermin: termin.fixtermin,
-			insertvon: termin.insertvon,
-			kurzbz: termin.kurzbz,
-			projektarbeit_id: termin.projektarbeit_id
-		}
-		const url = '/api/frontend/v1/Lehre/postProjektarbeitAbgabe';
-
-		return this.$fhcApi.post(url, payload, null)
-		
-	},
-	deleteProjektarbeitAbgabe(paabgabe_id) {
-		const payload = {
-			paabgabe_id
-		}
-		const url = '/api/frontend/v1/Lehre/deleteProjektarbeitAbgabe';
-
-		return this.$fhcApi.post(url, payload, null)
-	},
-	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids) {
-		const payload = {
-			datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids
-		}
-		const url = '/api/frontend/v1/Lehre/postSerientermin';
-
-		return this.$fhcApi.post(url, payload, null)
-	},
-	fetchDeadlines(person_id) {
-		const payload = {
-			person_id
-		}
-		const url = '/api/frontend/v1/Lehre/fetchDeadlines';
-
-		return this.$fhcApi.post(url, payload, null)
 	}
   }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 0900282ef..70b86e60f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -55,7 +55,7 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
-			this.$fhcApi.factory.lehre.postProjektarbeitAbgabe(termin).then( (res) => {
+			this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
 
@@ -86,7 +86,7 @@ export const AbgabeMitarbeiterDetail = {
 			})
 		},
 		deleteTermin(termin) {
-			this.$fhcApi.factory.lehre.deleteProjektarbeitAbgabe(termin.paabgabe_id).then( (res) => {
+			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
 					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
@@ -108,7 +108,9 @@ export const AbgabeMitarbeiterDetail = {
 			return true;
 		},
 		downloadAbgabe(termin) {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+			// TODO: test
+			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+			// this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
 		dateDiffInDays(datum, today){
 			const oneDayMs = 1000 * 60 * 60 * 24
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 1eb5d099c..107138962 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -74,7 +74,7 @@ export const AbgabeStudentDetail = {
 			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
 				formData.append('file', this.enduploadTermin.file[i]);
 			}
-			this.$fhcApi.factory.lehre.postStudentProjektarbeitEndupload(formData)
+			this.$api.call(ApiAbgabe.postStudentProjektarbeitEndupload(formData))
 				.then(res => {
 					this.handleUploadRes(res)
 				})
@@ -82,7 +82,9 @@ export const AbgabeStudentDetail = {
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+			// TODO: test
+			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+			// this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
 		formatDate(dateParam) {
 			const date = new Date(dateParam)
@@ -117,7 +119,8 @@ export const AbgabeStudentDetail = {
 				for (let i = 0; i < termin.file.length; i++) {
 					formData.append('file', termin.file[i]);
 				}
-				this.$fhcApi.factory.lehre.postStudentProjektarbeitZwischenabgabe(formData)
+
+				this.$api.call(ApiAbgabe.postStudentProjektarbeitZwischenabgabe(formData))
 					.then(res => {
 						this.handleUploadRes(res)
 					})
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 341d61920..a102e6e28 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -3,6 +3,7 @@ import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
+import ApiAbgabe from '../../../api/abgabe.js'
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -176,13 +177,13 @@ export const AbgabetoolMitarbeiter = {
 		},
 		addSeries() {
 			this.saving = true
-			this.$fhcApi.factory.lehre.postSerientermin(
+			this.$api.call(ApiAbgabe.postSerientermin(
 				this.serienTermin.datum.toISOString(),
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
 				this.selectedData?.map(projekt => projekt.projektarbeit_id)
-			).then(res => {
+			)).then(res => {
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
 					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
@@ -321,7 +322,7 @@ export const AbgabetoolMitarbeiter = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten(all = false, callback) {
-			this.$fhcApi.factory.lehre.getMitarbeiterProjektarbeiten(this.viewData?.uid ?? null, all)
+			this.$api.call(ApiAbgabe.getMitarbeiterProjektarbeiten(all))
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				}).finally(() => {
@@ -332,7 +333,7 @@ export const AbgabetoolMitarbeiter = {
 		},
 		loadAbgaben(details) {
 			return new Promise((resolve) => {
-				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+				this.$api.call(ApiAbgabe.getStudentProjektabgaben(details))
 					.then(res => {
 						resolve(res)
 					})
@@ -369,7 +370,13 @@ export const AbgabetoolMitarbeiter = {
 
 	},
 	created() {
-
+		// fetch abgabetypen options
+		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
+			this.paabgabetypOptions = res.data
+			this.tabulatorCanBeBuilt = true // because promises would be more work and not much better here
+		}).catch(e => {
+			this.loading = false
+		})
 	},
 	mounted() {
 		this.setupMounted()
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index d1eab7c6e..3890f2764 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -186,14 +186,14 @@ export const AbgabetoolStudent = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten() {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null)
+			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null))
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})
 		},
 		loadAbgaben(details) {
 			return new Promise((resolve) => {
-				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+				this.$api.call(ApiAbgabe.getStudentProjektabgaben(details))
 					.then(res => {
 						resolve(res)
 					})
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index d2b133979..67f692f84 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -84,7 +84,7 @@ export const DeadlineOverview = {
 			this.tableBuiltResolve = resolve
 		},
 		loadDeadlines() {
-			this.$fhcApi.factory.lehre.fetchDeadlines(this.person_uid_prop ??  null)
+			this.$api.call(ApiAbgabe.fetchDeadlines(this.person_uid_prop ??  null))
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
new file mode 100644
index 000000000..1341b3c5f
--- /dev/null
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -0,0 +1,29 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// add campus.tbl_paabgabetyp options for Quality Gates
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate1'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung) VALUES('qualgate1', 'Quality Gate 1');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp quality gate 1 hinzugefuegt';
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung) VALUES('qualgate2', 'Quality Gate 2');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp quality gate 2 hinzugefuegt';
+	}
+}

From 531fae8ab5834946e1b68eb4de061943502dcc9b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sat, 23 Aug 2025 16:46:26 +0200
Subject: [PATCH 0681/1357] enabled filling out UHSTAT1 form for logged in
 students

---
 application/controllers/codex/UHSTAT1.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index ff59ef41a..c290b098a 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -34,6 +34,7 @@ class UHSTAT1 extends FHC_Controller
 		// load models
 		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('system/Sprache_model', 'SpracheModel');
 		$this->load->model('codex/Abschluss_model', 'AbschlussModel');
 		$this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel');
@@ -430,6 +431,17 @@ class UHSTAT1 extends FHC_Controller
 		)
 			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
 
+		// ...check if student is successfully logged in
+		$loggedInPersonId = getAuthPersonId();
+		if (isset($loggedInPersonId) && is_numeric($loggedInPersonId))
+		{
+			// check if the the user is a student and if the benutzer is active
+			$this->StudentModel->addSelect('1');
+			$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
+			$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]);
+			if (hasData($res)) return $loggedInPersonId;
+		}
+
 		// if person id passed directly...
 		$person_id = $this->input->post('person_id');
 		if (!isset($person_id)) $person_id = $this->input->get('person_id');

From 1025a8b461f24859524d764737c13318842665ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 25 Aug 2025 11:19:20 +0200
Subject: [PATCH 0682/1357] Removed Duplicate Phrase

---
 system/phrasesupdate.php | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 49b05b7ef..dd23a1c4a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33827,11 +33827,11 @@ array(
 			array(
 				'sprache' => 'German',
 				'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt.
-				
+
 					Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen.
-					
+
 					Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen.
-					
+
 					Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen',
 				'description' => '',
 				'insertvon' => 'system'
@@ -33841,35 +33841,15 @@ array(
 				'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student.
 
 					When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually.
-					
+
 					Scrolling within the timeline changes the visual spacing between individual days.
-					
+
 					Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
 	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'lehreinheit_id',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Teil ID',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Teaching unit ID',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From e79b7a525f7864d6bd2724e0f1f64e494eb6a3ba Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 26 Aug 2025 11:41:10 +0200
Subject: [PATCH 0683/1357] pruefung bestaetigen bestaetigungsmail schicken
 ermoeglicht

---
 cis/private/lehre/pruefung/pruefung.js.php    | 58 ++++++++++++---
 .../pruefung/pruefungsanmeldung.json.php      | 74 ++++++++++++++++++-
 .../pruefungsanmeldungen_verwalten.php        | 22 +++---
 locale/de-AT/pruefung.php                     | 10 +++
 locale/en-US/pruefung.php                     |  9 +++
 5 files changed, 145 insertions(+), 28 deletions(-)

diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
index f2fc2dc7e..73b808d14 100644
--- a/cis/private/lehre/pruefung/pruefung.js.php
+++ b/cis/private/lehre/pruefung/pruefung.js.php
@@ -863,7 +863,8 @@ function writeAnmeldungen(data, showMessage = true)
 		});
 		liste += "</ul>";
 		$("#anmeldung_hinzufuegen").html("<input id='anmeldung_hinzufuegen_uid' type='text' placeholder='StudentIn-UID' /><input type='button' value='<?php echo $p->t('global/hinzufuegen'); ?>' onclick='saveAnmeldung(\""+lehrveranstaltung_id+"\",\""+terminId+"\");'/>");
-		$("#reihungSpeichernButton").html("<input type='button' value='<?php echo $p->t('pruefung/reihungSpeichern'); ?>' onclick='saveReihung(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'><input type='button' value='<?php echo $p->t('pruefung/alleBestaetigen'); ?>' onclick='alleBestaetigen(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'>");
+		$("#reihungSpeichernButton").html("<label for='emails'>E-Mail: <input type='email' id='emails' multiple /> <br /><br />" +
+			"<input type='button' value='<?php echo $p->t('pruefung/reihungSpeichern'); ?>' onclick='saveReihung(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'><input type='button' value='<?php echo $p->t('pruefung/alleBestaetigen'); ?>' onclick='alleBestaetigen(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'>");
 		$("#lvdaten").html(lv_bezeichnung+" ("+prf_termin+")");
 		$("#anmeldeDaten").html(liste);
 		$("#listeDrucken").html(listenLinks);
@@ -1036,6 +1037,30 @@ function anmeldungLoeschen(pruefungsanmeldung_id, termin_id, lehrveranstaltung_i
  */
 function alleBestaetigen(termin_id, lehrveranstaltung_id)
 {
+	const input = $('#emails').val();
+
+	let emails = '';
+	if (input)
+	{
+		emails = input.split(",").map(s => s.trim());
+		const re = /^([\w-+]+(?:\.[\w-+]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
+
+		let valid = true;
+		$.each(emails, function(index, email)
+		{
+			if (re.test(email) === false)
+			{
+				alert("<?php echo $p->t('pruefung/bitteEmailAngeben')?>");
+				valid = false;
+				return false;
+			}
+		});
+
+		if (!valid)
+			return false;
+
+	}
+
 	$.ajax({
 		dataType: 'json',
 		url: "./pruefungsanmeldung.json.php",
@@ -1043,7 +1068,8 @@ function alleBestaetigen(termin_id, lehrveranstaltung_id)
 		data: {
 			method: "alleBestaetigen",
 			termin_id: termin_id,
-			lehrveranstaltung_id: lehrveranstaltung_id
+			lehrveranstaltung_id: lehrveranstaltung_id,
+			emails: emails
 		},
 		error: loadError,
 		success: function(data){
@@ -1115,15 +1141,12 @@ function loadStudiengaenge()
 }
 
 /**
- * Lädt alle Prüfungen zu einem Studiengang
- * @param {type} studiengang_kz Studiengangskennzahl
+ * Lädt alle Prüfungen zu einem Studiensemester
+ * @param {type} studiensemester Studiensemester
  * @returns {undefined}
  */
-function loadPruefungStudiengang(studiengang_kz, studiensemester)
+function loadPruefungStudiengang(studiensemester)
 {
-	if(studiengang_kz === undefined)
-		studiengang_kz = $("#select_studiengang option:selected").val();
-
 	if(studiensemester === undefined)
 		studiensemester = $("#filter_studiensemester option:selected").val();
 
@@ -1132,8 +1155,7 @@ function loadPruefungStudiengang(studiengang_kz, studiensemester)
 		url: "./pruefungsanmeldung.json.php",
 		type: "POST",
 		data: {
-			method: "getPruefungenStudiengang",
-			studiengang_kz: studiengang_kz,
+			method: "getPruefungenStudiensemester",
 			studiensemester: studiensemester
 		},
 		error: loadError,
@@ -1148,7 +1170,14 @@ function loadPruefungStudiengang(studiengang_kz, studiensemester)
 
 					data.result.forEach(function(e)
 					{
-						let termine = e?.pruefung[0]?.termine || [];
+						let termine = [];
+						if (e.pruefung) {
+							e.pruefung.forEach(p => {
+								if (p.termine) {
+									termine = termine.concat(p.termine);
+								}
+							});
+						}
 
 						if (termine.length === 0)
 						{
@@ -1169,7 +1198,12 @@ function loadPruefungStudiengang(studiengang_kz, studiensemester)
 
 								rows += `
 									<tr>
-										<td><input type="checkbox" /></td>
+										<td><input type="checkbox"
+											class="termin-checkbox"
+											data-termin-id="${d.pruefungstermin_id}"
+											data-lv-id="${e.lehrveranstaltung_id}"
+											data-datum="${vonDate}"
+										/></td>
 										<td>${e.studiengang}</td>
 										<td>${e.bezeichnung}</td>
 										<td>${vonDate}</td>
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
index 54c064d14..c286f666e 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
@@ -106,7 +106,7 @@ switch($method)
 	case 'getStudiengaenge':
 		$data = getStudiengaenge();
 		break;
-	case 'getPruefungenStudiengang':
+	case 'getPruefungenStudiensemester':
 		$studiensemester = filter_input(INPUT_POST,"studiensemester");
 		$data = getPruefungenStudiengangBySemester($studiensemester);
 		break;
@@ -966,9 +966,13 @@ function alleBestaetigen($uid)
 	global $p;
 	$lehrveranstaltung_id = $_REQUEST["lehrveranstaltung_id"];
 	$pruefungstermin_id = $_REQUEST["termin_id"];
+	$emails = $_REQUEST["emails"];
 	$pruefungstermin = new pruefungstermin($pruefungstermin_id);
 	$pruefungsanmeldung = new pruefungsanmeldung();
 	$pranmeldungen = $pruefungsanmeldung->getAnmeldungenByTermin($pruefungstermin_id, $lehrveranstaltung_id);
+
+	$mail_benutzer = [];
+	$mail_inhalt = [];
 	foreach($pranmeldungen as $a)
 	{
 		$anmeldung = new pruefungsanmeldung($a->pruefungsanmeldung_id);
@@ -982,6 +986,13 @@ function alleBestaetigen($uid)
 				$ma = new mitarbeiter($uid);
 				$datum = new datum();
 				$ort = new ort($termin->ort_kurzbz);
+
+				$ortbezeichnung = $ort->bezeichnung;
+				if (is_null($termin->ort_kurzbz) && !is_null($termin->anderer_raum))
+				{
+					$ortbezeichnung = $termin->anderer_raum;
+				}
+
 				$pruefung = new pruefungCis($termin->pruefung_id);
 
 				$to = $anm->uid."@".DOMAIN;
@@ -1001,17 +1012,66 @@ function alleBestaetigen($uid)
 				}
 				else
 					$html .= $p->t('pruefung/emailBodyTermin')." ".$datum->formatDatum($termin->von, "d.m.Y")." ".$p->t('pruefung/emailBodyUm')." ".$datum->formatDatum($termin->von, "H:i")."<br>";
-				$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ort->bezeichnung."<br>";
+				$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ortbezeichnung."<br>";
 				$html .= "<br>";
 				$html .= "<a href='".APP_ROOT."cis/private/lehre/pruefung/pruefungsanmeldung.php'>".$p->t('pruefung/emailBodyLinkZurAnmeldung')."</a><br>";
 				$html .= "<br>";
 
+				$mail_benutzer[] = [
+					'uid' => $anm->uid
+				];
+
+				if (empty($mail_inhalt))
+				{
+					$mail_inhalt = array(
+						'von' => $ma->vorname." ".$ma->nachname,
+						'lv' => $lv->bezeichnung,
+						'ort' => $ortbezeichnung,
+						'datum' => $datum->formatDatum($termin->von, "d.m.Y") . ' ' . $p->t('pruefung/emailBodyUm') . ' ' . (isset($von) ? $von : $datum->formatDatum($termin->von, "H:i")),
+						'dauer' => $pruefung->einzeln ? ($pruefung->pruefungsintervall . ' ' . $p->t('pruefung/emailBodyMinuten')): '');
+				}
+
 				$mail = new mail($to, $from, $subject,$p->t('pruefung/emailBodyBitteHtmlSicht'));
 				$mail->setHTMLContent($html);
 				$mail->send();
 			}
 		}
 	}
+
+	if (!empty($emails) && !empty($mail_inhalt))
+	{
+		foreach ($emails as $email)
+		{
+			$from = "noreply@".DOMAIN;
+			$subject = $p->t('pruefung/emailSubjectAnmeldungBestaetigung');
+			$html = $p->t('pruefung/sammelemailBody',array($mail_inhalt['lv'], $mail_inhalt['datum'], $mail_inhalt['von']));
+
+			if ($mail_inhalt['ort'])
+			{
+				$html .= $p->t('pruefung/sammelemailBody2',array($mail_inhalt['ort']));
+			}
+
+			$html .= "<br /><table border='1'>
+						<thead>
+							<tr>
+								<th>UID</th>
+							</tr>
+						</thead>
+						<tbody>";
+
+			foreach($mail_benutzer as $benutzer)
+			{
+				$html .= "<tr>
+							<td>" . htmlspecialchars($benutzer['uid']) . "</td>
+						</tr>";
+			}
+			$html .= "</tbody></table><br />";
+
+			$mail = new mail($email, $from, $subject, $p->t('pruefung/emailBodyBitteHtmlSicht'));
+			$mail->setHTMLContent($html);
+			$mail->send();
+		}
+	}
 	$data['result']=true;
 	$data['error']='false';
 	$data['errormsg']='';
@@ -1038,6 +1098,12 @@ function anmeldungBestaetigen($uid)
 	$ort = new ort($termin->ort_kurzbz);
 	$pruefung = new pruefungCis($termin->pruefung_id);
 
+	$ortbezeichnung = $ort->bezeichnung;
+	if (is_null($termin->ort_kurzbz) && !is_null($termin->anderer_raum))
+	{
+		$ortbezeichnung = $termin->anderer_raum;
+	}
+
 	$to = $anmeldung->uid."@".DOMAIN;
 	$from = "noreply@".DOMAIN;
 	$subject = $p->t('pruefung/emailSubjectAnmeldungBestaetigung');
@@ -1055,7 +1121,7 @@ function anmeldungBestaetigen($uid)
 	}
 	else
 		$html .= $p->t('pruefung/emailBodyTermin')." ".$datum->formatDatum($termin->von, "d.m.Y")." ".$p->t('pruefung/emailBodyUm')." ".$datum->formatDatum($termin->von, "H:i")."<br>";
-	$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ort->bezeichnung."<br>";
+	$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ortbezeichnung."<br>";
 	$html .= "<br>";
 	$html .= "<a href='".APP_ROOT."cis/private/lehre/pruefung/pruefungsanmeldung.php'>".$p->t('pruefung/emailBodyLinkZurAnmeldung')."</a><br>";
 	$html .= "<br>";
@@ -1178,7 +1244,7 @@ function getPruefungenStudiengangBySemester($aktStudiensemester)
 	$pruefungen = new pruefungCis();
 	$pruefungen->getPruefungByStudiensemester($aktStudiensemester);
 
-	if((!empty($pruefungen->lehrveranstaltungen)))
+	if(!empty($pruefungen->lehrveranstaltungen))
 	{
 		$lehrveranstaltungen = [];
 		foreach ($pruefungen->lehrveranstaltungen as $prf)
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index dd38950b1..653d29c02 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -247,18 +247,16 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				}
 			});
 
-			$("#table4").tablesorter(
-				{
-
-					widgets: ["zebra"],
-					headers: {
-						0: { sorter: false },
-						3: { sorter: 'shortDate',
-							dateFormat: 'ddmmyyyy' },
-						4: { sorter: 'time' },
-						5: { sorter: 'time' }
-					}
-				});
+			$("#table4").tablesorter({
+				widgets: ["zebra"],
+				headers: {
+					0: { sorter: false },
+					3: { sorter: 'shortDate',
+						dateFormat: 'ddmmyyyy' },
+					4: { sorter: 'time' },
+					5: { sorter: 'time' }
+				}
+			});
 
 		});
 	</script>
diff --git a/locale/de-AT/pruefung.php b/locale/de-AT/pruefung.php
index 9e75fa89e..fbfb66b8f 100644
--- a/locale/de-AT/pruefung.php
+++ b/locale/de-AT/pruefung.php
@@ -78,6 +78,7 @@ $this->phrasen['pruefung/unbegrenzt'] = 'unbegrenzt';
 $this->phrasen['pruefung/bewertungenZu'] = 'Bewertungen zu';
 $this->phrasen['pruefung/keineAuswahl'] = 'Keine Auswahl';
 $this->phrasen['pruefung/alleBestaetigen'] = 'Alle bestätigen';
+$this->phrasen['pruefung/bitteEmailAngeben'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
 
 // pruefungsbewertung
 $this->phrasen['pruefung/pruefungsbewertungTitle'] = 'Prüfungsbewertung';
@@ -141,6 +142,15 @@ $this->phrasen['pruefung/emailBodyOrt'] = 'Ort:';
 $this->phrasen['pruefung/emailBodyLinkZurAnmeldung'] = 'Link zur Anmeldung';
 $this->phrasen['pruefung/emailBodyBitteHtmlSicht'] = 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Link vollständig darzustellen.';
 
+
+// Sammelmail
+$this->phrasen['pruefung/sammelemailBody'] = 'Die Anmeldungen zur Prüfung %s am %s wurde von %s bestätigt. <br />';
+$this->phrasen['pruefung/sammelemailBody2'] = 'Ort: %s<br />';
+$this->phrasen['pruefung/sammelemailBodyBestaetigt'] = 'Bestätigt von';
+$this->phrasen['pruefung/sammelemailBodyPruefung'] = 'Prüfung';
+$this->phrasen['pruefung/sammelemailBodyTermin'] = 'Termin';
+$this->phrasen['pruefung/sammelemailBodyDauer'] = 'Dauer';
+
 $this->phrasen['pruefung/emailLektorSubjectAnmeldung'] = 'Anmeldung zur Prüfung';
 $this->phrasen['pruefung/emailLektorStudentIn'] = 'StudentIn';
 $this->phrasen['pruefung/emailLektorHatSichZurPruefung'] = 'hat sich zur Prüfung';
diff --git a/locale/en-US/pruefung.php b/locale/en-US/pruefung.php
index 7b0cec97e..59d9953ca 100644
--- a/locale/en-US/pruefung.php
+++ b/locale/en-US/pruefung.php
@@ -78,6 +78,7 @@ $this->phrasen['pruefung/unbegrenzt'] = 'unlimited';
 $this->phrasen['pruefung/bewertungenZu'] = 'Bewertungen zu';
 $this->phrasen['pruefung/keineAuswahl'] = 'Keine Auswahl';
 $this->phrasen['pruefung/alleBestaetigen'] = 'Confirm all';
+$this->phrasen['pruefung/bitteEmailAngeben'] = 'Please enter a valid E-Mail Address.';
 
 // pruefungsbewertung
 $this->phrasen['pruefung/pruefungsbewertungTitle'] = 'Prüfungsbewertung';
@@ -140,6 +141,14 @@ $this->phrasen['pruefung/emailBodyOrt'] = 'Ort:';
 $this->phrasen['pruefung/emailBodyLinkZurAnmeldung'] = 'Link zur Anmeldung';
 $this->phrasen['pruefung/emailBodyBitteHtmlSicht'] = 'Bitte sehen Sie sich die Nachricht in HTML Sicht an, um den Link vollständig darzustellen.';
 
+// Sammelmail
+$this->phrasen['pruefung/sammelemailBody'] = 'The exam registrations for %s on %s have been confirmed by %s. <br />';
+$this->phrasen['pruefung/sammelemailBody2'] = 'Place: %s<br />';
+$this->phrasen['pruefung/sammelemailBodyBestaetigt'] = 'Confirmed by';
+$this->phrasen['pruefung/sammelemailBodyPruefung'] = 'Exam';
+$this->phrasen['pruefung/sammelemailBodyTermin'] = 'Exam date';
+$this->phrasen['pruefung/sammelemailBodyDauer'] = 'Duration';
+
 $this->phrasen['pruefung/emailLektorSubjectAnmeldung'] = 'Anmeldung zur Prüfung';
 $this->phrasen['pruefung/emailLektorStudentIn'] = 'StudentIn';
 $this->phrasen['pruefung/emailLektorHatSichZurPruefung'] = 'hat sich zur Prüfung';

From 045b764d654d44229fc97112673f712013384659 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 26 Aug 2025 12:40:27 +0200
Subject: [PATCH 0684/1357] studentenverwaltung im infocenter verlinkt

---
 application/controllers/system/infocenter/InfoCenter.php  | 2 ++
 application/views/system/infocenter/infocenterDetails.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 1fc49c72f..1a4f566e6 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -362,6 +362,8 @@ class InfoCenter extends Auth_Controller
 		$data[self::ORIGIN_PAGE] = $origin_page;
 		$data[self::PREV_FILTER_ID] = $this->input->get(self::PREV_FILTER_ID);
 
+		$data['studiensemester'] = $this->variablelib->getVar('infocenter_studiensemester');
+
 		$this->load->view('system/infocenter/infocenterDetails.php', $data);
 	}
 
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 51b913b6c..fb023c5fd 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -57,7 +57,7 @@
 				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 					<div class="col-lg-8">
 						<h3 class="page-header">
-							Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">

From 1ef884de8c966613572f7523c4116db0fb57dd73 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 26 Aug 2025 14:25:04 +0200
Subject: [PATCH 0685/1357] API: return results on multicall

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

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 091a81717..034c326e9 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -486,7 +486,7 @@ export default {
 				if (Array.isArray(factory)) {
 					const $api = app.config.globalProperties.$api;
 
-					Promise
+					return Promise
 						.allSettled(factory.map((config, index) => {
 							if (!Array.isArray(config))
 								config = ['#' + index, config];
@@ -526,6 +526,8 @@ export default {
 							for (var errType in typedErrors) {
 								errorConfig.handler[errType](typedErrors[errType]);
 							}
+							
+							return result;
 						});
 				}
 				let { method, url, params, config } = factory;

From f1c9e641bbe0b64d990cb026bc6ebaefc87494fa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 26 Aug 2025 14:25:29 +0200
Subject: [PATCH 0686/1357] API: feedback for stv status dropdown

---
 .../Studentenverwaltung/Details/Status/Dropdown.js   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index 8c2071c51..1f6f41900 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -151,7 +151,17 @@ export default {
 				ApiStvStatus.addStudent(prestudent_id, data),
 				{ errorHeader: prestudent_id }
 			]))
-			.then(() => {
+			.then(result => {
+				const messagesSuccessful = result.filter(res => res.status == 'fulfilled');
+				if (messagesSuccessful.length) {
+					this.$fhcAlert.alertDefault(
+						'info',
+						'Feedback',
+						messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
+						false,
+						true
+					);
+				}
 				this.$emit('reloadTable');
 				this.$reloadList();
 			});

From e3665569929968383f1194d722bf20214e6a1d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 26 Aug 2025 16:05:06 +0200
Subject: [PATCH 0687/1357] =?UTF-8?q?Dienstverhinderung=20f=C3=BCr=20Volks?=
 =?UTF-8?q?schultag=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/zeitsperre_resturlaub.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php
index ffd179401..1b6546d41 100644
--- a/cis/private/profile/zeitsperre_resturlaub.php
+++ b/cis/private/profile/zeitsperre_resturlaub.php
@@ -285,15 +285,16 @@ function showHideBezeichnungDropDown()
 	if (dd.options[dd.selectedIndex].value == 'DienstV')
 	{
 		var str = '<select name="bezeichnung" class="dd_breit">';
-		str += '<option value="Eheschließung">a) Eigene Eheschließung (3 Tage)</option>';
+		str += '<option value="Eheschließung">a) Eigene Eheschließung oder Verpartnerung (3 Tage)</option>';
 		str += '<option value="Geburt eigenes Kind">b) Geburt eines Kindes der Ehefrau/Lebensgefährtin (2 Tage)</option>';
-		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung eines Kindes/eigener Geschwister (1 Tag)</option>';
+		str += '<option value="Heirat Kind/Geschwister">c) Eheschließung oder Verpartnerung eines Kindes/eigener Geschwister (1 Tag)</option>';
 		str += '<option value="Eigene Sponsion/Promotion">d) Teilnahme an eigener Sponsion/Promotion (1 Tag)</option>';
 		str += '<option value="Lebensbedr. Erkrankung P/K/E">e) Lebensbedrohliche Erkrankung Partner/Kinder/Eltern (3 Tage)</option>';
 		str += '<option value="Ableben P/K/E">f) Ableben Partner/Kinder/Elternteil (3 Tage)</option>';
 		str += '<option value="Bestattung G/S/G">g) Teilnahme an Bestattung Geschwister/Schwiegereltern/eigener Großeltern (1 Tag)</option>';
 		str += '<option value="Wohnungswechsel">h) Wohnungswechsel in eigenen Haushalt (2 Tage)</option>';
 		str += '<option value="Bundesheer">i) Einberufung Bundesheer</option>';
+		str += '<option value="Volksschultag">j) erster Volksschultag (1 Tag)</option>';
 		str += '</select>';
 
 		sp.innerHTML = str;

From 63390b192c0b81ebbd415e54e7c90a0d31702f31 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 26 Aug 2025 17:15:37 +0200
Subject: [PATCH 0688/1357] qualgate 1&2 dbupdate script, note fkey reference &
 upload required flag in paabgabe; noten api duplicate from notentool for now;
 WIP more emails; qualgates benotbar & saveable aswell as upload flag;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 105 +++++++++++++++---
 application/models/education/Note_model.php   |   8 ++
 .../models/education/Projektarbeit_model.php  |   2 +
 .../education/Projektbetreuer_model.php       |  36 ++++++
 public/js/api/factory/abgabe.js               |  23 ++--
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  70 ++++++------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   5 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  56 +++++-----
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   9 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   1 +
 public/js/plugins/Api.js                      |   1 +
 .../61164_abgabetool_quality_gates.php        |  33 ++++++
 12 files changed, 256 insertions(+), 93 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 61a3b4c44..86f248c84 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -27,7 +27,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 //require_once('../../../include/projektarbeit.class.php');
 //require_once('../../../include/projektbetreuer.class.php');
 
-class Lehre extends FHCAPI_Controller
+class Abgabe extends FHCAPI_Controller
 {
 
 	/**
@@ -45,7 +45,8 @@ class Lehre extends FHCAPI_Controller
 			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
 			'postSerientermin' => self::PERM_LOGGED,
 			'fetchDeadlines' => self::PERM_LOGGED, // TODO: mitarbeiter recht prüfen
-			'getPaAbgabetypen' => self::PERM_LOGGED
+			'getPaAbgabetypen' => self::PERM_LOGGED,
+			'getNoten' => self::PERM_LOGGED
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -100,8 +101,10 @@ class Lehre extends FHCAPI_Controller
 	/**
 	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
 	 */
-	public function getStudentProjektarbeiten($uid)
+	public function getStudentProjektarbeiten()
 	{
+		$uid = $this->input->get("uid",TRUE);
+		
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -254,8 +257,7 @@ class Lehre extends FHCAPI_Controller
 	}
 
 	private function signaturFehltEmail($student_uid) {
-
-
+		
 		// Mail an Studiengang wenn keine Signatur gefunden wurde
 		$student = new student();
 		if(!$student->load($student_uid))
@@ -326,6 +328,10 @@ class Lehre extends FHCAPI_Controller
 			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
 			$maildata['token'] = "";
 
+			// TODO: clarify if all betreuer are mitarbeiter and have benutzer entries
+			// or if uid = null has to be checked WITH
+			// 'CASE WHEN tbl_benutzer.uid IS NULL THEN kontakt ELSE tbl_benutzer.uid || '@".DOMAIN."' END AS email'
+			
 			$email = $this->getBetreuerEmail($bperson_id);
 			
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
@@ -334,7 +340,6 @@ class Lehre extends FHCAPI_Controller
 				'ParbeitsbeurteilungEndupload',
 				$maildata,
 				$email,
-//				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
 				$subject,
 				'sancho_header_min_bw.jpg',
 				'sancho_footer_min_bw.jpg',
@@ -397,6 +402,12 @@ class Lehre extends FHCAPI_Controller
 							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
 							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
 
+
+							$email = $this->getBetreuerEmail($bperson_id);
+
+							if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+
+
 							$mailres = sendSanchoMail(
 								'ParbeitsbeurteilungEndupload',
 								$zweitbetmaildata,
@@ -443,7 +454,8 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
-
+	
+	// called by abgabetool/mitarbeiter when adding a new termin
 	public function postProjektarbeitAbgabe() {
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		$paabgabe_id = $_POST['paabgabe_id'];
@@ -451,6 +463,8 @@ class Lehre extends FHCAPI_Controller
 		$datum = $_POST['datum'];
 		$fixtermin = $_POST['fixtermin'];
 		$kurzbz = $_POST['kurzbz'];
+		$note = $_POST['note'];
+		$upload_required = $_POST['upload_required'];
 
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
 			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
@@ -469,12 +483,14 @@ class Lehre extends FHCAPI_Controller
 					'fixtermin' => $fixtermin,
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
+					'note' => $note,
+					'upload_required' => $upload_required,
 					'insertvon' => getAuthUID(),
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
 
-			$this->terminateWithSuccess($result);
+			
 		} else {
 			$result = $this->PaabgabeModel->update(
 				$paabgabe_id,
@@ -482,13 +498,25 @@ class Lehre extends FHCAPI_Controller
 					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
+					'note' => $note,
+					'upload_required' => $upload_required,
 					'updatevon' => getAuthUID(),
 					'updateamum' => date('Y-m-d H:i:s')
 				)
 			);
-
-			$this->terminateWithSuccess($result);
+			
 		}
+
+		$paabgabe_id = $this->getDataOrTerminateWithError($result);
+		
+		$paabgabe = $this->PaabgabeModel->load($paabgabe_id);
+		
+		// check if $paaabgabe is a qual gate and its note is deemed negative
+		// -> send email to student with that info
+		
+		// TODO: DEFAULT NOTE 9 OR DEFAULT NOTE NULL? 9 COUNTS AS NEGATIV :/
+		
+		$this->terminateWithSuccess($result);
 	}
 
 	public function deleteProjektarbeitAbgabe() {
@@ -631,17 +659,58 @@ class Lehre extends FHCAPI_Controller
 
 		$result = $this->PaabgabetypModel->getAll();
 		$paabgabetypen = $this->getDataOrTerminateWithError($result);
+		
+		
 		$this->terminateWithSuccess($paabgabetypen);
 	}
 	
 	private function getBetreuerEmail($person_id) {
-		// check if betreuer is intern (fixangestellt = true)
-		// -> email: uid@DOMAIN
-		
-		// if betreuer is extern, check if there are private email contacts 
-		// in tbl_kontakt. if so, return them
-		
-		return null;
+		$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+		$result = $this->ProjektbetreuerModel->getBetreuerEmail($person_id);
+		$email = $this->getDataOrTerminateWithError($result);
+		return $email[0]->email;
 	}
-}
 
+	//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
+
+	/**
+	 * GET METHOD
+	 * returns List of all available & active NotenOptions
+	 */
+	public function getNoten() {
+		$this->load->model('education/Note_model', 'NoteModel');
+
+		$result = $this->NoteModel->getAllActive();
+		$noten = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($noten);
+	}
+	
+	private function sendQualGateNegativEmail($student_uid) {
+		// Mail an Student wenn Qualgate negativ beurteilt wurde
+		$student = new student();
+		if(!$student->load($student_uid))
+			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+
+		// TODO: frasen
+		$subject = 'Quality Gate Negativ';
+		$tomail = $student_uid.'@'.DOMAIN;
+		
+		
+		// TODO: emaildata
+		$data = array(
+			'betreuerfullname' => $student->vorname,
+			'qualgatebezeichnung' => $student->nachname,
+			'datum' => $datum,
+			'projektarbeitname' => $name
+		);
+
+		$mailres = sendSanchoMail(
+			'QualGateNegativ',
+			$data,
+			$tomail,
+			$subject
+		);
+		
+		return $mailres;
+	}
+}
\ No newline at end of file
diff --git a/application/models/education/Note_model.php b/application/models/education/Note_model.php
index 80b454398..87a1501e0 100644
--- a/application/models/education/Note_model.php
+++ b/application/models/education/Note_model.php
@@ -11,4 +11,12 @@ class Note_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_note';
 		$this->pk = 'note';
 	}
+
+	public function getAllActive() {
+		$qry ="SELECT *
+			FROM lehre.tbl_note
+			WHERE aktiv = true";
+
+		return $this->execReadOnlyQuery($qry);
+	}
 }
\ No newline at end of file
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 4083dbf6e..b1971cea7 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -167,6 +167,8 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.fixtermin,
 					campus.tbl_paabgabe.kurzbz,
 					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabe.note,
+					campus.tbl_paabgabe.upload_required,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
index 95950bf95..ae78b96d9 100644
--- a/application/models/education/Projektbetreuer_model.php
+++ b/application/models/education/Projektbetreuer_model.php
@@ -231,4 +231,40 @@ class Projektbetreuer_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id, $betreuer_person_id));
 	}
+
+	/**
+	 * Gets email of a Betreuer for a Projektarbeit.
+	 * Projektarbeitbetreuer can be external employees, which should be contacted on their private
+	 * email contact, if they have one. Internal Betreuer should be contacted on their "uid@DOMAIN" adress.
+	 * @param int betreuer_person_id
+	 * @return object success or error
+	 */
+	public function getBetreuerEmail($betreuer_person_id) {
+		// TODO: check if benutzer uid exists, not fixangestellt
+		
+		$qry ="
+			SELECT uid,
+			   CASE
+				   WHEN public.tbl_mitarbeiter.fixangestellt = false
+					   THEN (
+							SELECT kontakt AS email
+							FROM public.tbl_kontakt
+							WHERE  
+								public.tbl_kontakt.person_id = ? AND
+								kontakttyp = 'email'
+							)
+				   
+						ELSE ( 
+							SELECT public.tbl_benutzer.uid || '@' || '".DOMAIN."' AS email
+			       			FROM public.tbl_benutzer
+			       			WHERE person_id = ?
+							)
+				   END AS email
+		FROM public.tbl_benutzer
+			JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)           
+		WHERE person_id = ?
+		";
+
+		return $this->execReadOnlyQuery($qry, array($betreuer_person_id, $betreuer_person_id, $betreuer_person_id));
+	}
 }
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 15c7dee43..0602a218c 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -17,25 +17,17 @@ export default {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitEndupload',
-			params: { formData },
+			params: formData,
 			config: {Headers: { "Content-Type": "multipart/form-data" }}
 		};
-		
-		// const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitEndupload';
-		// const headers = {Headers: { "Content-Type": "multipart/form-data" }}
-		// return this.$fhcApi.post(url, formData, headers)
 	},
 	postStudentProjektarbeitZwischenabgabe(formData) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitZwischenabgabe',
-			params: { formData },
+			params: formData,
 			config: {Headers: { "Content-Type": "multipart/form-data" }}
 		};
-		
-		// const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitZwischenabgabe';
-		// const headers = {Headers: { "Content-Type": "multipart/form-data" }}
-		// return this.$fhcApi.post(url, formData, headers)
 	},
 	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
 		// TODO: check if this is fine with new api scheme
@@ -59,6 +51,8 @@ export default {
 				paabgabe_id: termin.paabgabe_id,
 				paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
 				datum: termin.datum,
+				note: termin.note,
+				upload_required: termin.upload_required,
 				fixtermin: termin.fixtermin,
 				insertvon: termin.insertvon,
 				kurzbz: termin.kurzbz,
@@ -92,5 +86,12 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/Abgabe/getPaAbgabetypen'
 		};
-	}
+	},
+	//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
+	getNoten(){
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getNoten'
+		};
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 70b86e60f..c70c40ba7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -1,5 +1,6 @@
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
+import ApiAbgabe from '../../../api/factory/abgabe.js'
 
 const today = new Date()
 export const AbgabeMitarbeiterDetail = {
@@ -12,6 +13,7 @@ export const AbgabeMitarbeiterDetail = {
 		Textarea: primevue.textarea,
 		VueDatePicker
 	},
+	inject: ['abgabeTypeOptions', 'allowedNotenOptions'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -23,30 +25,7 @@ export const AbgabeMitarbeiterDetail = {
 			oldPaBeurteilungLink: 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052', // TODO: inject from app & app provide link from config
 			eidAkzeptiert: false,
 			enduploadTermin: null,
-			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
-			// TODO: fetch types
-			allAbgabeTypes: [
-				{
-					paabgabetyp_kurzbz: 'abstract',
-					bezeichnung: 'Entwurf'
-				},
-				{
-					paabgabetyp_kurzbz: 'zwischen',
-					bezeichnung: 'Zwischenabgabe'
-				},
-				{
-					paabgabetyp_kurzbz: 'note',
-					bezeichnung: 'Benotung'
-				},
-				{
-					paabgabetyp_kurzbz: 'end',
-					bezeichnung: 'Endupload'
-				},
-				{
-					paabgabetyp_kurzbz: 'enda',
-					bezeichnung: 'Endabgabe im Sekretariat'
-				}
-			]
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages
 		}
 	},
 	methods: {
@@ -55,6 +34,9 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
+			// 9 => magic number for "noch nicht eingetragen"
+			termin.note = termin.note?.note ?? 9
+			
 			this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
@@ -69,8 +51,10 @@ export const AbgabeMitarbeiterDetail = {
 							'fixtermin': false,
 							'kurzbz': '',
 							'datum': new Date().toISOString().split('T')[0],
-							'paabgabetyp_kurzbz': '',
-							'bezeichnung': '',
+							'paabgabetyp_kurzbz': termin.paabgabetyp_kurzbz,
+							'note': this.allowedNotenOptions.find(opt => opt.note == termin.note?.note),
+							'upload_required': termin.upload_required,
+							'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz),
 							'abgabedatum': null,
 							'insertvon': this.viewData?.uid ?? '',
 							'allowedToSave': true,
@@ -149,6 +133,9 @@ export const AbgabeMitarbeiterDetail = {
 		getOptionLabelAbgabetyp(option){
 			return option.bezeichnung
 		},
+		getNotenOptionLabel(option) {
+			return option.bezeichnung
+		},
 		formatDate(dateParam) {
 			const date = new Date(dateParam)
 			// handle missing leading 0
@@ -200,10 +187,8 @@ export const AbgabeMitarbeiterDetail = {
 	template: `
 		<div v-if="projektarbeit">
 		
-
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 
-
 			<div class="row">
 				<div class="col-8">
 					<p> {{projektarbeit?.student}}</p>
@@ -248,7 +233,9 @@ export const AbgabeMitarbeiterDetail = {
 					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
 					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
 					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4note')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4upload_required')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						
@@ -278,12 +265,30 @@ export const AbgabeMitarbeiterDetail = {
 							:style="{'width': '100%'}"
 							:disabled="!termin.allowedToSave"
 							v-model="termin.bezeichnung"
-							:options="allAbgabeTypes"
+							:options="abgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
-					<div class="col-4 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="!termin.allowedToSave"></Textarea>
+					<div class="col-2 d-flex justify-content-center align-items-center">
+						<Dropdown 
+							v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
+							:style="{'width': '100%'}"
+							v-model="termin.note"
+							:options="allowedNotenOptions"
+							:optionLabel="getNotenOptionLabel">
+						</Dropdown>
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<Checkbox 
+							v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
+							v-model="termin.upload_required"
+							:binary="true" 
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="30" :disabled="!termin.allowedToSave"></Textarea>
 					</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
@@ -310,7 +315,6 @@ export const AbgabeMitarbeiterDetail = {
 				</div>
 			</div>
 		 </div>
-
 `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 107138962..3271ed97f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -1,6 +1,7 @@
 import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
+import ApiAbgabe from '../../../api/factory/abgabe.js'
 
 const today = new Date()
 export const AbgabeStudentDetail = {
@@ -198,7 +199,7 @@ export const AbgabeStudentDetail = {
 		getEid() {
 			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
 		},
-		getEnduploadErlaubt() {
+		getAllowedToSendEndupload() {
 			return !this.eidAkzeptiert
 		}
 	},
@@ -371,7 +372,7 @@ export const AbgabeStudentDetail = {
 				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
+				<button class="btn btn-primary" :disabled="getAllowedToSendEndupload" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
 			</template>
 		</bs-modal>
 	 	
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index a102e6e28..c16abc8a3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -3,7 +3,7 @@ import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
-import ApiAbgabe from '../../../api/abgabe.js'
+import ApiAbgabe from '../../../api/factory/abgabe.js'
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -16,6 +16,12 @@ export const AbgabetoolMitarbeiter = {
 		Textarea: primevue.textarea,
 		VueDatePicker
 	},
+	provide() {
+		return {
+			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
+			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions)
+		}
+	},
 	props: {
 		viewData: {
 			type: Object,
@@ -30,29 +36,9 @@ export const AbgabetoolMitarbeiter = {
 		return {
 			saving: false,
 			loading: false,
-			// TODO: fetch types
-			allAbgabeTypes: [
-				{
-					paabgabetyp_kurzbz: 'abstract',
-					bezeichnung: 'Entwurf'
-				},
-				{
-					paabgabetyp_kurzbz: 'zwischen',
-					bezeichnung: 'Zwischenabgabe'
-				},
-				{
-					paabgabetyp_kurzbz: 'note',
-					bezeichnung: 'Benotung'
-				},
-				{
-					paabgabetyp_kurzbz: 'end',
-					bezeichnung: 'Endupload'
-				},
-				{
-					paabgabetyp_kurzbz: 'enda',
-					bezeichnung: 'Endabgabe im Sekretariat'
-				}
-			],
+			abgabeTypeOptions: null,
+			notenOptions: null,
+			allowedNotenOptions: null,
 			serienTermin: Vue.reactive({
 				datum: new Date(),
 				bezeichnung: {
@@ -222,6 +208,8 @@ export const AbgabetoolMitarbeiter = {
 					'fixtermin': false,
 					'kurzbz': '',
 					'datum': new Date().toISOString().split('T')[0],
+					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+					'upload_required': false,
 					'paabgabetyp_kurzbz': '',
 					'bezeichnung': '',
 					'abgabedatum': null,
@@ -229,6 +217,7 @@ export const AbgabetoolMitarbeiter = {
 					
 				})
 				pa.abgabetermine.forEach(termin => {
+					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
 					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
@@ -370,10 +359,23 @@ export const AbgabetoolMitarbeiter = {
 
 	},
 	created() {
+		// fetch noten options
+		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
+		this.$api.call(ApiAbgabe.getNoten()).then(res => {
+			this.notenOptions = res.data
+			// TODO: more sophisticated way to filter for these two, in essence it is still hardcoded
+			this.allowedNotenOptions = this.notenOptions.filter(
+				opt => opt.bezeichnung === 'Bestanden' 
+					|| opt.bezeichnung === 'Nicht bestanden'
+					|| opt.bezeichnung === 'Noch nicht eingetragen'
+			)
+		}).catch(e => {
+			this.loading = false
+		})
+		
 		// fetch abgabetypen options
 		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
-			this.paabgabetypOptions = res.data
-			this.tabulatorCanBeBuilt = true // because promises would be more work and not much better here
+			this.abgabeTypeOptions = res.data
 		}).catch(e => {
 			this.loading = false
 		})
@@ -419,7 +421,7 @@ export const AbgabetoolMitarbeiter = {
 						<Dropdown 
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
-							:options="allAbgabeTypes"
+							:options="abgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 3890f2764..bfd5da01b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeStudentDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js";
+import ApiAbgabe from '../../../api/factory/abgabe.js'
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
@@ -82,6 +83,9 @@ export const AbgabetoolStudent = {
 			]};
 	},
 	methods: {
+		checkQualityGates(termine, enduploadtermin) {
+				return true
+		},
 		isPastDate(date) {
 			return new Date(date) < new Date(Date.now())	
 		},
@@ -91,10 +95,11 @@ export const AbgabetoolStudent = {
 				pa.abgabetermine = res.data[0].retval
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
-					termin.allowedToUpload = true
+					// termin.allowedToUpload = true
 					
 					// TODO: fixtermin logic?
-					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
+					if(termin.bezeichnung == 'Endupload' && 
+						(this.isPastDate(termin.datum) || this.checkQualityGates(pa.abgabetermine, termin))) {
 						
 						// termin.allowedToUpload = false
 					} else {
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 67f692f84..6f8347169 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -1,4 +1,5 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import ApiAbgabe from '../../../api/factory/abgabe.js'
 
 export const DeadlineOverview = {
 	name: "DeadlineOverview",
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 43c2b3064..e3e604d6c 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -164,6 +164,7 @@ export default {
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
+				debugger
 				if (Array.isArray(factory)) {
 					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 					const $api = app.config.globalProperties.$api;
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 1341b3c5f..b4f6fd7c9 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -27,3 +27,36 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 			echo '<br>paabgabetyp quality gate 2 hinzugefuegt';
 	}
 }
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'note'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+
+		$qry = "ALTER TABLE campus.tbl_paabgabe
+				ADD COLUMN note SMALLINT NOT NULL DEFAULT 9,
+				ADD CONSTRAINT tbl_paabgabe_note_fkey
+					FOREIGN KEY (note)
+					REFERENCES lehre.tbl_note(note)
+					ON UPDATE CASCADE ON DELETE RESTRICT;";
+		
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabe column note default 9 (noch nicht eingetragen) hinzugefuegt';
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'upload_required'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "ALTER TABLE campus.tbl_paabgabe
+				ADD COLUMN IF NOT EXISTS upload_required boolean DEFAULT false;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabe column upload_required default false hinzugefuegt';
+	}
+}
\ No newline at end of file

From e2147c8f1f4840cbd378dcdd3e030b2865dfc6f8 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 27 Aug 2025 08:40:57 +0200
Subject: [PATCH 0689/1357] regeln von kompatiblen lvs wird geprueft zusammen
 legen von pruefungsterminen ermoeglicht

---
 cis/private/lehre/pruefung/pruefung.js.php    |  36 +++
 .../pruefung/pruefungsanmeldung.json.php      | 210 ++++++++++++++++++
 .../pruefungsanmeldungen_verwalten.php        |  30 +++
 cis/private/profile/studienplan.php           |  60 ++++-
 include/lehrveranstaltung.class.php           |  30 +++
 include/pruefungstermin.class.php             |  16 ++
 include/reservierung.class.php                |  32 +++
 7 files changed, 406 insertions(+), 8 deletions(-)

diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php
index 73b808d14..ea4c1eff0 100644
--- a/cis/private/lehre/pruefung/pruefung.js.php
+++ b/cis/private/lehre/pruefung/pruefung.js.php
@@ -1231,6 +1231,42 @@ function loadPruefungStudiengang(studiensemester)
 	});
 }
 
+function terminezusammenlegen(termine, lv_id)
+{
+	if(termine.length <= 1)
+		return;
+
+	$.ajax({
+		dataType: 'json',
+		url: "./pruefungsanmeldung.json.php",
+		type: "POST",
+		data: {
+			method: "terminezusammenlegen",
+			'termine[]': termine,
+			lv_id: lv_id
+		},
+		error: loadError,
+		success: function(data){
+			if(data.error === 'false')
+			{
+				loadPruefungStudiengang()
+				$("#anmeldung_hinzufuegen").empty();
+				$("#lvdaten").empty();
+				$("#anmeldeDaten").empty();
+				$("#reihungSpeichernButton").empty();
+				$("#kommentar").empty();
+				$("#kommentarSpeichernButton").empty();
+				$("#raumLink").empty();
+				$("#listeDrucken").empty();
+			}
+			else
+			{
+				messageBox("message", data.errormsg, "red", "highlight", 10000);
+			}
+		}
+	});
+}
+
 /**
  * Zeigt das Formularfeld zur Eingabe eines Kommentars in der Anmeldungsverwaltung an.
  * @param {String} vorname Vorname des Studenten
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
index c286f666e..f06898068 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
@@ -110,6 +110,11 @@ switch($method)
 		$studiensemester = filter_input(INPUT_POST,"studiensemester");
 		$data = getPruefungenStudiengangBySemester($studiensemester);
 		break;
+	case 'terminezusammenlegen':
+		$termine = filter_input(INPUT_POST, 'termine', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		$lv_id = filter_input(INPUT_POST, 'lv_id');
+		$data = terminezusammenlegen($termine, $lv_id);
+		break;
 	case 'saveKommentar':
 		$data = saveKommentar();
 		break;
@@ -1285,6 +1290,211 @@ function getPruefungenStudiengangBySemester($aktStudiensemester)
 	return $data;
 }
 
+function terminezusammenlegen($termine, $lv_id)
+{
+	$result = array();
+	$alle_termine = array();
+	$error = false;
+	$terminkollision = defined('CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION') ? CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION : false;
+	foreach($termine as $termin)
+	{
+		$pruefungstermin = new pruefungstermin();
+		$pruefungstermin->load($termin);
+		$pruefung = new pruefungCis();
+		$pruefung->load($pruefungstermin->pruefung_id);
+		$pruefung->getLehrveranstaltungenByPruefung();
+
+		$lehrveranstaltungen = array_column($pruefung->lehrveranstaltungen, 'lehrveranstaltung_id');
+		if (!in_array($lv_id, $lehrveranstaltungen))
+			continue;
+
+		$pruefung->lehrveranstaltung_id = $lv_id;
+		$pruefung->termin = $pruefungstermin;
+		$alle_termine[] = $pruefung;
+	}
+
+
+	if (count($alle_termine) >= 1)
+	{
+		usort($alle_termine, function($a, $b) {
+			return strcmp($a->termin->von, $b->termin->von);
+		});
+
+		$first_termin = $alle_termine[0];
+
+		$first_mitarbeiter = $first_termin->mitarbeiter_uid;
+		$first_date = date('Y-m-d', strtotime($first_termin->termin->von));
+		$first_studiensemester = $first_termin->studiensemester_kurzbz;
+		$first_sammelklausur = $first_termin->termin->sammelklausur;
+		$first_ort = $first_termin->termin->ort_kurzbz;
+		$first_raum = $first_termin->termin->anderer_raum;
+		$first_lv = $first_termin->lehrveranstaltung_id;
+		$first_titel = $first_termin->titel;
+
+		$max_von = strtotime($first_termin->termin->von);
+		$max_bis = strtotime($first_termin->termin->bis);
+		$teilnehmer_min = (int)$first_termin->termin->teilnehmer_min;
+		$teilnehmer_max = (int)$first_termin->termin->teilnehmer_max;
+
+
+		$prevEnd = $max_bis;
+
+		foreach ($alle_termine as $termin)
+		{
+			if (date('Y-m-d', strtotime($termin->termin->von)) !== $first_date)
+			{
+				$data['errormsg'] = 'Nicht der gleiche Tag!';
+				$error = true;
+			}
+
+			if ($termin->mitarbeiter_uid !== $first_mitarbeiter)
+			{
+				$data['errormsg'] = 'Unterschiedliche Lektoren!';
+				$error = true;
+			}
+
+			if ($termin->studiensemester_kurzbz !== $first_studiensemester)
+			{
+				$data['errormsg'] = 'Unterschiedliche Studiensemester!';
+				$error = true;
+			}
+
+			if ($termin->termin->sammelklausur !== $first_sammelklausur)
+			{
+				$data['errormsg'] = 'Sammelklausur unterschiedlich!';
+				$error = true;
+			}
+
+			if (!($termin->termin->ort_kurzbz === $first_ort || $first_termin->termin->anderer_raum = $first_raum))
+			{
+				$data['errormsg'] = 'Ort/Raum unterschiedlich!';
+				$error = true;
+			}
+
+			if ($termin->lehrveranstaltung_id !== $first_lv)
+			{
+				$data['errormsg'] = 'Lehrveranstaltungen unterscheiden sich!';
+				$error = true;
+			}
+
+
+			$start = strtotime($termin->termin->von);
+			$max_von = min($max_von, $start);
+			$max_bis = max($max_bis, strtotime($termin->termin->bis));
+			$teilnehmer_min = min($teilnehmer_min, (int)$termin->termin->teilnehmer_min);
+			$teilnehmer_max = max($teilnehmer_max, (int)$termin->termin->teilnehmer_max);
+
+			if (($start - $prevEnd > 0) && $first_ort)
+			{
+				$stunde = new stunde();
+
+				$gapStartStr = date('Y-m-d H:i:s', $prevEnd);
+				$gapEndStr = date('Y-m-d H:i:s', $start);
+
+				$gapStartArr = explode(' ', $gapStartStr);
+				$gapEndArr = explode(' ', $gapEndStr);
+
+				$stunden = $stunde->getStunden($gapStartArr[1], $gapEndArr[1]);
+
+				$reservierung = new reservierung();
+				$reserviert = false;
+
+				$reservierungs_stunden = $reservierung->getReservierungen($first_ort, $gapStartArr[0]);
+
+				$need_stunden = array_diff($stunden, $reservierungs_stunden);
+
+				foreach ($need_stunden as $h)
+				{
+					if ($reservierung->isReserviert($first_ort, $gapStartArr[0], $h))
+						$reserviert = true;
+				}
+
+				if (!$terminkollision && $reserviert && !$first_sammelklausur)
+				{
+					$error = true;
+					$data['errormsg'] = 'Kann nicht zusammengelegt werden, da der Raum reserviert ist';
+				}
+				else
+				{
+					$reservierung->studiengang_kz = "0";
+					$reservierung->ort_kurzbz = $first_ort;
+					$reservierung->uid = $first_mitarbeiter;
+					$reservierung->datum = $gapStartArr[0];
+					$reservierung->titel = $first_titel;
+					if (strlen($first_titel) > 10)
+					{
+						$reservierung->titel = "Prüfung";
+					}
+					$reservierung->beschreibung = "Prüfung";
+					$reservierung->insertamum = date('Y-m-d G:i:s');
+					$reservierung->insertvon = get_uid();
+					$reservierungError = false;
+
+					foreach ($need_stunden as $h)
+					{
+						$reservierung->stunde = $h;
+						if (!$reservierungError)
+						{
+							if (!$reservierung->save(true))
+							{
+								$error = true;
+								$data['errormsg'] = $reservierung->errormsg;
+								$reservierungError = true;
+							}
+						}
+					}
+				}
+			}
+			$prevEnd = strtotime($termin->termin->bis);
+		}
+
+		if (!$error)
+		{
+			$first_pruefungstermin =  new pruefungstermin();
+			$first_pruefungstermin->load($first_termin->termin->pruefungstermin_id);
+
+			$first_pruefungstermin->von = date('Y-m-d H:i:s', $max_von);
+			$first_pruefungstermin->bis = date('Y-m-d H:i:s', $max_bis);
+			$first_pruefungstermin->teilnehmer_min = $teilnehmer_min;
+			$first_pruefungstermin->teilnehmer_max = $teilnehmer_max;
+
+			$first_pruefungstermin->save();
+
+			$alle_termine = array_slice($alle_termine, 1);
+
+			foreach ($alle_termine as $termin)
+			{
+				$anmeldung_termin = new pruefungsanmeldung();
+				$anmeldungen_termine = $anmeldung_termin->getAnmeldungenByTermin($termin->termin->pruefungstermin_id);
+
+				if (count($anmeldungen_termine) === 0)
+				{
+					$first_pruefungstermin->delete($termin->termin->pruefungstermin_id);
+				}
+				$i = 0;
+				$anmeldungen_termine_count = count($anmeldungen_termine);
+				foreach ($anmeldungen_termine as $anmeldungtermin)
+				{
+					$anmeldung = new pruefungsanmeldung();
+					$anmeldung->load($anmeldungtermin->pruefungsanmeldung_id);
+					$old_pruefuengstermin_id = $anmeldung->pruefungstermin_id;
+					$anmeldung->pruefungstermin_id = $first_termin->termin->pruefungstermin_id;
+					if ($anmeldung->save(false) && ($i === $anmeldungen_termine_count - 1))
+					{
+						$first_pruefungstermin->delete($old_pruefuengstermin_id);
+					}
+					$i ++;
+				}
+			}
+		}
+	}
+
+	$data['result']= $result;
+	$data['error']= $error ? 'true' : 'false';
+	$data['errormsg']='';
+	return $data;
+}
+
 /**
  *
  * @return typespeichert ein Kommentar zu einer Prüfungsanmeldung
diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index 653d29c02..4928ed91a 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -258,6 +258,36 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				}
 			});
 
+
+			$('#zusammenlegen').on('click', function() {
+				let ausgewaehlte_termine = $('.termin-checkbox:checked');
+
+				if (ausgewaehlte_termine.length === 0)
+					return;
+
+				let erster_termin = ausgewaehlte_termine.first();
+				let erstes_datum = erster_termin.data('datum');
+				let erste_lvid = erster_termin.data('lv-id');
+
+				let termine = [];
+				ausgewaehlte_termine.each(function() {{
+					let termin = $(this);
+					let datum = termin.data('datum');
+					let lv_id = termin.data('lv-id');
+
+					if (erstes_datum !== datum)
+						return alert("Die ausgewählten Termine liegen nicht am selben Tag und können daher nicht zusammengelegt werden.")
+					if (erste_lvid !== lv_id)
+						return alert("Bei den ausgewählten Terminen handelt es sich um unterschiedliche Lehrveranstaltungen, die daher nicht zusammengelegt werden können.")
+
+					termine.push(termin.data('termin-id'));
+				}})
+
+				if (termine.length > 0)
+				{
+					terminezusammenlegen(termine, erste_lvid);
+				}
+			})
 		});
 	</script>
 	<h1><?php echo $p->t('pruefung/anmeldungenVerwalten'); ?></h1>
diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
index 92728df42..1bc8f3184 100644
--- a/cis/private/profile/studienplan.php
+++ b/cis/private/profile/studienplan.php
@@ -359,7 +359,7 @@ drawTree($tree,0);
 
 function drawTree($tree, $depth)
 {
-	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext;
+	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext, $studienplan_id;
 	global $datum_obj, $db, $lv_arr, $p, $note_pruef_arr, $student;
 	global $anrechnung;
 
@@ -401,7 +401,10 @@ function drawTree($tree, $depth)
 			echo '&nbsp;&nbsp;&nbsp;&nbsp;';
 
 		$lvkompatibel = new lehrveranstaltung();
-		$lvkompatibel_arr = $lvkompatibel->loadLVkompatibel($row_tree->lehrveranstaltung_id);
+
+		$studienplaene_kompatibel = $lvkompatibel->loadLVkompatibelWithStudienplan($row_tree->lehrveranstaltung_id, $studienplan_id);
+
+		$lvkompatibel_arr = array_unique(array_column($studienplaene_kompatibel, 'lehrveranstaltung_id_kompatibel'));
 		$lvkompatibel_arr[]=$row_tree->lehrveranstaltung_id;
 
 		$abgeschlossen=false;
@@ -414,6 +417,24 @@ function drawTree($tree, $depth)
 			else
 				$abgeschlossen=false;
 		}
+		else if (!empty($studienplaene_kompatibel))
+		{
+			foreach ($studienplaene_kompatibel as $kompatibel)
+			{
+				$lvregelExists = $lvregel->exists($kompatibel['studienplan_lehrveranstaltung_id']);
+
+				if ($lvregelExists)
+				{
+					if ($lvregel->isAbgeschlossen($uid, $kompatibel['studienplan_lehrveranstaltung_id']))
+						$abgeschlossen=true;
+					else
+						$abgeschlossen=false;
+
+					break;
+				}
+			}
+		}
+
 		$lvinfo = new lvinfo();
 		switch(getSprache())
 		{
@@ -583,15 +604,38 @@ function drawTree($tree, $depth)
 				{
 					$semesterlock=true;
 				}
-				else
+
+				if (!$semesterlock && !empty($studienplaene_kompatibel))
 				{
-					//check if rules are fulfilled just for actual or next studiensemester
-					if($stsem === $aktornext)
+					foreach ($studienplaene_kompatibel as $kompatibel)
 					{
-						$result = $lvregel->isZugangsberechtigt($uid, $row_tree->studienplan_lehrveranstaltung_id, $stsem);
-						if((is_array($result)) && ($result[0] !== true))
+						if (!$lvregel->checkSemester($kompatibel['studienplan_lehrveranstaltung_id'], $semester))
 						{
-							$regelerfuellt=false;
+							$semesterlock = true;
+							break;
+						}
+					}
+				}
+
+				//check if rules are fulfilled just for actual or next studiensemester
+				if($stsem === $aktornext && !$semesterlock)
+				{
+					$result = $lvregel->isZugangsberechtigt($uid, $row_tree->studienplan_lehrveranstaltung_id, $stsem);
+					if((is_array($result)) && ($result[0] !== true))
+					{
+						$regelerfuellt = false;
+					}
+
+					if ($regelerfuellt && !empty($studienplaene_kompatibel))
+					{
+						foreach ($studienplaene_kompatibel as $kompatibel)
+						{
+							$result = $lvregel->isZugangsberechtigt($uid, $kompatibel['studienplan_lehrveranstaltung_id'], $stsem);
+							if (is_array($result) && $result[0] !== true)
+							{
+								$regelerfuellt = false;
+								break;
+							}
 						}
 					}
 				}
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 48edd9d0a..e288f88e6 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -1554,6 +1554,36 @@ class lehrveranstaltung extends basis_db
 		}
 	}
 
+	public function loadLVkompatibelWithStudienplan($lehrveranstaltung_id, $studienplan_id)
+	{
+		if (!is_numeric($lehrveranstaltung_id))
+		{
+			$this->errormsg = 'Lehrveranstaltung_id muss eine gueltige Zahl sein';
+			return false;
+		}
+		if (!is_numeric($studienplan_id))
+		{
+			$this->errormsg = 'Studienplan_id muss eine gueltige Zahl sein';
+			return false;
+		}
+
+		$qry = "SELECT studienplan_lehrveranstaltung_id, lehrveranstaltung_id_kompatibel
+				FROM lehre.tbl_lehrveranstaltung_kompatibel
+					JOIN lehre.tbl_studienplan_lehrveranstaltung ON lehrveranstaltung_id_kompatibel = tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id
+				WHERE tbl_lehrveranstaltung_kompatibel.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)."
+				;";
+
+		if($this->db_query($qry))
+		{
+			$data = array();
+			while($row = $this->db_fetch_object())
+			{
+				$data[] = ['lehrveranstaltung_id_kompatibel' => $row->lehrveranstaltung_id_kompatibel, 'studienplan_lehrveranstaltung_id' => $row->studienplan_lehrveranstaltung_id];
+			}
+			return $data;
+		}
+	}
+	
 	/**
 	 * Lädt alle kompatiblen LVs zu einer Lehrveranstaltung
 	 * @param $lehrveranstaltung_id ID der Lehrveranstaltung
diff --git a/include/pruefungstermin.class.php b/include/pruefungstermin.class.php
index c7eb0b085..80db93338 100644
--- a/include/pruefungstermin.class.php
+++ b/include/pruefungstermin.class.php
@@ -244,4 +244,20 @@ class pruefungstermin extends basis_db{
 	}
 	
     }
+
+	public function delete($pruefungstermin_id)
+	{
+		$qry = "DELETE FROM campus.tbl_pruefungstermin WHERE pruefungstermin_id=".$this->db_add_param($pruefungstermin_id).";";
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg='Fehler beim Löschen des Eintrages';
+			return false;
+		}
+	}
+
 }
diff --git a/include/reservierung.class.php b/include/reservierung.class.php
index 44d989600..a29b314dc 100644
--- a/include/reservierung.class.php
+++ b/include/reservierung.class.php
@@ -322,5 +322,37 @@ class reservierung extends basis_db
 		}
 				
 	}
+
+	public function getReservierungen($ort_kurzbz, $datum)
+	{
+		$datum_obj = new Datum();
+		if(!$datum_obj->checkDatum($datum))
+		{
+			$this->errormsg='Datum hat ein ungueltiges Format';
+			return false;
+		}
+
+		$qry = "SELECT stunde FROM campus.tbl_reservierung 
+				WHERE 
+					ort_kurzbz=".$this->db_add_param($ort_kurzbz)." AND 
+					datum=".$this->db_add_param($datum);
+
+
+		if($this->db_query($qry))
+		{
+			$result = array();
+			while($row = $this->db_fetch_object())
+			{
+				$result[] = $row->stunde;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Prüfungstypen konnten nicht geladen werden.";
+			return false;
+		}
+
+		return $result;
+	}
 }
 ?>

From 7e6643c0ff6e6bc7fbdaa4864b91afb56a717e4b Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 27 Aug 2025 09:51:34 +0200
Subject: [PATCH 0690/1357] phrase typo

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

diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
index 373a8955c..237554be9 100644
--- a/public/js/components/LVVerwaltung/Lektor/Table.js
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -199,7 +199,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
-			:new-btn-label="$p.t('lehre', 'addlektor')"
+			:new-btn-label="$p.t('lehre', 'addLektor')"
 			new-btn-show
 			@click:new="showAutocomplete = !showAutocomplete"
 			>

From 41d26246aafafc48dd1f74f72a70f24c2da0390f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 27 Aug 2025 10:19:39 +0200
Subject: [PATCH 0691/1357] Form Input Component: add name & use autocomplete
 that was loaded in the CI View

---
 public/js/components/Form/Input.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index c85272aab..81b47d504 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -3,6 +3,7 @@ import FhcFragment from "../Fragment.js";
 let _uuid = {};
 
 export default {
+	name: "FormInput",
 	inheritAttrs: false,
 	components: {
 		FhcFragment
@@ -220,7 +221,7 @@ export default {
 			if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) {
 				this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php"));
 			} else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) {
-				this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js"));
+				this._.components.PvAutocomplete = primevue.autocomplete;
 			} else if (this.tag == 'UploadImage' && !this._.components.UploadImage) {
 				this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js"));
 			} else if (this.tag == 'UploadDms' && !this._.components.UploadDms) {

From 2d2bbd1bb373bc99a7d7fa647162b6fb663f17d3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 27 Aug 2025 10:20:41 +0200
Subject: [PATCH 0692/1357] Bootstrap Modal Component: forward shown-bs-modal
 event

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

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 61c5c6857..a84d9d8d7 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -130,7 +130,7 @@ export default {
 			});
 		});
 	},
-	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
 		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">

From 9a35ee59455899c4f6366b0a992b408f27587c3f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 27 Aug 2025 11:48:35 +0200
Subject: [PATCH 0693/1357] raum content im alten cis wieder auf tablesorter

---
 .../39911_tabulator_in_contentmittitel.php    | 64 ++++++++++++++-----
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
index b743648ed..73ad7e319 100644
--- a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
+++ b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php
@@ -1,5 +1,6 @@
 <?php
 
+
 $raum_contentmittitel_xslt_xhtml=  <<<EOD
 <xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -8,27 +9,56 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<head>
 			<title><xsl:value-of select="titel" /></title>
 			<link rel="stylesheet" href="../skin/style.css.php" type="text/css"  />
-            <link href="https://cdnjs.cloudflare.com/ajax/libs/tabulator/5.0.7/css/tabulator.min.css" rel="stylesheet" />
-            <script type="text/javascript" src="https://c3p0.ma0594.technikum-wien.at/fh-core/vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js?2019102903"></script>
+			<link rel="stylesheet" href="../skin/jquery.css" type="text/css" />
+			<link rel="stylesheet" type="text/css" href="../skin/jquery-ui-1.9.2.custom.min.css" />
+			<script type="text/javascript" src="../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+			<script type="text/javascript" src="../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+			<script type="text/javascript" src="../vendor/components/jqueryui/jquery-ui.min.js"></script>
+			<script type="text/javascript" src="../include/js/jquery.ui.datepicker.translation.js"></script>
+			<script type="text/javascript" src="../vendor/jquery/sizzle/sizzle.js"></script>
+			<link rel="stylesheet" href="../skin/tablesort.css" type="text/css"/>
 			<script type="text/javascript">
 
-            document.addEventListener("DOMContentLoaded", function() 
-			{
-				let tables = document.getElementsByClassName("tablesorter");
-				for(table of tables){
-					new Tabulator(table, {
-						layout:"fitDataFill",
-						autoResize:true,
-						resizableRows:true,
-						columnDefaults:{
-							formatter:"html",
-							resizable:true,
-						}
-					})
-				}
-			});
+				$(document).ready(function()
+				{
+					$(".tablesorter").each(function()
+					{
+						var col=0;
+						var sort=0;
+						var no_sort=1;
+						var classes = $(this).attr("class");
+						var class_arr = classes.split(" ");
+						var headersobj={};
+		
+						for(i in class_arr)
+						{
+							if(class_arr[i].indexOf("tablesorter_col_")!=-1)
+							{
+								col = class_arr[i].substr(16);
+							}
+						
+							if(class_arr[i].indexOf("tablesorter_sort_")!=-1)
+							{
+								sort = class_arr[i].substr(17);
+							}
 
+							if(class_arr[i].indexOf("tablesorter_no_sort_")!=-1)
+							{
+								no_sort = class_arr[i].substr(20);
+								headersobj[no_sort]={sorter:false};
+							}
+						}
+		
+						$(this).tablesorter(
+						{
+							sortList: [[col,sort]],
+							widgets: ["zebra"],
+							headers: headersobj
+						});
+					});
+				});
 			</script>
+			
 		</head>
 		<body>
 	    <h1><xsl:value-of select="titel" /></h1>

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

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

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

From 1024fc6cab1c40455334ddc92ef5e7709696a4c3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 27 Aug 2025 14:41:50 +0200
Subject: [PATCH 0695/1357] Don't overwrite object => work with copies

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

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 034c326e9..0b8e2fd17 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -311,10 +311,10 @@ export default {
 			const result = _merge_error_config(config?.errorHandling);
 
 			if (!config?.form) {
-				result.combine.form = [];
+				result.combine = { ...result.combine, form: [] };
 			} else {
 				const formHandler = result.handler.form;
-				result.handler.form = errors => formHandler(config.form, errors);
+				result.handler = { ...result.handler, form: errors => formHandler(config.form, errors) };
 			}
 
 			return result;

From 1d634a253048a227983c3af07558db9838fe6bfd Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 27 Aug 2025 16:23:58 +0200
Subject: [PATCH 0696/1357] uhstat form: bewerbungstool user data is loaded if
 there is a login, normal logged in user data otherwise. renamed methods,
 removed unnecessary model loads

---
 application/controllers/codex/UHSTAT1.php | 88 +++++++++++++++--------
 application/views/codex/uhstat1.php       |  6 +-
 2 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index c290b098a..60eb6695e 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -32,9 +32,7 @@ class UHSTAT1 extends FHC_Controller
 		$this->load->library('PermissionLib');
 
 		// load models
-		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('system/Sprache_model', 'SpracheModel');
 		$this->load->model('codex/Abschluss_model', 'AbschlussModel');
 		$this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel');
@@ -105,7 +103,7 @@ class UHSTAT1 extends FHC_Controller
 	{
 		$saved = false;
 
-		$person_id = $this->_getValidPersonId('sui');
+		$person_id = $this->_getUHSTATPersonId('sui');
 
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
@@ -246,7 +244,7 @@ class UHSTAT1 extends FHC_Controller
 		// uhstat data can only be deleted with permission
 		if (!$this->_checkPermission('suid')) show_error('no permission');
 
-		$person_id = $this->_getValidPersonId('suid');
+		$person_id = $this->_getUHSTATPersonId('suid');
 
 		$uhstat1datenRes = $this->Uhstat1datenModel->delete(
 			array('person_id' => $person_id)
@@ -288,13 +286,17 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getFormMetaData()
 	{
-		$person_id = $this->_getValidPersonId('s');
+		$person_id = $this->_getUHSTATPersonId('s');
 
 		// read only display param
 		$readOnly = $this->input->get('readOnly');
 
-		// depending on permissions, editing or deleting is possible
-		$editPermission = $this->_checkPermission('sui');
+		// checking permissions for form
+
+		// saving is possible if there permission or student log in (but not from application tool)
+		$savePermission = $this->_checkPermission('sui') || ($this->_getUserPersonId() && !$this->_getApplicationToolPersonId());
+
+		// deleting only possible with permission
 		$deletePermission = $this->_checkPermission('suid');
 
 		$languageIdx = $this->_getLanguageIndex();
@@ -305,7 +307,7 @@ class UHSTAT1 extends FHC_Controller
 			'abschluss_nicht_oesterreich' => array(),
 			'jahre' => array(),
 			'person_id' => $person_id,
-			'editPermission' => $editPermission,
+			'savePermission' => $savePermission,
 			'deletePermission' => $deletePermission,
 			'readOnly' => $readOnly
 		);
@@ -387,7 +389,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getUHSTAT1Data()
 	{
-		$person_id = $this->_getValidPersonId('s');
+		$person_id = $this->_getUHSTATPersonId('s');
 
 		$this->Uhstat1datenModel->addSelect(
 			implode(', ', array_keys($this->_uhstat1Fields))
@@ -418,40 +420,70 @@ class UHSTAT1 extends FHC_Controller
 	}
 
 	/**
-	 * Gets Id of person having permissions to manage UHSTAT1 data.
-	 * Can be passed as parameter or be in session.
+	 * Gets Id of person, for which UHSTAT1 data is edited.
+	 * Can be passed as parameter, id of logged in person, or be in session.
+	 * @param berechtigungsArt type of permission (suid)
 	 * @return int person_id
 	 */
-	private function _getValidPersonId($berechtigungsArt)
+	private function _getUHSTATPersonId($berechtigungsArt)
 	{
 		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
+		$applicationToolPersonId = $this->_getApplicationToolPersonId();
+		if (isset($applicationToolPersonId) && is_numeric($applicationToolPersonId)) return $applicationToolPersonId;
+
+		// if successfully logged in
+		$loggedInPersonId = $this->_getUserPersonId();
+		if (isset($loggedInPersonId) && is_numeric($loggedInPersonId))
+		{
+			// if person id passed directly...
+			$person_id = $this->input->post('person_id');
+			if (!isset($person_id)) $person_id = $this->input->get('person_id');
+
+			if (isset($person_id))
+			{
+				if (!is_numeric($person_id)) show_error("invalid person id");
+				// ...check if there is a permission for editing UHSTAT1 data
+				if ($this->_checkPermission($berechtigungsArt)) return $person_id;
+			}
+
+			// if no id passed, use logged in person id
+			return $loggedInPersonId;
+		}
+
+		show_error("No permission");
+	}
+
+	/**
+	 * Gets person Id if there is a application tool login.
+	 * @return person Id or null
+	 */
+	private function _getApplicationToolPersonId()
+	{
+		// if coming from aplication tool - person id is in session (person must be logged in bewerbungstool)
 		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX])
 			&& is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX])
 			&& isset($_SESSION[self::LOGIN_SESSION_INDEX])
 		)
 			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
 
-		// ...check if student is successfully logged in
+		return null;
+	}
+
+	/**
+	 * Gets person Id if there is a user login.
+	 * @return person Id or null
+	 */
+	private function _getUserPersonId()
+	{
 		$loggedInPersonId = getAuthPersonId();
 		if (isset($loggedInPersonId) && is_numeric($loggedInPersonId))
 		{
 			// check if the the user is a student and if the benutzer is active
-			$this->StudentModel->addSelect('1');
-			$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-			$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]);
+			$this->BenutzerModel->addSelect('1');
+			$res = $this->BenutzerModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]);
 			if (hasData($res)) return $loggedInPersonId;
 		}
-
-		// if person id passed directly...
-		$person_id = $this->input->post('person_id');
-		if (!isset($person_id)) $person_id = $this->input->get('person_id');
-
-		if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id");
-
-		// ...check if there is a permission for editing UHSTAT1 data
-		if ($this->_checkPermission($berechtigungsArt)) return $person_id;
-
-		show_error("No permission");
+		return null;
 	}
 
 	/**
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index a255781f1..cb2f219f8 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -26,7 +26,7 @@ $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->va
 $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
 $readOnly = isset($formMetaData['readOnly']);
 $disabled = $readOnly ? ' disabled' : '';
-$editPermission = isset($formMetaData['editPermission']) && $formMetaData['editPermission'] === true;
+$savePermission = isset($formMetaData['savePermission']) && $formMetaData['savePermission'] === true;
 $deletePermission = isset($formMetaData['deletePermission']) && $formMetaData['deletePermission'] === true;
 $saved = isset($saved) && $saved === true;
 ?>
@@ -51,7 +51,7 @@ $saved = isset($saved) && $saved === true;
 			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
 		</p>
 		<br>
-		<?php if ($editPermission): ?>
+		<?php if ($savePermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
 				<div class="alert alert-success" id="uhstat_success_alert">
 					<button type="button" class="close" data-dismiss="alert">x</button>
@@ -288,7 +288,7 @@ $saved = isset($saved) && $saved === true;
 					</div>
 				</div>
 			</fieldset>
-			<?php if ($editPermission && !$readOnly): ?>
+			<?php if ($savePermission && !$readOnly): ?>
 				<br>
 				<fieldset>
 					<div class="form-group">

From 7df383f45ee01a4237c590ad4d869a96b6b0c042 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 28 Aug 2025 08:36:20 +0200
Subject: [PATCH 0697/1357] hinzugefuegte spann class caps durch den parser
 entfernt

---
 application/libraries/PhrasesLib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php
index ecd8094d6..647bf7074 100644
--- a/application/libraries/PhrasesLib.php
+++ b/application/libraries/PhrasesLib.php
@@ -122,6 +122,7 @@ class PhrasesLib
 								$tmpText = substr($tmpText, 0, strlen($tmpText) - 4);
 							}
 						}
+						$tmpText = str_replace(['<span class="caps">', '</span>'], '', $tmpText);
 
 						$result->retval[$i]->text = $tmpText;
 					}

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

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

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

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

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

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

From d17f87be09fb2f43441f43a639934ec256642652 Mon Sep 17 00:00:00 2001
From: nscbrandb <bernhard.brandstetter@fhstp.ac.at>
Date: Fri, 29 Aug 2025 10:35:27 +0200
Subject: [PATCH 0700/1357] also take environment config into account

---
 application/config/routes.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index f6eafbcd2..b4ce2ed4a 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -111,23 +111,26 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'a
 // // (studiensemester_kurzbz)/person/(person_id)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
 
-// load routes from extensions
-$subdir = 'application/config/extensions';
-$dirlist = scandir($subdir);
+// load routes from extensions, also look for environment-specific configs
+$subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
 
-if ($dirlist)
+foreach($subdirs as $subdir)
 {
-	$files = array_diff($dirlist, array('.','..'));
-
-	foreach ($files as &$item)
+	$dirlist = scandir($subdir);
+	if ($dirlist)
 	{
-		if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
-		{
-			$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+		$files = array_diff($dirlist, array('.','..'));
 
-			if (file_exists($routes_file))
+		foreach ($files as &$item)
+		{
+			if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
 			{
-				require($routes_file);
+				$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+
+				if (file_exists($routes_file))
+				{
+					require($routes_file);
+				}
 			}
 		}
 	}

From 34528bb01446fb9f522589a63b2e310d4037f3c5 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 29 Aug 2025 13:19:00 +0200
Subject: [PATCH 0701/1357] iframe content hinzugefuegt

---
 public/js/components/Cis/Cms/Content.js       |  5 ++
 system/dbupdate_3.4.php                       |  1 +
 .../63436_cis4_iframe_component.php           | 81 +++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 system/dbupdate_3.4/63436_cis4_iframe_component.php

diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 470a0fa62..ec1bc8a76 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -2,6 +2,8 @@ import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
 import BsConfirm from "../../Bootstrap/Confirm.js";
 import news_content from './Content_types/News_content.js';
+import iframe_content from './Content_types/Iframe_content.js';
+
 import ApiCms from '../../../api/factory/cms.js';
 
 export default {
@@ -24,6 +26,7 @@ export default {
 		raum_contentmittitel,
 		news_content,
 		general,
+		iframe_content
 	},
 	data() {
 		return {
@@ -83,6 +86,8 @@ export default {
 					return "raum_contentmittitel";
 				case "news":
 					return "news_content";
+				case "iframe":
+					return "iframe_content";
 				default:
 					return "general";
 			};
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index cf2f40ca8..23ad5ffcd 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -77,6 +77,7 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
+require_once('dbupdate_3.4/63436_cis4_iframe_component.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/63436_cis4_iframe_component.php b/system/dbupdate_3.4/63436_cis4_iframe_component.php
new file mode 100644
index 000000000..abff4b7e1
--- /dev/null
+++ b/system/dbupdate_3.4/63436_cis4_iframe_component.php
@@ -0,0 +1,81 @@
+<?php
+
+$xsd= <<<EOD
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+	<xs:element name="content">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="url" type="xs:string"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
+EOD;
+
+$xslt_xhtml= <<<EOD
+<xsl:stylesheet version="1.0"
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" encoding="UTF-8"/>
+	<xsl:template match="content">
+		<xsl:choose>
+			<xsl:when test="string(url)">
+				<iframe
+					src="{url}"
+					frameborder="0"
+					style="width:100%; height:90vh; border:0; display:block;"
+				>
+				</iframe>
+			</xsl:when>
+			<xsl:otherwise>
+				<div class="alert alert-warning">Keine URL im Inhalt gefunden.</div>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
+EOD;
+
+$xslt_xhtml_c4= <<<EOD
+<xsl:stylesheet version="1.0"
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" encoding="UTF-8"/>
+	<xsl:template match="content">
+		<xsl:choose>
+			<xsl:when test="string(url)">
+				<iframe
+					src="{url}"
+					frameborder="0"
+					style="width:100%; height:90vh; border:0; display:block;"
+				>
+				</iframe>
+			</xsl:when>
+			<xsl:otherwise>
+				<div class="alert alert-warning">Keine URL im Inhalt gefunden.</div>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+</xsl:stylesheet>
+EOD;
+
+
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_template WHERE template_kurzbz='iframe2'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$sql=  <<<EOD
+	INSERT INTO campus.tbl_template 
+	(template_kurzbz, bezeichnung, xsd, xslt_xhtml, xslfo_pdf, xslt_xhtml_c4) 
+	VALUES 
+	('iframe','iFrame Content ', '{$xsd}', '{$xslt_xhtml}' , NULL, '{$xslt_xhtml_c4}');
+EOD;
+
+		if (!$db->db_query($sql))
+		{
+			echo '<strong>campus.tbl_template: ' . $db->db_last_error() . '</strong><br>';
+		}
+		else
+		{
+			echo ' campus.tbl_template: Template "iframe" hinzugefügt.<br>';
+		}
+
+	}
+}
\ No newline at end of file

From 1f0fe08b696a1d265ae2c93991456c883c3625ec Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 29 Aug 2025 14:15:20 +0200
Subject: [PATCH 0702/1357] upload_required => allowed; hardcoded links =>
 config; styling; endupload/qualgate logic; phrasen;

---
 application/config/abgabe.php                 |   9 +
 .../controllers/api/frontend/v1/Abgabe.php    | 121 +++++++---
 .../models/education/Projektarbeit_model.php  |  25 +-
 .../education/Projektbetreuer_model.php       |  36 ---
 public/js/api/factory/abgabe.js               |  13 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 212 ++++++++---------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  52 ++++-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 140 ++++++------
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 107 ++++++---
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 public/js/plugins/Api.js                      |   1 -
 .../61164_abgabetool_quality_gates.php        |   8 +-
 system/phrasesupdate.php                      | 216 +++++++++++++++++-
 13 files changed, 634 insertions(+), 308 deletions(-)
 create mode 100644 application/config/abgabe.php

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
new file mode 100644
index 000000000..e2092a367
--- /dev/null
+++ b/application/config/abgabe.php
@@ -0,0 +1,9 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start';
+
+$config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
+
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 86f248c84..345ead004 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -36,6 +36,7 @@ class Abgabe extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
+			'getConfig' => self::PERM_LOGGED,
 			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
 			'getStudentProjektabgaben' => self::PERM_LOGGED,
 			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
@@ -70,6 +71,22 @@ class Abgabe extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	/**
+	 * loads config related to abgabetool, found in application/config/abgabe
+	 */
+	public function getConfig() {
+		$this->load->config('abgabe');
+		$old_abgabe_beurteilung_link =$this->config->item('old_abgabe_beurteilung_link');
+		$turnitin_link =$this->config->item('turnitin_link');
+		
+		$ret = array(
+			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
+			'turnitin_link' => $turnitin_link
+		);
+		
+		$this->terminateWithSuccess($ret);
+	}
+	
 	/**
 	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
 	 */
@@ -116,9 +133,19 @@ class Abgabe extends FHCAPI_Controller
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
 
 		if ($isMitarbeiter && $isZugeteilterBetreuer){
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
+			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
 		} else {
-			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+
+		$projektarbeiten = getData($result);
+		
+		// TODO: save access to this, array could be empty
+		foreach($projektarbeiten as $pa) {
+			$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
+			
+			// TODO: save access
+			$pa->email = getData($result)[0]->private_email;
 		}
 
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
@@ -327,12 +354,8 @@ class Abgabe extends FHCAPI_Controller
 			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
 			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
 			$maildata['token'] = "";
-
-			// TODO: clarify if all betreuer are mitarbeiter and have benutzer entries
-			// or if uid = null has to be checked WITH
-			// 'CASE WHEN tbl_benutzer.uid IS NULL THEN kontakt ELSE tbl_benutzer.uid || '@".DOMAIN."' END AS email'
 			
-			$email = $this->getBetreuerEmail($bperson_id);
+			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
 			
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
 
@@ -401,12 +424,7 @@ class Abgabe extends FHCAPI_Controller
 							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
 							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
 							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-
-
-							$email = $this->getBetreuerEmail($bperson_id);
-
-							if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-
+							
 
 							$mailres = sendSanchoMail(
 								'ParbeitsbeurteilungEndupload',
@@ -464,12 +482,13 @@ class Abgabe extends FHCAPI_Controller
 		$fixtermin = $_POST['fixtermin'];
 		$kurzbz = $_POST['kurzbz'];
 		$note = $_POST['note'];
-		$upload_required = $_POST['upload_required'];
+		$upload_allowed = $_POST['upload_allowed'];
+		$betreuer_person_id = $_POST['betreuer_person_id'];
 
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
 			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
 			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($kurzbz)
 			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
@@ -484,7 +503,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
-					'upload_required' => $upload_required,
+					'upload_allowed' => $upload_allowed,
 					'insertvon' => getAuthUID(),
 					'insertamum' => date('Y-m-d H:i:s')
 				)
@@ -499,24 +518,37 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
-					'upload_required' => $upload_required,
+					'upload_allowed' => $upload_allowed,
 					'updatevon' => getAuthUID(),
 					'updateamum' => date('Y-m-d H:i:s')
 				)
 			);
 			
 		}
-
-		$paabgabe_id = $this->getDataOrTerminateWithError($result);
-		
-		$paabgabe = $this->PaabgabeModel->load($paabgabe_id);
 		
 		// check if $paaabgabe is a qual gate and its note is deemed negative
 		// -> send email to student with that info
+		$paabgabe_id = $this->getDataOrTerminateWithError($result);
 		
-		// TODO: DEFAULT NOTE 9 OR DEFAULT NOTE NULL? 9 COUNTS AS NEGATIV :/
+		$result = $this->PaabgabeModel->load($paabgabe_id);
+		$paabgabeArr = $this->getDataOrTerminateWithError($result);
+		$paabgabe = $paabgabeArr[0];
+		$this->addMeta('paabgabe', $paabgabeArr);
+
+		// check if abgabe even has note
+		if($paabgabe->note) {
+			$this->load->model('education/Note_model', 'NoteModel');
+			$result = $this->NoteModel->load($paabgabe->note);
+			$noteArr = $this->getDataOrTerminateWithError($result);
+			$note = $noteArr[0];
+			if($note->positiv === false) {
+				$this->addMeta('noteNegativ', true);
+					
+				$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
+			}
+		}
 		
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($paabgabe);
 	}
 
 	public function deleteProjektarbeitAbgabe() {
@@ -556,7 +588,7 @@ class Abgabe extends FHCAPI_Controller
 
 		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
 			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($kurzbz) || isEmptyString($kurzbz)
+			|| !isset($kurzbz)
 			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
 			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
@@ -664,11 +696,11 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess($paabgabetypen);
 	}
 	
-	private function getBetreuerEmail($person_id) {
-		$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
-		$result = $this->ProjektbetreuerModel->getBetreuerEmail($person_id);
+	private function getProjektbetreuerEmail($projektarbeit_id) {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
 		$email = $this->getDataOrTerminateWithError($result);
-		return $email[0]->email;
+		return $email[0]->private_email;
 	}
 
 	//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
@@ -685,7 +717,24 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess($noten);
 	}
 	
-	private function sendQualGateNegativEmail($student_uid) {
+	private function sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe) {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+		$projektarbeit = $projektarbeitArr[0];
+		
+		$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
+		$anredeArr = $this->getDataOrTerminateWithError($result);
+		$anrede = $anredeArr[0];
+		
+		$student_uid = $projektarbeit->student_uid;
+
+		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
+		$result = $this->PaabgabetypModel->load($paabgabe->paabgabetyp_kurzbz);
+		$paabgabetyp_kurzbzArr = $this->getDataOrTerminateWithError($result);
+		$paabgabetyp_kurzbz = $paabgabetyp_kurzbzArr[0];
+		
 		// Mail an Student wenn Qualgate negativ beurteilt wurde
 		$student = new student();
 		if(!$student->load($student_uid))
@@ -696,21 +745,21 @@ class Abgabe extends FHCAPI_Controller
 		$tomail = $student_uid.'@'.DOMAIN;
 		
 		
-		// TODO: emaildata
+		// TODO: datum format 
 		$data = array(
-			'betreuerfullname' => $student->vorname,
-			'qualgatebezeichnung' => $student->nachname,
-			'datum' => $datum,
-			'projektarbeitname' => $name
+			'betreuerfullname' => $anrede->first,
+			'qualgatebezeichnung' => $paabgabetyp_kurzbz->bezeichnung,
+			'datum' => $paabgabe->datum,
+			'projektarbeitname' => $projektarbeit->titel
 		);
 
+		$this->addMeta('$emaildata', $data);
+		
 		$mailres = sendSanchoMail(
 			'QualGateNegativ',
 			$data,
 			$tomail,
 			$subject
 		);
-		
-		return $mailres;
 	}
 }
\ No newline at end of file
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index b1971cea7..c87e9c187 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -168,7 +168,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.kurzbz,
 					campus.tbl_paabgabe.datum,
 					campus.tbl_paabgabe.note,
-					campus.tbl_paabgabe.upload_required,
+					campus.tbl_paabgabe.upload_allowed,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
@@ -189,7 +189,28 @@ class Projektarbeit_model extends DB_Model
 						WHERE public.tbl_person.person_id= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
+	}
+	
+	public function getProjektbetreuerEmail($projektarbeit_id) {
+		$qry = "SELECT (
+				   SELECT kontakt
+				   FROM public.tbl_kontakt
+				   WHERE kontakttyp = 'email'
+					 AND person_id = pers.person_id
+				   ORDER BY
+					   CASE WHEN zustellung THEN 0 ELSE 1 END,
+					   insertamum DESC NULLS LAST
+				   LIMIT 1
+			   ) AS private_email
+		FROM lehre.tbl_projektarbeit pa
+				 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				 JOIN public.tbl_person pers USING (person_id)
+				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+		WHERE (ben.aktiv OR ben.aktiv IS NULL)
+		  AND projektarbeit_id = ?";
 
+		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
 
 	public function getProjektarbeitBenutzer($uid) {
@@ -225,7 +246,7 @@ class Projektarbeit_model extends DB_Model
 				FROM
 					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
 							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
-							tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
 							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
 					 FROM lehre.tbl_projektarbeit
 							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
index ae78b96d9..95950bf95 100644
--- a/application/models/education/Projektbetreuer_model.php
+++ b/application/models/education/Projektbetreuer_model.php
@@ -231,40 +231,4 @@ class Projektbetreuer_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id, $betreuer_person_id));
 	}
-
-	/**
-	 * Gets email of a Betreuer for a Projektarbeit.
-	 * Projektarbeitbetreuer can be external employees, which should be contacted on their private
-	 * email contact, if they have one. Internal Betreuer should be contacted on their "uid@DOMAIN" adress.
-	 * @param int betreuer_person_id
-	 * @return object success or error
-	 */
-	public function getBetreuerEmail($betreuer_person_id) {
-		// TODO: check if benutzer uid exists, not fixangestellt
-		
-		$qry ="
-			SELECT uid,
-			   CASE
-				   WHEN public.tbl_mitarbeiter.fixangestellt = false
-					   THEN (
-							SELECT kontakt AS email
-							FROM public.tbl_kontakt
-							WHERE  
-								public.tbl_kontakt.person_id = ? AND
-								kontakttyp = 'email'
-							)
-				   
-						ELSE ( 
-							SELECT public.tbl_benutzer.uid || '@' || '".DOMAIN."' AS email
-			       			FROM public.tbl_benutzer
-			       			WHERE person_id = ?
-							)
-				   END AS email
-		FROM public.tbl_benutzer
-			JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)           
-		WHERE person_id = ?
-		";
-
-		return $this->execReadOnlyQuery($qry, array($betreuer_person_id, $betreuer_person_id, $betreuer_person_id));
-	}
 }
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 0602a218c..67e67f385 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -1,4 +1,10 @@
 export default {
+	getConfig() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getConfig'
+		};
+	},
 	getStudentProjektarbeiten(uid) {
 		return {
 			method: 'get',
@@ -51,12 +57,13 @@ export default {
 				paabgabe_id: termin.paabgabe_id,
 				paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
 				datum: termin.datum,
-				note: termin.note,
-				upload_required: termin.upload_required,
+				note: termin.note_pk,
+				upload_allowed: termin.upload_allowed,
 				fixtermin: termin.fixtermin,
 				insertvon: termin.insertvon,
 				kurzbz: termin.kurzbz,
-				projektarbeit_id: termin.projektarbeit_id 
+				projektarbeit_id: termin.projektarbeit_id,
+				betreuer_person_id: termin.betreuer_person_id
 			}
 		};
 	},
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index c70c40ba7..ca8d92cd8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -13,7 +13,7 @@ export const AbgabeMitarbeiterDetail = {
 		Textarea: primevue.textarea,
 		VueDatePicker
 	},
-	inject: ['abgabeTypeOptions', 'allowedNotenOptions'],
+	inject: ['abgabeTypeOptions', 'allowedNotenOptions', 'turnitin_link', 'old_abgabe_beurteilung_link'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -22,7 +22,6 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
-			oldPaBeurteilungLink: 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052', // TODO: inject from app & app provide link from config
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages
@@ -34,18 +33,15 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
-			// 9 => magic number for "noch nicht eingetragen"
-			termin.note = termin.note?.note ?? 9
 			
+			termin.note_pk = termin.note?.note ?? null
+			termin.betreuer_person_id = this.projektarbeit.betreuer_person_id
 			this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
-
 					if(paabgabe_id === -1) { // new abgabe has been inserted
-						termin.paabgabe_id = res?.data?.retval
-
+						termin.paabgabe_id = res?.data?.paabgabe_id
 						this.projektarbeit.abgabetermine.push({ // new abgatermin row
-
 							'paabgabe_id': -1,
 							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 							'fixtermin': false,
@@ -53,7 +49,7 @@ export const AbgabeMitarbeiterDetail = {
 							'datum': new Date().toISOString().split('T')[0],
 							'paabgabetyp_kurzbz': termin.paabgabetyp_kurzbz,
 							'note': this.allowedNotenOptions.find(opt => opt.note == termin.note?.note),
-							'upload_required': termin.upload_required,
+							'upload_allowed': termin.upload_allowed,
 							'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz),
 							'abgabedatum': null,
 							'insertvon': this.viewData?.uid ?? '',
@@ -61,12 +57,9 @@ export const AbgabeMitarbeiterDetail = {
 							'allowedToDelete': true
 						})
 					}
-					
-					
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
-				
 			})
 		},
 		deleteTermin(termin) {
@@ -76,8 +69,6 @@ export const AbgabeMitarbeiterDetail = {
 					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
 					const deletedTerminIndex = this.projektarbeit.abgabetermine.findIndex(t => t.paabgabe_id === termin.paabgabe_id)
 					this.projektarbeit.abgabetermine.splice(deletedTerminIndex, 1)
-
-
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
@@ -92,15 +83,13 @@ export const AbgabeMitarbeiterDetail = {
 			return true;
 		},
 		downloadAbgabe(termin) {
-			// TODO: test
 			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
-			// this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
 		dateDiffInDays(datum, today){
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyle(termin) {
+		getDateStyle(termin, mode) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
@@ -108,21 +97,31 @@ export const AbgabeMitarbeiterDetail = {
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			let color = 'white'
 			let fontColor = 'black'
+			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
 					color = 'red'
 					fontColor = 'white'
+					icon = 'fa-triangle-exclamation'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
 					color = 'yellow'
+					icon = 'fa-circle-exclamation'
 				}
 			} else if(abgabedatum > datum) {
 				color = 'pink' // aka "hellrot"
 				fontColor = 'white'
+				icon = 'fa-circle-question'
 			} else {
 				color = 'green'
+				icon = 'fa-square-check'
 			}
 
-			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			//return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			if(  typeof mode !== 'undefined' || mode === 'icon') {
+				return icon;
+			} else {
+				return 'abgabe-zieldatum-border-' + color;
+			}
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -153,8 +152,7 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(link, '_blank')
 		},
 		openPlagiatcheck() {
-			// todo: hardcoded turnitin link?
-			const link = "https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start"
+			const link = this.turnitin_link
 			window.open(link, '_blank')
 		},
 		openBenotung() {
@@ -175,8 +173,17 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		endUploadVorhanden(){
 			return this.projektarbeit?.abgabetermine.find(abgabe => abgabe.paabgabetyp_kurzbz === 'end' && abgabe.abgabedatum !== null)
+		},
+		qualityGateTerminAvailable() {
+			let qgatefound = false
+			this.projektarbeit?.abgabetermine.forEach(abgabe => {
+				if(abgabe.bezeichnung?.paabgabetyp_kurzbz == 'qualgate1'
+					|| abgabe?.bezeichnung?.paabgabetyp_kurzbz == 'qualgate2') {
+					qgatefound = true
+				}
+			})
+			return qgatefound
 		}
-		
 	},
 	created() {
 
@@ -185,7 +192,7 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-		<div v-if="projektarbeit">
+		<div v-if="projektarbeit" style="max-width: 95%">
 		
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 
@@ -199,20 +206,20 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="col">
 						<div class="row">
 							<button :disabled="!getSemesterBenotbar || !endUploadVorhanden" class="btn btn-secondary border-0" @click="openBenotung" style="width: 80%;">
-								benoten
-								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+								{{ $p.t('abgabetool/c4benoten') }}
+								<i class="fa-solid fa-user-check"></i>
 							</button>
 						</div>
 						<div class="row" style="width: 90%;">
 							<span v-if="!getSemesterBenotbar" v-html="$p.t('abgabetool/c4aeltereParbeitBenoten', oldPaBeurteilungLink)"></span>
-							<span v-else-if="!endUploadVorhanden">Kein Endupload vorhanden!</span>
+							<span v-else-if="!endUploadVorhanden">{{ $p.t('abgabetool/c4noEnduploadFound') }}</span>
 						</div>
 					</div>
 					<div class="col">
 						<div class="row">
 							<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="width: 80%;">
-								zur Plagiatsprüfung
-								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+								{{ $p.t('abgabetool/c4plagiatcheck_link')}}
+								<i class="fa-solid fa-user-check"></i>
 							</button>
 						</div>
 						
@@ -220,8 +227,8 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="col">
 						<div class="row">
 							<button class="btn btn-secondary border-0" @click="openStudentPage" style="width: 80%;">
-								Studentenansicht
-								<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
+								{{ $p.t('abgabetool/c4student_perspective')}}
+								<i class="fa-solid fa-eye"></i>
 							</button>
 						</div>
 						
@@ -230,86 +237,87 @@ export const AbgabeMitarbeiterDetail = {
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
-					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4note')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4upload_required')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-					<div class="col">
-						
+					<div class="fw-bold" style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="row" style="max-width: calc(100% - 100px)">
+						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+						<div v-show="qualityGateTerminAvailable" class="col-2 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+						<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+						<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+						<div class="col">
+							
+						</div>
 					</div>
 				</div>
 				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
 					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
-						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>
+						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>
+<!--						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>-->
 					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<div :style="getDateStyle(termin)">
-							<VueDatePicker
-								style="width: 95%;"
-								v-model="termin.datum"
-								:clearable="false"
+					<div class="row" style="max-width: calc(100% - 100px)">
+						<div class="col-2 d-flex justify-content-center align-items-center">
+							<div class="position-relative" :class="getDateStyle(termin)">
+								<VueDatePicker
+									style="width: 95%;"
+									v-model="termin.datum"
+									:clearable="false"
+									:disabled="!termin.allowedToSave"
+									:enable-time-picker="false"
+									:format="formatDate"
+									:text-input="true"
+									auto-apply>
+								</VueDatePicker>
+								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
+							</div>				
+						</div>
+						<div class="col-2 d-flex justify-content-center align-items-center">
+							<Dropdown 
+								:style="{'width': '100%'}"
 								:disabled="!termin.allowedToSave"
-								:enable-time-picker="false"
-								:format="formatDate"
-								:text-input="true"
-								auto-apply>
-							</VueDatePicker>
-						</div>				
-					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<Dropdown 
-							:style="{'width': '100%'}"
-							:disabled="!termin.allowedToSave"
-							v-model="termin.bezeichnung"
-							:options="abgabeTypeOptions"
-							:optionLabel="getOptionLabelAbgabetyp">
-						</Dropdown>
-					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<Dropdown 
-							v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
-							:style="{'width': '100%'}"
-							v-model="termin.note"
-							:options="allowedNotenOptions"
-							:optionLabel="getNotenOptionLabel">
-						</Dropdown>
-					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
-						<Checkbox 
-							v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
-							v-model="termin.upload_required"
-							:binary="true" 
-							:pt="{ root: { class: 'ml-auto' }}"
-						>
-						</Checkbox>
-					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="30" :disabled="!termin.allowedToSave"></Textarea>
-					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
-						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-							<i class="fa-solid fa-file-pdf"></i>
-						</a>
-					</div>
-					<div class="col-2 align-content-center">
-						<div class="row">
-							<div class="col-6">
-								<button v-if="termin.allowedToSave" class="btn btn-primary border-0" @click="saveTermin(termin)">
-									Speichern
-									<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
-								</button>
-							</div>
-							<div class="col-6">
-								<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" class="btn btn-primary border-0" @click="deleteTermin(termin)">
-									Löschen
-									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
-								</button>
-							</div>
+								v-model="termin.bezeichnung"
+								:options="abgabeTypeOptions"
+								:optionLabel="getOptionLabelAbgabetyp">
+							</Dropdown>
+						</div>
+						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-2 d-flex justify-content-center align-items-center">
+							<Dropdown 
+								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
+								:style="{'width': '100%'}"
+								v-model="termin.note"
+								:options="allowedNotenOptions"
+								:optionLabel="getNotenOptionLabel">
+							</Dropdown>
+						</div>
+						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-center">
+							<Checkbox 
+								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
+								v-model="termin.upload_allowed"
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+						<div class="col-2 d-flex justify-content-center align-items-center">
+							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="20" :disabled="!termin.allowedToSave"></Textarea>
+						</div>
+						<div class="col-1 d-flex justify-content-center align-items-center">
+							{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+							<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
+								<i class="fa-solid fa-2x fa-file-pdf"></i>
+							</a>
+						</div>
+						<div class="col-2 align-content-center">
+							<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
+								{{ $p.t('abgabetool/c4save') }}
+								<i class="fa-solid fa-floppy-disk"></i>
+							</button>
+							<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">
+								{{ $p.t('abgabetool/c4delete') }}
+								<i class="fa-solid fa-trash"></i>
+							</button>
 						</div>
 					</div>
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 3271ed97f..be44b0441 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -15,6 +15,7 @@ export const AbgabeStudentDetail = {
 		Textarea: primevue.textarea,
 		VueDatePicker
 	},
+	inject: ['notenOptions'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -83,9 +84,7 @@ export const AbgabeStudentDetail = {
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
-			// TODO: test
 			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
-			// this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
 		formatDate(dateParam) {
 			const date = new Date(dateParam)
@@ -181,6 +180,10 @@ export const AbgabeStudentDetail = {
 		},
 		getOptionLabel(option) {
 			return option.sprache
+		},
+		getTerminNoteBezeichnung(termin) {
+			const noteOpt = this.notenOptions.find(opt => opt.note == termin.note)
+			return noteOpt ? noteOpt.bezeichnung : ''
 		}
 	},
 	watch: {
@@ -201,6 +204,16 @@ export const AbgabeStudentDetail = {
 		},
 		getAllowedToSendEndupload() {
 			return !this.eidAkzeptiert
+		},
+		qualityGateTerminAvailable() {
+			let qgatefound = false
+			this.projektarbeit?.abgabetermine.forEach(abgabe => {
+				if(abgabe.paabgabetyp_kurzbz == 'qualgate1'
+					|| abgabe.paabgabetyp_kurzbz == 'qualgate2') {
+					qgatefound = true
+				}
+			})
+			return qgatefound
 		}
 	},
 	created() {
@@ -221,8 +234,10 @@ export const AbgabeStudentDetail = {
 				<div class="row" style="margin-bottom: 12px;">
 					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>
 					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col-3 fw-bold">
 						{{$p.t('abgabetool/c4fileupload')}}
@@ -250,14 +265,27 @@ export const AbgabeStudentDetail = {
 							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
 						</div>
 					</div>
-					<div class="col-2 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>
-					<div class="col-3 d-flex justify-content-start align-items-start">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="45" :disabled="true"></Textarea>
+					<div class="col-1 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>
+					<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">
+						{{ getTerminNoteBezeichnung(termin) }}
 					</div>
-					<div class="col-1 d-flex flex-column justify-content-start align-items-center">
+					<div v-if="qualityGateTerminAvailable || termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-start">
+						<Checkbox 
+							v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'"
+							disabled
+							v-model="termin.upload_allowed"
+							:binary="true" 
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
+					<div class="col-2 d-flex justify-content-start align-items-start">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="45" :disabled="true"></Textarea>
+					</div>
+					<div class="col-1 d-flex justify-content-start align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-							<i class="fa-solid fa-3x fa-file-pdf"></i>
+							<i class="fa-solid fa-2x fa-file-pdf"></i>
 						</a>
 					</div>
 					<div class="col-3" v-if="!viewMode">
@@ -267,8 +295,8 @@ export const AbgabeStudentDetail = {
 							</div>
 							<div class="col-4">
 								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
-									Upload
-									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
+									{{$p.t('abgabetool/c4upload')}}
+									<i class="fa-solid fa-upload"></i>
 								</button>
 							</div>
 						</div>
@@ -289,7 +317,7 @@ export const AbgabeStudentDetail = {
 				</div>
 				<div class="row mb-3 align-items-start">
 					
-					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
+					<p class="ml-4 mr-4">{{$p.t('abgabetool/c4titel')}}: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index c16abc8a3..1e9d61056 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -19,7 +19,9 @@ export const AbgabetoolMitarbeiter = {
 	provide() {
 		return {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
-			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions)
+			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
+			turnitin_link: Vue.computed(() => this.turnitin_link),
+			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
 		}
 	},
 	props: {
@@ -34,6 +36,8 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			turnitin_link: null,
+			old_abgabe_beurteilung_link: null,
 			saving: false,
 			loading: false,
 			abgabeTypeOptions: null,
@@ -59,9 +63,9 @@ export const AbgabetoolMitarbeiter = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 700,
+				minHeight: 250,
 				index: 'projektarbeit_id',
-				layout: 'fitDataStretch',
+				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
@@ -80,13 +84,13 @@ export const AbgabetoolMitarbeiter = {
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1}
 				],
 				persistence: false,
 			},
@@ -209,7 +213,7 @@ export const AbgabetoolMitarbeiter = {
 					'kurzbz': '',
 					'datum': new Date().toISOString().split('T')[0],
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-					'upload_required': false,
+					'upload_allowed': false,
 					'paabgabetyp_kurzbz': '',
 					'bezeichnung': '',
 					'abgabedatum': null,
@@ -227,7 +231,6 @@ export const AbgabetoolMitarbeiter = {
 						paabgabetyp_kurzbz: termin.paabgabetyp_kurzbz
 					}
 				})
-				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = details.student_uid
 				pa.student = `${pa.vorname} ${pa.nachname}`
 				
@@ -280,10 +283,6 @@ export const AbgabetoolMitarbeiter = {
 		buildStg(projekt) {
 			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
 		},
-		buildBetreuer(abgabe) {
-			// TODO: preload and insert own titled name of betreuer somehow
-			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
-		},
 		setupData(data){
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
@@ -337,7 +336,7 @@ export const AbgabetoolMitarbeiter = {
 			if(!tableDataSet) return
 			const rect = tableDataSet.getBoundingClientRect();
 
-			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top - 80
 			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
 		},
 		async setupMounted() {
@@ -346,7 +345,6 @@ export const AbgabetoolMitarbeiter = {
 
 			this.loadProjektarbeiten()
 
-
 			this.$refs.verticalsplit.collapseBottom()
 			this.calcMaxTableHeight()
 			
@@ -359,6 +357,15 @@ export const AbgabetoolMitarbeiter = {
 
 	},
 	created() {
+		// fetch config to avoid hard coded links
+		this.$api.call(ApiAbgabe.getConfig()).then(res => {
+			this.turnitin_link = res.data?.turnitin_link
+			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
+		}).catch(e => {
+			console.log(e)
+			this.loading = false
+		})
+		
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
@@ -367,7 +374,6 @@ export const AbgabetoolMitarbeiter = {
 			this.allowedNotenOptions = this.notenOptions.filter(
 				opt => opt.bezeichnung === 'Bestanden' 
 					|| opt.bezeichnung === 'Nicht bestanden'
-					|| opt.bezeichnung === 'Noch nicht eingetragen'
 			)
 		}).catch(e => {
 			this.loading = false
@@ -385,7 +391,7 @@ export const AbgabetoolMitarbeiter = {
 	},
 	template: `
 		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
-		dialogClass="modal-lg">
+			dialogClass="modal-lg">
 			<template v-slot:title>
 				<div>
 					{{ $p.t('abgabetool/neueTerminserie') }}
@@ -435,57 +441,59 @@ export const AbgabetoolMitarbeiter = {
 				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/speichern') }}</button>
 			</template>
 		</bs-modal>	
+		<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
+		<div style="max-height:40vw;"> 
 		
-		<vertical-split ref="verticalsplit">		
-			
-			<template #top>
-				<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-				<hr>
-				<core-filter-cmpt 
-					:title="''"  
-					@uuidDefined="handleUuidDefined"
-					ref="abgabeTable"
-					:newBtnShow="true"
-					:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
-					:newBtnDisabled="!selectedData.length"
-					@click:new=openAddSeriesModal
-					:tabulator-options="abgabeTableOptions"  
-					:tabulator-events="abgabeTableEventHandlers"
-					tableOnly
-					:sideMenu="false"
-					:useSelectionSpan="false"
-				>
-					<template #actions>
-						<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
-							<i v-show="!showAll" class="fa fa-eye"></i>
-							<i v-show="showAll" class="fa fa-eye-slash"></i>
-							{{ $p.t('abgabetool/showAll') }}
-						</button>
-						
-						<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
-							<i class="fa fa-hourglass-end"></i>
-							{{ $p.t('abgabetool/showDeadlines') }}
-						</button>
-						
-						<div v-show="saving">
-							{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-						</div>
-						<div v-show="loading">
-							{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-						</div>
-						
-					</template>
-				</core-filter-cmpt>
-
-			</template>
-			<template #bottom>
-				<div v-show="selectedProjektarbeit" ref="selProj"> 
-					<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-				</div>
-			</template>
-		</vertical-split>
-
-	 
+			<vertical-split ref="verticalsplit">		
+				
+				<template #top>
+					<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+					<hr>
+					<core-filter-cmpt
+						:title="''"  
+						@uuidDefined="handleUuidDefined"
+						ref="abgabeTable"
+						:newBtnShow="true"
+						:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
+						:newBtnDisabled="!selectedData.length"
+						@click:new=openAddSeriesModal
+						:tabulator-options="abgabeTableOptions"  
+						:tabulator-events="abgabeTableEventHandlers"
+						tableOnly
+						:sideMenu="false"
+						:useSelectionSpan="false"
+					>
+						<template #actions>
+							<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
+								<i v-show="!showAll" class="fa fa-eye"></i>
+								<i v-show="showAll" class="fa fa-eye-slash"></i>
+								{{ $p.t('abgabetool/showAll') }}
+							</button>
+							
+							<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
+								<i class="fa fa-hourglass-end"></i>
+								{{ $p.t('abgabetool/showDeadlines') }}
+							</button>
+							
+							<div v-show="saving">
+								{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+							</div>
+							<div v-show="loading">
+								{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+							</div>
+							
+						</template>
+					</core-filter-cmpt>
+	
+				</template>
+				<template #bottom>
+					<div v-show="selectedProjektarbeit" ref="selProj"> 
+						<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+					</div>
+				</template>
+			</vertical-split>
+		
+		</div>
     `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index bfd5da01b..2a1827b4e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -10,6 +10,11 @@ export const AbgabetoolStudent = {
 		AbgabeDetail,
 		VerticalSplit
 	},
+	provide() {
+		return {
+			notenOptions: Vue.computed(() => this.notenOptions)
+		}
+	},
 	props: {
 		student_uid_prop: {
 			default: null
@@ -25,6 +30,7 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			notenOptions: null,
 			tabulatorUuid: Vue.ref(0),
 			domain: '',
 			student_uid: null,
@@ -83,27 +89,42 @@ export const AbgabetoolStudent = {
 			]};
 	},
 	methods: {
-		checkQualityGates(termine, enduploadtermin) {
-				return true
+		checkQualityGates(termine) {
+			let qgate1Passed = false
+			let qgate2Passed = false
+			
+			termine.forEach(t => {
+				const noteOption = this.notenOptions.find(opt => opt.note == t.note)
+				if(noteOption && noteOption.positiv) {
+					if(t.paabgabetyp_kurzbz == 'qualgate1') {
+						qgate1Passed = true
+					} else if(t.paabgabetyp_kurzbz == 'qualgate2') {
+						qgate2Passed = true
+					}
+				}
+			})
+
+			return qgate1Passed && qgate2Passed
 		},
 		isPastDate(date) {
 			return new Date(date) < new Date(Date.now())	
 		},
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
-				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				const pa = this.projektarbeiten?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
-					// termin.allowedToUpload = true
-					
+					termin.allowedToUpload = false
+					// termin.datum = '2025-10-16'
 					// TODO: fixtermin logic?
-					if(termin.bezeichnung == 'Endupload' && 
-						(this.isPastDate(termin.datum) || this.checkQualityGates(pa.abgabetermine, termin))) {
+					if(termin.paabgabetyp_kurzbz == 'enda') {
 						
-						// termin.allowedToUpload = false
+						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
+					} else if(termin.paabgabetyp_kurzbz == 'qualgate1' || termin.paabgabetyp_kurzbz == 'qualgate2') {
+						termin.allowedToUpload = termin.upload_allowed
 					} else {
-						// termin.allowedToUpload = true
+						termin.allowedToUpload = true
 					}
 
 				})
@@ -111,7 +132,6 @@ export const AbgabetoolStudent = {
 				pa.student_uid = this.student_uid
 
 				this.selectedProjektarbeit = pa
-
 				
 				this.$refs.verticalsplit.showBoth()
 				
@@ -150,8 +170,12 @@ export const AbgabetoolStudent = {
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
 		},
-		buildMailToLink(abgabe) {
-			return 'mailto:' + abgabe.mitarbeiter_uid +'@'+ this.domain
+		buildMailToLink(projekt) {
+			if(projekt.mitarbeiter_uid) { // standard
+				return 'mailto:' + projekt.mitarbeiter_uid +'@'+ this.domain
+			} else { // private
+				return 'mailto:' + projekt.email
+			}
 		},
 		buildBetreuer(abgabe) {
 			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
@@ -160,7 +184,7 @@ export const AbgabetoolStudent = {
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			this.student_uid = data[2]
-			const d = data[0]?.retval?.map(projekt => {
+			const d = data[0]?.map(projekt => {
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
@@ -213,7 +237,7 @@ export const AbgabetoolStudent = {
 			if(!tableDataSet) return
 			const rect = tableDataSet.getBoundingClientRect();
 
-			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top - 100
 			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
 		},
 		async setupMounted() {
@@ -223,7 +247,7 @@ export const AbgabetoolStudent = {
 			this.loadProjektarbeiten()
 
 			this.$refs.verticalsplit.collapseBottom()
-			//this.calcMaxTableHeight()
+			this.calcMaxTableHeight()
 		}
 	},
 	watch: {
@@ -235,34 +259,43 @@ export const AbgabetoolStudent = {
 		}
 	},
 	created() {
+		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
+		this.$api.call(ApiAbgabe.getNoten()).then(res => {
+			this.notenOptions = res.data
+		}).catch(e => {
+			this.loading = false
+		})
 
 	},
 	mounted() {
 		this.setupMounted()
 	},
 	template: `
-	<vertical-split ref="verticalsplit">				
-		<template #top>
-			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-			<hr>
-				
-			 <core-filter-cmpt
-			 	@uuidDefined="handleUuidDefined"
-				:title="''"  
-				ref="abgabeTable" 
-				:tabulator-options="abgabeTableOptions"  
-				:tabulator-events="abgabeTableEventHandlers"
-				tableOnly
-				:sideMenu="false"
-			 />
-			 
-		 </template>
-		<template #bottom>
-			<div v-show="selectedProjektarbeit"> 
-				<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-			 </div>
-		</template>
-	</vertical-split>
+<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
+	<div style="max-height:40vw;"> 
+		<vertical-split ref="verticalsplit">				
+			<template #top>
+				<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+				<hr>
+					
+				 <core-filter-cmpt
+					@uuidDefined="handleUuidDefined"
+					:title="''"  
+					ref="abgabeTable" 
+					:tabulator-options="abgabeTableOptions"  
+					:tabulator-events="abgabeTableEventHandlers"
+					tableOnly
+					:sideMenu="false"
+				 />
+				 
+			 </template>
+			<template #bottom>
+				<div v-show="selectedProjektarbeit" style="max-width: 95%"> 
+					<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+				 </div>
+			</template>
+		</vertical-split>
+	</div>
     `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 6f8347169..cc202b4b4 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -110,7 +110,7 @@ export const DeadlineOverview = {
 			if(!tableDataSet) return
 			const rect = tableDataSet.getBoundingClientRect();
 
-			this.deadlineTableOptions.height = window.visualViewport.height - rect.top
+			this.deadlineTableOptions.height = window.visualViewport.height - rect.top - 30
 			this.$refs.deadlineTable.tabulator.setHeight(this.deadlineTableOptions.height)
 		},
 		async setupMounted() {
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index e3e604d6c..43c2b3064 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -164,7 +164,6 @@ export default {
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
-				debugger
 				if (Array.isArray(factory)) {
 					const $fhcAlert = app.config.globalProperties.$fhcAlert;
 					const $api = app.config.globalProperties.$api;
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index b4f6fd7c9..1ec257bb1 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -34,7 +34,7 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 	{
 
 		$qry = "ALTER TABLE campus.tbl_paabgabe
-				ADD COLUMN note SMALLINT NOT NULL DEFAULT 9,
+				ADD COLUMN note SMALLINT DEFAULT NULL,
 				ADD CONSTRAINT tbl_paabgabe_note_fkey
 					FOREIGN KEY (note)
 					REFERENCES lehre.tbl_note(note)
@@ -47,16 +47,16 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 	}
 }
 
-if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'upload_required'"))
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'upload_allowed'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "ALTER TABLE campus.tbl_paabgabe
-				ADD COLUMN IF NOT EXISTS upload_required boolean DEFAULT false;";
+				ADD COLUMN IF NOT EXISTS upload_allowed boolean DEFAULT false;";
 
 		if(!$db->db_query($qry))
 			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
 		else
-			echo '<br>paabgabe column upload_required default false hinzugefuegt';
+			echo '<br>paabgabe column upload_allowed default false hinzugefuegt';
 	}
 }
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dd23a1c4a..19cf6469f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41490,7 +41490,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "details",
+				'text' => "Details",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41510,7 +41510,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "semester",
+				'text' => "Semester",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41530,7 +41530,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "degree program",
+				'text' => "Degree program",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41550,7 +41550,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "contact",
+				'text' => "Contact",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41590,7 +41590,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "project type",
+				'text' => "Project type",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41610,7 +41610,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "title",
+				'text' => "Title",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41670,7 +41670,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "target date",
+				'text' => "Target date",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41730,7 +41730,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "submission date",
+				'text' => "Submission date",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41776,6 +41776,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4benoten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Benoten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Grade",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -41796,6 +41816,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4save',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Speichern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Save",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Löschen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Delete",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42176,6 +42236,146 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4note',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Note",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4upload_allowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Upload erlaubt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload allowed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4student_perspective',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Studentenansicht",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student perspective',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4upload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Hochladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4plagiatcheck_link',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "zur Plagiatsprüfung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Plagiarism check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4plagiatcheck_link',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "zur Plagiatsprüfung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Plagiarism check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4noEnduploadFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kein Endupload vorhanden!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No final submission found!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 0d1cf2b04310cd6995542f942f674782a6cb1b6f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 1 Sep 2025 09:20:33 +0200
Subject: [PATCH 0703/1357] autocomplete bei den kompatiblen lvs
 beruecksichtigen

---
 .../pruefungsanmeldungen_verwalten.php        |  3 ++
 system/dbupdate_3.4.php                       |  1 -
 ...hrveranstaltung_kompatibel_vergleichen.php | 46 ++++++++++++++++---
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index 4928ed91a..6a1dc9a92 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -288,6 +288,8 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 					terminezusammenlegen(termine, erste_lvid);
 				}
 			})
+
+			loadPruefungStudiengang();
 		});
 	</script>
 	<h1><?php echo $p->t('pruefung/anmeldungenVerwalten'); ?></h1>
@@ -318,6 +320,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 	<div id='prfWrapper'>
 		<div id='pruefungen'>
 		<h2><?php echo $p->t('pruefung/pruefungPruefungenTitle'); ?></h2>
+		<button id="zusammenlegen">Termine zusammenlegen</button>
 		<table id="table4" class="tablesorter" style="display:none">
 			<thead>
 				<tr>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3a743f065..c096899ee 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -77,7 +77,6 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
-require_once('dbupdate_3.4/60882_lehrfaecherverteilung_favorites.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
diff --git a/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
index 94e1af155..822de1057 100644
--- a/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
+++ b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
@@ -140,12 +140,17 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 				let uebernahmenCheckboxen = $("input[name='lvUebernehmenCheckbox']:checked");
 				let checkboxenUebernahmeCount = uebernahmenCheckboxen.length;
 
-				if (!lvidFrom || !lvidTo)
+				let lvidautoFrom = $('#autocompleteFrom').data("lv-id");
+				let lvidautoTo = $('#autocompleteTo').data("lv-id");
+
+				if ((!lvidFrom && !lvidautoFrom) || (!lvidTo && !lvidautoTo))
 				{
 					alert("Bitte in beiden Dropdowns eine LV auswählen!");
 					return;
 				}
 
+				lvidTo = lvidTo || lvidautoTo;
+
 				if (checkboxenUebernahmeCount === 0)
 				{
 					alert("Bitte Kompatible LV´s auswählen die übernommen werden sollen!");
@@ -159,7 +164,18 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 						done++;
 						if (done === checkboxenUebernahmeCount)
 						{
-							$('#lvDropdownTo').trigger('change');
+							let drodpwonval = $('#lvDropdownTo').val();
+							const autocompleteval  = $('#autocompleteTo').data('lv-id');
+
+							if (drodpwonval)
+							{
+								$('#lvDropdownTo').trigger('change');
+							}
+							else if (autocompleteval)
+							{
+								callLoadKompatibleLvs(autocompleteval, 'To');
+
+							}
 						}
 					});
 				});
@@ -211,9 +227,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 				loadKompatibleLvs(side)
 			})
 
-			$('#kompatibleLVs' + side).tablesorter({
-				widgets: ["zebra"]
-			});
+			$('#kompatibleLVs' + side).data('ts-initialized', false);
 
 			$("#autocomplete" + side).autocomplete({
 				source: "lehrveranstaltung_kompatibel_vergleichen.php?autocomplete=" + side,
@@ -230,6 +244,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 				},
 				select: function(event, ui) {
 					callLoadKompatibleLvs(ui.item.lehrveranstaltung_id, side)
+					$(this).data("lv-id", ui.item.lehrveranstaltung_id);
 					$("#lvBezeichnung" + side).html(ui.item.bezeichnung);
 				}
 			});
@@ -237,6 +252,16 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 
 		}
 
+		function sortTable(side)
+		{
+			if ($("#kompatibleLVs" + side + " tbody tr").length > 0 && !$('#kompatibleLVs' + side).data('ts-initialized'))
+			{
+				$('#kompatibleLVs' + side).tablesorter({
+					widgets: ["zebra"],
+				});
+			}
+		}
+
 		function loadSemester(side)
 		{
 			var studiengang_kz = $("#stgDropdown" + side).val();
@@ -318,6 +343,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 					});
 					$("#kompatibleLVs" + side + " tbody").html(html);
 
+					sortTable(side);
 					markDifferences();
 				},
 				error: function(jqXHR, textStatus, errorThrown)
@@ -328,8 +354,14 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 		}
 
 		function markDifferences() {
-			const fromVal = $("#lvDropdownFrom").val();
-			const toVal   = $("#lvDropdownTo").val();
+			let fromVal = $("#lvDropdownFrom").val();
+			let toVal   = $("#lvDropdownTo").val();
+
+			let lvidautoFrom = $('#autocompleteFrom').data("lv-id");
+			let lvidautoTo = $('#autocompleteTo').data("lv-id");
+
+			fromVal = fromVal || lvidautoFrom;
+			toVal = toVal || lvidautoTo;
 
 			if (!fromVal || fromVal === "null" || !toVal || toVal === "null")
 			{

From ea85cce9574cf1b9691a3e0a31109521d71a73e4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 1 Sep 2025 09:37:30 +0200
Subject: [PATCH 0704/1357] own controller detailHeader, bugfix
 loadDepartmentdata

---
 .../frontend/v1/detailheader/Detailheader.php | 53 +++++++++++++++++++
 .../api/frontend/v1/vertraege/Vertraege.php   | 36 -------------
 public/js/api/factory/detailHeader.js         |  6 +--
 .../components/DetailHeader/DetailHeader.js   | 21 ++++++--
 .../Vertraege/Vertragsverwaltung.js           |  1 +
 system/filtersupdate.php                      | 27 ++++++++++
 6 files changed, 102 insertions(+), 42 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/detailheader/Detailheader.php

diff --git a/application/controllers/api/frontend/v1/detailheader/Detailheader.php b/application/controllers/api/frontend/v1/detailheader/Detailheader.php
new file mode 100644
index 000000000..ada10c5b6
--- /dev/null
+++ b/application/controllers/api/frontend/v1/detailheader/Detailheader.php
@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Detailheader extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
+		]);
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+}
+
+
diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index bb14bc511..c426d5637 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -26,9 +26,6 @@ class Vertraege extends FHCAPI_Controller
 			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
 			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
 			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
-			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 
 		//Load Models and Libraries
@@ -684,37 +681,4 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
-
-	public function getPersonAbteilung($mitarbeiter_uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getLeitungOrg($oekurzbz)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getHeader($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getHeader($person_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
 }
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
index 74563bd4b..3c7d95bb1 100644
--- a/public/js/api/factory/detailHeader.js
+++ b/public/js/api/factory/detailHeader.js
@@ -19,19 +19,19 @@ export default {
 	getHeader(person_id){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
+			url: 'api/frontend/v1/detailheader/detailheader/getHeader/' + person_id,
 		};
 	},
 	getPersonAbteilung(mitarbeiter_uid){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + mitarbeiter_uid,
+			url: 'api/frontend/v1/detailheader/detailheader/getPersonAbteilung/' + mitarbeiter_uid,
 		};
 	},
 	getLeitungOrg(oekurzbz){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
+			url: 'api/frontend/v1/detailheader/detailheader/getLeitungOrg/' + oekurzbz,
 		};
 	},
 }
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 8cf7abe22..0e035b8a3 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -17,6 +17,10 @@ export default {
 			type: Number,
 			required: false
 		},
+		mitarbeiter_uid: {
+			type: String,
+			required: false
+		},
 		typeHeader: {
 			type: String,
 			default: 'student',
@@ -41,19 +45,30 @@ export default {
 	created(){
 		if(this.person_id) {
 			this.getHeader(this.person_id);
-
 			this.loadDepartmentData(this.mitarbeiter_uid)
 				.then(() => {
 					// Call getLeitungOrg only after departmentData is loaded
 					this.getLeitungOrg(this.departmentData.oe_kurzbz);
 				})
 				.catch((error) => {
-					console.error("Error loading department data:", error);
+					console.error("Error loading department data: ", error);
 				});
 		}
 	},
 	watch: {
 		person_id: {
+			handler(newVal) {
+				if (newVal) {
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.mitarbeiter_uid).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
+				}
+			},
+			deep: true,
+		},
+/*		person_id: {
 			handler(newVal) {
 				if (newVal) {
 					this.getHeader(this.person_id);
@@ -64,7 +79,7 @@ export default {
 				}
 			},
 			deep: true,
-		},
+		},*/
 	},
 	data(){
 		return{
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index a6d2b9e95..1bd97c55b 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -60,6 +60,7 @@ export default {
 						<div class="col" v-if="person_id!=null">
 							<fhc-header
 								:person_id="person_id"
+								:mitarbeiter_uid="this.mitarbeiter_uid"
 								typeHeader="mitarbeiter"
 								@redirectToLeitung="redirectToLeitung"
 							></fhc-header>
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 9e3c62a33..089065c24 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1558,6 +1558,33 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'vertragsverwaltung',
+		'filter_kurzbz' => 'Vertragsverwaltung',
+		'description' => '{Vertragsverwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Vertragsverwaltung",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Nachname"},
+					{"name": "Vorname"},
+					{"name": "aktiv"},
+					{"name": "Geburtsdatum"},
+					{"name": "Unternehmen"},
+					{"name": "Firma"},
+					{"name": "Vertragsarten"},
+					{"name": "IDs Dienstverhältnis"},
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
+	),
 
 );
 

From 05a3c40a9e4a37b20b41f93a0304b913bb945150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 1 Sep 2025 15:56:33 +0200
Subject: [PATCH 0705/1357] Falschen Config Eintrag verschoben

---
 config/cis.config-default.inc.php    | 3 +++
 config/global.config-default.inc.php | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 4f6745ce7..9985a90d4 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -249,6 +249,9 @@ define('CIS_INFOSCREEN_NEWS_ANZEIGEN',false);
 //User, welcher für das Anlegen von Anrechnungen bei der Prüfungsanmeldung verwendet wird
 define('CIS_PRUEFUNGSANMELDUNG_USER','p.pruefungsanmeldung');
 
+//Gibt an, ob die Studierenden bei der Anmeldung zu einer Prüfung den Ausmas an ECTS angeben können
+define('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE', false);
+
 // Anmeldefristen für Prüfungen in Tagen;
 // Wenn nicht definiert: 3
 //define('CIS_PRUEFUNGSANMELDUNG_FRIST',3);
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 89b02a8ce..8cfc36bfb 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -263,9 +263,6 @@ define('CIS_SAALPLAN_ALLERAEUME_OPTION', false);
 //Legt fest ob Bestätigungsmails über eine Anmelung zu einer Prüfung an eine einzelne Person erfolgt oder an den jeweiligen Lektor. (Leerstring für jeweiligen Lektor | uid);
 define('CIS_PRUEFUNG_MAIL_EMPFAENGER_ANMEDLUNG',"");
 
-//Gibt an, ob die Studierenden bei der Anmeldung zu einer Prüfung den Ausmas an ECTS angeben können
-define('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE', false);
-
 // Username fuer STIP Schnittstelle
 define('STIP_USER_NAME','stipendienstelle');
 // Passwort fuer STIP Schnittstelle

From fa6d651b2103ec5def3c8d8ed9f109d46abaabfb Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 1 Sep 2025 16:48:24 +0200
Subject: [PATCH 0706/1357] phrasen & permissionLib/Phrases reference $param in
 lvMenuBuild event

---
 .../controllers/api/frontend/v1/LvMenu.php    |   2 +
 system/phrasesupdate.php                      | 186 +++++++++++++++++-
 2 files changed, 185 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 393c4d5c3..2a305dbb5 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -269,6 +269,8 @@ class LvMenu extends FHCAPI_Controller
 			'lehrfach_id'=>$lehrfach_id,
 			'lektor_der_lv'=>$lektor_der_lv,
 			'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr,
+			'permissionLib' => &$this->PermissionLib,
+			'phrasesLib' => &$this->PhrasesLib
 		];
 		
 		Events::trigger('lvMenuBuild', 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dd23a1c4a..82ea03ba0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33361,18 +33361,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'anwTimeline',
+		'phrase' => 'anwTimelineV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Digitale Anwesenheiten Timeline',
+				'text' => 'Digitale Anwesenheiten Timeline EXPERIMENTELL',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Digital Attendances Timeline',
+				'text' => 'Digital Attendances Timeline EXPERIMENTAL',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -33850,6 +33850,186 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleRestart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Kontrolle wiederholen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Restart attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipLegende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Status Legende für das Digitales Anwesenheiten und Entschuldigungsmanagement anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show status legend for the digital attendance and excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipCsv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Tabelle als CSV Datei exportiern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Export table as CSV file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipEdit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheitskontrollen bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit attendance checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipSaveChanges',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Manuell veränderte Anwesenheiten speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save manually edited attendance entries',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipRestartKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Bestehende Anwesenheitskontrolle neu starten. Studierende, welche bereits gültig registriert sind, gelten weiterhin als anwesend!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Restart existing attendance check. Students who are already validly registered will continue to be considered present!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipDeleteKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheitskontrolle löschen. Die dazugehörigen Statuseinträge der Studierenden werden auch gelöscht!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete attendance checks. The corresponding student status entries will also be deleted!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipEditKontrollzeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Zeitgrenzen einer Kontrolle bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit time limits of an attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwesenheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From ba6224bc788e83894627d8fc5770af3c3f97053f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Sep 2025 11:18:24 +0200
Subject: [PATCH 0707/1357] oeh betrag aus der eigener tabelle holen
 studentenverwaltung bei jedem studiensemester wechsel fas nur einmalig ueber
 die variable

---
 .../controllers/api/frontend/v1/stv/Konto.php | 45 ++++++++++++++++++-
 include/konto.class.php                       | 45 ++++++++++++++++++-
 public/js/api/factory/stv/konto.js            | 10 +++--
 .../Studentenverwaltung/Details/Konto/New.js  | 18 +++++++-
 4 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index a33680ea0..c7c1aa1d5 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -48,7 +48,8 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto'
+			'konto',
+			'lehre'
 		]);
 	}
 
@@ -112,7 +113,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen()
+	public function getBuchungstypen($studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -122,6 +123,7 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -494,4 +496,43 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
+
+	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
+	{
+		if (is_null($studiensemester_kurzbz))
+		{
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
+		}
+		else
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+				$studiensemester_akt = $studiensemester_kurzbz;
+			else
+				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
+
+		$oehStandardbetrag = null;
+		if (hasData($oehBeitrag))
+		{
+			$oeh = getData($oehBeitrag)[0];
+			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
+			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
+		}
+
+		if ($oehStandardbetrag !== null)
+		{
+			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
+				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
+				{
+					$buchungstyp->standardbetrag = $oehStandardbetrag;
+				}
+				return $buchungstyp;
+			}, $data);
+		}
+	}
 }
diff --git a/include/konto.class.php b/include/konto.class.php
index 51f79200b..da76c147f 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -25,6 +25,7 @@
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
 require_once(dirname(__FILE__).'/'.EXT_FKT_PATH.'/generateZahlungsreferenz.inc.php');
+require_once(dirname(__FILE__).'/variable.class.php');
 
 class konto extends basis_db
 {
@@ -432,6 +433,8 @@ class konto extends basis_db
 
 		$qry.=" ORDER BY beschreibung";
 
+		$oehBeitrag = $this->_getOEHBeitrag();
+
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -440,7 +443,15 @@ class konto extends basis_db
 
 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				$typ->standardbetrag = $row->standardbetrag;
+				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
+				{
+					$typ->standardbetrag = $oehBeitrag;
+				}
+				else
+				{
+					$typ->standardbetrag = $row->standardbetrag;
+				}
+
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -990,6 +1001,38 @@ class konto extends basis_db
 			return false;
 		}
 	}
+
+	private function _getOEHBeitrag()
+	{
+		$variablen_obj = new variable();
+		$variablen_obj->loadVariables(get_uid());
+
+		$qry = "WITH semstart AS (
+					SELECT start FROM public.tbl_studiensemester
+					WHERE studiensemester_kurzbz = '". $this->db_escape($variablen_obj->variable->semester_aktuell) . "'
+				)
+				SELECT * FROM bis.tbl_oehbeitrag oehb
+				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
+				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
+				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
+				ORDER BY semvon.start
+				LIMIT 1";
+
+		if ($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$summe = ($row->studierendenbeitrag + $row->versicherung) * -1;
+				return number_format((float)$summe, 2, '.', '');
+			}
+			return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 }
 
 ?>
diff --git a/public/js/api/factory/stv/konto.js b/public/js/api/factory/stv/konto.js
index 6c17d460d..adfc0c44e 100644
--- a/public/js/api/factory/stv/konto.js
+++ b/public/js/api/factory/stv/konto.js
@@ -65,10 +65,14 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen() {
+	getBuchungstypen(studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
+		if (!!studiensemester_kurzbz)
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
+			url: url
 		};
-	}
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index cdb32de99..4060b5961 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -83,6 +83,8 @@ export default {
 				});
 		},
 		open() {
+
+			this.getBuchungstypen(this.currentSemester);
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
@@ -105,7 +107,7 @@ export default {
 			const text = typ.standardtext || '';
 			const creditpoints = typ.credit_points || '';
 
-			if (!this.data.betrag || this.data.betrag == '-0.00')
+			if (!this.data.betrag || this.data.betrag == '-0.00' || this.data.betrag !== amount)
 				this.data.betrag = amount;
 
 			if (!this.data.buchungstext)
@@ -113,7 +115,18 @@ export default {
 
 			if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null))
 				this.data.credit_points = creditpoints;
-		}
+		},
+		getBuchungstypen(studiensemester_kurzbz)
+		{
+			this.$api
+				.call(ApiKonto.getBuchungstypen(studiensemester_kurzbz))
+				.then(result => {
+					this.lists.buchungstypen = result.data;
+					if (this.data.buchungstyp_kurzbz)
+						this.checkDefaultBetrag(this.data.buchungstyp_kurzbz);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 	},
 	template: `
 	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
@@ -166,6 +179,7 @@ export default {
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
+					@change="getBuchungstypen(data.studiensemester_kurzbz)"
 					name="studiensemester_kurzbz"
 					:label="$p.t('lehre/studiensemester')"
 					>

From 374c1b66b5997a37b924f6931189c19409f1565d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Sep 2025 12:56:45 +0200
Subject: [PATCH 0708/1357] alle fehlenden lvs markieren alle abwaehlen id im
 title beim delete autocomplete beruecksichtigen

---
 ...hrveranstaltung_kompatibel_vergleichen.php | 59 ++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
index 822de1057..42604fdf6 100644
--- a/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
+++ b/vilesci/lehre/lehrveranstaltung_kompatibel_vergleichen.php
@@ -165,7 +165,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 						if (done === checkboxenUebernahmeCount)
 						{
 							let drodpwonval = $('#lvDropdownTo').val();
-							const autocompleteval  = $('#autocompleteTo').data('lv-id');
+							let autocompleteval  = $('#autocompleteTo').data('lv-id');
 
 							if (drodpwonval)
 							{
@@ -179,6 +179,18 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 						}
 					});
 				});
+			}),
+
+			$('#alleLVsMarkieren').on("click", function()
+			{
+				let checkboxen = $("#kompatibleLVsFrom tbody tr.missing-in-to").find("input[name='lvUebernehmenCheckbox']");
+				checkboxen.prop("checked", true);
+			}),
+
+			$('#alleLVsAbwaehlen').on("click", function()
+			{
+				let checkboxen = $("#kompatibleLVsFrom tbody").find("input[name='lvUebernehmenCheckbox']");
+				checkboxen.prop("checked", false);
 			})
 		});
 
@@ -245,7 +257,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 				select: function(event, ui) {
 					callLoadKompatibleLvs(ui.item.lehrveranstaltung_id, side)
 					$(this).data("lv-id", ui.item.lehrveranstaltung_id);
-					$("#lvBezeichnung" + side).html(ui.item.bezeichnung);
+					$("#lvBezeichnung" + side).html(ui.item.bezeichnung +  " (ID: " + ui.item.lehrveranstaltung_id + ")");
 				}
 			});
 
@@ -301,7 +313,7 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 		{
 			let lv_id = $("#lvDropdown" + side).val();
 
-			if (lv_id == "null")
+			if (lv_id === null)
 				$("#lvBezeichnung" + side).html("")
 			else
 			{
@@ -543,13 +555,42 @@ if (isset($_REQUEST['autocomplete']) && ($_REQUEST['autocomplete'] === 'From' ||
 					alert(data.errormsg);
 				}
 
-				if ($('#lvDropdownFrom').val() === $('#lvDropdownTo').val())
+				let fromValDropdown = $("#lvDropdownFrom").val();
+				let toValDropdwon   = $("#lvDropdownTo").val();
+
+				let lvidautoFrom = $('#autocompleteFrom').data("lv-id");
+				let lvidautoTo = $('#autocompleteTo').data("lv-id");
+
+				let fromVal = fromValDropdown || lvidautoFrom;
+				let toVal = toValDropdwon || lvidautoTo;
+
+
+				if (fromVal === toVal)
 				{
-					$('#lvDropdownFrom').trigger('change');
-					$('#lvDropdownTo').trigger('change');
+					if (fromValDropdown)
+						$('#lvDropdownFrom').trigger('change');
+					else if (lvidautoFrom)
+						callLoadKompatibleLvs(fromVal, 'From');
+
+					if (toValDropdwon)
+						$('#lvDropdownTo').trigger('change');
+					else if (lvidautoFrom)
+						callLoadKompatibleLvs(toVal, 'To');
 				}
 				else
-					$('#lvDropdown' + side).trigger('change');
+				{
+					let dropdownVal = $("#lvDropdown" + side).val();
+					let autoVal = $('#autocomplete' + side).data("lv-id");
+					if (dropdownVal)
+					{
+						$('#lvDropdown' + side).trigger('change');
+					}
+					else if (autoVal)
+					{
+						callLoadKompatibleLvs(autoVal, side);
+					}
+				}
+
 			}).error(function(data)
 			{
 				alert(data.responseText);
@@ -622,6 +663,10 @@ echo "<div class='container'>
 	</div>
 	Kompatible Lehrveranstaltungen - <span id='lvBezeichnungFrom'></span>
 	
+	<br />
+	<br />
+	<input type='button' id='alleLVsMarkieren' value='Alle fehlenden auswählen'/>
+	<input type='button' id='alleLVsAbwaehlen' value='Alle abwählen'/>
 	<table style='width: auto;' class='tablesorter' id='kompatibleLVsFrom'>
 			<thead>
 				<tr>

From 396251b0613d8fea526f8382d5702fd1b1fb44a2 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Sep 2025 13:35:15 +0200
Subject: [PATCH 0709/1357] lvverwaltung einschraenkung bei den tags erledigte
 tags werden in der header suche nicht beruecksichtigt

---
 application/config/lvverwaltung.php           |  11 ++
 .../controllers/api/frontend/v1/lv/Gruppe.php |   2 +-
 .../controllers/api/frontend/v1/lv/Tags.php   |  26 +++
 application/core/Tag_Controller.php           | 150 +++++++++++++++---
 .../models/education/Lehreinheit_model.php    |  23 ++-
 public/js/components/Tag/Tag.js               |  10 +-
 .../tabulator/filters/extendedHeaderFilter.js |   3 +-
 7 files changed, 193 insertions(+), 32 deletions(-)
 create mode 100644 application/config/lvverwaltung.php

diff --git a/application/config/lvverwaltung.php b/application/config/lvverwaltung.php
new file mode 100644
index 000000000..466f5c7ab
--- /dev/null
+++ b/application/config/lvverwaltung.php
@@ -0,0 +1,11 @@
+<?php
+
+$config['lvverwaltung_tags'] = [
+	'hinweis_stg_kf' => ['readonly' => false],
+	'hinweis' => ['readonly' => false],
+	'hinweis_assistenz' => ['readonly' => false],
+	'finished_stg' => ['readonly' => false],
+
+	'finished_kf' => ['readonly' => true],
+	'inwork_kf' => ['readonly' => true],
+];
diff --git a/application/controllers/api/frontend/v1/lv/Gruppe.php b/application/controllers/api/frontend/v1/lv/Gruppe.php
index 4a1e68656..83a4fb696 100644
--- a/application/controllers/api/frontend/v1/lv/Gruppe.php
+++ b/application/controllers/api/frontend/v1/lv/Gruppe.php
@@ -116,7 +116,7 @@ class Gruppe extends FHCAPI_Controller
 											bezeichnung,
 											gid,
 											\'false\' as lehrverband');
-		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false));
+		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
 
 		$gruppen_array = array();
 
diff --git a/application/controllers/api/frontend/v1/lv/Tags.php b/application/controllers/api/frontend/v1/lv/Tags.php
index 234ab3cba..a22a4c82e 100644
--- a/application/controllers/api/frontend/v1/lv/Tags.php
+++ b/application/controllers/api/frontend/v1/lv/Tags.php
@@ -20,5 +20,31 @@ class Tags extends Tag_Controller
 			'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'));
 	}
 }
\ No newline at end of file
diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php
index 10e54780e..5b9bac6c5 100644
--- a/application/core/Tag_Controller.php
+++ b/application/core/Tag_Controller.php
@@ -29,13 +29,36 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('system/Notiztyp_model', 'NotiztypModel');
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
+
+		$this->loadPhrases([
+			'ui'
+		]);
 	}
 
-	public function getTag()
+	public function getTag($readonly_tags = null)
 	{
 		$language = $this->_getLanguageIndex();
 		$id = $this->input->get('id');
 
+		if (is_array($readonly_tags) && !isEmptyArray($readonly_tags))
+		{
+			$readonly_tags = $this->_filterTag($readonly_tags, true);
+
+			foreach ($readonly_tags as $key => $tag)
+			{
+				$readonly_tags[$key] = $this->NotizModel->db->escape($tag);
+			}
+			$tags = '(' . implode(',', $readonly_tags) . ')';
+
+			$this->NotizModel->addSelect("
+						CASE 
+							WHEN tbl_notiz_typ.typ_kurzbz IN $tags 
+							THEN TRUE 
+							ELSE FALSE 
+						END as readonly
+					");
+		}
+
 		$this->NotizModel->addSelect(
 			"tbl_notiz.titel, 
 			tbl_notiz.text, 
@@ -54,7 +77,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->NotizModel->addJoin('public.tbl_benutzer verfasserbenutzer', 'tbl_notiz.verfasser_uid = verfasserbenutzer.uid', 'LEFT');
 		$this->NotizModel->addJoin('public.tbl_person verfasserperson', 'verfasserbenutzer.person_id = verfasserperson.person_id', 'LEFT');
 
-		$this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.verfasser_uid = bearbeiterbenutzer.uid', 'LEFT');
+		$this->NotizModel->addJoin('public.tbl_benutzer bearbeiterbenutzer', 'tbl_notiz.bearbeiter_uid = bearbeiterbenutzer.uid', 'LEFT');
 		$this->NotizModel->addJoin('public.tbl_person bearbeiterperson', 'bearbeiterbenutzer.person_id = bearbeiterperson.person_id', 'LEFT');
 
 		$notiz = $this->NotizModel->loadWhere(array('notiz_id' => $id));
@@ -62,7 +85,7 @@ class Tag_Controller extends FHCAPI_Controller
 		$this->terminateWithSuccess(hasData($notiz) ? getData($notiz)[0] : array());
 	}
 
-	public function getTags()
+	public function getTags($tags = null)
 	{
 		$this->NotiztypModel->addSelect(
 			'typ_kurzbz as tag_typ_kurzbz,
@@ -73,19 +96,36 @@ class Tag_Controller extends FHCAPI_Controller
 			'
 		);
 		$this->NotiztypModel->addOrder('prioritaet');
+
+		if (is_array($tags) && !isEmptyArray($tags))
+		{
+			$tags = $this->_filterTag($tags, false);
+			$this->NotiztypModel->db->where_in('typ_kurzbz', $tags);
+		}
+
 		$notiztypen = $this->NotiztypModel->loadWhere(array('aktiv' => true));
 		$this->terminateWithSuccess(hasData($notiztypen) ? getData($notiztypen) : array());
 	}
 
-	public function addTag($withZuordnung = true)
+	public function addTag($withZuordnung = true, $updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
 
 		$checkTyp = $this->NotiztypModel->loadWhere(array('typ_kurzbz' => $postData->tag_typ_kurzbz));
 
-		if (!hasData($checkTyp))
-			$this->terminateWithError('Error occurred', self::ERROR_TYPE_GENERAL);
+		if (isError($checkTyp))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
 
+		if (!hasData($checkTyp))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (is_array($updatable_tags) && !isEmptyArray($updatable_tags))
+		{
+			$tags = $this->_filterTag($updatable_tags, false);
+
+			if (!in_array($postData->tag_typ_kurzbz, $tags))
+				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+		}
 
 		if ($withZuordnung)
 		{
@@ -125,48 +165,88 @@ class Tag_Controller extends FHCAPI_Controller
 		}
 	}
 
-	private function addNotiz($postData)
-	{
-		return $this->NotizModel->insert(array(
-			'titel' => 'TAG', //TODO klären
-			'text' => $postData->notiz,
-			'verfasser_uid' => $this->_uid,
-			'erledigt' => false,
-			'insertamum' => date('Y-m-d H:i:s'),
-			'insertvon' => $this->_uid,
-			'typ' => $postData->tag_typ_kurzbz
-		));
-
-	}
-	public function updateTag()
+	public function updateTag($updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
+		$post_tag = $this->NotizModel->loadWhere(array('notiz_id' => $postData->id));
+
+		if (isError($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (!hasData($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (is_array($updatable_tags) && !isEmptyArray($updatable_tags))
+		{
+			$tags = $this->_filterTag($updatable_tags, false);
+
+			$post_tag_typ = getData($post_tag)[0]->typ;
+
+			if (!in_array($post_tag_typ, $tags))
+				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+		}
+
 		$updateData = $this->NotizModel->update(array('notiz_id' => $postData->id),
 			array('text' => $postData->notiz,
 				'updateamum' => date('Y-m-d H:i:s'),
 				'updatevon' => $this->_uid,
 				'bearbeiter_uid' => $this->_uid,
-				)
+			)
 		);
 		$this->terminateWithSuccess($updateData);
 	}
-	public function doneTag()
+	public function doneTag($updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
+		$post_tag = $this->NotizModel->loadWhere(array('notiz_id' => $postData->id));
+
+		if (isError($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (!hasData($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (is_array($updatable_tags) && !isEmptyArray($updatable_tags))
+		{
+			$tags = $this->_filterTag($updatable_tags, false);
+
+			$post_tag_typ = getData($post_tag)[0]->typ;
+
+			if (!in_array($post_tag_typ, $tags))
+				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+		}
+
 		$updateData = $this->NotizModel->update(array('notiz_id' => $postData->id),
 			array('erledigt' => !$postData->done,
+				'text' => $postData->notiz,
 				'updateamum' => date('Y-m-d H:i:s'),
 				'updatevon' => $this->_uid,
 				'bearbeiter_uid' => $this->_uid,
 			)
 		);
-
 		$this->terminateWithSuccess($updateData);
 	}
 
-	public function deleteTag($withZuordnung = true)
+	public function deleteTag($withZuordnung = true, $updatable_tags = null)
 	{
 		$postData = $this->getPostJson();
+		$post_tag = $this->NotizModel->loadWhere(array('notiz_id' => $postData->id));
+
+		if (isError($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (!hasData($post_tag))
+			$this->terminateWithError($this->p->t('ui', 'fehlerBeimLesen'));
+
+		if (is_array($updatable_tags) && !isEmptyArray($updatable_tags))
+		{
+			$tags = $this->_filterTag($updatable_tags, false);
+
+			$post_tag_typ = getData($post_tag)[0]->typ;
+
+			if (!in_array($post_tag_typ, $tags))
+				$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+		}
 
 		$deleteNotiz = "";
 		if ($withZuordnung)
@@ -208,5 +288,27 @@ class Tag_Controller extends FHCAPI_Controller
 		return hasData($result) ? getData($result)[0]->index : 1;
 	}
 
+	private function _filterTag($tags, $readonly = true)
+	{
+		$filtered_tags = array_filter($tags, function ($tag) use ($readonly)
+		{
+			return isset($tag['readonly']) && $tag['readonly'] === $readonly;
+		});
+
+		return array_keys($filtered_tags);
+	}
+
+	private function addNotiz($postData)
+	{
+		return $this->NotizModel->insert(array(
+			'titel' => 'TAG', //TODO klären
+			'text' => $postData->notiz,
+			'verfasser_uid' => $this->_uid,
+			'erledigt' => false,
+			'insertamum' => date('Y-m-d H:i:s'),
+			'insertvon' => $this->_uid,
+			'typ' => $postData->tag_typ_kurzbz
+		));
+	}
 
 }
\ No newline at end of file
diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index c373f5449..9b850f0d0 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -689,10 +689,26 @@ EOSQL;
 
 	private function _getTagsCTE()
 	{
+		$this->load->config('lvverwaltung');
+		$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
 						lehreinheit_id,
-						COALESCE(json_agg(tag ORDER BY id), '[]'::json) AS tags
+						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,
@@ -705,8 +721,9 @@ EOSQL;
 							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 lehreinheit_id IN (SELECT lehreinheit_id FROM lehreinheiten)
-						) AS tag
+							WHERE lehreinheit_id IN (SELECT lehreinheit_id FROM lehreinheiten)"
+								. $whereTags.
+						") AS tag
 					GROUP BY lehreinheit_id
 				)";
 	}
diff --git a/public/js/components/Tag/Tag.js b/public/js/components/Tag/Tag.js
index a3243ed47..a7c7a61ab 100644
--- a/public/js/components/Tag/Tag.js
+++ b/public/js/components/Tag/Tag.js
@@ -86,6 +86,7 @@ export default {
 			this.tagData.updateamum = this.formatDateTime(item.updateamum)
 			this.tagData.bearbeiter = item.bearbeiter;
 			this.tagData.verfasser = item.verfasser;
+			this.tagData.readonly = item.readonly;
 
 			if (item && item.notiz_id)
 			{
@@ -154,7 +155,8 @@ export default {
 
 			let postData = {
 				id: this.selectedTagId,
-				done: !this.tagData.done
+				done: !this.tagData.done,
+				notiz: this.tagData.notiz,
 			}
 			this.$api.call(this.endpoint.doneTag(postData))
 			this.$emit("updated", this.tagData);
@@ -182,7 +184,8 @@ export default {
 				verfasser: "",
 				updateamum: "",
 				bearbeiter: "",
-				response: ""
+				response: "",
+				readonly: false
 			};
 			this.selectedTagId = null;
 			this.mode = "create";
@@ -230,6 +233,7 @@ export default {
 						v-model="tagData.notiz"
 						type="textarea"
 						field="notiz"
+						:readonly="tagData.readonly"
 						placeholder="Notiz..."
 					></form-input>
 					<div class="modificationdate">
@@ -243,7 +247,7 @@ export default {
 					</div>
 				</div>
 			</template>
-			<template #footer>
+			<template #footer v-if="!tagData.readonly">
 				<div class="d-flex justify-content-between w-100">
 					<div>
 						<button 
diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 1112d36f3..6a995343f 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -146,12 +146,13 @@ export function tagHeaderFilter(headerValue, rowValue, rowData, filterParams)
 	if (Array.isArray(data))
 	{
 		combinedText = data
+			.filter(item => item?.done === false)
 			.map(item => `${item?.beschreibung} ${item?.notiz}`)
 			.join(' ');
 	}
 	else if (typeof data === 'object' && data !== null)
 	{
-		combinedText = `${data?.beschreibung} ${data?.notiz}`;
+		combinedText = data?.erledigt === false ? `${data?.beschreibung} ${data?.notiz}` : '';
 	}
 	else
 	{

From a560c335b8003e7bab771a74bc853c94a4029cce Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 2 Sep 2025 13:35:42 +0200
Subject: [PATCH 0710/1357] WIP responsive tabulator collapse abgabetool;
 paabgabe notiz column;

---
 .../views/CisRouterView/CisRouterView.php     |   3 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  41 +++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 147 +++++++++++++-----
 .../61164_abgabetool_quality_gates.php        |  14 ++
 4 files changed, 149 insertions(+), 56 deletions(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index ab22fbb81..b56ed482e 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -33,7 +33,8 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Dashboard/Fhc.js'
+		'public/js/apps/Dashboard/Fhc.js',
+		'vendor/olifolkerd/tabulator5/src/js/modules/ResponsiveLayout/ResponsiveLayout.js'
 	),
 
 );
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 1e9d61056..313029852 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -236,8 +236,8 @@ export const AbgabetoolMitarbeiter = {
 				
 				this.selectedProjektarbeit = pa
 				
-				
-				this.$refs.verticalsplit.showBoth()
+				this.$refs.modalContainerAbgabeDetail.show()
+				// this.$refs.verticalsplitthis.$refs.verticalsplit.showBoth()
 				
 			
 			})
@@ -345,7 +345,7 @@ export const AbgabetoolMitarbeiter = {
 
 			this.loadProjektarbeiten()
 
-			this.$refs.verticalsplit.collapseBottom()
+			// this.$refs.verticalsplit.collapseBottom()
 			this.calcMaxTableHeight()
 			
 		}
@@ -441,12 +441,27 @@ export const AbgabetoolMitarbeiter = {
 				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/speichern') }}</button>
 			</template>
 		</bs-modal>	
+		
+		
+		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
+			dialogClass="modal-fullscreen">
+			<template v-slot:title>
+				<div>
+					abgabe detail wtb phrasen
+				</div>
+			</template>
+			<template v-slot:default>
+				<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+				
+			</template>
+		</bs-modal>	
+		
 		<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
 		<div style="max-height:40vw;"> 
 		
-			<vertical-split ref="verticalsplit">		
-				
-				<template #top>
+<!--			<vertical-split ref="verticalsplit">		-->
+<!--				-->
+<!--				<template #top>-->
 					<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 					<hr>
 					<core-filter-cmpt
@@ -485,13 +500,13 @@ export const AbgabetoolMitarbeiter = {
 						</template>
 					</core-filter-cmpt>
 	
-				</template>
-				<template #bottom>
-					<div v-show="selectedProjektarbeit" ref="selProj"> 
-						<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-					</div>
-				</template>
-			</vertical-split>
+<!--				</template>-->
+<!--				<template #bottom>-->
+<!--					<div v-show="selectedProjektarbeit" ref="selProj"> -->
+<!--						<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>-->
+<!--					</div>-->
+<!--				</template>-->
+<!--			</vertical-split>-->
 		
 		</div>
     `,
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 2a1827b4e..a63f781e9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -2,10 +2,12 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeStudentDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import BsModal from "../../Bootstrap/Modal.js";
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
+		BsModal,
 		CoreFilterCmpt,
 		AbgabeDetail,
 		VerticalSplit
@@ -43,16 +45,61 @@ export const AbgabetoolStudent = {
 				minHeight: 250,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
+				responsiveLayout: "collapse",
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung', formatter: this.beurteilungFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer', formatter: this.centeredTextFormatter,widthGrow: 2},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, widthGrow: 8}
+					{
+						formatter:"responsiveCollapse",
+						width:30, minWidth:30, hozAlign:"center", resizable:false, headerSort:false
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details',
+						formatter: this.detailFormatter,
+						widthGrow: 1, tooltip: false
+						, responsive: 0, minWidth: 80
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung',
+						formatter: this.beurteilungFormatter,
+						widthGrow: 1, tooltip: false
+						, responsive: 0, minWidth: 80
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem',
+						formatter: this.centeredTextFormatter,
+						widthGrow: 1
+						, responsive: 5, minWidth: 120
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg',
+						formatter: this.centeredTextFormatter,
+						widthGrow: 1
+						, responsive: 6, minWidth: 120
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail',
+						formatter: this.mailFormatter,
+						widthGrow: 1
+						, responsive: 0, minWidth: 80
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer',
+						formatter: this.centeredTextFormatter,
+						widthGrow: 2
+						, responsive: 7, minWidth: 300
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ',
+						formatter: this.centeredTextFormatter,
+						widthGrow: 1
+						, responsive: 8, minWidth: 200
+					},
+					{
+						title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', 
+						formatter: this.centeredTextFormatter,
+						widthGrow: 8
+						, responsive: 1, minWidth: 420
+					}
 				],
 				persistence: false,
 			},
@@ -132,8 +179,9 @@ export const AbgabetoolStudent = {
 				pa.student_uid = this.student_uid
 
 				this.selectedProjektarbeit = pa
-				
-				this.$refs.verticalsplit.showBoth()
+
+				this.$refs.modalContainerAbgabeDetail.show()
+				// this.$refs.verticalsplit.showBoth()
 				
 			})
 			
@@ -141,29 +189,29 @@ export const AbgabetoolStudent = {
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
 
-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
 				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
 		},
 		detailFormatter(cell) {
 			const val = cell.getValue()
 
 			if(val.mode === 'detailTermine') {
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
 					'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
 			} else if (val.mode === 'beurteilungDownload') {
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
 					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
 			}
 		},
 		mailFormatter(cell) {
 			const val = cell.getValue()
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
 					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
 		},
 		beurteilungFormatter(cell) {
 			const val = cell.getValue()
 			if(val) {
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
 					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
 			} else return '-'
 		},
@@ -213,6 +261,11 @@ export const AbgabetoolStudent = {
 
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(d);
+
+			Vue.nextTick(()=>{
+				this.$refs.abgabeTable?.tabulator.setColumns(this.$refs.abgabeTable?.tabulator.getColumnDefinitions())
+
+			})
 		},
 		loadProjektarbeiten() {
 			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null))
@@ -245,9 +298,15 @@ export const AbgabetoolStudent = {
 			await this.tableBuiltPromise
 			
 			this.loadProjektarbeiten()
+			
 
-			this.$refs.verticalsplit.collapseBottom()
-			this.calcMaxTableHeight()
+			// window.addEventListener("resize", this.redrawHandler);
+			// this.$refs.verticalsplit.collapseBottom()
+		},
+		redrawHandler() {
+			console.log('redrawHandler')
+			this.$refs.abgabeTable?.tabulator.setColumns(this.$refs.abgabeTable?.tabulator.getColumnDefinitions())
+			this.$refs.abgabeTable?.tabulator.redraw(true)
 		}
 	},
 	watch: {
@@ -270,32 +329,36 @@ export const AbgabetoolStudent = {
 	mounted() {
 		this.setupMounted()
 	},
+	unmounted() {
+		// window.removeEventListener("resize", this.redrawHandler);
+	},
 	template: `
-<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
-	<div style="max-height:40vw;"> 
-		<vertical-split ref="verticalsplit">				
-			<template #top>
-				<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-				<hr>
-					
-				 <core-filter-cmpt
-					@uuidDefined="handleUuidDefined"
-					:title="''"  
-					ref="abgabeTable" 
-					:tabulator-options="abgabeTableOptions"  
-					:tabulator-events="abgabeTableEventHandlers"
-					tableOnly
-					:sideMenu="false"
-				 />
-				 
-			 </template>
-			<template #bottom>
-				<div v-show="selectedProjektarbeit" style="max-width: 95%"> 
-					<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-				 </div>
-			</template>
-		</vertical-split>
-	</div>
+	
+	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
+		dialogClass="modal-fullscreen">
+		<template v-slot:title>
+			<div>
+				abgabe detail wtb phrasen
+			</div>
+		</template>
+		<template v-slot:default>
+			<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+			
+		</template>
+	</bs-modal>
+	
+	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+	<hr>
+		
+	 <core-filter-cmpt
+		@uuidDefined="handleUuidDefined"
+		:title="''"  
+		ref="abgabeTable" 
+		:tabulator-options="abgabeTableOptions"  
+		:tabulator-events="abgabeTableEventHandlers"
+		tableOnly
+		:sideMenu="false"
+	 />
     `,
 };
 
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 1ec257bb1..1584aae01 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -59,4 +59,18 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 		else
 			echo '<br>paabgabe column upload_allowed default false hinzugefuegt';
 	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'notiz'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "ALTER TABLE campus.tbl_paabgabe
+				ADD COLUMN IF NOT EXISTS notiz text DEFAULT NULL;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>paabgabe column notiz default '' hinzugefuegt";
+	}
 }
\ No newline at end of file

From 0095595dd28ad985c6989d877bf5390bebe27cdb Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Sep 2025 14:11:48 +0200
Subject: [PATCH 0711/1357] falsche kompatible lvs ueberpruefung rausgenommen

---
 cis/private/profile/studienplan.php | 60 ++++-------------------------
 include/lehrveranstaltung.class.php | 30 ---------------
 2 files changed, 8 insertions(+), 82 deletions(-)

diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
index 1bc8f3184..92728df42 100644
--- a/cis/private/profile/studienplan.php
+++ b/cis/private/profile/studienplan.php
@@ -359,7 +359,7 @@ drawTree($tree,0);
 
 function drawTree($tree, $depth)
 {
-	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext, $studienplan_id;
+	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext;
 	global $datum_obj, $db, $lv_arr, $p, $note_pruef_arr, $student;
 	global $anrechnung;
 
@@ -401,10 +401,7 @@ function drawTree($tree, $depth)
 			echo '&nbsp;&nbsp;&nbsp;&nbsp;';
 
 		$lvkompatibel = new lehrveranstaltung();
-
-		$studienplaene_kompatibel = $lvkompatibel->loadLVkompatibelWithStudienplan($row_tree->lehrveranstaltung_id, $studienplan_id);
-
-		$lvkompatibel_arr = array_unique(array_column($studienplaene_kompatibel, 'lehrveranstaltung_id_kompatibel'));
+		$lvkompatibel_arr = $lvkompatibel->loadLVkompatibel($row_tree->lehrveranstaltung_id);
 		$lvkompatibel_arr[]=$row_tree->lehrveranstaltung_id;
 
 		$abgeschlossen=false;
@@ -417,24 +414,6 @@ function drawTree($tree, $depth)
 			else
 				$abgeschlossen=false;
 		}
-		else if (!empty($studienplaene_kompatibel))
-		{
-			foreach ($studienplaene_kompatibel as $kompatibel)
-			{
-				$lvregelExists = $lvregel->exists($kompatibel['studienplan_lehrveranstaltung_id']);
-
-				if ($lvregelExists)
-				{
-					if ($lvregel->isAbgeschlossen($uid, $kompatibel['studienplan_lehrveranstaltung_id']))
-						$abgeschlossen=true;
-					else
-						$abgeschlossen=false;
-
-					break;
-				}
-			}
-		}
-
 		$lvinfo = new lvinfo();
 		switch(getSprache())
 		{
@@ -604,38 +583,15 @@ function drawTree($tree, $depth)
 				{
 					$semesterlock=true;
 				}
-
-				if (!$semesterlock && !empty($studienplaene_kompatibel))
+				else
 				{
-					foreach ($studienplaene_kompatibel as $kompatibel)
+					//check if rules are fulfilled just for actual or next studiensemester
+					if($stsem === $aktornext)
 					{
-						if (!$lvregel->checkSemester($kompatibel['studienplan_lehrveranstaltung_id'], $semester))
+						$result = $lvregel->isZugangsberechtigt($uid, $row_tree->studienplan_lehrveranstaltung_id, $stsem);
+						if((is_array($result)) && ($result[0] !== true))
 						{
-							$semesterlock = true;
-							break;
-						}
-					}
-				}
-
-				//check if rules are fulfilled just for actual or next studiensemester
-				if($stsem === $aktornext && !$semesterlock)
-				{
-					$result = $lvregel->isZugangsberechtigt($uid, $row_tree->studienplan_lehrveranstaltung_id, $stsem);
-					if((is_array($result)) && ($result[0] !== true))
-					{
-						$regelerfuellt = false;
-					}
-
-					if ($regelerfuellt && !empty($studienplaene_kompatibel))
-					{
-						foreach ($studienplaene_kompatibel as $kompatibel)
-						{
-							$result = $lvregel->isZugangsberechtigt($uid, $kompatibel['studienplan_lehrveranstaltung_id'], $stsem);
-							if (is_array($result) && $result[0] !== true)
-							{
-								$regelerfuellt = false;
-								break;
-							}
+							$regelerfuellt=false;
 						}
 					}
 				}
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index e288f88e6..48edd9d0a 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -1554,36 +1554,6 @@ class lehrveranstaltung extends basis_db
 		}
 	}
 
-	public function loadLVkompatibelWithStudienplan($lehrveranstaltung_id, $studienplan_id)
-	{
-		if (!is_numeric($lehrveranstaltung_id))
-		{
-			$this->errormsg = 'Lehrveranstaltung_id muss eine gueltige Zahl sein';
-			return false;
-		}
-		if (!is_numeric($studienplan_id))
-		{
-			$this->errormsg = 'Studienplan_id muss eine gueltige Zahl sein';
-			return false;
-		}
-
-		$qry = "SELECT studienplan_lehrveranstaltung_id, lehrveranstaltung_id_kompatibel
-				FROM lehre.tbl_lehrveranstaltung_kompatibel
-					JOIN lehre.tbl_studienplan_lehrveranstaltung ON lehrveranstaltung_id_kompatibel = tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id
-				WHERE tbl_lehrveranstaltung_kompatibel.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)."
-				;";
-
-		if($this->db_query($qry))
-		{
-			$data = array();
-			while($row = $this->db_fetch_object())
-			{
-				$data[] = ['lehrveranstaltung_id_kompatibel' => $row->lehrveranstaltung_id_kompatibel, 'studienplan_lehrveranstaltung_id' => $row->studienplan_lehrveranstaltung_id];
-			}
-			return $data;
-		}
-	}
-	
 	/**
 	 * Lädt alle kompatiblen LVs zu einer Lehrveranstaltung
 	 * @param $lehrveranstaltung_id ID der Lehrveranstaltung

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

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

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

From 988ce115280eb301e18635ca4a553b22ad3d83f1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Sep 2025 15:05:42 +0200
Subject: [PATCH 0713/1357] ueberpruefung der kompatiblen lvs regeln

---
 cis/private/profile/studienplan.php | 72 +++++++++++++++++++++++------
 include/lehrveranstaltung.class.php | 28 +++++++++++
 2 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
index 92728df42..8545b2e34 100644
--- a/cis/private/profile/studienplan.php
+++ b/cis/private/profile/studienplan.php
@@ -69,6 +69,8 @@ if(isset($_GET['getAnmeldung']))
 
 	$lehrveranstaltung_id=$_GET['lehrveranstaltung_id'];
 	$stsem = $_GET['stsem'];
+	$semester = $_GET['semester'];
+	$studienplan_id = $_GET['studienplan_id'];
 
 	echo $p->t('studienplan/LehrveranstalungWaehlen').'
 		<form action="'.$_SERVER['PHP_SELF'].'?uid='.$db->convert_html_chars($uid).'" method="POST">
@@ -83,6 +85,10 @@ if(isset($_GET['getAnmeldung']))
 	$datum = new datum();
 	$kompatibel[]=$lehrveranstaltung_id;
 	$kompatibel = array_unique($kompatibel);
+	$stsem_obj = new studiensemester();
+	$aktornext = $stsem_obj->getaktorNext();
+
+	$lvregel = new lvregel();
 	foreach($kompatibel as $lvid)
 	{
 		$lvangebot = new  lvangebot();
@@ -95,20 +101,58 @@ if(isset($_GET['getAnmeldung']))
 			$angebot = $lvangebot->result[0];
 			if($angebot->AnmeldungMoeglich())
 			{
-				$anzahl++;
-				// LV wird angeboten und Anmeldefenster ist offen
+				$kompatible_lv = $lehrveranstaltung->getStudienplanLehrveranstaltung($lvid, $studienplan_id);
 
-				$bngruppe = new benutzergruppe();
-				if(!$bngruppe->load($uid, $lvangebot->result[0]->gruppe_kurzbz, $stsem))
+				$lvregelExists = false;
+				$abgeschlossen = false;
+				$semesterlock = false;
+				$regelerfuellt = true;
+				if ($kompatible_lv)
 				{
-					// User ist noch nicht angemeldet
-					echo '<br><input type="radio" value="'.$lvid.'" name="lv"/>'.$lv->bezeichnung.' (Anmeldung bis '.$datum->formatDatum($angebot->anmeldefenster_ende,"d.m.Y").')';
+					$lvregelExists = $lvregel->exists($kompatible_lv);
+					if($lvregelExists)
+					{
+						if($lvregel->isAbgeschlossen($uid, $kompatible_lv))
+							$abgeschlossen=true;
+						else
+							$abgeschlossen=false;
+					}
+
+					if(!$lvregel->checkSemester($kompatible_lv, $semester))
+					{
+						$semesterlock=true;
+					}
+					else
+					{
+						if($stsem === $aktornext)
+						{
+							$result = $lvregel->isZugangsberechtigt($uid, $kompatible_lv, $stsem);
+							if((is_array($result)) && ($result[0] !== true))
+							{
+								$regelerfuellt=false;
+							}
+						}
+					}
 				}
-				else
+
+				if (!(($lvregelExists && !$abgeschlossen) || $semesterlock || !$regelerfuellt))
 				{
-					// Bereits angemeldet
-					echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
+					$anzahl++;
+					// LV wird angeboten und Anmeldefenster ist offen
+
+					$bngruppe = new benutzergruppe();
+					if(!$bngruppe->load($uid, $lvangebot->result[0]->gruppe_kurzbz, $stsem))
+					{
+						// User ist noch nicht angemeldet
+						echo '<br><input type="radio" value="'.$lvid.'" name="lv"/>'.$lv->bezeichnung.' (Anmeldung bis '.$datum->formatDatum($angebot->anmeldefenster_ende,"d.m.Y").')';
+					}
+					else
+					{
+						// Bereits angemeldet
+						echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
+					}
 				}
+
 			}
 /*			else
 			{
@@ -170,9 +214,9 @@ echo '
 		$("#dialog").dialog({ autoOpen: false, width: "auto" });
 	});
 
-	function OpenAnmeldung(lehrveranstaltung_id, stsem)
+	function OpenAnmeldung(lehrveranstaltung_id, stsem, semester, studienplan_id)
 	{
-		$("#dialog").load("studienplan.php?getAnmeldung=true&lehrveranstaltung_id="+lehrveranstaltung_id+"&stsem="+stsem+"&uid='.$db->convert_html_chars($uid).'");
+		$("#dialog").load("studienplan.php?getAnmeldung=true&lehrveranstaltung_id="+lehrveranstaltung_id+"&stsem="+stsem+"&semester="+semester+"&studienplan_id="+studienplan_id+"&uid='.$db->convert_html_chars($uid).'");
 		$("#dialog").dialog("open");
 	}
 	</script>
@@ -359,7 +403,7 @@ drawTree($tree,0);
 
 function drawTree($tree, $depth)
 {
-	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext;
+	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext, $studienplan_id;
 	global $datum_obj, $db, $lv_arr, $p, $note_pruef_arr, $student;
 	global $anrechnung;
 
@@ -639,12 +683,12 @@ function drawTree($tree, $depth)
 						$tdclass[]='angebot';
 						if($angemeldet)
 						{
-							$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/ja.png" title="'.$p->t('studienplan/legendeAngemeldet').'" /></a>';
+							$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\',\''.$semester.'\',\''.$studienplan_id.'\'); return false;"><img src="../../../skin/images/ja.png" title="'.$p->t('studienplan/legendeAngemeldet').'" /></a>';
 						}
 						else
 						{
 							if($anmeldungmoeglich)
-								$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
+								$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\', \''.$semester.'\', \''.$studienplan_id.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
 							else
 								$tdinhalt.= '<span title="'.$anmeldeinformation.'">-</a>';
 
diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php
index 48edd9d0a..26f846f8e 100644
--- a/include/lehrveranstaltung.class.php
+++ b/include/lehrveranstaltung.class.php
@@ -2861,5 +2861,33 @@ class lehrveranstaltung extends basis_db
 			return false;
 		}
 	}
+
+	public function getStudienplanLehrveranstaltung($lehrveranstaltung_id, $studienplan_id)
+	{
+		$qry = "SELECT studienplan_lehrveranstaltung_id
+				FROM lehre.tbl_lehrveranstaltung
+				JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id)
+				WHERE lehrveranstaltung_id = ".$this->db_add_param($lehrveranstaltung_id)."
+					AND tbl_studienplan_lehrveranstaltung.studienplan_id = ".$this->db_add_param($studienplan_id);"";
+
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+			{
+				return $row->studienplan_lehrveranstaltung_id;
+			}
+			else
+			{
+				$this->errormsg = 'Fehler beim Ermitteln der studienplan_lehrveranstaltung_id';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
+		}
+		return null;
+
+	}
 }
 ?>

From 022fb26e9267d0a12aaa0d74076e8c62378f0b0c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 1 Jul 2025 17:37:32 +0200
Subject: [PATCH 0714/1357] uhstat1 form: removed staatenlos code from
 dropdowns

---
 application/controllers/codex/UHSTAT1.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 60eb6695e..d65752b4f 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -10,6 +10,7 @@ class UHSTAT1 extends FHC_Controller
 	const CODEX_OESTERREICH = 'A';
 	const CODEX_UNKNOWN_YEAR = 9999;
 	const CODEX_UNKNOWN_NATION = 'XXX';
+	const CODEX_EXCLUDED_NATIONS = ['ZZZ'];
 	const CODEX_UNKNOWN_BILDUNGMAX = 999;
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
@@ -339,15 +340,19 @@ class UHSTAT1 extends FHC_Controller
 
 		if (hasData($nationRes))
 		{
+			$dropdownNations = [];
 			$nations = getData($nationRes);
 
-			// put austria in beginning of selection
 			foreach ($nations as $nation)
 			{
-				if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation);
+				// put austria in beginning of selection
+				if ($nation->nation_code == self::CODEX_OESTERREICH)
+					array_unshift($dropdownNations, $nation);
+				elseif (!in_array($nation->nation_code, self::CODEX_EXCLUDED_NATIONS)) // add nation if not excluded
+					$dropdownNations[] = $nation;
 			}
 
-			$formMetaData['nation'] = $nations;
+			$formMetaData['nation'] = $dropdownNations;
 		}
 
 		// get abschluss list

From 0782de055084a22239fa90fd4432744cfef9ced0 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 2 Jul 2025 10:46:34 +0200
Subject: [PATCH 0715/1357] uhstat form: moved constant down for better
 readability

---
 application/controllers/codex/UHSTAT1.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index d65752b4f..c1d4d0abf 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -10,8 +10,8 @@ class UHSTAT1 extends FHC_Controller
 	const CODEX_OESTERREICH = 'A';
 	const CODEX_UNKNOWN_YEAR = 9999;
 	const CODEX_UNKNOWN_NATION = 'XXX';
-	const CODEX_EXCLUDED_NATIONS = ['ZZZ'];
 	const CODEX_UNKNOWN_BILDUNGMAX = 999;
+	const CODEX_EXCLUDED_NATIONS = ['ZZZ'];
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 

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

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

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

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

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

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

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

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

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

From e5cf417ac0ebcf6f9c8d3df98a3c24df3d1fd3c7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Sep 2025 20:29:23 +0200
Subject: [PATCH 0719/1357] adapt headerFilter, remove frontend filter, add
 backend filter aktiv mitarbeiter

---
 .../components/filters/Vertragsverwaltung.php |  29 ++++
 application/config/navigation.php             |   1 +
 .../controllers/Vertragsverwaltung.php        |   1 +
 public/js/api/factory/vertraege/vertraege.js  |   1 +
 .../components/DetailHeader/DetailHeader.js   |  38 +++--
 .../components/Vertraege/MitarbeiterHeader.js | 135 +++++++++++-------
 .../Vertraege/Vertragsverwaltung.js           |   3 +-
 system/filtersupdate.php                      |  10 +-
 8 files changed, 147 insertions(+), 71 deletions(-)
 create mode 100644 application/components/filters/Vertragsverwaltung.php

diff --git a/application/components/filters/Vertragsverwaltung.php b/application/components/filters/Vertragsverwaltung.php
new file mode 100644
index 000000000..81e6775b3
--- /dev/null
+++ b/application/components/filters/Vertragsverwaltung.php
@@ -0,0 +1,29 @@
+<?php
+$filterCmptArray = array(
+	"app" => 'core',
+	'datasetName' => 'vertragsverwaltung',
+	'query' =>  '
+		SELECT
+			b.uid , p.person_id,
+			p.vorname, p.nachname,
+			gebdatum,
+			COALESCE(b.alias, b.uid) AS email,
+			STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
+			STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
+			STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
+				CASE
+				WHEN b.aktiv = true THEN \'aktiv\'
+				ELSE \'naktiv\'
+				END AS "aktiv"
+			FROM
+				hr.tbl_dienstverhaeltnis d
+			JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+			JOIN public.tbl_person p ON p.person_id = b.person_id
+			JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+			JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			WHERE b.aktiv = true
+			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias, b.aktiv
+			ORDER BY nachname, vorname
+		',
+	'requiredPermissions' => 'vertrag/mitarbeiter'
+	);
\ No newline at end of file
diff --git a/application/config/navigation.php b/application/config/navigation.php
index 8f327fde8..752a70464 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -332,4 +332,5 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
+
 );
diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php
index bcd00abb1..f68ed1737 100644
--- a/application/controllers/Vertragsverwaltung.php
+++ b/application/controllers/Vertragsverwaltung.php
@@ -9,6 +9,7 @@ class Vertragsverwaltung extends Auth_Controller
 		$permissions = [];
 		$router = load_class('Router');
 		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
+		#$permissions[$router->method] = ['admin:rw'];
 		parent::__construct($permissions);
 
 		// Load Libraries
diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js
index a925f71e9..afd5cb166 100644
--- a/public/js/api/factory/vertraege/vertraege.js
+++ b/public/js/api/factory/vertraege/vertraege.js
@@ -126,6 +126,7 @@ export default {
 			params
 		};
 	},
+	//loaded by mitarbeiter_header_js
 	getMitarbeiter(){
 		return {
 			method: 'get',
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0e035b8a3..f86be4ae7 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -181,13 +181,13 @@ export default {
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">
-			<div class="row">
-				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
-						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
-					  class="d-block h-100 rounded"
+					  class="d-block w-100 h-100 rounded"
 					  alt="Profilbild"
 					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
+					  style="object-fit: contain;"
 					/>
 					<template v-if="headerDataMa.foto_sperre">
 						<i
@@ -198,28 +198,42 @@ export default {
 				</div>
 
 				<!--show Ma-Details-->
-				<div class="col-md-10">
-					<h5>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}
-					</h5>
+				<div class="col-md-9 text-nowrap mt-2">
+					<h4>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}</h4>
 					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
 						{{departmentData.bezeichnung}}
 					<span v-if="leitungData.uid"> | </span>
 					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
-					<a href="#" @click.prevent="redirectToLeitung">
+					<a href="#" @click.prevent="redirectToLeitung" >
 						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
 					</a>
 					<p>
 						<strong class="text-muted">Email </strong>
-						 <span v-if="!headerDataMa?.alias">
-							<a :href="'mailto:'+headerDataMa?.uid+'@'+domain">{{headerDataMa.uid}}@{{domain}}</a>
+						 <span v-if="headerDataMa && (headerDataMa.alias === undefined || headerDataMa.alias === null || headerDataMa.alias === '')">
+							<a :href="'mailto:' + mitarbeiter_uid + '@' + domain">
+							  {{ mitarbeiter_uid }}@{{ domain }}
+							</a>
 						</span>
-						<span v-if="headerDataMa?.alias">
+						<span v-else>
 							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
 						</span>
 						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
 					</p>
 				</div>
-			</div>
+
+				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
+					<div class="d-flex py-1">
+						<div class="px-2">
+							<h4 class="mb-1">PNr</h4>
+							<h6 class="text-muted">{{ headerDataMa?.person_id }}</h6>
+						</div>
+						<div class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1">UID</h4>
+							<h6 class="text-muted">{{ mitarbeiter_uid }}</h6>
+						</div>
+					</div>
+				</div>
+
 		</template>
 	</div>
 	`
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 200687632..fa8162141 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -15,9 +15,14 @@ export default {
 			type: Object,
 			required: true
 		},
+		domain: {
+			type: String,
+			required: true
+		}
 	},
 	data() {
 		return {
+			tabulatorData: [],
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
@@ -25,23 +30,15 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "UID", field: "uid", headerFilter:"input"},
-					{title: "personID", field: "person_id", visible: false, headerFilter:"input"},
-					{title: "Nachname", field: "nachname", headerFilter:"input"},
-					{title: "Vorname", field: "vorname", headerFilter:"input"},
-					{
-						title: "Aktiv", field: "aktiv", headerFilter: "input",
-						formatter:"tickCross",
-						hozAlign:"center",
-						formatterParams: {
-							tickElement: '<i class="fa fa-check text-success"></i>',
-							crossElement: '<i class="fa fa-xmark text-danger"></i>'
-						}
-					},
+					{title: "UID", field: "uid", headerFilter: "input"},
+					{title: "personID", field: "person_id", visible: false, headerFilter: "input"},
+					{title: "Nachname", field: "nachname", visible: true, headerFilter: "input"},
+					{title: "Vorname", field: "vorname", visible: true, headerFilter: "input"},
 					{
 						title: "Geburtsdatum",
 						field: "gebdatum",
-						headerFilter:"input",
+						headerFilter: "input",
+						visible: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -52,12 +49,38 @@ export default {
 							});
 						}
 					},
-					{title: "Unternehmen", field: "unternehmen", headerFilter:"input"},
-					{title: "Vertragsarten", field: "vertragsarten", headerFilter:"input"},
-					{title: "Ids Dienstverträge", field: "ids", headerFilter:"input"},
+					{
+						title: "Aktiv", field: "aktiv", visible: false, headerFilter: true, width: 85,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatter: function(cell) {
+							return cell.getValue() === "aktiv"
+								? '<i class="fa fa-check text-success"></i>'
+								: '<i class="fa fa-xmark text-danger"></i>';
+						}
+					},
+					{title: "Unternehmen", field: "unternehmen", visible: false, headerFilter: "input"},
+					{title: "Vertragsarten", field: "vertragsarten", visible: true, headerFilter: "input"},
+					{title: "Ids Dienstverträge", field: "ids", visible: true, headerFilter: "input"},
+
+					{
+						title: "email", field: "email", headerFilter: "input",
+						visible: false,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							let email = cell.getValue() + '@';
+
+							let container = document.createElement('div');
+							container.className = "d-flex";
+							container.append(email);
+							container.append(cell.getData().emailDomain);
+							return container;
+						},
+					},
 				],
 				layout: 'fitColumns',
-				persistenceID: 'core-mitarbeiter',
+				persistenceID: 'core-mitarbeiter_20250901',
+				footerElement: '<div>&sum; <span id="search_count"></span> / <span id="total_count"></span></div>',
 				selectableRangeMode: 'click',
 				selectable: true,
 			},
@@ -74,18 +97,21 @@ export default {
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
+						cm.getColumnByField('uid').component.updateDefinition({
+							visible: true
+						});
+
 						cm.getColumnByField('person_id').component.updateDefinition({
 							title: this.$p.t('person', 'person_id')
 						});
 
 						cm.getColumnByField('nachname').component.updateDefinition({
-							title: this.$p.t('person', 'nachname')
+							title: this.$p.t('person', 'nachname'),
+							visible: true
 						});
 						cm.getColumnByField('vorname').component.updateDefinition({
-							title: this.$p.t('person', 'vorname')
-						});
-						cm.getColumnByField('aktiv').component.updateDefinition({
-							title: this.$p.t('global', 'aktiv')
+							title: this.$p.t('person', 'vorname'),
+							visible: true
 						});
 						cm.getColumnByField('gebdatum').component.updateDefinition({
 							title: this.$p.t('person', 'geburtsdatum')
@@ -94,17 +120,41 @@ export default {
 							title: this.$p.t('person', 'firma')
 						});
 						cm.getColumnByField('vertragsarten').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsarten')
+							title: this.$p.t('vertrag', 'vertragsarten'),
+							visible: true
 						});
 						cm.getColumnByField('ids').component.updateDefinition({
-							title: this.$p.t('vertrag', 'idsDienstverhaeltnisse')
+							title: this.$p.t('vertrag', 'idsDienstverhaeltnisse'),
+							visible: true
+						});
+						cm.getColumnByField('aktiv').component.updateDefinition({
+							title: this.$p.t('global', 'aktiv'),
+							width: 45
 						});
 					}
-				}
+				},
+				{
+					event: "dataFiltered",
+					handler: function(filters, rows) {
+						let el = document.getElementById("search_count");
+						el.innerHTML = rows.length;
+					}
+				},
+				{
+					event: 'dataLoaded',
+					handler: (data) => {
+						let el = document.getElementById("total_count");
+						el.innerHTML = data.length;
+
+						this.tabulatorData = data.map(item => {
+							item.emailDomain = document.createElement('div');
+							return item;
+						});
+					}
+				},
 			],
 			selectedPerson: null,
 			selectedUid: null,
-			isFilterSet: false,
 		}
 	},
 	methods: {
@@ -117,41 +167,22 @@ export default {
 				uid: this.selectedUid
 			});
 		},
-		onSwitchChange() {
-			if (this.isFilterSet) {
-				this.$refs.table.tabulator.setFilter("aktiv", "=", true);
-			}
-			else {
-				this.$refs.table.tabulator.clearFilter();
-			}
-		},
 	},
 	template: `
-	<div class="core-mitarbeiter-header">
-		<h4>{{$p.t('vertrag', 'vertragsverwaltung')}}</h4>
-		
-	
-<!--	filter: show only active employees-->
-		<div class="justify-content-end py-3">
-			<form-input
-				container-class="form-switch"
-				type="checkbox"
-				:label="$p.t('vertrag/nurAktiveMaAnzeigen')"
-				v-model="isFilterSet"
-				@change="onSwitchChange"
-				>
-			</form-input>
-		</div>
 		
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
 			:tabulator-events="tabulatorEvents"
-			table-only
+			filter-type="Vertragsverwaltung"
 			:side-menu="false"
 			>
 		</core-filter-cmpt>
 
-	</div>`
+		<Teleport v-for="data in tabulatorData" :key="data.uid" :to="data.emailDomain">
+			{{domain}}
+		</Teleport>
+
+`
 }
 
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 1bd97c55b..90a833400 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -46,12 +46,12 @@ export default {
 		<core-navigation-cmpt/>
 
 		<div class="vv">
-			<main>
 				<vertical-split ref="vsplit">
 					<template #top>	
 						<div class="d-flex flex-column" style="height: 100%;">
 							<mitarbeiter-header
 								:endpoint="endpoint"
+								:domain="config.domain"
 								@selectionChanged="handleSelection"
 								/>
 						</div>
@@ -72,7 +72,6 @@ export default {
 						</div>
 					</template>
 				</vertical-split>
-			</main>	
 		</div>
 		`
 }
\ No newline at end of file
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 089065c24..7bca94a23 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1567,7 +1567,7 @@ $filters = array(
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "Vertragsverwaltung",
+				"name": "MA Vertragsverwaltung (aktiv)",
 				"columns": [
 					{"name": "UID"},
 					{"name": "PersonId"},
@@ -1579,13 +1579,13 @@ $filters = array(
 					{"name": "Firma"},
 					{"name": "Vertragsarten"},
 					{"name": "IDs Dienstverhältnis"},
+					{"name": "email"}
 				],
-				"filters": []
-			}
-		',
+				"filters": [
+					]
+			}',
 		'oe_kurzbz' => null,
 	),
-
 );
 
 // Loop through the filters array

From 49e89f44be81286ced604a8602a66a65161bb453 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Sep 2025 20:37:20 +0200
Subject: [PATCH 0720/1357] set default domain to fhcomplete.info

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

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index f86be4ae7..078e2d9a2 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -5,7 +5,7 @@ export default {
 	inject: {
 		domain: {
 			from: 'configDomain',
-			default: 'technikum-wien.at'
+			default: 'fhcomplete.info'
 		},
 	},
 	props: {

From ab70968bfc4a84fe7038261efefbcc8e53d1de55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 3 Sep 2025 06:50:18 +0200
Subject: [PATCH 0721/1357] Fixed Date Sort order in Pruefungsliste

---
 cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index 6a1dc9a92..de9a7cc26 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -252,7 +252,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				headers: {
 					0: { sorter: false },
 					3: { sorter: 'shortDate',
-						dateFormat: 'ddmmyyyy' },
+						dateFormat: 'dd.mm.yyyy' },
 					4: { sorter: 'time' },
 					5: { sorter: 'time' }
 				}

From bf83b715856157fa019e1c92e084b4056a31e3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 3 Sep 2025 06:52:01 +0200
Subject: [PATCH 0722/1357] =?UTF-8?q?Removed=20ugly=20Border=20in=20Pr?=
 =?UTF-8?q?=C3=BCfungseverwaltung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index de9a7cc26..17498ebbf 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -76,7 +76,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		width: 850px;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
-		border: 1px solid #dddddd;
+		/*border: 1px solid #dddddd;*/
 		/*box-shadow: 0em 0em 2em 0.5em #888888 inset;*/
 		}
 

From 1bb10ddeb1336ccd048a73df84d1722ee4b2f9a6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Sep 2025 10:43:20 +0200
Subject: [PATCH 0723/1357] refactor backend filter

---
 .../components/filters/Vertragsverwaltung.php | 30 +++++++++++++++++--
 .../components/Vertraege/MitarbeiterHeader.js |  9 +++---
 system/filtersupdate.php                      | 11 +++++--
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/application/components/filters/Vertragsverwaltung.php b/application/components/filters/Vertragsverwaltung.php
index 81e6775b3..d759f9563 100644
--- a/application/components/filters/Vertragsverwaltung.php
+++ b/application/components/filters/Vertragsverwaltung.php
@@ -4,6 +4,10 @@ $filterCmptArray = array(
 	'datasetName' => 'vertragsverwaltung',
 	'query' =>  '
 		SELECT
+		  *
+		FROM
+		  (
+			SELECT
 			b.uid , p.person_id,
 			p.vorname, p.nachname,
 			gebdatum,
@@ -13,8 +17,8 @@ $filterCmptArray = array(
 			STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
 				CASE
 				WHEN b.aktiv = true THEN \'aktiv\'
-				ELSE \'naktiv\'
-				END AS "aktiv"
+				END AS "aktiv_status",
+			    b.aktiv
 			FROM
 				hr.tbl_dienstverhaeltnis d
 			JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
@@ -23,7 +27,27 @@ $filterCmptArray = array(
 			JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
 			WHERE b.aktiv = true
 			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias, b.aktiv
-			ORDER BY nachname, vorname
+
+			UNION ALL
+
+			SELECT
+				b.uid , p.person_id,
+				p.vorname, p.nachname,
+				gebdatum,
+				COALESCE(b.alias, b.uid) AS email,
+				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
+				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
+				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
+				\'all\' AS "aktiv_status",
+				b.aktiv
+			FROM
+				hr.tbl_dienstverhaeltnis d
+			JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+			JOIN public.tbl_person p ON p.person_id = b.person_id
+			JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+			JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias
+			ORDER BY nachname, vorname) a
 		',
 	'requiredPermissions' => 'vertrag/mitarbeiter'
 	);
\ No newline at end of file
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index fa8162141..52fb244c3 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -53,16 +53,14 @@ export default {
 						title: "Aktiv", field: "aktiv", visible: false, headerFilter: true, width: 85,
 						formatter:"tickCross",
 						hozAlign:"center",
-						formatter: function(cell) {
-							return cell.getValue() === "aktiv"
-								? '<i class="fa fa-check text-success"></i>'
-								: '<i class="fa fa-xmark text-danger"></i>';
+					    formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
 					},
 					{title: "Unternehmen", field: "unternehmen", visible: false, headerFilter: "input"},
 					{title: "Vertragsarten", field: "vertragsarten", visible: true, headerFilter: "input"},
 					{title: "Ids Dienstverträge", field: "ids", visible: true, headerFilter: "input"},
-
 					{
 						title: "email", field: "email", headerFilter: "input",
 						visible: false,
@@ -77,6 +75,7 @@ export default {
 							return container;
 						},
 					},
+					{title: "Filter aktiv/all", field: "aktiv_status", visible:false, headerFilter: "input"}
 				],
 				layout: 'fitColumns',
 				persistenceID: 'core-mitarbeiter_20250901',
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 7bca94a23..a865a0cd7 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1567,7 +1567,7 @@ $filters = array(
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "MA Vertragsverwaltung (aktiv)",
+				"name": "MA Vertragsverwaltung (aktiv/all)",
 				"columns": [
 					{"name": "UID"},
 					{"name": "PersonId"},
@@ -1579,9 +1579,16 @@ $filters = array(
 					{"name": "Firma"},
 					{"name": "Vertragsarten"},
 					{"name": "IDs Dienstverhältnis"},
-					{"name": "email"}
+					{"name": "email"},
+					{"name": "aktiv_status"}
 				],
 				"filters": [
+					{
+						"name": "aktiv_status",
+						"option": "",
+						"operation": "equal",
+						"condition": "aktiv"
+					}
 					]
 			}',
 		'oe_kurzbz' => null,

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

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

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

From d027e62e75864cd25aefccb6447fdbbc3b6216ac Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 3 Sep 2025 11:21:08 +0200
Subject: [PATCH 0725/1357] neu hinzugefuegter tag an erster stelle

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

diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 5b4d45c24..5360c3525 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -445,7 +445,7 @@ export default {
 							if (!tagExists)
 							{
 								addedTag.id = tag.id;
-								tags.push({ ...addedTag });
+								tags.unshift({ ...addedTag });
 								targetRow.update({ tags: JSON.stringify(tags) });
 								targetRow.reformat();
 							}

From 2c3754b33f61bfcdb88e78d6f6191f4aa1d86012 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 3 Sep 2025 13:51:41 +0200
Subject: [PATCH 0726/1357] more tooltips so people can avoid reading the wiki

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 82ea03ba0..76cc70f06 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -34030,6 +34030,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipAssistenzVonDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Untere Datumsgrenze für das Laden von Entschuldigungsdaten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lower date limit for the data loading of excuse notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipAssistenzBisDatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Obere Datumsgrenze für das Laden von Entschuldigungsdaten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upper date limit for the data loading of excuse notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From fd2ff27e22d16aab895e781bf9a5d21c3ac91d51 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 3 Sep 2025 15:24:07 +0200
Subject: [PATCH 0727/1357] Added column prestudent_id to getStudentsByLv
 method query in Lehrveranstaltung_model.php

---
 application/models/education/Lehrveranstaltung_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 3eb4d33a2..63d1ca15c 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -316,7 +316,8 @@ class Lehrveranstaltung_model extends DB_Model
 			(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
-			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung
+			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
+			tbl_student.prestudent_id
 
 		FROM
 			campus.vw_student_lehrveranstaltung

From 10d58d1a42f64649ef0110ccb9528519bd05efa4 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 3 Sep 2025 15:24:07 +0200
Subject: [PATCH 0728/1357] Added column prestudent_id to getStudentsByLv
 method query in Lehrveranstaltung_model.php

---
 application/models/education/Lehrveranstaltung_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 3eb4d33a2..e02c1ad0b 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -316,8 +316,8 @@ class Lehrveranstaltung_model extends DB_Model
 			(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
-			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung
-
+			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
+			tbl_student.prestudent_id
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)

From 707a900ee4225eef3f1f2f5606953c79df2fcf47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 3 Sep 2025 18:38:29 +0200
Subject: [PATCH 0729/1357] =?UTF-8?q?Ortpr=C3=BCfung=20bei=20Pruefungszusa?=
 =?UTF-8?q?mmenlegung=20korrigiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/lehre/pruefung/pruefungsanmeldung.json.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
index f06898068..e4f17860a 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
@@ -1365,7 +1365,7 @@ function terminezusammenlegen($termine, $lv_id)
 				$error = true;
 			}
 
-			if (!($termin->termin->ort_kurzbz === $first_ort || $first_termin->termin->anderer_raum = $first_raum))
+			if (!($termin->termin->ort_kurzbz === $first_ort || $first_termin->termin->anderer_raum == $first_raum))
 			{
 				$data['errormsg'] = 'Ort/Raum unterschiedlich!';
 				$error = true;
@@ -1491,7 +1491,7 @@ function terminezusammenlegen($termine, $lv_id)
 
 	$data['result']= $result;
 	$data['error']= $error ? 'true' : 'false';
-	$data['errormsg']='';
+	//$data['errormsg']='';
 	return $data;
 }
 

From 5f1c7537fb191a27726fcffde44ef7400e5be492 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Sep 2025 11:04:12 +0200
Subject: [PATCH 0730/1357] WIP

---
 .../controllers/api/frontend/v1/Abgabe.php    |  15 +-
 public/js/apps/Dashboard/Fhc.js               |   1 +
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 248 +++++++++++++-----
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  42 ++-
 4 files changed, 221 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 345ead004..4ff260602 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -140,13 +140,16 @@ class Abgabe extends FHCAPI_Controller
 
 		$projektarbeiten = getData($result);
 		
-		// TODO: save access to this, array could be empty
-		foreach($projektarbeiten as $pa) {
-			$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
-			
-			// TODO: save access
-			$pa->email = getData($result)[0]->private_email;
+		if(count($projektarbeiten)) {
+			// TODO: save access to this, array could be empty
+			foreach($projektarbeiten as $pa) {
+				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
+
+				// TODO: save access
+				$pa->email = getData($result)[0]->private_email;
+			}
 		}
+		
 
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
 	}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 473e1cf67..5295050a0 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -233,6 +233,7 @@ const app = Vue.createApp({
 		return { // provide injectable & watchable language property
 			language: Vue.computed(() => this.$p.user_language),
 			renderers: Vue.computed(() => this.renderers),
+			isMobile: this.isMobile
 		}	
 	},
 	methods: {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index be44b0441..e56ab90ca 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -13,9 +13,11 @@ export const AbgabeStudentDetail = {
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
+		Accordion: primevue.accordion,
+		AccordionTab: primevue.accordiontab,
 		VueDatePicker
 	},
-	inject: ['notenOptions'],
+	inject: ['notenOptions', 'isMobile'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -184,6 +186,14 @@ export const AbgabeStudentDetail = {
 		getTerminNoteBezeichnung(termin) {
 			const noteOpt = this.notenOptions.find(opt => opt.note == termin.note)
 			return noteOpt ? noteOpt.bezeichnung : ''
+		},
+		getAccTabHeaderForTermin(termin) {
+			let tabTitle = ''
+
+			const datumFormatted = this.formatDate(termin.datum)
+			tabTitle += termin.bezeichnung + ' ' + datumFormatted
+			
+			return tabTitle
 		}
 	},
 	watch: {
@@ -230,79 +240,175 @@ export const AbgabeStudentDetail = {
 				<p> {{projektarbeit?.betreuer}}</p>
 				<p> {{projektarbeit?.titel}}</p>
 			</div>
-			<div id="uploadWrapper">
-				<div class="row" style="margin-bottom: 12px;">
-					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
-					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
-					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-					<div class="col-3 fw-bold">
-						{{$p.t('abgabetool/c4fileupload')}}
-					</div>
-				</div>
-				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div class="col-1 d-flex justify-content-center align-items-start">
-						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>
-						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>
-<!--
-						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
--->
-					</div>
-					<div class="col-2 d-flex justify-content-start align-items-start">
-						<div class="position-relative" :class="getDateStyle(termin)">
-							<VueDatePicker
-								v-model="termin.datum"
-								:clearable="false"
-								:disabled="true"
-								:enable-time-picker="false"
-								:format="formatDate"
-								:text-input="true"
-								auto-apply>
-							</VueDatePicker>
-							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
-						</div>
-					</div>
-					<div class="col-1 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>
-					<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">
-						{{ getTerminNoteBezeichnung(termin) }}
-					</div>
-					<div v-if="qualityGateTerminAvailable || termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-start">
-						<Checkbox 
-							v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'"
-							disabled
-							v-model="termin.upload_allowed"
-							:binary="true" 
-							:pt="{ root: { class: 'ml-auto' }}"
-						>
-						</Checkbox>
-					</div>
-					<div class="col-2 d-flex justify-content-start align-items-start">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="45" :disabled="true"></Textarea>
-					</div>
-					<div class="col-1 d-flex justify-content-start align-items-center">
-						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-							<i class="fa-solid fa-2x fa-file-pdf"></i>
-						</a>
-					</div>
-					<div class="col-3" v-if="!viewMode">
+			
+<!--			 TODO: arrange this properly in mobile view, left col is a bit tight and all-->
+			<Accordion ref="accordion" :multiple="true" :activeIndex="[0]">
+				<template v-for="termin in this.projektarbeit?.abgabetermine">
+					<AccordionTab :header="getAccTabHeaderForTermin(termin)" style="padding: 0px;" :pt="tabPassthroughStyle">
+							
 						<div class="row">
-							<div class="col-8">
-								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
-							</div>
-							<div class="col-4">
-								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
-									{{$p.t('abgabetool/c4upload')}}
-									<i class="fa-solid fa-upload"></i>
-								</button>
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+							<div class="col-8 col-md-9">
+								<Checkbox 
+									disabled
+									v-model="termin.fixtermin"
+									:binary="true" 
+									:pt="{ root: { class: 'ml-auto' }}"
+								>
+								</Checkbox>
+<!--								<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
+<!--								<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
 							</div>
 						</div>
-					</div>
-				</div>
-			</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+							<div class="col-8 col-md-9">
+								<VueDatePicker
+									v-model="termin.datum"
+									:clearable="false"
+									:disabled="true"
+									:enable-time-picker="false"
+									:format="formatDate"
+									:text-input="true"
+									auto-apply>
+								</VueDatePicker>
+<!--								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
+							</div>
+						</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+							<div class="col-8 col-md-9">
+								{{ termin.bezeichnung }}
+							</div>
+						</div>
+						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+							<div class="col-8 col-md-9">
+								<div v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">
+									{{ getTerminNoteBezeichnung(termin) }}
+								</div>
+							</div>
+						</div>
+						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+							<div class="col-8 col-md-9">
+								<Checkbox 
+									disabled
+									v-model="termin.upload_allowed"
+									:binary="true" 
+									:pt="{ root: { class: 'ml-auto' }}"
+								>
+								</Checkbox>
+							</div>
+						</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+							<div class="col-8 col-md-9">
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="true"></Textarea>
+							</div>
+						</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+							<div class="col-8 col-md-9">
+								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+								<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
+									<i class="fa-solid fa-2x fa-file-pdf"></i>
+								</a>
+							</div>
+						</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fileupload')}}</div>
+							<div class="col-8 col-md-9">
+								<div class="row">
+									<div class="col-4">
+										<Upload :disabled="!termin?.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+									</div>
+									<div class="col-4">
+										<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+											{{$p.t('abgabetool/c4upload')}}
+											<i class="fa-solid fa-upload"></i>
+										</button>
+									</div>
+								</div>
+							</div>
+						</div>
+					</AccordionTab>
+				</template>
+			</Accordion>
+			
+<!--			<div id="uploadWrapper">-->
+<!--				<div class="row" style="margin-bottom: 12px;">-->
+<!--					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
+<!--					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>-->
+<!--					<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>-->
+<!--					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4note')}}</div>-->
+<!--					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>-->
+<!--					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>-->
+<!--					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>-->
+<!--					<div class="col-3 fw-bold">-->
+<!--						{{$p.t('abgabetool/c4fileupload')}}-->
+<!--					</div>-->
+<!--				</div>-->
+<!--				<div class="row" v-for="termin in projektarbeit.abgabetermine">-->
+<!--					<div class="col-1 d-flex justify-content-center align-items-start">-->
+<!--						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
+<!--						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
+<!--&lt;!&ndash;-->
+<!--						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>-->
+<!--&ndash;&gt;-->
+<!--					</div>-->
+<!--					<div class="col-2 d-flex justify-content-start align-items-start">-->
+<!--						<div class="position-relative" :class="getDateStyle(termin)">-->
+<!--							<VueDatePicker-->
+<!--								v-model="termin.datum"-->
+<!--								:clearable="false"-->
+<!--								:disabled="true"-->
+<!--								:enable-time-picker="false"-->
+<!--								:format="formatDate"-->
+<!--								:text-input="true"-->
+<!--								auto-apply>-->
+<!--							</VueDatePicker>-->
+<!--							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
+<!--						</div>-->
+<!--					</div>-->
+<!--					<div class="col-1 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>-->
+<!--					<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">-->
+<!--						{{ getTerminNoteBezeichnung(termin) }}-->
+<!--					</div>-->
+<!--					<div v-if="qualityGateTerminAvailable || termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-start">-->
+<!--						<Checkbox -->
+<!--							v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'"-->
+<!--							disabled-->
+<!--							v-model="termin.upload_allowed"-->
+<!--							:binary="true" -->
+<!--							:pt="{ root: { class: 'ml-auto' }}"-->
+<!--						>-->
+<!--						</Checkbox>-->
+<!--					</div>-->
+<!--					<div class="col-2 d-flex justify-content-start align-items-start">-->
+<!--						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="45" :disabled="true"></Textarea>-->
+<!--					</div>-->
+<!--					<div class="col-1 d-flex justify-content-start align-items-center">-->
+<!--						{{ termin.abgabedatum?.split("-").reverse().join(".") }}-->
+<!--						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">-->
+<!--							<i class="fa-solid fa-2x fa-file-pdf"></i>-->
+<!--						</a>-->
+<!--					</div>-->
+<!--					<div class="col-3" v-if="!viewMode">-->
+<!--						<div class="row">-->
+<!--							<div class="col-8">-->
+<!--								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>-->
+<!--							</div>-->
+<!--							<div class="col-4">-->
+<!--								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">-->
+<!--									{{$p.t('abgabetool/c4upload')}}-->
+<!--									<i class="fa-solid fa-upload"></i>-->
+<!--								</button>-->
+<!--							</div>-->
+<!--						</div>-->
+<!--					</div>-->
+<!--				</div>-->
+<!--			</div>-->
 		 </div>
 	 	
 	 	<bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index a63f781e9..e46f46579 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -12,6 +12,7 @@ export const AbgabetoolStudent = {
 		AbgabeDetail,
 		VerticalSplit
 	},
+	inject: ['isMobile'],
 	provide() {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions)
@@ -41,6 +42,8 @@ export const AbgabetoolStudent = {
 			selectedProjektarbeit: null,
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
+			dataProcessedPromise: null,
+			dataProcessedResolve: null,
 			abgabeTableOptions: {
 				minHeight: 250,
 				index: 'projektarbeit_id',
@@ -103,12 +106,20 @@ export const AbgabetoolStudent = {
 				],
 				persistence: false,
 			},
-			abgabeTableEventHandlers: [{
+			abgabeTableEventHandlers: [
+			{
 				event: "tableBuilt",
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
 			},
+			{
+				event: "dataProcessed",
+				handler: async () => {
+					console.log('dataProcessed event')
+					this.dataProcessedResolve()
+				}
+			},
 			{
 				event: "cellClick",
 				handler: async (e, cell) => {
@@ -218,6 +229,10 @@ export const AbgabetoolStudent = {
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
 		},
+		dataResolve(resolve) {
+			console.log('dataResolve')
+			this.dataProcessedResolve = resolve
+		},
 		buildMailToLink(projekt) {
 			if(projekt.mitarbeiter_uid) { // standard
 				return 'mailto:' + projekt.mitarbeiter_uid +'@'+ this.domain
@@ -228,7 +243,7 @@ export const AbgabetoolStudent = {
 		buildBetreuer(abgabe) {
 			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
-		setupData(data){
+		async setupData(data){
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			this.student_uid = data[2]
@@ -259,13 +274,23 @@ export const AbgabetoolStudent = {
 				}
 			})
 
-			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			// this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(d);
+			await this.dataProcessedPromise
 
-			Vue.nextTick(()=>{
-				this.$refs.abgabeTable?.tabulator.setColumns(this.$refs.abgabeTable?.tabulator.getColumnDefinitions())
 
-			})
+			// TODO: proper event handling cleanup
+			
+			// todo in general fix this nasty race condition
+			const t = this.$refs.abgabeTable.tabulator;
+			t.on("renderComplete", () => {
+				// only if container width is small enough to trigger collapse
+				if (t.element.offsetWidth < 600 || this.isMobile) {
+					t.setColumns(t.getColumnDefinitions());
+					t.redraw(true)
+				}
+			});
+			
 		},
 		loadProjektarbeiten() {
 			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null))
@@ -295,8 +320,9 @@ export const AbgabetoolStudent = {
 		},
 		async setupMounted() {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
+			this.dataProcessedPromise = new Promise(this.dataResolve)
 			await this.tableBuiltPromise
-			
+			// this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.loadProjektarbeiten()
 			
 
@@ -338,7 +364,7 @@ export const AbgabetoolStudent = {
 		dialogClass="modal-fullscreen">
 		<template v-slot:title>
 			<div>
-				abgabe detail wtb phrasen
+				abgabe detail todo phrasen
 			</div>
 		</template>
 		<template v-slot:default>

From 8bba492ec15fe9a9dd2eea46e46b9a836e8ff8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 4 Sep 2025 13:36:14 +0200
Subject: [PATCH 0731/1357] Check for existing Folder before loading possible
 routes

---
 application/config/routes.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index b4ce2ed4a..52bf535ca 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -116,20 +116,23 @@ $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT
 
 foreach($subdirs as $subdir)
 {
-	$dirlist = scandir($subdir);
-	if ($dirlist)
+	if(is_dir($subdir))
 	{
-		$files = array_diff($dirlist, array('.','..'));
-
-		foreach ($files as &$item)
+		$dirlist = scandir($subdir);
+		if ($dirlist)
 		{
-			if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
-			{
-				$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+			$files = array_diff($dirlist, array('.','..'));
 
-				if (file_exists($routes_file))
+			foreach ($files as &$item)
+			{
+				if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
 				{
-					require($routes_file);
+					$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+
+					if (file_exists($routes_file))
+					{
+						require($routes_file);
+					}
 				}
 			}
 		}

From 49ca5383819f1b37cd9a4d8b7272c5f402d04060 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Sep 2025 17:38:32 +0200
Subject: [PATCH 0732/1357] student page redesign; wip mitarbeiter page + add
 new modal

---
 .../controllers/api/frontend/v1/Abgabe.php    |   3 +
 .../models/education/Projektarbeit_model.php  |   1 +
 public/js/api/factory/abgabe.js               |   3 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 457 ++++++++++++++----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   5 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 119 +++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 345 ++++++-------
 system/phrasesupdate.php                      |  20 +
 8 files changed, 610 insertions(+), 343 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 4ff260602..a4384a890 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -485,6 +485,7 @@ class Abgabe extends FHCAPI_Controller
 		$fixtermin = $_POST['fixtermin'];
 		$kurzbz = $_POST['kurzbz'];
 		$note = $_POST['note'];
+		$notiz = $_POST['notiz'];
 		$upload_allowed = $_POST['upload_allowed'];
 		$betreuer_person_id = $_POST['betreuer_person_id'];
 
@@ -506,6 +507,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
+					'notiz' => $notiz,
 					'upload_allowed' => $upload_allowed,
 					'insertvon' => getAuthUID(),
 					'insertamum' => date('Y-m-d H:i:s')
@@ -521,6 +523,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
+					'notiz' => $notiz,
 					'upload_allowed' => $upload_allowed,
 					'updatevon' => getAuthUID(),
 					'updateamum' => date('Y-m-d H:i:s')
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index c87e9c187..a6eaf7fd2 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -169,6 +169,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.datum,
 					campus.tbl_paabgabe.note,
 					campus.tbl_paabgabe.upload_allowed,
+					campus.tbl_paabgabe.notiz,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 67e67f385..9cb26dcc3 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -58,7 +58,8 @@ export default {
 				paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
 				datum: termin.datum,
 				note: termin.note_pk,
-				upload_allowed: termin.upload_allowed,
+				upload_allowed: !!termin.upload_allowed,
+				notiz: termin.notiz ?? '',
 				fixtermin: termin.fixtermin,
 				insertvon: termin.insertvon,
 				kurzbz: termin.kurzbz,
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index ca8d92cd8..1a480634f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -11,9 +11,12 @@ export const AbgabeMitarbeiterDetail = {
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
+		SpeedDial: primevue.speeddial,
+		Accordion: primevue.accordion,
+		AccordionTab: primevue.accordiontab,
 		VueDatePicker
 	},
-	inject: ['abgabeTypeOptions', 'allowedNotenOptions', 'turnitin_link', 'old_abgabe_beurteilung_link'],
+	inject: ['abgabeTypeOptions', 'allowedNotenOptions', 'turnitin_link', 'old_abgabe_beurteilung_link', 'isMobile'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -24,10 +27,19 @@ export const AbgabeMitarbeiterDetail = {
 		return {
 			eidAkzeptiert: false,
 			enduploadTermin: null,
-			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			speedDialItems: [{
+				label: "Create New",
+				icon: "pi pi-plus",
+				command: this.createNew
+			}],
+			newTermin: null
 		}
 	},
 	methods: {
+		createNew(){
+			console.log('create new')	
+		},
 		openZusatzdatenModal(termin) {
 				
 		},
@@ -39,24 +51,26 @@ export const AbgabeMitarbeiterDetail = {
 			this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
-					if(paabgabe_id === -1) { // new abgabe has been inserted
-						termin.paabgabe_id = res?.data?.paabgabe_id
-						this.projektarbeit.abgabetermine.push({ // new abgatermin row
-							'paabgabe_id': -1,
-							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
-							'fixtermin': false,
-							'kurzbz': '',
-							'datum': new Date().toISOString().split('T')[0],
-							'paabgabetyp_kurzbz': termin.paabgabetyp_kurzbz,
-							'note': this.allowedNotenOptions.find(opt => opt.note == termin.note?.note),
-							'upload_allowed': termin.upload_allowed,
-							'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz),
-							'abgabedatum': null,
-							'insertvon': this.viewData?.uid ?? '',
-							'allowedToSave': true,
-							'allowedToDelete': true
-						})
-					}
+					
+					// if(paabgabe_id === -1) { // new abgabe has been inserted
+					// 	termin.paabgabe_id = res?.data?.paabgabe_id
+					// 	this.projektarbeit.abgabetermine.push({ // new abgatermin row
+					// 		'paabgabe_id': -1,
+					// 		'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+					// 		'fixtermin': false,
+					// 		'kurzbz': '',
+					// 		'datum': new Date().toISOString().split('T')[0],
+					// 		'paabgabetyp_kurzbz': termin.paabgabetyp_kurzbz,
+					// 		'note': this.allowedNotenOptions.find(opt => opt.note == termin.note?.note),
+					// 		'upload_allowed': termin.upload_allowed,
+					// 		'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz),
+					// 		'abgabedatum': null,
+					// 		'insertvon': this.viewData?.uid ?? '',
+					// 		'allowedToSave': true,
+					// 		'allowedToDelete': true
+					// 	})
+					// }
+					
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
@@ -135,17 +149,6 @@ export const AbgabeMitarbeiterDetail = {
 		getNotenOptionLabel(option) {
 			return option.bezeichnung
 		},
-		formatDate(dateParam) {
-			const date = new Date(dateParam)
-			// handle missing leading 0
-			const padZero = (num) => String(num).padStart(2, '0');
-
-			const month = padZero(date.getMonth() + 1); // Months are zero-based
-			const day = padZero(date.getDate());
-			const year = date.getFullYear();
-
-			return `${day}.${month}.${year}`;
-		},
 		openStudentPage() {
 			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
 				+ '/Cis/Abgabetool/Student/' + this.projektarbeit?.student_uid
@@ -159,6 +162,44 @@ export const AbgabeMitarbeiterDetail = {
 			const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
 			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
 			window.open(link, '_blank')
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		getAccTabHeaderForTermin(termin) {
+			let tabTitle = ''
+			
+			const datumFormatted = this.formatDate(termin.datum)
+			tabTitle += termin.bezeichnung?.bezeichnung + ' ' + datumFormatted
+
+			return tabTitle
+		},
+		openCreateNewAbgabeModal() {
+			if(!this.newTermin) {
+				this.newTermin = {
+					// 'paabgabe_id': -1,
+					// 'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+					// 'fixtermin': false,
+					// 'kurzbz': '',
+					// 'datum': new Date().toISOString().split('T')[0],
+					// 'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+					// 'upload_allowed': false,
+					// 'paabgabetyp_kurzbz': '',
+					// 'bezeichnung': '',
+					// 'abgabedatum': null,
+					// 'insertvon': this.viewData?.uid ?? ''
+				}
+			}
+			
+			this.$refs.modalContainerCreateNewAbgabe.show()
 		}
 	},
 	computed: {
@@ -183,6 +224,12 @@ export const AbgabeMitarbeiterDetail = {
 				}
 			})
 			return qgatefound
+		},
+		getPageWrapperStyle() {
+			return 'position: relative; min-height: 100vh;'
+		},
+		getSpeedDialStyle() {
+			return 'position: absolute; right: 1rem; bottom: 1rem;'
 		}
 	},
 	created() {
@@ -192,8 +239,104 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-		<div v-if="projektarbeit" style="max-width: 95%">
-		
+		<bs-modal ref="modalContainerCreateNewAbgabe" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{ $p.t('abgabetool/c4neueAbgabe') }}
+				</div>
+			</template>
+			<template v-slot:default>
+				<div v-if="newTermin">
+					<div class="row">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+						<div class="col-8 col-md-9">
+							<Checkbox 
+								v-model="newTermin.fixtermin"
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+						<div class="col-8 col-md-9">
+							<VueDatePicker
+								v-model="newTermin.datum"
+								:clearable="false"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
+						</div>
+					</div>
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+						<div class="col-8 col-md-9">
+							<Dropdown
+								:style="{'width': '100%'}"
+								v-model="newTermin.bezeichnung"
+								:options="abgabeTypeOptions"
+								:optionLabel="getOptionLabelAbgabetyp">
+							</Dropdown>
+						</div>
+					</div>
+					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+						<div class="col-8 col-md-9">
+							<Dropdown
+								:style="{'width': '100%'}"
+								v-model="newTermin.note"
+								:options="allowedNotenOptions"
+								:optionLabel="getNotenOptionLabel">
+							</Dropdown>
+						</div>
+					</div>
+					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin?.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+						<div class="col-8 col-md-9">
+							<Checkbox
+								v-model="newTermin.upload_allowed"
+								:binary="true"
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
+					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
+						<div class="col-8 col-md-9">
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin?.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
+						</div>
+					</div>
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+						<div class="col-8 col-md-9">
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
+						</div>
+					</div>	
+				</div>
+			</template>
+			<template v-slot:footer>
+				
+			</template>
+		</bs-modal>
+
+		<SpeedDial
+			@click="openCreateNewAbgabeModal"
+			:model="[]" 
+			direction="up"
+			type="linear"
+			showIcon="pi pi-plus"
+			hideIcon="pi pi-plus" 
+			:visible="true"
+			:style="getSpeedDialStyle"
+		/>
+
+		<div v-if="projektarbeit">
+			
+			
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 
 			<div class="row">
@@ -235,33 +378,26 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 			</div>
-			<div id="uploadWrapper">
-				<div class="row" style="margin-bottom: 12px;">
-					<div class="fw-bold" style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="row" style="max-width: calc(100% - 100px)">
-						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
-						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-						<div v-show="qualityGateTerminAvailable" class="col-2 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
-						<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
-						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-						<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-						<div class="col">
+			
+			<Accordion :multiple="true" :activeIndex="[0]">
+				<template v-for="termin in this.projektarbeit?.abgabetermine">
+					<AccordionTab :header="getAccTabHeaderForTermin(termin)">
 							
+						<div class="row">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+							<div class="col-8 col-md-9">
+								<Checkbox 
+									v-model="termin.fixtermin"
+									:binary="true" 
+									:pt="{ root: { class: 'ml-auto' }}"
+								>
+								</Checkbox>
+							</div>
 						</div>
-					</div>
-				</div>
-				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>
-				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
-						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>
-						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>
-<!--						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>-->
-					</div>
-					<div class="row" style="max-width: calc(100% - 100px)">
-						<div class="col-2 d-flex justify-content-center align-items-center">
-							<div class="position-relative" :class="getDateStyle(termin)">
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+							<div class="col-8 col-md-9">
 								<VueDatePicker
-									style="width: 95%;"
 									v-model="termin.datum"
 									:clearable="false"
 									:disabled="!termin.allowedToSave"
@@ -270,58 +406,175 @@ export const AbgabeMitarbeiterDetail = {
 									:text-input="true"
 									auto-apply>
 								</VueDatePicker>
-								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
-							</div>				
+							</div>
 						</div>
-						<div class="col-2 d-flex justify-content-center align-items-center">
-							<Dropdown 
-								:style="{'width': '100%'}"
-								:disabled="!termin.allowedToSave"
-								v-model="termin.bezeichnung"
-								:options="abgabeTypeOptions"
-								:optionLabel="getOptionLabelAbgabetyp">
-							</Dropdown>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+							<div class="col-8 col-md-9">
+								<Dropdown
+									:style="{'width': '100%'}"
+									:disabled="!termin.allowedToSave"
+									v-model="termin.bezeichnung"
+									:options="abgabeTypeOptions"
+									:optionLabel="getOptionLabelAbgabetyp">
+								</Dropdown>
+							</div>
 						</div>
-						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-2 d-flex justify-content-center align-items-center">
-							<Dropdown 
-								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
-								:style="{'width': '100%'}"
-								v-model="termin.note"
-								:options="allowedNotenOptions"
-								:optionLabel="getNotenOptionLabel">
-							</Dropdown>
+						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+							<div class="col-8 col-md-9">
+								<Dropdown
+									:style="{'width': '100%'}"
+									v-model="termin.note"
+									:options="allowedNotenOptions"
+									:optionLabel="getNotenOptionLabel">
+								</Dropdown>
+							</div>
 						</div>
-						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-center">
-							<Checkbox 
-								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"
-								v-model="termin.upload_allowed"
-								:binary="true" 
-								:pt="{ root: { class: 'ml-auto' }}"
-							>
-							</Checkbox>
+						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+							<div class="col-8 col-md-9">
+								<Checkbox
+									v-model="termin.upload_allowed"
+									:binary="true"
+									:pt="{ root: { class: 'ml-auto' }}"
+								>
+								</Checkbox>
+							</div>
 						</div>
-						<div class="col-2 d-flex justify-content-center align-items-center">
-							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="20" :disabled="!termin.allowedToSave"></Textarea>
+						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
+							<div class="col-8 col-md-9">
+								<Textarea style="margin-bottom: 4px;" v-model="termin.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+							</div>
 						</div>
-						<div class="col-1 d-flex justify-content-center align-items-center">
-							{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-							<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-								<i class="fa-solid fa-2x fa-file-pdf"></i>
-							</a>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+							<div class="col-8 col-md-9">
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+							</div>
 						</div>
-						<div class="col-2 align-content-center">
-							<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
-								{{ $p.t('abgabetool/c4save') }}
-								<i class="fa-solid fa-floppy-disk"></i>
-							</button>
-							<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">
-								{{ $p.t('abgabetool/c4delete') }}
-								<i class="fa-solid fa-trash"></i>
-							</button>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+							<div class="col-8 col-md-9">
+								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+								<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
+									<i class="fa-solid fa-2x fa-file-pdf"></i>
+								</a>
+							</div>
 						</div>
-					</div>
-				</div>
-			</div>
+						<div class="row mt-2">
+							<div class="col-4 col-md-3 fw-bold">
+<!--								 TODO: row description? -->
+							</div>
+							<div class="col-8 col-md-9">
+								<div class="row">
+									<div class="col-4">
+										<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
+											{{ $p.t('abgabetool/c4save') }}
+											<i class="fa-solid fa-floppy-disk"></i>
+										</button>
+									</div>
+									<div class="col-4">
+										<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">
+											{{ $p.t('abgabetool/c4delete') }}
+											<i class="fa-solid fa-trash"></i>
+										</button>
+									</div>
+								</div>
+							</div>
+						</div>
+					</AccordionTab>
+				</template>
+			</Accordion>
+			
+<!--			<div id="uploadWrapper">-->
+<!--				<div class="row" style="margin-bottom: 12px;">-->
+<!--					<div class="fw-bold" style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
+<!--					<div class="row" style="max-width: calc(100% - 100px)">-->
+<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>-->
+<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>-->
+<!--						<div v-show="qualityGateTerminAvailable" class="col-2 fw-bold">{{$p.t('abgabetool/c4note')}}</div>-->
+<!--						<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>-->
+<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>-->
+<!--						<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>-->
+<!--						<div class="col">-->
+<!--							-->
+<!--						</div>-->
+<!--					</div>-->
+<!--				</div>-->
+<!--				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>-->
+<!--				<div class="row" v-for="termin in projektarbeit.abgabetermine">-->
+<!--					<div style="width: 100px" class="d-flex justify-content-center align-items-center">-->
+<!--						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
+<!--						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
+<!--&lt;!&ndash;						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>&ndash;&gt;-->
+<!--					</div>-->
+<!--					<div class="row" style="max-width: calc(100% - 100px)">-->
+<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
+<!--							<div class="position-relative" :class="getDateStyle(termin)">-->
+<!--								<VueDatePicker-->
+<!--									style="width: 95%;"-->
+<!--									v-model="termin.datum"-->
+<!--									:clearable="false"-->
+<!--									:disabled="!termin.allowedToSave"-->
+<!--									:enable-time-picker="false"-->
+<!--									:format="formatDate"-->
+<!--									:text-input="true"-->
+<!--									auto-apply>-->
+<!--								</VueDatePicker>-->
+<!--								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
+<!--							</div>				-->
+<!--						</div>-->
+<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
+<!--							<Dropdown -->
+<!--								:style="{'width': '100%'}"-->
+<!--								:disabled="!termin.allowedToSave"-->
+<!--								v-model="termin.bezeichnung"-->
+<!--								:options="abgabeTypeOptions"-->
+<!--								:optionLabel="getOptionLabelAbgabetyp">-->
+<!--							</Dropdown>-->
+<!--						</div>-->
+<!--						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-2 d-flex justify-content-center align-items-center">-->
+<!--							<Dropdown -->
+<!--								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"-->
+<!--								:style="{'width': '100%'}"-->
+<!--								v-model="termin.note"-->
+<!--								:options="allowedNotenOptions"-->
+<!--								:optionLabel="getNotenOptionLabel">-->
+<!--							</Dropdown>-->
+<!--						</div>-->
+<!--						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-center">-->
+<!--							<Checkbox -->
+<!--								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"-->
+<!--								v-model="termin.upload_allowed"-->
+<!--								:binary="true" -->
+<!--								:pt="{ root: { class: 'ml-auto' }}"-->
+<!--							>-->
+<!--							</Checkbox>-->
+<!--						</div>-->
+<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
+<!--							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="20" :disabled="!termin.allowedToSave"></Textarea>-->
+<!--						</div>-->
+<!--						<div class="col-1 d-flex justify-content-center align-items-center">-->
+<!--							{{ termin.abgabedatum?.split("-").reverse().join(".") }}-->
+<!--							<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">-->
+<!--								<i class="fa-solid fa-2x fa-file-pdf"></i>-->
+<!--							</a>-->
+<!--						</div>-->
+<!--						<div class="col-2 align-content-center">-->
+<!--							<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">-->
+<!--								{{ $p.t('abgabetool/c4save') }}-->
+<!--								<i class="fa-solid fa-floppy-disk"></i>-->
+<!--							</button>-->
+<!--							<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">-->
+<!--								{{ $p.t('abgabetool/c4delete') }}-->
+<!--								<i class="fa-solid fa-trash"></i>-->
+<!--							</button>-->
+<!--						</div>-->
+<!--					</div>-->
+<!--				</div>-->
+<!--			</div>-->
 		 </div>
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index e56ab90ca..8bf02780e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -241,10 +241,9 @@ export const AbgabeStudentDetail = {
 				<p> {{projektarbeit?.titel}}</p>
 			</div>
 			
-<!--			 TODO: arrange this properly in mobile view, left col is a bit tight and all-->
-			<Accordion ref="accordion" :multiple="true" :activeIndex="[0]">
+			<Accordion :multiple="true" :activeIndex="[0]">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :header="getAccTabHeaderForTermin(termin)" style="padding: 0px;" :pt="tabPassthroughStyle">
+					<AccordionTab :header="getAccTabHeaderForTermin(termin)" style="padding: 0px;">
 							
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 313029852..b41a81e5a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -205,21 +205,23 @@ export const AbgabetoolMitarbeiter = {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
 				pa.isCurrent = res.data[1]
-				pa.abgabetermine.push({ // new abgatermin row
-
-					'paabgabe_id': -1,
-					'projektarbeit_id': pa.projektarbeit_id,
-					'fixtermin': false,
-					'kurzbz': '',
-					'datum': new Date().toISOString().split('T')[0],
-					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-					'upload_allowed': false,
-					'paabgabetyp_kurzbz': '',
-					'bezeichnung': '',
-					'abgabedatum': null,
-					'insertvon': this.viewData?.uid ?? ''
-					
-				})
+				
+				// pa.abgabetermine.push({ // new abgatermin row
+				//
+				// 	'paabgabe_id': -1,
+				// 	'projektarbeit_id': pa.projektarbeit_id,
+				// 	'fixtermin': false,
+				// 	'kurzbz': '',
+				// 	'datum': new Date().toISOString().split('T')[0],
+				// 	'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+				// 	'upload_allowed': false,
+				// 	'paabgabetyp_kurzbz': '',
+				// 	'bezeichnung': '',
+				// 	'abgabedatum': null,
+				// 	'insertvon': this.viewData?.uid ?? ''
+				//	
+				// })
+				
 				pa.abgabetermine.forEach(termin => {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
@@ -237,8 +239,6 @@ export const AbgabetoolMitarbeiter = {
 				this.selectedProjektarbeit = pa
 				
 				this.$refs.modalContainerAbgabeDetail.show()
-				// this.$refs.verticalsplitthis.$refs.verticalsplit.showBoth()
-				
 			
 			})
 		},
@@ -459,54 +459,43 @@ export const AbgabetoolMitarbeiter = {
 		<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
 		<div style="max-height:40vw;"> 
 		
-<!--			<vertical-split ref="verticalsplit">		-->
-<!--				-->
-<!--				<template #top>-->
-					<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-					<hr>
-					<core-filter-cmpt
-						:title="''"  
-						@uuidDefined="handleUuidDefined"
-						ref="abgabeTable"
-						:newBtnShow="true"
-						:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
-						:newBtnDisabled="!selectedData.length"
-						@click:new=openAddSeriesModal
-						:tabulator-options="abgabeTableOptions"  
-						:tabulator-events="abgabeTableEventHandlers"
-						tableOnly
-						:sideMenu="false"
-						:useSelectionSpan="false"
-					>
-						<template #actions>
-							<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
-								<i v-show="!showAll" class="fa fa-eye"></i>
-								<i v-show="showAll" class="fa fa-eye-slash"></i>
-								{{ $p.t('abgabetool/showAll') }}
-							</button>
-							
-							<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
-								<i class="fa fa-hourglass-end"></i>
-								{{ $p.t('abgabetool/showDeadlines') }}
-							</button>
-							
-							<div v-show="saving">
-								{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-							</div>
-							<div v-show="loading">
-								{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-							</div>
-							
-						</template>
-					</core-filter-cmpt>
-	
-<!--				</template>-->
-<!--				<template #bottom>-->
-<!--					<div v-show="selectedProjektarbeit" ref="selProj"> -->
-<!--						<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>-->
-<!--					</div>-->
-<!--				</template>-->
-<!--			</vertical-split>-->
+			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<hr>
+			<core-filter-cmpt
+				:title="''"  
+				@uuidDefined="handleUuidDefined"
+				ref="abgabeTable"
+				:newBtnShow="true"
+				:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
+				:newBtnDisabled="!selectedData.length"
+				@click:new=openAddSeriesModal
+				:tabulator-options="abgabeTableOptions"  
+				:tabulator-events="abgabeTableEventHandlers"
+				tableOnly
+				:sideMenu="false"
+				:useSelectionSpan="false"
+			>
+				<template #actions>
+					<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
+						<i v-show="!showAll" class="fa fa-eye"></i>
+						<i v-show="showAll" class="fa fa-eye-slash"></i>
+						{{ $p.t('abgabetool/showAll') }}
+					</button>
+					
+					<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
+						<i class="fa fa-hourglass-end"></i>
+						{{ $p.t('abgabetool/showDeadlines') }}
+					</button>
+					
+					<div v-show="saving">
+						{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+					</div>
+					<div v-show="loading">
+						{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+					</div>
+					
+				</template>
+			</core-filter-cmpt>
 		
 		</div>
     `,
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e46f46579..089a1af43 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,4 +1,3 @@
-import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeStudentDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
@@ -7,8 +6,9 @@ import BsModal from "../../Bootstrap/Modal.js";
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
+		Accordion: primevue.accordion,
+		AccordionTab: primevue.accordiontab,
 		BsModal,
-		CoreFilterCmpt,
 		AbgabeDetail,
 		VerticalSplit
 	},
@@ -34,117 +34,113 @@ export const AbgabetoolStudent = {
 	data() {
 		return {
 			notenOptions: null,
-			tabulatorUuid: Vue.ref(0),
 			domain: '',
 			student_uid: null,
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null,
-			tableBuiltResolve: null,
-			tableBuiltPromise: null,
-			dataProcessedPromise: null,
-			dataProcessedResolve: null,
-			abgabeTableOptions: {
-				minHeight: 250,
-				index: 'projektarbeit_id',
-				layout: 'fitColumns',
-				responsiveLayout: "collapse",
-				placeholder: this.$p.t('global/noDataAvailable'),
-				columns: [
-					{
-						formatter:"responsiveCollapse",
-						width:30, minWidth:30, hozAlign:"center", resizable:false, headerSort:false
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details',
-						formatter: this.detailFormatter,
-						widthGrow: 1, tooltip: false
-						, responsive: 0, minWidth: 80
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung',
-						formatter: this.beurteilungFormatter,
-						widthGrow: 1, tooltip: false
-						, responsive: 0, minWidth: 80
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem',
-						formatter: this.centeredTextFormatter,
-						widthGrow: 1
-						, responsive: 5, minWidth: 120
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg',
-						formatter: this.centeredTextFormatter,
-						widthGrow: 1
-						, responsive: 6, minWidth: 120
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail',
-						formatter: this.mailFormatter,
-						widthGrow: 1
-						, responsive: 0, minWidth: 80
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer',
-						formatter: this.centeredTextFormatter,
-						widthGrow: 2
-						, responsive: 7, minWidth: 300
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ',
-						formatter: this.centeredTextFormatter,
-						widthGrow: 1
-						, responsive: 8, minWidth: 200
-					},
-					{
-						title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', 
-						formatter: this.centeredTextFormatter,
-						widthGrow: 8
-						, responsive: 1, minWidth: 420
-					}
-				],
-				persistence: false,
-			},
-			abgabeTableEventHandlers: [
-			{
-				event: "tableBuilt",
-				handler: async () => {
-					this.tableBuiltResolve()
-				}
-			},
-			{
-				event: "dataProcessed",
-				handler: async () => {
-					console.log('dataProcessed event')
-					this.dataProcessedResolve()
-				}
-			},
-			{
-				event: "cellClick",
-				handler: async (e, cell) => {
-					
-					if(cell.getColumn().getField() === "details") {
-						const val = cell.getValue()
-						
-						if(val.mode === 'detailTermine') {
-							this.setDetailComponent(cell.getValue())
-						} else if (val.mode === 'beurteilungDownload') {
-							const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-							// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-							window.open(pdfExportLink, '_blank')
-						}
-
-					} else if (cell.getColumn().getField() === "beurteilung") {
-						const val = cell.getValue()
-						
-						if(val != '-') window.open(val, '_blank')
-					} 
-					e.stopPropagation()
-
-				}
-			}
-			]};
+			// abgabeTableOptions: {
+			// 	minHeight: 250,
+			// 	index: 'projektarbeit_id',
+			// 	layout: 'fitColumns',
+			// 	responsiveLayout: "collapse",
+			// 	placeholder: this.$p.t('global/noDataAvailable'),
+			// 	columns: [
+			// 		{
+			// 			formatter:"responsiveCollapse",
+			// 			width:30, minWidth:30, hozAlign:"center", resizable:false, headerSort:false
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details',
+			// 			formatter: this.detailFormatter,
+			// 			widthGrow: 1, tooltip: false
+			// 			, responsive: 0, minWidth: 80
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung',
+			// 			formatter: this.beurteilungFormatter,
+			// 			widthGrow: 1, tooltip: false
+			// 			, responsive: 0, minWidth: 80
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem',
+			// 			formatter: this.centeredTextFormatter,
+			// 			widthGrow: 1
+			// 			, responsive: 5, minWidth: 120
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg',
+			// 			formatter: this.centeredTextFormatter,
+			// 			widthGrow: 1
+			// 			, responsive: 6, minWidth: 120
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail',
+			// 			formatter: this.mailFormatter,
+			// 			widthGrow: 1
+			// 			, responsive: 0, minWidth: 80
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer',
+			// 			formatter: this.centeredTextFormatter,
+			// 			widthGrow: 2
+			// 			, responsive: 7, minWidth: 300
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ',
+			// 			formatter: this.centeredTextFormatter,
+			// 			widthGrow: 1
+			// 			, responsive: 8, minWidth: 200
+			// 		},
+			// 		{
+			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', 
+			// 			formatter: this.centeredTextFormatter,
+			// 			widthGrow: 8
+			// 			, responsive: 1, minWidth: 420
+			// 		}
+			// 	],
+			// 	persistence: false,
+			// },
+			// abgabeTableEventHandlers: [
+			// {
+			// 	event: "tableBuilt",
+			// 	handler: async () => {
+			// 		this.tableBuiltResolve()
+			// 	}
+			// },
+			// {
+			// 	event: "dataProcessed",
+			// 	handler: async () => {
+			// 		console.log('dataProcessed event')
+			// 		this.dataProcessedResolve()
+			// 	}
+			// },
+			// {
+			// 	event: "cellClick",
+			// 	handler: async (e, cell) => {
+			//		
+			// 		if(cell.getColumn().getField() === "details") {
+			// 			const val = cell.getValue()
+			//			
+			// 			if(val.mode === 'detailTermine') {
+			// 				this.setDetailComponent(cell.getValue())
+			// 			} else if (val.mode === 'beurteilungDownload') {
+			// 				const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+			// 				// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+			// 				window.open(pdfExportLink, '_blank')
+			// 			}
+			//
+			// 		} else if (cell.getColumn().getField() === "beurteilung") {
+			// 			const val = cell.getValue()
+			//			
+			// 			if(val != '-') window.open(val, '_blank')
+			// 		} 
+			// 		e.stopPropagation()
+			//
+			// 	}
+			// }
+			// ]
+		};
 	},
 	methods: {
 		checkQualityGates(termine) {
@@ -195,7 +191,6 @@ export const AbgabetoolStudent = {
 				// this.$refs.verticalsplit.showBoth()
 				
 			})
-			
 		},
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
@@ -226,13 +221,6 @@ export const AbgabetoolStudent = {
 					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
 			} else return '-'
 		},
-		tableResolve(resolve) {
-			this.tableBuiltResolve = resolve
-		},
-		dataResolve(resolve) {
-			console.log('dataResolve')
-			this.dataProcessedResolve = resolve
-		},
 		buildMailToLink(projekt) {
 			if(projekt.mitarbeiter_uid) { // standard
 				return 'mailto:' + projekt.mitarbeiter_uid +'@'+ this.domain
@@ -244,10 +232,10 @@ export const AbgabetoolStudent = {
 			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		async setupData(data){
-			this.projektarbeiten = data[0]
+			// this.projektarbeiten = data[0]
 			this.domain = data[1]
 			this.student_uid = data[2]
-			const d = data[0]?.map(projekt => {
+			this.projektarbeiten = data[0]?.map(projekt => {
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
@@ -257,6 +245,7 @@ export const AbgabetoolStudent = {
 				}
 				
 				return {
+					...projekt,
 					details: {
 						student_uid: this.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
@@ -273,23 +262,6 @@ export const AbgabetoolStudent = {
 					titel: projekt.titel
 				}
 			})
-
-			// this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-			this.$refs.abgabeTable.tabulator.setData(d);
-			await this.dataProcessedPromise
-
-
-			// TODO: proper event handling cleanup
-			
-			// todo in general fix this nasty race condition
-			const t = this.$refs.abgabeTable.tabulator;
-			t.on("renderComplete", () => {
-				// only if container width is small enough to trigger collapse
-				if (t.element.offsetWidth < 600 || this.isMobile) {
-					t.setColumns(t.getColumnDefinitions());
-					t.redraw(true)
-				}
-			});
 			
 		},
 		loadProjektarbeiten() {
@@ -306,33 +278,15 @@ export const AbgabetoolStudent = {
 					})
 			})	
 		},
-		handleUuidDefined(uuid) {
-			this.tabulatorUuid = uuid
-		},
-		calcMaxTableHeight() {
-			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
-			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
-			if(!tableDataSet) return
-			const rect = tableDataSet.getBoundingClientRect();
-
-			this.abgabeTableOptions.height = window.visualViewport.height - rect.top - 100
-			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
-		},
 		async setupMounted() {
-			this.tableBuiltPromise = new Promise(this.tableResolve)
-			this.dataProcessedPromise = new Promise(this.dataResolve)
-			await this.tableBuiltPromise
-			// this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.loadProjektarbeiten()
-			
-
-			// window.addEventListener("resize", this.redrawHandler);
-			// this.$refs.verticalsplit.collapseBottom()
 		},
-		redrawHandler() {
-			console.log('redrawHandler')
-			this.$refs.abgabeTable?.tabulator.setColumns(this.$refs.abgabeTable?.tabulator.getColumnDefinitions())
-			this.$refs.abgabeTable?.tabulator.redraw(true)
+		getAccTabHeaderForProjektarbeit(projektarbeit) {
+			let title = ''
+			
+			title += projektarbeit.titel
+			
+			return title
 		}
 	},
 	watch: {
@@ -355,9 +309,6 @@ export const AbgabetoolStudent = {
 	mounted() {
 		this.setupMounted()
 	},
-	unmounted() {
-		// window.removeEventListener("resize", this.redrawHandler);
-	},
 	template: `
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
@@ -375,16 +326,66 @@ export const AbgabetoolStudent = {
 	
 	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 	<hr>
-		
-	 <core-filter-cmpt
-		@uuidDefined="handleUuidDefined"
-		:title="''"  
-		ref="abgabeTable" 
-		:tabulator-options="abgabeTableOptions"  
-		:tabulator-events="abgabeTableEventHandlers"
-		tableOnly
-		:sideMenu="false"
-	 />
+	
+	<div v-if="projektarbeiten === null || projektarbeiten === []">
+		Keine Projektarbeiten gefunden!
+	</div>
+	
+	<Accordion :multiple="true" :activeIndex="[0]">
+		<template v-for="projektarbeit in projektarbeiten">
+			<AccordionTab :header="getAccTabHeaderForProjektarbeit(projektarbeit)" style="padding: 0px;">
+					
+				<div class="row">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4details')}}</div>
+					<div class="col-8 col-md-9">
+						<button @click="setDetailComponent(projektarbeit.details)" class="btn btn-primary">
+							Projektdetails öffnen <a><i class="fa fa-folder-open"></i></a>
+						</button>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4beurteilung')}}</div>
+					<div class="col-8 col-md-9">
+						<a v-if="projektarbeit.beurteilung"><i class="fa fa-file-pdf" style="color:#00649C"></i></a>
+						<a v-else>Keine Beurteilung vorhanden</a>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4sem')}}</div>
+					<div class="col-8 col-md-9">
+						{{ projektarbeit.sem }}
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4stg')}}</div>
+					<div class="col-8 col-md-9">
+						<div class="col-1 d-flex justify-content-start align-items-start">
+							{{ projektarbeit.stg }}
+						</div>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4betreuer')}}</div>
+					<div class="col-8 col-md-9">
+						{{ projektarbeit.betreuer }}
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4projekttyp')}}</div>
+					<div class="col-8 col-md-9">
+						{{ projektarbeit.projekttypbezeichnung }}					
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4titel')}}</div>
+					<div class="col-8 col-md-9">
+						{{ projektarbeit.titel }}	
+					</div>
+				</div>
+			</AccordionTab>
+		</template>
+	</Accordion>
+	
     `,
 };
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 19cf6469f..46df5493e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42376,6 +42376,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notizQualGate',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Notizen Quality Gate",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Notes Quality Gate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 4099d91a1bb9d331d6acfc9b25179dc74dca6935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 5 Sep 2025 12:45:39 +0200
Subject: [PATCH 0733/1357] Vertragsverwaltung - Filter korrigiert fuer aktive
 und inaktive Mitarbeiter

---
 .../components/filters/Vertragsverwaltung.php |  51 +++----
 application/config/navigation.php             |  11 ++
 .../components/Vertraege/MitarbeiterHeader.js |  46 ++-----
 public/js/components/Vertraege/Vertraege.js   |  34 ++---
 .../Vertraege/Vertragsverwaltung.js           |  56 ++++----
 system/filtersupdate.php                      | 126 ++++++++++--------
 6 files changed, 157 insertions(+), 167 deletions(-)

diff --git a/application/components/filters/Vertragsverwaltung.php b/application/components/filters/Vertragsverwaltung.php
index d759f9563..b96aee8ea 100644
--- a/application/components/filters/Vertragsverwaltung.php
+++ b/application/components/filters/Vertragsverwaltung.php
@@ -4,50 +4,33 @@ $filterCmptArray = array(
 	'datasetName' => 'vertragsverwaltung',
 	'query' =>  '
 		SELECT
-		  *
-		FROM
-		  (
-			SELECT
-			b.uid , p.person_id,
-			p.vorname, p.nachname,
+			uid,
+			person_id,
+			vorname,
+			nachname,
 			gebdatum,
-			COALESCE(b.alias, b.uid) AS email,
-			STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
-			STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
-			STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				CASE
-				WHEN b.aktiv = true THEN \'aktiv\'
-				END AS "aktiv_status",
-			    b.aktiv
-			FROM
-				hr.tbl_dienstverhaeltnis d
-			JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-			JOIN public.tbl_person p ON p.person_id = b.person_id
-			JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-			JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			WHERE b.aktiv = true
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias, b.aktiv
-
-			UNION ALL
-
+			vertragsarten,
+			unternehmen,
+			ids,
+			aktiv
+		FROM
+			(
 			SELECT
 				b.uid , p.person_id,
 				p.vorname, p.nachname,
 				gebdatum,
-				COALESCE(b.alias, b.uid) AS email,
 				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
 				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
 				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				\'all\' AS "aktiv_status",
 				b.aktiv
 			FROM
 				hr.tbl_dienstverhaeltnis d
-			JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-			JOIN public.tbl_person p ON p.person_id = b.person_id
-			JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-			JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias
-			ORDER BY nachname, vorname) a
+				JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+				JOIN public.tbl_person p ON p.person_id = b.person_id
+				JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+				JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.aktiv
+			) as vertragsdaten
 		',
 	'requiredPermissions' => 'vertrag/mitarbeiter'
-	);
\ No newline at end of file
+	);
diff --git a/application/config/navigation.php b/application/config/navigation.php
index 752a70464..b4b0aa51c 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -334,3 +334,14 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 	),
 
 );
+
+$config['navigation_menu']['vertragsverwaltung/*'] = array(
+	'vertragsverwaltung' => array(
+		'link' => site_url('vertragsverwaltung'),
+		'description' => 'Vertragsverwaltung',
+		'icon' => 'home',
+		'sort' => 100,
+		'target' => '_blank',
+		'requiredPermissions' => array('vertrag/mitarbeiter:r')
+	)
+);
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 52fb244c3..31f9fe96d 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -61,24 +61,9 @@ export default {
 					{title: "Unternehmen", field: "unternehmen", visible: false, headerFilter: "input"},
 					{title: "Vertragsarten", field: "vertragsarten", visible: true, headerFilter: "input"},
 					{title: "Ids Dienstverträge", field: "ids", visible: true, headerFilter: "input"},
-					{
-						title: "email", field: "email", headerFilter: "input",
-						visible: false,
-						formatter: (cell, formatterParams, onRendered) => {
-
-							let email = cell.getValue() + '@';
-
-							let container = document.createElement('div');
-							container.className = "d-flex";
-							container.append(email);
-							container.append(cell.getData().emailDomain);
-							return container;
-						},
-					},
-					{title: "Filter aktiv/all", field: "aktiv_status", visible:false, headerFilter: "input"}
 				],
 				layout: 'fitColumns',
-				persistenceID: 'core-mitarbeiter_20250901',
+				persistenceID: 'core-mitarbeiter_20250901-2',
 				footerElement: '<div>&sum; <span id="search_count"></span> / <span id="total_count"></span></div>',
 				selectableRangeMode: 'click',
 				selectable: true,
@@ -91,9 +76,7 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-
 						await this.$p.loadCategory(['person', 'global', 'vertrag']);
-
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('uid').component.updateDefinition({
@@ -144,11 +127,6 @@ export default {
 					handler: (data) => {
 						let el = document.getElementById("total_count");
 						el.innerHTML = data.length;
-
-						this.tabulatorData = data.map(item => {
-							item.emailDomain = document.createElement('div');
-							return item;
-						});
 					}
 				},
 			],
@@ -158,17 +136,19 @@ export default {
 	},
 	methods: {
 		rowSelectionChanged(data) {
-			this.selectedPerson = data[0].person_id;
-			this.selectedUid = data[0].uid;
+				if(typeof data[0] != 'undefined')
+				{
+					this.selectedPerson = data[0].person_id;
+					this.selectedUid = data[0].uid;
 
-			this.$emit('selectionChanged', {
-				person_id: this.selectedPerson,
-				uid: this.selectedUid
-			});
+					this.$emit('selectionChanged', {
+						person_id: this.selectedPerson,
+						uid: this.selectedUid
+					});
+				}
 		},
 	},
 	template: `
-		
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -177,11 +157,5 @@ export default {
 			:side-menu="false"
 			>
 		</core-filter-cmpt>
-
-		<Teleport v-for="data in tabulatorData" :key="data.uid" :to="data.emailDomain">
-			{{domain}}
-		</Teleport>
-
 `
 }
-
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index d075ddd62..2b9531a07 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -56,9 +56,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 150},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300},
 					{
-						title: "Betrag", field: "betrag", width: 150,
+						title: "Betrag", field: "betrag", width: 100,
 						formatter: function (cell) {
 							let value = cell.getValue();
 
@@ -69,7 +69,7 @@ export default {
 						}
 					},
 					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
-					{title: "Status", field: "status"},
+					{title: "Status", field: "status", width: 100},
 					{
 						title: "Vertragsdatum",
 						field: "vertragsdatum",
@@ -137,9 +137,10 @@ export default {
 				persistence: {
 					sort: true,
 					page: true,
+					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts'
+				persistenceID: 'core-contracts-20250905'
 			},
 			tabulatorEvents: [
 				{
@@ -522,10 +523,10 @@ export default {
 	},
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
-	
+
 		<!--	injected print functionality for KU Linz (printHonorarvertrag)  -->
 	   <template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
-		 
+
 		   <div v-for="item in arraySelectedContracts" :key="item[0]">
 			  <input
 				class="form-control"
@@ -536,7 +537,7 @@ export default {
 			  >
 			</div>
 		</template>
-		
+
 		<template v-if="arraySelectedContracts.length >= 2" class="d-flex">
 			<div class="ms-auto mt-2">
 				<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
@@ -544,8 +545,8 @@ export default {
 			</div>
 		</template>
 
-	<hr> 
-		
+	<hr>
+
 <!--	filter: open means no status abgerechnet yet-->
 		<div class="justify-content-end pb-3">
 			<form-input
@@ -557,7 +558,7 @@ export default {
 				>
 			</form-input>
 		</div>
-		
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -570,7 +571,7 @@ export default {
 			@click:new="actionNewContract"
 			>
 		</core-filter-cmpt>
-		
+
 		<div class="row">
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
@@ -587,7 +588,7 @@ export default {
 			</div>
 			<div class="col-sm-6">
 				<!-- ContractStati -->
-				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">      
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">
 					<contract-stati
 						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"
@@ -603,14 +604,14 @@ export default {
 				</div>
 			</div>
 		</div>
-		
+
 		<!--Modal: contractModal-->
 			<bs-modal ref="contractModal" dialog-class="modal-xl">
 				<template #title>
 					<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('vertrag', 'addVertrag')}}</p>
 					<p v-else class="fw-bold mt-3">{{$p.t('vertrag', 'editVertrag')}}</p>
 				</template>
-				
+
 					<list-unassigned
 						:person_id="person_id"
 						:endpoint="endpoint"
@@ -634,7 +635,7 @@ export default {
 								>
 							</form-input>
 						</div>
-						
+
 						<div class="row mb-3">
 							<form-input
 								type="text"
@@ -699,7 +700,7 @@ export default {
 							</form-input>
 						</div>
 					</core-form>
-				
+
 				<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
 					<button type="button" class="btn btn-primary" :disabled="!this.hasSchreibrechte" @click="statusNew ? addNewContract() : updateContract(formData.vertrag_id)">{{$p.t('vertrag', 'vertragErstellen')}}</button>
@@ -708,4 +709,3 @@ export default {
 
 	</div>`
 }
-
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 90a833400..a0409190d 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -45,33 +45,33 @@ export default {
 		<!-- Navigation component -->
 		<core-navigation-cmpt/>
 
-		<div class="vv">
-				<vertical-split ref="vsplit">
-					<template #top>	
-						<div class="d-flex flex-column" style="height: 100%;">
-							<mitarbeiter-header
-								:endpoint="endpoint"
-								:domain="config.domain"
-								@selectionChanged="handleSelection"
-								/>
-						</div>
-					</template>
-					<template #bottom>
-						<div class="col" v-if="person_id!=null">
-							<fhc-header
-								:person_id="person_id"
-								:mitarbeiter_uid="this.mitarbeiter_uid"
-								typeHeader="mitarbeiter"
-								@redirectToLeitung="redirectToLeitung"
-							></fhc-header>
-							<vertraege-mitarbeiter
-								:endpoint="endpoint"
-								:person_id="this.person_id"
-								:mitarbeiter_uid="this.mitarbeiter_uid"
-								/>
-						</div>
-					</template>
-				</vertical-split>
+		<div id="content">
+			<vertical-split ref="vsplit">
+				<template #top>
+					<div class="d-flex flex-column" style="height: 100%;">
+						<mitarbeiter-header
+							:endpoint="endpoint"
+							:domain="config.domain"
+							@selectionChanged="handleSelection"
+							/>
+					</div>
+				</template>
+				<template #bottom>
+					<div class="col" v-if="person_id!=null">
+						<fhc-header
+							:person_id="person_id"
+							:mitarbeiter_uid="this.mitarbeiter_uid"
+							typeHeader="mitarbeiter"
+							@redirectToLeitung="redirectToLeitung"
+						></fhc-header>
+						<vertraege-mitarbeiter
+							:endpoint="endpoint"
+							:person_id="this.person_id"
+							:mitarbeiter_uid="this.mitarbeiter_uid"
+							/>
+					</div>
+				</template>
+			</vertical-split>
 		</div>
 		`
-}
\ No newline at end of file
+}
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index a865a0cd7..483f0aa77 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1395,14 +1395,14 @@ $filters = array(
 						{"name": "PersonId"},
 						{"name": "Vorname"},
 						{"name": "Nachname"},
-						{"name": "EMail"}, 
-						{"name": "Unternehmen"}, 
-						{"name": "Vertragsart"}, 
-						{"name": "DV_von"}, 
-						{"name": "DV_bis"}, 
-						{"name": "Wochenstunden"}, 
-						{"name": "WS_von"}, 
-						{"name": "WS_bis"}, 
+						{"name": "EMail"},
+						{"name": "Unternehmen"},
+						{"name": "Vertragsart"},
+						{"name": "DV_von"},
+						{"name": "DV_bis"},
+						{"name": "Wochenstunden"},
+						{"name": "WS_von"},
+						{"name": "WS_bis"},
 						{"name": "Standardkostenstelle"},
 						{"name": "DV_status"}
 					],
@@ -1433,14 +1433,14 @@ $filters = array(
 						{"name": "PersonId"},
 						{"name": "Vorname"},
 						{"name": "Nachname"},
-						{"name": "EMail"}, 
-						{"name": "Unternehmen"}, 
-						{"name": "Vertragsart"}, 
-						{"name": "DV_von"}, 
-						{"name": "DV_bis"}, 
-						{"name": "Wochenstunden"}, 
-						{"name": "WS_von"}, 
-						{"name": "WS_bis"}, 
+						{"name": "EMail"},
+						{"name": "Unternehmen"},
+						{"name": "Vertragsart"},
+						{"name": "DV_von"},
+						{"name": "DV_bis"},
+						{"name": "Wochenstunden"},
+						{"name": "WS_von"},
+						{"name": "WS_bis"},
 						{"name": "Standardkostenstelle"},
 						{"name": "DV_status"}
 					],
@@ -1471,14 +1471,14 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "EMail"}, 
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
-					{"name": "Wochenstunden"}, 
-					{"name": "WS_von"}, 
-					{"name": "WS_bis"}, 
+					{"name": "EMail"},
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
+					{"name": "Wochenstunden"},
+					{"name": "WS_von"},
+					{"name": "WS_bis"},
 					{"name": "Standardkostenstelle"},
 					{"name": "DV_status"}
 				],
@@ -1509,14 +1509,14 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "EMail"}, 
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
-					{"name": "Wochenstunden"}, 
-					{"name": "WS_von"}, 
-					{"name": "WS_bis"}, 
+					{"name": "EMail"},
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
+					{"name": "Wochenstunden"},
+					{"name": "WS_von"},
+					{"name": "WS_bis"},
 					{"name": "Standardkostenstelle"},
 					{"name": "DV_status"}
 				],
@@ -1547,10 +1547,10 @@ $filters = array(
 					{"name": "PersonId"},
 					{"name": "Vorname"},
 					{"name": "Nachname"},
-					{"name": "Unternehmen"}, 
-					{"name": "Vertragsart"}, 
-					{"name": "DV_von"}, 
-					{"name": "DV_bis"}, 
+					{"name": "Unternehmen"},
+					{"name": "Vertragsart"},
+					{"name": "DV_von"},
+					{"name": "DV_bis"},
 					{"name": "Disziplinaere_Zuordnung"},
 					{"name": "DV_status"}
 				],
@@ -1561,38 +1561,60 @@ $filters = array(
 	array(
 		'app' => 'core',
 		'dataset_name' => 'vertragsverwaltung',
-		'filter_kurzbz' => 'Vertragsverwaltung',
-		'description' => '{Vertragsverwaltung}',
+		'filter_kurzbz' => 'VertragsverwaltungAktiv',
+		'description' => '{Aktive Mitarbeiter}',
 		'sort' => 1,
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "MA Vertragsverwaltung (aktiv/all)",
+				"name": "Aktive Mitarbeiter",
 				"columns": [
-					{"name": "UID"},
-					{"name": "PersonId"},
-					{"name": "Nachname"},
-					{"name": "Vorname"},
+					{"name": "uid"},
+					{"name": "person_id"},
+					{"name": "nachname"},
+					{"name": "vorname"},
 					{"name": "aktiv"},
-					{"name": "Geburtsdatum"},
-					{"name": "Unternehmen"},
-					{"name": "Firma"},
-					{"name": "Vertragsarten"},
-					{"name": "IDs Dienstverhältnis"},
-					{"name": "email"},
-					{"name": "aktiv_status"}
+					{"name": "gebdatum"},
+					{"name": "unternehmen"},
+					{"name": "vertragsarten"},
+					{"name": "ids"}
 				],
 				"filters": [
 					{
-						"name": "aktiv_status",
+						"name": "aktiv",
 						"option": "",
 						"operation": "equal",
-						"condition": "aktiv"
+						"condition": "true"
 					}
 					]
 			}',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'vertragsverwaltung',
+		'filter_kurzbz' => 'VertragsverwaltungAlle',
+		'description' => '{Alle Mitarbeiter}',
+		'sort' => 1,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "Alle Mitarbeiter",
+				"columns": [
+					{"name": "uid"},
+					{"name": "person_id"},
+					{"name": "nachname"},
+					{"name": "vorname"},
+					{"name": "aktiv"},
+					{"name": "gebdatum"},
+					{"name": "unternehmen"},
+					{"name": "vertragsarten"},
+					{"name": "ids"}
+				],
+				"filters": []
+			}',
+		'oe_kurzbz' => null,
+	),
 );
 
 // Loop through the filters array

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

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

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

From 4e598a321d805f4769613fb3be5cfa2f479a78ca Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Sep 2025 10:44:41 +0200
Subject: [PATCH 0735/1357] wip add new abgabe wizard

---
 application/views/CisRouterView/CisRouterView.php    |  6 +++---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js        | 12 +-----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index b56ed482e..73ecc4797 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -27,14 +27,14 @@ $includesArray = array(
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
 		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
-		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
-		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js',
-		'vendor/olifolkerd/tabulator5/src/js/modules/ResponsiveLayout/ResponsiveLayout.js'
 	),
 
 );
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 1a480634f..569262fd2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -25,6 +25,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
+			sdModel: [],
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
@@ -323,17 +324,6 @@ export const AbgabeMitarbeiterDetail = {
 			</template>
 		</bs-modal>
 
-		<SpeedDial
-			@click="openCreateNewAbgabeModal"
-			:model="[]" 
-			direction="up"
-			type="linear"
-			showIcon="pi pi-plus"
-			hideIcon="pi pi-plus" 
-			:visible="true"
-			:style="getSpeedDialStyle"
-		/>
-
 		<div v-if="projektarbeit">
 			
 			

From 56e74fc3656c93040f8350fe47f3d099617b0b04 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Sep 2025 11:59:25 +0200
Subject: [PATCH 0736/1357] fix phrasesLib init so reference in lvMenuBuild
 event doesnt break

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

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 2a305dbb5..18f86c389 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -51,7 +51,7 @@ class LvMenu extends FHCAPI_Controller
 
 		$this->load->library("PermissionLib", null, 'PermissionLib');
 
-		$this->load->library("PhrasesLib");
+		$this->load->library("PhrasesLib", null, 'PhrasesLib');
 		$this->loadPhrases(array('global', 'lehre'));
 	}
 

From d015b208fc8191bde68370394bbe89d2617c5ce2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Sep 2025 14:35:20 +0200
Subject: [PATCH 0737/1357] dont reassign event.lektor inside computed property
 depending on event.lektor

---
 .../components/Cis/Renderer/Lehreinheit/calendarEvent.js  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index ca8d470e2..badbf537f 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -23,14 +23,6 @@ export default {
 				this.$p.t('person/ort'),
 				this.event.ort_kurzbz
 			].join(": "));
-
-			this.event.lektor = [
-				this.event.lektor[0],
-				this.event.lektor[0],
-				this.event.lektor[0],
-				this.event.lektor[0],
-				this.event.lektor[0],
-			];
 			
 			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
 				if (this.event.lektor.length > 3) {

From eee9d6b691f3c9c1939757c9d0b399f95a3e9465 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Sep 2025 17:28:09 +0200
Subject: [PATCH 0738/1357] raumsuche phrasen change & fix; fhcapi -> api;
 lvMenu try to use phrasenkey for responsiveness instead of the already looked
 up phrase; tried investigating news carousel bug, not sure if bug or feature
 - at least declared non changing variables as const;

---
 public/js/api/factory/ort.js                  | 14 ++++++
 .../Cms/Content_types/Raum_contentmittitel.js |  4 +-
 public/js/components/Cis/Mylv/LvMenu.js       |  9 +++-
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 46 +++++++++++--------
 public/js/components/DashboardWidget/News.js  | 10 ++--
 system/phrasesupdate.php                      | 46 +++++++++++++++++--
 6 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/public/js/api/factory/ort.js b/public/js/api/factory/ort.js
index 90488df1b..2e06d6b71 100644
--- a/public/js/api/factory/ort.js
+++ b/public/js/api/factory/ort.js
@@ -22,5 +22,19 @@ export default {
 			url: '/api/frontend/v1/Ort/ContentID',
 			params: { ort_kurzbz: ort_kurbz }
 		};
+	},
+	getRooms(datum, von, bis, typ, personenanzahl = 0) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getRooms',
+			params: { datum, von, bis, typ, personenanzahl }
+		};
+	},
+	getRoomTypes() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getTypes',
+			params: { }
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
index d7b9ed956..8373b6ac9 100644
--- a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -12,7 +12,7 @@ export default {
           required:true,
       },
 	  content_id:{
-		type:Number,
+		type: [Number, String],
 	  }
     },
 	methods: {
@@ -129,7 +129,7 @@ export default {
     template: /*html*/ `
       <!-- div that contains the content -->
 <!--       TODO: test with more img content from cms-->
-      <div v-if="imgContent"><img v-bind="imgContent"></img></div>
+      <div v-if="imgContent"><img v-bind="imgContent"/></div>
       <div v-html="content" v-else-if="content" ></div>
       <p v-else>Content was not found</p>
       `,
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 88340f01b..ef820ebb0 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -43,6 +43,13 @@ export default {
 				return menuItem.c4_link ?? null;
 			}
 		},
+		getMenuName(menuItem) {
+			if(menuItem.phrase) {
+				return this.$p.t(menuItem.phrase)
+			} else {
+				return menuItem.name
+			}
+		}
 	},
 	template:/*html*/`
 	<div v-if="!menu">{{$p.t('lehre','lehrveranstaltungsUnavailable')}}</div>
@@ -54,7 +61,7 @@ export default {
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
-						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
+						<p class="w-100 mt-2 mb-0">{{ getMenuName(menuItem) }}</p>
 						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</a>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 3f66a5508..f45c8c61f 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,6 +1,6 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import VueDatePicker from '../../vueDatepicker.js.php';
-
+import ApiOrt from '../../../api/factory/ort.js'
 export const Raumsuche =  {
 	name: "Raumsuche",
 	props: {
@@ -54,8 +54,8 @@ export const Raumsuche =  {
 				columns: [
 					{title: Vue.computed(() => this.$p.t('rauminfo/raum_kurzbz')), field: 'ort_kurzbz', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
-					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/raumnummer')), field: 'nummer', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/personcap')), field: 'personen', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/rauminfo')),
 						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
@@ -68,17 +68,6 @@ export const Raumsuche =  {
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
-			},
-			{
-				event: "cellClick",
-				handler: async (e, cell) => {
-
-					if((cell.column.field === 'linkInfo' || cell.column.field === 'linkRes') && cell.value){
-						window.open(cell.value, '_blank');
-						e.stopPropagation();
-					}
-					
-				}
 			}
 			]};
 	},
@@ -132,7 +121,8 @@ export const Raumsuche =  {
 			this.$refs.raumsucheTable.tabulator.setData(d);
 		},
 		loadRoomTypes() {
-			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+			this.$api.call(ApiOrt.getRoomTypes())
+				.then(res => {
 				res?.data?.forEach(type => {
 					type.beschreibung = type.beschreibung.replace('&amp;', '&')
 				})
@@ -141,7 +131,7 @@ export const Raumsuche =  {
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$api.call(ApiOrt.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl))
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -183,6 +173,18 @@ export const Raumsuche =  {
 				this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
 			}
 
+			const cols = this.$refs.raumsucheTable.tabulator.getColumns()
+
+			// phrasen race condition bandaid
+			this.raumsucheTableOptions.columns[0].title = await this.$p.t('rauminfo/raum_kurzbz')
+			this.raumsucheTableOptions.columns[1].title = await this.$p.t('global/bezeichnung')
+			this.raumsucheTableOptions.columns[2].title = await this.$p.t('rauminfo/raumnummer')
+			this.raumsucheTableOptions.columns[3].title = await this.$p.t('rauminfo/personcap')
+			this.raumsucheTableOptions.columns[4].title = await this.$p.t('rauminfo/rauminfo')
+			this.raumsucheTableOptions.columns[5].title = await this.$p.t('rauminfo/roomReservations')
+
+			this.$refs.raumsucheTable.tabulator.setColumns(cols)
+			
 		}
 	},
 	computed: {
@@ -239,7 +241,7 @@ export const Raumsuche =  {
 			</VueDatePicker>
 		</div>
 		
-		<div class="col-lg-auto">
+		<div class="col-12 col-lg-3">
 			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
 			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
 				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
@@ -248,10 +250,14 @@ export const Raumsuche =  {
 		</div>
 		
 
-		<div class="col-4 col-lg-2">
-			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
+		<div class="col-12 col-lg-3">
+			<InputNumber v-model="anzahl" 
+			:prefix="$p.t('rauminfo/minCapacity') + ': '" 
+			inputId="anzahlInput" :min="1" :max="1000" 
+			:style="{'width': '100%'}"
+			/>
 		</div>
-		<div class="col-8 col-lg-2 d-flex justify-content-center align-items-center">
+		<div class="col-12 col-lg-2">
 			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
 		</div>
 	</div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f0b6ec75a..103bc4fa1 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -106,7 +106,7 @@ export default {
 		setPrev() {
 			const thisIndex = this.allNewsList.findIndex(n=>n.news_id == this.selected.news_id)
 			const prevIndex = thisIndex ? thisIndex - 1 : this.allNewsList.length - 1
-			
+
 			this.setSelected(this.allNewsList[prevIndex])
 			this.updateNewsContentClasses();
 		},
@@ -118,14 +118,14 @@ export default {
 			return classString
 		},
 		async setSelected(news) {
-			let clickedElement = document.getElementById('card-'+news.news_id);
-			let clickedElementIndex = this.allNewsList.indexOf(news);
-			let oldElementIndex = this.allNewsList.indexOf(this.selected);
+			const clickedElement = document.getElementById('card-'+news.news_id);
+			const clickedElementIndex = this.allNewsList.indexOf(news);
+			const oldElementIndex = this.allNewsList.indexOf(this.selected);
 			
 			//if the clicked element is already active, do nothing
 			if(clickedElementIndex === oldElementIndex) return;
 			//add prev/next class to the clicked element
-			if(clickedElementIndex > oldElementIndex){
+			if(clickedElementIndex > oldElementIndex) {
 				clickedElement.classList.add('carousel-item-next');
 			}else{
 				clickedElement.classList.add('carousel-item-prev');
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 76cc70f06..8f3be1fb9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20707,18 +20707,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',
-		'phrase' => 'anzahlPersonen',
+		'phrase' => 'minCapacity',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Anzahl Person",
+				'text' => "Mindestpersonenkapazität",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Number of People",
+				'text' => "Minimum person capacity",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20744,6 +20744,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'personcap',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Personen Kapazität",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Person Capacity",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'raumnummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raumnummer",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Number",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',

From 20f936c22c3ab5f1a3647c8093114f8588abb2b1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 9 Sep 2025 09:54:33 +0200
Subject: [PATCH 0739/1357] 'emails an studierende' add phrasenkey for
 responsive translations lvmenu

---
 application/controllers/api/frontend/v1/LvMenu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 18f86c389..3954a8a62 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -452,6 +452,7 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_mailanstudierende',
 				'position'=>'100',
 				'name'=>$this->p->t('lehre', 'mail'),
+				'phrase' => 'lehre/mail',
 				'c4_icon'=>base_url('skin/images/button_feedback.png'),
 				'c4_icon2' => 'fa-regular fa-envelope',
 				'c4_link'=>$mailto,

From 14cca2b4cc6217b4b5aef5f75349ba98033957f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 9 Sep 2025 10:40:41 +0200
Subject: [PATCH 0740/1357] Problem behoben wodurch der
 Projektarbeitskarteireiter nicht geladen wurde wenn das neue Config fehlt

---
 content/student/studentprojektarbeit.js.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php
index 2005d85fc..62dbfeace 100644
--- a/content/student/studentprojektarbeit.js.php
+++ b/content/student/studentprojektarbeit.js.php
@@ -1166,13 +1166,13 @@ function StudentProjektbetreuerDetailReset()
 	if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Diplom')
 	{
 		document.getElementById('student-projektbetreuer-textbox-stunden').value=
-			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER; ?>;
+			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER; else echo '5'; ?>;
 		document.getElementById('student-projektbetreuer-menulist-betreuerart').value='Erstbegutachter';
 	}
 	else if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Bachelor')
 	{
 		document.getElementById('student-projektbetreuer-textbox-stunden').value=
-			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR; ?>;
+			<?php if (defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR') && FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR) echo FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR; else echo '4'; ?>;
 		document.getElementById('student-projektbetreuer-menulist-betreuerart').value='Begutachter';
 	}
 	else if(document.getElementById('student-projektarbeit-menulist-projekttyp').value=='Praktikum')

From 708e03bda3f8c44a0bdeca5d46fea6c340c29c2c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 9 Sep 2025 11:31:19 +0200
Subject: [PATCH 0741/1357] raumsuche phrasenpromise; lvMenu phrasenkeys; lv
 component property bezeichnung_eng so template can find it;

---
 .../controllers/api/frontend/v1/LvMenu.php    |  7 +++++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  1 +
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 19 ++++++-------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 3954a8a62..45936d9f5 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -333,6 +333,7 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_lvinfo',
 				'position'=>'10',
 				'name'=>$this->p->t('lehre', 'lehrveranstaltungsinformation'),
+				'phrase' => 'lehre/lehrveranstaltungsinformation',
 				'icon'=>'../../../skin/images/button_lvinfo.png',
 				'link'=>'',
 				'c4_icon'=> base_url('skin/images/button_lvinfo.png'),
@@ -351,6 +352,7 @@ class LvMenu extends FHCAPI_Controller
 				'id'=>'core_menu_feedback',
 				'position'=>'60',
 				'name'=>$this->p->t('lehre', 'feedback'),
+				'phrase' => 'lehre/feedback',
 				'c4_icon'=> base_url('skin/images/button_feedback.png'),
 				'c4_link'=> base_url('feedback.php?lvid='.$lvid),
 			);
@@ -368,6 +370,7 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
+					'phrase' => 'lehre/gesamtnote',
 					'c4_icon'=> base_url('skin/images/button_endnote.png'),
 					'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
 					//'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem))
@@ -380,6 +383,7 @@ class LvMenu extends FHCAPI_Controller
 					'id'=>'core_menu_gesamtnote',
 					'position'=>'80',
 					'name'=>$this->p->t('lehre', 'gesamtnote'),
+					'phrase'=>'lehre/gesamtnote',
 					'c4_icon'=>base_url('skin/images/button_endnote.png'),
 					'c4_link'=>'#',
 					'c4_linkList'=>[[$this->p->t('lehre', 'noteneingabedeaktiviert'),'#']],
@@ -477,6 +481,7 @@ class LvMenu extends FHCAPI_Controller
 						'id'=>'core_menu_abmeldung',
 						'position'=>'120',
 						'name'=>$this->p->t('lehre', 'abmelden'),
+						'phrase'=>'lehre/abmelden',
 						'c4_icon'=>base_url('skin/images/button_studiupload.png'),
 						'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)),
 					);
@@ -511,6 +516,7 @@ class LvMenu extends FHCAPI_Controller
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse',
 				'position' => '128',
 				'name' => $this->p->t('lehre', 'anrechnung'),
+				'phrase' => 'lehre/anrechnung',
 				'c4_icon' => base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid))
@@ -528,6 +534,7 @@ class LvMenu extends FHCAPI_Controller
 				'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen',
 				'position' => '128',
 				'name' => $this->p->t('lehre', 'anrechnungen'),
+				'phrase' => 'lehre/anrechnung',
 				'c4_icon'=> base_url('skin/images/button_listen.png'),
 				'c4_icon2' => 'fa-regular fa-folder-open',
 				'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem))
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 5aed3902f..3fd5e6900 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -19,6 +19,7 @@ export default {
 	props: {
 		lehrveranstaltung_id: Number,
 		bezeichnung: String,
+		bezeichnung_eng: String,
 		module: String,
 		farbe: String,
 		lvinfo: Boolean,
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index f45c8c61f..365da4911 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -13,6 +13,8 @@ export const Raumsuche =  {
 	},
 	data() {
 		return {
+			phrasenPromise: null,
+			phrasenResolved: false,
 			tabulatorUuid: Vue.ref(0),
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
@@ -157,6 +159,7 @@ export const Raumsuche =  {
 			return `${hours}:${minutes}`;
 		},
 		async setupMounted() {
+			
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
 			
@@ -172,18 +175,6 @@ export const Raumsuche =  {
 			if(this.$refs.raumsucheTable) {
 				this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
 			}
-
-			const cols = this.$refs.raumsucheTable.tabulator.getColumns()
-
-			// phrasen race condition bandaid
-			this.raumsucheTableOptions.columns[0].title = await this.$p.t('rauminfo/raum_kurzbz')
-			this.raumsucheTableOptions.columns[1].title = await this.$p.t('global/bezeichnung')
-			this.raumsucheTableOptions.columns[2].title = await this.$p.t('rauminfo/raumnummer')
-			this.raumsucheTableOptions.columns[3].title = await this.$p.t('rauminfo/personcap')
-			this.raumsucheTableOptions.columns[4].title = await this.$p.t('rauminfo/rauminfo')
-			this.raumsucheTableOptions.columns[5].title = await this.$p.t('rauminfo/roomReservations')
-
-			this.$refs.raumsucheTable.tabulator.setColumns(cols)
 			
 		}
 	},
@@ -193,7 +184,8 @@ export const Raumsuche =  {
 		}
 	},
 	created() {
-		
+		this.phrasenPromise = this.$p.loadCategory(['rauminfo', 'global'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 	},
 	mounted() {
 		this.setupMounted()
@@ -264,6 +256,7 @@ export const Raumsuche =  {
 	
 
      <core-filter-cmpt 
+     	v-if="phrasenResolved"
 		@uuidDefined="handleUuidDefined"
 		:title="''"  
 		ref="raumsucheTable" 

From 14d49d87b323c085f139c0aa50f18e21bac1cd8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 10 Sep 2025 07:51:09 +0200
Subject: [PATCH 0742/1357] also clear browser basic auth via additional
 fhclogout cookie in private/logout.php

---
 application/controllers/Cis/Auth.php |  3 ++-
 cis/private/logout.php               | 34 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 cis/private/logout.php

diff --git a/application/controllers/Cis/Auth.php b/application/controllers/Cis/Auth.php
index 59dab1568..67267ebf6 100644
--- a/application/controllers/Cis/Auth.php
+++ b/application/controllers/Cis/Auth.php
@@ -72,6 +72,7 @@ class Auth extends FHC_Controller
 	{
 		$this->load->library('AuthLib');
 		$this->authlib->logout();
-		redirect('/Cis/Auth/login', 'refresh');
+		setcookie('fhclogout', 'fhclogout', 0, '/');
+		redirect(base_url('/cis/private/logout.php'), 'refresh');
 	}
 }
diff --git a/cis/private/logout.php b/cis/private/logout.php
new file mode 100644
index 000000000..9c1cbeee6
--- /dev/null
+++ b/cis/private/logout.php
@@ -0,0 +1,34 @@
+<?php
+require_once('../../config/cis.config.inc.php');
+
+if (isset($_COOKIE['fhclogout']) && ($_COOKIE['fhclogout'] === 'fhclogout'))
+{
+	setcookie('fhclogout', '', -1, '/');
+	http_response_code(401);
+	header('WWW-Authenticate: Basic realm="' . AUTH_NAME . '"');
+	?>
+	<!doctype html>
+	<html>
+		<head>
+			<title>FH-Complete logout Basic Auth</title>
+				<meta http-equiv="refresh" content="2; url=<?php echo APP_ROOT . 'cis/'; ?>"/>
+			</head>
+		<body>
+			<script>
+				function logout()
+				{
+					console.log('FH-Complete logout Basic Auth');
+					window.location.href = '<?php echo APP_ROOT . 'cis/'; ?>';
+				}
+
+				logout();
+			</script>
+		</body>
+	</html>
+	<?php
+}
+else
+{
+	http_response_code(303);
+	header('Location:' . APP_ROOT . 'cis/');
+}
\ No newline at end of file

From b95dd49d0e66cb5d1798fe42f2d83b446ef56309 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 10 Sep 2025 10:44:43 +0200
Subject: [PATCH 0743/1357] assistenz uploaddatum -> antragsdatum; added new
 column 'fileuploaddatum';

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8f3be1fb9..2567fbba6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33818,6 +33818,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'antragsdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antragsdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Application date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'fileuploaddatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fileuploaddatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File upload date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

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

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

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

From c9425a0061162cf9fb0ba67b3d524a98d8b805c9 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 10 Sep 2025 11:20:32 +0200
Subject: [PATCH 0745/1357] 'fileuploaddatum' phrase => 'FileUpload-Datum'

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2567fbba6..a2d270010 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33846,7 +33846,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Fileuploaddatum',
+				'text' => 'FileUpload-Datum',
 				'description' => '',
 				'insertvon' => 'system'
 			),

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

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

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

From 4c3f9e42b996e0965727c3a9892794b9c8169ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 10 Sep 2025 14:29:58 +0200
Subject: [PATCH 0747/1357] =?UTF-8?q?Bankimport=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/personen/bankimport.php | 343 ++++++++++++++++++++++++++++++++
 1 file changed, 343 insertions(+)
 create mode 100644 vilesci/personen/bankimport.php

diff --git a/vilesci/personen/bankimport.php b/vilesci/personen/bankimport.php
new file mode 100644
index 000000000..dda6d029f
--- /dev/null
+++ b/vilesci/personen/bankimport.php
@@ -0,0 +1,343 @@
+<?php
+/* Copyright (C) 2025 Technikum-Wien
+ *
+ * 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:
+ */
+require_once("../../config/vilesci.config.inc.php");
+require_once("../../include/functions.inc.php");
+require_once("../../include/benutzerberechtigung.class.php");
+require_once("../../include/datum.class.php");
+require_once("../../include/studiengang.class.php");
+require_once("../../include/studiensemester.class.php");
+require_once("../../include/studienjahr.class.php");
+require_once("../../include/student.class.php");
+require_once("../../include/konto.class.php");
+require_once("../../include/bankverbindung.class.php");
+
+// Get the uid of the logged user
+$user = get_uid();
+// Check rights
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+if (!$rechte->isBerechtigt("admin", null, "suid"))
+{
+	die("Sie haben keine Berechtigung für diese Seite");
+}
+
+// Variables declaration
+$logArray = array(); // Array for output messages
+$errorOccurred = false; // Error flag
+$dataPosted = false; // Post data flag
+$fileName = null;
+$fileTmpName = null;
+$fileMimeType = null;
+
+// Constants
+$L_CSV_N_COLS = 4; // Number of columns of the CSV file
+$L_ERROR = "Error";
+$L_WARNING = "Warning";
+$L_INFO = "Info";
+$L_LN_NOT_AVAILABLE = "N/A";
+
+/**
+ * Add an entry in $logArray
+ */
+function lAddToLogArray($code, $lineNumber, $msg)
+{
+	global $logArray, $errorOccurred, $L_ERROR;
+
+	if ($code == $L_ERROR)
+	{
+		$errorOccurred = true;
+	}
+
+	$log = new stdClass();
+	$log->code = $code;
+	$log->lineNumber = $lineNumber;
+	$log->msg = $msg;
+
+	array_push($logArray, $log);
+}
+
+
+
+// If data has been posted
+if (isset($_POST["submit"]))
+{
+	$dataPosted = true;
+
+	// Checks if a file was uploaded
+	if (!$errorOccurred && (!isset($_FILES) || !is_array($_FILES) || count($_FILES) == 0))
+	{
+		lAddToLogArray($L_ERROR, $L_LN_NOT_AVAILABLE, "No files have been uploaded");
+	}
+
+	// If the file is not present or it was not correctly uploaded
+	if (!$errorOccurred && (!isset($_FILES["csvFile"]) || $_FILES["csvFile"]["error"] != 0))
+	{
+		lAddToLogArray($L_ERROR, $L_LN_NOT_AVAILABLE, "An error has occurred while uploading the CSV file");
+	}
+	else // else save file attributes
+	{
+		$fileName = $_FILES["csvFile"]["name"];
+		$fileTmpName = $_FILES["csvFile"]["tmp_name"];
+		$fileMimeType = mime_content_type($_FILES["csvFile"]["tmp_name"]);
+	}
+
+	// Checks the file mime type
+	if (!$errorOccurred && ($fileMimeType != "text/plain"))
+	{
+		lAddToLogArray($L_ERROR, $L_LN_NOT_AVAILABLE, "The mime type of the uploaded file is not of the type text/plain");
+	}
+
+	// Opens the file in read mode
+	if (!$errorOccurred && (($fileHandle = fopen($fileTmpName, "r")) === false))
+	{
+		lAddToLogArray($L_ERROR, $L_LN_NOT_AVAILABLE, "An error has occurred while opening the uploaded file on read mode");
+	}
+}
+else // else no data has been posted
+{
+	$dataPosted = false;
+}
+
+// If everything is ok and data has been posted
+if (!$errorOccurred && $dataPosted)
+{
+	$fileRow = false; // Contains a single file row
+	$lineNumber = 0; // lines number counter
+
+	// Loops on file rows
+	do
+	{
+		$lineNumber++;
+		// Gets and parses a single row of the given file
+		$fileRow = fgetcsv($fileHandle, 9999, ";", "\"");
+		// If everything is ok
+		if ($fileRow != null && $fileRow !== false)
+		{
+			// Checks if the row has the right amount of columns
+			if (is_array($fileRow) && count($fileRow) == $L_CSV_N_COLS)
+			{
+				// Checks if character encoding is UTF-8
+				if (mb_detect_encoding(implode(";", $fileRow), "UTF-8", true))
+				{
+					$rowSurname = $fileRow[0];
+					$rowName = $fileRow[1];
+					$rowPersonID = $fileRow[2];
+					$rowIBAN = $fileRow[3];
+
+					// If this row is not the header
+					if (strtolower($rowSurname) != "nachname")
+					{
+						// Bankverbindung hinterlegen
+						$bank = new bankverbindung();
+						$found = false;
+						if($bank->load_pers($rowPersonID))
+						{
+							foreach($bank->result as $row_bank)
+							{
+								if(str_replace(' ', '', $row_bank->iban) == str_replace(' ', '', $rowIBAN))
+								{
+									lAddToLogArray(
+										$L_WARNING,
+										$lineNumber,
+										"Bank IBAN already found for PersonID ".$rowPersonID
+									);
+									$found = true;
+
+									// Update Datum aktualisieren damit Update in Fremdsystem getriggert wird
+									$row_bank->new=false;
+									$row_bank->updateamum = date('Y-m-d H:i:s');
+									$row_bank->updatevon = 'Bankimport';
+									if($row_bank->save())
+									{
+										lAddToLogArray(
+											$L_INFO,
+											$lineNumber,
+											"Bank Date Update for PersonID ".$rowPersonID
+										);
+									}
+									else
+									{
+										lAddToLogArray(
+											$L_WARNING,
+											$lineNumber,
+											"Bank Date Update Failed for PersonID ".$rowPersonID
+										);
+									}
+
+									break;
+								}
+							}
+						}
+
+						if(!$found)
+						{
+							$bank = new bankverbindung();
+							$bank->new = true;
+							$bank->iban = $rowIBAN;
+							$bank->person_id = $rowPersonID;
+							//$bank->bic = $rowBIC;
+							//$bank->name = $rowBank;
+							$bank->typ = 'p';
+							$bank->verrechnung = true;
+							$bank->insertamum = date('Y-m-d H:i:s');
+							$bank->insertvon = 'Bankimport';
+							$bank->updateamum = date('Y-m-d H:i:s');
+							$bank->updatevon = 'Bankimport';
+							if($bank->save())
+							{
+								lAddToLogArray(
+									$L_INFO,
+									$lineNumber,
+									"Bankdaten hinzugefügt"
+								);
+							}
+							else
+							{
+								lAddToLogArray(
+									$L_WARNING,
+									$lineNumber,
+									"Failed to Add Bankdata".$bank->errormsg
+								);
+							}
+						}
+					}
+					else
+					{
+						lAddToLogArray($L_WARNING, $lineNumber, "This file row has been discarted because it is the header");
+					}
+				}
+				else
+				{
+					lAddToLogArray($L_WARNING, $lineNumber, "This file row has been discarted because of invalid characters");
+				}
+			}
+			else
+			{
+				lAddToLogArray(
+					$L_WARNING,
+					$lineNumber,
+					"This file row has been discarted because it isn't well formatted and/or it hasn't " . $L_CSV_N_COLS . " columns"
+				);
+			}
+		}
+		else
+		{
+			// If it is not the end of the file, another error has occurred
+			if (!feof($fileHandle))
+			{
+				lAddToLogArray($L_ERROR, $lineNumber, "An error has occurred while parsing this row, procedure terminated");
+			}
+		}
+	}
+	while($fileRow);
+
+	// Close the file handler
+	fclose($fileHandle);
+}
+
+?>
+<!DOCTYPE HTML>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
+	</head>
+	<body>
+		<h1>Bank Data Import</h1>
+		Diese Seite dient dazu Bankdaten für Studierende per CSV Import ins System zu laden.<br /> <br />
+		<form name="saveBank" method="post" enctype="multipart/form-data" action="">
+			<table border=0>
+				<tr><td valign="top">CMS-Format</td>
+					<td></td>
+					<td valign="top">
+						Zeichensatz: UTF-8<br>
+						Feldtrenner: ;<br>
+						Texttrenner: "<br>
+						Felder:<br>
+						<pre>Nachname;Vorname;PersonID;IBAN</pre>
+					</td>
+				</tr>
+				<tr>
+					<th width="30%">
+					<th width="3%">
+					<th width="67%">
+				</tr>
+				<tr>
+					<td>
+						CSV file:
+					</td>
+					<td>&nbsp;</td>
+					<td>
+						<input type="file" name="csvFile" value="" />
+					</td>
+				</tr>
+				<tr>
+					<td colspan="3">&nbsp;</td>
+				</tr>
+				<tr>
+					<td colspan="3" align="center">
+						<input type="submit" name="submit" value="Import CSV" />
+					</td>
+				</tr>
+			</table>
+		</form>
+
+		<br/>
+		<br/>
+
+		<table border=0>
+			<tr>
+				<th width="25%" align="left">Status</th>
+				<th width="25%" align="left">Record</th>
+				<th width="50%" align="left">Message</th>
+			</tr>
+			<?php
+				// Printing all the information
+				$tableRow = "
+					<tr style=\"color: %s;\">
+						<td align=\"left\">
+							%s
+						</td>
+						<td align=\"left\">
+							%s
+						</td>
+						<td align=\"left\">
+							%s
+						</td>
+					</tr>";
+
+				foreach($logArray as $log)
+				{
+					$color = "green"; // great expectations
+					if ($log->code == $L_ERROR)
+					{
+						$color = "red";
+					}
+					else if ($log->code == $L_WARNING)
+					{
+						$color = "orange";
+					}
+
+					echo sprintf($tableRow, $color, $log->code, $log->lineNumber, $log->msg);
+				}
+			?>
+		</table>
+	</body>
+</html>

From af32f65015e4681f377b23a7eb682bb3f3ede62c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 10 Sep 2025 17:10:24 +0200
Subject: [PATCH 0748/1357] store routeinfo and advanced search info in db

---
 .../controllers/api/frontend/v1/RouteInfo.php | 50 +++++++++++++++++++
 .../controllers/api/frontend/v1/Searchbar.php | 13 +++++
 public/js/api/factory/routeinfo.js            | 29 +++++++++++
 public/js/apps/Dashboard/Fhc.js               |  6 +++
 4 files changed, 98 insertions(+)
 create mode 100644 application/controllers/api/frontend/v1/RouteInfo.php
 create mode 100644 public/js/api/factory/routeinfo.js

diff --git a/application/controllers/api/frontend/v1/RouteInfo.php b/application/controllers/api/frontend/v1/RouteInfo.php
new file mode 100644
index 000000000..f9b4df7f3
--- /dev/null
+++ b/application/controllers/api/frontend/v1/RouteInfo.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Copyright (C) 2024 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/>.
+ */
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class RouteInfo extends FHCAPI_Controller
+{
+
+	public function __construct()
+	{
+		parent::__construct([
+			'info' => self::PERM_LOGGED,
+		]);
+
+		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
+	}
+
+	public function info()
+	{
+		$payload = json_decode($this->input->raw_input_stream);
+
+		if (isset($payload->app) && isset($payload->path))
+		{
+			$this->WebservicelogModel->insert(array(
+				'webservicetyp_kurzbz' => 'content',
+				'beschreibung' => $payload->app,
+				'request_data' => $payload->path,
+				'execute_user' => getAuthUID(),
+				'execute_time' => 'NOW()'
+			));
+		}
+		$this->terminateWithSuccess(true);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 363b6e534..b4c251555 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -39,6 +39,8 @@ class Searchbar extends FHCAPI_Controller
 			'searchCis' => self::PERM_LOGGED,
 			'searchStv' => self::PERM_LOGGED
 		]);
+
+		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -103,6 +105,17 @@ class Searchbar extends FHCAPI_Controller
 		// Convert to json the result from searchlib->search
 		$result = $this->searchlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 
+		$this->WebservicelogModel->insert(array(
+			'webservicetyp_kurzbz' => 'content',
+			'beschreibung' => $config['config'],
+			'request_data' => json_encode(array(
+				self::SEARCHSTR_PARAM => $this->input->post(self::SEARCHSTR_PARAM),
+				self::TYPES_PARAM => $this->input->post(self::TYPES_PARAM)
+			)),
+			'execute_user' => getAuthUID(),
+			'execute_time' => 'NOW()'
+		));
+
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->addMeta('time', $result->meta['time']);
diff --git a/public/js/api/factory/routeinfo.js b/public/js/api/factory/routeinfo.js
new file mode 100644
index 000000000..9ec2ad2a0
--- /dev/null
+++ b/public/js/api/factory/routeinfo.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/>.
+ */
+
+export default {
+	info(app, path) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/RouteInfo/info',
+			params: {
+				app: app,
+				path: path
+			}
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 473e1cf67..870d9d1d6 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -18,6 +18,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
+import ApiRouteInfo from '../../api/factory/routeinfo.js';
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -319,6 +320,7 @@ const app = Vue.createApp({
 
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
+
 app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
@@ -331,3 +333,7 @@ app.use(PluginsPhrasen);
 app.use(Theme);
 app.directive('contrast', contrast);
 app.mount('#fhccontent');
+
+router.afterEach((to, from, failure) => {
+	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
+});
\ No newline at end of file

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

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

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

From 06a41e24d6e4e5f1e9a5664c3c7b2476b033abf9 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 10 Sep 2025 17:39:32 +0200
Subject: [PATCH 0750/1357] Lehreinheit model getLesForLv method: only getting
 necessary fields to save memory

---
 application/models/education/Lehreinheit_model.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/models/education/Lehreinheit_model.php b/application/models/education/Lehreinheit_model.php
index d4bc7a22f..fadb7e113 100644
--- a/application/models/education/Lehreinheit_model.php
+++ b/application/models/education/Lehreinheit_model.php
@@ -28,6 +28,11 @@ class Lehreinheit_model extends DB_Model
 	{
 		$lehreinheiten = array();
 
+		$this->addSelect(
+			'lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, lehrform_kurzbz,
+			stundenblockung, wochenrythmus, start_kw, raumtyp, raumtypalternativ,
+			sprache, lehre, unr, lvnr, lehrfach_id, gewicht'
+		);
 		$this->addOrder('lehreinheit_id');
 		$les = $this->loadWhere(
 			array('lehrveranstaltung_id' => $lehrveranstaltung_id,

From 632e7d74e5c5dd3f772cc3e4ea01e9a611de79ca Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Sep 2025 11:25:18 +0200
Subject: [PATCH 0751/1357] add validation

---
 .../controllers/api/frontend/v1/RouteInfo.php        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/RouteInfo.php b/application/controllers/api/frontend/v1/RouteInfo.php
index f9b4df7f3..78db3ba2c 100644
--- a/application/controllers/api/frontend/v1/RouteInfo.php
+++ b/application/controllers/api/frontend/v1/RouteInfo.php
@@ -35,7 +35,7 @@ class RouteInfo extends FHCAPI_Controller
 	{
 		$payload = json_decode($this->input->raw_input_stream);
 
-		if (isset($payload->app) && isset($payload->path))
+		if (isset($payload->app) && isset($payload->path) && $this->isValidApp($payload->app) && $this->isValidPath($payload->path))
 		{
 			$this->WebservicelogModel->insert(array(
 				'webservicetyp_kurzbz' => 'content',
@@ -47,4 +47,14 @@ class RouteInfo extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess(true);
 	}
+
+	protected function isValidApp($app)
+	{
+		return preg_match("/^[A-Za-z0-9\-_]+$/", $app);
+	}
+
+	protected function isValidPath($path)
+	{
+		return preg_match("/^[\/A-Za-z0-9_.\-~?%=&;]+$/", $path);
+	}
 }

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

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

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

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

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

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

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

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

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

From 0ae0ceb5d9c6e3cb8e2e3d6a5c4c9e8c004bc699 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 11 Sep 2025 16:14:20 +0200
Subject: [PATCH 0755/1357] Bugfix: Stv Verband springt

---
 .../api/frontend/v1/stv/Verband.php            |  1 +
 .../Stv/Studentenverwaltung/Verband.js         | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 4060704de..6487b6263 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -188,6 +188,7 @@ class Verband extends FHCAPI_Controller
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
+			'stg_kz' => (int)$studiengang_kz,
 			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
 		]);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 9a34033ce..ccd555714 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -190,6 +190,24 @@ export default {
 			if (!currentNode)
 				return;
 
+			const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
+			if (currentSelectedKey) {
+				if (currentSelectedKey == currentKey)
+					return;
+				/**
+				 * Do not select a new entry if the current is a child of the new one.
+				 * This happens if a child entry of a new stg is selected and the router
+				 * tries to select the stg root entry (because subtrees do not have
+				 * routes yet)
+				 */
+				const isChild = this.findNodeByKey(
+					currentSelectedKey,
+					currentNode.children
+				);
+				if (isChild)
+					return;
+			}
+
 			for (let i = 1; i < parts.length; i++)
 			{
 				this.expandedKeys[currentNode.key] = true;

From 48f7a04d8183461eca03d59fa1042227e4e4d452 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 11 Sep 2025 16:27:24 +0200
Subject: [PATCH 0756/1357] wip abgabetool

---
 public/css/Cis4/Cis.css                       |   6 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 105 +++++++++++++-----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   6 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   2 +-
 system/phrasesupdate.php                      |  40 +++++++
 5 files changed, 129 insertions(+), 30 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index ff1b181dd..3056d36b6 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -854,4 +854,10 @@ html {
 #cis-main .modal-footer {
 	background-color: var(--fhc-secondary);
 	
+}
+
+.bordered-modal {
+	border: 1px solid rgba(0, 0, 0, 0.15);
+	border-radius: 0.5rem;
+	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 569262fd2..6fa929dec 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -30,29 +30,51 @@ export const AbgabeMitarbeiterDetail = {
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
 			speedDialItems: [{
-				label: "Create New",
-				icon: "pi pi-plus",
-				command: this.createNew
+				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
+				icon: "fa fa-plus",
+				command: this.openCreateNewAbgabeModal
+			},
+			{
+				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
+				icon: "fa fa-user-check",
+				command: this.openBenotung
+			},
+			{
+				label: Vue.computed(() => this.$p.t('abgabetool/c4plagiatcheck_link')),
+				icon: "fa fa-clipboard-check",
+				command: this.openPlagiatcheck
+			},
+			{
+				label: Vue.computed(() => this.$p.t('abgabetool/c4student_perspective')),
+				icon: "fa fa-eye",
+				command: this.openStudentPage
 			}],
 			newTermin: null
 		}
 	},
 	methods: {
-		createNew(){
-			console.log('create new')	
-		},
 		openZusatzdatenModal(termin) {
 				
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
-			
 			termin.note_pk = termin.note?.note ?? null
 			termin.betreuer_person_id = this.projektarbeit.betreuer_person_id
-			this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
+			return this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
+					
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
 					
+					const newTerminRes = {
+						...res.data
+					}
+					newTerminRes.bezeichnung = {
+						bezeichnung: termin.bezeichnung?.bezeichnung,
+						paabgabetyp_kurzbz: termin.bezeichnung?.paabgabetyp_kurzbz
+					}
+					
+					this.projektarbeit.abgabetermine.push(newTerminRes)
+					
 					// if(paabgabe_id === -1) { // new abgabe has been inserted
 					// 	termin.paabgabe_id = res?.data?.paabgabe_id
 					// 	this.projektarbeit.abgabetermine.push({ // new abgatermin row
@@ -186,21 +208,41 @@ export const AbgabeMitarbeiterDetail = {
 		openCreateNewAbgabeModal() {
 			if(!this.newTermin) {
 				this.newTermin = {
-					// 'paabgabe_id': -1,
-					// 'projektarbeit_id': this.projektarbeit.projektarbeit_id,
-					// 'fixtermin': false,
-					// 'kurzbz': '',
-					// 'datum': new Date().toISOString().split('T')[0],
-					// 'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-					// 'upload_allowed': false,
-					// 'paabgabetyp_kurzbz': '',
-					// 'bezeichnung': '',
-					// 'abgabedatum': null,
-					// 'insertvon': this.viewData?.uid ?? ''
+					'paabgabe_id': -1,
+					'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+					'fixtermin': false,
+					'kurzbz': '',
+					'datum': new Date().toISOString().split('T')[0],
+					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+					'notiz': '',
+					'upload_allowed': false,
+					'paabgabetyp_kurzbz': '',
+					'bezeichnung': '',
+					'abgabedatum': null,
+					'insertvon': this.viewData?.uid ?? ''
 				}
 			}
-			
+			console.log(this.$refs.modalContainerCreateNewAbgabe)
 			this.$refs.modalContainerCreateNewAbgabe.show()
+		},
+		async handleSaveNewAbgabe(termin) {
+			await this.saveTermin(termin)
+			
+			this.$refs.modalContainerCreateNewAbgabe.hide()
+			this.newTermin = {
+				'paabgabe_id': -1,
+				'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+				'fixtermin': false,
+				'kurzbz': '',
+				'datum': new Date().toISOString().split('T')[0],
+				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+				'notiz': '',
+				'upload_allowed': false,
+				'paabgabetyp_kurzbz': '',
+				'bezeichnung': '',
+				'abgabedatum': null,
+				'insertvon': this.viewData?.uid ?? ''
+			}
 		}
 	},
 	computed: {
@@ -230,7 +272,7 @@ export const AbgabeMitarbeiterDetail = {
 			return 'position: relative; min-height: 100vh;'
 		},
 		getSpeedDialStyle() {
-			return 'position: absolute; right: 1rem; bottom: 1rem;'
+			return 'position: static !important;'
 		}
 	},
 	created() {
@@ -240,10 +282,10 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-		<bs-modal ref="modalContainerCreateNewAbgabe" class="bootstrap-prompt" dialogClass="modal-lg">
+		<bs-modal id="innerModalNewAbgabe" ref="modalContainerCreateNewAbgabe" class="bootstrap-prompt" dialogClass="bordered-modal modal-xl" :backdrop="true">
 			<template v-slot:title>
 				<div>
-					{{ $p.t('abgabetool/c4neueAbgabe') }}
+					{{ $p.t('abgabetool/c4newAbgabetermin') }}
 				</div>
 			</template>
 			<template v-slot:default>
@@ -294,7 +336,7 @@ export const AbgabeMitarbeiterDetail = {
 							</Dropdown>
 						</div>
 					</div>
-					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin?.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
 						<div class="col-8 col-md-9">
 							<Checkbox
@@ -308,7 +350,7 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin?.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
 						</div>
 					</div>
 					<div class="row mt-2">
@@ -320,12 +362,23 @@ export const AbgabeMitarbeiterDetail = {
 				</div>
 			</template>
 			<template v-slot:footer>
-				
+				<button type="button" class="btn btn-primary" @click="handleSaveNewAbgabe(newTermin)">{{ $p.t('global/c4saveNewAbgabetermin') }}</button>
 			</template>
 		</bs-modal>
 
 		<div v-if="projektarbeit">
 			
+			<div style="position: fixed; bottom: 24px; right: 24px; z-index: 9999;">
+				<SpeedDial
+					:style="getSpeedDialStyle"
+					:model="speedDialItems" 
+					direction="up"
+					:radius="80"
+					type="linear"
+					buttonClass="p-button-rounded p-button-lg p-button-primary"
+					:tooltipOptions="{ position: 'left' }"
+				/>
+			</div>
 			
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8bf02780e..df88720e5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -17,7 +17,7 @@ export const AbgabeStudentDetail = {
 		AccordionTab: primevue.accordiontab,
 		VueDatePicker
 	},
-	inject: ['notenOptions', 'isMobile'],
+	inject: ['notenOptions', 'isMobile', 'isViewMode'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -320,10 +320,10 @@ export const AbgabeStudentDetail = {
 							<div class="col-8 col-md-9">
 								<div class="row">
 									<div class="col-4">
-										<Upload :disabled="!termin?.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+										<Upload :disabled="!termin?.allowedToUpload || isViewMode" accept=".pdf" v-model="termin.file"></Upload>
 									</div>
 									<div class="col-4">
-										<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+										<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || isViewMode">
 											{{$p.t('abgabetool/c4upload')}}
 											<i class="fa-solid fa-upload"></i>
 										</button>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 089a1af43..c4f790336 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -12,7 +12,7 @@ export const AbgabetoolStudent = {
 		AbgabeDetail,
 		VerticalSplit
 	},
-	inject: ['isMobile'],
+	inject: ['isMobile', 'isViewMode'],
 	provide() {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 46df5493e..676b8dd06 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42396,6 +42396,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4newAbgabetermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Neuen Abgabetermin erstellen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create new Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4saveNewAbgabetermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Neuen Abgabetermin speichern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save new Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From e3ccb76e9b6e3093beb3046e85a005f03d5c91e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 11 Sep 2025 18:07:39 +0200
Subject: [PATCH 0757/1357] Reverted Table Sort-fix

---
 cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
index 17498ebbf..96a00f033 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php
@@ -252,7 +252,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				headers: {
 					0: { sorter: false },
 					3: { sorter: 'shortDate',
-						dateFormat: 'dd.mm.yyyy' },
+						dateFormat: 'ddmmyyyy' },
 					4: { sorter: 'time' },
 					5: { sorter: 'time' }
 				}

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

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

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

From d9c716a62b9d732f9ccc5e4fe7f7b8331b1ce67d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 12 Sep 2025 08:37:18 +0200
Subject: [PATCH 0759/1357] convert wert from public.tbl_variable to TEXT

---
 .../api/frontend/v1/stv/Favorites.php         | 11 -------
 .../Stv/Studentenverwaltung/Verband.js        | 32 +++----------------
 system/FHComplete-3.3.sql                     |  2 +-
 system/dbupdate_3.4.php                       |  1 +
 .../63394_Variablenbeschraenkung.php          | 28 ++++++++++++++++
 system/phrasesupdate.php                      | 20 ------------
 6 files changed, 34 insertions(+), 60 deletions(-)
 create mode 100644 system/dbupdate_3.4/63394_Variablenbeschraenkung.php

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index ca8b62da6..951eb01a4 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -60,17 +60,6 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
-		$removed = [];
-		while (strlen($favorites) > 64) {
-			$favObj = json_decode($favorites);
-			if (!$favObj->list)
-				break;
-			$removed[] = array_shift($favObj->list);
-			$favorites = json_encode($favObj);
-		}
-		if ($removed)
-			$this->addMeta('removed', $removed);
-
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 9a34033ce..5281b3f0a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -112,26 +112,14 @@ export default {
 
 			return cp;
 		},
-		async filterFav() {
+		filterFav() {
 			this.favorites.on = !this.favorites.on;
 			this.$api
 				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
-				))
-				.then(result => {
-					if (result.meta?.removed) {
-						this.favorites.list = this.favorites.list
-							.filter(fav => !result.meta.removed.includes(fav));
-						const items = result.meta.removed.map(
-							rem => this.nodes.find(
-								node => node.data.link == rem
-							).label
-						).join(',\n');
-						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
-					}
-				});
+				));
 		},
-		async markFav(key) {
+		markFav(key) {
 			let index = this.favorites.list.indexOf(key.data.link + '');
 
 			if (index != -1) {
@@ -143,19 +131,7 @@ export default {
 			this.$api
 				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
-				))
-				.then(result => {
-					if (result.meta?.removed) {
-						this.favorites.list = this.favorites.list
-							.filter(fav => !result.meta.removed.includes(fav));
-						const items = "\n" + result.meta.removed.map(
-							rem => this.nodes.find(
-								node => node.data.link == rem
-							).label
-						).join(",\n");
-						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
-					}
-				});
+				));
 		},
 		unsetFavFocus(e) {
 			if (e.target.dataset?.linkFavAdd !== undefined) {
diff --git a/system/FHComplete-3.3.sql b/system/FHComplete-3.3.sql
index 170066a1e..18c9c2c3d 100644
--- a/system/FHComplete-3.3.sql
+++ b/system/FHComplete-3.3.sql
@@ -9755,7 +9755,7 @@ COMMENT ON TABLE public.tbl_tag IS 'Orders and Company Tags';
 CREATE TABLE public.tbl_variable (
     name character varying(64) NOT NULL,
     uid character varying(32) NOT NULL,
-    wert character varying(64)
+    wert text
 );
 
 
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index cf2f40ca8..39d51a829 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -77,6 +77,7 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
+require_once('dbupdate_3.4/63394_Variablenbeschraenkung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/63394_Variablenbeschraenkung.php b/system/dbupdate_3.4/63394_Variablenbeschraenkung.php
new file mode 100644
index 000000000..f6a75b5ef
--- /dev/null
+++ b/system/dbupdate_3.4/63394_Variablenbeschraenkung.php
@@ -0,0 +1,28 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Change type of wert in public.tbl_variable
+if ($result = @$db->db_query("
+	SELECT data_type
+	FROM information_schema.columns
+	WHERE table_schema = 'public'
+	AND table_name = 'tbl_variable'
+	AND column_name = 'wert';
+")) {
+	if ($db->db_num_rows($result) == 1)
+	{
+		$data_type = $db->db_fetch_row($result)[0];
+	
+		if (strtolower($data_type) != 'text')
+		{
+			$qry = "ALTER TABLE public.tbl_variable
+				ALTER COLUMN wert
+				TYPE TEXT;";
+
+			if (!$db->db_query($qry))
+				echo '<strong>public.tbl_variable '.$db->db_last_error().'</strong><br>';
+			else
+				echo 'public.tbl_variable: Change type of "wert" to TEXT<br>';
+		}
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9916907be..e417e4b7b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38360,26 +38360,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'stv',
-		'phrase' => 'warn_removed_favs',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Zu viele Favoriten! Die folgenden Einträge wurden entfernt: {items}',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Too many favorites! The following entries were removed: {items}',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From 012ae4ac62210d76696c64aab38eb0c3085b0866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 12 Sep 2025 09:39:06 +0200
Subject: [PATCH 0760/1357] =?UTF-8?q?Berufsschule=20f=C3=BCr=20Lehrlinge?=
 =?UTF-8?q?=20als=20aktivit=C3=A4t=20hinzugef=C3=BCgt=20in=20der=20Zeitauf?=
 =?UTF-8?q?zeichnung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/tools/zeitaufzeichnung.php     | 10 +++++-
 system/dbupdate_3.4.php                    |  1 +
 system/dbupdate_3.4/66982_berufsschule.php | 41 ++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 system/dbupdate_3.4/66982_berufsschule.php

diff --git a/cis/private/tools/zeitaufzeichnung.php b/cis/private/tools/zeitaufzeichnung.php
index 1ae315f7a..4dcb63b31 100644
--- a/cis/private/tools/zeitaufzeichnung.php
+++ b/cis/private/tools/zeitaufzeichnung.php
@@ -45,6 +45,7 @@ require_once('../../../include/benutzerberechtigung.class.php');
 require_once('../../../include/zeitaufzeichnung_import_csv.class.php');
 require_once('../../../include/zeitaufzeichnung_import_post.class.php');
 require_once('../../../include/vertragsbestandteil.class.php');
+require_once('../../../include/benutzerfunktion.class.php');
 
 $sprache = getSprache();
 $p=new phrasen($sprache);
@@ -112,6 +113,13 @@ else
 	$activities = array('Admin', 'FuE','FuEallg','Lehre', 'Pause', 'Arztbesuch', 'DienstreiseMT', 'Behoerde', 'Ersatzruhe', 'Weiterbildung', 'LVEntwicklung');
 }
 
+// Wenn die Funktion Lehrling zugeteilt ist, kann zusaetzlich Berufsschule als Aktivitaet gewaehlt werden
+$benutzerfunktion = new benutzerfunktion();
+if ($benutzerfunktion->benutzerfunktion_exists($user, 'lehrling', true))
+{
+	$activities[] = 'Berufsschule';
+}
+
 $activities_str = "'".implode("','", $activities)."'";
 
 // definiert bis zu welchem Datum die Eintragung nicht mehr möglich ist
@@ -690,7 +698,7 @@ echo '
 		function checkPausenblock()
 		{
 			var sel = $("#aktivitaet").val();
-			var activities = ["Admin", "Lehre", "FuE", "Operativ", "Betrieb", "Design", "LVEntwicklung", "Weiterbildung", "FuEallg"];
+			var activities = ["Admin", "Lehre", "FuE", "Operativ", "Betrieb", "Design", "LVEntwicklung", "Weiterbildung", "FuEallg", "Berufsschule"];
 			if (activities.includes(sel))
 				showPausenblock();
 			else
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index cf2f40ca8..4237a2c41 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -77,6 +77,7 @@ require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
 require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 require_once('dbupdate_3.4/40128_search.php');
+require_once('dbupdate_3.4/66982_berufsschule.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/66982_berufsschule.php b/system/dbupdate_3.4/66982_berufsschule.php
new file mode 100644
index 000000000..8cb45c781
--- /dev/null
+++ b/system/dbupdate_3.4/66982_berufsschule.php
@@ -0,0 +1,41 @@
+<?php
+/* 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 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: Andreas Österreicher <oesi@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Aktivität Berufsschule für Zeitaufzeichnung
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: basis/gehaelter
+if($result = @$db->db_query("SELECT 1 FROM fue.tbl_aktivitaet WHERE aktivitaet_kurzbz = 'Berufsschule';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO fue.tbl_aktivitaet(aktivitaet_kurzbz, beschreibung, sort) VALUES('Berufsschule', 'Berufsschule','5');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>fue.tbl_aktivitaet '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'fue.tbl_aktivitaet: Added Aktivitaet "berufsschule"<br>';
+        }
+    }
+}

From b8d197d923bec153d6ae8769935df863fba3f72e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 12 Sep 2025 13:50:25 +0200
Subject: [PATCH 0761/1357] deleted entschuldigung email betreff

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a2d270010..093a6cab9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31206,6 +31206,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entDeletedEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht wurde gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances has been deleted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

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

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

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

From 92ba45a84dedab644695d62654d2cf21ff619e07 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 12 Sep 2025 16:09:03 +0200
Subject: [PATCH 0763/1357] cleanup Controller, move api functions to api
 controller, use api in tabulator, fix card refresh in profile right column,
 fix sancho mails

---
 application/config/cis.php                    |   6 +
 application/controllers/Cis/ProfilUpdate.php  | 752 +-----------------
 .../api/frontend/v1/ProfilUpdate.php          |  22 +-
 public/js/api/factory/profilUpdate.js         |   7 +
 .../Cis/Profil/MitarbeiterProfil.js           |   4 +-
 .../js/components/Cis/Profil/StudentProfil.js |   4 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 107 +--
 7 files changed, 95 insertions(+), 807 deletions(-)

diff --git a/application/config/cis.php b/application/config/cis.php
index 82655f244..8d3bc347e 100644
--- a/application/config/cis.php
+++ b/application/config/cis.php
@@ -7,3 +7,9 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 $config['cis_menu_root_content_id'] = 11087;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
+// Vilesci CI BaseUrl
+$config['cis_vilesci_base_url'] = defined('VILESCI_ROOT') ? VILESCI_ROOT : APP_ROOT;
+$config['cis_vilesci_index_page'] = 'index.ci.php';
+// Cis CI BaseUrl
+$config['cis_base_url'] = defined('CIS_ROOT') ? CIS_ROOT : APP_ROOT;
+$config['cis_index_page'] = 'cis.php';
diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index c47b7540b..74641d748 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -9,54 +9,21 @@ if (!defined('BASEPATH'))
 class ProfilUpdate extends Auth_Controller
 {
 
-	public static $STATUS_PENDING = NULL;
-	public static $STATUS_ACCEPTED = NULL;
-	public static $STATUS_REJECTED = NULL;
-
-	public static $TOPICS = [];
-
-
 	public function __construct()
 	{
 		parent::__construct([
 			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'getProfilUpdateWithPermission' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'acceptProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
-			'denyProfilRequest' => ['student/stammdaten:rw', 'mitarbeiter/stammdaten:rw'],
 			'show' => ['basis/cis:r'],
-
-			'insertProfilRequest' => ['basis/cis:rw'],
-			'updateProfilRequest' => ['basis/cis:rw'],
-			'deleteProfilRequest' => ['basis/cis:rw'],
-			'selectProfilRequest' => ['basis/cis:r'],
-			'insertFile' => ['basis/cis:rw'],
-			'getProfilRequestFiles' => ['basis/cis:r'],
-			'getStatus' => ['basis/cis:r'],
-			'getTopic' => ['basis/cis:r'],
+			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
 		]);
 
-		$this->load->config('cis');
-
 		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('person/Adressentyp_model', 'AdressenTypModel');
-		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->load->model('person/Profil_update_status_model', 'ProfilUpdateStatusModel');
-		$this->load->model('person/Profil_update_topic_model', 'ProfilUpdateTopicModel');
 
 		// Load language phrases
 		$this->loadPhrases(
 			array(
-				'ui',
-				'global',
-				'person',
-				'profil',
 				'profilUpdate'
 			)
 		);
@@ -64,32 +31,10 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->library('DmsLib');
 		$this->load->library('PermissionLib');
 
-		//? put the uid and pid inside the controller for reusability
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
-
-		// setup the ProfilUpdate states
-		$this->ProfilUpdateStatusModel->addSelect(['status_kurzbz']);
-		$status_kurzbz = $this->ProfilUpdateStatusModel->load();
-		if (hasData($status_kurzbz)) {
-			list($status_pending, $status_accepted, $status_rejected) = getData($status_kurzbz);
-
-			self::$STATUS_PENDING = $status_pending->status_kurzbz;
-			self::$STATUS_ACCEPTED = $status_accepted->status_kurzbz;
-			self::$STATUS_REJECTED = $status_rejected->status_kurzbz;
-		}
-		// setup the ProfilUpdate topics
-		$this->ProfilUpdateTopicModel->addSelect(['topic_kurzbz']);
-		$topic_kurzbz = $this->ProfilUpdateTopicModel->load();
-
-		if (hasData($topic_kurzbz)) {
-			foreach (getData($topic_kurzbz) as $topic) {
-				self::$TOPICS[$topic->topic_kurzbz] = $topic->topic_kurzbz;
-			}
-		}
 	}
 
-
 	public function index()
 	{
 		$this->load->view('Cis/ProfilUpdate');
@@ -100,129 +45,14 @@ class ProfilUpdate extends Auth_Controller
 		$this->load->view('Cis/ProfilUpdate', ['profil_update_id' => $profil_update_id]);
 	}
 
-	public function getStatus()
-	{
-		echo json_encode([self::$STATUS_PENDING => self::$STATUS_PENDING, self::$STATUS_ACCEPTED => self::$STATUS_ACCEPTED, self::$STATUS_REJECTED => self::$STATUS_REJECTED]);
-	}
-
-	public function getTopic()
-	{
-		echo json_encode(self::$TOPICS);
-	}
-
-	private function sendEmail_onProfilUpdate_response($uid, $topic, $status)
-	{
-		if($this->config->item('cis_send_profil_update_mails') === false)
-		{
-			return;
-		}
-
-		$this->load->helper('hlp_sancho_helper');
-		$email = $uid . "@" . DOMAIN;
-
-
-		function languageQuery($language)
-		{
-			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
-		}
-		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
-		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
-		if (isError($status_translation)) {
-			show_error($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
-		}
-		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
-		if (isset($status_translation)) {
-			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
-			if (!$mail_res) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
-			}
-		}
-
-	}
-
-
-	private function sendEmail_onProfilUpdate_insertion($uid, $profil_update_id, $topic)
-	{
-		if($this->config->item('cis_send_profil_update_mails') === false)
-		{
-			return;
-		}
-
-		$this->load->helper('hlp_sancho_helper');
-		$emails = [];
-
-		$isMitarbeiter_res = $this->MitarbeiterModel->isMitarbeiter($uid);
-		if (isError($isMitarbeiter_res)) {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
-		}
-		$isMitarbeiter_res = getData($isMitarbeiter_res);
-
-		//! if the $uid is a mitarbeiter and student, only the hr is notified by email
-		if ($isMitarbeiter_res) {
-			//? user is not a student therefore he is a mitarbeiter, send email to Personalverwaltung
-			//? use constant variable MAIL_GST to mail to the personalverwaltung
-			$this->MitarbeiterModel->addSelect([TRUE]);
-			$this->MitarbeiterModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid");
-			//? check if the the userID is a mitarbeiter and if the benutzer is active
-			$res = $this->MitarbeiterModel->loadWhere(["public.tbl_mitarbeiter.mitarbeiter_uid" => $uid, "public.tbl_benutzer.aktiv" => TRUE]);
-			if (isError($res)) {
-				show_error("was not able to query the mitarbeiter and benutzer by the uid: " . $uid);
-			}
-			if (hasData($res)) {
-				array_push($emails, MAIL_GST);
-			} else {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_mitarbeiterCheck_error'));
-			}
-		} else {
-			//? if it is not a mitarbeiter, check whether it is a student and send email to studiengang
-			$isStudent_res = $this->StudentModel->isStudent($uid);
-			if (isError($isStudent_res)) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_studentCheck_error'));
-			}
-			$isStudent_res = getData($isStudent_res);
-			if ($isStudent_res) {
-				//? Send email to the Studiengangsassistentinnen
-				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
-				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
-				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
-				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
-				//* check if the benutzer itself is active
-				//* check if the student status is Student or Diplomand (active students)
-				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
-				$res = $this->StudentModel->loadWhere(["public.tbl_benutzer.aktiv" => TRUE, "public.tbl_student.student_uid" => $uid]);
-				if (isError($res)) {
-					show_error(getData($res));
-				} else {
-					$res = hasData($res) ? getData($res) : [];
-					foreach ($res as $emailObj) {
-						array_push($emails, $emailObj->email);
-					}
-				}
-			}
-		}
-		$mail_res = [];
-		//? sending email
-		foreach ($emails as $email) {
-			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
-		}
-		foreach ($mail_res as $m_res) {
-			if (!$m_res) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_email_error'));
-			}
-		}
-
-	}
-
-
 	public function show($dms_id)
 	{
-
 		$profil_update = $this->ProfilUpdateModel->loadWhere(['attachment_id' => $dms_id]);
 		$profil_update = hasData($profil_update) ? getData($profil_update)[0] : null;
 
 		//? checks if an profil update exists with the dms_id requested from the user
-		if ($profil_update) {
+		if ($profil_update)
+		{
 			$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($profil_update->uid));
 			$is_student_profil_update = getData($this->StudentModel->isStudent($profil_update->uid));
 
@@ -230,7 +60,8 @@ class ProfilUpdate extends Auth_Controller
 				$this->permissionlib->isBerechtigt('student/stammdaten:r') && $is_student_profil_update ||
 				$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten:r') && $is_mitarbeiter_profil_update ||
 				$this->uid == $profil_update->uid
-			) {
+			)
+			{
 				// Get file to be downloaded from DMS
 				$newFilename = $this->uid . "/document_" . $dms_id;
 				$download = $this->dmslib->download($dms_id);
@@ -239,576 +70,17 @@ class ProfilUpdate extends Auth_Controller
 
 				// Download file
 				$this->outputFile(getData($download));
-
-
-			} else {
+			}
+			else
+			{
 				show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
 				return;
 			}
-
-		} else {
+		}
+		else
+		{
 			show_error($this->p->t('profilUpdate', 'profilUpdate_dms_error'));
 			return;
 		}
-
 	}
-
-
-	public function insertFile($replace)
-	{
-		$replace = json_decode($replace);
-
-		if (!count($_FILES)) {
-			echo json_encode([]);
-			return;
-		}
-
-		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
-		if (isset($replace)) {
-			$this->ProfilUpdateModel->addSelect(["attachment_id"]);
-			$profilUpdate = $this->ProfilUpdateModel->load([$replace]);
-			if (isError($profilUpdate)) {
-				return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
-			}
-			//? get the attachmentID
-			$dms_id = hasData($profilUpdate) ? getData($profilUpdate)[0]->attachment_id : null;
-
-			//? delete old dms_file of Profil Update
-			$this->deleteOldVersionFile($dms_id);
-		}
-
-
-		$files = $_FILES['files'];
-		$file_count = count($files['name']);
-
-		$res = [];
-
-		for ($i = 0; $i < $file_count; $i++) {
-			$_FILES['files']['name'] = $files['name'][$i];
-			$_FILES['files']['type'] = $files['type'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-			$_FILES['files']['error'] = $files['error'][$i];
-			$_FILES['files']['size'] = $files['size'][$i];
-
-			$dms = [
-				"kategorie_kurzbz" => "profil_aenderung",
-				"version" => 0,
-				"name" => $_FILES['files']['name'],
-				"mimetype" => $_FILES['files']['type'],
-				"beschreibung" => $this->uid . " Profil Änderung",
-				"insertvon" => $this->uid,
-				"insertamum" => "NOW()",
-			];
-
-			$tmp_res = $this->dmslib->upload($dms, 'files', array("jpg", "png", "pdf"));
-
-			$tmp_res = hasData($tmp_res) ? getData($tmp_res) : null;
-			array_push($res, $tmp_res);
-		}
-
-		echo json_encode($res);
-	}
-
-
-	public function selectProfilRequest()
-	{
-		$_GET = json_decode($this->input->raw_input_stream, true);
-		$uid = $this->input->get('uid');
-		$id = $this->input->get('id');
-		$whereClause = ['uid' => $this->uid];
-
-		if (isset($uid))
-			$whereClause['uid'] = $uid;
-		if (isset($id))
-			$whereClause['id'] = $id;
-
-		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere($whereClause);
-		$res = hasData($res) ? getData($res) : null;
-		echo json_encode($res);
-
-	}
-
-
-	public function getProfilRequestFiles()
-	{
-		$id = json_decode($this->input->raw_input_stream);
-
-		$this->ProfilUpdateModel->addSelect(["attachment_id"]);
-		$attachmentID = $this->ProfilUpdateModel->load([$id]);
-		if (isError($attachmentID)) {
-			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_loading_error')));
-		}
-		//? get the attachmentID
-		$dms_id = hasData($attachmentID) ? getData($attachmentID)[0]->attachment_id : null;
-
-		//? get the name to the file
-		$this->DmsVersionModel->addSelect(["name", "dms_id"]);
-		$attachment = $this->DmsVersionModel->load([$dms_id, 0]);
-		if (isError($attachment)) {
-			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
-		}
-		$attachment = hasData($attachment) ? getData($attachment) : null;
-		//? returns {name:..., dms_id:...}
-		echo json_encode($attachment);
-	}
-
-	public function insertProfilRequest()
-	{
-
-		$json = json_decode($this->input->raw_input_stream);
-
-		$payload = $json->payload;
-		$identifier = property_exists($json->payload, "kontakt_id") ? "kontakt_id" : (property_exists($json->payload, "adresse_id") ? "adresse_id" : null);
-
-		$data = ["topic" => $json->topic, "uid" => $this->uid, "requested_change" => json_encode($payload), "insertamum" => "NOW()", "insertvon" => $this->uid, "status" => self::$STATUS_PENDING ?: 'Pending'];
-
-		//? insert fileID in the dataset if sent with post request
-		if (isset($json->fileID)) {
-			$data['attachment_id'] = $json->fileID;
-
-		}
-
-		//? loops over all updateRequests from a user to validate if the new request is valid
-		$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid" => $this->uid]);
-		if (isError($res)) {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_loading_error'));
-		}
-		$res = hasData($res) ? getData($res) : null;
-
-		//? the user cannot delete a zustelladresse/kontakt
-		if (isset($payload->delete) && $payload->{$identifier == "kontakt_id" ? "zustellung" : "zustelladresse"}) {
-			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
-			return;
-		}
-
-		//? if the user tries to delete a adresse, checks whether the adresse is a heimatadresse, if so an error is raised
-		if (isset($payload->delete) && $identifier == "adresse_id") {
-			$adr = $this->AdresseModel->load($payload->$identifier);
-			$adr = getData($adr)[0];
-			if ($adr->heimatadresse) {
-				echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_deleteZustellung_error')));
-				return;
-			}
-		}
-
-		if ($res) {
-			$pending_changes = array_filter($res, function ($element) {
-				return $element->status == (self::$STATUS_PENDING ?: "Pending");
-			});
-
-			foreach ($pending_changes as $update_request) {
-				$existing_change = $update_request->requested_change;
-
-				//? the user can add as many new kontakte/adressen as he likes
-				if (!isset($payload->add) && property_exists($existing_change, $identifier) && property_exists($payload, $identifier) && $existing_change->$identifier == $payload->$identifier) {
-					//? the kontakt_id / adresse_id of a change has to be unique 
-					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTwice_error')));
-					return;
-				}
-
-				//? if it is not updating any kontakt/adresse, the topic has to be unique
-				elseif (!$identifier && $update_request->topic == $json->topic) {
-					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_changeTopicTwice_error', ['0' => $update_request->topic])));
-					return;
-				}
-			}
-		}
-
-		$insertID = $this->ProfilUpdateModel->insert($data);
-
-		if (isError($insertID)) {
-			show_error(getData($insertID));
-		} else {
-			$insertID = hasData($insertID) ? getData($insertID) : null;
-
-			//? sends emails to the correspondents of the $uid
-			$this->sendEmail_onProfilUpdate_insertion($this->uid, $insertID, $json->topic);
-			echo json_encode(success($insertID));
-		}
-	}
-
-	public function updateProfilRequest()
-	{
-		$json = json_decode($this->input->raw_input_stream);
-
-		$updateData = ["requested_change" => json_encode($json->payload), "updateamum" => "NOW()", "updatevon" => $this->uid];
-		if (isset($json->fileID)) {
-			$updateData['attachment_id'] = json_decode($json->fileID);
-		}
-		$updateID = $this->ProfilUpdateModel->update([$json->ID], $updateData);
-		//? insert fileID in the dataset if sent with post request
-
-		if (isError($updateID)) {
-			//catch error
-		} else {
-			$updateID = hasData($updateID) ? getData($updateID)[0] : null;
-			//TODO: should an email be sent to the responsable people when the user changes his profil update
-			echo json_encode(success($updateID));
-		}
-	}
-
-	public function deleteProfilRequest()
-	{
-
-		$json = json_decode($this->input->raw_input_stream);
-		$delete_res = $this->ProfilUpdateModel->delete([$json]);
-		echo json_encode($delete_res);
-	}
-
-
-	public function getProfilUpdateWithPermission($status = null)
-	{
-		// early return if no status has been passed as argument
-		if (!isset($status)) {
-			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
-			return;
-		}
-
-		// get the sprache of the user
-		$sprachenIndex = $this->SpracheModel->loadWhere(["sprache" => getUserLanguage()]);
-		$sprachenIndex = hasData($sprachenIndex) ? getData($sprachenIndex)[0]->index : null;
-
-		if (isset($sprachenIndex) && isset($status)) {
-			// get the corresponding status kurz_bz primary key out of the translation
-			$status = $this->ProfilUpdateStatusModel->execReadOnlyQuery("select * from public.tbl_profil_update_status where ? = ANY(bezeichnung_mehrsprachig)", [$status]);
-			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
-			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
-
-			echo json_encode($res);
-		}
-	}
-
-
-
-	private function getOE_from_student($student_uid)
-	{
-
-		//? returns the oe_einheit eines Studenten 
-		$query = "SELECT public.tbl_studiengang.oe_kurzbz
-		FROM public.tbl_student
-		JOIN public.tbl_studiengang ON tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-		WHERE public.tbl_student.student_uid = ?;";
-
-		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
-		if (!isSuccess($res)) {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));
-		}
-		$res = hasData($res) ? getData($res) : [];
-		$res = array_map(
-			function ($item) {
-				return $item->oe_kurzbz;
-			},
-			$res
-		);
-		return $res;
-	}
-
-
-	public function acceptProfilRequest()
-	{
-		$_POST = json_decode($this->input->raw_input_stream, true);
-		$id = $this->input->post('profil_update_id', true);
-		$uid = $this->input->post('uid', true);
-
-		//? fetching person_id using UID
-		$personID = $this->PersonModel->getByUid($uid);
-		$personID = hasData($personID) ? getData($personID)[0]->person_id : null;
-		$status_message = $this->input->post('status_message', true);
-		$topic = $this->input->post('topic', true);
-
-		//! somehow the xss check converted boolean false to empty string
-		$requested_change = $this->input->post('requested_change');
-
-		//! check for required information
-		if (!isset($id) || !isset($uid) || !isset($personID) || !isset($requested_change) || !isset($topic)) {
-			return json_encode(error($this->p->t('profilUpdate', 'profilUpdate_requiredInformation_error')));
-		}
-
-		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
-		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
-
-
-		//? check if the permissions are set correctly
-		if (
-			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
-		) {
-
-			if (is_array($requested_change) && array_key_exists("adresse_id", $requested_change)) {
-				$insertID = $this->handleAdresse($requested_change, $personID);
-				$insertID = hasData($insertID) ? getData($insertID) : null;
-				if (isset($insertID)) {
-					$requested_change['adresse_id'] = $insertID;
-					$update_res = $this->updateRequestedChange($id, $requested_change);
-					if (isError($update_res)) {
-						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_address_error', [$insertID])));
-						return;
-					}
-				}
-
-			} else if (is_array($requested_change) && array_key_exists("kontakt_id", $requested_change)) {
-				$insertID = $this->handleKontakt($requested_change, $personID);
-				$insertID = hasData($insertID) ? getData($insertID) : null;
-				if (isset($insertID)) {
-					$requested_change['kontakt_id'] = $insertID;
-					$update_res = $this->updateRequestedChange($id, $requested_change);
-					if (isError($update_res)) {
-						echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_kontakt_error', [$insertID])));
-						return;
-					}
-				}
-
-
-			} else {
-				switch ($topic) {
-					// mapping phrasen to database columns to make the update with the correct column names
-					case self::$TOPICS['Titel']:
-						$topic = "titelpre";
-						break;
-					case self::$TOPICS['Postnomen']:
-						$topic = "titelpost";
-						break;
-					case self::$TOPICS['Vorname']:
-						$topic = "vorname";
-						break;
-					case self::$TOPICS['Nachname']:
-						$topic = "nachname";
-						break;
-					default:
-						show_error($this->p->t('profilUpdate', 'profilUpdate_topic_error', [$topic]));
-						return;
-				}
-
-				$result = $this->PersonModel->update($personID, [$topic => $requested_change["value"]]);
-				if (isError($result)) {
-					echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_insert_error')));
-					return;
-				}
-			}
-			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_ACCEPTED);
-
-			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_ACCEPTED, $status_message, $requested_change));
-		} else {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
-		}
-
-
-	}
-
-	public function denyProfilRequest()
-	{
-
-		$_POST = json_decode($this->input->raw_input_stream, true);
-		$id = $this->input->post('profil_update_id', true);
-		$uid = $this->input->post('uid', true);
-		$topic = $this->input->post('topic', true);
-		$status_message = $this->input->post('status_message', true);
-
-		$is_mitarbeiter_profil_update = getData($this->MitarbeiterModel->isMitarbeiter($uid));
-		$is_student_profil_update = getData($this->StudentModel->isStudent($uid));
-
-
-		if (
-			$this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) && $is_student_profil_update ||
-			$this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") && $is_mitarbeiter_profil_update
-		) {
-			$this->sendEmail_onProfilUpdate_response($uid, $topic, self::$STATUS_REJECTED);
-			echo json_encode($this->setStatusOnUpdateRequest($id, self::$STATUS_REJECTED, $status_message));
-		} else {
-			show_error($this->p->t('profilUpdate', 'profilUpdate_permission_error'));
-		}
-
-
-	}
-
-	private function updateRequestedChange($id, $requested_change)
-	{
-		return $this->ProfilUpdateModel->update([$id], ['requested_change' => json_encode($requested_change)]);
-	}
-
-	private function setStatusOnUpdateRequest($id, $status, $status_message)
-	{
-		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
-	}
-
-	private function deleteOldVersionFile($dms_id)
-	{
-		if (!isset($dms_id)) {
-			return;
-		}
-
-		//? collect all the results of the deleted versions in an array 
-		$res = array();
-
-		//? delete all the different versions of the dms_file
-		$dmsVersions = $this->DmsVersionModel->loadWhere(["dms_id" => $dms_id]);
-		$dmsVersions = hasData($dmsVersions) ? getData($dmsVersions) : null;
-		if (isset($dmsVersions)) {
-			$zwischen_res = array_map(function ($item) {
-				return $item->version;
-			}, $dmsVersions);
-			foreach ($zwischen_res as $version) {
-				array_push($res, $this->DmsVersionModel->delete([$dms_id, $version]));
-			}
-		} else {
-			echo json_encode(error($this->p->t('profilUpdate', 'profilUpdate_dmsVersion_error')));
-		}
-
-		//? returns a result for each deleted dms_file
-		return $res;
-	}
-
-
-	private function handleKontakt($requested_change, $personID)
-	{
-		$kontakt_id = $requested_change["kontakt_id"];
-		//? removes the kontakt_id because we don't want to update the kontakt_id in the database
-		unset($requested_change["kontakt_id"]);
-
-
-		//! ADD
-		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
-			//? removes add flag
-			unset($requested_change['add']);
-			$requested_change['person_id'] = $personID;
-			$requested_change['insertamum'] = "NOW()";
-			$requested_change['insertvon'] = getAuthUID();
-			$insertID = $this->KontaktModel->insert($requested_change);
-			$insert_kontakt_id = $insertID;
-			if (isError($insert_kontakt_id)) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
-			}
-			$insert_kontakt_id = hasData($insert_kontakt_id) ? getData($insert_kontakt_id) : null;
-			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
-			}
-
-
-		}
-		//! DELETE
-		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
-			$this->KontaktModel->delete($kontakt_id);
-		}
-		//! UPDATE
-		else {
-			$requested_change['updateamum'] = "NOW()";
-			$requested_change['updatevon'] = getAuthUID();
-
-			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
-
-			if (isError($update_kontakt_id)) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
-			}
-			$update_kontakt_id = hasData($update_kontakt_id) ? getData($update_kontakt_id) : null;
-			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
-			}
-		}
-		return isset($insertID) ? $insertID : null;
-	}
-
-	private function handleAdresse($requested_change, $personID)
-	{
-
-		$this->AdressenTypModel->addSelect(["adressentyp_kurzbz"]);
-		$adr_kurzbz = $this->AdressenTypModel->loadWhere(["bezeichnung" => $requested_change['typ']]);
-		$adr_kurzbz = hasData($adr_kurzbz) ? getData($adr_kurzbz)[0]->adressentyp_kurzbz : null;
-		//? replace the address_typ with its correct kurzbz foreign key
-		$requested_change['typ'] = $adr_kurzbz;
-
-		$adresse_id = $requested_change["adresse_id"];
-		//? removes the adresse_id because we don't want to update the kontakt_id in the database
-		unset($requested_change["adresse_id"]);
-
-
-		//! ADD
-		if (array_key_exists('add', $requested_change) && $requested_change['add']) {
-
-			//? removes add flag
-			unset($requested_change['add']);
-			$requested_change['insertamum'] = "NOW()";
-			$requested_change['insertvon'] = getAuthUID();
-			$requested_change['person_id'] = $personID;
-			//TODO: zustelladresse, heimatadresse, rechnungsadresse und nation werden nicht beachtet
-			$insertID = $this->AdresseModel->insert($requested_change);
-			$insert_adresse_id = $insertID;
-			if (isError($insert_adresse_id)) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
-			}
-			$insert_adresse_id = hasData($insert_adresse_id) ? getData($insert_adresse_id) : null;
-			if ($insert_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
-			}
-
-		}
-		//! DELETE
-		elseif (array_key_exists('delete', $requested_change) && $requested_change['delete']) {
-			$this->AdresseModel->delete($adresse_id);
-		}
-		//! UPDATE
-		else {
-			$requested_change['updateamum'] = "NOW()";
-			$requested_change['updatevon'] = getAuthUID();
-			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-			if (isError($update_adresse_id)) {
-				show_error($this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-			}
-			$update_adresse_id = hasData($update_adresse_id) ? getData($update_adresse_id) : null;
-			if ($update_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
-			}
-		}
-		return isset($insertID) ? $insertID : null;
-	}
-
-
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
-	{
-		if ($zustellung) {
-			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
-			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
-			if (!isSuccess($zustellKontakteArray)) {
-				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
-			}
-			$zustellKontakteArray = hasData($zustellKontakteArray) ? getData($zustellKontakteArray) : null;
-
-			if ($zustellung && count($zustellKontakteArray) > 0) {
-				$zustellKontakteArray = array_filter($zustellKontakteArray, function ($kontakt) use ($kontakt_id) {
-					return $kontakt->kontakt_id != $kontakt_id;
-				});
-				foreach ($zustellKontakteArray as $kontakt) {
-					$this->KontaktModel->update($kontakt->kontakt_id, ["zustellung" => FALSE]);
-				}
-
-			}
-		}
-	}
-
-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
-	{
-		if ($zustellung) {
-			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
-			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
-			if (!isSuccess($zustellAdressenArray)) {
-				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
-			}
-			$zustellAdressenArray = hasData($zustellAdressenArray) ? getData($zustellAdressenArray) : null;
-
-			if ($zustellung && count($zustellAdressenArray) > 0) {
-
-				$zustellAdressenArray = array_filter($zustellAdressenArray, function ($adresse) use ($adresse_id) {
-
-					return $adresse->adresse_id != $adresse_id;
-				});
-				foreach ($zustellAdressenArray as $adresse) {
-					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
-				}
-
-			}
-		}
-	}
-
-
-}
\ No newline at end of file
+}
diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 929ea49d6..bbfed651c 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -573,8 +573,7 @@ class ProfilUpdate extends FHCAPI_Controller
 	{
 		// early return if no status has been passed as argument
 		if (!isset($status)) {
-			echo json_encode($this->ProfilUpdateModel->getProfilUpdateWithPermission());
-			return;
+			$this->terminateWithSuccess($this->ProfilUpdateModel->getProfilUpdateWithPermission());
 		}
 
 		// get the sprache of the user
@@ -587,7 +586,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$status = hasData($status) ? getData($status)[0]->status_kurzbz : null;
 			$res = $this->ProfilUpdateModel->getProfilUpdateWithPermission(isset($status) ? ['status' => $status] : null);
 
-			echo json_encode($res);
+			$this->terminateWithSuccess($res);
 		}
 	}
 
@@ -641,6 +640,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
 				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
 				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);
 				//* check if the benutzer itself is active
 				//* check if the student status is Student or Diplomand (active students)
 				$this->StudentModel->db->where_in("public.tbl_prestudentstatus.status_kurzbz", ['Student', 'Diplomand']);
@@ -657,8 +657,10 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		$mail_res = [];
 		//? sending email
-		foreach ($emails as $email) {
-			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => APP_ROOT . 'Cis/ProfilUpdate/id/' . $profil_update_id], $email, ("Profil Änderung von " . $uid)));
+		foreach ($emails as $email)
+		{
+			$href = $this->config->item('cis_vilesci_base_url') . $this->config->item('cis_vilesci_index_page') . '/Cis/ProfilUpdate/id/' . $profil_update_id;
+			array_push($mail_res, sendSanchoMail("profil_update", ['uid' => $uid, 'topic' => $topic, 'href' => $href], $email, ("Profil Änderung von " . $uid)));
 		}
 		foreach ($mail_res as $m_res) {
 			if (!$m_res) {
@@ -681,21 +683,21 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		function languageQuery($language)
 		{
-			return "select index from public.tbl_sprache where sprache = '" + $language + "'";
+			return "select index from public.tbl_sprache where sprache = '" . $language . "'";
 		}
 
 		$this->ProfilUpdateStatusModel->addSelect(["bezeichnung_mehrsprachig[(" . languageQuery('German') . ")] as status_de", "bezeichnung_mehrsprachig[(" . languageQuery('English') . ")] as status_en"]);
 		
 		$status_translation = $this->ProfilUpdateStatusModel->loadWhere(["status_kurzbz" => $status]);
-		
 		if (isError($status_translation)) {
 			$this->terminateWithError($this->p->t('profilUpdate', 'ProfilUpdateStatusTranslationError'));
 		}
 
 		$status_translation = hasData($status_translation) ? getData($status_translation)[0] : null;
-
-		if (isset($status_translation)) {
-			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => APP_ROOT . 'Cis/Profil'], $email, ("Profil Änderung " . $this->p->t('profilUpdate', 'pending')));
+		if (isset($status_translation))
+		{
+			$href = $this->config->item('cis_base_url') . $this->config->item('cis_index_page') . '/Cis/Profil';
+			$mail_res = sendSanchoMail("profil_update_response", ['topic' => $topic, 'status_de' => $status_translation->status_de, 'status_en' => $status_translation->status_en, 'href' => $href], $email, ("Profil Änderung " . $status_translation->status_de . ' / Profile Update ' . $status_translation->status_en));
 			if (!$mail_res) {
 				$this->addError($this->p->t('profilUpdate', 'profilUpdate_email_error'));
 			}
diff --git a/public/js/api/factory/profilUpdate.js b/public/js/api/factory/profilUpdate.js
index dfef399bf..553522d30 100644
--- a/public/js/api/factory/profilUpdate.js
+++ b/public/js/api/factory/profilUpdate.js
@@ -68,6 +68,13 @@ export default {
 			params: dms
 		};
 	},
+	getProfilUpdateWithPermission(filter) {
+		const url_filter = (filter !== '') ? '/' + encodeURIComponent(filter) : '';
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/ProfilUpdate/getProfilUpdateWithPermission' + url_filter
+		};
+	},
 	getProfilRequestFiles(requestID) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 78fbdb04b..223b5c2b6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -167,11 +167,11 @@ export default {
 				this.$api
 					.call(ApiProfilUpdate.selectProfilRequest())
 					.then((request) => {
-						if (!request.error && request) {
+						if (!request.error && request.data) {
 							this.data.profilUpdates = request.data;
 							this.data.profilUpdates.sort(this.sortProfilUpdates);
 						} else {
-							console.error("Error when fetching profile updates: " + res.data);
+							console.error("Error when fetching profile updates: " + request);
 						}
 					})
 					.catch((err) => {
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 88437a0f1..8d46377d5 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -133,11 +133,11 @@ export default {
 				this.$api
 					.call(ApiProfilUpdate.selectProfilRequest())
 					.then((request) => {
-						if (!request.error && res) {
+						if (!request.error && request.data) {
 							this.data.profilUpdates = request.data;
 							this.data.profilUpdates.sort(this.sortProfilUpdates);
 						} else {
-							console.error("Error when fetching profile updates: " + res.data);
+							console.error("Error when fetching profile updates: " + request);
 						}
 					})
 					.catch((err) => {
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 483a4665c..3b056b042 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -31,10 +31,10 @@ export default {
     Loading,
     AcceptDenyUpdate,
   },
-  inject: ["profilUpdateTopic", "profilUpdateStates"],
+  inject: ["profilUpdateStates"],
   props: {
     id: {
-      type: Number,
+      type: String,
     },
   },
   data() {
@@ -44,51 +44,53 @@ export default {
       modalData: null,
       loading: false,
       filter: "Pending",
-      events: [],
       profil_update_id: Number(this.id),
 
   };
   },
-  computed:{
-    profilUpdateOptions: function(){
-      return {
-        ajaxURL:
-          FHC_JS_DATA_STORAGE_OBJECT.app_root +
-          FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-          `/Cis/ProfilUpdate/`,
-
-        ajaxURLGenerator: (url, config, params) => {
-          //? this function needs to be an array function in order to access the this properties of the Vue component
-
-          switch (this.filter) {
-            case this.profilUpdateStates["Pending"]:
-              return (
-                url +
-                `getProfilUpdateWithPermission/${this.profilUpdateStates["Pending"]}`
-              );
-            case this.profilUpdateStates["Accepted"]:
-              return (
-                url +
-                `getProfilUpdateWithPermission/${this.profilUpdateStates["Accepted"]}`
-              );
-            case this.profilUpdateStates["Rejected"]:
-              return (
-                url +
-                `getProfilUpdateWithPermission/${this.profilUpdateStates["Rejected"]}`
-              );
-            default:
-              return url + `getProfilUpdateWithPermission`;
-          }
-        },
+	computed: {
+		profilUpdateEvents: function () {
+			return [
+				{
+					"event": "dataProcessed",
+					"handler": this.handleDataProcessed
+				}
+			];
+		},
+		profilUpdateOptions: function () {
+			return {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: (url, config, params) => {
+					return this.$api.call(ApiProfilUpdate.getProfilUpdateWithPermission(params.filter));
+				},
+				ajaxParams: () => {
+					let filter = '';
+					switch (this.filter) {
+						case this.profilUpdateStates["Pending"]:
+							filter = this.profilUpdateStates["Pending"];
+							break;
+						case this.profilUpdateStates["Accepted"]:
+							filter = this.profilUpdateStates["Accepted"];
+							break;
+						case this.profilUpdateStates["Rejected"]:
+							filter = this.profilUpdateStates["Rejected"];
+							break;
+						default:
+							filter = '';
+					}
+					return {
+						"filter": filter
+					};
+				},
         ajaxResponse: (url, params, response) => {
           //url - the URL of the request
           //params - the parameters passed with the request
           //response - the JSON object returned in the body of the response.
           //? sorts the response data from the backend
-          if (response)
-            response.sort((ele1, ele2) => sortProfilUpdates(ele1, ele2, this));
+					if (response?.data)
+						response.data.sort((ele1, ele2) => sortProfilUpdates(ele1, ele2, this));
 
-          return response;
+					return response.data;
         },
         //? adds tooltip with the status message of a profil update request if its status is not pending
         columnDefaults: {
@@ -356,7 +358,19 @@ export default {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
       sessionStorage.setItem("filter", event.target.value);
-    },
+		},
+		handleDataProcessed: function () {
+			if (this.profil_update_id) {
+				const arrayRowData = this.$refs.UpdatesTable.tabulator
+					.getData()
+					.filter((row) => {
+						return row.profil_update_id === this.profil_update_id;
+					});
+				if (arrayRowData.length) {
+					this.showAcceptDenyModal(arrayRowData[0]);
+				}
+			}
+		}
   },
   watch: {
     loading: function (newValue, oldValue) {
@@ -374,20 +388,7 @@ export default {
   },
 
   mounted() {
-    //? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
-    if (this.profil_update_id) {
-      this.$refs.UpdatesTable.tabulator.on("dataProcessed", () => {
-        const arrayRowData = this.$refs.UpdatesTable.tabulator
-          .getData()
-          .filter((row) => {
-            return row.profil_update_id === this.profil_update_id;
-          });
-        if (arrayRowData.length) {
-          this.showAcceptDenyModal(arrayRowData[0]);
-        }
-      });
-    }
-
+		//? opens the AcceptDenyUpdate Modal if a preselected profil_update_id was passed to the component (used for email links)
     if (sessionStorage.getItem("filter")) {
       this.filter = sessionStorage.getItem("filter");
     }
@@ -409,7 +410,7 @@ export default {
     </div>
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="events" :tabulator-options="profilUpdateOptions" tableOnly :sideMenu="false" />
+    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="profilUpdateEvents" :tabulator-options="profilUpdateOptions" tableOnly :sideMenu="false" />
 
     </div>`,
 };

From f0d9a4373390e69b3f4ac7e26faffec3b26718eb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Sat, 13 Sep 2025 11:08:19 +0200
Subject: [PATCH 0764/1357] fix LvPlan not rendering Events in timeGrid
 correctly

---
 application/controllers/api/frontend/v1/LvPlan.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 3b6b55911..28b48e3f1 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -176,6 +176,7 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
+		$this->StundeModel->addOrder('stunde', 'ASC');
 		$stunden = $this->StundeModel->load();
 
         $stunden = $this->getDataOrTerminateWithError($stunden);

From c498119b6cf0f08c12c128fa1e4edd9a3b9392ba Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Sep 2025 11:08:33 +0200
Subject: [PATCH 0765/1357] fix cis4 cms link replacement in general content
 type when switching via vue router from one content to another

---
 .../Cis/Cms/Content_types/General.js          | 119 +++++++++---------
 1 file changed, 62 insertions(+), 57 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index c57ccd8ca..cbc4224f9 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -57,65 +57,70 @@ export default {
 				p.style.setProperty('white-space', 'normal');
 				p.style.setProperty('max-width', '400px');
 			})
+		},
+		prepareContent() {
+			// replaces the tablesorter with the tabulator
+			let tables = Array.from(document.getElementsByClassName("tablesorter"));
+
+			tables.forEach((table, index) =>  {
+				this.sanitizeLegacyTables(table)
+
+				new Tabulator(table, {
+					index: index,
+					layout: "fitDataFill",
+
+					columnDefaults: {
+						formatter: "html",
+						resizable: true,
+						minWidth: "100px"
+					}
+				})
+			})
+
+			document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+				el.addEventListener("click", (evt) => {
+					evt.preventDefault();
+					BsConfirm.popup(el.dataset.confirm)
+					.then(() => {
+						Axios.get(el.href)
+						.then((res) => {
+							// TODO(chris): check for success then show message and/or reload
+							location = location;
+						})
+						.catch((err) => console.error("ERROR:", err));
+					})
+					.catch(() => {});
+				});
+			});
+			document.querySelectorAll("#cms [data-href]").forEach((el) => {
+				el.href = el.dataset.href.replace(
+					/^ROOT\//,
+					FHC_JS_DATA_STORAGE_OBJECT.app_root
+				);
+			});
+
+			document.querySelectorAll("[href]").forEach((element) => {
+				let orignal_href = element.getAttribute("href");
+				let new_href = replaceRelativeLegacyLink(orignal_href);
+				element.href = new_href;
+			});
+
+			document.querySelectorAll("[style*=background-color]").forEach((element) => {
+				if (element.style.backgroundColor == "rgb(255, 255, 255)"){
+					element.style.backgroundColor = "var(--fhc-background)";
+				}
+				if(element.querySelector("*[style*=background-color]")){
+					element.style.backgroundColor = "var(--fhc-tertiary)";
+				}
+			});
 		}
 	},
-    mounted(){
-		// replaces the tablesorter with the tabulator
-		let tables = Array.from(document.getElementsByClassName("tablesorter"));
-
-		tables.forEach((table, index) =>  {
-			this.sanitizeLegacyTables(table)
-			
-			new Tabulator(table, {
-				index: index,
-				layout: "fitDataFill",
-
-				columnDefaults: {
-					formatter: "html",
-					resizable: true,
-					minWidth: "100px"
-				}
-			})
-		})
-
-        document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
-            el.addEventListener("click", (evt) => {
-              evt.preventDefault();
-              BsConfirm.popup(el.dataset.confirm)
-                .then(() => {
-                  Axios.get(el.href)
-                    .then((res) => {
-                    	// TODO(chris): check for success then show message and/or reload
-                    	location = location;
-                    })
-                    .catch((err) => console.error("ERROR:", err));
-                })
-                .catch(() => {});
-            });
-          });
-        document.querySelectorAll("#cms [data-href]").forEach((el) => {
-            el.href = el.dataset.href.replace(
-            	/^ROOT\//,
-            	FHC_JS_DATA_STORAGE_OBJECT.app_root
-            );
-        });
-			
-		document.querySelectorAll("[href]").forEach((element) => {
-			let orignal_href = element.getAttribute("href");
-			let new_href = replaceRelativeLegacyLink(orignal_href);
-			element.href = new_href;
-		});
-
-		document.querySelectorAll("[style*=background-color]").forEach((element) => {
-			if (element.style.backgroundColor == "rgb(255, 255, 255)"){
-				element.style.backgroundColor = "var(--fhc-background)";
-			}
-			if(element.querySelector("*[style*=background-color]")){
-				element.style.backgroundColor = "var(--fhc-tertiary)";
-			}
-		});
-
-    },
+	updated() {
+		this.prepareContent();
+	},
+	mounted(){
+		this.prepareContent();
+	},
     template: /*html*/ `
       <!-- div that contains the content -->
       <div v-if="content" class="container" style="max-width: 100%;"><div class="row"><div class="col">

From 9e6ae4f5a40907a7fc955366c5e433dd082cc7bd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Sep 2025 11:31:35 +0200
Subject: [PATCH 0766/1357] add phrase lehre/termineImLvPlan

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9916907be..0bfcdc466 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -48350,6 +48350,26 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	//****************************	 CORE/search end
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'termineImLvPlan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Termine dieser LV',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dates in schedule',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

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

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

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

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

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

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

From 7f7488e61ec1c6fb7c302e2ad0c614ad15bdc60f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 11:45:49 +0200
Subject: [PATCH 0769/1357] add fileupload to edit address for meldezettel
 upload

---
 .../Cis/Cms/Content_types/News_content.js     |  2 +-
 .../ProfilComponents/FetchProfilUpdates.js    | 12 ++++
 .../EditProfilComponents/EditAdresse.js       | 56 +++++++++++++++++--
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 10 ++--
 4 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content_types/News_content.js b/public/js/components/Cis/Cms/Content_types/News_content.js
index a4eacd332..a17e8592a 100644
--- a/public/js/components/Cis/Cms/Content_types/News_content.js
+++ b/public/js/components/Cis/Cms/Content_types/News_content.js
@@ -1,6 +1,6 @@
 import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js"
 export default {
-	name: "GeneralComponent",
+	name: "NewsContentType",
 	props:{
 	  content:{
 		  type:String,
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 40627d98b..b8cfb52e4 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -88,6 +88,18 @@ export default {
 				if (isMitarbeiter) {
 					content["isMitarbeiter"] = isMitarbeiter;
 				}
+
+				const filesFromDatabase =
+					await this.$api
+						.call(ApiProfilUpdate.getProfilRequestFiles(
+							updateRequest.profil_update_id
+						))
+						.then((res) => {
+							return res.data;
+						});
+
+				files = filesFromDatabase;
+				content["files"] = files;
 			}
 
 			//? adds the status information if the profil update request was rejected or accepted
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 1dcde49c9..cb702c27d 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -1,8 +1,11 @@
+import Dms from "../../../../Form/Upload/Dms.js";
+
 import ApiProfil from '../../../../../api/factory/profil.js';
 
 export default {
   components: {
     AutoComplete: primevue.autocomplete,
+	Dms: Dms
   },
 
   props: {
@@ -11,9 +14,13 @@ export default {
       type: Boolean,
       default: false,
     },
+    files: {
+      type: Array,
+      default: []
+    },
   },
 
-  inject: ["getZustelladressenCount"],
+  inject: ["getZustelladressenCount", "updateFileID"],
 
   data() {
     return {
@@ -23,6 +30,8 @@ export default {
       nationenList: [],
       originalValue: null,
       zustellAdressenCount: null,
+	  dmsData: [],
+	  fileschanged: false
     };
   },
 
@@ -83,6 +92,11 @@ export default {
       //? sets the value of a property to null when an empty string is entered to keep the isChanged function valid
       if (bind === "zustelladresse") {
         this.data[bind] = event.target.checked;
+	  } else if(bind === 'files') {
+		  if(this.dmsData.length > 0 && this.dmsData[0].type !== 'application/x.fhc-dms+json') {
+			this.fileschanged = true;
+		  }
+		  this.updateFileID(this.dmsData);
       } else {
         this.data[bind] = event.target.value === "" ? null : event.target.value;
       }
@@ -91,6 +105,11 @@ export default {
       // update the zustellAdressen count
       this.zustellAdressenCount = this.getZustelladressenCount();
     },
+
+	deleteDmsData: function() {
+		this.dmsData = [];
+		this.updateValue(null, 'files');
+	}
   },
 
   computed: {
@@ -111,12 +130,14 @@ export default {
         !this.data.strasse ||
         !this.data.plz ||
         !this.data.ort ||
-        !this.data.typ
+        !this.data.typ ||
+        this.dmsData.length === 0
       ) {
         return false;
       }
 
-      return this.originalValue !== JSON.stringify(this.data);
+      const datachanged = this.originalValue !== JSON.stringify(this.data);
+      return datachanged || this.fileschanged;
     },
   },
 
@@ -133,6 +154,12 @@ export default {
     this.zustellAdressenCount = this.getZustelladressenCount();
   },
 
+  mounted() {
+    if (this.files) {
+      this.dmsData = this.files;
+    }
+  },
+
   template: /*html*/ `
 <div class="gy-3 row justify-content-center align-items-center">
   <!-- warning message for too many zustellungs Adressen -->
@@ -212,9 +239,26 @@ export default {
     </div>
   </div>
 
-
-  
-
+	<div class="row g-2">
+		<div class="col">
+			<dms
+				ref="update"
+				id="files"
+				name="files"
+				:multiple="false"
+				v-model="dmsData"
+				@update:model-value="updateValue($event,'files')"
+			></dms>
+		</div>
+		<div class="col-auto">
+			<button
+					@click="deleteDmsData"
+					class="btn btn-danger"
+					:aria-label="$p.t('profilUpdate','deleteAttachment')"
+					:title="$p.t('profilUpdate','deleteAttachment')"
+			><i style="color:white" class="fa fa-trash" aria-hidden="true"></i></button>
+		</div>
+	</div>
 
 </div>
     `,
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index d9495f073..ce7949f7b 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -188,14 +188,16 @@ export default {
 
       <span  class="form-underline-content" >{{data.requested_change.value}}</span>
     </div>
-    <div v-if="files?.length" class="ms-2">
-    
-    <a  v-for="file in files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
-    </div>
     </template>
 
 
     <component v-else :is="getComponentView" :withZustelladresse="getComponentView==='adresse'?true:false" :data="data.requested_change"></component>
+
+    <div v-if="files?.length" class="ms-2">
+
+    <a  v-for="file in files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
+    </div>
+
     </div>
     </div>
     </div>

From 379270c2962225c636f33fc7d375fea841d9bbf7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 11:57:27 +0200
Subject: [PATCH 0770/1357] consider person foto_sperre in advanced cis search

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

diff --git a/application/config/searchcis.php b/application/config/searchcis.php
index e3d1e2213..12bad025d 100644
--- a/application/config/searchcis.php
+++ b/application/config/searchcis.php
@@ -27,7 +27,7 @@ $config['student']['resultfields'] = [
 	"(p.vorname || ' ' || p.nachname) AS name",
 	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
 	"CASE
-		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+		WHEN (p.foto_sperre = false AND p.foto IS NOT NULL) THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 		ELSE NULL END
 		AS photo_url",
 	"b.aktiv"

From cb5623d228cf4bf88297ae373e1f92660902d245 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 13:32:28 +0200
Subject: [PATCH 0771/1357] label and layout for documents

---
 .../EditProfilComponents/EditAdresse.js       |  4 +-
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js      | 13 +++---
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index cb702c27d..83d98a31f 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -94,7 +94,7 @@ export default {
         this.data[bind] = event.target.checked;
 	  } else if(bind === 'files') {
 		  if(this.dmsData.length > 0 && this.dmsData[0].type !== 'application/x.fhc-dms+json') {
-			this.fileschanged = true;
+		    this.fileschanged = true;
 		  }
 		  this.updateFileID(this.dmsData);
       } else {
@@ -241,6 +241,7 @@ export default {
 
 	<div class="row g-2">
 		<div class="col">
+			<div class="form-underline-titel">{{$p.t('profilUpdate','meldebestaetigung')}}*</div>
 			<dms
 				ref="update"
 				id="files"
@@ -251,6 +252,7 @@ export default {
 			></dms>
 		</div>
 		<div class="col-auto">
+			<div>&nbsp;</div>
 			<button
 					@click="deleteDmsData"
 					class="btn btn-danger"
diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index ce7949f7b..d23dcb1b8 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -193,13 +193,16 @@ export default {
 
     <component v-else :is="getComponentView" :withZustelladresse="getComponentView==='adresse'?true:false" :data="data.requested_change"></component>
 
-    <div v-if="files?.length" class="ms-2">
-
-    <a  v-for="file in files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
+    </div>
     </div>
 
-    </div>
-    </div>
+		<div  v-if="files?.length" class="card mt-3">
+			<div class="card-header">{{$p.t('profilUpdate','nachweisdokumente')}}</div>
+			<div class="card-body">
+				<a  v-for="file in files" target="_blank" :href="getDocumentLink(file.dms_id)" >{{file.name}}</a>
+			</div>
+		</div>
+
     </div>
     </div>
     
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0bfcdc466..5b4f17ced 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -48370,6 +48370,46 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'profilUpdate',
+		'phrase' => 'meldebestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldebestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirmation of registration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profilUpdate',
+		'phrase' => 'nachweisdokumente',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachweisdokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Confirmation documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 34eb37306120f2eeec7c1d5e9651ec6970675620 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 13:39:15 +0200
Subject: [PATCH 0772/1357] adapt phrase profilUpdateInformationMessage

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5b4f17ced..43e9c0fcc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29149,7 +29149,7 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Erneuern Sie ihr {0} und laden Sie die passenden Beweisdokumente hoch',
+					'text' => 'Aktualisieren Sie ihren {0} und laden Sie die passenden Nachweisdokumente hoch',
 					'description' => '',
 					'insertvon' => 'system'
 				),

From cef581178cd18aefc5907d7cb74cc210a9faac8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 13:52:52 +0200
Subject: [PATCH 0773/1357] show documents in status view

---
 .../Profil/ProfilModal/EditProfilComponents/Status.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
index a0492a2da..d8c7637b3 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/Status.js
@@ -112,14 +112,17 @@ export default {
     <div class="form-underline-titel">{{topic}}</div>
     <span  class="form-underline-content">{{data.value}} </span>
     </div>
-    <div v-if="files?.length" class="ms-2">
-    
-    <a target="_blank" :href="getDocumentLink(file.dms_id)" v-for="file in files">{{file.name}}</a>
-    </div>
     </template>
     <component v-else :is="getComponentView" :data="data"></component>
     
     </div>
     </div>
+
+	<div v-if="files?.length" class="card mt-4">
+		<div class="card-header">{{$p.t('profilUpdate','nachweisdokumente')}}</div>
+		<div class="card-body">
+			<a target="_blank" :href="getDocumentLink(file.dms_id)" v-for="file in files">{{file.name}}</a>
+		</div>
+	</div>
     `,
 };

From 7e40e34212f30191121dec324eff8f1e83ca9655 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Sep 2025 17:40:27 +0200
Subject: [PATCH 0774/1357] remove DMS_PATH from original user filename

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

diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php
index 774ebdc79..c6c16a866 100644
--- a/application/libraries/DmsLib.php
+++ b/application/libraries/DmsLib.php
@@ -670,7 +670,7 @@ class DmsLib
 			$fileObj = new stdClass();
 			$fileObj->filename = getData($result)[0]->filename;
 			$fileObj->file = DMS_PATH.getData($result)[0]->filename;
-			$fileObj->name = DMS_PATH.getData($result)[0]->name;   // original user filename
+			$fileObj->name = getData($result)[0]->name;   // original user filename
 			$fileObj->mimetype = getData($result)[0]->mimetype;
 
 			return success($fileObj);

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

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

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

From dff8223d3e8c593c03c0e7daf31804b93f4eaf71 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 Sep 2025 11:04:10 +0200
Subject: [PATCH 0776/1357] sortierung der tags

---
 public/js/components/LVVerwaltung/Setup/Table.js | 11 +++++++++++
 public/js/components/filter/Filter.js            |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 5360c3525..fa288f8d7 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -233,6 +233,17 @@ export default {
 							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 => {
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cefa99404..9a294d2d4 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -666,7 +666,7 @@ export const CoreFilterCmpt = {
 					</button>
 					<span v-if="$slots.actions && tabulatorHasSelector && useSelectionSpan">
 						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>
-						<span v-else> Mit {{ selectedData.length }} ausgewählten:</span>
+						<span v-else id="selected-info-text"> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
 					<slot name="actions" v-bind="{selected: tabulatorHasSelector ? selectedData : []}"></slot>
 					<slot name="search"></slot>

From bbfaf447f569afa7ca8c9d54648cbcf8e09b0b50 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 17 Sep 2025 12:13:15 +0200
Subject: [PATCH 0777/1357] remove dependency to library from pv extension and
 do not delete salary history when gb is deleted since foreign key is
 configured on delete set null

---
 .../libraries/vertragsbestandteil/GehaltsbestandteilLib.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php b/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
index 1aaafa471..c1238c13d 100644
--- a/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php
@@ -24,7 +24,6 @@ class GehaltsbestandteilLib
 		$this->CI = get_instance();
 		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 
 			'GehaltsbestandteilModel');
-		$this->CI->load->library('extensions/FHC-Core-Personalverwaltung/abrechnung/GehaltsLib');
 		$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
 	}
 
@@ -121,10 +120,6 @@ class GehaltsbestandteilLib
 	{
 		$this->setUIDtoPGSQL();
 
-		// delete Gehaltsabrechnung
-		$ret = $this->CI->gehaltslib->deleteAbrechnung($gehaltsbestandteil);
-
-		//
 		$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
 		
 		if (isError($ret))

From 57531d956d1a0ef18e98ec4a50a4d5c1c3ed55a6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 18 Sep 2025 13:18:44 +0200
Subject: [PATCH 0778/1357] gruppen in eigenen tab verschoben styling phrases

---
 .../api/frontend/v1/lv/Lehreinheit.php        |   4 +-
 .../controllers/api/frontend/v1/lv/Lektor.php |  33 +++-
 .../controllers/api/frontend/v1/lv/Setup.php  |   5 +
 application/libraries/LektorLib.php           |  14 +-
 public/css/Lvverwaltung.css                   |  10 ++
 public/css/Tabulator6.css                     | 154 +++++++++++++++-
 .../components/LVVerwaltung/Details/Form.js   | 166 ++++++++++--------
 .../LVVerwaltung/Details/Gruppen.js           |   4 +-
 .../components/LVVerwaltung/LVVerwaltung.js   |   4 +-
 .../components/LVVerwaltung/Lektor/Daten.js   |  19 +-
 .../components/LVVerwaltung/Lektor/Table.js   |   2 +-
 .../components/LVVerwaltung/Lektor/Vertrag.js |   9 +-
 .../js/components/LVVerwaltung/Setup/Table.js |  22 +--
 .../js/components/LVVerwaltung/Setup/Tabs.js  |   1 -
 .../components/LVVerwaltung/Tabs/Details.js   |  19 +-
 .../components/LVVerwaltung/Tabs/Gruppen.js   |  39 ++++
 system/phrasesupdate.php                      |  40 +++++
 17 files changed, 418 insertions(+), 127 deletions(-)
 create mode 100644 public/js/components/LVVerwaltung/Tabs/Gruppen.js

diff --git a/application/controllers/api/frontend/v1/lv/Lehreinheit.php b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
index b851f8c22..958007901 100644
--- a/application/controllers/api/frontend/v1/lv/Lehreinheit.php
+++ b/application/controllers/api/frontend/v1/lv/Lehreinheit.php
@@ -350,7 +350,7 @@ class Lehreinheit extends FHCAPI_Controller
 						$this->form_validation->set_rules($field, 'Start KW', 'integer|greater_than[0]|less_than_equal_to[53]');
 						break;
 					case 'gewicht':
-						$this->form_validation->set_rules($field, 'Gewicht', 'numeric');
+						$this->form_validation->set_rules($field, 'Gewicht', 'numeric|greater_than_equal_to[0]');
 						break;
 					case 'raumtyp':
 						$this->form_validation->set_rules($field, 'Raumtyp', 'required|max_length[16]');
@@ -365,7 +365,7 @@ class Lehreinheit extends FHCAPI_Controller
 						$this->form_validation->set_rules($field, 'LVNR', 'integer');
 						break;
 					case 'unr':
-						$this->form_validation->set_rules($field, 'UNR', 'integer');
+						$this->form_validation->set_rules($field, 'UNR', 'integer|greater_than_equal_to[0]');
 						break;
 					case 'lehre':
 						$this->form_validation->set_rules($field, 'Lehre', 'trim');
diff --git a/application/controllers/api/frontend/v1/lv/Lektor.php b/application/controllers/api/frontend/v1/lv/Lektor.php
index 4a244c1a1..68bec1bc4 100644
--- a/application/controllers/api/frontend/v1/lv/Lektor.php
+++ b/application/controllers/api/frontend/v1/lv/Lektor.php
@@ -107,7 +107,8 @@ class Lektor extends FHCAPI_Controller
 						$this->form_validation->set_rules($field, 'Planstunden', 'integer|greater_than_equal_to[0]');
 						break;
 					case 'stundensatz':
-						$this->form_validation->set_rules($field, 'Stundensatz', 'numeric|greater_than_equal_to[0]');
+						$formData['stundensatz'] = str_replace(',', '.', $formData['stundensatz']);
+						$this->form_validation->set_rules($field, 'Stundensatz', 'callback__check_stundensatz');
 						break;
 					case 'faktor':
 						$this->form_validation->set_rules($field, 'Faktor', 'numeric|greater_than_equal_to[0]');
@@ -119,6 +120,7 @@ class Lektor extends FHCAPI_Controller
 						$this->form_validation->set_rules($field, 'Bis Melden', 'trim');
 						break;
 					case 'semesterstunden':
+						$formData['semesterstunden'] = str_replace(',', '.', $formData['semesterstunden']);
 						$this->form_validation->set_rules($field, 'Semesterstunden', 'callback__check_semesterstunden');
 						break;
 					case 'mitarbeiter_uid':
@@ -129,7 +131,7 @@ class Lektor extends FHCAPI_Controller
 		}
 		if (!$this->form_validation->run())
 		{
-			$this->terminateWithError($this->form_validation->error_array());
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
 		if (isset($formData['semesterstunden']) && (!is_numeric($formData['semesterstunden']) || $formData['semesterstunden'] === ''))
@@ -145,9 +147,26 @@ class Lektor extends FHCAPI_Controller
 		$result = $this->_ci->lektorlib->updateLektorFromLehreinheit($lehreinheit_id, $mitarbeiter_uid, $formData);
 
 		if (isError($result)) $this->terminateWithError(getError($result));
-		$this->terminateWithSuccess("Erfolgreich geupdated");
+		$this->terminateWithSuccess($result);
 	}
 
+	public function _check_stundensatz($value)
+	{
+		$value = str_replace(',', '.', $value);
+
+		if (!is_numeric($value))
+		{
+			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss eine Zahl sein.');
+			return false;
+		}
+
+		if ($value < 0 || $value >= 10000) {
+			$this->form_validation->set_message('_check_decimal', 'Das Feld {field} muss zwischen 0 und 10000 liegen.');
+			return false;
+		}
+
+		return true;
+	}
 	public function _check_semesterstunden($value)
 	{
 		if ($value === null || $value === '') {
@@ -171,6 +190,14 @@ class Lektor extends FHCAPI_Controller
 			);
 			return false;
 		}
+		if ($value > 999.99)
+		{
+			$this->form_validation->set_message(
+				'_check_semesterstunden',
+				'Das Feld {field} darf maximal 999,99 betragen.'
+			);
+			return false;
+		}
 
 		return true;
 	}
diff --git a/application/controllers/api/frontend/v1/lv/Setup.php b/application/controllers/api/frontend/v1/lv/Setup.php
index cf73697a7..a2c167dd6 100644
--- a/application/controllers/api/frontend/v1/lv/Setup.php
+++ b/application/controllers/api/frontend/v1/lv/Setup.php
@@ -50,6 +50,11 @@ class Setup extends FHCAPI_Controller
 			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Details.js',
 			'config' => []
 		);
+		$tabs['gruppen'] = array (
+			'title' =>  'Gruppen',
+			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Gruppen.js',
+			'config' => []
+		);
 		$tabs['lektor'] = array (
 			'title' =>  'LektorInnenzuteilung',
 			'component' => APP_ROOT . 'public/js/components/LVVerwaltung/Tabs/Lektor.js',
diff --git a/application/libraries/LektorLib.php b/application/libraries/LektorLib.php
index 44c71cdaa..e06e2b728 100644
--- a/application/libraries/LektorLib.php
+++ b/application/libraries/LektorLib.php
@@ -176,11 +176,11 @@ class LektorLib
 					if (!$echter_dv && (!$this->_ci->permissionlib->isBerechtigt('admin')))
 					{
 						if (!$this->LehrauftragAufFirma(isset($formData['mitarbeiter_uid']) ? $formData['mitarbeiter_uid'] : $mitarbeiter_uid))
-							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\n Daten wurden NICHT gespeichert!\n\n");
+							return error("ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden NICHT gespeichert!\n\n");
 					}
 					else
 					{
-						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\n Daten wurden gespeichert!\n\n";
+						$warning .= "ACHTUNG: Die maximal erlaubte Semesterstundenanzahl des Lektors von $summe Stunden ($stundengrenze->stunden) wurde ueberschritten!\nDaten wurden gespeichert!\n\n";
 					}
 
 					$stunden_limit_result = $this->getStundenInstitut($mitarbeiter_uid, $lehreinheit->studiensemester_kurzbz, $oe_array);
@@ -190,7 +190,7 @@ class LektorLib
 						$stunden_limit_array = getData($stunden_limit_result);
 						foreach ($stunden_limit_array as $stunden_limit)
 						{
-							$warning .= $stunden_limit->summe . ' Stunden' . $stunden_limit->bezeichnung;
+							$warning .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
 						}
 					}
 				}
@@ -206,7 +206,7 @@ class LektorLib
 		$benutzer_aktiv = getData($benutzer_result)[0]->aktiv;
 
 		if (!$benutzer_aktiv)
-			$warning .= "Achtung: Der/Die Benutzer*in ist inaktiv!\nBitte informieren Sie die Personalbteilung.\n\nDaten wurden gespeichert.\n\n";
+			$warning .= "Achtung: Der/Die Benutzer*in ist inaktiv!\nBitte informieren Sie die Personalbteilung.\nDaten wurden gespeichert.\n\n";
 
 		$updatableFields = array(
 			'semesterstunden',
@@ -236,9 +236,9 @@ class LektorLib
 
 		if (isError($result)) return $result;
 
-		if ($warning !== '') return error($warning);
+		if ($warning !== '') return success(['warning' => $warning]);
 
-		return success('Successfully updated Lehreinheit');
+		return success('Erfolgreich geupdated');
 	}
 
 	private function getMaxStunden($mitarbeiter_uid, $studiensemester_kurzbz, $studiengang_kz, $echter_dv)
@@ -280,7 +280,7 @@ class LektorLib
 
 					foreach ($stunden_limit_array as $stunden_limit)
 					{
-						$error .= $stunden_limit->summe . ' Stunden' . $stunden_limit->bezeichnung;
+						$error .= $stunden_limit->summe . ' Stunden ' . $stunden_limit->bezeichnung . "\n";
 					}
 				}
 				return error($error);
diff --git a/public/css/Lvverwaltung.css b/public/css/Lvverwaltung.css
index 38d74def4..6e0f4c760 100644
--- a/public/css/Lvverwaltung.css
+++ b/public/css/Lvverwaltung.css
@@ -28,3 +28,13 @@ textarea[name="anmerkung"] {
 	content: '\f073';
 	color: #f3c541;
 }
+
+
+.modal-dialog.modal-xxl {
+	max-width: 95% !important;
+}
+
+.tabulator-menu .tabulator-menu-item.tabulator-menu-item-submenu:after
+{
+	border-color: black;
+}
diff --git a/public/css/Tabulator6.css b/public/css/Tabulator6.css
index 8be726544..7a66dd2f6 100644
--- a/public/css/Tabulator6.css
+++ b/public/css/Tabulator6.css
@@ -1 +1,153 @@
-@import '../../vendor/olifolkerd/tabulator6/dist/css/tabulator_simple.min.css';
\ No newline at end of file
+@import '../../vendor/olifolkerd/tabulator6/dist/css/tabulator_simple.min.css';
+.tabulator-row {
+    border-bottom: none;
+}
+.tabulator-row .tabulator-frozen,
+.tabulator-row .tabulator-cell {
+    border-bottom: 1px solid #dee2e6;
+}
+.tabulator-row.tabulator-row-even {
+    background-color: transparent;
+}
+.tabulator-headers .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-frozen,
+.tabulator-row.tabulator-row-odd .tabulator-cell {
+    background-color: #fff;
+}
+.tabulator-row.tabulator-row-even .tabulator-frozen,
+.tabulator-row.tabulator-row-even .tabulator-cell {
+    background-color: #f2f2f2;
+}
+.tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.tabulator-row.tabulator-selectable:hover .tabulator-cell {
+    background-color: #ececec;
+}
+.tabulator-row.tabulator-selected .tabulator-frozen,
+.tabulator-row.tabulator-selected .tabulator-cell {
+    background-color: #9abcea;
+}
+.tabulator-row.tabulator-selected:hover .tabulator-frozen,
+.tabulator-row.tabulator-selected:hover .tabulator-cell {
+    background-color: #769bcc;
+}
+.tabulator .tabulator-col-resize-handle:last-of-type {
+    z-index: 999999;
+}
+
+/* classes for rows that are not selectable in the tabulator, except for rows that are used for calculation */
+.tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
+    color: #adb5bd !important;
+    pointer-events: none !important;
+}
+
+.tabulator-row.tabulator-unselectable a {
+    pointer-events: auto !important;
+}
+
+/* using bootstrap background classes to style the background color of tabulator rows */
+/* bg-warning */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-warning {
+    background-color: #fcf8e3;
+
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-warning,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-warning {
+    background-color: #fcf8e3;
+
+}
+
+/* bg-success */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-success {
+    background-color: #dff0d8;
+
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-success,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-success {
+    background-color: #dff0d8;
+
+}
+
+/* bg-info */
+/* odd-rows */
+.tabulator-headers .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-odd .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-odd .tabulator-cell.bg-info {
+    background-color: #d9edf7;
+
+}
+/* even-rows */
+.tabulator-headers .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-even .tabulator-frozen.bg-info,
+.tabulator-row.tabulator-row-even .tabulator-cell.bg-info {
+    background-color: #d9edf7;
+
+}
+
+/* special bootstrap5 styling for tableWidget and their accordion-item ::after content */
+.accordion-button::after{
+    content:none !important;
+}
+
+
+.tabulator {
+    font-size: 1rem;
+}
+
+.tabulator-initialfontsize .tabulator {
+    font-size: 14px;
+}
+
+.tabulator-row.tabulator-unselectable .tabulator-cell {
+    pointer-events: all;
+}
+
+.tabulator-tooltip {
+    color: #fff;
+    background-color: #000;
+}
+
+.tabulator-row.tabulator-unselectable:not(.tabulator-calcs) {
+    color: #777 !important;
+}
+
+.tabulator-cell .btn {
+    padding: 0 .375rem;
+    font-size: calc(1rem - 2px / 1.5); /* substract border (2 x 1px) modified by the line-height (1.5) */
+    border-radius: .2rem;
+    vertical-align: baseline;
+}
+
+.tabulator-row.tabulator-selectable:focus {
+    box-shadow: 0 0 0 .24rem rgba(13,110,253,.25);
+    z-index: 1;
+    outline: 0;
+}
+
+.btn-select-col-selected
+{
+    background-color: #e6e6e6;
+}
+
+.accordion-item-dark, .accordion-item-dark:focus{
+    background-color:#CED4DA !important;
+    border-color:#ADB5BD !important;
+    box-shadow: none !important;
+}
+
+/**
+ * Make keyboard-focused list items look like the mouse-hovered list items
+ */
+.tabulator-edit-list .tabulator-edit-list-item.focused {
+    color: #fff;
+    background: #1d68cd;
+}
diff --git a/public/js/components/LVVerwaltung/Details/Form.js b/public/js/components/LVVerwaltung/Details/Form.js
index eed65f7ad..5908512d7 100644
--- a/public/js/components/LVVerwaltung/Details/Form.js
+++ b/public/js/components/LVVerwaltung/Details/Form.js
@@ -38,33 +38,6 @@ export default {
 	},
 	template: `
 	<div>
-		<div class="row align-items-start mb-3">
-			<form-input
-				v-if="showLVID"
-				:label="$p.t('lehre', 'lehrveranstaltung_id')"
-				type="text"
-				container-class="col-3"
-				v-model="data.lehrveranstaltung_id"
-				name="lehrveranstaltung_id"
-			 />
-			<form-input
-				v-if="showGewichtung"
-				:label="$p.t('lehre', 'gewicht')"
-				type="text"
-				container-class="col-3"
-				v-model="data.gewicht"
-				name="gewicht"
-			/>
-			<form-input
-				:label="$p.t('lehre', 'detailanmerkung')"
-				type="textarea"
-				container-class="col-3"
-				v-model="formattedAnmerkung"
-				name="anmerkung"
-				id="anmerkung"
-				rows="4"
-			/>
-		</div>
 		<div class="row mb-3">
 			<form-input
 				:label="$p.t('lehre', 'lehrfach')"
@@ -96,55 +69,15 @@ export default {
 				{{ lehrform.bez_kurz }} {{ lehrform.bez }}
 				</option>
 			</form-input>
-		</div>
-	
-		<div class="row mb-3">
+			
 			<form-input
-				:label="$p.t('global', 'sprache')"
-				type="select"
+				:label="$p.t('lehre', 'detailanmerkung')"
+				type="textarea"
 				container-class="col-3"
-				v-model="data.sprache"
-				name="sprache"
-			>
-				<option
-				v-for="sprache in dropdowns.sprachen_array"
-				:key="sprache.sprache"
-				:value="sprache.sprache"
-				>
-				{{ sprache.sprache }}
-				</option>
-			</form-input>
-			<form-input
-				:label="$p.t('lehre', 'unr')"
-				type="text"
-				container-class="col-3"
-				v-model="data.unr"
-				name="unr"
-			/>
-		</div>
-	
-		<div class="row mb-3">
-			<form-input
-				:label="$p.t('lehre', 'studiensemester')"
-				type="select"
-				container-class="col-3"
-				v-model="data.studiensemester_kurzbz"
-				name="studiensemester_kurzbz"
-			>
-				<option
-				v-for="semester in dropdowns.studiensemester_array"
-				:key="semester.studiensemester_kurzbz"
-				:value="semester.studiensemester_kurzbz"
-				>
-				{{ semester.studiensemester_kurzbz }}
-				</option>
-			</form-input>
-			<form-input
-				:label="$p.t('lehre', 'lehre')"
-				type="checkbox"
-				container-class="col-3"
-				v-model="data.lehre"
-				name="lehre"
+				v-model="formattedAnmerkung"
+				name="anmerkung"
+				id="anmerkung"
+				rows="10"
 			/>
 		</div>
 	
@@ -179,30 +112,109 @@ export default {
 				{{ raumtyp.raumtyp_kurzbz }} {{ raumtyp.beschreibung }}
 				</option>
 			</form-input>
+			
+			
+		</div>
+	
+	
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('global', 'sprache')"
+				type="select"
+				container-class="col-3"
+				v-model="data.sprache"
+				name="sprache"
+			>
+				<option
+				v-for="sprache in dropdowns.sprachen_array"
+				:key="sprache.sprache"
+				:value="sprache.sprache"
+				>
+				{{ sprache.sprache }}
+				</option>
+			</form-input>
+			
+			<form-input
+				:label="$p.t('lehre', 'studiensemester')"
+				type="select"
+				container-class="col-3"
+				v-model="data.studiensemester_kurzbz"
+				name="studiensemester_kurzbz"
+			>
+				<option
+				v-for="semester in dropdowns.studiensemester_array"
+				:key="semester.studiensemester_kurzbz"
+				:value="semester.studiensemester_kurzbz"
+				>
+				{{ semester.studiensemester_kurzbz }}
+				</option>
+			</form-input>
+			
+			
+			
 		</div>
 	
 		<div class="row mb-3">
 			<form-input
 				:label="$p.t('lehre', 'startkw')"
 				type="number"
-				container-class="col-2"
+				min="0"
+				container-class="col-1"
 				v-model="data.start_kw"
 				name="start_kw"
 			/>
 			<form-input
 				:label="$p.t('lehre', 'stundenblockung')"
 				type="number"
-				container-class="col-2"
+				min="0"
+				container-class="col-1"
 				v-model="data.stundenblockung"
 				name="stundenblockung"
 			/>
 			<form-input
 				:label="$p.t('lehre', 'wochenrhythmus')"
 				type="number"
-				container-class="col-2"
+				min="0"
+				container-class="col-1"
 				v-model="data.wochenrythmus"
 				name="wochenrythmus"
 			/>
+			
+			 <div class="col-3 d-flex align-items-end">
+				<form-input
+					:label="$p.t('lehre', 'lehre')"
+					type="checkbox"
+					v-model="data.lehre"
+					name="lehre"
+				/>
+			</div>
+		
+		</div>
+		
+		<div class="row mb-3">
+			<form-input
+				v-if="showLVID"
+				:label="$p.t('lehre', 'lehrveranstaltung_id')"
+				type="text"
+				container-class="col-2"
+				v-model="data.lehrveranstaltung_id"
+				name="lehrveranstaltung_id"
+			 />
+			<form-input
+				:label="$p.t('lehre', 'unr')"
+				type="text"
+				container-class="col-1"
+				v-model="data.unr"
+				name="unr"
+			/>
+			<form-input
+				v-if="showGewichtung"
+				:label="$p.t('lehre', 'gewicht')"
+				type="text"
+				container-class="col-1"
+				v-model="data.gewicht"
+				name="gewicht"
+			/>
 		</div>
 	</div>
 `
diff --git a/public/js/components/LVVerwaltung/Details/Gruppen.js b/public/js/components/LVVerwaltung/Details/Gruppen.js
index 219b956d8..a6f9df005 100644
--- a/public/js/components/LVVerwaltung/Details/Gruppen.js
+++ b/public/js/components/LVVerwaltung/Details/Gruppen.js
@@ -50,7 +50,7 @@ export default{
 							let button = document.createElement('button');
 							container.className = "d-flex gap-1";
 
-							button.className = 'btn btn-outline-secondary btn-action';
+							button.className = 'btn btn-outline-secondary';
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('ui', 'loeschen');
 							button.addEventListener('click', (event) => {
@@ -63,7 +63,7 @@ export default{
 							{
 								button = document.createElement('button');
 								container.className = "d-flex gap-2";
-								button.className = 'btn btn-outline-secondary btn-action';
+								button.className = 'btn btn-outline-secondary';
 								button.innerHTML = '<i class="fa fa-calendar-xmark"></i>';
 								button.title = this.$p.t('lehre', 'auslvplanentfernen');
 								button.disabled = !cell.getData().verplant;
diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index e9d132848..a1ff28a2e 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -88,10 +88,12 @@ export default {
 			},
 			selectedStudiengang: '',
 			searchbaroptions: {
+				origin: 'lvverwaltung',
 				cssclass: "position-relative",
 				calcheightonly: true,
 				types: [
-					"mitarbeiter"
+					"mitarbeiter",
+					"mitarbeiter_ohne_zuordnung"
 				],
 				actions: {
 					employee: {
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
index 0f6b9e0f7..d4c6aa5e3 100644
--- a/public/js/components/LVVerwaltung/Lektor/Daten.js
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -121,9 +121,9 @@ export default{
 			}
 			this.$refs.form.call(ApiLektor.update(updatedData))
 				.then(result => {
-					let error = result.data?.error;
-					if (error)
-						this.$fhcAlert.alertWarning(error)
+					let warning = result.data?.retval?.warning;
+					if (warning)
+						this.$fhcAlert.alertWarning(warning)
 					this.original = {...this.data};
 
 					if (this.changed.mitarbeiter_uid)
@@ -192,6 +192,7 @@ export default{
 						container-class="col-3"
 						dropdown
 						@complete="searchLektor"
+						name="lektorautocomplete"
 					></form-input>
 					
 					<form-input
@@ -207,7 +208,9 @@ export default{
 				<div class="row mb-3">
 					<form-input
 						:label="$p.t('lehre', 'las')"
-						type="text"
+						type="number"
+						min="0"
+						step="0.01"
 						container-class="col-3"
 						:disabled="data.vertrag?.vertragsstatus_kurzbz === 'akzeptiert'"
 						v-model="data.semesterstunden"
@@ -217,7 +220,9 @@ export default{
 					
 					<form-input
 						:label="$p.t('lehre', 'planstunden')"
-						type="text"
+						type="number"
+						min="0"
+						step="0.01"
 						container-class="col-3"
 						v-model="data.planstunden"
 						name="planstunden"
@@ -231,7 +236,9 @@ export default{
 						:label="data.default_stundensatz !== null 
 							? $p.t('lehre', 'stundensatz') + ' (' + $p.t('lehre', 'default') + ': ' + data.default_stundensatz + ')'
 							: $p.t('lehre', 'stundensatz')"
-						type="text"
+						type="number"
+						min="0"
+						step="0.01"
 						container-class="col-3"
 						v-model="data.stundensatz"
 						:disabled="data.vertrag?.vertragsstatus_kurzbz === 'akzeptiert'"
diff --git a/public/js/components/LVVerwaltung/Lektor/Table.js b/public/js/components/LVVerwaltung/Lektor/Table.js
index 237554be9..4e568f9db 100644
--- a/public/js/components/LVVerwaltung/Lektor/Table.js
+++ b/public/js/components/LVVerwaltung/Lektor/Table.js
@@ -85,7 +85,7 @@ export default{
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.innerHTML = '<i class="fa fa-calendar-xmark"></i>';
 							button.disabled = !cell.getData().verplant;
-							button.title = this.$p.t('ui', 'auslvplanentfernen');
+							button.title = this.$p.t('lehre', 'auslvplanentfernen');
 							button.addEventListener('click', (event) => {
 								event.stopPropagation();
 								this.deleteLVPlan(cell.getData().mitarbeiter_uid, cell.getData().lehreinheit_id)
diff --git a/public/js/components/LVVerwaltung/Lektor/Vertrag.js b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
index f36fad8e0..bdb156546 100644
--- a/public/js/components/LVVerwaltung/Lektor/Vertrag.js
+++ b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
@@ -88,8 +88,14 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 
-		cancelVertrag()
+		async cancelVertrag()
 		{
+
+			if (await this.$fhcAlert.confirm({
+				message: this.$p.t('lehre', 'vertragConfirm'),
+				acceptLabel: this.$p.t('ui', 'ja').charAt(0).toUpperCase() + this.$p.t('ui', 'ja').slice(1),
+				acceptClass: 'btn btn-danger'}) === false)
+				return;
 			let needUpdate = {
 				vertrag_id: this.data.vertrag.vertrag_id,
 				mitarbeiter_uid: this.mitarbeiter_uid,
@@ -126,6 +132,7 @@ export default{
 								type="button" 
 								class="btn btn-outline-secondary w-100"
 								@click="cancelVertrag"
+								:title="$p.t('lehre', 'cancelvertrag')"
 							>
 								<i class="fa-solid fa-ban"></i>
 							</button>
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index fa288f8d7..2f37e4207 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -670,19 +670,19 @@ export default {
 			<slot name="filterzuruecksetzen"></slot>
 		</template>
 	</core-filter-cmpt>
-		<bs-modal ref="lehreinheitModal" dialogClass="modal-lg">
-			<template #title>
-				<p class="fw-bold mt-3">{{$p.t('lehre', 'newlehreinheit')}}</p>
-			</template>
+	<bs-modal ref="lehreinheitModal" dialogClass="modal-xxl">
+		<template #title>
+			<p class="fw-bold mt-3">{{$p.t('lehre', 'newlehreinheit')}}</p>
+		</template>
 			
-			<template v-if="lv_info">
-				<details-form :data="lv_info"/>
-			</template>
+		<template v-if="lv_info">
+			<details-form :data="lv_info"/>
+		</template>
 			
-			<template #footer>
-				<button type="button" class="btn btn-primary" @click="addNewLehreinheit">{{$p.t('ui', 'speichern')}}</button>
-			</template>
-		</bs-modal>
+		<template #footer>
+			<button type="button" class="btn btn-primary" @click="addNewLehreinheit">{{$p.t('ui', 'speichern')}}</button>
+		</template>
+	</bs-modal>
 
 `
 };
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Setup/Tabs.js b/public/js/components/LVVerwaltung/Setup/Tabs.js
index af14fbf32..62c5bbc31 100644
--- a/public/js/components/LVVerwaltung/Setup/Tabs.js
+++ b/public/js/components/LVVerwaltung/Setup/Tabs.js
@@ -50,7 +50,6 @@ export default {
 					:modelValue="lv[0]"
 					:config="configLVTabs"
 					:default="$route.params.tab"
-					style="flex: 1 1 0%; height: 0%"
 					@changed="reload"
 				/>
 			</div>
diff --git a/public/js/components/LVVerwaltung/Tabs/Details.js b/public/js/components/LVVerwaltung/Tabs/Details.js
index ce0102177..cb3275d23 100644
--- a/public/js/components/LVVerwaltung/Tabs/Details.js
+++ b/public/js/components/LVVerwaltung/Tabs/Details.js
@@ -111,23 +111,14 @@ export default {
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">{{$p.t('ui', 'speichern')}}</button>
 		</div>
 		<fieldset class="overflow-hidden">
-			<legend>{{this.$p.t('lehre', 'lehreinheit')}}</legend>
+			<div class="core-header d-flex flex-column w-100 overflow-auto pb-3 gap-0">
+				<legend>{{ this.$p.t('lehre', 'lehreinheit') }}</legend>
+				<small v-if="data" v-html="data.lehreinheit_id" class="text-muted"></small>
+			</div>
 			<template v-if="data">
 				<details-form :data="data"/>
 			</template>
 		</fieldset>	
 	</core-form>
-	<fieldset class="overflow-hidden">
-		<div class="row">
-			<div class="col-6">
-				<legend>{{this.$p.t('lehre', 'gruppen')}}</legend>
-				<gruppen-table ref="gruppen_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-table>
-			</div>
-			<div class="col-6">
-				<legend>{{this.$p.t('lehre', 'assignedPersons')}}</legend>
-				<gruppen-direkt-table ref="gruppen_direkt_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-direkt-table>
-			</div>
-		</div>
-		
-	</fieldset>`
+	`
 };
\ No newline at end of file
diff --git a/public/js/components/LVVerwaltung/Tabs/Gruppen.js b/public/js/components/LVVerwaltung/Tabs/Gruppen.js
new file mode 100644
index 000000000..2879c1959
--- /dev/null
+++ b/public/js/components/LVVerwaltung/Tabs/Gruppen.js
@@ -0,0 +1,39 @@
+import GruppenTable from '../Details/Gruppen.js';
+import GruppenDirektTable from '../Details/Direktinskription.js';
+
+export default {
+	name: "LVTabGruppen",
+	components: {
+		GruppenTable,
+		GruppenDirektTable,
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		},
+	},
+	inject: {
+		dropdowns: {
+			from: 'dropdowns'
+		}
+	},
+
+	template: `
+
+		<fieldset class="overflow-hidden">
+			<div class="row">
+				<div class="col-6">
+					<legend>{{this.$p.t('lehre', 'gruppen')}}</legend>
+					<gruppen-table ref="gruppen_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-table>
+				</div>
+				<div class="col-6">
+					<legend>{{this.$p.t('lehre', 'assignedPersons')}}</legend>
+					<gruppen-direkt-table ref="gruppen_direkt_table" :lehreinheit_id="modelValue.lehreinheit_id"></gruppen-direkt-table>
+				</div>
+			</div>
+			
+		</fieldset>
+	`
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0927ea309..6a4c98fd9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2984,6 +2984,46 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'cancelvertrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag stornieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancel Contract',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'vertragConfirm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Möchten Sie den Vertrag wirklich stornieren?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you really want to cancel the contract?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 41dbd83bdb39cc1035e9a5bcd7d88b7910ffab19 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 18 Sep 2025 15:27:04 +0200
Subject: [PATCH 0779/1357] phrases tags als default entfernt master gemerged

---
 application/config/lvverwaltung.php | 14 ++---
 system/phrasesupdate.php            | 80 +++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/application/config/lvverwaltung.php b/application/config/lvverwaltung.php
index 466f5c7ab..4fe09bff3 100644
--- a/application/config/lvverwaltung.php
+++ b/application/config/lvverwaltung.php
@@ -1,11 +1,11 @@
 <?php
 
-$config['lvverwaltung_tags'] = [
-	'hinweis_stg_kf' => ['readonly' => false],
-	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => false],
-	'finished_stg' => ['readonly' => false],
+/*It defines which tags are available in LVVerwaltung and whether they are editable
 
-	'finished_kf' => ['readonly' => true],
-	'inwork_kf' => ['readonly' => true],
+$config['lvverwaltung_tags'] = [
+	'tag_1' => ['readonly' => false],
+	'tag_1' => ['readonly' => true]
 ];
+*/
+
+$config['lvverwaltung_tags'] = [];
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 437e76c1e..008ad8a8d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43278,6 +43278,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lehrauftrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrauftrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching lectureship',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'kategorie',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kategorie',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Category',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'project',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kategorie',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Category',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lventwicklung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Weiterentwicklung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Development',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'pep',
 		'category' => 'ui',

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

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

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

From 0577f3f8b96a31fbd7f087c1586a2de717d64b30 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 18 Sep 2025 18:46:11 +0200
Subject: [PATCH 0781/1357] Cis4 Profile only show current userfunctions with
 description from tbl_funktion

---
 application/libraries/ProfilLib.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 2a130d263..e86a343e7 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -303,10 +303,22 @@ class ProfilLib{
 	private function getBenutzerFunktion($uid)
 	{
 		$this->ci->load->model("person/Benutzerfunktion_model","BenutzerfunktionModel");
-		$this->ci->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->ci->BenutzerfunktionModel->addSelect([
+			"tbl_funktion.beschreibung as Bezeichnung",
+			"tbl_organisationseinheit.bezeichnung as Organisationseinheit",
+			"datum_von as Gültig_von",
+			"datum_bis as Gültig_bis",
+			"COALESCE(wochenstunden, '0'::numeric(5,2)) AS \"Wochenstunden\""
+		]);
+		$this->ci->BenutzerfunktionModel->addJoin("tbl_funktion", "funktion_kurzbz");
 		$this->ci->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
 
-		$benutzer_funktion_res = $this->ci->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		$benutzer_funktion_res = $this->ci->BenutzerfunktionModel->loadWhere(
+			array(
+				'uid' => $uid,
+				'NOW()::date BETWEEN COALESCE(datum_von, \'1970-01-01\'::date) AND COALESCE(datum_bis, \'2170-12-01\'::date)' => null
+			)
+		);
 		if(isError($benutzer_funktion_res)){
 			return error(getData($benutzer_funktion_res));
 		}

From 41143a6dfc66bf34bb6b454ae2c6e059de015fc8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 19 Sep 2025 10:58:53 +0200
Subject: [PATCH 0782/1357] profile functions use
 tbl_benutzerfunktion.beschreibung in column description, format date columns
 in profile tabulators, fix vuejs dev version warnings

---
 application/libraries/ProfilLib.php           |  2 +-
 .../Cis/Profil/MitarbeiterProfil.js           | 35 ++++++++++++++-----
 .../Cis/Profil/MitarbeiterViewProfil.js       | 27 +++++++++++---
 .../ProfilComponents/RoleInformation.js       | 19 ++++++++--
 .../EditProfilComponents/ImageUpload.js       |  4 +--
 .../js/components/Cis/Profil/StudentProfil.js | 21 ++++++++---
 6 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index e86a343e7..50b8bc264 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -304,7 +304,7 @@ class ProfilLib{
 	{
 		$this->ci->load->model("person/Benutzerfunktion_model","BenutzerfunktionModel");
 		$this->ci->BenutzerfunktionModel->addSelect([
-			"tbl_funktion.beschreibung as Bezeichnung",
+			"CASE WHEN (tbl_benutzerfunktion.bezeichnung IS NOT NULL AND tbl_benutzerfunktion.bezeichnung <> '' AND tbl_benutzerfunktion.bezeichnung <> tbl_funktion.beschreibung) THEN tbl_funktion.beschreibung || ' - ' || tbl_benutzerfunktion.bezeichnung ELSE tbl_funktion.beschreibung END as \"Bezeichnung\"",
 			"tbl_organisationseinheit.bezeichnung as Organisationseinheit",
 			"datum_von as Gültig_von",
 			"datum_bis as Gültig_bis",
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 223b5c2b6..bf3c4cf49 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -11,6 +11,7 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export default {
 	components: {
@@ -40,7 +41,7 @@ export default {
 				persistence: {
 					columns: false
 				},
-				height: 300,
+				minHeight: 300,
 				layout: "fitColumns",
 				responsiveLayout: "collapse",
 				responsiveLayoutCollapseUseFormatters: false,
@@ -74,18 +75,24 @@ export default {
 					{
 						title: Vue.computed(() => this.preloadedPhrasen.gueltigVonPhrase),
 						field: "Gültig_von",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 					{
 						title: Vue.computed(() => this.preloadedPhrasen.gueltigBisPhrase),
 						field: "Gültig_bis",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 					{
 						title: Vue.computed(() => this.preloadedPhrasen.wochenstundenPhrase),
@@ -102,7 +109,7 @@ export default {
 				persistence: {
 					columns: false
 				},
-				height: 300,
+				minHeight: 300,
 				layout: "fitColumns",
 				responsiveLayout: "collapse",
 				responsiveLayoutCollapseUseFormatters: false,
@@ -138,9 +145,12 @@ export default {
 					{
 						title: Vue.computed(() => this.preloadedPhrasen.ausgabedatumPhrase),
 						field: "Ausgegeben_am",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 				],
 			}
@@ -211,6 +221,15 @@ export default {
 		setTableColumnTitles() { // reevaluates computed phrasen
 			if(this.$refs.betriebsmittelTable) this.$refs.betriebsmittelTable.tabulator.setColumns(this.betriebsmittel_table_options.columns)
 			if(this.$refs.funktionenTable) this.$refs.funktionenTable.tabulator.setColumns(this.funktionen_table_options.columns)
+		},
+		datetimeFormatterParams: function() {
+			const params = {
+				inputFormat:"yyyy-MM-dd",
+				outputFormat:"dd.MM.yyyy",
+				invalidPlaceholder:"(invalid date)",
+				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+			};
+			return params;
 		}
 	},
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index c1ce4ead6..481714590 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -5,6 +5,8 @@ import RoleInformation from "./ProfilComponents/RoleInformation.js";
 import ProfilEmails from "./ProfilComponents/ProfilEmails.js";
 import ProfilInformation from "./ProfilComponents/ProfilInformation.js";
 
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -24,7 +26,7 @@ export default {
 				persistence: {
 					columns: false
 				},
-				height: 300,
+				minHeight: 300,
 				layout: "fitColumns",
 				responsiveLayout: "collapse",
 				responsiveLayoutCollapseUseFormatters: false,
@@ -60,18 +62,24 @@ export default {
 					{
 						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
 						field: "Gültig_von",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 					{
 						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
 						field: "Gültig_bis",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						resizable: true,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 					{
 						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
@@ -91,6 +99,15 @@ export default {
 		funktionenTableBuilt: function () {
 			this.$refs.funktionenTable.tabulator.setData(this.data.funktionen);
 		},
+		datetimeFormatterParams: function() {
+			const params = {
+				inputFormat:"yyyy-MM-dd",
+				outputFormat:"dd.MM.yyyy",
+				invalidPlaceholder:"(invalid date)",
+				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+			};
+			return params;
+		}
 	},
 	watch: {
 		'data.funktionen'(newVal) {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index ae1a4f2b9..968fb2f83 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -10,21 +10,34 @@ export default {
 			type: String,
 		}
 	},
-	inject: [
-		'studiengang_kz', // inject info that should not be displayed
-	],
+	inject: {
+		// inject info that should not be displayed
+		'studiengang_kz': {
+			from: 'studiengang_kz',
+			default: false
+		},
+	},
 	computed: {
 		getLinkGruppeListe() {
+			if(this.studiengang_kz === false) {
+				return '';
+			}
 			return this.data.gruppe?.value && this.data.verband?.value && this.data.semester?.value ? FHC_JS_DATA_STORAGE_OBJECT.app_root 
 				+ 'cis/private/stud_in_grp.php?kz='+this.studiengang_kz+'&sem=' + this.data.semester.value
 				+ '&verband=' + this.data.verband.value + '&grp=' + this.data.gruppe.value : ''
 		},
 		getLinkVerbandListe() {
+			if(this.studiengang_kz === false) {
+				return '';
+			}
 			return this.data.verband?.value && this.data.semester?.value ? FHC_JS_DATA_STORAGE_OBJECT.app_root 
 				+ 'cis/private/stud_in_grp.php?kz='+this.studiengang_kz+'&sem=' + this.data.semester.value
 				+ '&verband=' + this.data.verband.value : ''
 		},
 		getLinkSemesterListe() {
+			if(this.studiengang_kz === false) {
+				return '';
+			}
 			return this.data.semester?.value ? FHC_JS_DATA_STORAGE_OBJECT.app_root 
 				+ 'cis/private/stud_in_grp.php?kz='+this.studiengang_kz+'&sem=' + this.data.semester.value : ''
 		}
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
index 672b4ce4a..2d2efb0fe 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
@@ -16,7 +16,7 @@ export default {
 	mixins: [BsModal],
 	props: {
 		titel: {
-			type: Object,
+			type: String,
 		},
 		files: {
 			type: Array,
@@ -57,7 +57,7 @@ export default {
 	},
 	template: /*html*/`
 
-	<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+	<bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 		<template #title>
 			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilBildUpdateMessage',[titel])}}</p>
 		</template>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 8d46377d5..3f8e8380d 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -11,6 +11,7 @@ import FetchProfilUpdates from "./ProfilComponents/FetchProfilUpdates.js";
 import EditProfil from "./ProfilModal/EditProfil.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export default {
 	components: {
@@ -39,7 +40,7 @@ export default {
 				persistence: {
 					columns: false
 				},
-				height: 200,
+				minHeight: 200,
 				layout: "fitColumns",
 				columns: [{
 					title: Vue.computed(() => this.preloadedPhrasen.zutrittsGruppenPhrase),
@@ -51,7 +52,7 @@ export default {
 				persistence: {
 					columns: false
 				},
-				height: 300,
+				minHeight: 300,
 				layout: "fitColumns",
 				responsiveLayout: "collapse",
 				responsiveLayoutCollapseUseFormatters: false,
@@ -85,9 +86,12 @@ export default {
 					{
 						title: Vue.computed(() =>this.preloadedPhrasen.ausgabedatum) ,
 						field: "Ausgegeben_am",
-						headerFilter: true,
+						headerFilterFunc: 'dates',
+						headerFilter: dateFilter,
 						minWidth: 200,
-						visible: true
+						visible: true,
+						formatter:"datetime",
+						formatterParams: this.datetimeFormatterParams()
 					},
 				],
 			},
@@ -160,6 +164,15 @@ export default {
 				this.$refs.editModal.show();
 			});
 		},
+		datetimeFormatterParams: function() {
+			const params = {
+				inputFormat:"yyyy-MM-dd",
+				outputFormat:"dd.MM.yyyy",
+				invalidPlaceholder:"(invalid date)",
+				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+			};
+			return params;
+		}
 	},
 
 	computed: {

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

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

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

From 3f5801f6ed92f8861d8f39ff89a213fdbccb26b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 22 Sep 2025 09:26:13 +0200
Subject: [PATCH 0784/1357] =?UTF-8?q?Men=C3=BCpunkt=20f=C3=BCr=20LV-Verwal?=
 =?UTF-8?q?tung=20im=20Vilesci=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 5cbb6512c..11fd1a3a6 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -64,7 +64,7 @@ $config['navigation_header'] = array(
 				'lehrveranstaltungen' => array(
 					'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
 					'icon' => '',
-					'description' => 'Lehrveranstaltungen',
+					'description' => 'Lehrveranstaltungen Templates',
 					'sort' => 15
 				),
 				'reihungstest' => array(
@@ -81,6 +81,16 @@ $config['navigation_header'] = array(
 					'sort' => 30,
 					'requiredPermissions' => 'infocenter:r'
 				),
+				'lvverwaltung' => array(
+					'link' => site_url('LVVerwaltung'),
+					'icon' => '',
+					'description' => 'LV Verwaltung',
+					'requiredPermissions' => array(
+						'admin:r',
+						'assistenz:r'
+					),
+					'sort' => 35
+				),
 				'lehrauftrag' => array(
 					'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
 					'description' => 'Lehrauftrag',

From ef56af633790177d4010a78e82e5abed9bcb61ff Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 22 Sep 2025 09:40:37 +0200
Subject: [PATCH 0785/1357] lv teil hinzufuegen beim semesterwechsel das
 richtige semester preselecten lv teil kopieren nur bei lv teilen anzeigen

---
 public/js/components/LVVerwaltung/LVVerwaltung.js   | 12 +++++-------
 public/js/components/LVVerwaltung/Lektor/Daten.js   |  4 ++--
 public/js/components/LVVerwaltung/Lektor/Vertrag.js |  1 -
 public/js/components/LVVerwaltung/Setup/Table.js    | 12 ++++++++++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index a1ff28a2e..c03e7c84c 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -32,13 +32,7 @@ export default {
 		studiensemester_kurzbz: { type: String, required: false, default: null },
 		emp: { type: String, required: false, default: null }
 	},
-	computed: {
-		selectedStudiensemester() {
-			return this.studiensemester_kurzbz != null
-				? this.studiensemester_kurzbz
-				: this.defaultSemester;
-		}
-	},
+
 	provide() {
 		return {
 			currentSemester: Vue.computed(() => this.selectedStudiensemester),
@@ -70,12 +64,16 @@ export default {
 		emp() {
 			this.updateFilter();
 		},
+		studiensemester_kurzbz(newVal) {
+			this.selectedStudiensemester = newVal ?? this.defaultSemester;
+		}
 	},
 	data() {
 		return {
 			selected: [],
 			studiengang: "",
 			filter: {},
+			selectedStudiensemester: this.studiensemester_kurzbz ?? this.defaultSemester,
 			endpoint: ApiStudiengangTree,
 			dropdowns: {
 				studiensemester_array: [],
diff --git a/public/js/components/LVVerwaltung/Lektor/Daten.js b/public/js/components/LVVerwaltung/Lektor/Daten.js
index d4c6aa5e3..a9c7e53be 100644
--- a/public/js/components/LVVerwaltung/Lektor/Daten.js
+++ b/public/js/components/LVVerwaltung/Lektor/Daten.js
@@ -198,7 +198,7 @@ export default{
 					<form-input
 						:label="$p.t('lehre', 'anmerkung')"
 						type="text"
-						container-class="col-3"
+						container-class="col-6"
 						v-model="data.anmerkung"
 						name="anmerkung"
 						>
@@ -230,7 +230,7 @@ export default{
 					</form-input>
 
 				</div>
-				<div class="row mb-3">
+				<div class="row mb-3 d-flex align-items-end">
 					
 					<form-input
 						:label="data.default_stundensatz !== null 
diff --git a/public/js/components/LVVerwaltung/Lektor/Vertrag.js b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
index bdb156546..095e92f7c 100644
--- a/public/js/components/LVVerwaltung/Lektor/Vertrag.js
+++ b/public/js/components/LVVerwaltung/Lektor/Vertrag.js
@@ -109,7 +109,6 @@ export default{
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 	},
-	// language=HTML
 	template: `
 		<core-form ref="form">
 			<fieldset class="overflow-hidden" v-if="showVertragsdetails">
diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js
index 2f37e4207..309960f54 100644
--- a/public/js/components/LVVerwaltung/Setup/Table.js
+++ b/public/js/components/LVVerwaltung/Setup/Table.js
@@ -56,7 +56,13 @@ export default {
 				}
 			},
 			deep: true,
-
+		},
+		currentSemester: {
+			handler(newVal)
+			{
+				this.lv_info_default.studiensemester_kurzbz = newVal
+				this.lv_info = false;
+			}
 		}
 	},
 	data() {
@@ -137,6 +143,8 @@ export default {
 				selectableRows: true,
 				rowContextMenu: (component, e) => {
 
+					if (e.getData()?.lehreinheit_id === undefined)
+						return;
 					return [
 						{
 							label: "LV-Teil kopieren",
@@ -159,7 +167,7 @@ export default {
 									label: "Nur mit Gruppen",
 									action: (e, row) =>
 									{
-										this.copyLehreinheit(row, "halb");
+										this.copyLehreinheit(row, "gruppen");
 									},
 								},
 								{

From 14f5a651a4144e5da535426db8bf620124568364 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 22 Sep 2025 10:47:12 +0200
Subject: [PATCH 0786/1357] abgabetool rechte; WIP magic modal for next QG
 Termin logic handling;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 61 +++++++++++++------
 .../models/education/Projektarbeit_model.php  | 41 ++++++-------
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 52 +++++++++++++++-
 .../61164_abgabetool_quality_gates.php        | 44 ++++++++++++-
 system/phrasesupdate.php                      | 20 ++++++
 5 files changed, 174 insertions(+), 44 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index a4384a890..c87d3609d 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -36,16 +36,16 @@ class Abgabe extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getConfig' => self::PERM_LOGGED,
-			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
-			'getStudentProjektabgaben' => self::PERM_LOGGED,
-			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
-			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
-			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
-			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'postSerientermin' => self::PERM_LOGGED,
-			'fetchDeadlines' => self::PERM_LOGGED, // TODO: mitarbeiter recht prüfen
+			'getConfig' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'getStudentProjektarbeiten' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
+			'getStudentProjektabgaben' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
+			'postStudentProjektarbeitZwischenabgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
+			'postStudentProjektarbeitEndupload' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
+			'getMitarbeiterProjektarbeiten' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'postProjektarbeitAbgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'deleteProjektarbeitAbgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'postSerientermin' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'fetchDeadlines' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'getPaAbgabetypen' => self::PERM_LOGGED,
 			'getNoten' => self::PERM_LOGGED
 		]);
@@ -88,7 +88,7 @@ class Abgabe extends FHCAPI_Controller
 	}
 	
 	/**
-	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
+	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool & lektor abgabetool
 	 */
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
@@ -467,8 +467,6 @@ class Abgabe extends FHCAPI_Controller
 			$showAllBool = true;
 		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
 			$showAllBool = false;
-		} else {
-//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
 		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
@@ -498,6 +496,7 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
+		$existingPaabgabe = null; 
 		if($paabgabe_id == -1) {
 			$result = $this->PaabgabeModel->insert(
 				array(
@@ -513,9 +512,15 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
-
-			
 		} else {
+			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
+			// only notiz has changed.
+			
+			// TODO: what if paabgabe is a qualgate1, is benotet negativ and then its type is changed to gate2?
+			
+			$existingResult = $this->PaabgabeModel->load($paabgabe_id);
+			$existingPaabgabe = getData($existingResult);
+			
 			$result = $this->PaabgabeModel->update(
 				$paabgabe_id,
 				array(
@@ -529,7 +534,6 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				)
 			);
-			
 		}
 		
 		// check if $paaabgabe is a qual gate and its note is deemed negative
@@ -539,7 +543,7 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->PaabgabeModel->load($paabgabe_id);
 		$paabgabeArr = $this->getDataOrTerminateWithError($result);
 		$paabgabe = $paabgabeArr[0];
-		$this->addMeta('paabgabe', $paabgabeArr);
+//		$this->addMeta('paabgabe', $paabgabeArr);
 
 		// check if abgabe even has note
 		if($paabgabe->note) {
@@ -548,13 +552,30 @@ class Abgabe extends FHCAPI_Controller
 			$noteArr = $this->getDataOrTerminateWithError($result);
 			$note = $noteArr[0];
 			if($note->positiv === false) {
-				$this->addMeta('noteNegativ', true);
+//				$this->addMeta('noteNegativ', true);
+				// TODO: somewhere in here check if there has been an existingPaabgabe and if that existing abgabe was
+				// already negativ -> dont send mail
+				
+				
+				if($existingPaabgabe && $existingPaabgabe->note) {
+					$result = $this->NoteModel->load($paabgabe->note);
+					$noteArr = $this->getDataOrTerminateWithError($result);
+					$note = $noteArr[0];
+					if($note->positiv === false) {
+						// do nothing since this means $notiz change or smth else
+					} else { // benotung legitimately changed -> email
+						$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
+					}
 					
-				$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
+				} else { // nothing existing previously -> send that mail
+					$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
+				}
+				
+				
 			}
 		}
 		
-		$this->terminateWithSuccess($paabgabe);
+		$this->terminateWithSuccess([$paabgabe, $existingPaabgabe]);
 	}
 
 	public function deleteProjektarbeitAbgabe() {
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index a6eaf7fd2..ab0ebdcd5 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -97,8 +97,7 @@ class Projektarbeit_model extends DB_Model
 	 */
 	public function getStudentProjektarbeitenWithBetreuer($studentUID)
 	{
-		$betreuerQuery = "
-		SELECT 
+		$betreuerQuery = "SELECT DISTINCT ON(projektarbeit_id)
 			vorname as bvorname,
 			nachname as bnachname,
 			titelpre as btitelpre,
@@ -106,19 +105,19 @@ class Projektarbeit_model extends DB_Model
 			titelpost AS btitelpost,
 			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
 		
-			(SELECT person_id 
-			 FROM lehre.tbl_projektbetreuer 
+			(SELECT person_id
+			 FROM lehre.tbl_projektbetreuer
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-			(SELECT betreuerart_kurzbz 
-			 FROM lehre.tbl_projektbetreuer 
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz
+			 FROM lehre.tbl_projektbetreuer
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-			(SELECT tbl_betreuerart.beschreibung 
-			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
 			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-			
+			   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+		
 			tbl_betreuerart.betreuerart_kurzbz,
 			person_id as bperson_id,
 			projektarbeit_id,
@@ -135,7 +134,7 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.schlagwoerter as schlagwoerter,
 			lehre.tbl_projektarbeit.schlagwoerter_en as schlagwoerter_en,
 			lehre.tbl_projektarbeit.abstract as abstract,
-			lehre.tbl_projektarbeit.abstract_en as abstract_en, 
+			lehre.tbl_projektarbeit.abstract_en as abstract_en,
 			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
 			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
@@ -146,15 +145,15 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer USING(person_id)
 				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
-		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		WHERE 
-			tbl_projektarbeit.student_uid = ? AND
+				 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE
+			tbl_projektarbeit.student_uid = ? AND mitarbeiter_uid IS NOT NULL AND
 			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
-		
+		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+				
 		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
 	}
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 6fa929dec..20d71ae0a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -25,6 +25,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
+			showAutomagicModalPhrase: false,
 			sdModel: [],
 			eidAkzeptiert: false,
 			enduploadTermin: null,
@@ -73,7 +74,46 @@ export const AbgabeMitarbeiterDetail = {
 						paabgabetyp_kurzbz: termin.bezeichnung?.paabgabetyp_kurzbz
 					}
 					
-					this.projektarbeit.abgabetermine.push(newTerminRes)
+					// only insert new abgabe if we actually created a new one, not when saving/editing existing
+					if(!this.projektarbeit.abgabetermine.find(abgabe => abgabe.paabgabe_id == newTerminRes.paabgabe_id)){
+						this.projektarbeit.abgabetermine.push(newTerminRes)
+					}
+					
+					
+					
+					// negative abgabe -> automagically open new termin modal
+					// really bad feature idea by management people that think
+					// they know better lmao that will be so annoying to deal with
+					
+					// TODO fix the note changed check
+					// check if the abgabe existed beforehand and thus if the note even changed -> dont spam modal open
+					// when editing text of negative abgabe
+					// const savedExistingTermin = termin.paabgabe_id == newTerminRes.paabgabe_id
+					// const noteChanged = savedExistingTermin && termin.note_pk !== newTerminRes.note
+					const newTerminResNoteOpt = this.allowedNotenOptions.find(opt => opt.note == newTerminRes.note)
+					if(newTerminResNoteOpt && !newTerminResNoteOpt.positiv) {
+
+						this.newTermin = {
+							'paabgabe_id': -1,
+							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+							'fixtermin': false,
+							'kurzbz': '',
+							'datum': new Date().toISOString().split('T')[0],
+							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+							'notiz': '',
+							'upload_allowed': false,
+							'paabgabetyp_kurzbz': '',
+							'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === newTerminRes.paabgabetyp_kurzbz),
+							'abgabedatum': null,
+							'insertvon': this.viewData?.uid ?? ''
+						}
+						
+						this.showAutomagicModalPhrase = true
+						
+						this.$refs.modalContainerCreateNewAbgabe.show()
+					}
+					
+					
 					
 					// if(paabgabe_id === -1) { // new abgabe has been inserted
 					// 	termin.paabgabe_id = res?.data?.paabgabe_id
@@ -282,13 +322,21 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-		<bs-modal id="innerModalNewAbgabe" ref="modalContainerCreateNewAbgabe" class="bootstrap-prompt" dialogClass="bordered-modal modal-xl" :backdrop="true">
+		<bs-modal 
+			id="innerModalNewAbgabe" 
+			ref="modalContainerCreateNewAbgabe" 
+			class="bootstrap-prompt" 
+			dialogClass="bordered-modal modal-xl" 
+			:backdrop="true"
+			@hideBsModal="console.log('hideBsModal'); showAutomagicModalPhrase=false;"
+		>
 			<template v-slot:title>
 				<div>
 					{{ $p.t('abgabetool/c4newAbgabetermin') }}
 				</div>
 			</template>
 			<template v-slot:default>
+				<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
 				<div v-if="newTermin">
 					<div class="row">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 1584aae01..b7ce12f8f 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -73,4 +73,46 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 		else
 			echo "<br>paabgabe column notiz default '' hinzugefuegt";
 	}
-}
\ No newline at end of file
+}
+
+if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/abgabe_student'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung)
+				SELECT 'basis/abgabe_student', 'Recht um Abgabetool für Studenten zu bedienen'";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_berechtigung insert basis/abgabe_student hinzugefuegt";
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/abgabe_lektor'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung)
+				SELECT 'basis/abgabe_lektor', 'Recht um Abgabetool für Lektoren zu bedienen'";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_berechtigung insert basis/abgabe_lektor hinzugefuegt";
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/abgabe_assistenz'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung)
+				SELECT 'basis/abgabe_assistenz', 'Recht um Abgabetool für Assistenzen zu bedienen'";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_berechtigung insert basis/abgabe_assistenz hinzugefuegt";
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d2782d5d..c544b086f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42756,6 +42756,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeQualGateNegativAddNewAutomagisch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Sie haben eine Abgabe vom Typ Quality Gate negativ benotet, bitte legen Sie zeitnah einen Nachfolgetermin an!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You have graded a submission of type Quality Gate negative, please schedule a follow-up appointment promptly!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From c69877ed85eaf7efc840348b889377e6ec9de91f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 22 Sep 2025 13:41:58 +0200
Subject: [PATCH 0787/1357] bug beim loeschen von einer notiz mit doc

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

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index c2bb03267..cfc54d5f5 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -393,10 +393,10 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		foreach ($result as $doc) {
 			$res = $this->dmslib->removeAll($doc->dms_id);
-			if (isError($result))
+			if (isError($res))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError(getError($res), self::ERROR_TYPE_GENERAL);
 			}
 		}
 

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

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

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

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

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

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

From 5efad50b62e4c27d18dd608f66f0c0a17efbee8f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 23 Sep 2025 08:31:00 +0200
Subject: [PATCH 0790/1357] added missing iframe component

---
 .../Cis/Cms/Content_types/Iframe_content.js   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 public/js/components/Cis/Cms/Content_types/Iframe_content.js

diff --git a/public/js/components/Cis/Cms/Content_types/Iframe_content.js b/public/js/components/Cis/Cms/Content_types/Iframe_content.js
new file mode 100644
index 000000000..568cfaf03
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content_types/Iframe_content.js
@@ -0,0 +1,31 @@
+import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js";
+
+export default {
+	name: "iframe_content",
+	props: {
+		content: { type: String, required: true }
+	},
+	computed: {
+		srcUrl() {
+			const parser = new DOMParser()
+			const doc = parser.parseFromString(`<div>${this.content}</div>`, "text/html");
+			const iframe = doc.querySelector("iframe[src]");
+
+			if (!iframe)
+				return "";
+
+			let url = iframe.getAttribute("src") || "";
+			return replaceRelativeLegacyLink(url);
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				v-if="srcUrl"
+				:src="srcUrl"
+				style="width:100%; height:90vh; border:0; display:block;"
+			></iframe>
+		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
+		</div>
+	`
+};

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

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

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

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

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

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

From 5326f961c6d9e2ba7eec7fb44385e7ab5fe94eae Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 25 Sep 2025 11:25:55 +0200
Subject: [PATCH 0793/1357] DetailHeader: add uid to redirectToLeitung

---
 .../js/components/DetailHeader/DetailHeader.js   | 16 +++-------------
 .../components/Vertraege/Vertragsverwaltung.js   |  1 +
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 078e2d9a2..ae5eef53e 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -68,18 +68,6 @@ export default {
 			},
 			deep: true,
 		},
-/*		person_id: {
-			handler(newVal) {
-				if (newVal) {
-					this.getHeader(this.person_id);
-					this.loadDepartmentData(this.person_id).
-					then(() => {
-						this.getLeitungOrg(this.departmentData.oe_kurzbz);
-					});
-				}
-			},
-			deep: true,
-		},*/
 	},
 	data(){
 		return{
@@ -116,7 +104,9 @@ export default {
 		},
 		redirectToLeitung(){
 			this.$emit('redirectToLeitung', {
-				person_id: this.leitungData.person_id});
+				person_id: this.leitungData.person_id,
+				uid: this.leitungData.uid
+			});
 		}
 	},
 	template: `
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index a0409190d..5368082ee 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -39,6 +39,7 @@ export default {
 		},
 		redirectToLeitung(leitung){
 			this.person_id = leitung.person_id;
+			this.mitarbeiter_uid = leitung.uid;
 		}
 	},
 	template: `

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

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

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

From 2ef2948a6e4bf2cbe32d547d18a5f7dacbf77397 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 25 Sep 2025 16:02:43 +0200
Subject: [PATCH 0795/1357] prevent strange effects when switching between
 content_types

---
 public/js/components/Cis/Cms/Content.js | 32 ++++---------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index ec1bc8a76..355add08a 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -30,39 +30,19 @@ export default {
 	},
 	data() {
 		return {
+			content_type: null,
 			content: null,
 			content_id_internal: this.content_id
 		};
 	},
 	methods: {
 		fetchContent(){
-			return this.$api
+			this.$api
 				.call(ApiCms.content(this.content_id_internal, this.version, this.sprache, this.sichtbar))
 				.then(res => {
-					this.content = res.data.content;
-					this.content_type = res.data.type;
-					
-					document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
-						el.addEventListener("click", (evt) => {
-							evt.preventDefault();
-							BsConfirm.popup(el.dataset.confirm)
-								.then(() => {
-									Axios.get(el.href)
-										.then((res) => {
-											// TODO(chris): check for success then show message and/or reload
-											location = location;
-										})
-										.catch((err) => console.error("ERROR:", err));
-								})
-								.catch(() => {
-								});
-						});
-					});
-					document.querySelectorAll("#cms [data-href]").forEach((el) => {
-						el.href = el.dataset.href.replace(
-							/^ROOT\//,
-							FHC_JS_DATA_STORAGE_OBJECT.app_root
-						);
+					this.$nextTick(function() {
+						this.content = res.data.content;
+						this.content_type = res.data.type;
 					});
 				});
 		}
@@ -96,8 +76,6 @@ export default {
 	created() {
 		this.fetchContent();
 	},
-	mounted() {
-	},
 	template: /*html*/ `
     <!-- div that contains the content -->
 	<div id="fhc-cms-content" v-if="content">

From 58b942f0441aae268b784e7b3020b4e3f364f5eb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 25 Sep 2025 16:14:09 +0200
Subject: [PATCH 0796/1357] fix typo in template_kurzbz

---
 system/dbupdate_3.4/63436_cis4_iframe_component.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4/63436_cis4_iframe_component.php b/system/dbupdate_3.4/63436_cis4_iframe_component.php
index abff4b7e1..a5b3bbf7c 100644
--- a/system/dbupdate_3.4/63436_cis4_iframe_component.php
+++ b/system/dbupdate_3.4/63436_cis4_iframe_component.php
@@ -57,7 +57,7 @@ $xslt_xhtml_c4= <<<EOD
 EOD;
 
 
-if ($result = @$db->db_query("SELECT * FROM campus.tbl_template WHERE template_kurzbz='iframe2'"))
+if ($result = @$db->db_query("SELECT * FROM campus.tbl_template WHERE template_kurzbz='iframe'"))
 {
 	if ($db->db_num_rows($result) == 0)
 	{
@@ -78,4 +78,4 @@ EOD;
 		}
 
 	}
-}
\ No newline at end of file
+}

From 6047b19f4710cb941cdca0f9d31f5e6169fe7637 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 25 Sep 2025 17:19:19 +0200
Subject: [PATCH 0797/1357] do not show contacts with type hidden in cis4
 profile

---
 application/libraries/ProfilLib.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 50b8bc264..6e93a0943 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -214,7 +214,7 @@ class ProfilLib{
 	 * @param  integer $uid the userID used to get the kontakt information
 	 * @return array all the kontakt information corresponding to a userID
 	 */
-	private function getKontaktInfo($pid)
+	private function getKontaktInfo($pid, $includehidden=false)
 	{
 		$this->ci->load->model("person/Kontakt_model","KontaktModel");
 		$this->ci->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
@@ -222,7 +222,13 @@ class ProfilLib{
 		$this->ci->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
 		$this->ci->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
 
-		$kontakte_res = $this->ci->KontaktModel->loadWhere(['person_id' => $pid]);
+		$params = array('person_id' => $pid);
+		if(!$includehidden)
+		{
+			$params['kontakttyp <>'] = 'hidden';
+		}
+
+		$kontakte_res = $this->ci->KontaktModel->loadWhere($params);
 		if(isError($kontakte_res)){
 			return error(getData($kontakte_res));
 		}

From a021c8592022d6f86ccc29f1c56902c41c8b9927 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 25 Sep 2025 17:23:03 +0200
Subject: [PATCH 0798/1357] =?UTF-8?q?sch=C3=B6nere=20phrasen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 008ad8a8d..ceb265b14 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30686,6 +30686,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'jetztStarten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Jetzt Starten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Start Now',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -42556,6 +42576,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStgSpezifischeRichtlinienBeachten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bitte beachten Sie gegebenenfalls existierende studiengangsspezifische Richtlinien und informieren Sie sich diesbezüglich. Vielen Dank.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please note any existing program-specific guidelines and inform yourself about them. Thank you.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From e908215b050aa9152803e849995e377c21d8f829 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 25 Sep 2025 17:40:39 +0200
Subject: [PATCH 0799/1357] use person_id from profilupdate request instead of
 logged in user to handle duplicates

---
 .../api/frontend/v1/ProfilUpdate.php           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index bbfed651c..6752c805a 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -813,7 +813,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_adresse_id = $insertID;
 			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			if ($insert_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id, $personID);
 			}
 		}
 		//! DELETE
@@ -829,7 +829,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$requested_change['updatevon'] = getAuthUID();
 			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
 			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
+			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
 
 		}
 		return $insertID ?? null;
@@ -852,7 +852,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_kontakt_id = $insertID;
 			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $personID);
 			}
 		}
 		//! DELETE
@@ -869,18 +869,18 @@ class ProfilUpdate extends FHCAPI_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
 			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $personID);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}
 
-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id, $person_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
 			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustelladresse" => TRUE]);
 			if (isError($zustellAdressenArray)) {
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
@@ -893,6 +893,8 @@ class ProfilUpdate extends FHCAPI_Controller
 					return $adresse->adresse_id != $adresse_id;
 				});
 	
+				$this->addMeta('bhzustelladressen', $zustellAdressenArray);
+
 				// remove the zustelladresse from all other zustelladressen
 				foreach ($zustellAdressenArray as $adresse) {
 					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
@@ -902,12 +904,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $person_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
 			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustellung" => TRUE]);
 			if (!isSuccess($zustellKontakteArray)) {
 				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}

From 0df9cf769fd7a27528fe7b2534fce82dcb9f05e6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 26 Sep 2025 14:33:20 +0200
Subject: [PATCH 0800/1357] strip data image base64 prefix before storing foto,
 show dummy profile img when foto is null in DetailsHeader

---
 .../controllers/api/frontend/v1/stv/Student.php   | 15 ++++++++++-----
 public/js/components/DetailHeader/DetailHeader.js |  9 ++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 90c12fe41..f2845572f 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -276,14 +276,19 @@ class Student extends FHCAPI_Controller
 		$update_person = array();
 		foreach ($array_allowed_props_person as $prop) {
 			$val = $this->input->post($prop);
-			if ($val !== null)
+			if ($val === null)
+			{
+				continue;
+			}
+			if($prop == 'foto')
+			{
+				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
+				$update_person[$prop] = $fotoval;
+			}
+			else
 			{
 				$update_person[$prop] = $val;
 			}
-			if($prop == 'foto' && $val == '')
-			{
-				$update_person[$prop] = null;
-			}
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 5c1573753..1088e3f63 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -102,6 +102,13 @@ export default {
 		redirectToLeitung(){
 			this.$emit('redirectToLeitung', {
 				person_id: this.leitungData.person_id});
+		},
+		getFotoSrc(foto) {
+			if(foto === null) {
+				return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'skin/images/profilbild_dummy.jpg';
+			} else {
+				return 'data:image/jpeg;base64,' + foto;
+			}
 		}
 	},
 	template: `
@@ -116,7 +123,7 @@ export default {
 						<img
 						  class="d-block h-100 rounded"
 						  alt="Profilbild"
-						  :src="'data:image/jpeg;base64,' + person.foto"
+						  :src="getFotoSrc(person.foto)"
 						/>
 
 						<template v-if="person.foto_sperre">

From 4a55b7346135c6852364ad9bae81d1d92464ac03 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Sep 2025 08:03:04 +0200
Subject: [PATCH 0801/1357] do not query hidden contacts or the hidden contact
 type from db, remove hidden contact type filtering from frontend code

---
 .../controllers/api/frontend/v1/stv/Kontakt.php    | 14 +++++++-------
 .../Studentenverwaltung/Details/Kontakt/Contact.js |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index 7c646e991..3a8268775 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -434,7 +434,10 @@ class Kontakt extends FHCAPI_Controller
 		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
 		$this->KontakttypModel->addJoin('public.tbl_kontakttyp kt', 'ON (public.tbl_kontakt.kontakttyp = kt.kontakttyp)');
 		$result = $this->KontaktModel->loadWhere(
-			array('person_id' => $person_id)
+			array(
+				'person_id' => $person_id,
+				'public.tbl_kontakt.kontakttyp !=' => 'hidden'
+			)
 		);
 
 		if (isError($result))
@@ -448,15 +451,12 @@ class Kontakt extends FHCAPI_Controller
 	public function getKontakttypen()
 	{
 		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
-
-		$result = $this->KontakttypModel->load();
+		$this->KontakttypModel->addOrder('beschreibung', 'ASC');
+		$result = $this->KontakttypModel->loadWhere(array('kontakttyp !=' => 'hidden'));
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$filteredData = array_filter($data, function ($item) {
-			return $item->kontakttyp !== "hidden";
-		});
-		$this->terminateWithSuccess($filteredData);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function loadContact()
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index e65566cd1..1ff34dc79 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -300,8 +300,7 @@ export default{
 		this.$api
 			.call(ApiStvContact.getTypes())
 			.then(result => {
-				//this.kontakttypen = result.data;
-				this.kontakttypen = result.data.filter(item => item.kontakttyp !== 'hidden');
+				this.kontakttypen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From 2ede54b60e59c6f0f51e28d81a97cb3de1af4bbe Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 29 Sep 2025 13:31:15 +0200
Subject: [PATCH 0802/1357] ProfilUpdateView Tabulator add columns studiengang,
 orgform and oezuordnung, tune tabulator options e.g. headerfilter

---
 .../models/person/Profil_update_model.php     | 59 +++++++++++++++-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 67 ++++++++++---------
 2 files changed, 94 insertions(+), 32 deletions(-)

diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index ffb04b7e7..141044a2c 100644
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -118,13 +118,47 @@ class Profil_update_model extends DB_Model
 			$parameters = [];
 			$query = "
 			SELECT
-			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated, status_timestamp, status_message, attachment_id 
+				profil_update_id,
+				tbl_profil_update.uid,
+				(tbl_person.vorname || ' ' || tbl_person.nachname) AS name ,
+				topic,
+				requested_change,
+				tbl_profil_update.updateamum,
+				tbl_profil_update.updatevon,
+				tbl_profil_update.insertamum,
+				tbl_profil_update.insertvon,
+				status,
+				public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated,
+				status_timestamp,
+				status_message,
+				attachment_id,
+				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
+				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
+				NULL as oezuordnung
 			FROM public.tbl_profil_update
 			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
 			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
 			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
 			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
+			LEFT JOIN (
+				select
+					pss.prestudent_id, COALESCE(sp.orgform_kurzbz, pss.orgform_kurzbz) as orgform_kurzbz
+				from (
+					select
+						prestudent_id, max(insertamum) as insertamum
+					from
+						public.tbl_prestudentstatus
+					where
+						datum <= NOW()
+					group by
+						prestudent_id
+				) mpss
+				join
+					public.tbl_prestudentstatus pss on pss.prestudent_id  = mpss.prestudent_id and pss.insertamum = mpss.insertamum
+				left join
+					lehre.tbl_studienplan sp on pss.studienplan_id = sp.studienplan_id
+			) of ON of.prestudent_id = public.tbl_student.prestudent_id
 			Where public.tbl_studiengang.oe_kurzbz IN ? ";
 			$parameters[] = $oe_berechtigung;
 			if ($whereClause) {
@@ -144,12 +178,33 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if ($mitarbeiterBerechtigung) {
-			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
+			$this->addSelect([
+				"profil_update_id",
+				"tbl_profil_update.uid",
+				"(tbl_person.vorname || ' ' || tbl_person.nachname) AS name",
+				"topic",
+				"requested_change",
+				"tbl_profil_update.updateamum",
+				"tbl_profil_update.updatevon",
+				"tbl_profil_update.insertamum",
+				"tbl_profil_update.insertvon",
+				"status",
+				"public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated",
+				"status_timestamp",
+				"status_message",
+				"attachment_id",
+				"COALESCE(NULL) as studiengang",
+				"COALESCE(NULL) as orgform",
+				"oe.bezeichnung as oezuordnung"
+			]);
 			$this->addJoin('tbl_profil_update_status', 'tbl_profil_update_status.status_kurzbz=tbl_profil_update.status');
 			$this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_person', 'tbl_benutzer.person_id=tbl_person.person_id');
+			$this->addJoin('tbl_benutzerfunktion bf', 'bf.uid = tbl_benutzer.uid AND bf.funktion_kurzbz = \'oezuordnung\' AND NOW() >= COALESCE(bf.datum_von, \'1970-01-01\'::date) AND NOW() <= COALESCE(bf.datum_bis, \'2170-12-31\'::date)', 'LEFT');
+			$this->addJoin('tbl_organisationseinheit oe', 'oe.oe_kurzbz = bf.oe_kurzbz', 'LEFT');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
+
 			if (isError($mitarbeiterRequests))
 				return error("db error: " . getData($mitarbeiterRequests));
 			$mitarbeiterRequests = getData($mitarbeiterRequests) ?: [];
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 3b056b042..53a6a5041 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -184,13 +184,13 @@ export default {
         },
 
         height: 600,
-        layout: "fitColumns",
+        layout: "fitDataStretchFrozen",
 
         columns: [
           {
             title: this.$p.t("profilUpdate", "UID"),
             field: "uid",
-            minWidth: 200,
+            minWidth: 100,
             resizable: true,
             headerFilter: true,
             //responsive:0,
@@ -203,12 +203,40 @@ export default {
             headerFilter: true,
             //responsive:0,
           },
+          {
+            title: this.$p.t("lehre", "studiengang") + ' (' + this.$p.t("profil", "studentIn") + ')',
+            field: "studiengang",
+            minWidth: 50,
+            resizable: true,
+            headerFilter: "list",
+            headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+            //responsive:0,
+          },
+          {
+            title: this.$p.t("lehre", "organisationsform") + ' (' + this.$p.t("profil", "studentIn") + ')',
+            field: "orgform",
+            minWidth: 50,
+            resizable: true,
+            headerFilter: "list",
+            headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+            //responsive:0,
+          },
+          {
+            title: this.$p.t("lehre", "organisationseinheit") + ' (' + this.$p.t("profil", "mitarbeiterIn") + ')',
+            field: "oezuordnung",
+            minWidth: 200,
+            resizable: true,
+            headerFilter: "list",
+            headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
+            //responsive:0,
+          },
           {
             title: this.$p.t("profilUpdate", "Topic"),
             field: "topic",
             resizable: true,
             minWidth: 200,
-            headerFilter: true,
+            headerFilter: "list",
+            headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             //responsive:0,
           },
           {
@@ -223,7 +251,8 @@ export default {
             title: this.$p.t("profilUpdate", "Status"),
             field: "status_translated",
             hozAlign: "center",
-            headerFilter: true,
+            headerFilter: "list",
+            headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             formatter: (cell, para) => {
               let iconClasses = "";
               let status = cell.getRow().getData().status;
@@ -248,20 +277,11 @@ export default {
           {
             title: this.$p.t("profilUpdate", "actions"),
             headerSort: false,
+			frozen: true,
             formatter: (cell, params) => {
-              let STATUS_PENDING =
-                cell.getRow().getData().status ==
-                this.profilUpdateStates["Pending"];
-
+              let details = this.$p.t('global', 'details');
               let html = `<div class="d-flex justify-content-evenly align-items-center">
-                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye fhc-primary-color"></i></button>
-                ${
-                  STATUS_PENDING ?
-                  `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
-                  <button class="btn border-danger border-2" id="denyButton"><i class=' fa fa-lg fa-circle-xmark text-danger'></i></button>`
-                  :
-                  ``
-                }
+                <button class="btn btn-secondary" id="showButton">${details}</button>
               </div>`;
 
               // Convert the HTML string to an HTML node
@@ -276,19 +296,6 @@ export default {
                   this.showAcceptDenyModal(cell.getRow().getData());
                 });
 
-              if (STATUS_PENDING) {
-                node
-                  .querySelector("#acceptButton")
-                  .addEventListener("click", () => {
-                    this.acceptProfilUpdate(cell.getRow().getData());
-                  });
-                node
-                  .querySelector("#denyButton")
-                  .addEventListener("click", () => {
-                    this.denyProfilUpdate(cell.getRow().getData());
-                  });
-              }
-
               return node;
             },
             minWidth: 200,
@@ -382,7 +389,7 @@ export default {
     },
   },
   created() {
-    this.$p.loadCategory("profilUpdate").then(() => {
+    this.$p.loadCategory(["profilUpdate", "lehre", "profil", "global"]).then(() => {
       this.categoryLoaded = true;
     });
   },

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

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

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

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

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

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

From 3551172c0b94fd27258f8b998600f3f0561a1fdd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 30 Sep 2025 09:33:07 +0200
Subject: [PATCH 0805/1357] reenable meldestichtag check

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

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 6cebb3ddb..b4e158b74 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -732,15 +732,14 @@ class Status extends FHCAPI_Controller
 					REST_Controller::HTTP_FORBIDDEN
 				);
 
-			//TODO(Manu) check this check, meanwhile not active
-/*			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
+			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
 
 			if (!$this->getDataOrTerminateWithError($result))
 				$this->terminateWithError(
 					$this->p->t('lehre', 'error_dataVorMeldestichtag'),
 					self::ERROR_TYPE_GENERAL,
 					REST_Controller::HTTP_FORBIDDEN
-				);*/
+				);
 		}
 
 		// Start DB transaction

From 36644284670e43c634292056504a23818d1f5596 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 30 Sep 2025 10:50:01 +0200
Subject: [PATCH 0806/1357] add logic to edit and delete Personfoto

---
 .../api/frontend/v1/fotoHandling/Foto.php     | 237 ++++++++++++++++++
 application/models/person/Person_model.php    |   4 +
 public/css/Studentenverwaltung.css            |   4 +
 public/css/Vertragsverwaltung.css             |   4 +
 public/js/api/factory/fotoHandling.js         |  32 +++
 .../components/DetailHeader/DetailHeader.js   | 129 ++++++++--
 .../DetailHeader/Modal/UploadFoto.js          |  99 ++++++++
 .../js/components/Stv/Studentenverwaltung.js  |   2 +-
 .../Stv/Studentenverwaltung/Details.js        |   6 +-
 .../Details/Dokumente/Modal/Upload.js         |   1 +
 .../Vertraege/Vertragsverwaltung.js           |   1 +
 system/phrasesupdate.php                      |  82 ++++++
 12 files changed, 581 insertions(+), 20 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/fotoHandling/Foto.php
 create mode 100644 public/js/api/factory/fotoHandling.js
 create mode 100644 public/js/components/DetailHeader/Modal/UploadFoto.js

diff --git a/application/controllers/api/frontend/v1/fotoHandling/Foto.php b/application/controllers/api/frontend/v1/fotoHandling/Foto.php
new file mode 100644
index 000000000..4945ddd85
--- /dev/null
+++ b/application/controllers/api/frontend/v1/fotoHandling/Foto.php
@@ -0,0 +1,237 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Foto extends  FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'uploadFoto' => ['admin:r', 'assistenz:r'],
+			'deleteFoto' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models and Libraries
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model("crm/Akte_model", "AkteModel");
+		$this->load->model('person/Fotostatusperson_model', 'FotostatusPersonModel');
+
+		$this->loadPhrases([
+			'ui',
+			'header'
+		]);
+	}
+
+	public function uploadFoto($person_id)
+	{
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$data = json_decode(file_get_contents("php://input"), true);
+
+		if (!empty($data['image']))
+		{
+			$base64 = $data['image'];
+			$resizedImage1 = $this->_resize($base64, 827, 1063);
+
+			if (is_null($resizedImage1))
+				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
+
+			$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => 'Lichtbil'));
+
+			$akteUpdateData = array(
+				'dokument_kurzbz' => 'Lichtbil',
+				'person_id' => $person_id,
+				'inhalt' => $resizedImage1,
+				'mimetype' => 'image/jpg',
+				'erstelltam' => date('c'),
+				'gedruckt' => false,
+				'titel' => 'Lichtbild_' . $person_id . '.jpg',
+				'bezeichnung' => 'Lichtbild gross',
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+			);
+
+			if (hasData($akte)) {
+				$akte_id = getData($akte)[0]->akte_id;
+
+				$akteUpdateData['updateamum'] = date('c');
+				$akteUpdateData['updatevon'] = getAuthUID();
+				$akteResult = $this->AkteModel->update(array('akte_id' => $akte_id), $akteUpdateData);
+			} else {
+				$akteResult = $this->AkteModel->insert($akteUpdateData);
+			}
+
+			if (isError($akteResult)) {
+				return $this->terminateWithError(getError($akteResult), self::ERROR_TYPE_GENERAL);
+			}
+
+			$resizedImage2 = $this->_resize($base64, 101, 130);
+
+			if (is_null($resizedImage2))
+				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
+
+			$result = $this->_updateFoto($person_id, $resizedImage2);
+
+			if (!isError($result)) {
+				$this->FotostatusPersonModel->insert(array(
+					'person_id' => $person_id,
+					'fotostatus_kurzbz' => 'hochgeladen',
+					'datum' => date('Y-m-d'),
+					'updateamum' => date('c'),
+					'updatevon' => getAuthUID(),
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID(),
+				));
+
+				return $this->terminateWithSuccess($base64);
+			}
+		}
+		else
+		{
+			$this->terminateWithError($this->p->t('header', 'error_noPhoto'), self::ERROR_TYPE_GENERAL);
+		}
+	}
+
+	public function deleteFoto($person_id)
+	{
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->_deleteFoto($person_id);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess($result);
+	}
+
+	private function _resize($imageData, $maxwidth, $maxheight, $quality = 90)
+	{
+		$meta = getimagesize($imageData);
+		if (!$meta)
+		{
+			return null;
+		}
+
+		$src_width = $meta[0];
+		$src_height = $meta[1];
+		$mime = $meta['mime'];
+
+		switch ($mime) {
+			case 'image/jpeg':
+			case 'image/jpg':
+				$imagecreated = imagecreatefromjpeg($imageData);
+				break;
+			case 'image/png':
+				$imagecreated = imagecreatefrompng($imageData);
+				break;
+			case 'image/gif':
+				$imagecreated = imagecreatefromgif($imageData);
+				break;
+			default:
+				return null;
+		}
+
+
+		if (!$imagecreated)
+		{
+			return null;
+		}
+
+		$src_aspect_ratio = $src_width / $src_height;
+		$thu_aspect_ratio = $maxwidth / $maxheight;
+
+		if ($src_width <= $maxwidth && $src_height <= $maxheight)
+		{
+			$thu_width = $src_width;
+			$thu_height = $src_height;
+		}
+		elseif ($thu_aspect_ratio > $src_aspect_ratio)
+		{
+			$thu_width = (int) ($maxheight * $src_aspect_ratio);
+			$thu_height = $maxheight;
+		}
+		else
+		{
+			$thu_width = $maxwidth;
+			$thu_height = (int) ($maxwidth / $src_aspect_ratio);
+		}
+
+		$imageScaled = imagecreatetruecolor($thu_width, $thu_height);
+
+		if ($mime === 'image/png')
+		{
+			$background = imagecolorallocate($imageScaled , 0, 0, 0);
+			imagecolortransparent($imageScaled, $background);
+			imagealphablending($imageScaled, false);
+			imagesavealpha($imageScaled, true);
+		}
+
+		imagecopyresampled($imageScaled, $imagecreated, 0, 0, 0, 0, $thu_width, $thu_height, $src_width, $src_height);
+
+		if ($mime === "image/gif")
+		{
+			$background = imagecolorallocate($imageScaled, 0, 0, 0);
+			imagecolortransparent($imageScaled, $background);
+		}
+
+		if (!empty($imageScaled))
+		{
+			ob_start();
+
+			if ($mime == 'image/png')
+				imagepng($imageScaled, NULL);
+			else if ($mime === 'image/gif')
+				imagegif($imageScaled, NULL);
+			else
+				imagejpeg($imageScaled, NULL, $quality);
+
+			$resizedImageData = ob_get_contents();
+			ob_end_clean();
+			@imagedestroy($imagecreated);
+			@imagedestroy($imageScaled);
+
+
+			if (!empty($resizedImageData))
+			{
+				return base64_encode($resizedImageData);
+			}
+			return null;
+		}
+		return null;
+	}
+
+	private function _updateFoto($person_id, $foto)
+	{
+		$personJson['foto'] = $foto;
+		$result = $this->PersonModel->update($person_id, $personJson);
+
+		if (isError($result))
+		{
+			return error($result->msg, EXIT_ERROR);
+		}
+
+		return $result;
+	}
+
+	private function _deleteFoto($person_id)
+	{
+		$personJson['foto'] = null;
+		$result = $this->PersonModel->update($person_id, $personJson);
+
+		if (isError($result))
+		{
+			return error($result->msg, EXIT_ERROR);
+		}
+
+		return $result;
+	}
+}
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 997048972..35a0f6144 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -423,4 +423,8 @@ class Person_model extends DB_Model
 			return success($result);
 		}
 	}
+
+
+
+
 }
\ No newline at end of file
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index bb2588926..05b28d314 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -158,4 +158,8 @@ html {
 
 .tiny-90 div.tox.tox-tinymce {
 	height: 90% !important;
+}
+
+.foto-container:hover .fotoedit {
+    opacity: 1 !important;
 }
\ No newline at end of file
diff --git a/public/css/Vertragsverwaltung.css b/public/css/Vertragsverwaltung.css
index 7b2d71481..300ee5d55 100644
--- a/public/css/Vertragsverwaltung.css
+++ b/public/css/Vertragsverwaltung.css
@@ -18,3 +18,7 @@ html {
 .vv {
 	margin-left: 0 !important;
 }
+
+.foto-container:hover .fotoedit {
+    opacity: 1 !important;
+}
diff --git a/public/js/api/factory/fotoHandling.js b/public/js/api/factory/fotoHandling.js
new file mode 100644
index 000000000..8fffaef07
--- /dev/null
+++ b/public/js/api/factory/fotoHandling.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	uploadFoto(person_id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/fotoHandling/Foto/uploadFoto/' + person_id,
+			params
+		};
+	},
+	deleteFoto(person_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/fotoHandling/Foto/deleteFoto/' + person_id
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index ae5eef53e..b821620e1 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,7 +1,12 @@
 import ApiDetailHeader from "../../api/factory/detailHeader.js";
+import ApiHandleFoto from "../../api/factory/fotoHandling.js";
+import ModalUploadFoto from "./Modal/UploadFoto.js";
 
 export default {
 	name: 'DetailHeader',
+	components: {
+		ModalUploadFoto
+	},
 	inject: {
 		domain: {
 			from: 'configDomain',
@@ -21,6 +26,11 @@ export default {
 			type: String,
 			required: false
 		},
+		fotoEditable: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
 		typeHeader: {
 			type: String,
 			default: 'student',
@@ -44,26 +54,14 @@ export default {
 	},
 	created(){
 		if(this.person_id) {
-			this.getHeader(this.person_id);
-			this.loadDepartmentData(this.mitarbeiter_uid)
-				.then(() => {
-					// Call getLeitungOrg only after departmentData is loaded
-					this.getLeitungOrg(this.departmentData.oe_kurzbz);
-				})
-				.catch((error) => {
-					console.error("Error loading department data: ", error);
-				});
+			this.loadHeaderData();
 		}
 	},
 	watch: {
 		person_id: {
 			handler(newVal) {
 				if (newVal) {
-					this.getHeader(this.person_id);
-					this.loadDepartmentData(this.mitarbeiter_uid).
-					then(() => {
-						this.getLeitungOrg(this.departmentData.oe_kurzbz);
-					});
+					this.loadHeaderData();
 				}
 			},
 			deep: true,
@@ -74,9 +72,21 @@ export default {
 			headerDataMa: {},
 			departmentData: {},
 			leitungData: {},
+			isFetchingIssues: false
 		};
 	},
 	methods: {
+		loadHeaderData(){
+			this.getHeader(this.person_id);
+			this.loadDepartmentData(this.mitarbeiter_uid)
+				.then(() => {
+					// Call getLeitungOrg only after departmentData is loaded
+					this.getLeitungOrg(this.departmentData.oe_kurzbz);
+				})
+				.catch((error) => {
+					console.error("Error loading header data: ", error);
+				});
+		},
 		getHeader(person_id) {
 			return this.$api
 				.call(ApiDetailHeader.getHeader(person_id))
@@ -107,17 +117,63 @@ export default {
 				person_id: this.leitungData.person_id,
 				uid: this.leitungData.uid
 			});
-		}
+		},
+		showModal(person_id){
+			this.$refs.modalFoto.open(person_id);
+		},
+		showDeleteModal(person_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? person_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFoto)
+				.catch(this.$fhcAlert.handleSystemError);
+			},
+		deleteFoto(person_id){
+			return this.$api
+				.call(ApiHandleFoto.deleteFoto(person_id))
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				});
+		},
+		reload() {
+			if(this.person_id) {
+				this.loadHeaderData();
+			}
+			else {
+				this.$emit('reload');
+			}
+		},
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
+			<modal-upload-foto
+				v-if="person_id"
+				ref="modalFoto"
+				:person_id="person_id"
+				@reload="reload"
+			>
+			</modal-upload-foto>
+			<modal-upload-foto
+				v-else
+				ref="modalFoto"
+				:person_id="headerData[0].person_id"
+				@reload="reload"
+			>
+			</modal-upload-foto>
+
 			<template v-if="typeHeader==='student'">
 
 				<div
 					v-for="person in headerData"
 					:key="person.person_id"
-					class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
+					class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block"
 				>
 					<img
 					  class="d-block h-100 rounded"
@@ -131,6 +187,22 @@ export default {
 						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
 						></i>
 					</template>
+					<template v-if="fotoEditable">
+						<button
+							type="button"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
+							style="z-index: 4; font-size: 1rem; width: 1.5rem; height: 1.5rem; opacity:0; transition: opacity 0.2s; top:20%; left:2rem;"
+							@click="showDeleteModal(headerData[0].person_id)">
+							<i class="fa fa-xmark"></i>
+						</button>
+						<button
+							type="button"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
+							style="z-index: 4; font-size: 1rem; width: 1.5rem; height: 1.5rem; opacity:0; transition: opacity 0.2s; top:20%; right:2rem;"
+							@click="showModal(headerData[0].person_id)">
+							<i class="fa fa-pen"></i>
+						</button>
+					</template>
 					<small class="text-muted">{{person.uid}}</small>
 				</div>
 
@@ -171,8 +243,8 @@ export default {
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">
-
-				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+		
+				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
 					  class="d-block w-100 h-100 rounded"
 					  alt="Profilbild"
@@ -185,6 +257,22 @@ export default {
 						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
 						></i>
 					</template>
+					<template v-if="fotoEditable">
+						<button
+							type="button"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
+							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							@click="showDeleteModal(person_id)">
+							<i class="fa fa-xmark"></i>
+						</button>
+						<button
+							type="button"
+							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
+							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							@click="showModal(person_id)">
+							<i class="fa fa-pen"></i>
+						</button>
+					</template>
 				</div>
 
 				<!--show Ma-Details-->
@@ -213,6 +301,11 @@ export default {
 
 				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
 					<div class="d-flex py-1">
+					<!--  TODO slots for Issue Tracking and Tags
+						<class="px-2">
+							<h4 class="mb-1">Issues<a class="refresh-issues" title="checkIssues Person" @click="checkPerson"><i class="fas fa-sync"></i></a></h4>
+							<h6 v-if="!isFetchingIssues" class="text-muted">122</h6>
+						</div> -->
 						<div class="px-2">
 							<h4 class="mb-1">PNr</h4>
 							<h6 class="text-muted">{{ headerDataMa?.person_id }}</h6>
diff --git a/public/js/components/DetailHeader/Modal/UploadFoto.js b/public/js/components/DetailHeader/Modal/UploadFoto.js
new file mode 100644
index 000000000..34f569828
--- /dev/null
+++ b/public/js/components/DetailHeader/Modal/UploadFoto.js
@@ -0,0 +1,99 @@
+import BsModal from "../../Bootstrap/Modal.js";
+import FormForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
+
+import ApiHandleFoto from "../../../../js/api/factory/fotoHandling.js";
+
+export default {
+	name: "modalUploadFoto",
+	components: {
+		BsModal,
+		FormForm,
+		FormInput,
+	},
+	props: {
+		person_id: {
+			type: Number,
+			required: true
+		}
+	},
+	data(){
+		return{
+			formData: {
+				file: null,
+				preview: null,
+				base64Image: null,
+			},
+		}
+	},
+	methods:{
+		open(person_id){
+			this.$refs.modalUploadFoto.show(person_id);
+		},
+		onFileChange(e) {
+			this.file = e.target.files[0];
+			if (!this.file) return;
+
+			// convert File in base64
+			const reader = new FileReader();
+			reader.onload = (event) => {
+				this.base64Image = event.target.result;
+				this.preview = this.base64Image;
+			};
+			reader.readAsDataURL(this.file);
+		},
+
+		async uploadImage(person_id) {
+			if (!this.base64Image) {
+				this.$fhcAlert.alertInfo(this.$p.t('header', 'alert_chooseFoto'));
+				return;
+			}
+
+			return this.$api
+				.call(ApiHandleFoto.uploadFoto(person_id, {
+						image: this.base64Image,    // Base64 String
+						filename: this.file.name    // Original name of file
+							}))
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successFotoUpload'));
+					this.resetModal();
+					this.$refs.modalUploadFoto.hide();
+					this.$emit('reload');
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		resetModal(){
+			this.formData.foto = [];
+		}
+	},
+	template: `
+		<bs-modal
+			ref="modalUploadFoto"
+			dialog-class="modal-dialog-scrollable"
+			>
+				<template #title>
+					Upload Foto
+				</template>
+
+				<form-form
+					ref="formUploadFoto"
+					>
+
+					  <div>
+						<input type="file" @change="onFileChange" accept="image/*" />
+						<div v-if="preview">
+						  <p>Preview:</p>
+						  <img :src="preview" width="200" />
+						</div>
+					  </div>
+				</form-form>
+
+				<template #footer>
+					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+						<button type="button" class="btn btn-primary" @click="uploadImage(person_id)">{{$p.t('ui', 'hochladen')}}</button>
+					</div>
+				</template>
+
+			</bs-modal>
+	`,
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d0543ad59..1cfcbb1d7 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -371,7 +371,7 @@ export default {
 							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></stv-list>
 						</template>
 						<template #bottom>
-							<stv-details ref="details" :students="selected"></stv-details>
+							<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
 						</template>
 					</vertical-split>
 				</main>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 036435dd8..dadb5ea6f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -41,7 +41,10 @@ export default {
 		reload() {
 			if (this.$refs.tabs?.$refs?.current?.reload)
 				this.$refs.tabs.$refs.current.reload();
-		}
+		},
+		reloadList() {
+			this.$emit('reload');
+		},
 	},
 	created() {
 		this.$api
@@ -67,6 +70,7 @@ export default {
 			<fhc-header
 				:headerData="students"
 				typeHeader="student"
+				@reload="reloadList"
 			>
 			</fhc-header>
 			<fhc-tabs
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
index f6280a9cf..ad5afd989 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -24,6 +24,7 @@ export default {
 		}
 	},
 	methods:{
+
 		open(prestudent_id, dokument_kurzbz){
 			this.formData.dokument_kurzbz = dokument_kurzbz;
 			this.formData.prestudent_id = prestudent_id;
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 5368082ee..53dd23fd4 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -63,6 +63,7 @@ export default {
 							:person_id="person_id"
 							:mitarbeiter_uid="this.mitarbeiter_uid"
 							typeHeader="mitarbeiter"
+							fotoEditable
 							@redirectToLeitung="redirectToLeitung"
 						></fhc-header>
 						<vertraege-mitarbeiter
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9658489e1..3e04e72c0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -48911,6 +48911,88 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	//****************************	 CORE/search end
+	//****************************	 DetailHeader start
+	array(
+		'app' => 'core',
+		'category' => 'header',
+		'phrase' => 'error_fotoupload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Speichern des Fotos',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error saving photo',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successFotoUpload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Foto erfolgreich hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Photoupload successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'header',
+		'phrase' => 'alert_chooseFoto',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte zuerst ein Bild auswählen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select an image first!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'header',
+		'phrase' => 'error_noPhoto',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Bild empfangen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No picture received',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	//****************************	 DetailHeader end
 );
 
 

From 93fa0ed180362e5991de38cd5e95a2876a61dc17 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 30 Sep 2025 10:51:14 +0200
Subject: [PATCH 0807/1357] deleteStatus fix isMeldestichtagErreicht
 comparison, add modal-dialog-scrollable class to status modal

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

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index b4e158b74..dc48a47ff 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -733,8 +733,9 @@ class Status extends FHCAPI_Controller
 				);
 
 			$result = $this->prestudentstatuschecklib->checkIfMeldestichtagErreicht($oldstatus->datum);
+			$isMeldestichtagErreicht = $this->getDataOrTerminateWithError($result);
 
-			if (!$this->getDataOrTerminateWithError($result))
+			if ($isMeldestichtagErreicht)
 				$this->terminateWithError(
 					$this->p->t('lehre', 'error_dataVorMeldestichtag'),
 					self::ERROR_TYPE_GENERAL,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index edbd3b6ea..8b0252be8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -205,7 +205,7 @@ export default{
 		];*/
 	},
 	template: `
-	<bs-modal class="stv-status-modal" ref="modal">
+	<bs-modal class="stv-status-modal" ref="modal" dialog-class="modal-dialog-scrollable">
 		<template #title>
 			{{ $p.t('lehre', statusNew ? 'status_new' : 'status_edit', prestudent) }}
 		</template>

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

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

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

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

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

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

From 8fdabcb3178891ee86f34e5a6f44cfdcc4fa6baa Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 30 Sep 2025 12:22:12 +0200
Subject: [PATCH 0810/1357] handle boolean values explicitly

---
 .../api/frontend/v1/stv/Prestudent.php        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 2a427e569..e94c46166 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -138,19 +138,23 @@ class Prestudent extends FHCAPI_Controller
 		{
 			$val = $this->input->post($prop, true);
 
-			if ($val !== null || $prop === 'foerderrelevant') {
+			if ($val !== null) {
+				if(in_array($prop, ['dual', 'bismelden', 'foerderrelevant']))
+				{
+					$val = boolval($val);
+				}
 				$update_prestudent[$prop] = $val;
 			}
 
-			//set null instead of empty string
-			if ($val === ''  && ($prop != 'dual' || $prop != 'bismelden')){
+			// allowed to be null, but has to be in postparameter
+			if (
+				in_array($prop, ['foerderrelevant', 'zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
+				&& !isset($update_prestudent[$prop])
+				&& array_key_exists($prop, $_POST)
+			)
+			{
 				$update_prestudent[$prop] = null;
 			}
-
-			//set false instead of empty string if boolean
-			if ($val === '' && ($prop === 'dual' || $prop === 'bismelden')) {
-				$update_prestudent[$prop] = false;
-			}
 		}
 
 		$update_prestudent['updateamum'] = date('c');

From 9a74ab9c63447325e4a5c3b1b83d3b0c45f4907e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 30 Sep 2025 13:19:18 +0200
Subject: [PATCH 0811/1357] add empty option to zgvnation, zgvmanation,
 zgvdoktornation, berufstaetigkeit_code and ausbildungcode. to not violate fk
 set empty value for those to null in backend

---
 application/controllers/api/frontend/v1/stv/Prestudent.php | 7 +++++++
 .../Stv/Studentenverwaltung/Details/Prestudent.js          | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index e94c46166..7dc607d1a 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -143,6 +143,13 @@ class Prestudent extends FHCAPI_Controller
 				{
 					$val = boolval($val);
 				}
+				elseif (
+					$val === ''
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
+				)
+				{
+					$val = null;
+				}
 				$update_prestudent[$prop] = $val;
 			}
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 3fa43e624..dc645dadc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -318,6 +318,7 @@ export default {
 						name="zgvnation"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option value="">&nbsp;</option>
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
@@ -380,6 +381,7 @@ export default {
 						name="zgvmanation"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option value="">&nbsp;</option>
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
@@ -443,6 +445,7 @@ export default {
 						name="zgvdoktornation"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
+						<option value="">&nbsp;</option>
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
@@ -504,6 +507,7 @@ export default {
 						v-model="data.berufstaetigkeit_code"
 						name="berufstaetigkeit_code"
 						>
+						<option value="">&nbsp;</option>
 						<option v-for="beruf in listBerufe" :key="beruf.berufstaetigkeit_code" :value="beruf.berufstaetigkeit_code">{{beruf.berufstaetigkeit_bez}} </option>
 					</form-input>
 					<form-input
@@ -514,6 +518,7 @@ export default {
 						v-model="data.ausbildungcode"
 						name="ausbildungcode"
 						>
+						<option value="">&nbsp;</option>
 						<option v-for="ausbld in listAusbildung" :key="ausbld.ausbildungcode" :value="ausbld.ausbildungcode">{{ausbld.ausbildungbez}} </option>
 					</form-input>
 				</div>

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

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

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

From c796536417780638fbe01ade95ba165d6c3d6594 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 30 Sep 2025 16:47:05 +0200
Subject: [PATCH 0813/1357] notiz -> beurteilungsnotiz; some missing phrasen;
 more color definitions (WIP); finalize automagic modal logic; added
 validation stub for endupload; loading spinner on every upload; added custom
 header classes to code unexpanded paabgabe accordion tabs by their
 abgabedatum or lack thereof (WIP);

---
 .../controllers/api/frontend/v1/Abgabe.php    |  19 +-
 .../models/education/Projektarbeit_model.php  |   2 +-
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/css/components/abgabetool/abgabe.css   | 113 +++++++++
 public/css/theme/default.css                  |  29 ++-
 public/js/api/factory/abgabe.js               |   2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 140 ++++++-----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 235 ++++++++----------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   2 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  11 +-
 .../61164_abgabetool_quality_gates.php        |   8 +-
 system/phrasesupdate.php                      | 104 +++++++-
 12 files changed, 444 insertions(+), 222 deletions(-)
 create mode 100644 public/css/components/abgabetool/abgabe.css

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c87d3609d..78434e5a3 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -146,7 +146,11 @@ class Abgabe extends FHCAPI_Controller
 				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
 
 				// TODO: save access
-				$pa->email = getData($result)[0]->private_email;
+				$data = getData($result);
+				if(count($data) > 0) {
+					$pa->email = $data[0]->private_email;
+				}
+				
 			}
 		}
 		
@@ -330,7 +334,7 @@ class Abgabe extends FHCAPI_Controller
 
 		if( null === $num_rows_sem || false === $num_rows_sem )
 		{
-			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
 		}
 
 		foreach($resBetr->retval as $betreuerRow) {
@@ -483,7 +487,7 @@ class Abgabe extends FHCAPI_Controller
 		$fixtermin = $_POST['fixtermin'];
 		$kurzbz = $_POST['kurzbz'];
 		$note = $_POST['note'];
-		$notiz = $_POST['notiz'];
+		$beurteilungsnotiz = $_POST['beurteilungsnotiz'];
 		$upload_allowed = $_POST['upload_allowed'];
 		$betreuer_person_id = $_POST['betreuer_person_id'];
 
@@ -506,7 +510,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
-					'notiz' => $notiz,
+					'beurteilungsnotiz' => $beurteilungsnotiz,
 					'upload_allowed' => $upload_allowed,
 					'insertvon' => getAuthUID(),
 					'insertamum' => date('Y-m-d H:i:s')
@@ -519,7 +523,8 @@ class Abgabe extends FHCAPI_Controller
 			// TODO: what if paabgabe is a qualgate1, is benotet negativ and then its type is changed to gate2?
 			
 			$existingResult = $this->PaabgabeModel->load($paabgabe_id);
-			$existingPaabgabe = getData($existingResult);
+			$existingPaabgabeArr = getData($existingResult);
+			if(count($existingPaabgabeArr) > 0) $existingPaabgabe = $existingPaabgabeArr[0];
 			
 			$result = $this->PaabgabeModel->update(
 				$paabgabe_id,
@@ -528,7 +533,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
-					'notiz' => $notiz,
+					'beurteilungsnotiz' => $beurteilungsnotiz,
 					'upload_allowed' => $upload_allowed,
 					'updatevon' => getAuthUID(),
 					'updateamum' => date('Y-m-d H:i:s')
@@ -562,7 +567,7 @@ class Abgabe extends FHCAPI_Controller
 					$noteArr = $this->getDataOrTerminateWithError($result);
 					$note = $noteArr[0];
 					if($note->positiv === false) {
-						// do nothing since this means $notiz change or smth else
+						// do nothing since this means $beurteilungsnotiz change or smth else
 					} else { // benotung legitimately changed -> email
 						$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
 					}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index ab0ebdcd5..bb5e06b0c 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -168,7 +168,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.datum,
 					campus.tbl_paabgabe.note,
 					campus.tbl_paabgabe.upload_allowed,
-					campus.tbl_paabgabe.notiz,
+					campus.tbl_paabgabe.beurteilungsnotiz,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
 					campus.tbl_paabgabe.abgabedatum,
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 73ecc4797..5b16ceb87 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -21,6 +21,7 @@ $includesArray = array(
 		'public/css/components/FilterComponent.css',
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
+		'public/css/components/abgabetool/abgabe.css',
 		'public/css/Cis4/Cms.css',
 		'public/css/Cis4/Studium.css',
 	),
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
new file mode 100644
index 000000000..ad0c1c166
--- /dev/null
+++ b/public/css/components/abgabetool/abgabe.css
@@ -0,0 +1,113 @@
+/* Base Header */
+.verpasst-header {
+	background-color: var(--fhc-red-40);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 32px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.verpasst-header:hover {
+	background-color: var(--fhc-red-30);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .verpasst-header {
+	background-color: var(--fhc-red-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .verpasst-header:hover {
+	background-color: var(--fhc-red-40);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Base Header */
+.abzugeben-header {
+	background-color: var(--fhc-yellow-40);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 32px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.abzugeben-header:hover {
+	background-color: var(--fhc-yellow-30);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .abzugeben-header {
+	background-color: var(--fhc-yellow-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .abzugeben-header:hover {
+	background-color: var(--fhc-yellow-40);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Base Header */
+.verspaetet-header {
+	background-color: var(--fhc-pink-40);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 32px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.verspaetet-header:hover {
+	background-color: var(--fhc-pink-30);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .verspaetet-header {
+	background-color: var(--fhc-pink-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .verspaetet-header:hover {
+	background-color: var(--fhc-pink-40);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Base Header */
+.abgegeben-header {
+	background-color: var(--fhc-green-40);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 32px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.abgegeben-header:hover {
+	background-color: var(--fhc-green-30);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .abgegeben-header {
+	background-color: var(--fhc-green-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .abgegeben-header:hover {
+	background-color: var(--fhc-green-40);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index a0f366174..0337dd319 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -38,10 +38,33 @@
 	--fhc-blue-primary: #006095;
 	--fhc-blue-primary-highlight: #0086CB;
 
-	--fhc-red-10: #842029;
-	--fhc-red-20: #800000;
+	/* --- Green --- */
+	--fhc-green-10: #dff4df;
+	--fhc-green-20: #a8e0a2;
+	--fhc-green-30: #008000;
+	--fhc-green-40: #006600;
+	--fhc-green-50: #004d00;
 
-	--fhc-green-10: #008000;
+	/* --- Red --- */
+	--fhc-red-10: #fde6e8;
+	--fhc-red-20: #f5a3a8;
+	--fhc-red-30: #842029;
+	--fhc-red-40: #600018;
+	--fhc-red-50: #400010;
+
+	/* --- Yellow --- */
+	--fhc-yellow-10: #fff9e6;
+	--fhc-yellow-20: #fff0b3;
+	--fhc-yellow-30: #ffeb3b;
+	--fhc-yellow-40: #f5d600;
+	--fhc-yellow-50: #c8aa00;
+
+	/* --- Pink --- */
+	--fhc-pink-10: #ffe6f0;
+	--fhc-pink-20: #f8c1d6;
+	--fhc-pink-30: #e91e63;
+	--fhc-pink-40: #c2185b;
+	--fhc-pink-50: #8b1050;
 
 	--fhc-beige-10: rgba(245, 233, 215, 0.5);
 	--fhc-beige-20: rgba(172, 153, 125, 0.5);
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 9cb26dcc3..0b6a0cb03 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -59,7 +59,7 @@ export default {
 				datum: termin.datum,
 				note: termin.note_pk,
 				upload_allowed: !!termin.upload_allowed,
-				notiz: termin.notiz ?? '',
+				beurteilungsnotiz: termin.beurteilungsnotiz ?? '',
 				fixtermin: termin.fixtermin,
 				insertvon: termin.insertvon,
 				kurzbz: termin.kurzbz,
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 20d71ae0a..3ff230b00 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -63,36 +63,41 @@ export const AbgabeMitarbeiterDetail = {
 			termin.betreuer_person_id = this.projektarbeit.betreuer_person_id
 			return this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
-					
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
 					
+					const noteOpt = this.allowedNotenOptions.find(opt => opt.note == res.data[0].note)
 					const newTerminRes = {
-						...res.data
+						'allowedToSave': true,
+						'allowedToDelete': true,
+						...res.data[0]
 					}
+					if(newTerminRes.note) newTerminRes.note = noteOpt
+					const existingTerminRes = res.data[1]
 					newTerminRes.bezeichnung = {
 						bezeichnung: termin.bezeichnung?.bezeichnung,
 						paabgabetyp_kurzbz: termin.bezeichnung?.paabgabetyp_kurzbz
 					}
 					
 					// only insert new abgabe if we actually created a new one, not when saving/editing existing
-					if(!this.projektarbeit.abgabetermine.find(abgabe => abgabe.paabgabe_id == newTerminRes.paabgabe_id)){
+					if(!existingTerminRes){
 						this.projektarbeit.abgabetermine.push(newTerminRes)
+						this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
+					} else {
+						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
+						existingTerminRes.note = noteOptExisting
 					}
 					
-					
-					
 					// negative abgabe -> automagically open new termin modal
-					// really bad feature idea by management people that think
-					// they know better lmao that will be so annoying to deal with
+					// really bad feature imo that will be annoying to deal with
 					
-					// TODO fix the note changed check
-					// check if the abgabe existed beforehand and thus if the note even changed -> dont spam modal open
-					// when editing text of negative abgabe
-					// const savedExistingTermin = termin.paabgabe_id == newTerminRes.paabgabe_id
-					// const noteChanged = savedExistingTermin && termin.note_pk !== newTerminRes.note
-					const newTerminResNoteOpt = this.allowedNotenOptions.find(opt => opt.note == newTerminRes.note)
-					if(newTerminResNoteOpt && !newTerminResNoteOpt.positiv) {
+					// termin is completely new and has negative note
+					const savedNewWithNegative = !existingTerminRes && !newTerminRes.note?.positiv
 
+					// termin existed previously + oldTermin had different note/positive note or no note at all
+					const savedExistingNoteAsNegativeAndWasNotNegativeBefore = existingTerminRes && !newTerminRes.note?.positiv && (existingTerminRes.note?.positiv || existingTerminRes.note === undefined)
+
+					const openModalDueToNegativeBeurteilung = savedNewWithNegative || savedExistingNoteAsNegativeAndWasNotNegativeBefore
+					if(openModalDueToNegativeBeurteilung) {
 						this.newTermin = {
 							'paabgabe_id': -1,
 							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
@@ -100,7 +105,7 @@ export const AbgabeMitarbeiterDetail = {
 							'kurzbz': '',
 							'datum': new Date().toISOString().split('T')[0],
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-							'notiz': '',
+							'beurteilungsnotiz': '',
 							'upload_allowed': false,
 							'paabgabetyp_kurzbz': '',
 							'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === newTerminRes.paabgabetyp_kurzbz),
@@ -109,31 +114,7 @@ export const AbgabeMitarbeiterDetail = {
 						}
 						
 						this.showAutomagicModalPhrase = true
-						
-						this.$refs.modalContainerCreateNewAbgabe.show()
 					}
-					
-					
-					
-					// if(paabgabe_id === -1) { // new abgabe has been inserted
-					// 	termin.paabgabe_id = res?.data?.paabgabe_id
-					// 	this.projektarbeit.abgabetermine.push({ // new abgatermin row
-					// 		'paabgabe_id': -1,
-					// 		'projektarbeit_id': this.projektarbeit.projektarbeit_id,
-					// 		'fixtermin': false,
-					// 		'kurzbz': '',
-					// 		'datum': new Date().toISOString().split('T')[0],
-					// 		'paabgabetyp_kurzbz': termin.paabgabetyp_kurzbz,
-					// 		'note': this.allowedNotenOptions.find(opt => opt.note == termin.note?.note),
-					// 		'upload_allowed': termin.upload_allowed,
-					// 		'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz),
-					// 		'abgabedatum': null,
-					// 		'insertvon': this.viewData?.uid ?? '',
-					// 		'allowedToSave': true,
-					// 		'allowedToDelete': true
-					// 	})
-					// }
-					
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
@@ -254,10 +235,10 @@ export const AbgabeMitarbeiterDetail = {
 					'kurzbz': '',
 					'datum': new Date().toISOString().split('T')[0],
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-					'notiz': '',
+					'beurteilungsnotiz': '',
 					'upload_allowed': false,
 					'paabgabetyp_kurzbz': '',
-					'bezeichnung': '',
+					'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen'),
 					'abgabedatum': null,
 					'insertvon': this.viewData?.uid ?? ''
 				}
@@ -266,24 +247,39 @@ export const AbgabeMitarbeiterDetail = {
 			this.$refs.modalContainerCreateNewAbgabe.show()
 		},
 		async handleSaveNewAbgabe(termin) {
+			// TODO: validate termin type & date
+			
 			await this.saveTermin(termin)
 			
-			this.$refs.modalContainerCreateNewAbgabe.hide()
-			this.newTermin = {
-				'paabgabe_id': -1,
-				'projektarbeit_id': this.projektarbeit.projektarbeit_id,
-				'fixtermin': false,
-				'kurzbz': '',
-				'datum': new Date().toISOString().split('T')[0],
-				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-				'notiz': '',
-				'upload_allowed': false,
-				'paabgabetyp_kurzbz': '',
-				'bezeichnung': '',
-				'abgabedatum': null,
-				'insertvon': this.viewData?.uid ?? ''
+			// determined inside saveTermin api.then()
+			if(this.showAutomagicModalPhrase) {
+				this.$refs.modalContainerCreateNewAbgabe.show()
+			} else {
+				this.$refs.modalContainerCreateNewAbgabe.hide()
+				this.newTermin = {
+					'paabgabe_id': -1,
+					'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+					'fixtermin': false,
+					'kurzbz': '',
+					'datum': new Date().toISOString().split('T')[0],
+					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+					'beurteilungsnotiz': '',
+					'upload_allowed': false,
+					'paabgabetyp_kurzbz': '',
+					'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen'),
+					'abgabedatum': null,
+					'insertvon': this.viewData?.uid ?? ''
+				}
+			}
+		},
+		handleChangeAbgabetyp(termin) {
+			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
+			// are possibly less confused, which is a pursuit in vain
+			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2') {
+				termin.kurzbz = termin.bezeichnung.bezeichnung
 			}
 		}
+			
 	},
 	computed: {
 		getEid() {
@@ -337,18 +333,20 @@ export const AbgabeMitarbeiterDetail = {
 			</template>
 			<template v-slot:default>
 				<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
-				<div v-if="newTermin">
-					<div class="row">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
-						<div class="col-8 col-md-9">
-							<Checkbox 
-								v-model="newTermin.fixtermin"
-								:binary="true" 
-								:pt="{ root: { class: 'ml-auto' }}"
-							>
-							</Checkbox>
-						</div>
-					</div>
+<!--				minheight to avoid z-index magic for the datepicker inside the modal inside the modal...-->
+				<div v-if="newTermin" style="min-height: 600px">
+<!--				fixtermin is not an option for lektors-->
+<!--					<div class="row">-->
+<!--						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
+<!--						<div class="col-8 col-md-9">-->
+<!--							<Checkbox -->
+<!--								v-model="newTermin.fixtermin"-->
+<!--								:binary="true" -->
+<!--								:pt="{ root: { class: 'ml-auto' }}"-->
+<!--							>-->
+<!--							</Checkbox>-->
+<!--						</div>-->
+<!--					</div>-->
 					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
 						<div class="col-8 col-md-9">
@@ -368,6 +366,7 @@ export const AbgabeMitarbeiterDetail = {
 							<Dropdown
 								:style="{'width': '100%'}"
 								v-model="newTermin.bezeichnung"
+								@change="handleChangeAbgabetyp(newTermin)"
 								:options="abgabeTypeOptions"
 								:optionLabel="getOptionLabelAbgabetyp">
 							</Dropdown>
@@ -398,7 +397,7 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin.beurteilungsnotiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
 						</div>
 					</div>
 					<div class="row mt-2">
@@ -477,8 +476,10 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
 							<div class="col-8 col-md-9">
+<!--								always keep fixtermin checkbox disabled for mitarbeiter tool -->
 								<Checkbox 
 									v-model="termin.fixtermin"
+									disabled
 									:binary="true" 
 									:pt="{ root: { class: 'ml-auto' }}"
 								>
@@ -506,6 +507,7 @@ export const AbgabeMitarbeiterDetail = {
 									:style="{'width': '100%'}"
 									:disabled="!termin.allowedToSave"
 									v-model="termin.bezeichnung"
+									@change="handleChangeAbgabetyp(termin)"
 									:options="abgabeTypeOptions"
 									:optionLabel="getOptionLabelAbgabetyp">
 								</Dropdown>
@@ -536,7 +538,7 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.notiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
 							</div>
 						</div>
 						<div class="row mt-2">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index df88720e5..b90427a7c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -30,6 +30,7 @@ export const AbgabeStudentDetail = {
 	},
 	data() {
 		return {
+			loading: false,
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
@@ -45,16 +46,38 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	methods: {
-		validate: function(termin) {
+		async validate(termin, endupload = false) {
 			if(!termin.file.length) {
 				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
 				return false
 			}
+			
+			// TODO: refine these
+			if(endupload) {
+				// check these input fields for length of entry ? standard fallback '' anyways
 
+				// this.form['abstract']
+				// this.form['abstract_en']
+				// this.form['schlagwoerter']
+				// this.form['schlagwoerter_en']
+				// this.form['seitenanzahl']
+
+				if(this.form['abstract'].length < 10 && await this.$fhcAlert.confirm({
+					message: 'Abstract is very short, wirklich speichern?',
+					acceptLabel: 'Verstanden und Fortfahren',
+					acceptClass: 'btn btn-danger',
+					rejectLabel: 'Zurück',
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+			}
+			
 			return true;
 		},
-		triggerEndupload() {
-			if (!this.validate(this.enduploadTermin))
+		async triggerEndupload() {
+			
+			if (!await this.validate(this.enduploadTermin))
 			{
 				return false;
 			}
@@ -67,7 +90,6 @@ export const AbgabeStudentDetail = {
 			formData.append('student_uid', this.projektarbeit.student_uid)
 			formData.append('bperson_id', this.projektarbeit.bperson_id)
 			
-			// TODO: validate/check for null etc.
 			formData.append('sprache', this.form['sprache'].sprache)
 			formData.append('abstract', this.form['abstract'])
 			formData.append('abstract_en', this.form['abstract_en'])
@@ -78,10 +100,13 @@ export const AbgabeStudentDetail = {
 			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
 				formData.append('file', this.enduploadTermin.file[i]);
 			}
+			this.loading = true
 			this.$api.call(ApiAbgabe.postStudentProjektarbeitEndupload(formData))
 				.then(res => {
-					this.handleUploadRes(res)
-				})
+					this.handleUploadRes(res, this.enduploadTermin)
+				}).finally(()=> {
+					this.loading = false
+			})
 			
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
@@ -99,9 +124,10 @@ export const AbgabeStudentDetail = {
 
 			return `${day}.${month}.${year}`;
 		},
-		upload(termin) {
+		async upload(termin) {
 
-			if (!this.validate(termin))
+			// only do this on endupload
+			if (! await this.validate(termin))
 			{
 				return false;
 			}
@@ -122,15 +148,22 @@ export const AbgabeStudentDetail = {
 					formData.append('file', termin.file[i]);
 				}
 
+				this.loading = true
 				this.$api.call(ApiAbgabe.postStudentProjektarbeitZwischenabgabe(formData))
 					.then(res => {
-						this.handleUploadRes(res)
-					})
+						this.handleUploadRes(res, termin)
+					}).finally(()=> {
+						this.loading = false
+				})
 			}
 		},
-		handleUploadRes(res) {
+		handleUploadRes(res, termin) {
 			if(res.meta.status == "success") {
 				this.$fhcAlert.alertSuccess('File erfolgreich hochgeladen')
+
+				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
+				termin.abgabedatum = new Date().toISOString().split('T')[0];
+				
 			} else {
 				this.$fhcAlert.alertError('File upload error')
 			}
@@ -138,6 +171,8 @@ export const AbgabeStudentDetail = {
 			if(res.meta.signaturInfo) {
 				this.$fhcAlert.alertInfo(res.meta.signaturInfo)
 			}
+			
+			
 		},
 		dateDiffInDays(datum, today){
 			const oneDayMs = 1000 * 60 * 60 * 24
@@ -154,28 +189,38 @@ export const AbgabeStudentDetail = {
 			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
-					color = 'red'
-					fontColor = 'white'
-					icon = 'fa-triangle-exclamation'
+					return 'verpasst-header'
+					
+					// color = 'red'
+					// fontColor = 'white'
+					// icon = 'fa-triangle-exclamation'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					color = 'yellow'
-					icon = 'fa-circle-exclamation'
+					return 'abzugeben-header'
+					
+					// color = 'yellow'
+					// icon = 'fa-circle-exclamation'
 				}
 			} else if(abgabedatum > datum) {
-				color = 'pink' // aka "hellrot"
-				fontColor = 'white'
-				icon = 'fa-circle-question'
+				return 'verspaetet-header'
+				
+				// color = 'pink' // aka "hellrot"
+				// fontColor = 'white'
+				// icon = 'fa-circle-question'
 			} else {
-				color = 'green'
-				icon = 'fa-square-check'
+				return 'abgegeben-header'
+				
+				// color = 'green'
+				// icon = 'fa-square-check'
 			}
 			
-			//return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
-			if(  typeof mode !== 'undefined' || mode === 'icon') {
-				return icon;
-			} else {
-				return 'abgabe-zieldatum-border-' + color;
-			}
+			// return 'background-color: ' + color;
+			//
+			// //return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			// if(  typeof mode !== 'undefined' || mode === 'icon') {
+			// 	return icon;
+			// } else {
+			// 	return 'abgabe-zieldatum-border-' + color;
+			// }
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -200,12 +245,12 @@ export const AbgabeStudentDetail = {
 		projektarbeit(newVal) {
 			// default select german if projektarbeit sprache was null
 			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
-			this.form.abstract = newVal.abstract
-			this.form.abstract_en = newVal.abstract_en
-			this.form.schlagwoerter = newVal.schlagwoerter
-			this.form.schlagwoerter_en = newVal.schlagwoerter_en
-			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
-			this.form.seitenanzahl = newVal.seitenanzahl
+			this.form.abstract = newVal.abstract ?? ''
+			this.form.abstract_en = newVal.abstract_en ?? ''
+			this.form.schlagwoerter = newVal.schlagwoerter ?? ''
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
+			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
 		}
 	},
 	computed: {
@@ -233,6 +278,11 @@ export const AbgabeStudentDetail = {
 
 	},
 	template: `
+		<div id="loadingOverlay" v-show="loading" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
+			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
+		</div>
+
+
 		<div v-if="projektarbeit">
 		
 			<h5>{{$p.t('abgabetool/c4abgabeStudentenbereich')}}</h5>
@@ -243,8 +293,7 @@ export const AbgabeStudentDetail = {
 			
 			<Accordion :multiple="true" :activeIndex="[0]">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :header="getAccTabHeaderForTermin(termin)" style="padding: 0px;">
-							
+					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
 							<div class="col-8 col-md-9">
@@ -288,18 +337,6 @@ export const AbgabeStudentDetail = {
 								</div>
 							</div>
 						</div>
-						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
-							<div class="col-8 col-md-9">
-								<Checkbox 
-									disabled
-									v-model="termin.upload_allowed"
-									:binary="true" 
-									:pt="{ root: { class: 'ml-auto' }}"
-								>
-								</Checkbox>
-							</div>
-						</div>
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 							<div class="col-8 col-md-9">
@@ -315,15 +352,23 @@ export const AbgabeStudentDetail = {
 								</a>
 							</div>
 						</div>
-						<div class="row mt-2">
+						<div class="row mt-2" v-if="termin.upload_allowed">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fileupload')}}</div>
 							<div class="col-8 col-md-9">
 								<div class="row">
-									<div class="col-4">
-										<Upload :disabled="!termin?.allowedToUpload || isViewMode" accept=".pdf" v-model="termin.file"></Upload>
+									<div class="col-12 col-sm-6 mb-2">
+										<Upload 
+											:disabled="!termin?.allowedToUpload || isViewMode" 
+											accept=".pdf" 
+											v-model="termin.file"
+										></Upload>
 									</div>
-									<div class="col-4">
-										<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || isViewMode">
+									<div class="col-12 col-sm-6">
+										<button 
+											class="btn btn-primary border-0 w-100" 
+											@click="upload(termin)" 
+											:disabled="!termin.allowedToUpload || isViewMode"
+										>
 											{{$p.t('abgabetool/c4upload')}}
 											<i class="fa-solid fa-upload"></i>
 										</button>
@@ -331,86 +376,16 @@ export const AbgabeStudentDetail = {
 								</div>
 							</div>
 						</div>
+						</div>
 					</AccordionTab>
 				</template>
 			</Accordion>
-			
-<!--			<div id="uploadWrapper">-->
-<!--				<div class="row" style="margin-bottom: 12px;">-->
-<!--					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
-<!--					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>-->
-<!--					<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>-->
-<!--					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4note')}}</div>-->
-<!--					<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>-->
-<!--					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>-->
-<!--					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>-->
-<!--					<div class="col-3 fw-bold">-->
-<!--						{{$p.t('abgabetool/c4fileupload')}}-->
-<!--					</div>-->
-<!--				</div>-->
-<!--				<div class="row" v-for="termin in projektarbeit.abgabetermine">-->
-<!--					<div class="col-1 d-flex justify-content-center align-items-start">-->
-<!--						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
-<!--						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
-<!--&lt;!&ndash;-->
-<!--						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>-->
-<!--&ndash;&gt;-->
-<!--					</div>-->
-<!--					<div class="col-2 d-flex justify-content-start align-items-start">-->
-<!--						<div class="position-relative" :class="getDateStyle(termin)">-->
-<!--							<VueDatePicker-->
-<!--								v-model="termin.datum"-->
-<!--								:clearable="false"-->
-<!--								:disabled="true"-->
-<!--								:enable-time-picker="false"-->
-<!--								:format="formatDate"-->
-<!--								:text-input="true"-->
-<!--								auto-apply>-->
-<!--							</VueDatePicker>-->
-<!--							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
-<!--						</div>-->
-<!--					</div>-->
-<!--					<div class="col-1 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>-->
-<!--					<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">-->
-<!--						{{ getTerminNoteBezeichnung(termin) }}-->
-<!--					</div>-->
-<!--					<div v-if="qualityGateTerminAvailable || termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-start">-->
-<!--						<Checkbox -->
-<!--							v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'"-->
-<!--							disabled-->
-<!--							v-model="termin.upload_allowed"-->
-<!--							:binary="true" -->
-<!--							:pt="{ root: { class: 'ml-auto' }}"-->
-<!--						>-->
-<!--						</Checkbox>-->
-<!--					</div>-->
-<!--					<div class="col-2 d-flex justify-content-start align-items-start">-->
-<!--						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="45" :disabled="true"></Textarea>-->
-<!--					</div>-->
-<!--					<div class="col-1 d-flex justify-content-start align-items-center">-->
-<!--						{{ termin.abgabedatum?.split("-").reverse().join(".") }}-->
-<!--						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">-->
-<!--							<i class="fa-solid fa-2x fa-file-pdf"></i>-->
-<!--						</a>-->
-<!--					</div>-->
-<!--					<div class="col-3" v-if="!viewMode">-->
-<!--						<div class="row">-->
-<!--							<div class="col-8">-->
-<!--								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>-->
-<!--							</div>-->
-<!--							<div class="col-4">-->
-<!--								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">-->
-<!--									{{$p.t('abgabetool/c4upload')}}-->
-<!--									<i class="fa-solid fa-upload"></i>-->
-<!--								</button>-->
-<!--							</div>-->
-<!--						</div>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--			</div>-->
 		 </div>
 	 	
-	 	<bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
+	 	<bs-modal 
+	 		ref="modalContainerEnduploadZusatzdaten"
+	 		class="bootstrap-prompt"
+	 		dialogClass="bordered-modal modal-lg">
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
@@ -465,14 +440,16 @@ export const AbgabeStudentDetail = {
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
 					<div class="row">
-						<Textarea v-model="form.abstract" rows="10"></Textarea>
+						<Textarea v-model="form.abstract" rows="10" maxlength="5000"></Textarea>
+						<p>{{ form.abstract?.length ? form.abstract.length : 0 }} / 5000 characters</p>
 					</div>
 				</div>
 
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
 					<div class="row">
-						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
+						<Textarea v-model="form.abstract_en" rows="10" maxlength="5000"></Textarea>
+						<p>{{ form.abstract_en?.length ? form.abstract_en.length : 0 }} / 5000 characters</p>
 					</div>				
 				</div>
 				
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index b41a81e5a..a9230bc6d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -447,7 +447,7 @@ export const AbgabetoolMitarbeiter = {
 			dialogClass="modal-fullscreen">
 			<template v-slot:title>
 				<div>
-					abgabe detail wtb phrasen
+					{{$p.t('abgabetool/c4abgabeMitarbeiterDetailTitle')}}
 				</div>
 			</template>
 			<template v-slot:default>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index c4f790336..9def48445 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -12,10 +12,11 @@ export const AbgabetoolStudent = {
 		AbgabeDetail,
 		VerticalSplit
 	},
-	inject: ['isMobile', 'isViewMode'],
+	inject: ['isMobile'],
 	provide() {
 		return {
-			notenOptions: Vue.computed(() => this.notenOptions)
+			notenOptions: Vue.computed(() => this.notenOptions),
+			isViewMode: Vue.computed(() => this.isViewMode)
 		}
 	},
 	props: {
@@ -315,7 +316,7 @@ export const AbgabetoolStudent = {
 		dialogClass="modal-fullscreen">
 		<template v-slot:title>
 			<div>
-				abgabe detail todo phrasen
+				{{$p.t('abgabetool/c4abgabeStudentDetailTitle')}}
 			</div>
 		</template>
 		<template v-slot:default>
@@ -328,12 +329,12 @@ export const AbgabetoolStudent = {
 	<hr>
 	
 	<div v-if="projektarbeiten === null || projektarbeiten === []">
-		Keine Projektarbeiten gefunden!
+		{{$p.t('abgabetool/c4abgabeStudentNoProjectsFound')}}
 	</div>
 	
 	<Accordion :multiple="true" :activeIndex="[0]">
 		<template v-for="projektarbeit in projektarbeiten">
-			<AccordionTab :header="getAccTabHeaderForProjektarbeit(projektarbeit)" style="padding: 0px;">
+			<AccordionTab :header="getAccTabHeaderForProjektarbeit(projektarbeit)">
 					
 				<div class="row">
 					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4details')}}</div>
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index b7ce12f8f..38506a742 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -52,7 +52,7 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "ALTER TABLE campus.tbl_paabgabe
-				ADD COLUMN IF NOT EXISTS upload_allowed boolean DEFAULT false;";
+				ADD COLUMN IF NOT EXISTS upload_allowed boolean DEFAULT true;";
 
 		if(!$db->db_query($qry))
 			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
@@ -61,17 +61,17 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 	}
 }
 
-if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'notiz'"))
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabe' AND column_name = 'beurteilungsnotiz'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "ALTER TABLE campus.tbl_paabgabe
-				ADD COLUMN IF NOT EXISTS notiz text DEFAULT NULL;";
+				ADD COLUMN IF NOT EXISTS beurteilungsnotiz text DEFAULT NULL;";
 
 		if(!$db->db_query($qry))
 			echo '<strong>campus.tbl_paabgabe: '.$db->db_last_error().'</strong><br>';
 		else
-			echo "<br>paabgabe column notiz default '' hinzugefuegt";
+			echo "<br>paabgabe column beurteilungsnotiz default '' hinzugefuegt";
 	}
 }
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c544b086f..8d417ae48 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40071,6 +40071,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4Sprache',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Sprache",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Language",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fehlerAktualitaetProjektarbeit ',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projektarbeit ist nichtmehr aktuell",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Project work is not current anymore",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42724,13 +42764,73 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Notizen Quality Gate",
+				'text' => "Beurteilungsnotizen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Notes Quality Gate',
+				'text' => 'Evaluation notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeMitarbeiterDetailTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projektarbeit Detailansicht Mitarbeiter",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project work Detailed view Employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStudentDetailTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projektarbeit Detailansicht Studierende",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project work Detailed view Students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStudentNoProjectsFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Projektarbeiten gefunden!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No projects found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)

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 0814/1357] 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 cb64c83b504c4b1ba05b5a2bc73f0b4ea34e2d55 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 1 Oct 2025 13:48:10 +0200
Subject: [PATCH 0815/1357] Added method to get LV-Leitung from given LV

---
 .../education/Lehrveranstaltung_model.php     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index e02c1ad0b..462e92e5e 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -386,6 +386,37 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($query, array($lehrveranstaltung_id, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * Get LV-Leitung of given Lehrveranstaltung ID and Studiensemester.
+	 *
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester
+	 * @return array|stdClass|null
+	 */
+	public function getLvLeitung($lehrveranstaltung_id, $studiensemester)
+	{
+		$params = [$lehrveranstaltung_id, $studiensemester];
+
+		$qry = "
+			SELECT
+				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
+			FROM
+				lehre.tbl_lehreinheit
+				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
+				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
+				JOIN public.tbl_person p using (person_id) 
+			WHERE
+				tbl_lehreinheit.lehrveranstaltung_id= ?
+				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				AND lehrfunktion_kurzbz = 'LV-Leitung'
+            ORDER BY 
+                lema.insertamum DESC
+			LIMIT 1
+		";
+
+		return $this->execQuery($qry, $params);
+	}
 	/**
 	 * Gets all Leiter of Lehrveranstaltungsorganisationseinheit
 	 * @param $lehrveranstaltung_id

From cb77f3148a5a6fe2da87f614a4897457907ddf4c Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 1 Oct 2025 13:50:57 +0200
Subject: [PATCH 0816/1357] Added method to get Stundenplantermine for
 Lehreinheit/Lehrveranstaltung

---
 .../models/ressource/Stundenplan_model.php    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 389be582d..067e2b790 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -535,4 +535,53 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execQuery($query, [$uid, $uid]);
 	}
+
+	/**
+	 * Get Stundenplantermine for given Lehreinheit.
+	 *
+	 * @param $lehreinheit_id
+	 * @return array|stdClass|null
+	 */
+	public function getTermineByLe($lehreinheit_id)
+	{
+		$qry = '
+			SELECT DISTINCT
+			    datum
+			FROM 
+		       	lehre.vw_stundenplan
+			WHERE 
+				lehreinheit_id = ?
+			ORDER BY 
+			    datum ASC
+		';
+
+		return $this->execQuery($qry, [$lehreinheit_id]);
+	}
+
+	/**
+	 * Get Stundenplantermine for given Lehrveranstaltung of given Studiensemester.
+	 *
+	 * @param $lehrveranstaltung_id
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null
+	 */
+	public function getTermineByLv($lehrveranstaltung_id, $studiensemester_kurzbz)
+	{
+		$qry = '
+		  	SELECT DISTINCT
+				datum
+	   		FROM
+	   		    lehre.vw_stundenplan
+	  		WHERE 
+	  		    lehreinheit_id IN (
+					SELECT lehreinheit_id
+					FROM lehre.tbl_lehreinheit 
+					WHERE lehrveranstaltung_id = ?
+					AND studiensemester_kurzbz = ?
+				)    
+	   		ORDER BY datum ASC
+		';
+
+		return $this->execQuery($qry, [$lehrveranstaltung_id, $studiensemester_kurzbz]);
+	}
 }

From deebe987d32a0bec2e64bd162c4b0bade7aa7149 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 1 Oct 2025 13:51:43 +0200
Subject: [PATCH 0817/1357] Added slot selectedItem to autocomplete component
 in Input.js

---
 public/js/components/Form/Input.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 81b47d504..3c3fa45d5 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -280,6 +280,7 @@ export default {
 			<template #chip="data"><slot name="chip" v-bind="data"></slot></template>
 			<template #header="data"><slot name="header" v-bind="data"></slot></template>
 			<template #footer="data"><slot name="footer" v-bind="data"></slot></template>
+			<template #selectedItem="data"><slot name="selectedItem" v-bind="data"></slot></template>
 			<template #option="data"><slot name="option" v-bind="data"></slot></template>
 			<template #optiongroup="data"><slot name="optiongroup" v-bind="data"></slot></template>
 			<template #content="data"><slot name="content" v-bind="data"></slot></template>

From ecbb6744a75733079952ab69e8bb4c2a80df0721 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 1 Oct 2025 14:26:58 +0200
Subject: [PATCH 0818/1357] readd renderif feature from commit
 d6bdad27b2a61d3d48d90f3571de6ca8e6c289ea to searchbar

---
 public/js/apps/Cis.js                            |  4 ++--
 .../searchbar/result/template/action.js          | 16 +++++++++++++++-
 .../searchbar/result/template/actions.js         | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 73703b42b..5b76c5721 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -50,7 +50,7 @@ const app = Vue.createApp({
                         defaultaction: {
                             type: "link",
 							renderif: function(data) {
-								if(data.content_id === "N/A"){
+								if(data.content_id === null){
 									return false;
 								}
 								return true;
@@ -79,7 +79,7 @@ const app = Vue.createApp({
                                 icon: "fas fa-info-circle",
                                 type: "link",
                                 renderif: function(data) {
-									if(data.content_id === "N/A"){
+									if(data.content_id === null){
 										return false;
 									}
 									return true;
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index eb4b1db3a..fdcbfaee8 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -19,10 +19,24 @@ export default {
 			if (this.action.type === 'function')
 				this.action.action(this.res);
 			this.$emit('actionexecuted');
+		},
+		renderif: function() {
+			if(this.action?.renderif === undefined) {
+				return true;
+			}
+
+			return this.action.renderif(this.res);
 		}
 	},
 	template: `
+	<template v-if="this.renderif()">
 	<a class="searchbar-result-template-action" :href="actionHref" @click="actionFunc">
 		<slot>{{ $p.t('search/action_default_label') }}</slot>
-	</a>`
+	</a>
+	</template>
+	<template v-else>
+	<div class="searchbar-result-template-action">
+		<slot>{{ $p.t('search/action_default_label') }}</slot>
+	</div>
+	</template>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
index 726fef4dd..8bfd08420 100644
--- a/public/js/components/searchbar/result/template/actions.js
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -10,11 +10,20 @@ export default {
 		res: Object,
 		actions: Array
 	},
+	methods: {
+		renderif: function(action) {
+			if(action?.renderif === undefined) {
+				return true;
+			}
+
+			return action.renderif(this.res);
+		}
+	},
 	template: `
 	<div v-if="actions.length" class="searchbar-result-template-actions">
+		<template v-for="(action, index) in actions" :key="action.label">
 		<result-action
-			v-for="(action, index) in actions"
-			:key="action.label"
+			 v-if="this.renderif(action)"
 			:res="res"
 			:action="action"
 			class="btn btn-primary btn-sm"
@@ -23,5 +32,6 @@ export default {
 			<i v-if="action.icon" :class="action.icon"></i>
 			<span class="p-2">{{ action.label }}</span>
 		</result-action>
+		</template>
 	</div>`
 };
\ No newline at end of file

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

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

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

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

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

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

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

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

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

From d148eaed1160ae3b9762915facf6e594b9338e96 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 1 Oct 2025 16:19:15 +0200
Subject: [PATCH 0822/1357] ReservierungModel getRerservierungenMitarbeiter
 remove unused paramter ort_kurzbz, StundenplanLib only query reservations for
 logged in user if request is for the personal lv plan aka if ort_kurbz is
 empty

---
 application/libraries/StundenplanLib.php            | 7 ++++---
 application/models/ressource/Reservierung_model.php | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 6d53a2e2e..7ed64da2c 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -229,9 +229,10 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-		
-		if ($is_mitarbeiter) {
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+
+		if ($is_mitarbeiter && empty($ort_kurzbz)) {
+			// request for personal lvplan show only reservations of logged in user
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 789ff3d9c..0c391ea20 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -76,7 +76,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz = null)
+	public function getReservierungenMitarbeiter($start_date, $end_date)
 	{
 
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -89,7 +89,6 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.uid = ? AND datum >= ? AND datum <= ?";
 
-//		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		$subquery = $raum_reservierungen_query;
 
 		

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

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

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

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

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

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

From a2d2025e4cd0b93884c7ac7d790af055aedee8ac Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 2 Oct 2025 13:33:47 +0200
Subject: [PATCH 0825/1357] Fixed

---
 application/libraries/FilterCmptLib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index 272899de6..e85c60b5c 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -177,7 +177,7 @@ class FilterCmptLib
 		$session = $this->getSession();
 
 		// If session is NOT empty -> a filter was already loaded
-		if ($session != null)
+		if (!isError($session) && $session != null)
 		{
 			// Retrieve the filterId stored in the session
 			$sessionFilterId = $this->_getSessionElement(FilterCmptLib::FILTER_ID);
@@ -219,9 +219,7 @@ class FilterCmptLib
 				}
 			}
 		}
-
-		// If the session is empty -> first time that this filter is loaded
-		if ($session == null)
+		else
 		{
 			// Load filter definition data from DB
 			$definition = $this->_loadDefinition(
@@ -602,7 +600,7 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		if (isset($session[$name]))
+		if (!isError($session) && isset($session[$name]))
 		{
 			return $session[$name];
 		}
@@ -623,7 +621,7 @@ class FilterCmptLib
 
 		if (!$this->_ci->permissionlib->hasAtLeastOne($this->_requiredPermissions, self::PERMISSION_FILTER_METHOD, self::PERMISSION_TYPE))
 		{
-			$this->_setSession(error('The required permission is not help by the logged user'));
+			$this->_setSession(error('The required permission is not held by the logged user'));
 			return false;
 		}
 
@@ -951,9 +949,11 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		$session[$name] = $value;
-
-		setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
+		if (!isError($session) && $session != null)
+		{
+			$session[$name] = $value;
+			setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
+		}
 	}
 
 	/**

From 35b37dec5546c4a41574ff46f8c123451c809d86 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 2 Oct 2025 13:34:44 +0200
Subject: [PATCH 0826/1357] Other filters are still working even if for one of
 them the user does not have permissions

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

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index e85c60b5c..f742b4ce1 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2022 fhcomplete.org
+ * 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

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

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

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

From 3a6fb08350c100c61f1f4c843754e9e33a60d6e1 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 2 Oct 2025 16:52:11 +0200
Subject: [PATCH 0828/1357] Creating of Interessenten: moved to PRestudentlib,
 renamed check to getPerson, corrected transaction handling, enabled creating
 of Incomings

---
 .../api/frontend/v1/stv/Student.php           | 552 ++++++++++--------
 application/libraries/PrestudentLib.php       | 216 +++++++
 application/models/crm/Student_model.php      |   4 +-
 public/js/api/factory/stv/students.js         |   4 +-
 .../Stv/Studentenverwaltung/List.js           |   2 -
 .../Stv/Studentenverwaltung/List/New.js       |  48 +-
 6 files changed, 541 insertions(+), 285 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 23a8fc7cb..d5737dc2f 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -36,7 +36,7 @@ class Student extends FHCAPI_Controller
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
 			'save' => ['admin:rw', 'assistenz:rw'],
-			'check' => ['admin:rw', 'assistenz:rw'],
+			'getPerson' => ['admin:rw', 'assistenz:rw'],
 			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);
 
@@ -111,12 +111,12 @@ class Student extends FHCAPI_Controller
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
 				"(
-					SELECT kontakt 
-					FROM public.tbl_kontakt 
-					WHERE kontakttyp='email' 
-					AND person_id=p.person_id 
-					AND zustellung 
-					ORDER BY kontakt_id 
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp='email'
+					AND person_id=p.person_id
+					AND zustellung
+					ORDER BY kontakt_id
 					LIMIT 1
 				) AS email_privat",
 				false
@@ -146,9 +146,9 @@ class Student extends FHCAPI_Controller
 										'LEFT');*/
 
 		$result = $this->PrestudentModel->loadWhere(['tbl_prestudent.prestudent_id' => $prestudent_id]);
-		
+
 		$student = $this->getDataOrTerminateWithError($result);
-		
+
 		if (!$student)
 			return show_404();
 
@@ -208,7 +208,7 @@ class Student extends FHCAPI_Controller
 		]);
 
 		$this->load->library('UDFLib');
-		
+
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
 		$udf_field_validations = $this->getDataOrTerminateWithError($result);
@@ -219,7 +219,7 @@ class Student extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-		
+
 		$student = $this->getDataOrTerminateWithError($result);
 
 		$uid = $student ? current($student)->student_uid : null;
@@ -232,7 +232,6 @@ class Student extends FHCAPI_Controller
 
 		$person_id = $person ? current($person)->person_id : null;
 
-		
 		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
 		$update_lehrverband = array();
 		foreach ($array_allowed_props_lehrverband as $prop) {
@@ -282,7 +281,7 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
-		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
+		if($this->isLaufendesSemester($studiensemester_kurzbz))
 		{
 			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
 		}
@@ -414,7 +413,7 @@ class Student extends FHCAPI_Controller
 		), ''));
 	}
 
-	public function check()
+	public function getPerson()
 	{
 		$this->load->library('form_validation');
 
@@ -436,11 +435,11 @@ class Student extends FHCAPI_Controller
 			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
 		if ($vorname && $nachname) {
 			$this->PersonModel->db->or_group_start();
-			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
-			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape(trim($nachname)) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape(trim($vorname)) . ')', false);
 			$this->PersonModel->db->group_end();
 		} elseif ($nachname) {
-			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape(trim($nachname)) . ')', false);
 		}
 
 		$result = $this->PersonModel->load();
@@ -460,6 +459,279 @@ class Student extends FHCAPI_Controller
 			$_POST['ausbildungssemester'] = 0;
 		}
 
+		$this->_validate();
+
+		// TODO(chris): This should be in a library
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+
+		$this->load->library('PrestudentLib');
+
+		$errors = [];
+		$person_id = null;
+
+		$this->db->trans_begin();
+
+		$result = $this->_addPerson();
+		if (hasData($result))
+		{
+			$person_id = getData($result);
+			$result = $this->_addAdresse($person_id);
+			if (isError($result)) $errors[] = getError($result);
+			$result = $this->_addKontakt($person_id);
+			if (isError($result)) $errors[] = getError($result);
+			if (!$this->input->post('personOnly')) $result = $this->_addInteressent($person_id);
+			if (isError($result)) $errors[] = getError($result);
+		}
+
+		if ($this->db->trans_status() === FALSE || !isEmptyArray($errors))
+		{
+			$this->db->trans_rollback();
+			$this->terminateWithError(isEmptyArray($errors) ? $this->p->t('stv', 'error_add_student') : $errors);
+		}
+		$this->db->trans_commit();
+
+		$this->terminateWithSuccess($person_id);
+	}
+
+	private function _addPerson()
+	{
+		// Person anlegen wenn nötig
+		$person_id = $this->input->post('person_id');
+		if (!$person_id) {
+			$this->load->model('person/Person_model', 'PersonModel');
+
+			$data = [
+				'nachname' => $this->input->post('nachname'),
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID(),
+				'zugangscode' => uniqid(),
+				'aktiv' => true
+			];
+			if ($this->input->post('anrede'))
+				$data['anrede'] = $this->input->post('anrede');
+			if ($this->input->post('titelpre'))
+				$data['titelpre'] = $this->input->post('titelpre');
+			if ($this->input->post('titelpost'))
+				$data['titelpost'] = $this->input->post('titelpost');
+			if ($this->input->post('vorname'))
+				$data['vorname'] = $this->input->post('vorname');
+			if ($this->input->post('vornamen'))
+				$data['vornamen'] = $this->input->post('vornamen');
+			if ($this->input->post('wahlname'))
+				$data['wahlname'] = $this->input->post('wahlname');
+			if ($this->input->post('geschlecht'))
+				$data['geschlecht'] = $this->input->post('geschlecht');
+			if ($this->input->post('gebdatum'))
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
+			if ($this->input->post('geburtsnation'))
+				$data['geburtsnation'] = $this->input->post('geburtsnation');
+			if ($this->input->post('staatsbuergerschaft'))
+				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
+
+			return $this->PersonModel->insert($data);
+		}
+
+		return success($person_id);
+	}
+
+	private function _addAdresse($person_id)
+	{
+		// Addresse anlegen?
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen)
+		{
+			// Adresse laden
+			$this->load->model('person/Adresse_model', 'AdresseModel');
+
+			$data = [
+				'nation' => $this->input->post('address[nation]'),
+				'strasse' => $this->input->post('address[address]'),
+				'plz' => $this->input->post('address[plz]'),
+				'ort' => $this->input->post('address[ort]'),
+				'gemeinde' => $this->input->post('address[gemeinde]'),
+				'typ' => 'h',
+				'zustelladresse' => true,
+			];
+
+			if ($anlegen < 0) // Adresse überschreiben
+			{
+				$this->AdresseModel->addSelect('adresse_id');
+				$this->AdresseModel->addJoin('public.tbl_adressentyp', 'typ = adressentyp_kurzbz');
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
+				$result = $this->AdresseModel->loadWhere([
+					'person_id' => $person_id
+				]);
+
+				if (isError($result)) return $result;
+
+				if (hasData($result))
+				{
+					$address = getData($result)[0];
+
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
+
+					return $this->AdresseModel->update($address->adresse_id, $data);
+				}
+				else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+
+			if ($anlegen > 0) // Adresse hinzufügen
+			{
+				$data['person_id'] = $person_id;
+				$data['insertamum'] = date('c');
+				$data['insertvon'] = getAuthUID();
+
+				// Wenn die Person neu angelegt wird, dann ist die neue Adresse die Heimatadresse
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+
+				return $this->AdresseModel->insert($data);
+			}
+		}
+
+		return success(null);
+	}
+
+	private function _addKontakt($person_id)
+	{
+		// Kontaktdaten
+		$kontaktdaten = [];
+
+		foreach (['email', 'telefon', 'mobil'] as $k)
+		{
+			$v = $this->input->post($k);
+			if ($v)
+				$kontaktdaten[$k] = $v;
+		}
+
+		if (count($kontaktdaten))
+		{
+			$this->load->model('person/Kontakt_model', 'KontaktModel');
+
+			foreach ($kontaktdaten as $typ => $kontakt)
+			{
+				$data = [
+					'person_id' => $person_id,
+					'kontakttyp' => $typ,
+					'kontakt' => $kontakt,
+					'zustellung' => true,
+					'insertamum' => date('c'),
+					'insertvon' => getAuthUID()
+				];
+				$result = $this->KontaktModel->insert($data);
+				if (isError($result)) return $result;
+			}
+		}
+		return success(null);
+	}
+
+	private function _addInteressent($person_id)
+	{
+		// Prestudent anlegen
+
+		// Anmerkung with Ausbildungsart
+		$studiengang_kz = $this->input->post('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$ausbildungsart = $this->input->post('ausbildungsart');
+		$anmerkung = $this->input->post('anmerkungen');
+		$foerderrelevant = null;
+		if ($ausbildungsart)
+			$anmerkung .= ' Ausbildungsart:' . $ausbildungsart;
+
+		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
+		$incoming = $this->input->post('incoming');
+		if ($incoming || substr($studiengang_kz, 0, 1) == '9')
+			$foerderrelevant = false;
+
+		// Prestudent speichern
+		$result = $this->prestudentlib->setPrestudent(
+			$person_id,
+			$studiengang_kz,
+			$this->input->post('letzteausbildung'),
+			$anmerkung,
+			$foerderrelevant
+		);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('Error when adding prestudent');
+
+		$prestudent_id = getData($result);
+
+		// Prestudent Rolle Anlegen
+		$this->prestudentlib->setFirstStatus(
+			$prestudent_id,
+			$incoming ? 'Incoming' : 'Interessent',
+			$studiensemester_kurzbz,
+			$this->input->post('ausbildungssemester'),
+			$this->input->post('orgform_kurzbz'),
+			$this->input->post('studienplan_id')
+		);
+		if (!hasData($result)) return error('error when adding status');
+		if (isError($result)) return $result;
+
+		if ($incoming)
+		{
+			$result = $this->prestudentlib->setIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz);
+			if (isError($result)) return $result;
+		}
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		return success($prestudent_id);
+	}
+
+	public function requiredIfNotPersonId($value)
+	{
+		if (isset($_POST['person_id']))
+			return true;
+		return !!$value;
+	}
+	
+	public function requiredIfAddressFunc($value)
+	{
+		if (!$_POST['address']['func'] || $_POST['address']['func'] == 0)
+			return true;
+		return !!$value;
+	}
+
+	public function requiredIfStudentFunc($value)
+	{
+		if (isset($_POST['personOnly']) && $_POST['personOnly'])
+			return true;
+		return !!$value;
+	}
+
+	public function requiredIfStudentAndNotIncomingFunc($value)
+	{
+		if ((isset($_POST['incoming']) && $_POST['incoming']) || $this->requiredIfStudentFunc($value))
+			return true;
+		return !!$value;
+	}
+
+	public function isValidDate($value)
+	{
+		return isValidDate($value);
+	}
+
+	/**
+	 * Validates input data. Terminates with validation errors, if invalid.
+	 */
+	private function _validate()
+	{
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
@@ -491,247 +763,19 @@ class Student extends FHCAPI_Controller
 		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'callback_requiredIfStudentFunc', [
 			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiensemester')])
 		]);
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'callback_requiredIfStudentFunc|integer|less_than[9]|greater_than[-1]', [
-			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'ausbildungssemester')])
-		]);
+		$this->form_validation->set_rules(
+			'ausbildungssemester',
+			'Ausbildungssemester',
+			'callback_requiredIfStudentAndNotIncomingFunc|integer|less_than[9]|greater_than[-1]',
+			[
+				'requiredIfStudentAndNotIncomingFunc' =>
+					$this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'ausbildungssemester')]),
+			]
+		);
 		// TODO(chris): validate studienplan with studiengang, semester and orgform?
 		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// TODO(chris): This should be in a library
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		$this->db->trans_start();
-
-		$result = $this->addInteressent();
-
-		$this->db->trans_complete();
-
-		if ($this->db->trans_status() === FALSE)
-			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	protected function addInteressent()
-	{
-		// Person anlegen wenn nötig
-		$person_id = $this->input->post('person_id');
-		if (!$person_id) {
-			$this->load->model('person/Person_model', 'PersonModel');
-			
-			$data = [
-				'nachname' => $this->input->post('nachname'),
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-				'zugangscode' => uniqid(),
-				'aktiv' => true
-			];
-			if ($this->input->post('anrede'))
-				$data['anrede'] = $this->input->post('anrede');
-			if ($this->input->post('titelpre'))
-				$data['titelpre'] = $this->input->post('titelpre');
-			if ($this->input->post('titelpost'))
-				$data['titelpost'] = $this->input->post('titelpost');
-			if ($this->input->post('vorname'))
-				$data['vorname'] = $this->input->post('vorname');
-			if ($this->input->post('vornamen'))
-				$data['vornamen'] = $this->input->post('vornamen');
-			if ($this->input->post('wahlname'))
-				$data['wahlname'] = $this->input->post('wahlname');
-			if ($this->input->post('geschlecht'))
-				$data['geschlecht'] = $this->input->post('geschlecht');
-			if ($this->input->post('gebdatum'))
-				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
-			if ($this->input->post('geburtsnation'))
-				$data['geburtsnation'] = $this->input->post('geburtsnation');
-			if ($this->input->post('staatsbuergerschaft'))
-				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
-
-			$result = $this->PersonModel->insert($data);
-			$person_id = $this->getDataOrTerminateWithError($result);
-		}
-
-		// Addresse anlegen
-		$anlegen = $this->input->post('address[func]');
-		if ($anlegen) {
-			$this->load->model('person/Adresse_model', 'AdresseModel');
-
-			$data = [
-				'nation' => $this->input->post('address[nation]'),
-				'strasse' => $this->input->post('address[address]'),
-				'plz' => $this->input->post('address[plz]'),
-				'ort' => $this->input->post('address[ort]'),
-				'gemeinde' => $this->input->post('address[gemeinde]'),
-				'typ' => 'h',
-				'zustelladresse' => true,
-			];
-			if ($anlegen < 0) { // Überschreiben
-				$this->AdresseModel->addSelect('adresse_id');
-				$this->AdresseModel->addJoin('public.tbl_adressentyp', 'typ = adressentyp_kurzbz');
-				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
-				$this->AdresseModel->addOrder('sort');
-				$result = $this->AdresseModel->loadWhere([
-					'person_id' => $person_id
-				]);
-				$address = $this->getDataOrTerminateWithError($result);
-				if ($address) {
-					$address = current($address);
-
-					$data['updateamum'] = date('c');
-					$data['updatevon'] = getAuthUID();
-
-					$result = $this->AdresseModel->update($address->adresse_id, $data);
-					$this->getDataOrTerminateWithError($result);
-				} else {
-					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
-					$anlegen = 1;
-					$data['heimatadresse'] = true;
-				}
-			}
-			if ($anlegen > 0) {
-				$data['person_id'] = $person_id;
-				$data['insertamum'] = date('c');
-				$data['insertvon'] = getAuthUID();
-				if (!isset($data['heimatadresse']))
-					$data['heimatadresse'] = !$this->input->post('person_id');
-				
-				$result = $this->AdresseModel->insert($data);
-				$this->getDataOrTerminateWithError($result);
-			}
-		}
-		
-		// Kontaktdaten
-		$kontaktdaten = [];
-		foreach (['email', 'telefon', 'mobil'] as $k) {
-			$v = $this->input->post($k);
-			if ($v)
-				$kontaktdaten[$k] = $v;
-		}
-		if (count($kontaktdaten)) {
-			$this->load->model('person/Kontakt_model', 'KontaktModel');
-
-			foreach ($kontaktdaten as $typ => $kontakt) {
-				$data = [
-					'person_id' => $person_id,
-					'kontakttyp' => $typ,
-					'kontakt' => $kontakt,
-					'zustellung' => true,
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID()
-				];
-				$result = $this->KontaktModel->insert($data);
-				$this->getDataOrTerminateWithError($result);
-			}
-		}
-
-		$personOnly = $anlegen = $this->input->post('personOnly');
-
-		if (!$personOnly)
-		{
-			// Prestudent anlegen
-			$data = [
-				'aufmerksamdurch_kurzbz' => 'k.A.',
-				'person_id' => $person_id,
-				'studiengang_kz' => $this->input->post('studiengang_kz'),
-				'ausbildungcode' => $this->input->post('letzteausbildung'),
-				'anmerkung' => $this->input->post('anmerkungen'),
-				'reihungstestangetreten' => false,
-				'bismelden' => true
-			];
-			$ausbildungsart = $this->input->post('ausbildungsart');
-			if ($ausbildungsart)
-				$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
-			// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
-			$incoming = $this->input->post('incoming');
-			if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
-				$data['foerderrelevant'] = false;
-			// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
-			$this->PrestudentModel->addOrder('zgvmas_code');
-			$this->PrestudentModel->addOrder('zgv_code', 'DESC');
-			$this->PrestudentModel->addLimit(1);
-			$result = $this->PrestudentModel->loadWhere([
-				'person_id' => $person_id
-			]);
-			$prestudent = $this->getDataOrTerminateWithError($result);
-			if ($prestudent) {
-				$prestudent = current($prestudent);
-				if ($prestudent->zgv_code) {
-					$data['zgv_code'] = $prestudent->zgv_code;
-					$data['zgvort'] = $prestudent->zgvort;
-					$data['zgvdatum'] = $prestudent->zgvdatum;
-
-					$data['zgvmas_code'] = $prestudent->zgvmas_code;
-					$data['zgvmaort'] = $prestudent->zgvmaort;
-					$data['zgvmadatum'] = $prestudent->zgvmadatum;
-				}
-			}
-			// Prestudent speichern
-			$result = $this->PrestudentModel->insert($data);
-			$prestudent_id = $this->getDataOrTerminateWithError($result);
-
-			// Prestudent Rolle Anlegen
-			$data = [
-				'prestudent_id' => $prestudent_id,
-				'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
-				'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
-				'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
-				'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
-				'studienplan_id' => $this->input->post('studienplan_id') ?: null,
-				'datum' => date('Y-m-d'),
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID()
-			];
-			$result = $this->PrestudentstatusModel->insert($data);
-			$this->getDataOrTerminateWithError($result);
-
-			if ($incoming) {
-				// TODO(chris): IMPLEMENT!
-				//Matrikelnummer und UID generieren
-				//Benutzerdatensatz anlegen
-				//Studentendatensatz anlegen
-				//StudentLehrverband anlegen
-			}
-		}
-		// TODO(chris): DEBUG
-		/*$result = $this->PrestudentModel->loadWhere([
-			'pestudent_id' => 1
-		]);
-		if (isError($result)) {
-			return $result;
-		}*/
-
-		return success($person_id);
-	}
-
-	public function requiredIfNotPersonId($value)
-	{
-		if (isset($_POST['person_id']))
-			return true;
-		return !!$value;
-	}
-	
-	public function requiredIfAddressFunc($value)
-	{
-		if (!$_POST['address']['func'] || $_POST['address']['func'] == 0)
-			return true;
-		return !!$value;
-	}
-
-	public function requiredIfStudentFunc($value)
-	{
-		if ($_POST['personOnly'])
-			return true;
-		return !!$value;
-	}
-
-	public function isValidDate($value)
-	{
-		return isValidDate($value);
 	}
 }
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 2d795369f..fe1fa3a00 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,6 +35,87 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
+	/**
+	 * Sets initial prestudent entry, no status yet.
+	 * @return object success or error
+	 */
+	public function setPrestudent(
+		$person_id,
+		$studiengang_kz,
+		$ausbildungscode,
+		$anmerkung,
+		$foerderrelevant
+	)
+	{
+		// Prestudent anlegen
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $studiengang_kz,
+			'ausbildungcode' => $ausbildungscode,
+			'anmerkung' => $anmerkung,
+			'reihungstestangetreten' => false,
+			'bismelden' => true,
+			'foerderrelevant' => $foerderrelevant
+		];
+
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->_ci->PrestudentModel->addSelect('public.tbl_prestudent.*, public.tbl_person.vorname, public.tbl_person.nachname');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person', 'person_id');
+		$this->_ci->PrestudentModel->addOrder('zgvmas_code');
+		$this->_ci->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->_ci->PrestudentModel->addLimit(1);
+		$result = $this->_ci->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+
+		if (isError($result)) return $result;
+
+		if (hasData($result)) {
+			$prestudent = getData($result)[0];
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
+
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
+		// Prestudent speichern
+		return $this->_ci->PrestudentModel->insert($data);
+	}
+
+	/**
+	 * Sets first status of a prestudent.!
+	 * @return object success or error
+	 */
+	public function setFirstStatus(
+		$prestudent_id,
+		$status_kurzbz,
+		$studiensemester_kurzbz,
+		$ausbildungssemester = null,
+		$orgform_kurzbz = null,
+		$studienplan_id = null
+	)
+	{
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $ausbildungssemester ?: 0,
+			'orgform_kurzbz' => $orgform_kurzbz ?: null,
+			'studienplan_id' => $studienplan_id ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+
+		return  $this->_ci->PrestudentstatusModel->insert($data);
+	}
+
 	public function setAbbrecher(
 		$prestudent_id,
 		$studiensemester_kurzbz,
@@ -889,6 +970,141 @@ class PrestudentLib
 		);
 	}
 
+	/**
+	 * Creates an incoming, saves necessary data for an incoming. 
+	 * @param $prestudent_id existing prestudent, for which incoming entry is created
+	 * @param $studiengang_kz Studiengang assigned to incoming
+	 * @param $studiensemester_kurzbz start semester for incoming
+	 * @return object success if incoming successfully saved, or error
+	 */
+	public function setIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz)
+	{
+		// Verband and Ausbildungssemester for incoming
+		$authUID = getAuthUID();
+		$incomingVerband = 'I';
+		$incomingAusbildungssemester = '0';
+
+		// get prestudent
+		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+		$this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No prestudent');
+
+		$student_data = getData($result)[0];
+
+		// generate Personenkennzeichen
+		$result = $this->_ci->StudentModel->generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No personenkennzeichen could be generated');
+
+		$personenkennzeichen = getData($result);
+
+		$jahr = mb_substr($personenkennzeichen, 0, 2);
+		$stg = mb_substr($personenkennzeichen, 3, 4);
+
+		$nachname_clean = mb_strtolower(sanitizeProblemChars($student_data->nachname));
+		$vorname_clean = mb_strtolower(sanitizeProblemChars($student_data->vorname));
+		$nachname_clean = str_replace(' ','_', $nachname_clean);
+		$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+		// get Studiengang data
+		$result = $this->_ci->StudiengangModel->load(ltrim($stg, '0'));
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('No Studiengang');
+
+		$stgObj = getData($result)[0];
+
+		// gernerate uid
+		$result = $this->_ci->StudentModel->generateUID($stgObj->kurzbz, $jahr, $stgObj->typ, $personenkennzeichen, $vorname_clean, $nachname_clean);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error("UID could not be generated");
+		$uid = getData($result);
+
+		//Benutzerdatensatz anlegen
+		$benutzer = [
+			'uid' => $uid,
+			'person_id' => $student_data->person_id,
+			'aktiv' => true,
+			'aktivierungscode' => $this->_ci->BenutzerModel->generateActivationkey()
+		];
+
+		// Generate Alias
+		$alias = '';
+		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
+		{
+			$result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
+			if (isError($result))
+				return $result;
+			$alias = getData($result);
+		}
+
+		$benutzer['alias'] = $alias;
+		$benutzer['insertamum'] = date('Y-m-d H:i:s');
+		$benutzer['insertvon'] = $authUID;
+
+		$this->_ci->addMeta('benutzer', $benutzer);
+
+		$result = $this->_ci->BenutzerModel->insert($benutzer);
+
+		if (isError($result)) return $result;
+
+		// Studentendatensatz anlegen
+		$student = [
+			'student_uid' => $uid,
+			'matrikelnr' => $personenkennzeichen,
+			'prestudent_id' => $prestudent_id,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $incomingAusbildungssemester,
+			'verband' => $incomingVerband,
+			'gruppe' => ' '
+		];
+
+		// Add Lehrverband if it does not exist
+		$result = $this->_ci->LehrverbandModel->load([' ', ' ', $incomingAusbildungssemester, $student_data->studiengang_kz]);
+
+		if (isError($result)) return $result;
+
+		if (!hasData($result))
+		{
+			$result = $this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student_data->studiengang_kz,
+				'semester' => $incomingAusbildungssemester,
+				'verband' => $incomingVerband,
+				'gruppe' => $student_data->gruppe,
+				'bezeichnung' => 'Incoming',
+				'aktiv' => true
+			]);
+
+			if (isError($result)) return $result;
+		}
+
+		// add student
+		$student['insertamum'] = date('Y-m-d H:i:s');
+		$student['insertvon'] = $authUID;
+
+		$result = $this->_ci->StudentModel->insert($student);
+		if (isError($result)) return $result;
+
+		// Add Studentlehrverband
+		$result = $this->_ci->StudentlehrverbandModel->insert([
+			'student_uid' => $uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $student_data->studiengang_kz,
+			'semester' => $incomingAusbildungssemester,
+			'verband' => $incomingVerband,
+			'gruppe' => ' ',
+			'insertamum' => date('Y-m-d H:i:s'),
+			'insertvon' => $authUID
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success($prestudent_id);
+	}
+
 	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 539c3cf56..6f2404cbd 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -27,7 +27,7 @@ class Student_model extends DB_Model
         $this->addSelect('1');
 
         $result = $this->loadWhere(array('student_uid' => $uid));
-        
+
 
         if(hasData($result))
         {
@@ -169,7 +169,7 @@ class Student_model extends DB_Model
 
 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
-			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
+			$max = mb_substr(getData($matrikelnrres)[0]->matrikelnr, 7);
 			if (!is_numeric($max)) {
 				$max = (int)$max;
 			}
diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js
index 07d4453d8..acb4d5f49 100644
--- a/public/js/api/factory/stv/students.js
+++ b/public/js/api/factory/stv/students.js
@@ -52,10 +52,10 @@ export default {
 			url: 'api/frontend/v1/stv/students/' + relative_path
 		};
 	},
-	check(params) {
+	getPerson(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/student/check',
+			url: 'api/frontend/v1/stv/student/getPerson',
 			params
 		};
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..39a46b630 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -322,9 +322,7 @@ export default {
 				table-only
 				:side-menu="false"
 				reload
-				` + /* TODO(chris): Ausgeblendet für Testing
 				new-btn-show
-				*/`
 				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
 			>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 75896d408..211bb9dd3 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -6,6 +6,7 @@ import FormInput from '../../../Form/Input.js';
 import accessibility from '../../../../directives/accessibility.js';
 
 import ApiStvStudents from '../../../../api/factory/stv/students.js';
+import ApiStvAddress from '../../../../api/factory/stv/kontakt/address.js';
 
 var _uuid = 0;
 const FORMDATA_DEFAULT = {
@@ -35,7 +36,7 @@ export default {
 	],
 	emits: ['saved'],
 	props: {
-		personOnly: Boolean, 
+		personOnly: Boolean,
 		studiengangKz: Number,
 		studiensemesterKurzbz: String
 	},
@@ -112,7 +113,7 @@ export default {
 			this.abortController.suggestions = new AbortController();
 
 			this.$api
-				.call(ApiStvStudents.check({
+				.call(ApiStvStudents.getPerson({
 					vorname: this.formData.vorname,
 					nachname: this.formData.nachname,
 					gebdatum: this.formData.gebdatum
@@ -138,23 +139,22 @@ export default {
 				return;
 
 			this.abortController.places = new AbortController();
-			this.$refs.form
-				.get(
-					'api/frontend/v1/stv/address/getPlaces/' + this.formData.address.plz,
-					undefined,
-					{
-						signal: this.abortController.places.signal
-					}
-				)
-				.then(result => {
-					this.places = result.data
-				})
-				.catch(error => {
-					if (error.code != "ERR_CANCELED")
-						window.setTimeout(this.loadPlaces, 100);
-					else
-						this.$fhcAlert.handleSystemError(error);
-				});
+			this.$refs.form.call(
+				ApiStvAddress.getPlaces(this.formData.address.plz)
+				//~ undefined,
+				//~ {
+					//~ signal: this.abortController.places.signal
+				//~ }
+			)
+			.then(result => {
+				this.places = result.data
+			})
+			.catch(error => {
+				if (error.code != "ERR_CANCELED")
+					window.setTimeout(this.loadPlaces, 100);
+				else
+					this.$fhcAlert.handleSystemError(error);
+			});
 		},
 		loadStudienplaene() {
 			if (this.formDataStg)
@@ -228,14 +228,12 @@ export default {
 	},
 	template: `
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-lg modal-dialog-scrollable" @hidden-bs-modal="reset">
+		<bs-modal ref="modal" dialog-class="modal-lg modal-dialog-scrollable" style="min-height: 500px" @hidden-bs-modal="reset">
 			<template #title>
 				{{ personOnly ? $p.t('person', 'personAnlegen') : $p.t('lehre', 'interessentAnlegen') }}
 			</template>
 			<template #default>
 
-				<form-validation></form-validation>
-
 				<template v-if="person === null">
 					<div class="row">
 						<div class="col-sm-4 mb-3">
@@ -275,7 +273,7 @@ export default {
 								@update:model-value="loadSuggestions"
 								text-input
 								auto-apply
-								no-today 
+								no-today
 								:enable-time-picker="false"
 								format="dd.MM.yyyy"
 								>
@@ -418,7 +416,7 @@ export default {
 							</form-input>
 						</div>
 					</div>
-					
+
 					<div class="row">
 						<div class="col-sm-6 mb-3">
 							<form-input
@@ -433,7 +431,7 @@ export default {
 							</form-input>
 						</div>
 					</div>
-					
+
 					<fieldset v-if="formData['address']['func'] != 0">
 						<legend>Adresse</legend>
 						<div class="row">

From dab34eff35041fe11a686994ecd5a71f04fd50c4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 2 Oct 2025 16:53:41 +0200
Subject: [PATCH 0829/1357] klickibunti farben in accordion headers je nach
 datum/abgabedatum combo; more color definitions cis4 default.css; nomore
 legacy classes in Abgabe.php, CI3 models only; confirm delete Termin prompt;
 endupload validation stub, not sure about the technical min requirements
 here; mitarbeiter table format fix; show noten in projektarbeit view for
 students so there is some distinction; fhc isMobile computed revamp; order
 projektarbeiten by insertamum DESC to get most recent ones at the top of
 lists;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 160 ++++++++-------
 .../models/education/Projektarbeit_model.php  | 128 +++++++++++-
 public/css/components/abgabetool/abgabe.css   |  51 +++--
 public/css/theme/default.css                  |  62 ++++--
 public/js/apps/Dashboard/Fhc.js               |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 189 ++++--------------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  38 +---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  16 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 153 +++++---------
 system/phrasesupdate.php                      | 100 +++++++++
 10 files changed, 494 insertions(+), 407 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 78434e5a3..d0b39d35c 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -18,15 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-//require_once('../../../include/studiengang.class.php');
-//require_once('../../../include/student.class.php');
-//require_once('../../../include/datum.class.php');
-//require_once('../../../include/mail.class.php');
-//require_once('../../../include/benutzerberechtigung.class.php');
-//require_once('../../../include/phrasen.class.php');
-//require_once('../../../include/projektarbeit.class.php');
-//require_once('../../../include/projektbetreuer.class.php');
-
 class Abgabe extends FHCAPI_Controller
 {
 
@@ -61,11 +52,6 @@ class Abgabe extends FHCAPI_Controller
 		);
 
 		$this->load->helper('hlp_sancho_helper');
-
-		require_once(FHCPATH . 'include/studiengang.class.php');
-		require_once(FHCPATH . 'include/student.class.php');
-		require_once(FHCPATH . 'include/projektarbeit.class.php');
-		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -92,26 +78,24 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
-
-		// TODO: error messages
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
-		$projektarbeit_obj = new projektarbeit();
-		if($projektarbeit_id==-1)
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
 
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		if(count($projektarbeitArr) > 0) {
+			$projektarbeit = $projektarbeitArr[0];
+		} else {
+			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+		}
+		
+		$paIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
 
-		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
-
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 
-		// TODO: fetch zweitbetreuer
-
 		$this->terminateWithSuccess(array($ret, $paIsCurrent));
 	}
 
@@ -141,15 +125,26 @@ class Abgabe extends FHCAPI_Controller
 		$projektarbeiten = getData($result);
 		
 		if(count($projektarbeiten)) {
-			// TODO: save access to this, array could be empty
 			foreach($projektarbeiten as $pa) {
 				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
-
-				// TODO: save access
+				
 				$data = getData($result);
 				if(count($data) > 0) {
 					$pa->email = $data[0]->private_email;
 				}
+				if($pa->zweitbetreuer_person_id !== null) {
+					// zweitbetreuer info since the 'getStudentProjektarbeitenWithBetreuer' query got quiete large,
+					// enjoy optimizing that one in 2038. we need this to render a string like
+					// Zweitbegutachter: FH-Prof. PD DI Dr. techn. Vorname Nachname MBA
+
+					$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($pa->zweitbetreuer_person_id);
+
+					$data = getData($result);
+					if(count($data) > 0) {
+						$pa->zweitbetreuer = $data[0];
+					}
+				}
+				
 				
 			}
 		}
@@ -225,11 +220,12 @@ class Abgabe extends FHCAPI_Controller
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
 			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
 			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz)
+			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
+			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
+			|| !isset($seitenanzahl))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
-		// TODO: maybe check for other params aswell?
-
 		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
 			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
 
@@ -261,8 +257,7 @@ class Abgabe extends FHCAPI_Controller
 				{
 					$this->signaturFehltEmail($student_uid);
 				}
-
-				// TODO error handle get data has data the updates
+				
 				// update projektarbeit cols
 				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
@@ -291,15 +286,26 @@ class Abgabe extends FHCAPI_Controller
 	}
 
 	private function signaturFehltEmail($student_uid) {
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('education/Studiengang_model', 'StudiengangModel');
 		
-		// Mail an Studiengang wenn keine Signatur gefunden wurde
-		$student = new student();
-		if(!$student->load($student_uid))
+		$result = $this->StudentModel->load($student_uid);
+		$studentArr = $this->getDataOrTerminateWithError($result);
+		
+		if(count($studentArr) > 0) {
+			$student = $studentArr[0];
+		} else {
 			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+		}
 
-		$stg_obj = new studiengang();
-		if(!$stg_obj->load($student->studiengang_kz))
+		$result = $this->Studiengang_model->load($student->studiengang_kz);
+		$studiengangArr = $this->getDataOrTerminateWithError($result);
+
+		if(count($studiengangArr) > 0) {
+			$stg_obj = $studiengangArr[0];
+		} else {
 			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
+		}
 
 		$subject = 'Abgabe ohne Signatur';
 		$tomail = $stg_obj->email;
@@ -325,15 +331,19 @@ class Abgabe extends FHCAPI_Controller
 
 		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
 
-		$projektarbeit_obj = new projektarbeit();
 
-		if(!$projektarbeit_obj->load($projektarbeit_id))
-			$this->terminateWithError('Ungueltiger Eintrag');
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
 
-		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+		if(count($projektarbeitArr) > 0) {
+			$projektarbeit = $projektarbeitArr[0];
+		} else {
+			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+		}
 
-		if( null === $num_rows_sem || false === $num_rows_sem )
-		{
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
+		if(!$projektarbeitIsCurrent) {
 			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
 		}
 
@@ -341,14 +351,12 @@ class Abgabe extends FHCAPI_Controller
 
 			// query student benutzer view for every betreuer row
 			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
-
-			// TODO: hasdata, getData etc
-
+			
 			// 1. Begutachter mail ohne Token
 			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
 			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
-			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
+			$projekttyp_kurzbz = $projektarbeit->projekttyp_kurzbz;
+			$subject = $projektarbeit->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
 			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
 
 			$maildata = array();
@@ -359,7 +367,7 @@ class Abgabe extends FHCAPI_Controller
 			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
 			$maildata['abgabetyp'] = $abgabetyp;
 			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
-			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
+			$maildata['bewertunglink'] = $projektarbeitIsCurrent && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
 			$maildata['token'] = "";
 			
 			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
@@ -384,12 +392,14 @@ class Abgabe extends FHCAPI_Controller
 			if ($paabgabetyp_kurzbz == 'end')
 			{
 				// Zweitbegutachter holen
-				$zweitbegutachter = new projektbetreuer();
-				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
-
+				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+				$zweitbegutachterRes = $this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
+				
+				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRes);
+				
 				if ($zweitbegutachterRes)
 				{
-					$zweitbegutachterResults = $zweitbegutachter->result;
+					$zweitbegutachterResults = $zweitbegutachterRes->retval;
 
 					foreach ($zweitbegutachterResults as $begutachter)
 					{
@@ -400,10 +410,9 @@ class Abgabe extends FHCAPI_Controller
 						{
 							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
 						}
-
-						// Zweitbegutachter (evtl. mit Token) holen
-						$zweitbegutachterMitToken = new projektbetreuer();
-						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+						
+						$begutachterMitTokenRes = $this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+//						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
 
 						if (!$begutachterMitTokenRes)
 						{
@@ -429,8 +438,8 @@ class Abgabe extends FHCAPI_Controller
 							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
 							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
 							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
-							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
-							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+							$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+							$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
 							
 
 							$mailres = sendSanchoMail(
@@ -558,9 +567,6 @@ class Abgabe extends FHCAPI_Controller
 			$note = $noteArr[0];
 			if($note->positiv === false) {
 //				$this->addMeta('noteNegativ', true);
-				// TODO: somewhere in here check if there has been an existingPaabgabe and if that existing abgabe was
-				// already negativ -> dont send mail
-				
 				
 				if($existingPaabgabe && $existingPaabgabe->note) {
 					$result = $this->NoteModel->load($paabgabe->note);
@@ -596,8 +602,7 @@ class Abgabe extends FHCAPI_Controller
 
 		if(count($result) == 0)
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
-		// TODO: berechtigung?
+		
 		if($result[0]->insertvon === getAuthUID()) {
 			$result = $this->PaabgabeModel->delete($paabgabe_id);
 			$result = $this->getDataOrTerminateWithError($result);
@@ -636,7 +641,7 @@ class Abgabe extends FHCAPI_Controller
 		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
 		// and should never unintentionally happen
 
-		// TODO: check berechtigung &/|| zuordnung?
+		// TODO: maybe check for betreuer zuordnung?
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
@@ -768,24 +773,29 @@ class Abgabe extends FHCAPI_Controller
 		$paabgabetyp_kurzbz = $paabgabetyp_kurzbzArr[0];
 		
 		// Mail an Student wenn Qualgate negativ beurteilt wurde
-		$student = new student();
-		if(!$student->load($student_uid))
-			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->load($paabgabe->paabgabetyp_kurzbz);
+		$studentArr = $this->getDataOrTerminateWithError($result);
+		$student = $studentArr[0];
 
-		// TODO: frasen
-		$subject = 'Quality Gate Negativ';
+		if(!$student) {
+			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+		}
+		
+		$subject = $this->p->t('abgabetool', 'c4qualgateNegativEmailSubject');
 		$tomail = $student_uid.'@'.DOMAIN;
 		
+		$datetime = new DateTime($paabgabe->datum);
+		$dateEmailFormatted = $datetime->format('d.m.Y');
 		
-		// TODO: datum format 
 		$data = array(
 			'betreuerfullname' => $anrede->first,
 			'qualgatebezeichnung' => $paabgabetyp_kurzbz->bezeichnung,
-			'datum' => $paabgabe->datum,
+			'datum' => $dateEmailFormatted,
 			'projektarbeitname' => $projektarbeit->titel
 		);
 
-		$this->addMeta('$emaildata', $data);
+//		$this->addMeta('$emaildata', $data);
 		
 		$mailres = sendSanchoMail(
 			'QualGateNegativ',
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index bb5e06b0c..76908600c 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -97,12 +97,11 @@ class Projektarbeit_model extends DB_Model
 	 */
 	public function getStudentProjektarbeitenWithBetreuer($studentUID)
 	{
-		$betreuerQuery = "SELECT DISTINCT ON(projektarbeit_id)
+		$betreuerQuery = "SELECT * FROM (SELECT DISTINCT ON(projektarbeit_id)
 			vorname as bvorname,
 			nachname as bnachname,
 			titelpre as btitelpre,
 			titelpost AS btitelpost,
-			titelpost AS btitelpost,
 			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
 		
 			(SELECT person_id
@@ -125,7 +124,8 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_lehreinheit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
-			lehre.tbl_projektbetreuer.note as note,
+			lehre.tbl_projektarbeit.note as note,
+			lehre.tbl_note.bezeichnung as note_bezeichnung,
 			public.tbl_mitarbeiter.mitarbeiter_uid,
 			lehre.tbl_projektarbeit.titel as titel,
 			lehre.tbl_projektarbeit.sprache as sprache,
@@ -135,6 +135,7 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.schlagwoerter_en as schlagwoerter_en,
 			lehre.tbl_projektarbeit.abstract as abstract,
 			lehre.tbl_projektarbeit.abstract_en as abstract_en,
+			lehre.tbl_projektarbeit.insertamum as insertamum,
 			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
 			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
@@ -149,10 +150,12 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
 				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+				 LEFT JOIN lehre.tbl_note ON(lehre.tbl_projektarbeit.note = lehre.tbl_note.note)
 		WHERE
 			tbl_projektarbeit.student_uid = ? AND mitarbeiter_uid IS NOT NULL AND
 			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+		  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')) as base
+		ORDER BY insertamum DESC";
 				
 		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
 	}
@@ -284,4 +287,121 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
+
+	/**
+	 * Prüft ob Projektarbeit aktuell ist (also zurzeit online bewertet wird).
+	 * @param $projektarbeit_id
+	 * @return boolean
+	 */
+	public function projektarbeitIsCurrent($projektarbeit_id) {
+		$version = $this->getVersion($projektarbeit_id);
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		return $version === null ? null : $version->isCurrent;
+	}
+
+	/**
+	 * Holt sich Version der Projektarbeit.
+	 * Liefert auch mit, ob die Version die aktuellste ist.
+	 * z.B.: Masterarbeiten waren ab der Änderung zur Gewichtung der Punkte aktuell,
+	 * Bachelorarbeiten waren ab dem Umstieg auf das Online Beurteilungsformular aktuell.
+	 * @param $projektarbeit_id
+	 * @return objekt mit Versionsinfo, null im Fehlerfall
+	 */
+	private function getVersion($projektarbeit_id) {
+		$_versions_query = array(
+			'Diplom' => array(
+				'SS2025',
+				'SS2023',
+				'SS2022'
+			),
+			'Others' => array(
+				'SS2025',
+				'SS2022',
+			)
+		);
+
+		$_versions_check = array(
+			'Diplom' => array(
+				'SS2025' => 3,
+				'SS2023' => 2,
+				'SS2022' => 1
+			),
+			'Others' => array(
+				'SS2025' => 2,
+				'SS2022' => 1
+			)
+		);
+		
+		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
+		$qry="
+			SELECT
+				CASE
+					WHEN semesters_diplom.studiensemester_kurzbz IS NOT NULL
+					THEN semesters_diplom.studiensemester_kurzbz
+					ELSE semesters.studiensemester_kurzbz 
+				END AS version_studiensemester_kurzbz,
+				pa.projekttyp_kurzbz
+			FROM
+				lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters ON sem.start >= semesters.start AND pa.projekttyp_kurzbz <> 'Diplom'
+				LEFT JOIN (
+					SELECT
+						start, studiensemester_kurzbz
+					FROM
+						public.tbl_studiensemester
+					WHERE
+						studiensemester_kurzbz IN ?
+				) semesters_diplom ON sem.start >= semesters_diplom.start AND pa.projekttyp_kurzbz = 'Diplom'
+			WHERE
+				projektarbeit_id = ?
+			ORDER BY
+				semesters.start DESC, semesters_diplom.start DESC
+			LIMIT 1";
+
+		$resultociniBambini = $this->execReadOnlyQuery($qry, array($_versions_query['Others'], $_versions_query['Diplom'], $projektarbeit_id));
+		
+		if(hasData($resultociniBambini)) {
+			$data =	getData($resultociniBambini);
+			if(count($data) > 0) {
+				$row = $data[0];
+				
+				// known project types
+				if (isset($_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]
+						== max($_versions_check[$row->projekttyp_kurzbz]);
+
+				}
+				elseif (isset($_versions_check['Others'][$row->version_studiensemester_kurzbz]))
+				{
+					$row->versionNumber = $_versions_check['Others'][$row->version_studiensemester_kurzbz];
+					$row->isCurrent =
+						$_versions_check['Others'][$row->version_studiensemester_kurzbz]
+						== max($_versions_check['Others']);
+				}
+				else
+				{
+					$row->isCurrent = false;
+					$row->versionNumber = 0;
+				}
+				return $row;
+				
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
 }
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index ad0c1c166..c9de223fd 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -1,6 +1,6 @@
 /* Base Header */
 .verpasst-header {
-	background-color: var(--fhc-red-40);
+	background-color: var(--fhc-red-70);
 	font-weight: 600;
 	border-radius: 6px;
 	padding: 0px 0px 0px 32px;
@@ -10,7 +10,7 @@
 
 /* Hover State */
 .verpasst-header:hover {
-	background-color: var(--fhc-red-30);
+	background-color: var(--fhc-red-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
@@ -22,13 +22,13 @@
 
 /* Hover State Active*/
 .p-accordion-tab-active > .verpasst-header:hover {
-	background-color: var(--fhc-red-40);
+	background-color: var(--fhc-red-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
 /* Base Header */
 .abzugeben-header {
-	background-color: var(--fhc-yellow-40);
+	background-color: var(--fhc-yellow-70);
 	font-weight: 600;
 	border-radius: 6px;
 	padding: 0px 0px 0px 32px;
@@ -38,7 +38,7 @@
 
 /* Hover State */
 .abzugeben-header:hover {
-	background-color: var(--fhc-yellow-30);
+	background-color: var(--fhc-yellow-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
@@ -50,13 +50,13 @@
 
 /* Hover State Active*/
 .p-accordion-tab-active > .abzugeben-header:hover {
-	background-color: var(--fhc-yellow-40);
+	background-color: var(--fhc-yellow-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
 /* Base Header */
 .verspaetet-header {
-	background-color: var(--fhc-pink-40);
+	background-color: var(--fhc-pink-70);
 	font-weight: 600;
 	border-radius: 6px;
 	padding: 0px 0px 0px 32px;
@@ -66,7 +66,7 @@
 
 /* Hover State */
 .verspaetet-header:hover {
-	background-color: var(--fhc-pink-30);
+	background-color: var(--fhc-pink-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
@@ -78,13 +78,13 @@
 
 /* Hover State Active*/
 .p-accordion-tab-active > .verspaetet-header:hover {
-	background-color: var(--fhc-pink-40);
+	background-color: var(--fhc-pink-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
 /* Base Header */
 .abgegeben-header {
-	background-color: var(--fhc-green-40);
+	background-color: var(--fhc-green-70);
 	font-weight: 600;
 	border-radius: 6px;
 	padding: 0px 0px 0px 32px;
@@ -94,7 +94,7 @@
 
 /* Hover State */
 .abgegeben-header:hover {
-	background-color: var(--fhc-green-30);
+	background-color: var(--fhc-green-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
@@ -106,8 +106,35 @@
 
 /* Hover State Active*/
 .p-accordion-tab-active > .abgegeben-header:hover {
-	background-color: var(--fhc-green-40);
+	background-color: var(--fhc-green-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
+/* Base Header */
+.standard-header {
+	background-color: var(--fhc-white-70);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 32px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.standard-header:hover {
+	background-color: var(--fhc-white-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .standard-header {
+	background-color: var(--fhc-white-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .standard-header:hover {
+	background-color: var(--fhc-white-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
 
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 0337dd319..51bbeceb6 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -39,33 +39,53 @@
 	--fhc-blue-primary-highlight: #0086CB;
 
 	/* --- Green --- */
-	--fhc-green-10: #dff4df;
-	--fhc-green-20: #a8e0a2;
-	--fhc-green-30: #008000;
-	--fhc-green-40: #006600;
-	--fhc-green-50: #004d00;
+	--fhc-green-5:  rgb(240, 250, 240);
+	--fhc-green-10: rgb(220, 245, 220);
+	--fhc-green-20: rgb(190, 235, 190);
+	--fhc-green-30: rgb(150, 220, 150);
+	--fhc-green-40: rgb(110, 200, 110);
+	--fhc-green-50: rgb(70, 170, 70);
+	--fhc-green-60: rgb(50, 145, 50);
+	--fhc-green-70: rgb(35, 120, 35);
+	--fhc-green-80: rgb(25, 95, 25);
+	--fhc-green-90: rgb(15, 70, 15);
 
 	/* --- Red --- */
-	--fhc-red-10: #fde6e8;
-	--fhc-red-20: #f5a3a8;
-	--fhc-red-30: #842029;
-	--fhc-red-40: #600018;
-	--fhc-red-50: #400010;
+	--fhc-red-5:  rgb(255, 245, 246);
+	--fhc-red-10: rgb(255, 225, 228);
+	--fhc-red-20: rgb(250, 190, 195);
+	--fhc-red-30: rgb(240, 150, 160);
+	--fhc-red-40: rgb(225, 110, 120);
+	--fhc-red-50: rgb(200, 70, 85);
+	--fhc-red-60: rgb(170, 50, 65);
+	--fhc-red-70: rgb(140, 35, 50);
+	--fhc-red-80: rgb(110, 20, 35);
+	--fhc-red-90: rgb(85, 10, 25);
 
 	/* --- Yellow --- */
-	--fhc-yellow-10: #fff9e6;
-	--fhc-yellow-20: #fff0b3;
-	--fhc-yellow-30: #ffeb3b;
-	--fhc-yellow-40: #f5d600;
-	--fhc-yellow-50: #c8aa00;
+	--fhc-yellow-5:  rgb(255, 255, 240);
+	--fhc-yellow-10: rgb(255, 250, 210);
+	--fhc-yellow-20: rgb(255, 240, 160);
+	--fhc-yellow-30: rgb(255, 225, 100);
+	--fhc-yellow-40: rgb(250, 210, 50);
+	--fhc-yellow-50: rgb(240, 190, 0);
+	--fhc-yellow-60: rgb(220, 165, 0);
+	--fhc-yellow-70: rgb(190, 135, 0);
+	--fhc-yellow-80: rgb(160, 105, 0);
+	--fhc-yellow-90: rgb(120, 75, 0);
 
 	/* --- Pink --- */
-	--fhc-pink-10: #ffe6f0;
-	--fhc-pink-20: #f8c1d6;
-	--fhc-pink-30: #e91e63;
-	--fhc-pink-40: #c2185b;
-	--fhc-pink-50: #8b1050;
-
+	--fhc-pink-5:  rgb(255, 245, 250);
+	--fhc-pink-10: rgb(255, 225, 235);
+	--fhc-pink-20: rgb(250, 195, 215);
+	--fhc-pink-30: rgb(245, 160, 190);
+	--fhc-pink-40: rgb(235, 120, 160);
+	--fhc-pink-50: rgb(220, 80, 130);
+	--fhc-pink-60: rgb(190, 60, 110);
+	--fhc-pink-70: rgb(160, 40, 90);
+	--fhc-pink-80: rgb(130, 25, 70);
+	--fhc-pink-90: rgb(100, 15, 50);
+	
 	--fhc-beige-10: rgba(245, 233, 215, 0.5);
 	--fhc-beige-20: rgba(172, 153, 125, 0.5);
 
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a92bea9fb..31c59ef36 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -227,7 +227,9 @@ const app = Vue.createApp({
 	components: {},
 	computed: {
 		isMobile() {
-			return /Mobi|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
 		}	
 	},
 	provide() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 3ff230b00..3e5a6717d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -102,7 +102,7 @@ export const AbgabeMitarbeiterDetail = {
 							'paabgabe_id': -1,
 							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 							'fixtermin': false,
-							'kurzbz': '',
+							'kurzbz': '', // todo kurzbz textfield value vorschlag für qualgates
 							'datum': new Date().toISOString().split('T')[0],
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 							'beurteilungsnotiz': '',
@@ -114,12 +114,27 @@ export const AbgabeMitarbeiterDetail = {
 						}
 						
 						this.showAutomagicModalPhrase = true
+					} else {
+						this.showAutomagicModalPhrase = false	
 					}
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
 			})
 		},
+		async handleDeleteTermin(termin){
+			if(await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/c4confirm_delete'),
+				acceptLabel: 'Löschen',
+				acceptClass: 'btn btn-danger',
+				rejectLabel: 'Zurück',
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			} else {
+				this.deleteTermin(termin)
+			}
+		},
 		deleteTermin(termin) {
 			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id)).then( (res) => {
 				if(res?.meta?.status == 'success') {
@@ -151,34 +166,19 @@ export const AbgabeMitarbeiterDetail = {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
-			// todo: rework styling but keep the color pattern logic
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			let color = 'white'
-			let fontColor = 'black'
-			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
-					color = 'red'
-					fontColor = 'white'
-					icon = 'fa-triangle-exclamation'
+					return 'verpasst-header'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					color = 'yellow'
-					icon = 'fa-circle-exclamation'
-				}
+					return 'abzugeben-header'
+				} else {
+					return 'standard-header'
+				} 
 			} else if(abgabedatum > datum) {
-				color = 'pink' // aka "hellrot"
-				fontColor = 'white'
-				icon = 'fa-circle-question'
+				return 'verspaetet-header'
 			} else {
-				color = 'green'
-				icon = 'fa-square-check'
-			}
-
-			//return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
-			if(  typeof mode !== 'undefined' || mode === 'icon') {
-				return icon;
-			} else {
-				return 'abgabe-zieldatum-border-' + color;
+				return 'abgegeben-header'
 			}
 		},
 		openBeurteilungLink(link) {
@@ -246,8 +246,18 @@ export const AbgabeMitarbeiterDetail = {
 			console.log(this.$refs.modalContainerCreateNewAbgabe)
 			this.$refs.modalContainerCreateNewAbgabe.show()
 		},
+		validateTermin(termin) {
+			// compare new termin to existing ones to block illegal termin constellations, if they exist
+			
+			return true
+		},
 		async handleSaveNewAbgabe(termin) {
-			// TODO: validate termin type & date
+			
+			if(!this.validateTermin(termin)) {
+				this.$fhcAlert.alertWarning('invalid termin')
+				
+				return false
+			}
 			
 			await this.saveTermin(termin)
 			
@@ -368,7 +378,8 @@ export const AbgabeMitarbeiterDetail = {
 								v-model="newTermin.bezeichnung"
 								@change="handleChangeAbgabetyp(newTermin)"
 								:options="abgabeTypeOptions"
-								:optionLabel="getOptionLabelAbgabetyp">
+								:optionLabel="getOptionLabelAbgabetyp"
+								scrollHeight="300px">
 							</Dropdown>
 						</div>
 					</div>
@@ -430,53 +441,21 @@ export const AbgabeMitarbeiterDetail = {
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 
 			<div class="row">
-				<div class="col-8">
+				<div class="col-6">
 					<p> {{projektarbeit?.student}}</p>
 					<p> {{projektarbeit?.titel}}</p>
 					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 				</div>
-				<div class="col-4 d-flex">
-					<div class="col">
-						<div class="row">
-							<button :disabled="!getSemesterBenotbar || !endUploadVorhanden" class="btn btn-secondary border-0" @click="openBenotung" style="width: 80%;">
-								{{ $p.t('abgabetool/c4benoten') }}
-								<i class="fa-solid fa-user-check"></i>
-							</button>
-						</div>
-						<div class="row" style="width: 90%;">
-							<span v-if="!getSemesterBenotbar" v-html="$p.t('abgabetool/c4aeltereParbeitBenoten', oldPaBeurteilungLink)"></span>
-							<span v-else-if="!endUploadVorhanden">{{ $p.t('abgabetool/c4noEnduploadFound') }}</span>
-						</div>
-					</div>
-					<div class="col">
-						<div class="row">
-							<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="width: 80%;">
-								{{ $p.t('abgabetool/c4plagiatcheck_link')}}
-								<i class="fa-solid fa-user-check"></i>
-							</button>
-						</div>
-						
-					</div>
-					<div class="col">
-						<div class="row">
-							<button class="btn btn-secondary border-0" @click="openStudentPage" style="width: 80%;">
-								{{ $p.t('abgabetool/c4student_perspective')}}
-								<i class="fa-solid fa-eye"></i>
-							</button>
-						</div>
-						
-					</div>
-				</div>
 			</div>
 			
 			<Accordion :multiple="true" :activeIndex="[0]">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :header="getAccTabHeaderForTermin(termin)">
+					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
 							
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
 							<div class="col-8 col-md-9">
-<!--								always keep fixtermin checkbox disabled for mitarbeiter tool -->
+<!--							always keep fixtermin checkbox disabled for mitarbeiter tool -->
 								<Checkbox 
 									v-model="termin.fixtermin"
 									disabled
@@ -569,7 +548,7 @@ export const AbgabeMitarbeiterDetail = {
 										</button>
 									</div>
 									<div class="col-4">
-										<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">
+										<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-danger border-0" @click="handleDeleteTermin(termin)">
 											{{ $p.t('abgabetool/c4delete') }}
 											<i class="fa-solid fa-trash"></i>
 										</button>
@@ -580,94 +559,6 @@ export const AbgabeMitarbeiterDetail = {
 					</AccordionTab>
 				</template>
 			</Accordion>
-			
-<!--			<div id="uploadWrapper">-->
-<!--				<div class="row" style="margin-bottom: 12px;">-->
-<!--					<div class="fw-bold" style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
-<!--					<div class="row" style="max-width: calc(100% - 100px)">-->
-<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>-->
-<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>-->
-<!--						<div v-show="qualityGateTerminAvailable" class="col-2 fw-bold">{{$p.t('abgabetool/c4note')}}</div>-->
-<!--						<div v-show="qualityGateTerminAvailable" class="col-1 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>-->
-<!--						<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>-->
-<!--						<div class="col-1 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>-->
-<!--						<div class="col">-->
-<!--							-->
-<!--						</div>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>-->
-<!--				<div class="row" v-for="termin in projektarbeit.abgabetermine">-->
-<!--					<div style="width: 100px" class="d-flex justify-content-center align-items-center">-->
-<!--						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
-<!--						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
-<!--&lt;!&ndash;						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>&ndash;&gt;-->
-<!--					</div>-->
-<!--					<div class="row" style="max-width: calc(100% - 100px)">-->
-<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
-<!--							<div class="position-relative" :class="getDateStyle(termin)">-->
-<!--								<VueDatePicker-->
-<!--									style="width: 95%;"-->
-<!--									v-model="termin.datum"-->
-<!--									:clearable="false"-->
-<!--									:disabled="!termin.allowedToSave"-->
-<!--									:enable-time-picker="false"-->
-<!--									:format="formatDate"-->
-<!--									:text-input="true"-->
-<!--									auto-apply>-->
-<!--								</VueDatePicker>-->
-<!--								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
-<!--							</div>				-->
-<!--						</div>-->
-<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
-<!--							<Dropdown -->
-<!--								:style="{'width': '100%'}"-->
-<!--								:disabled="!termin.allowedToSave"-->
-<!--								v-model="termin.bezeichnung"-->
-<!--								:options="abgabeTypeOptions"-->
-<!--								:optionLabel="getOptionLabelAbgabetyp">-->
-<!--							</Dropdown>-->
-<!--						</div>-->
-<!--						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-2 d-flex justify-content-center align-items-center">-->
-<!--							<Dropdown -->
-<!--								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"-->
-<!--								:style="{'width': '100%'}"-->
-<!--								v-model="termin.note"-->
-<!--								:options="allowedNotenOptions"-->
-<!--								:optionLabel="getNotenOptionLabel">-->
-<!--							</Dropdown>-->
-<!--						</div>-->
-<!--						<div v-if="qualityGateTerminAvailable || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-center align-items-center">-->
-<!--							<Checkbox -->
-<!--								v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'"-->
-<!--								v-model="termin.upload_allowed"-->
-<!--								:binary="true" -->
-<!--								:pt="{ root: { class: 'ml-auto' }}"-->
-<!--							>-->
-<!--							</Checkbox>-->
-<!--						</div>-->
-<!--						<div class="col-2 d-flex justify-content-center align-items-center">-->
-<!--							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" cols="20" :disabled="!termin.allowedToSave"></Textarea>-->
-<!--						</div>-->
-<!--						<div class="col-1 d-flex justify-content-center align-items-center">-->
-<!--							{{ termin.abgabedatum?.split("-").reverse().join(".") }}-->
-<!--							<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">-->
-<!--								<i class="fa-solid fa-2x fa-file-pdf"></i>-->
-<!--							</a>-->
-<!--						</div>-->
-<!--						<div class="col-2 align-content-center">-->
-<!--							<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">-->
-<!--								{{ $p.t('abgabetool/c4save') }}-->
-<!--								<i class="fa-solid fa-floppy-disk"></i>-->
-<!--							</button>-->
-<!--							<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-primary border-0" @click="deleteTermin(termin)">-->
-<!--								{{ $p.t('abgabetool/c4delete') }}-->
-<!--								<i class="fa-solid fa-trash"></i>-->
-<!--							</button>-->
-<!--						</div>-->
-<!--					</div>-->
-<!--				</div>-->
-<!--			</div>-->
 		 </div>
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index b90427a7c..5c5d88ecc 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -182,45 +182,20 @@ export const AbgabeStudentDetail = {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
-			// todo: rework styling but keep the color pattern logic
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			let color = 'white'
-			let fontColor = 'black'
-			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
 					return 'verpasst-header'
-					
-					// color = 'red'
-					// fontColor = 'white'
-					// icon = 'fa-triangle-exclamation'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
 					return 'abzugeben-header'
-					
-					// color = 'yellow'
-					// icon = 'fa-circle-exclamation'
+				} else {
+					return 'standard-header'
 				}
 			} else if(abgabedatum > datum) {
 				return 'verspaetet-header'
-				
-				// color = 'pink' // aka "hellrot"
-				// fontColor = 'white'
-				// icon = 'fa-circle-question'
 			} else {
 				return 'abgegeben-header'
-				
-				// color = 'green'
-				// icon = 'fa-square-check'
 			}
-			
-			// return 'background-color: ' + color;
-			//
-			// //return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
-			// if(  typeof mode !== 'undefined' || mode === 'icon') {
-			// 	return icon;
-			// } else {
-			// 	return 'abgabe-zieldatum-border-' + color;
-			// }
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -308,6 +283,7 @@ export const AbgabeStudentDetail = {
 <!--								<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
 							</div>
 						</div>
+						
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
 							<div class="col-8 col-md-9">
@@ -323,12 +299,14 @@ export const AbgabeStudentDetail = {
 <!--								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
 							</div>
 						</div>
+						
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
 							<div class="col-8 col-md-9">
 								{{ termin.bezeichnung }}
 							</div>
 						</div>
+						
 						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
 							<div class="col-8 col-md-9">
@@ -337,12 +315,14 @@ export const AbgabeStudentDetail = {
 								</div>
 							</div>
 						</div>
+						
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="true"></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
 							</div>
 						</div>
+						
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 							<div class="col-8 col-md-9">
@@ -352,6 +332,7 @@ export const AbgabeStudentDetail = {
 								</a>
 							</div>
 						</div>
+						
 						<div class="row mt-2" v-if="termin.upload_allowed">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fileupload')}}</div>
 							<div class="col-8 col-md-9">
@@ -376,7 +357,6 @@ export const AbgabeStudentDetail = {
 								</div>
 							</div>
 						</div>
-						</div>
 					</AccordionTab>
 				</template>
 			</Accordion>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index a9230bc6d..89c9b4fda 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -65,10 +65,11 @@ export const AbgabetoolMitarbeiter = {
 			abgabeTableOptions: {
 				minHeight: 250,
 				index: 'projektarbeit_id',
-				layout: 'fitColumns',
+				layout: 'fitDataStretch',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
+				rowHeight: 80,
 				columns: [
 					{
 						formatter: 'rowSelection',
@@ -82,14 +83,14 @@ export const AbgabetoolMitarbeiter = {
 						width: 70
 					},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1}
 				],
 				persistence: false,
@@ -442,7 +443,6 @@ export const AbgabetoolMitarbeiter = {
 			</template>
 		</bs-modal>	
 		
-		
 		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
 			dialogClass="modal-fullscreen">
 			<template v-slot:title>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 9def48445..f1d284452 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -39,108 +39,7 @@ export const AbgabetoolStudent = {
 			student_uid: null,
 			detail: null,
 			projektarbeiten: null,
-			selectedProjektarbeit: null,
-			// abgabeTableOptions: {
-			// 	minHeight: 250,
-			// 	index: 'projektarbeit_id',
-			// 	layout: 'fitColumns',
-			// 	responsiveLayout: "collapse",
-			// 	placeholder: this.$p.t('global/noDataAvailable'),
-			// 	columns: [
-			// 		{
-			// 			formatter:"responsiveCollapse",
-			// 			width:30, minWidth:30, hozAlign:"center", resizable:false, headerSort:false
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details',
-			// 			formatter: this.detailFormatter,
-			// 			widthGrow: 1, tooltip: false
-			// 			, responsive: 0, minWidth: 80
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung',
-			// 			formatter: this.beurteilungFormatter,
-			// 			widthGrow: 1, tooltip: false
-			// 			, responsive: 0, minWidth: 80
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem',
-			// 			formatter: this.centeredTextFormatter,
-			// 			widthGrow: 1
-			// 			, responsive: 5, minWidth: 120
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg',
-			// 			formatter: this.centeredTextFormatter,
-			// 			widthGrow: 1
-			// 			, responsive: 6, minWidth: 120
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail',
-			// 			formatter: this.mailFormatter,
-			// 			widthGrow: 1
-			// 			, responsive: 0, minWidth: 80
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer',
-			// 			formatter: this.centeredTextFormatter,
-			// 			widthGrow: 2
-			// 			, responsive: 7, minWidth: 300
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ',
-			// 			formatter: this.centeredTextFormatter,
-			// 			widthGrow: 1
-			// 			, responsive: 8, minWidth: 200
-			// 		},
-			// 		{
-			// 			title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', 
-			// 			formatter: this.centeredTextFormatter,
-			// 			widthGrow: 8
-			// 			, responsive: 1, minWidth: 420
-			// 		}
-			// 	],
-			// 	persistence: false,
-			// },
-			// abgabeTableEventHandlers: [
-			// {
-			// 	event: "tableBuilt",
-			// 	handler: async () => {
-			// 		this.tableBuiltResolve()
-			// 	}
-			// },
-			// {
-			// 	event: "dataProcessed",
-			// 	handler: async () => {
-			// 		console.log('dataProcessed event')
-			// 		this.dataProcessedResolve()
-			// 	}
-			// },
-			// {
-			// 	event: "cellClick",
-			// 	handler: async (e, cell) => {
-			//		
-			// 		if(cell.getColumn().getField() === "details") {
-			// 			const val = cell.getValue()
-			//			
-			// 			if(val.mode === 'detailTermine') {
-			// 				this.setDetailComponent(cell.getValue())
-			// 			} else if (val.mode === 'beurteilungDownload') {
-			// 				const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-			// 				// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-			// 				window.open(pdfExportLink, '_blank')
-			// 			}
-			//
-			// 		} else if (cell.getColumn().getField() === "beurteilung") {
-			// 			const val = cell.getValue()
-			//			
-			// 			if(val != '-') window.open(val, '_blank')
-			// 		} 
-			// 		e.stopPropagation()
-			//
-			// 	}
-			// }
-			// ]
+			selectedProjektarbeit: null
 		};
 	},
 	methods: {
@@ -236,7 +135,9 @@ export const AbgabetoolStudent = {
 			// this.projektarbeiten = data[0]
 			this.domain = data[1]
 			this.student_uid = data[2]
-			this.projektarbeiten = data[0]?.map(projekt => {
+			this.projektarbeiten = data[0] ?? null
+			if(!this.projektarbeiten) return
+			this.projektarbeiten = this.projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
@@ -288,6 +189,19 @@ export const AbgabetoolStudent = {
 			title += projektarbeit.titel
 			
 			return title
+		},
+		getMailLink(projektarbeit) {
+			if(projektarbeit.email) {
+				return 'mailto:'+projektarbeit.email
+			} else return ''
+		},
+		getNoteBezeichnung(projektarbeit) {
+			if(projektarbeit.note) {
+				const noteOpt = this.notenOptions.find(opt => opt.note == projektarbeit.note)
+				return noteOpt?.bezeichnung
+			} else {
+				return ''
+			}
 		}
 	},
 	watch: {
@@ -328,19 +242,30 @@ export const AbgabetoolStudent = {
 	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 	<hr>
 	
-	<div v-if="projektarbeiten === null || projektarbeiten === []">
+	<div v-if="projektarbeiten === null">
 		{{$p.t('abgabetool/c4abgabeStudentNoProjectsFound')}}
 	</div>
 	
 	<Accordion :multiple="true" :activeIndex="[0]">
 		<template v-for="projektarbeit in projektarbeiten">
-			<AccordionTab :header="getAccTabHeaderForProjektarbeit(projektarbeit)">
-					
+			<AccordionTab>
+				
+				<template #header>
+					<div class="d-flex row w-100">
+						<div class="col-6 text-start">
+							<span>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
+						</div>
+						<div class="col-6 text-end">
+							<span>{{getNoteBezeichnung(projektarbeit)}}</span>
+						</div>
+					</div>
+				</template>
+				
 				<div class="row">
 					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4details')}}</div>
 					<div class="col-8 col-md-9">
 						<button @click="setDetailComponent(projektarbeit.details)" class="btn btn-primary">
-							Projektdetails öffnen <a><i class="fa fa-folder-open"></i></a>
+							{{$p.t('abgabetool/c4projektdetailsOeffnen')}} <a><i class="fa fa-folder-open"></i></a>
 						</button>
 					</div>
 				</div>
@@ -348,7 +273,7 @@ export const AbgabetoolStudent = {
 					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4beurteilung')}}</div>
 					<div class="col-8 col-md-9">
 						<a v-if="projektarbeit.beurteilung"><i class="fa fa-file-pdf" style="color:#00649C"></i></a>
-						<a v-else>Keine Beurteilung vorhanden</a>
+						<a v-else>{{$p.t('abgabetool/c4nobeurteilungVorhanden')}}</a>
 					</div>
 				</div>
 				<div class="row mt-2">
@@ -371,6 +296,18 @@ export const AbgabetoolStudent = {
 						{{ projektarbeit.betreuer }}
 					</div>
 				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4betreuerEmailKontakt')}}</div>
+					<div class="col-8 col-md-9">
+						<a :href="getMailLink(projektarbeit)"><i class="fa fa-envelope" style="color:#00649C"></i></a>
+					</div>
+				</div>
+				<div v-if="projektarbeit.zweitbetreuer" class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit.zweitbetreuer_betreuerart_kurzbz}}</div>
+					<div class="col-8 col-md-9">
+						{{ projektarbeit.zweitbetreuer_betreuerart_beschreibung}}: {{ projektarbeit.zweitbetreuer?.first }}
+					</div>
+				</div>
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4projekttyp')}}</div>
 					<div class="col-8 col-md-9">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8d417ae48..8a0f2f42f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42836,6 +42836,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4confirm_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Möchten Sie w",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No projects found!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42856,6 +42876,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4qualgateNegativEmailSubject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Quality Gate Negativ beurteilt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Quality Gate graded negative',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42876,6 +42916,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betreuerEmailKontakt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Emailkontakt Betreuer",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Emailcontact Assesor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projektdetailsOeffnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projektdetails öffnen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'open Project Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4nobeurteilungVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Beurteilung vorhanden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Project evaluation found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

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 0830/1357] 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 8c6033fed6b24fc4a4290b7b7983e5134b01994d Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 3 Oct 2025 14:02:53 +0200
Subject: [PATCH 0831/1357] add first incoming: correctly check lehrverband,
 moved creating of incoming prestudentstatus to prestudent lib

---
 .../api/frontend/v1/stv/Student.php           | 43 ++++++++++---------
 application/libraries/PrestudentLib.php       | 28 +++++++++---
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d5737dc2f..dbe977cd8 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -666,30 +666,31 @@ class Student extends FHCAPI_Controller
 
 		$prestudent_id = getData($result);
 
-		// Prestudent Rolle Anlegen
-		$this->prestudentlib->setFirstStatus(
-			$prestudent_id,
-			$incoming ? 'Incoming' : 'Interessent',
-			$studiensemester_kurzbz,
-			$this->input->post('ausbildungssemester'),
-			$this->input->post('orgform_kurzbz'),
-			$this->input->post('studienplan_id')
-		);
-		if (!hasData($result)) return error('error when adding status');
-		if (isError($result)) return $result;
-
+		// wenn Incoming, Incoming Daten hinzufügen
 		if ($incoming)
 		{
-			$result = $this->prestudentlib->setIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz);
-			if (isError($result)) return $result;
+			$statusResult = $this->prestudentlib->setFirstIncoming(
+				$prestudent_id,
+				$studiengang_kz,
+				$studiensemester_kurzbz,
+				$this->input->post('orgform_kurzbz'),
+				$this->input->post('studienplan_id')
+			);
 		}
-		// TODO(chris): DEBUG
-		/*$result = $this->PrestudentModel->loadWhere([
-			'pestudent_id' => 1
-		]);
-		if (isError($result)) {
-			return $result;
-		}*/
+		else
+		{
+			// Prestudent Rolle Anlegen
+			$statusResult = $this->prestudentlib->setFirstStatus(
+				$prestudent_id,
+				$this->PrestudentstatusModel::STATUS_INTERESSENT,
+				$studiensemester_kurzbz,
+				$this->input->post('ausbildungssemester'),
+				$this->input->post('orgform_kurzbz'),
+				$this->input->post('studienplan_id')
+			);
+		}
+		if (!hasData($statusResult)) return error('error when adding status');
+		if (isError($statusResult)) return $statusResult;
 
 		return success($prestudent_id);
 	}
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index fe1fa3a00..eda800842 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -977,7 +977,7 @@ class PrestudentLib
 	 * @param $studiensemester_kurzbz start semester for incoming
 	 * @return object success if incoming successfully saved, or error
 	 */
-	public function setIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz)
+	public function setFirstIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz, $orgform_kurzbz, $studienplan_id)
 	{
 		// Verband and Ausbildungssemester for incoming
 		$authUID = getAuthUID();
@@ -994,6 +994,17 @@ class PrestudentLib
 
 		$student_data = getData($result)[0];
 
+		$result = $this->setFirstStatus(
+			$prestudent_id,
+			$this->_ci->PrestudentstatusModel::STATUS_INCOMING,
+			$studiensemester_kurzbz,
+			$incomingAusbildungssemester,
+			$orgform_kurzbz,
+			$studienplan_id
+		);
+		if (isError($result)) return $result;
+		if (!hasData($result)) return error('Error when adding prestudentstatus');
+
 		// generate Personenkennzeichen
 		$result = $this->_ci->StudentModel->generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz);
 		if (isError($result)) return $result;
@@ -1061,18 +1072,23 @@ class PrestudentLib
 			'gruppe' => ' '
 		];
 
-		// Add Lehrverband if it does not exist
-		$result = $this->_ci->LehrverbandModel->load([' ', ' ', $incomingAusbildungssemester, $student_data->studiengang_kz]);
+		$result = $this->_ci->LehrverbandModel->loadWhere([
+				'studiengang_kz' => $student['studiengang_kz'],
+				'semester' => $student['semester'],
+				'verband' => $student['verband'],
+				'gruppe' => $student['gruppe']
+			]);
 
 		if (isError($result)) return $result;
 
 		if (!hasData($result))
 		{
+			// Add Lehrverband if it does not exist
 			$result = $this->_ci->LehrverbandModel->insert([
 				'studiengang_kz' => $student_data->studiengang_kz,
-				'semester' => $incomingAusbildungssemester,
-				'verband' => $incomingVerband,
-				'gruppe' => $student_data->gruppe,
+				'semester' => $student['semester'],
+				'verband' => $student['verband'],
+				'gruppe' => $student['gruppe'],
 				'bezeichnung' => 'Incoming',
 				'aktiv' => true
 			]);

From 60a1d40048ebea5be0f155a2ae5c585332f8e66f Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 3 Oct 2025 14:03:41 +0200
Subject: [PATCH 0832/1357] prstudentlib incoming: removed addmeta (debugging)

---
 application/libraries/PrestudentLib.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index eda800842..983f41b87 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -1055,8 +1055,6 @@ class PrestudentLib
 		$benutzer['insertamum'] = date('Y-m-d H:i:s');
 		$benutzer['insertvon'] = $authUID;
 
-		$this->_ci->addMeta('benutzer', $benutzer);
-
 		$result = $this->_ci->BenutzerModel->insert($benutzer);
 
 		if (isError($result)) return $result;

From b22c6c10e47b84ba0219a8cfe450ddaa8ea94276 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 3 Oct 2025 14:05:40 +0200
Subject: [PATCH 0833/1357] Student.php controller: renamed method add
 Interessent to addFirstPrestudentstatus

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index dbe977cd8..d64bc0d2c 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -483,7 +483,7 @@ class Student extends FHCAPI_Controller
 			if (isError($result)) $errors[] = getError($result);
 			$result = $this->_addKontakt($person_id);
 			if (isError($result)) $errors[] = getError($result);
-			if (!$this->input->post('personOnly')) $result = $this->_addInteressent($person_id);
+			if (!$this->input->post('personOnly')) $result = $this->_addFirstPrestudentstatus($person_id);
 			if (isError($result)) $errors[] = getError($result);
 		}
 
@@ -635,7 +635,7 @@ class Student extends FHCAPI_Controller
 		return success(null);
 	}
 
-	private function _addInteressent($person_id)
+	private function _addFirstPrestudentstatus($person_id)
 	{
 		// Prestudent anlegen
 

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

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

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

From 1e23b6de6171c9d990bfc85667f210076e779406 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 6 Oct 2025 13:58:26 +0200
Subject: [PATCH 0835/1357] =?UTF-8?q?download=20files=20with=20window.open?=
 =?UTF-8?q?=20instead=20of=20window.location;=20fix=20signature=20mail=20s?=
 =?UTF-8?q?tudent=5Fmodal=20info=20loading;=20check=20length=20of=20every?=
 =?UTF-8?q?=20entry=20field=20when=20doing=20endupload=20and=20force=20use?=
 =?UTF-8?q?r=20to=20accept=20or=20cancel=20upon=20notification;=20berechti?=
 =?UTF-8?q?gung=20check=20f=C3=BCr=20Abgabetool.php=20controller;=20phrase?=
 =?UTF-8?q?n=20everywhere;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/Cis/Abgabetool.php    |   2 +-
 .../controllers/api/frontend/v1/Abgabe.php    |  17 +-
 public/js/api/factory/abgabe.js               |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |   8 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  71 +++++---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  11 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  16 +-
 system/phrasesupdate.php                      | 152 +++++++++++++++++-
 8 files changed, 230 insertions(+), 51 deletions(-)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 1895f7472..269496738 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -14,7 +14,7 @@ class Abgabetool extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => self::PERM_LOGGED,
-			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
+			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
 			'Mitarbeiter' => self::PERM_LOGGED,
 			'Student' => self::PERM_LOGGED,
 			'Deadlines' => self::PERM_LOGGED
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index d0b39d35c..f95655a1d 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -287,18 +287,24 @@ class Abgabe extends FHCAPI_Controller
 
 	private function signaturFehltEmail($student_uid) {
 		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('education/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->StudentModel->addJoin('public.tbl_benutzer', 'ON (public.tbl_benutzer.uid = public.tbl_student.student_uid)');
+		$this->StudentModel->addJoin('public.tbl_person', 'person_id');
+
+//		$this->StudentModel->load($student_uid); -> this loads all students for some reason
+		$result = $this->StudentModel->loadWhere(array('student_uid' => $student_uid));
+		$this->StudentModel->resetQuery();
 		
-		$result = $this->StudentModel->load($student_uid);
 		$studentArr = $this->getDataOrTerminateWithError($result);
-		
+
 		if(count($studentArr) > 0) {
 			$student = $studentArr[0];
 		} else {
 			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
 		}
-
-		$result = $this->Studiengang_model->load($student->studiengang_kz);
+		
+		$result = $this->StudiengangModel->load($student->studiengang_kz);
 		$studiengangArr = $this->getDataOrTerminateWithError($result);
 
 		if(count($studiengangArr) > 0) {
@@ -341,7 +347,6 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
 		}
 
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
 		if(!$projektarbeitIsCurrent) {
 			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 0b6a0cb03..c51da95fe 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -36,11 +36,9 @@ export default {
 		};
 	},
 	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
-		// TODO: check if this is fine with new api scheme
-		
 		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
 
-		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
+		window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 	},
 	getMitarbeiterProjektarbeiten(all) {
 		return {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 3e5a6717d..08fc74e04 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -420,7 +420,7 @@ export const AbgabeMitarbeiterDetail = {
 				</div>
 			</template>
 			<template v-slot:footer>
-				<button type="button" class="btn btn-primary" @click="handleSaveNewAbgabe(newTermin)">{{ $p.t('global/c4saveNewAbgabetermin') }}</button>
+				<button type="button" class="btn btn-primary" @click="handleSaveNewAbgabe(newTermin)">{{ $p.t('abgabetool/c4saveNewAbgabetermin') }}</button>
 			</template>
 		</bs-modal>
 
@@ -530,9 +530,9 @@ export const AbgabeMitarbeiterDetail = {
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 							<div class="col-8 col-md-9">
 								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-								<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-									<i class="fa-solid fa-2x fa-file-pdf"></i>
-								</a>
+								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+									<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+								</button>
 							</div>
 						</div>
 						<div class="row mt-2">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 5c5d88ecc..ead8154b0 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -52,21 +52,54 @@ export const AbgabeStudentDetail = {
 				return false
 			}
 			
-			// TODO: refine these
+			// TODO: define these
 			if(endupload) {
-				// check these input fields for length of entry ? standard fallback '' anyways
-
-				// this.form['abstract']
-				// this.form['abstract_en']
-				// this.form['schlagwoerter']
-				// this.form['schlagwoerter_en']
-				// this.form['seitenanzahl']
-
-				if(this.form['abstract'].length < 10 && await this.$fhcAlert.confirm({
-					message: 'Abstract is very short, wirklich speichern?',
-					acceptLabel: 'Verstanden und Fortfahren',
+				// check these input fields for length of entry
+				if(this.form['abstract'].length < 100 && await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/warningShortAbstract'),
+					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: 'Zurück',
+					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				if(this.form['abstract_en'].length < 100 && await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/warningShortAbstractEn'),
+					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				if(this.form['schlagwoerter'].length < 50 && await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/warningShortSchlagwoerter'),
+					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				if(this.form['schlagwoerter_en'].length < 50 && await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/warningShortSchlagwoerterEn'),
+					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				if(this.form['seitenanzahl'] <= 5 && await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/warningSmallSeitenanzahl'),
+					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
@@ -159,13 +192,13 @@ export const AbgabeStudentDetail = {
 		},
 		handleUploadRes(res, termin) {
 			if(res.meta.status == "success") {
-				this.$fhcAlert.alertSuccess('File erfolgreich hochgeladen')
+				this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/c4fileUploadSuccess'))
 
 				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
 				termin.abgabedatum = new Date().toISOString().split('T')[0];
 				
 			} else {
-				this.$fhcAlert.alertError('File upload error')
+				this.$fhcAlert.alertError(this.$p.t('abgabetool/c4fileUploadError'))
 			}
 			
 			if(res.meta.signaturInfo) {
@@ -316,7 +349,7 @@ export const AbgabeStudentDetail = {
 							</div>
 						</div>
 						
-						<div class="row mt-2">
+						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 							<div class="col-8 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
@@ -327,9 +360,9 @@ export const AbgabeStudentDetail = {
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 							<div class="col-8 col-md-9">
 								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-								<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-									<i class="fa-solid fa-2x fa-file-pdf"></i>
-								</a>
+								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+									<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+								</button>
 							</div>
 						</div>
 						
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 89c9b4fda..0d60234b9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -391,6 +391,10 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
+		<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
+			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
+		</div>
+
 		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
 			dialogClass="modal-lg">
 			<template v-slot:title>
@@ -487,13 +491,6 @@ export const AbgabetoolMitarbeiter = {
 						{{ $p.t('abgabetool/showDeadlines') }}
 					</button>
 					
-					<div v-show="saving">
-						{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-					</div>
-					<div v-show="loading">
-						{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-					</div>
-					
 				</template>
 			</core-filter-cmpt>
 		
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index f1d284452..9aa9032b7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -48,7 +48,7 @@ export const AbgabetoolStudent = {
 			let qgate2Passed = false
 			
 			termine.forEach(t => {
-				const noteOption = this.notenOptions.find(opt => opt.note == t.note)
+				const noteOption = this.notenOptions?.find(opt => opt.note == t.note)
 				if(noteOption && noteOption.positiv) {
 					if(t.paabgabetyp_kurzbz == 'qualgate1') {
 						qgate1Passed = true
@@ -196,12 +196,15 @@ export const AbgabetoolStudent = {
 			} else return ''
 		},
 		getNoteBezeichnung(projektarbeit) {
-			if(projektarbeit.note) {
+			if(projektarbeit.note && this.notenOptions) {
 				const noteOpt = this.notenOptions.find(opt => opt.note == projektarbeit.note)
 				return noteOpt?.bezeichnung
 			} else {
 				return ''
 			}
+		},
+		handleDownloadBeurteilung(projektarbeit) {
+			window.open(projektarbeit.beurteilung)
 		}
 	},
 	watch: {
@@ -212,9 +215,10 @@ export const AbgabetoolStudent = {
 			return this.student_uid !== this.viewData.uid
 		}
 	},
-	created() {
+	async created() {
+		this.loading = true
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
-		this.$api.call(ApiAbgabe.getNoten()).then(res => {
+		await this.$api.call(ApiAbgabe.getNoten()).then(res => {
 			this.notenOptions = res.data
 		}).catch(e => {
 			this.loading = false
@@ -272,7 +276,9 @@ export const AbgabetoolStudent = {
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4beurteilung')}}</div>
 					<div class="col-8 col-md-9">
-						<a v-if="projektarbeit.beurteilung"><i class="fa fa-file-pdf" style="color:#00649C"></i></a>
+						<button v-if="projektarbeit.beurteilung" @click="handleDownloadBeurteilung(projektarbeit)" class="btn btn-primary">
+							<a> {{$p.t('abgabetool/c4downloadBeurteilung')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+						</button>
 						<a v-else>{{$p.t('abgabetool/c4nobeurteilungVorhanden')}}</a>
 					</div>
 				</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8a0f2f42f..3b19bb00a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33898,6 +33898,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'c4fileUploadSuccess',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datei erfolgreich hochgeladen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File upload successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'c4fileUploadError',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim hochladen der Datei!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File upload error!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -41944,7 +41984,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Betreuer",
+				'text' => "BetreuerIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42004,7 +42044,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Dokumentabgabe - Studentenbereich",
+				'text' => "Dokumentabgabe - Studierendenbereich",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42664,7 +42704,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Studentenansicht",
+				'text' => "Studierendenansicht",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42844,13 +42884,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Möchten Sie w",
+				'text' => "Möchten Sie wirklich Löschen?",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No projects found!',
+				'text' => 'Do you really want to delete?',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42924,7 +42964,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Emailkontakt Betreuer",
+				'text' => "Emailkontakt BetreuerIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42956,6 +42996,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4downloadBeurteilung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Beurteilung herunterladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download Evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42976,6 +43036,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4AcceptAndProceed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Akzeptieren und Fortfahren",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept and proceed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4Cancel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abbrechen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancel',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4downloadAbgabe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabe herunterladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download Abgabe',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'warningShortAbstract',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ihr Abstract ist sehr kurz, möchten Sie den Endupload trotzdem durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your abstract is very short. Would you still like to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 5640f229d3239f6b2e1f2500e6b12fc6157116f5 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 6 Oct 2025 16:10:06 +0200
Subject: [PATCH 0836/1357] Studierendenverwaltung add Interessenten: switched
 to new API, Studienplaene are loaded in time

---
 .../frontend/v1/organisation/Studienplan.php  | 69 +++++++++++++++++++
 public/js/api/factory/studienplan.js          | 11 +++
 public/js/api/factory/studiensemester.js      | 11 +++
 .../Stv/Studentenverwaltung/List/New.js       | 38 +++++-----
 4 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/organisation/Studienplan.php
 create mode 100644 public/js/api/factory/studienplan.js
 create mode 100644 public/js/api/factory/studiensemester.js

diff --git a/application/controllers/api/frontend/v1/organisation/Studienplan.php b/application/controllers/api/frontend/v1/organisation/Studienplan.php
new file mode 100644
index 000000000..c5a69fdee
--- /dev/null
+++ b/application/controllers/api/frontend/v1/organisation/Studienplan.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package        FHC-API
+ * @author        FHC-Team
+ * @copyright    Copyright (c) 2016, fhcomplete.org
+ * @license        GPLv3
+ * @link        http://fhcomplete.org
+ * @since        Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studienplan extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		// TODO(chris): access!
+		parent::__construct([
+			'getBySemester' => self::PERM_LOGGED
+		]);
+	}
+
+	public function getBySemester()
+	{
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$ausbildungssemester = $this->input->get('ausbildungssemester') ?: null;
+		$orgform_kurzbz = $this->input->get('orgform_kurzbz') ?: null;
+
+		if (!$studiengang_kz || !is_numeric($studiengang_kz))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
+
+		if (!$studiensemester_kurzbz)
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiensemester']), self::ERROR_TYPE_GENERAL);
+
+		if (isset($ausbildungssemester) && !is_numeric($ausbildungssemester))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Ausbildungssemester']), self::ERROR_TYPE_GENERAL);
+
+
+		//~ $this->load->library('form_validation');
+		
+		//~ $this->form_validation->set_rules('studiengang_kz', 'StudiengangKz', 'required|numeric');
+		//~ $this->form_validation->set_rules('studiensemester_kurzbz', 'StudiensemesterKurbz', 'required');
+		//~ $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'numeric');
+
+		//~ if (!$this->form_validation->run())
+		//~ {
+			//~ $this->addMeta('fail2', 'fail2');
+			//~ return $this->terminateWithValidationErrors($this->form_validation->error_array());
+		//~ }
+
+
+		$this->addMeta('stg_kz', $studiengang_kz);
+		$this->addMeta('sem', $studiensemester_kurzbz);
+		$this->addMeta('sem2', $ausbildungssemester);
+		$this->addMeta('org', $orgform_kurzbz);
+
+		$result = $this->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz);
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+}
diff --git a/public/js/api/factory/studienplan.js b/public/js/api/factory/studienplan.js
new file mode 100644
index 000000000..550a5211c
--- /dev/null
+++ b/public/js/api/factory/studienplan.js
@@ -0,0 +1,11 @@
+export default {
+
+	getStudienplaeneBySemester(studiengang_kz, studiensemester_kurzbz, ausbildungssemester, orgform_kurzbz)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/organisation/studienplan/getBySemester',
+			params: { studiengang_kz, studiensemester_kurzbz, ausbildungssemester, orgform_kurzbz },
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/factory/studiensemester.js b/public/js/api/factory/studiensemester.js
new file mode 100644
index 000000000..367ec9558
--- /dev/null
+++ b/public/js/api/factory/studiensemester.js
@@ -0,0 +1,11 @@
+export default {
+
+	getAll(order = null, start = null)
+	{
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/organisation/studiensemester/getAll',
+			params: { order, start }
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 211bb9dd3..27afb103c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -7,6 +7,8 @@ import accessibility from '../../../../directives/accessibility.js';
 
 import ApiStvStudents from '../../../../api/factory/stv/students.js';
 import ApiStvAddress from '../../../../api/factory/stv/kontakt/address.js';
+import ApiStudiensemester from '../../../../api/factory/studiensemester.js';
+import ApiStudienplan from '../../../../api/factory/studienplan.js';
 
 var _uuid = 0;
 const FORMDATA_DEFAULT = {
@@ -157,15 +159,15 @@ export default {
 			});
 		},
 		loadStudienplaene() {
-			if (this.formDataStg)
-				CoreRESTClient
-					.post('components/stv/studienplan/get', {
-						studiengang_kz: this.formDataStg,
-						studiensemester_kurzbz: this.formDataSem,
-						ausbildungssemester: this.formData.ausbildungssemester,
-						orgform_kurzbz: this.formData.orgform_kurzbz
-					})
-					.then(result => CoreRESTClient.getData(result.data) || [])
+			if (this.formDataStg) {
+				this.$api
+					.call(ApiStudienplan.getStudienplaeneBySemester(
+						this.formDataStg,
+						this.formDataSem,
+						this.formData.ausbildungssemester,
+						this.formData.orgform_kurzbz
+					))
+					.then(result => result.data || [])
 					.then(result => {
 						this.studienplaene = result;
 						if (this.formData.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData.studienplan_id).length)
@@ -179,6 +181,7 @@ export default {
 						if (error.code != "ERR_CANCELED")
 							window.setTimeout(this.loadStudienplaene, 100);
 					})
+			}
 		},
 		changeAddressNation(e) {
 			if (this.formData['geburtsnation'] == this.formData['address']['nation'])
@@ -218,13 +221,12 @@ export default {
 	},
 	created() {
 		this.uuid = _uuid++;
-		CoreRESTClient
-			.get('components/stv/Studiensemester')
-			.then(result => CoreRESTClient.getData(result.data) || [])
-			.then(result => {
-				this.semester = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+		this.$api.call(ApiStudiensemester.getAll())
+		.then(result => result.data || [])
+		.then(result => {
+			this.semester = result;
+		})
+		.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
@@ -642,7 +644,7 @@ export default {
 									name="ausbildungssemester"
 									v-model="formData['ausbildungssemester']"
 									:disabled="formData['incoming']"
-									@input="loadStudienplaene"
+									@change="loadStudienplaene"
 									>
 									<option v-for="sem in Array.from({length:8}).map((u,i) => i+1)" :key="sem" :value="sem">{{sem}}. Semester</option>
 								</form-input>
@@ -656,7 +658,7 @@ export default {
 									id="stv-list-new-orgform_kurzbz"
 									name="orgform_kurzbz"
 									v-model="formData['orgform_kurzbz']"
-									@input="loadStudienplaene"
+									@change="loadStudienplaene"
 									>
 									<option value="">-- keine Auswahl --</option>
 									<option v-for="orgform in lists.orgforms" :key="orgform.orgform_kurzbz" :value="orgform.orgform_kurzbz">{{orgform.bezeichnung}}</option>

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 0837/1357] 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 309faaae065feb8e64d17938787b1b650d546979 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 6 Oct 2025 16:57:31 +0200
Subject: [PATCH 0838/1357] phrasesupdate coma bugfix

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 843e8d28c..649085cb1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -50312,7 +50312,7 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	//****************************	 FHC-Core-ElectronicOnboarding
 	array(

From a1d616ff033710795ea8ddb98aacc4ecacec4681 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 6 Oct 2025 18:27:19 +0200
Subject: [PATCH 0839/1357] alter profilupdate api if heimatadresse is updated
 create new adress, readd missing isMitarbeiter info in frontend an
 provide/inject it

---
 .../api/frontend/v1/ProfilUpdate.php          | 31 ++++++++++++++++---
 application/libraries/ProfilLib.php           |  2 +-
 .../Cis/Profil/MitarbeiterProfil.js           |  2 +-
 .../Cis/Profil/ProfilModal/EditProfil.js      |  5 +++
 .../EditProfilComponents/EditAdresse.js       |  6 +---
 .../Profil/ProfilModal/EditProfilSelect.js    |  7 +++--
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 6752c805a..d0eb26858 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -825,12 +825,33 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		//! UPDATE
 		else {
-			$requested_change['updateamum'] = "NOW()";
-			$requested_change['updatevon'] = getAuthUID();
-			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
+			$curadresse_res = $this->AdresseModel->load($adresse_id);
+			$curadresse = ($this->getDataOrTerminateWithError($curadresse_res))[0];
 
+			if($curadresse->heimatadresse)
+			{
+				$tmpadresse = array_merge((array) $curadresse, $requested_change);
+				unset($tmpadresse["adresse_id"]);
+				$tmpadresse['insertamum'] = "NOW()";
+				$tmpadresse['insertvon'] = getAuthUID();
+				$tmpadresse['person_id'] = $personID;
+				unset($tmpadresse["heimatadresse"]);
+				unset($tmpadresse["updateamum"]);
+				unset($tmpadresse["updatevon"]);
+
+				$tmpadresse_res = $this->AdresseModel->insert($tmpadresse);
+				$tmpadresse_id = $this->getDataOrTerminateWithError($tmpadresse_res, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $tmpadresse_id, $personID);
+			}
+			else
+			{
+				$requested_change['updateamum'] = "NOW()";
+				$requested_change['updatevon'] = getAuthUID();
+
+				$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+				$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
+			}
 		}
 		return $insertID ?? null;
 	}
diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 6e93a0943..e4bbf5a25 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -196,7 +196,7 @@ class ProfilLib{
 	private function getAdressenInfo($pid)
 	{
 		$this->ci->load->model("person/Adresse_model","AdresseModel");
-		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "heimatadresse", "zustelladresse", "gemeinde", "nation"]);
 		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
 		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index bf3c4cf49..559006a1b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -328,7 +328,7 @@ export default {
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
+    <edit-profil v-if="showModal" ref="editModal" :isMitarbeiter="true" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
         <div  class="d-md-none col-12 ">
             <!--TODO: uncomment when implemented
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 39b18c83b..0fbf92b4d 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -14,6 +14,10 @@ export default {
 	},
 	mixins: [BsModal],
 	props: {
+		isMitarbeiter: {
+			type: Boolean,
+			default: false
+		},
 		value: Object,
 		titel: String,
 		zustelladressenCount: Function,
@@ -47,6 +51,7 @@ export default {
 	provide() {
 		return {
 			updateFileID: this.updateFileIDFunction,
+			isMitarbeiter: this.isMitarbeiter
 		};
 	},
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 83d98a31f..76e08b974 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -10,17 +10,13 @@ export default {
 
   props: {
     data: Object,
-    isMitarbeiter: {
-      type: Boolean,
-      default: false,
-    },
     files: {
       type: Array,
       default: []
     },
   },
 
-  inject: ["getZustelladressenCount", "updateFileID"],
+  inject: ["getZustelladressenCount", "updateFileID", "isMitarbeiter"],
 
   data() {
     return {
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 53c5baf8d..60dd759b3 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -6,6 +6,7 @@ import Status from "./EditProfilComponents/Status.js";
 import TextInputDokument from "./EditProfilComponents/TextInputDokument.js";
 
 export default {
+	name: 'EditProfilSelect',
 	components: {
 		Kontakt,
 		EditKontakt,
@@ -14,7 +15,7 @@ export default {
 		Status,
 		TextInputDokument,
 	},
-	inject: ["profilUpdateTopic"],
+	inject: ["profilUpdateTopic", "isMitarbeiter"],
 	props: {
 		list: Object,
 
@@ -147,7 +148,7 @@ export default {
     <template v-if="!view">
         <div  class="list-group">
             <template v-for="item in data">
-                <div class="d-flex flex-row align-items-center">
+                <div v-if="!(this.isMitarbeiter === false && item.listview === 'Adresse' && item.data.heimatadresse === true)" class="d-flex flex-row align-items-center">
                     <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
                         <!-- render title of options -->
                         <p v-if="item.title" class="my-1"   >{{item.title}}</p>
@@ -156,7 +157,7 @@ export default {
                             <component :is="item.listview" v-bind="item"></component>
                         </div>
                     </button>
-                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
+                    <button v-if="item.listview && !(item.listview === 'Adresse' && item.data.heimatadresse === true)" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
                 </div>
             </template>
         </div>

From 8a1ca9a598e60b9599d53eb5bc8e62e8372d9bbe Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 7 Oct 2025 13:33:49 +0200
Subject: [PATCH 0840/1357] Checked that the session is not an error in the
 FilterComponent

---
 application/libraries/FilterCmptLib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php
index f742b4ce1..b1de89245 100644
--- a/application/libraries/FilterCmptLib.php
+++ b/application/libraries/FilterCmptLib.php
@@ -902,7 +902,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if ($filterCmptsSession != null)
+		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -965,7 +965,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if ($filterCmptsSession != null)
+		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -1174,3 +1174,4 @@ class FilterCmptLib
 		return $filterName;
 	}
 }
+

From 5f57c53ed0cdb40233afcba80423d3eb58947841 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 7 Oct 2025 14:47:34 +0200
Subject: [PATCH 0841/1357] Api.js: better error handling

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

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 0b8e2fd17..895ecf70d 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -328,6 +328,7 @@ export default {
 						url: error.request.responseURL
 					}];
 				} else {
+					if (error.response.data.errors == undefined) return [];
 					return error.response.data.errors;
 				}
 			} else if (error.request) {
@@ -346,6 +347,9 @@ export default {
 		function popHandleableErrors(errorHandling, errors) {
 			const result = {};
 			const copy = [];
+
+			if (errors == undefined) return {};
+
 			while (errors.length)
 				copy.push(errors.pop());
 			for (var error of copy) {
@@ -551,4 +555,4 @@ export default {
 
 		app.provide('$api', app.config.globalProperties.$api);
 	}
-};
\ No newline at end of file
+};

From b681ca29c17929bd7bfd85dbde11444d99234261 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 7 Oct 2025 15:13:07 +0200
Subject: [PATCH 0842/1357] add info alert for heimatadresse, tune duplicate
 zustellkontakt handling

---
 .../api/frontend/v1/ProfilUpdate.php          | 12 +++--
 .../models/person/Profil_update_model.php     |  1 +
 public/js/components/Cis/Profil/Profil.js     | 20 +++++---
 .../Cis/Profil/ProfilComponents/Adresse.js    |  2 +-
 .../EditProfilComponents/EditAdresse.js       |  6 +--
 .../EditProfilComponents/EditKontakt.js       | 29 +++++------
 .../Profil/ProfilModal/EditProfilSelect.js    | 22 +++++++--
 system/phrasesupdate.php                      | 48 +++++++++++++++++--
 8 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index d0eb26858..e5129b678 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -873,7 +873,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_kontakt_id = $insertID;
 			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $requested_change['kontakttyp'], $personID);
 			}
 		}
 		//! DELETE
@@ -890,7 +890,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
 			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $requested_change['kontakttyp'], $personID);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
@@ -925,12 +925,16 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $person_id)
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $kontakttyp, $person_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
 			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustellung" => TRUE]);
+			$zustellKontakteArray = $this->PersonModel->loadWhere([
+				"public.tbl_person.person_id" => $person_id,
+				"zustellung" => TRUE,
+				"kontakttyp" => $kontakttyp
+			]);
 			if (!isSuccess($zustellKontakteArray)) {
 				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}
diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 141044a2c..36f53ff75 100644
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -63,6 +63,7 @@ class Profil_update_model extends DB_Model
 		$this->addSelect(["public.tbl_profil_update.*", "public.tbl_person.vorname"]);
 		$this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
 		$this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
+		$this->db->order_by('COALESCE(public.tbl_profil_update.updateamum, public.tbl_profil_update.insertamum)', 'DESC', false);
 		$res = $this->loadWhere($whereClause);
 		if (isError($res)) {
 			return $res;
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index 8ca2cfe8e..da205816d 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -120,10 +120,10 @@ export const Profil = {
 			},
 			sortProfilUpdates: (ele1, ele2) => {
 				let result = 0;
-				if (ele1.status === "pending") {
+				if (ele1.status.toLowerCase() === "pending") {
 					result = -1;
-				} else if (ele1.status === "accepted") {
-					result = ele2.status === "rejected" ? -1 : 1;
+				} else if (ele1.status.toLowerCase() === "accepted") {
+					result = ele2.status.toLowerCase() === "rejected" ? -1 : 1;
 				} else {
 					result = 1;
 				}
@@ -226,10 +226,13 @@ export const Profil = {
 				kontakteArray = kontakteArray.concat(
 					this.data.profilUpdates
 						.filter((update) => {
-							return update.requested_change.zustellung;
+							return update.status === 'Pending' && update.requested_change.zustellung;
 						})
 						.map((kontant) => {
-							return kontant.requested_change.kontakt_id;
+							return {
+										kontakt_id: kontant.requested_change.kontakt_id,
+										kontakttyp: kontant.requested_change.kontakttyp
+								};
 						})
 				);
 			}
@@ -241,7 +244,7 @@ export const Profil = {
 					.every((kontakt) =>
 						this.data.profilUpdates.some(
 							(update) =>
-								update.requested_change.kontakt_id == kontakt.kontakt_id
+								update.status === 'Pending' && update.requested_change.kontakt_id == kontakt.kontakt_id
 						)
 					)
 			) {
@@ -251,7 +254,10 @@ export const Profil = {
 							return kontakt.zustellung;
 						})
 						.map((kon) => {
-							return kon.kontakt_id;
+							return {
+										kontakt_id: kon.kontakt_id,
+										kontakttyp: kon.kontakttyp
+								};
 						})
 				);
 			}
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 5ba2f1fe7..7ec1213e2 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -4,7 +4,7 @@ export default {
         view:String,
         withZustelladresse:{
             type:Boolean,
-            default:false,
+            default:true,
         },
     },
     data(){
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 76e08b974..8f0724f9c 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -160,10 +160,8 @@ export default {
 <div class="gy-3 row justify-content-center align-items-center">
   <!-- warning message for too many zustellungs Adressen -->
   <div v-if="showZustellAdressenWarning" class="col-12 ">
-    <div class="card bg-danger mx-2">
-      <div class="card-body text-white ">
+    <div class="alert alert-warning mx-2">
 	  <span>{{$p.t('profilUpdate','zustell_adressen_warning')}}</span>
-      </div>
     </div>
   </div>
   <!-- End of warning -->
@@ -173,7 +171,7 @@ export default {
     <div class="form-check mb-2">
       <input class="form-check-input" type="checkbox" @change="updateValue($event,'zustelladresse')" :checked="data.zustelladresse" id="flexCheckDefault">
       <label class="form-check-label" for="flexCheckDefault">
-      {{$p.t('person','zustelladresse')}}
+      {{$p.t('person','zustelladresse')}} {{$p.t('profilUpdate','infoZustelladresse')}}
       </label>
     </div>
   </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index 4f978f636..b484c9dd5 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -30,12 +30,15 @@ export default {
 	  // if the kontakt is already a zustellungskontakt when the user is editing the kontakt, then no warning is shown and the zustellung will be overwritten
 	  if (JSON.parse(this.originalValue).zustellung) {
 	    return false;
-	  } 
+	  }
+	  const kontakteOfSelectedType = this.zustellKontakteCount.filter((element) => {
+		  return element.kontakttyp === this.data?.kontakttyp
+	  });
       // if zustellKontakteCount is not 0 and the own kontakt has the flag zustellung set to true
-      if (!this.zustellKontakteCount.includes(this.data.kontakt_id)) {
-        return this.data.zustellung && this.zustellKontakteCount.length;
+      if (!this.zustellKontakteCount.some((element) => element.kontakt_id === this.data.kontakt_id)) {
+        return this.data.zustellung && kontakteOfSelectedType.length;
       }
-      return this.zustellKontakteCount.length >= 2 && this.data.zustellung;
+      return this.kontakteOfSelectedType.length >= 2 && this.data.zustellung;
     },
     isChanged: function () {
       //? returns true if the original passed data object was changed
@@ -57,16 +60,6 @@ export default {
 
     <div class="gy-3 row align-items-center justify-content-center">
 
-    <!-- warning message for too many zustellungs Kontakte -->
-    <div v-if="showZustellKontakteWarning" class="col-12 ">
-    <div class="card bg-danger mx-2">
-    <div class="card-body text-white ">
-    <span>{{$p.t('profilUpdate','zustell_kontakte_warning')}}</span>
-    </div>
-    </div>
-    </div>
-    <!-- End of warning -->
-
     <div v-if="!data.kontakt_id" class="col-12">
 
 
@@ -108,6 +101,14 @@ export default {
 
     </div>
 
+    <!-- warning message for too many zustellungs Kontakte -->
+    <div v-if="showZustellKontakteWarning" class="col-12 ">
+    <div class="alert alert-warning mx-2">
+      <span>{{$p.t('profilUpdate','zustell_kontakte_warning')}}</span>
+    </div>
+    </div>
+    <!-- End of warning -->
+
     <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
         <span style="opacity: 0.65; font-size: .85rem; " class="px-2">{{$p.t('profilUpdate','zustellungsKontakt')}}</span>
 
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 60dd759b3..921758ae0 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -148,16 +148,32 @@ export default {
     <template v-if="!view">
         <div  class="list-group">
             <template v-for="item in data">
-                <div v-if="!(this.isMitarbeiter === false && item.listview === 'Adresse' && item.data.heimatadresse === true)" class="d-flex flex-row align-items-center">
-                    <button style="position:relative" type="button" class=" list-group-item list-group-item-action" @click="updateOptions($event,item)" >
+                <div class="d-flex flex-row align-items-center">
+                    <button
+						style="position:relative"
+						type="button" class="list-group-item list-group-item-action"
+						@click="updateOptions($event,item)"
+						:disabled="(this.isMitarbeiter === false && item.listview === 'Adresse' && item.data.heimatadresse === true)"
+					>
                         <!-- render title of options -->
                         <p v-if="item.title" class="my-1"   >{{item.title}}</p>
                         <!-- else render list view of items -->
                         <div v-else class="my-2 me-4" >
                             <component :is="item.listview" v-bind="item"></component>
+							<div
+								v-if="(this.isMitarbeiter === false && item.listview === 'Adresse' && item.data.heimatadresse === true)"
+								class="gy-2 row justify-content-center align-items-center"
+							>
+								<div class="col-1">&nbsp;</div>
+								<div class="col-11">
+									<div class="alert alert-info mt-4" role="alert">
+										{{ $p.t('profilUpdate','infoHeimatadresse') }}
+									</div>
+								</div>
+							</div>
                         </div>
                     </button>
-                    <button v-if="item.listview && !(item.listview === 'Adresse' && item.data.heimatadresse === true)" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
+                    <button v-if="item.listview" :disabled="(this.isMitarbeiter === false && item.listview === 'Adresse' && item.data.heimatadresse === true)" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
                 </div>
             </template>
         </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 750faafcc..cd55b0187 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28928,13 +28928,13 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Einer ihrer Adressen wird bereits zur Zustellung verwendet, möchten sie diese Adressen als Zustellungsadresse übernehmen?',
+					'text' => 'Eine andere Adresse wird aktuell zur Zustellung verwendet, in Zukunft würde diese Adresse als Zustellungsadresse verwendet werden!',
 					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => 'One of your addresses is already used as a contact address, would you like to use this address as your new contact address?',
+					'text' => 'Another address is currently used as contact address, in the future this address would be used as contact address!',
 					'description' => '',
 					'insertvon' => 'system'
 				)
@@ -28948,13 +28948,13 @@ array(
 			'phrases' => array(
 				array(
 					'sprache' => 'German',
-					'text' => 'Einer ihrer Kontakte wird bereits zur Zustellung verwendet, möchten sie diesen Kontakt als Zustellungskontakt übernehmen?',
+					'text' => 'Ein anderer Kontakt wird aktuell zur Zustellung verwendet, in Zukunft würde dieser Kontakt als Zustellungskontakt verwendet werden!',
 					'description' => '',
 					'insertvon' => 'system'
 				),
 				array(
 					'sprache' => 'English',
-					'text' => 'One of your contacts is already used as a communication mean, would you like to use this contact as your new communication mean?',
+					'text' => 'Another contact is currently used for communication, in the future this contact would be used for communication!',
 					'description' => '',
 					'insertvon' => 'system'
 				)
@@ -30381,6 +30381,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'infoHeimatadresse',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Die initiale Meldeadresse kann aufgrund von Berichtspflichten nicht verändert oder gelöscht werden.',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'The initial official address can not be changed or deleted due to reporting obligations.',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'infoZustelladresse',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => '(Soll etwaige Post an diese Adresse geschickt werden?)',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => '(Should any paper mail be sent to this address?)',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 
 		//ProfilUpdate Phrasen ende
 	array(

From 4054a0cfee5f7c11ab52c46ef31398e4a5ec76f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 7 Oct 2025 15:24:45 +0200
Subject: [PATCH 0843/1357] format Zutrittskarte Datum

---
 application/libraries/ProfilLib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index e4bbf5a25..97cb8ce5d 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -183,7 +183,10 @@ class ProfilLib{
 		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
 		
 		//? formats date from 01-01-2000 to 01.01.2000
-		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		if ($zutrittskarte_ausgegebenam !== NULL)
+		{
+			$zutrittskarte_ausgegebenam = (new DateTime($zutrittskarte_ausgegebenam))->format('d.m.Y');
+		}
 		return $zutrittskarte_ausgegebenam;
 	}
 

From 06788bafc8a59579fa4a55c94bbb3f2a8d96b039 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Tue, 7 Oct 2025 18:42:50 +0200
Subject: [PATCH 0844/1357] =?UTF-8?q?ParseHTML=20bei=20statistik.class=20e?=
 =?UTF-8?q?rg=C3=A4nzt.=20SVNR=20aus=20BIS-Checks=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/statistik.class.php      |  9 ++++++++-
 vilesci/bis/lehrgangsmeldung.php | 32 +++++++++++++++++++++++---------
 vilesci/bis/studentenmeldung.php | 16 +++++++++++-----
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/include/statistik.class.php b/include/statistik.class.php
index fd48e7d28..364c6d1a0 100644
--- a/include/statistik.class.php
+++ b/include/statistik.class.php
@@ -513,6 +513,7 @@ class statistik extends basis_db
 		$this->json=array();
 		$this->countRows=0;
 		set_time_limit(600);
+		$parseHtml = (strpos($this->preferences, 'parseHTML: true') !== false);
 
 		// In case a decryption function is used then perform password substitution
 		$this->sql = $this->replaceSQLDecryptionPassword($this->sql);
@@ -565,7 +566,13 @@ class statistik extends basis_db
 					for($spalte=0;$spalte<$anzahl_spalten;$spalte++)
 					{
 						$name = $this->db_field_name($this->data,$spalte);
-						$this->html.= '<td>'.$this->convert_html_chars($row->$name).'</td>';
+						if ($parseHtml) {
+							// HTML direkt rendern
+							$this->html .= '<td>'.($row->$name).'</td>';
+						} else {
+							// wie bisher escapen
+							$this->html .= '<td>'.$this->convert_html_chars($row->$name).'</td>';
+						}
 						// Umwandeln von Punkt in Komma bei Float-Werten
 						if (is_numeric($row->$name))
 						{
diff --git a/vilesci/bis/lehrgangsmeldung.php b/vilesci/bis/lehrgangsmeldung.php
index dd7597689..f16dafc91 100644
--- a/vilesci/bis/lehrgangsmeldung.php
+++ b/vilesci/bis/lehrgangsmeldung.php
@@ -390,30 +390,34 @@ if($result = $db->db_query($qry))
 			$error_log.=(!empty($error_log)?', ':'')."Matrikelnummer ('".trim($row->matr_nr)."') ist nicht 8 Zeichen lang";
 		}
 		//SVNR mu߸ 10-stellig sein
+		/* Alle SVNR Checks entfernt
 		if($row->svnr!='' && $row->svnr!=null && mb_strlen(trim($row->svnr))!=10)
 		{
 			$error_log.=(!empty($error_log)?', ':'')."SVNR ('".trim($row->svnr)."') ist nicht 10 Zeichen lang";
-		}
+		}*/
 		//Ersatzkennzeichen muß 10-stellig sein
 		if($row->ersatzkennzeichen!='' && $row->ersatzkennzeichen!=null && mb_strlen(trim($row->ersatzkennzeichen))!=10)
 		{
 			$error_log.=(!empty($error_log)?', ':'')."Ersatzkennzeichen ('".trim($row->ersatzkennzeichen)."') ist nicht 10 Zeichen lang";
 		}
+
 		//Vergleich der letzten 6 Stellen der SVNR mit Geburtsdatum - ausser bei 01.01. und 01.07.
+		/* Alle SVNR Checks entfernt
 		if($row->svnr!='' && $row->svnr!=null && substr($row->svnr,4,6)!=$row->vdat && substr($row->vdat,0,4)!='0101' && substr($row->vdat,0,4)!='0107')
 		{
 			$error_log_hinweis.=(!empty($error_log_hinweis)?', ':'')."SVNR ('".$row->svnr."') enth&auml;lt Geburtsdatum (".$row->gebdatum.") nicht";
-		}
+		}*/
 		//Vergleich der letzten 6 Stellen des Ersatzkennzeichen mit Geburtsdatum
 		if($row->ersatzkennzeichen!='' && $row->ersatzkennzeichen!=null && substr($row->ersatzkennzeichen,4,6)!=$row->vdat)
 		{
 			$error_log.=(!empty($error_log)?', ':'')."Ersatzkennzeichen ('".$row->ersatzkennzeichen."') enth&auml;lt Geburtsdatum (".$row->gebdatum.") nicht";
 		}
 		// Wenn SVNR fehlt, darf Ersatzkennzeichen nicht fehlen (und umgekehrt)
+		/* Alle SVNR Checks entfernt
 		if(($row->svnr=='' || $row->svnr==null)&&($row->ersatzkennzeichen=='' || $row->ersatzkennzeichen==null))
 		{
 			$error_log.=(!empty($error_log)?', ':'')."SVNR ('".$row->svnr."') bzw. ErsKz ('".$row->ersatzkennzeichen."') fehlt";
-		}
+		}*/
 		if($row->staatsbuergerschaft=='' || $row->staatsbuergerschaft==null)
 		{
 			$error_log.=(!empty($error_log)?', ':'')."Staatsb&uuml;rgerschaft ('".$row->staatsbuergerschaft."')";
@@ -714,7 +718,7 @@ if($result = $db->db_query($qry))
 			$qry_ap="SELECT * FROM lehre.tbl_abschlusspruefung WHERE student_uid=".$db->db_add_param($row->student_uid)." AND abschlussbeurteilung_kurzbz!='nicht' AND abschlussbeurteilung_kurzbz IS NOT NULL";
 			if($result_ap = $db->db_query($qry_ap))
 			{
-				$ap=0;
+				$ap = array();
 				while($row_ap = $db->db_fetch_object($result_ap))
 				{
 					if($row_ap->datum=='' || $row_ap->datum==null)
@@ -725,12 +729,19 @@ if($result = $db->db_query($qry))
 					{
 						$error_log.=(!empty($error_log)?', ':'')."Datum der Sponsion ('".$row_ap->sponsion."')";
 					}
-					$ap++;
+					if (!isset($ap[$row_ap->pruefungstyp_kurzbz]))
+					{
+						$ap[$row_ap->pruefungstyp_kurzbz] = 0;
+					}
+					$ap[$row_ap->pruefungstyp_kurzbz]++;
 					$sponsion=$row_ap->sponsion;
 				}
-				if($ap!=1)
+				foreach ($ap as $typ => $count)
 				{
-					$error_log.=(!empty($error_log)?', ':'').$ap." bestandene Abschlusspr&uuml;fungen";
+				    if ($count > 1)
+				    {
+					    $error_log.=(!empty($error_log)?', ':'').$count." bestandene Abschlusspr&uuml;fungen desselben Typs";
+				    }
 				}
 			}
 		}
@@ -815,13 +826,16 @@ if($result = $db->db_query($qry))
 				<Vorname>".$row->vorname."</Vorname>
 				<Familienname>".$row->nachname."</Familienname>";
 
+				/* Alle SVNR Checks entfernt
 				if($row->svnr!='')
 				{
 					$datei.="
 				<SVNR>".$row->svnr."</SVNR>";
-				}
+				}*/
 				// Ersatzkennzeichen nur inkludieren wenn svnr nicht gesetzt
-				if($row->ersatzkennzeichen!='' && $row->svnr == null)
+				// Alle SVNR Checks entfernt
+				// if($row->ersatzkennzeichen!='' && $row->svnr == null)
+				if($row->ersatzkennzeichen!='')
 				{
 					$datei.="
 				<ErsKz>".$row->ersatzkennzeichen."</ErsKz>";
diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php
index 8c7e31d36..7e06726ec 100644
--- a/vilesci/bis/studentenmeldung.php
+++ b/vilesci/bis/studentenmeldung.php
@@ -930,26 +930,29 @@ function GenerateXMLStudentBlock($row)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Matrikelnummer ('".trim($row->matr_nr)."') ist nicht 8 Zeichen lang";
 	}
+	/* Alle SVNR Checks entfernt
 	if($row->svnr!='' && $row->svnr!=null && mb_strlen(trim($row->svnr))!=10)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."SVNR ('".trim($row->svnr)."') ist nicht 10 Zeichen lang";
-	}
+	}*/
 	if($row->ersatzkennzeichen!='' && $row->ersatzkennzeichen!=null && mb_strlen(trim($row->ersatzkennzeichen))!=10)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Ersatzkennzeichen ('".trim($row->ersatzkennzeichen)."') ist nicht 10 Zeichen lang";
 	}
+	/* Alle SVNR Checks entfernt
 	if($row->svnr!='' && $row->svnr!=null && substr($row->svnr,4,6)!=$row->vdat && substr($row->vdat,0,4)!='0101' && substr($row->vdat,0,4)!='0107')
 	{
 		$error_log_hinweis.=(!empty($error_log_hinweis)?', ':'')."SVNR ('".$row->svnr."') enth&auml;lt Geburtsdatum (".$datum_obj->formatDatum($row->gebdatum,'d.m.Y').") nicht (Nicht BIS-Relevant)";
-	}
+	}*/
 	if($row->ersatzkennzeichen!='' && $row->ersatzkennzeichen!=null && substr($row->ersatzkennzeichen,4,6)!=$row->vdat)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Ersatzkennzeichen ('".$row->ersatzkennzeichen."') enth&auml;lt Geburtsdatum (".$datum_obj->formatDatum($row->gebdatum,'d.m.Y').") nicht";
 	}
+	/* Alle SVNR Checks entfernt
 	if(($row->svnr=='' || $row->svnr==null)&&($row->ersatzkennzeichen=='' || $row->ersatzkennzeichen==null))
 	{
 		$error_log.=(!empty($error_log)?', ':'')."SVNR ('".$row->svnr."') bzw. ErsKz ('".$row->ersatzkennzeichen."') fehlt";
-	}
+	}*/
 	if($row->staatsbuergerschaft=='' || $row->staatsbuergerschaft==null)
 	{
 		$error_log.=(!empty($error_log)?', ':'')."Staatsb&uuml;rgerschaft ('".$row->staatsbuergerschaft."')";
@@ -1510,14 +1513,17 @@ function GenerateXMLStudentBlock($row)
 			<Vorname>" . $row->vorname . "</Vorname>
 			<Familienname>" . $row->nachname . "</Familienname>";
 
+		/* Alle SVNR Checks entfernt
 		if ($row->svnr != '')
 		{
 			$datei .= "
 			<SVNR>" . $row->svnr . "</SVNR>";
-		}
+		}*/
 
 		// Ersatzkennzeichen nur inkludieren wenn svnr nicht gesetzt
-		if ($row->ersatzkennzeichen != '' && $row->svnr == null)
+		//  Alle SVNR Checks entfernt
+		// if ($row->ersatzkennzeichen != '' && $row->svnr == null)
+		if ($row->ersatzkennzeichen != '')
 		{
 			$datei .= "
 			<ErsKz>" . $row->ersatzkennzeichen . "</ErsKz>";

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 0845/1357] 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 0846/1357] 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 67281c84ed27dc6fbb9cc8157f81f340ea973a7a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Oct 2025 13:36:20 +0200
Subject: [PATCH 0847/1357] FhcApps Library

---
 public/js/FhcApps.js | 50 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 public/js/FhcApps.js

diff --git a/public/js/FhcApps.js b/public/js/FhcApps.js
new file mode 100644
index 000000000..f9ec61001
--- /dev/null
+++ b/public/js/FhcApps.js
@@ -0,0 +1,50 @@
+/**
+ * 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/>.
+ */
+
+
+const FhcApps = (function() {
+	// Logic to extend app here (like adding components, plugins, ...)
+
+	function makeExtendable(app) {
+		// apply extensions here
+		return app;
+	}
+
+	return {
+		makeExtendable
+	};
+})();
+
+FhcApps.router = (() => {
+	const extraRoutes = [];
+
+	function addRoute(...route) {
+		extraRoutes.push(route);
+	}
+
+	function makeExtendable(router) {
+		while (extraRoutes.length) {
+			router.addRoute(...extraRoutes.shift());
+		}
+		router.replace(router.currentRoute.value.fullPath);
+	}
+
+	return {
+		addRoute,
+		makeExtendable
+	};
+})();

From 842dabc1e7aac7817303aacf0105a7ed8ba24257 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Oct 2025 13:37:06 +0200
Subject: [PATCH 0848/1357] add fhcApps functionality to view template

---
 application/views/templates/FHC-Common.php | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 71f9c46c4..955583500 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -48,3 +48,60 @@
 	$udfs = isset($udfs) ? $udfs : false;
 	$widgets = isset($widgets) ? $widgets : false;
 	$tags = isset($tags) ? $tags : false;
+
+// VueJs App magic
+if (isset($fhcApps)) {
+	if (!isset($customJSs))
+		$customJSs = ['public/js/FhcApps.js'];
+	elseif (!is_array($customJSs))
+		$customJSs = [$customJSs, 'public/js/FhcApps.js'];
+	else
+		array_push($customJSs, 'public/js/FhcApps.js');
+
+	if (!isset($customJSModules))
+		$customJSModules = [];
+	elseif (!is_array($customJSModules))
+		$customJSModules = [$customJSModules];
+
+	if (!isset($customCSSs))
+		$customCSSs = [];
+	elseif (!is_array($customCSSs))
+		$customCSSs = [$customCSSs];
+
+	$ext_path = 'public/extensions/';
+	$ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $ext_path);
+
+	foreach ($fhcApps as $app) {
+		if (!strstr($app, ':')) {
+			$app_js_path = 'public/js/apps/' . $app . '.js';
+			$app_css_path = 'public/css/apps/' . $app . '.css';
+			$app_js_ext_path = '/js/extend_app/' . $app . '.js';
+			$app_css_ext_path = '/css/extend_app/' . $app . '.css';
+		} else {
+			list($ext_name, $app_path) = explode(':', $app);
+			$app_js_path = 'public/extensions/' . $ext_name . '/js/apps/' . $app_path . '.js';
+			$app_css_path = 'public/extensions/' . $ext_name . '/css/apps/' . $app_path . '.css';
+			$app_js_ext_path = '/js/extend_app/extensions/' . $ext_name . '/' . $app_path . '.js';
+			$app_css_ext_path = '/css/extend_app/extensions/' . $ext_name . '/' . $app_path . '.css';
+		}
+
+		if (file_exists(FHCPATH . str_replace('/', DIRECTORY_SEPARATOR, $app_css_path)))
+			array_push($customCSSs, $app_css_path);
+
+		foreach (scandir(FHCPATH . $ext_realpath) as $extension_name) {
+			if ($extension_name[0] == '.')
+				continue;
+			
+			$app_js_ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $app_js_ext_path);
+			if (file_exists(FHCPATH . $ext_realpath . $extension_name . $app_js_ext_realpath)) {
+				array_push($customJSModules, $ext_path . $extension_name . $app_js_ext_path);
+			}
+			$app_css_ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $app_css_ext_path);
+			if (file_exists(FHCPATH . $ext_realpath . $extension_name . $app_css_ext_realpath)) {
+				array_push($customCSSs, $ext_path . $extension_name . $app_css_ext_path);
+			}
+		}
+		
+		array_push($customJSModules, $app_js_path);
+	}
+}

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

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

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

From 5fbcc60c67864323c197f85b29fb6913b40859b4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 14:37:25 +0200
Subject: [PATCH 0850/1357] fix bug when editing profile request adding a file
 and no previous file exists

---
 application/controllers/api/frontend/v1/ProfilUpdate.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index e5129b678..e4eb4783e 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -716,13 +716,12 @@ class ProfilUpdate extends FHCAPI_Controller
 	
 	private function deleteOldVersionFile($dms_id)
 	{
+		if (!isset($dms_id)) {
+			return true;
+		}
+
 		// starting the transaction
 		$this->db->trans_start();
-		
-		
-		if (!isset($dms_id)) {
-			return;
-		}
 
 		//? delete the file from the profilUpdate first
 		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);

From d2f21ba4e6fe7aee20fcafdd732c256b653e58d8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 8 Oct 2025 14:45:12 +0200
Subject: [PATCH 0851/1357] use fhcApps for LVVerwaltung

---
 application/views/LVVerwaltung.php | 4 ++--
 public/js/apps/LVVerwaltung.js     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/views/LVVerwaltung.php b/application/views/LVVerwaltung.php
index 4cebae839..5c4c9549e 100644
--- a/application/views/LVVerwaltung.php
+++ b/application/views/LVVerwaltung.php
@@ -17,8 +17,8 @@
 			'public/css/Lvverwaltung.css'
 
 		],
-		'customJSModules' => [
-			'public/js/apps/LVVerwaltung.js'
+		'fhcApps' => [
+			'LVVerwaltung'
 		]
 	);
 
diff --git a/public/js/apps/LVVerwaltung.js b/public/js/apps/LVVerwaltung.js
index f365b74a8..18f8a072f 100644
--- a/public/js/apps/LVVerwaltung.js
+++ b/public/js/apps/LVVerwaltung.js
@@ -89,8 +89,12 @@ const router = VueRouter.createRouter({
 	]
 });
 
+FhcApps.router.makeExtendable(router);
+
 const app = Vue.createApp();
 
+FhcApps.makeExtendable(app);
+
 app
 	.use(router)
 	.use(primevue.config.default, {

From c79e329439d4f867e8f8fe03dc1071ea839cee7b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 15:35:28 +0200
Subject: [PATCH 0852/1357] add iso dates to result object of profile updates
 api endpoint, use iso date in tabulator to sort correctly and format with
 luxon js

---
 .../models/person/Profil_update_model.php       |  3 +++
 application/views/Cis/ProfilUpdate.php          |  4 ++++
 .../Cis/ProfilUpdate/ProfilUpdateView.js        | 17 +++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 36f53ff75..31005c4b7 100644
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -235,8 +235,11 @@ class Profil_update_model extends DB_Model
 	private function formatProfilRequest($request)
 	{
 		$request->requested_change = json_decode($request->requested_change);
+		$request->insertamum_iso = !is_null($request->insertamum) ? date_create($request->insertamum)->format('Y-m-d') : null;
 		$request->insertamum = !is_null($request->insertamum) ? date_create($request->insertamum)->format('d.m.Y') : null;
+		$request->updateamum_iso = !is_null($request->updateamum) ? date_create($request->updateamum)->format('Y-m-d') : null;
 		$request->updateamum = !is_null($request->updateamum) ? date_create($request->updateamum)->format('d.m.Y') : null;
+		$request->status_timestamp_iso = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('Y-m-d') : null;
 		$request->status_timestamp = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('d.m.Y') : null;
 	}
 
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index e797d436f..2e69208c7 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -2,10 +2,14 @@
 $includesArray = array(
     'title' => 'Profil Änderungen',
     'vue3' => true,
+	'primevue3' => true,
     'bootstrap5' => true,
     'fontawesome6'=> true,
     'axios027' => true,
     'tabulator5' => true,
+	'customJSs' => array(
+		'vendor/moment/luxonjs/luxon.min.js'
+	),
     'customJSModules' => array(
 	'public/js/apps/Cis/ProfilUpdateRequests.js'
     ),
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 53a6a5041..745f53002 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -4,6 +4,7 @@ import Alert from "../../../components/Bootstrap/Alert.js";
 import Loading from "../../../components/Loader.js";
 
 import ApiProfilUpdate from '../../../api/factory/profilUpdate.js';
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 const sortProfilUpdates = (ele1, ele2, thisPointer) => {
   let result = 0;
@@ -241,10 +242,13 @@ export default {
           },
           {
             title: this.$p.t("profilUpdate", "insertamum"),
-            field: "insertamum",
+            field: "insertamum_iso",
             resizable: true,
-            headerFilter: true,
+			headerFilterFunc: 'dates',
+			headerFilter: dateFilter,
             minWidth: 200,
+			formatter:"datetime",
+			formatterParams: this.datetimeFormatterParams(),
             //responsive:0,
           },
           {
@@ -377,6 +381,15 @@ export default {
 					this.showAcceptDenyModal(arrayRowData[0]);
 				}
 			}
+		},
+		datetimeFormatterParams: function() {
+			const params = {
+				inputFormat:"yyyy-MM-dd",
+				outputFormat:"dd.MM.yyyy",
+				invalidPlaceholder:"(invalid date)",
+				timezone:FHC_JS_DATA_STORAGE_OBJECT.timezone
+			};
+			return params;
 		}
   },
   watch: {

From 0fa8b6bc327703cde4af31b82f45fa1a92288cf0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 15:46:42 +0200
Subject: [PATCH 0853/1357] add permission to view attachements when
 accepting/rejecting

---
 application/controllers/Cis/ProfilUpdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/Cis/ProfilUpdate.php b/application/controllers/Cis/ProfilUpdate.php
index 74641d748..698b091d1 100644
--- a/application/controllers/Cis/ProfilUpdate.php
+++ b/application/controllers/Cis/ProfilUpdate.php
@@ -13,7 +13,7 @@ class ProfilUpdate extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'show' => ['basis/cis:r'],
+			'show' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r', 'basis/cis:r'],
 			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
 		]);
 

From 2c3843fce661f05a4be97cb08256d4498ae5e0bb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 16:03:41 +0200
Subject: [PATCH 0854/1357] ProfilUpdate Modal styling

---
 .../Cis/ProfilUpdate/AcceptDenyUpdate.js         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
index d23dcb1b8..f0bb2fc3e 100644
--- a/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
+++ b/public/js/components/Cis/ProfilUpdate/AcceptDenyUpdate.js
@@ -113,7 +113,17 @@ export default {
   },
   template: /*html*/ `
 
-  <bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false" >
+  <bs-modal
+		v-show="!loading"
+		ref="modalContainer"
+		v-bind="$props"
+		header-class="bg-light"
+		footer-class="bg-light"
+		body-class=""
+		dialog-class="modal-lg"
+		class="bootstrap-alert"
+		:backdrop="false"
+	>
     
     <template v-slot:title>
       {{title}}  
@@ -210,8 +220,8 @@ export default {
     
 
     <template v-if="data.status === profilUpdateStates['Pending']"  v-slot:footer>
-    <div  class="form-underline flex-fill">
-      <div class="form-underline-titel">{{$p.t('global','nachricht')}}</div>
+    <div  class="flex-fill">
+      <div>{{$p.t('global','nachricht')}}</div>
 
       <div class="d-flex flex-row gap-2">
         <input  class="form-control " v-model="data.status_message"  />

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 0855/1357] 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 6bf823b4cf44d91d9c3cb1e799a900634aa6ff62 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 17:32:23 +0200
Subject: [PATCH 0856/1357] return oe_kurzbz instead of array oe_kurzbz

---
 .../controllers/api/frontend/v1/ProfilUpdate.php       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index e4eb4783e..cf0336bf7 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -356,6 +356,7 @@ class ProfilUpdate extends FHCAPI_Controller
 
 
 		//? check if the permissions are set correctly
+		$this->addMeta('bhstudoe', $this->getOE_from_student($uid));
 		if (
 			$is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
 			$is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") 
@@ -776,13 +777,8 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
 		$res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));	
-		$res = array_map(
-			function ($item) {
-				return $item->oe_kurzbz;
-			},
-			$res
-		);
-		return $res;
+		$oe = ($res[0])->oe_kurzbz;
+		return $oe;
 	}
 
 	private function handleAdresse($requested_change, $personID)

From 5be4e5e0f785ff7d074f77c4f1ea89bb6bea6bff Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Oct 2025 17:34:13 +0200
Subject: [PATCH 0857/1357] remove debug code

---
 application/controllers/api/frontend/v1/ProfilUpdate.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index cf0336bf7..9e3b72d74 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -356,7 +356,6 @@ class ProfilUpdate extends FHCAPI_Controller
 
 
 		//? check if the permissions are set correctly
-		$this->addMeta('bhstudoe', $this->getOE_from_student($uid));
 		if (
 			$is_student && $this->permissionlib->isBerechtigt('student/stammdaten', "suid", $this->getOE_from_student($uid)) ||
 			$is_mitarbeiter && $this->permissionlib->isBerechtigt('mitarbeiter/stammdaten', "suid") 

From f03411c668ac00238e8cb79f122b1009bd2c8ba6 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 8 Oct 2025 17:41:00 +0200
Subject: [PATCH 0858/1357] legacy cis abgabetool routes; abgabetool.css for
 legacy cis; endupload & fixtermin logic enabled; paabgabe template
 rearranged; legacy view, controller has cis4 switch; viewData & router props
 workaround with CI3 router logic; wrapper app legacy cis; fix enduplaod
 validation;

---
 application/config/routes.php                 |   5 +
 application/controllers/Cis/Abgabetool.php    |  28 ++-
 .../controllers/api/frontend/v1/Abgabe.php    |   7 +-
 application/views/Cis/Abgabetool.php          |  39 ++++
 public/css/Cis4/Cis.css                       |   2 +-
 public/css/components/abgabetool/abgabe.css   |  19 ++
 public/js/apps/Abgabetool/Abgabetool.js       |  61 +++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  86 +++++----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  17 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   2 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   4 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 system/phrasesupdate.php                      | 168 +++++++++++++-----
 13 files changed, 334 insertions(+), 106 deletions(-)
 create mode 100644 application/views/Cis/Abgabetool.php
 create mode 100644 public/js/apps/Abgabetool/Abgabetool.js

diff --git a/application/config/routes.php b/application/config/routes.php
index de8e6e098..9a3651f24 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -65,6 +65,11 @@ $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 
+$route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
+$route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
+$route['Abgabetool/Student/.*'] = 'Cis/Abgabetool/Student/$1';
+$route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
+
 // Studierendenverwaltung List Routes
 $route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 269496738..35970b6e9 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -34,17 +34,27 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
+		}
 	}
 
-	public function Student()
+	public function Student($student_uid_prop = '')
 	{
 
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+		
+		
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
+		}
 	}
 
 	public function Mitarbeiter()
@@ -54,7 +64,11 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
+		}
 	}
 
 	public function Deadlines()
@@ -64,7 +78,11 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
+		}
 	}
 
 
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index f95655a1d..9be560034 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -109,8 +109,9 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		if (!isset($uid) || isEmptyString($uid))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		if (!isset($uid) || isEmptyString($uid)) {
+			$uid = getAuthUID();
+		}
 
 		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
 		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
@@ -779,7 +780,7 @@ class Abgabe extends FHCAPI_Controller
 		
 		// Mail an Student wenn Qualgate negativ beurteilt wurde
 		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->load($paabgabe->paabgabetyp_kurzbz);
+		$result = $this->StudentModel->load([$student_uid]);
 		$studentArr = $this->getDataOrTerminateWithError($result);
 		$student = $studentArr[0];
 
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
new file mode 100644
index 000000000..1b1994e0a
--- /dev/null
+++ b/application/views/Cis/Abgabetool.php
@@ -0,0 +1,39 @@
+<?php
+
+$includesArray = array(
+	'title' => 'Cis4',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'tabulator5' => true, // TODO: upgrade to 6 when available
+	'vue3' => true,
+	'primevue3' => true,
+	'skipID' => '#fhccontent',
+	'vuedatepicker11' => true,
+	'customCSSs' => array(
+		'public/css/components/verticalsplit.css',
+		'public/css/components/FilterComponent.css',
+		'public/css/components/FormUnderline.css',
+		'public/css/theme/default.css',
+		'public/css/components/abgabetool/abgabe.css'
+	),
+	'customJSs' => array(
+		'vendor/npm-asset/primevue/accordion/accordion.min.js',
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+	),
+	'customJSModules' => array(
+		'public/js/apps/Abgabetool/Abgabetool.js',
+	),
+
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+<div id="abgabetoolroot" class="h-100" route=<?php echo json_encode($route) ?> uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '' ?>>
+
+</div>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 3056d36b6..05a63bb3a 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -844,7 +844,7 @@ html {
 
 #cis-main .modal-header{
 	background-color: var(--fhc-primary);
-	color: var(--fhc-light);
+	color: var(--fhc-white-50);
 }
 
 #cis-main .modal-header .btn-close{
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index c9de223fd..ab91d8d2f 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -138,3 +138,22 @@
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
+#abgabetoolroot .modal-header{
+	background-color: var(--fhc-blue-primary);
+	color: var(--fhc-white-50);
+}
+
+#abgabetoolroot .modal-header .btn-close{
+	filter: invert(1);
+}
+
+#abgabetoolroot .modal-footer {
+	background-color: var(--fhc-white-20);
+
+}
+
+.bordered-modal {
+	border: 1px solid rgba(0, 0, 0, 0.15);
+	border-radius: 0.5rem;
+	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
+}
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
new file mode 100644
index 000000000..1336276af
--- /dev/null
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -0,0 +1,61 @@
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
+
+const app = Vue.createApp({
+	name: 'AbgabetoolApp',
+	components: {
+		AbgabetoolStudent,
+		AbgabetoolMitarbeiter,
+		DeadlineOverview
+	},
+	data: function() {
+		return {
+			comp: null,
+			uid: null,
+			student_uid: null
+		};
+	},
+	methods: {
+		
+	},
+	computed: {
+		viewData() {
+			return { uid: this.uid}
+		},
+		student_uid_computed() {
+			return this.student_uid ?? null
+		}
+	},
+	created() {
+	},
+	mounted() {
+		
+		const root = document.getElementById('abgabetoolroot')
+		const route = root.getAttribute("route");
+		this.comp = route
+
+		const uid = root.getAttribute("uid");
+		this.uid = uid
+
+		const student_uid = root.getAttribute("student_uid_prop");
+		this.student_uid = student_uid
+		
+	},
+	template: `
+		<template v-if="comp && uid">
+			<AbgabetoolStudent v-if="comp == 'AbgabetoolStudent'" :viewData="viewData" :student_uid_prop="student_uid_computed"></AbgabetoolStudent>
+			<AbgabetoolMitarbeiter v-if="comp == 'AbgabetoolMitarbeiter'" :viewData="viewData"></AbgabetoolMitarbeiter>
+			<DeadlineOverview v-if="comp == 'DeadlinesOverview'" :viewData="viewData"></DeadlineOverview>
+		</template>
+	`
+});
+app.use(primevue.config.default, {
+	zIndex: {
+		overlay: 9000,
+		tooltip: 8000
+	}
+})
+app.use(PluginsPhrasen);
+app.mount('#abgabetoolroot');
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 08fc74e04..024aa998b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -251,16 +251,7 @@ export const AbgabeMitarbeiterDetail = {
 			
 			return true
 		},
-		async handleSaveNewAbgabe(termin) {
-			
-			if(!this.validateTermin(termin)) {
-				this.$fhcAlert.alertWarning('invalid termin')
-				
-				return false
-			}
-			
-			await this.saveTermin(termin)
-			
+		handleModalClose() {
 			// determined inside saveTermin api.then()
 			if(this.showAutomagicModalPhrase) {
 				this.$refs.modalContainerCreateNewAbgabe.show()
@@ -280,7 +271,20 @@ export const AbgabeMitarbeiterDetail = {
 					'abgabedatum': null,
 					'insertvon': this.viewData?.uid ?? ''
 				}
+			}	
+		},
+		async handleSaveNewAbgabe(termin) {
+			
+			if(!this.validateTermin(termin)) {
+				this.$fhcAlert.alertWarning('invalid termin')
+				
+				return false
 			}
+			
+			await this.saveTermin(termin)
+			
+			this.handleModalClose()
+			
 		},
 		handleChangeAbgabetyp(termin) {
 			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
@@ -321,6 +325,15 @@ export const AbgabeMitarbeiterDetail = {
 			return 'position: static !important;'
 		}
 	},
+	watch: {
+		'newTermin.bezeichnung'(newVal) {
+			console.log('\'newTermin.bezeichnung\' watcher', newVal)
+
+			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
+				this.newTermin.kurzbz = newVal.bezeichnung
+			}
+		}	
+	},
 	created() {
 
 	},
@@ -344,7 +357,7 @@ export const AbgabeMitarbeiterDetail = {
 			<template v-slot:default>
 				<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
 <!--				minheight to avoid z-index magic for the datepicker inside the modal inside the modal...-->
-				<div v-if="newTermin" style="min-height: 600px">
+				<div v-if="newTermin">
 <!--				fixtermin is not an option for lektors-->
 <!--					<div class="row">-->
 <!--						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
@@ -376,24 +389,12 @@ export const AbgabeMitarbeiterDetail = {
 							<Dropdown
 								:style="{'width': '100%'}"
 								v-model="newTermin.bezeichnung"
-								@change="handleChangeAbgabetyp(newTermin)"
 								:options="abgabeTypeOptions"
 								:optionLabel="getOptionLabelAbgabetyp"
 								scrollHeight="300px">
 							</Dropdown>
 						</div>
 					</div>
-					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
-						<div class="col-8 col-md-9">
-							<Dropdown
-								:style="{'width': '100%'}"
-								v-model="newTermin.note"
-								:options="allowedNotenOptions"
-								:optionLabel="getNotenOptionLabel">
-							</Dropdown>
-						</div>
-					</div>
 					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
 						<div class="col-8 col-md-9">
@@ -405,16 +406,10 @@ export const AbgabeMitarbeiterDetail = {
 							</Checkbox>
 						</div>
 					</div>
-					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
-						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin.beurteilungsnotiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
-						</div>
-					</div>
 					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90"></Textarea>
 						</div>
 					</div>	
 				</div>
@@ -453,7 +448,7 @@ export const AbgabeMitarbeiterDetail = {
 					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
 							
 						<div class="row">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
 							<div class="col-8 col-md-9">
 <!--							always keep fixtermin checkbox disabled for mitarbeiter tool -->
 								<Checkbox 
@@ -492,17 +487,6 @@ export const AbgabeMitarbeiterDetail = {
 								</Dropdown>
 							</div>
 						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
-							<div class="col-8 col-md-9">
-								<Dropdown
-									:style="{'width': '100%'}"
-									v-model="termin.note"
-									:options="allowedNotenOptions"
-									:optionLabel="getNotenOptionLabel">
-								</Dropdown>
-							</div>
-						</div>
 						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
 							<div class="col-8 col-md-9">
@@ -515,15 +499,27 @@ export const AbgabeMitarbeiterDetail = {
 							</div>
 						</div>
 						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGate')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+								<Dropdown
+									:style="{'width': '100%'}"
+									v-model="termin.note"
+									:options="allowedNotenOptions"
+									:optionLabel="getNotenOptionLabel">
+								</Dropdown>
 							</div>
 						</div>
+						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGatev2')}}</div>
+							<div class="col-8 col-md-9">
+								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+							</div>
+						</div>
+						
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
 							</div>
 						</div>
 						<div class="row mt-2">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index ead8154b0..7898ce5b3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -110,7 +110,7 @@ export const AbgabeStudentDetail = {
 		},
 		async triggerEndupload() {
 			
-			if (!await this.validate(this.enduploadTermin))
+			if (!await this.validate(this.enduploadTermin, true))
 			{
 				return false;
 			}
@@ -192,13 +192,13 @@ export const AbgabeStudentDetail = {
 		},
 		handleUploadRes(res, termin) {
 			if(res.meta.status == "success") {
-				this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/c4fileUploadSuccess'))
+				this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/c4fileUploadSuccessv3'))
 
 				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
 				termin.abgabedatum = new Date().toISOString().split('T')[0];
 				
 			} else {
-				this.$fhcAlert.alertError(this.$p.t('abgabetool/c4fileUploadError'))
+				this.$fhcAlert.alertError(this.$p.t('abgabetool/c4fileUploadErrorv3'))
 			}
 			
 			if(res.meta.signaturInfo) {
@@ -303,7 +303,7 @@ export const AbgabeStudentDetail = {
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
 						<div class="row">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
 							<div class="col-8 col-md-9">
 								<Checkbox 
 									disabled
@@ -349,10 +349,17 @@ export const AbgabeStudentDetail = {
 							</div>
 						</div>
 						
+						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
+							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGatev2')}}</div>
+							<div class="col-8 col-md-9">
+								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" disabled></Textarea>
+							</div>
+						</div>
+						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" :rows=" isMobile ? 2 : 4" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
 							</div>
 						</div>
 						
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 0d60234b9..2c2b8fad8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -437,7 +437,7 @@ export const AbgabetoolMitarbeiter = {
 						</Dropdown>
 					</div>
 					<div class="col-6 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="3" cols="40"></Textarea>
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" cols="40"></Textarea>
 					</div>
 				</div>
 				
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 9aa9032b7..81af1a422 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -72,11 +72,13 @@ export const AbgabetoolStudent = {
 					termin.allowedToUpload = false
 					// termin.datum = '2025-10-16'
 					// TODO: fixtermin logic?
-					if(termin.paabgabetyp_kurzbz == 'enda') {
+					if(termin.paabgabetyp_kurzbz == 'end') {
 						
 						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
 					} else if(termin.paabgabetyp_kurzbz == 'qualgate1' || termin.paabgabetyp_kurzbz == 'qualgate2') {
 						termin.allowedToUpload = termin.upload_allowed
+					} else if(termin.fixtermin) {
+						termin.allowedToUpload = !this.isPastDate(termin.datum)
 					} else {
 						termin.allowedToUpload = true
 					}
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index cc202b4b4..a5cc9a43b 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -33,7 +33,7 @@ export const DeadlineOverview = {
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixtermin')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv2')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetyp')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 3b19bb00a..dd7788265 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33898,46 +33898,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'c4fileUploadSuccess',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Datei erfolgreich hochgeladen!',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'File upload successful',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'c4fileUploadError',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Fehler beim hochladen der Datei!',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'File upload error!',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -42059,18 +42019,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fixtermin',
+		'phrase' => 'c4fixterminv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Fix",
+				'text' => "Fixtermin",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Fixed",
+				'text' => "Fixed Deadline",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42799,7 +42759,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4notizQualGate',
+		'phrase' => 'c4notizQualGatev2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43116,6 +43076,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'warningShortAbstractEn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ihr englisches Abstract ist sehr kurz, möchten Sie den Endupload trotzdem durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your english abstract is very short. Would you still like to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'warningShortSchlagwoerter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ihre Schlagwörter sind sehr kurz, möchten Sie den Endupload trotzdem durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your keywords are very short. Would you still like to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'warningShortSchlagwoerterEn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ihre englischen Schlagwörter sind sehr kurz, möchten Sie den Endupload trotzdem durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your english keywords are very short. Would you still like to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'warningSmallSeitenanzahl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ihre Seitenanzahl ist gering, möchten Sie den Endupload trotzdem durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your number of pages is low. Would you still like to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43171,6 +43211,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fileUploadSuccessv3',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datei erfolgreich hochgeladen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File upload successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fileUploadErrorv3',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim hochladen der Datei!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File upload error!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN START
 	array(
 		'app' => 'core',

From 09864c515428e7901b32ba9d568ae447ff0f7989 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 08:41:58 +0200
Subject: [PATCH 0859/1357] remove unused view that links to a non existing app

---
 application/views/Cis/Profil.php | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 application/views/Cis/Profil.php

diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
deleted file mode 100644
index f66ebf8a9..000000000
--- a/application/views/Cis/Profil.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'Profil',
-	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
-	'tabulator5' => true,
-	'primevue3' => true,
-	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
-	
-);
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-<div id="content" >
-
-</div>
-
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

From d389cf87b8b7f31054552e53360fa8c7d78c56e4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 08:42:29 +0200
Subject: [PATCH 0860/1357] delete MyLv->Info because app does not exist
 anymore and url is rerouted to MyLv->index

---
 application/controllers/Cis/MyLv.php |  5 -----
 application/views/Cis/LvInfo.php     | 15 ---------------
 2 files changed, 20 deletions(-)
 delete mode 100644 application/views/Cis/LvInfo.php

diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index 49a938553..819d56b05 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -33,9 +33,4 @@ class MyLv extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
 	}
-
-	public function Info($studien_semester,$lvid)
-	{
-		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
-	}
 }
diff --git a/application/views/Cis/LvInfo.php b/application/views/Cis/LvInfo.php
deleted file mode 100644
index 49a7b7a85..000000000
--- a/application/views/Cis/LvInfo.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'LvInfo',
-	'customJSModules' => ['public/js/apps/Cis/LvInfo.js']
-);
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-<div id="content">
-	<Info studien_semester="<?= $studien_semester ?>" lehrveranstaltung_id="<?= $lvid ?>"></Info>
-	
-</div>
-
-<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

From 3c3e92057317877cfb5e6da90fee8e31111a340b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 08:43:12 +0200
Subject: [PATCH 0861/1357] use fhcApps for Studentenverwaltung

---
 application/views/Studentenverwaltung.php | 4 ++--
 public/js/apps/Studentenverwaltung.js     | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01e611657..aa4891e9a 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -26,8 +26,8 @@
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
-		'customJSModules' => [
-			'public/js/apps/Studentenverwaltung.js'
+		'fhcApps' => [
+			'Studentenverwaltung'
 		]
 	);
 
diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 5eda16dd6..50763ad6f 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -168,10 +168,14 @@ router.afterEach((to, from, failure) => {
 	document.title = title;
 });
 
+FhcApps.router.makeExtendable(router);
+
 const app = Vue.createApp({
 	name: 'StudentenverwaltungApp'
 });
 
+FhcApps.makeExtendable(app);
+
 app
 	.use(router)
 	.use(primevue.config.default, {

From 0309c04ae09fb0b634d84ede9d0a66972ed435ca Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 08:46:09 +0200
Subject: [PATCH 0862/1357] use fhcApps for Cis/Documents

---
 application/views/Cis/Documents.php | 2 +-
 public/js/apps/Cis/Documents.js     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index f34ce3fc1..fa491fa11 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -2,7 +2,7 @@
 $includesArray = array(
 	'title' => 'Documents',
 	'tabulator5' => true,
-	'customJSModules' => ['public/js/apps/Cis/Documents.js']
+	'fhcApps' => ['Cis/Documents']
 );
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
diff --git a/public/js/apps/Cis/Documents.js b/public/js/apps/Cis/Documents.js
index de03769b4..149a32446 100644
--- a/public/js/apps/Cis/Documents.js
+++ b/public/js/apps/Cis/Documents.js
@@ -87,6 +87,8 @@ const app = Vue.createApp({
 	}
 });
 
+FhcApps.makeExtendable(app);
+
 setScrollbarWidth();
 
 app.use(PluginsPhrasen);

From ea0b69d4c274ea5f67854d058e8cc630423da720 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 09:15:26 +0200
Subject: [PATCH 0863/1357] use fhcApps for ProfilUpdateRequest

---
 application/views/Cis/ProfilUpdate.php     | 4 ++--
 public/js/apps/Cis/ProfilUpdateRequests.js | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index e797d436f..525d261a7 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -6,8 +6,8 @@ $includesArray = array(
     'fontawesome6'=> true,
     'axios027' => true,
     'tabulator5' => true,
-    'customJSModules' => array(
-	'public/js/apps/Cis/ProfilUpdateRequests.js'
+    'fhcApps' => array(
+		'Cis/ProfilUpdateRequests'
     ),
     'customCSSs' => array(
 	'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'
diff --git a/public/js/apps/Cis/ProfilUpdateRequests.js b/public/js/apps/Cis/ProfilUpdateRequests.js
index 68465b202..974b2c362 100644
--- a/public/js/apps/Cis/ProfilUpdateRequests.js
+++ b/public/js/apps/Cis/ProfilUpdateRequests.js
@@ -34,4 +34,7 @@ const app = Vue.createApp({
       });
   },
 });
+
+FhcApps.makeExtendable(app);
+
 app.use(PluginsPhrasen).mount("#content");
\ No newline at end of file

From 61600e78b630a3adac25b6f6ba0c9c005025ed3c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 09:27:31 +0200
Subject: [PATCH 0864/1357] use fhcApps for Bismeldestichtag/Bismeldestichtag

---
 application/views/codex/bismeldestichtag.php        | 2 +-
 public/js/apps/Bismeldestichtag/Bismeldestichtag.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 37af16cc6..2f024d25e 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -10,7 +10,7 @@
 		'tabulator5' => true,
 		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css'),
 		'customJSs' => array('vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'),
-		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
+		'fhcApps' => array('Bismeldestichtag/Bismeldestichtag')
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
diff --git a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
index d6e5a4a27..9a9766690 100644
--- a/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
+++ b/public/js/apps/Bismeldestichtag/Bismeldestichtag.js
@@ -237,4 +237,6 @@ const bismeldestichtagApp = Vue.createApp({
 	}
 });
 
+FhcApps.makeExtendable(bismeldestichtagApp);
+
 bismeldestichtagApp.use(PluginsPhrasen).mount('#main');

From d88cc77a5cb35cbc3c4b2cad034a9d2b896299c7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 10:40:02 +0200
Subject: [PATCH 0865/1357] use fhcApps for Studstatus

---
 application/views/lehre/Antrag/Create.php               | 2 +-
 application/views/lehre/Antrag/Leitung/List.php         | 2 +-
 application/views/lehre/Antrag/Student/List.php         | 2 +-
 application/views/lehre/Antrag/Wiederholung/Student.php | 2 +-
 public/js/apps/lehre/Antrag.js                          | 3 +++
 public/js/apps/lehre/Antrag/Leitung.js                  | 3 +++
 public/js/apps/lehre/Antrag/Lvzuweisung.js              | 3 +++
 public/js/apps/lehre/Antrag/Student.js                  | 3 +++
 8 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 00e41d1cd..36a39078f 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -8,7 +8,7 @@ $sitesettings = array(
 	'fontawesome6' => true,
 	'phrases' => array(
 	),
-	'customJSModules' => array('public/js/apps/lehre/Antrag.js'),
+	'fhcApps' => array('lehre/Antrag'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index 1225b16b6..b1ba44a4c 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -18,7 +18,7 @@ $sitesettings = array(
 		'lehre',
 		'person',
 	),
-	'customJSModules' => array('public/js/apps/lehre/Antrag/Leitung.js'),
+	'fhcApps' => array('lehre/Antrag/Leitung'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 6d769dafe..9454e2006 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -8,7 +8,7 @@ $sitesettings = array(
 	'fontawesome6' => true,
 	'phrases' => array(
 	),
-	'customJSModules' => array('public/js/apps/lehre/Antrag/Student.js'),
+	'fhcApps' => array('lehre/Antrag/Student'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index e51cfd1bc..73405fc0a 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -12,7 +12,7 @@ $sitesettings = array(
 		'lehre',
 		'global'
 	),
-	'customJSModules' => array('public/js/apps/lehre/Antrag/Lvzuweisung.js'),
+	'fhcApps' => array('lehre/Antrag/Lvzuweisung'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index 97b4bda97..afdfe48ab 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -20,6 +20,9 @@ const app = Vue.createApp({
 		};
 	}
 });
+
+FhcApps.makeExtendable(app);
+
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index 8fd8b117e..c8169629a 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -7,6 +7,9 @@ const app = Vue.createApp({
 		StudierendenantragLeitung
 	}
 });
+
+FhcApps.makeExtendable(app);
+
 app
 	.use(PluginsPhrasen)
 	.use(primevue.config.default,{zIndex: {overlay: 9999}})
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
index 7504e7dcf..f85a52f62 100644
--- a/public/js/apps/lehre/Antrag/Lvzuweisung.js
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -12,6 +12,9 @@ const app = Vue.createApp({
 		}
 	}
 });
+
+FhcApps.makeExtendable(app);
+
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');
\ No newline at end of file
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
index 46150c541..7d40f4339 100644
--- a/public/js/apps/lehre/Antrag/Student.js
+++ b/public/js/apps/lehre/Antrag/Student.js
@@ -7,6 +7,9 @@ const app = Vue.createApp({
 		LvPopup
 	}
 });
+
+FhcApps.makeExtendable(app);
+
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');
\ No newline at end of file

From d294d17e375add1c2d89bef9ee59a7890c681cd3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 10:42:22 +0200
Subject: [PATCH 0866/1357] use fhcApps for lehre/lvplanung/LvTemplates

---
 application/views/lehre/lvplanung/lvTemplateUebersicht.php | 2 +-
 public/js/apps/lehre/lvplanung/LvTemplates.js              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/lehre/lvplanung/lvTemplateUebersicht.php b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
index 5c873486c..1d5a2e777 100644
--- a/application/views/lehre/lvplanung/lvTemplateUebersicht.php
+++ b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
@@ -9,7 +9,7 @@ $includesArray = array(
 	'primevue3' => true,
 	'navigationcomponent' => true,
 	'filtercomponent' => true,
-	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
+	'fhcApps' => array('lehre/lvplanung/LvTemplates'),
 	'customCSSs' => array(
 	    'public/css/Fhc.css',
 	    'public/css/lvTemplateUebersicht.css'
diff --git a/public/js/apps/lehre/lvplanung/LvTemplates.js b/public/js/apps/lehre/lvplanung/LvTemplates.js
index 655d611ce..b19b1f730 100644
--- a/public/js/apps/lehre/lvplanung/LvTemplates.js
+++ b/public/js/apps/lehre/lvplanung/LvTemplates.js
@@ -28,6 +28,8 @@ const lvTemplatesApp = Vue.createApp({
 	}
 });
 
+FhcApps.makeExtendable(lvTemplatesApp);
+
 lvTemplatesApp
 	.use(primevue.config.default,{zIndex: {overlay: 9999}})
 	.use(PluginsPhrasen)

From 70c230edcee856a9386f59e97ee136032e1bfae8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 10:44:13 +0200
Subject: [PATCH 0867/1357] use fhcApps for LogsViewer/LogsViewer

---
 application/views/system/logs/logsViewer.php | 2 +-
 public/js/apps/LogsViewer/LogsViewer.js      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
index ddfe855fe..60d9075d0 100644
--- a/application/views/system/logs/logsViewer.php
+++ b/application/views/system/logs/logsViewer.php
@@ -13,7 +13,7 @@
 			'global' => array('mailAnXversandt'),
 			'ui' => array('bitteEintragWaehlen')
 		),
-		'customJSModules' => array('public/js/apps/LogsViewer/LogsViewer.js'),
+		'fhcApps' => array('LogsViewer/LogsViewer'),
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
diff --git a/public/js/apps/LogsViewer/LogsViewer.js b/public/js/apps/LogsViewer/LogsViewer.js
index eeb4b38a7..ad377a369 100644
--- a/public/js/apps/LogsViewer/LogsViewer.js
+++ b/public/js/apps/LogsViewer/LogsViewer.js
@@ -42,5 +42,7 @@ const logsViewerApp = Vue.createApp({
 	}
 });
 
+FhcApps.makeExtendable(logsViewerApp);
+
 logsViewerApp.use(PluginsPhrasen).mount('#main');
 

From 601c4367dccad16d497940aede1d358a471f14a6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 9 Oct 2025 10:57:51 +0200
Subject: [PATCH 0868/1357] use fhcApps for CIS

---
 application/views/templates/CISVUE-Footer.php | 6 +++---
 application/views/templates/CISVUE-Header.php | 6 +++---
 public/js/apps/Cis.js                         | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
index d7c1de24c..48943650d 100644
--- a/application/views/templates/CISVUE-Footer.php
+++ b/application/views/templates/CISVUE-Footer.php
@@ -5,9 +5,9 @@ $includesArray = array(
 	'bootstrap5' => true,
 	'fontawesome6' => true,
 	'axios027' => true,
-	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
-	], $customJSModules ?? []),
+	'fhcApps' => array_merge([
+		'Cis'
+	], $fhcApps ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'
 	], $customCSSs ?? [])
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 358fc75c9..943d26d80 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -7,9 +7,9 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'primevue3' => true,
-	'customJSModules' => array_merge([
-		'public/js/apps/Cis.js'
-	], $customJSModules ?? []),
+	'fhcApps' => array_merge([
+		'Cis'
+	], $fhcApps ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',
 		$this->config->item('theme_css'),
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 5b76c5721..c88a47a35 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -142,6 +142,9 @@ const app = Vue.createApp({
         }
     }
 });
+
+FhcApps.makeExtendable(app);
+
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,

From 14aad56d5eb189ea1c18b10c979afde9e0205330 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 9 Oct 2025 12:40:53 +0200
Subject: [PATCH 0869/1357] datepicker css overflow fix; returned modalMagic to
 old form since its simpler now

---
 public/css/components/abgabetool/abgabe.css   |  4 ++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 40 ++++++++-----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index ab91d8d2f..2c35da965 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -157,3 +157,7 @@
 	border-radius: 0.5rem;
 	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
 }
+
+.bordered-modal  .modal-body {
+	overflow-y: visible;
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 024aa998b..d6b0040fd 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -114,6 +114,8 @@ export const AbgabeMitarbeiterDetail = {
 						}
 						
 						this.showAutomagicModalPhrase = true
+
+						this.$refs.modalContainerCreateNewAbgabe.show()
 					} else {
 						this.showAutomagicModalPhrase = false	
 					}
@@ -251,28 +253,6 @@ export const AbgabeMitarbeiterDetail = {
 			
 			return true
 		},
-		handleModalClose() {
-			// determined inside saveTermin api.then()
-			if(this.showAutomagicModalPhrase) {
-				this.$refs.modalContainerCreateNewAbgabe.show()
-			} else {
-				this.$refs.modalContainerCreateNewAbgabe.hide()
-				this.newTermin = {
-					'paabgabe_id': -1,
-					'projektarbeit_id': this.projektarbeit.projektarbeit_id,
-					'fixtermin': false,
-					'kurzbz': '',
-					'datum': new Date().toISOString().split('T')[0],
-					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-					'beurteilungsnotiz': '',
-					'upload_allowed': false,
-					'paabgabetyp_kurzbz': '',
-					'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen'),
-					'abgabedatum': null,
-					'insertvon': this.viewData?.uid ?? ''
-				}
-			}	
-		},
 		async handleSaveNewAbgabe(termin) {
 			
 			if(!this.validateTermin(termin)) {
@@ -283,7 +263,21 @@ export const AbgabeMitarbeiterDetail = {
 			
 			await this.saveTermin(termin)
 			
-			this.handleModalClose()
+			this.$refs.modalContainerCreateNewAbgabe.hide()
+			this.newTermin = {
+				'paabgabe_id': -1,
+				'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+				'fixtermin': false,
+				'kurzbz': '',
+				'datum': new Date().toISOString().split('T')[0],
+				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+				'beurteilungsnotiz': '',
+				'upload_allowed': false,
+				'paabgabetyp_kurzbz': '',
+				'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen'),
+				'abgabedatum': null,
+				'insertvon': this.viewData?.uid ?? ''
+			}
 			
 		},
 		handleChangeAbgabetyp(termin) {

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 0870/1357] 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 b9cb8f9cced86c6391178fed1668902e085cc0b7 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 10 Oct 2025 16:42:14 +0200
Subject: [PATCH 0871/1357] Interessent anlegen: bugfix Geburtsdatum save, when
 searching for existing persons, more fields are displayed, form is emptied
 each time it is opened, adress can only be added, but not overwritten

---
 .../api/frontend/v1/stv/Student.php           |  91 ++++++++-------
 .../models/crm/Prestudentstatus_model.php     |   9 +-
 .../Details/Projektarbeit/Projektbetreuer.js  |   1 -
 .../Stv/Studentenverwaltung/List/New.js       | 105 ++++++++++++------
 4 files changed, 130 insertions(+), 76 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 3a383ed2c..031b24670 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -441,6 +441,13 @@ class Student extends FHCAPI_Controller
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
+		$this->PersonModel->addSelect(
+			'person_id, vorname, nachname, vornamen, wahlname, gebdatum, staatsbuergerschaft, geburtsnation, sprache, anrede,
+			titelpost, titelpre, gebort, gebzeit, homepage, geschlecht, matr_nr,
+			aktiv, unruly, tbl_geschlecht.bezeichnung_mehrsprachig AS geschlecht_bezeichnung'
+		);
+		$this->PersonModel->addJoin('public.tbl_geschlecht', 'geschlecht');
+
 		if ($gebdatum)
 			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
 		if ($vorname && $nachname) {
@@ -456,6 +463,33 @@ class Student extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->load->model('person/Adresse_model', 'AdresseModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		foreach ($data as $person)
+		{
+			// get adresses
+			$langIdx = $this->_getLanguageIndex() - 1;
+			$person->geschlecht_bezeichnung = isset($person->geschlecht_bezeichnung[$langIdx]) ? $person->geschlecht_bezeichnung[$langIdx] : '';
+
+			// get Adresse
+			$this->AdresseModel->addOrder('heimatadresse', 'DESC');
+			$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+			$this->AdresseModel->addOrder('adresse_id', 'DESC');
+			$result = $this->AdresseModel->loadWhere(['person_id' => $person->person_id]);
+
+			$adressen = $this->getDataOrTerminateWithError($result);
+
+			$person->adressen = $adressen;
+
+			// get status
+			$result = $this->PrestudentstatusModel->getLastStatusPerson($person->person_id);
+
+			$status = $this->getDataOrTerminateWithError($result);
+
+			$person->status = $status;
+		}
+
 		$this->terminateWithSuccess($data);
 	}
 
@@ -471,7 +505,6 @@ class Student extends FHCAPI_Controller
 
 		$this->_validate();
 
-		// TODO(chris): This should be in a library
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
@@ -486,6 +519,8 @@ class Student extends FHCAPI_Controller
 		$this->db->trans_begin();
 
 		$result = $this->_addPerson();
+		if (isError($result)) $errors[] = getError($result);
+
 		if (hasData($result))
 		{
 			$person_id = getData($result);
@@ -536,7 +571,7 @@ class Student extends FHCAPI_Controller
 			if ($this->input->post('geschlecht'))
 				$data['geschlecht'] = $this->input->post('geschlecht');
 			if ($this->input->post('gebdatum'))
-				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
+				$data['gebdatum'] = (new DateTime($this->input->post('gebdatum')))->format('Y-m-d');
 			if ($this->input->post('geburtsnation'))
 				$data['geburtsnation'] = $this->input->post('geburtsnation');
 			if ($this->input->post('staatsbuergerschaft'))
@@ -551,8 +586,8 @@ class Student extends FHCAPI_Controller
 	private function _addAdresse($person_id)
 	{
 		// Addresse anlegen?
-		$anlegen = $this->input->post('address[func]');
-		if ($anlegen)
+		$anlegen = $this->input->post('address[checked]');
+		if ($anlegen === true)
 		{
 			// Adresse laden
 			$this->load->model('person/Adresse_model', 'AdresseModel');
@@ -567,46 +602,21 @@ class Student extends FHCAPI_Controller
 				'zustelladresse' => true,
 			];
 
-			if ($anlegen < 0) // Adresse überschreiben
-			{
 				$this->AdresseModel->addSelect('adresse_id');
-				$this->AdresseModel->addJoin('public.tbl_adressentyp', 'typ = adressentyp_kurzbz');
-				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
-				$this->AdresseModel->addOrder('sort');
 				$result = $this->AdresseModel->loadWhere([
 					'person_id' => $person_id
 				]);
 
 				if (isError($result)) return $result;
 
-				if (hasData($result))
-				{
-					$address = getData($result)[0];
+				// wenn neue Adresse, heimatadresse setzen
+				if (!hasData($result)) $data['heimatadresse'] = true;
 
-					$data['updateamum'] = date('c');
-					$data['updatevon'] = getAuthUID();
-
-					return $this->AdresseModel->update($address->adresse_id, $data);
-				}
-				else {
-					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
-					$anlegen = 1;
-					$data['heimatadresse'] = true;
-				}
-			}
-
-			if ($anlegen > 0) // Adresse hinzufügen
-			{
 				$data['person_id'] = $person_id;
 				$data['insertamum'] = date('c');
 				$data['insertvon'] = getAuthUID();
 
-				// Wenn die Person neu angelegt wird, dann ist die neue Adresse die Heimatadresse
-				if (!isset($data['heimatadresse']))
-					$data['heimatadresse'] = !$this->input->post('person_id');
-
 				return $this->AdresseModel->insert($data);
-			}
 		}
 
 		return success(null);
@@ -714,7 +724,7 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!$_POST['address']['func'] || $_POST['address']['func'] == 0)
+		if (!isset($_POST['address']['checked']) || !$_POST['address']['checked'])
 			return true;
 		return !!$value;
 	}
@@ -733,11 +743,6 @@ class Student extends FHCAPI_Controller
 		return !!$value;
 	}
 
-	public function isValidDate($value)
-	{
-		return isValidDate($value);
-	}
-
 	/**
 	 * Validates input data. Terminates with validation errors, if invalid.
 	 */
@@ -754,7 +759,7 @@ class Student extends FHCAPI_Controller
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
 			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
 		]);
-		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		//$this->form_validation->set_rules('address[checked]', 'Address', 'required');
 		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
 			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'plz')])
 		]);
@@ -789,4 +794,14 @@ class Student extends FHCAPI_Controller
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 	}
+
+	private function _getLanguageIndex()
+	{
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->SpracheModel->addSelect('index');
+		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+		$this->addMeta('lang', getUserLanguage());
+
+		return hasData($result) ? getData($result)[0]->index : 1;
+	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index de91319b9..c0ed8595e 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -290,7 +290,11 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function getLastStatusPerson($person_id, $studiensemester_kurzbz = null)
 	{
-		$query = 'SELECT *
+		$query = 'SELECT p.*, ps.*, s.*,
+					stg.kurzbz AS studiengang_kurzbz, stg.kurzbzlang AS studiengang_kurzbzlang,
+					UPPER(typ::varchar(1) || kurzbz) AS studiengang_kuerzel,
+					stg.typ AS studiengang_typ, stg.bezeichnung AS studiengang_bezeichnung, stg.english AS studiengang_bezeichnung_english,
+					stg.orgform_kurzbz AS studiengang_orgform
 					FROM public.tbl_prestudent p
 					JOIN (
 							SELECT DISTINCT ON(prestudent_id) *
@@ -298,7 +302,8 @@ class Prestudentstatus_model extends DB_Model
 							 WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?)
 						  ORDER BY prestudent_id, datum desc, insertamum desc
 						) ps USING(prestudent_id)
-					JOIN public.tbl_status USING(status_kurzbz)';
+					JOIN public.tbl_status s USING(status_kurzbz)
+					JOIN public.tbl_studiengang stg USING (studiengang_kz)';
 
 		$parametersArray = array($person_id);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index adcf2f2a8..ca8ff891b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -381,7 +381,6 @@ export default {
 			return false;
 		},
 		actionNewPerson() {
-			this.$refs.newPersonModal.reset();
 			this.$refs.newPersonModal.open();
 		},
 		actionKontaktdatenBearbeiten() {
diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 27afb103c..018602d0c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -13,9 +13,11 @@ import ApiStudienplan from '../../../../api/factory/studienplan.js';
 var _uuid = 0;
 const FORMDATA_DEFAULT = {
 	address: {
-		func: 1,
+		checked: true,
 		nation: 'A'
 	},
+	vorname: '',
+	nachname: '',
 	geburtsnation: 'A',
 	staatsbuergerschaft: 'A',
 	ausbildungssemester: 1,
@@ -45,7 +47,7 @@ export default {
 	data() {
 		return {
 			places: [],
-			formData: FORMDATA_DEFAULT,
+			formData: null,
 			suggestions: {},
 			person: null,
 			semester: [],
@@ -63,7 +65,7 @@ export default {
 			return this.formData;
 		},
 		orte() {
-			return this.places.filter(ort => ort.name == this.formData.address.gemeinde);
+			return this.places.filter(ort => ort.name == this.formData?.address.gemeinde);
 		},
 		gemeinden() {
 			return Object.values(this.places.reduce((res,place) => {
@@ -73,7 +75,7 @@ export default {
 		},
 		formDataStg: {
 			get() {
-				return this.formData.studiengang_kz !== undefined ? this.formData.studiengang_kz : this.studiengangKz;
+				return this.formData?.studiengang_kz !== undefined ? this.formData?.studiengang_kz : this.studiengangKz;
 			},
 			set(v) {
 				this.formData.studiengang_kz = v;
@@ -81,7 +83,7 @@ export default {
 		},
 		formDataSem: {
 			get() {
-				return this.formData.studiensemester_kurzbz !== undefined ? this.formData.studiensemester_kurzbz : this.studiensemesterKurzbz;
+				return this.formData?.studiensemester_kurzbz !== undefined ? this.formData?.studiensemester_kurzbz : this.studiensemesterKurzbz;
 			},
 			set(v) {
 				this.formData.studiensemester_kurzbz = v;
@@ -101,10 +103,10 @@ export default {
 			this.$refs.modal.show();
 		},
 		reset() {
-			this.formData = FORMDATA_DEFAULT;
+			this.formData = JSON.parse(JSON.stringify(FORMDATA_DEFAULT));
 			this.person = null;
 			this.suggestions = [];
-			this.$refs.form.clearValidation();
+			if (this.$refs.form) this.$refs.form.clearValidation();
 		},
 		loadSuggestions() {
 			if (this.abortController.suggestions)
@@ -116,9 +118,9 @@ export default {
 
 			this.$api
 				.call(ApiStvStudents.getPerson({
-					vorname: this.formData.vorname,
-					nachname: this.formData.nachname,
-					gebdatum: this.formData.gebdatum
+					vorname: this.formData?.vorname,
+					nachname: this.formData?.nachname,
+					gebdatum: this.formData?.gebdatum
 				}), {
 					signal: this.abortController.suggestions.signal
 				})
@@ -137,12 +139,12 @@ export default {
 		loadPlaces() {
 			if (this.abortController.places)
 				this.abortController.places.abort();
-			if (this.formData.address.nation != 'A' || !this.formData.address.plz)
+			if (this.formData?.address?.nation != 'A' || !this?.formData?.address?.plz)
 				return;
 
 			this.abortController.places = new AbortController();
 			this.$refs.form.call(
-				ApiStvAddress.getPlaces(this.formData.address.plz)
+				ApiStvAddress.getPlaces(this.formData?.address.plz)
 				//~ undefined,
 				//~ {
 					//~ signal: this.abortController.places.signal
@@ -164,13 +166,13 @@ export default {
 					.call(ApiStudienplan.getStudienplaeneBySemester(
 						this.formDataStg,
 						this.formDataSem,
-						this.formData.ausbildungssemester,
-						this.formData.orgform_kurzbz
+						this.formData?.ausbildungssemester,
+						this.formData?.orgform_kurzbz
 					))
 					.then(result => result.data || [])
 					.then(result => {
 						this.studienplaene = result;
-						if (this.formData.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData.studienplan_id).length)
+						if (this.formData?.studienplan_id !== '' && !this.studienplaene.filter(plan => plan.studienplan_id == this.formData?.studienplan_id).length)
 							this.formData.studienplan_id = '';
 					})
 					.catch(error => {
@@ -184,10 +186,10 @@ export default {
 			}
 		},
 		changeAddressNation(e) {
-			if (this.formData['geburtsnation'] == this.formData['address']['nation'])
-				this.formData['geburtsnation'] = e.target.value;
-			if (this.formData['staatsbuergerschaft'] == this.formData['address']['nation'])
-				this.formData['staatsbuergerschaft'] = e.target.value;
+			if (this.formData.geburtsnation == this.formData?.address.nation)
+				this.formData.geburtsnation = e.target.value;
+			if (this.formData.staatsbuergerschaft == this.formData?.address.nation)
+				this.formData.staatsbuergerschaft = e.target.value;
 			this.loadPlaces();
 		},
 		send(e) {
@@ -216,11 +218,23 @@ export default {
 		setPerson(suggestion)
 		{
 			this.person = suggestion;
-			this.formData.address.func = -1;
+			this.formData.address.checked = false;
+		},
+		dateFormatter(val)
+		{
+			if (!val)
+				return '';
+			let date = new Date(val);
+			return date.toLocaleDateString('de-AT', {
+				"day": "2-digit",
+				"month": "2-digit",
+				"year": "numeric"
+			});
 		}
 	},
 	created() {
 		this.uuid = _uuid++;
+		this.reset();
 		this.$api.call(ApiStudiensemester.getAll())
 		.then(result => result.data || [])
 		.then(result => {
@@ -282,9 +296,17 @@ export default {
 							</form-input>
 						</div>
 					</div>
-					<!-- TODO(chris): more details -->
-					<table class="table caption-top table-striped table-hover">
+					<table class="table caption-top table-striped table-hover" >
 						<caption>{{ $p.t('person', 'personExistiertPruefung') }}</caption>
+						<thead v-if="suggestions?.length">
+							<th>{{ $p.t('person', 'nachname') }}</th>
+							<th>{{ $p.t('person', 'vorname') }}</th>
+							<th>{{ $p.t('person', 'weitereVornamen') }}</th>
+							<th>{{ $p.t('person', 'geburtsdatum') }}</th>
+							<th>{{ $p.t('person', 'geschlecht') }}</th>
+							<th>{{ $p.t('person', 'adresse') }}</th>
+							<th>Status</th>
+						</thead>
 						<tbody>
 							<tr
 								v-for="(suggestion, index) in suggestions"
@@ -293,8 +315,21 @@ export default {
 								@click="(index == 2) ? suggestions.shift() : setPerson(suggestion)"
 								v-accessibility:tab.vertical
 								>
-								<td>{{suggestion.vorname + ' ' + suggestion.nachname}}</td>
-								<td></td>
+								<td>{{ suggestion.nachname }}</td>
+								<td>{{ suggestion.vorname }}</td>
+								<td>{{ suggestion.vornamen }}</td>
+								<td>{{ dateFormatter(suggestion.gebdatum) }}</td>
+								<td>{{ suggestion.geschlecht_bezeichnung }}</td>
+								<td>
+									<div v-for="adresse in suggestion.adressen">
+										{{ (adresse.plz ?? '') + (adresse.plz && adresse.ort ? ' ' : '') + (adresse.ort ?? '') + (adresse.ort && adresse.strasse ? ', ' : '') + (adresse.strasse ?? '') }}
+									</div>
+								</td>
+								<td>
+									<div v-for="status in suggestion.status">
+										{{ status.status_kurzbz + " " + status.studiengang_kuerzel }}
+									</div>
+								</td>
 							</tr>
 						</tbody>
 					</table>
@@ -422,19 +457,18 @@ export default {
 					<div class="row">
 						<div class="col-sm-6 mb-3">
 							<form-input
-								type="select"
-								id="stv-list-new-address-func"
-								name="address[func]"
-								v-model="formData['address']['func']"
+								:label="$p.t('person', 'adresseHinzufuegen')"
+								type="checkbox"
+								id="stv-new-adresse"
+								name="adresseChecked"
+								v-model="formData['address']['checked']"
+								value="true"
 								>
-								<option value="-1" v-if="person">{{ $p.t('person', 'bestehendeAdresseUeberschreiben') }}</option>
-								<option value="1">{{ $p.t('person', 'adresseHinzufuegen') }}</option>
-								<option value="0">{{ $p.t('person', 'adresseNichtAnlegen') }}</option>
 							</form-input>
 						</div>
 					</div>
-
-					<fieldset v-if="formData['address']['func'] != 0">
+					<fieldset v-if="formData['address']['checked']">
+					<hr>
 						<legend>Adresse</legend>
 						<div class="row">
 							<div class="col-sm-4 mb-3">
@@ -519,6 +553,7 @@ export default {
 								</form-input>
 							</div>
 						</div>
+					<hr>
 					</fieldset>
 
 					<div class="row">
@@ -679,7 +714,7 @@ export default {
 						</div>
 						<div class="row">
 							<div class="col-10 mb-3">
-								<div class="form-check">
+								<div>
 									<form-input
 										label="Incoming"
 										type="checkbox"
@@ -696,7 +731,7 @@ export default {
 				</template>
 			</template>
 			<template #footer>
-				<button v-if="person !== null" type="button" class="btn btn-secondary" @click="person = null; formData.address.func = 1;"><i class="fa fa-chevron-left"></i>{{ $p.t('ui', 'zurueck') }}</button>
+				<button v-if="person !== null" type="button" class="btn btn-secondary" @click="person = null; formData.address.checked = true;"><i class="fa fa-chevron-left"></i>{{ $p.t('ui', 'zurueck') }}</button>
 				<button type="submit" class="btn btn-primary">{{ person === null || personOnly ? $p.t('person', 'personAnlegen') : $p.t('lehre', 'interessentAnlegen') }}</button>
 			</template>
 		</bs-modal>

From 440477d2496a752c53bdba989adc24df75ab2e77 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 13 Oct 2025 09:30:35 +0200
Subject: [PATCH 0872/1357] Quickfix: Api errors sometimes will not be
 displayed

---
 public/js/plugins/Api.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 895ecf70d..ed40551de 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -10,8 +10,6 @@ export default {
 		if (!app.config.globalProperties.$fhcAlert)
 			app.use(FhcAlert);
 
-		const $fhcAlert = app.config.globalProperties.$fhcAlert;
-
 		function _send_array_or_object(errors, func) {
 			if (Array.isArray(errors))
 				errors.forEach(func);
@@ -115,7 +113,7 @@ export default {
 					await $p.loadCategory('ui');
 					const n_errors = $p.t('ui/n_errors', { n: counter });
 
-					$fhcAlert.alertDefault(
+					app.config.globalProperties.$fhcAlert.alertDefault(
 						'error',
 						n_errors,
 						'<dl>' + msgs.join('') + '</dl>',
@@ -146,7 +144,7 @@ export default {
 									title += ': PHP ' + error.severity;
 								else
 									title = 'PHP ' + error.severity;
-								$fhcAlert.alertDefault('warn', title, message, true);
+								app.config.globalProperties.$fhcAlert.alertDefault('warn', title, message, true);
 								break;
 							case 'Notice':
 							case 'User Notice':
@@ -155,13 +153,13 @@ export default {
 									title += ': PHP ' + error.severity;
 								else
 									title = 'PHP ' + error.severity;
-								$fhcAlert.alertDefault('info', title, message, true);
+								app.config.globalProperties.$fhcAlert.alertDefault('info', title, message, true);
 								break;
 							default:
 								message = 'Type: PHP ' + error.severity + '\n\n' + message;
 								if (title)
 									message = title + '\n\n' + message;
-								$fhcAlert.alertSystemError(message);
+								app.config.globalProperties.$fhcAlert.alertSystemError(message);
 								break;
 						}
 					});
@@ -183,7 +181,7 @@ export default {
 								message += '\tFunction: ' + err.function + '\n';
 							});
 						}
-						$fhcAlert.alertSystemError(message);
+						app.config.globalProperties.$fhcAlert.alertSystemError(message);
 					});
 				},
 				db(errors) {
@@ -206,7 +204,7 @@ export default {
 						if (error.line !== undefined)
 							message += 'Line Number: ' + error.line + '\n';
 
-						$fhcAlert.alertSystemError(message);
+						app.config.globalProperties.$fhcAlert.alertSystemError(message);
 					});
 				},
 				auth(errors) {
@@ -221,7 +219,7 @@ export default {
 						message += 'Method name: ' + error.method + '\n';
 						message += 'Required permissions: ' + error.required_permissions;
 
-						$fhcAlert.alertDefault(
+						app.config.globalProperties.$fhcAlert.alertDefault(
 							'error',
 							title,
 							message,

From 07bcbee11bc5fdca821e5c4ffdcaafeea4aae6ac Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 13 Oct 2025 10:52:52 +0200
Subject: [PATCH 0873/1357] add Interessent: insertamum and insertvon when
 adding prestuden

---
 application/libraries/PrestudentLib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 983f41b87..28879fb47 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -56,7 +56,9 @@ class PrestudentLib
 			'anmerkung' => $anmerkung,
 			'reihungstestangetreten' => false,
 			'bismelden' => true,
-			'foerderrelevant' => $foerderrelevant
+			'foerderrelevant' => $foerderrelevant,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
 		];
 
 		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen

From fed45015bddfde59e27e2bbed8e28df7c197cb39 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 13 Oct 2025 11:18:45 +0200
Subject: [PATCH 0874/1357] set updateamum, updatevon when changing profile
 update status

---
 application/controllers/api/frontend/v1/ProfilUpdate.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 9e3b72d74..604ae33c9 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -706,7 +706,13 @@ class ProfilUpdate extends FHCAPI_Controller
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message)
 	{
-		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
+		return $this->ProfilUpdateModel->update([$id], [
+			"status" => $status,
+			"status_timestamp" => "NOW()",
+			"status_message" => $status_message,
+			"updateamum" => "NOW()",
+			"updatevon" => getAuthUID()
+		]);
 	}
 	
 	private function updateRequestedChange($id, $requested_change)

From e9c039dad24be1a410b514f3a4c012b4396b963d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 13 Oct 2025 16:07:51 +0200
Subject: [PATCH 0875/1357] Refactor detailHeader component for PV21

- own css.file for fotouplad
- domain as prop
- refactor link to Leitung
- slots for issuetracking and tags
---
 .../models/ressource/Mitarbeiter_model.php    |  2 +-
 application/views/Studentenverwaltung.php     |  3 +-
 application/views/Vertragsverwaltung.php      |  1 +
 public/css/Studentenverwaltung.css            |  4 --
 public/css/Vertragsverwaltung.css             |  4 --
 public/css/components/Detailheader.css        |  3 +
 .../components/DetailHeader/DetailHeader.js   | 58 +++++++++----------
 .../Vertraege/Vertragsverwaltung.js           |  7 +--
 8 files changed, 38 insertions(+), 44 deletions(-)
 create mode 100644 public/css/components/Detailheader.css

diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 24709caf4..3150d2031 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -209,7 +209,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe, personalnummer, mitarbeiter_uid
 			FROM
 				public.tbl_person
 				JOIN public.tbl_benutzer b USING(person_id)
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01e611657..10fe268c3 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -19,7 +19,8 @@
 			'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/components/Detailheader.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index db7701f0f..7738a8d4a 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -18,6 +18,7 @@ $includesArray = array(
 		'public/css/components/vue-datepicker.css',
 		'public/css/components/primevue.css',
 		'public/css/Vertragsverwaltung.css',
+		'public/css/components/Detailheader.css'
 	],
 	'customJSs' => [
 		#'vendor/npm-asset/primevue/tree/tree.min.js',
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 05b28d314..bb2588926 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -158,8 +158,4 @@ html {
 
 .tiny-90 div.tox.tox-tinymce {
 	height: 90% !important;
-}
-
-.foto-container:hover .fotoedit {
-    opacity: 1 !important;
 }
\ No newline at end of file
diff --git a/public/css/Vertragsverwaltung.css b/public/css/Vertragsverwaltung.css
index 300ee5d55..7b2d71481 100644
--- a/public/css/Vertragsverwaltung.css
+++ b/public/css/Vertragsverwaltung.css
@@ -18,7 +18,3 @@ html {
 .vv {
 	margin-left: 0 !important;
 }
-
-.foto-container:hover .fotoedit {
-    opacity: 1 !important;
-}
diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css
new file mode 100644
index 000000000..dde2756f1
--- /dev/null
+++ b/public/css/components/Detailheader.css
@@ -0,0 +1,3 @@
+.foto-container:hover .fotoedit {
+    opacity: 1 !important;
+}
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index b821620e1..ba88eb31f 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -7,12 +7,12 @@ export default {
 	components: {
 		ModalUploadFoto
 	},
-	inject: {
+/*	inject: {
 		domain: {
 			from: 'configDomain',
 			default: 'fhcomplete.info'
 		},
-	},
+	},*/
 	props: {
 		headerData: {
 			type: Object,
@@ -31,6 +31,10 @@ export default {
 			required: false,
 			default: false
 		},
+		domain: {
+			type: String,
+			required: true
+		},
 		typeHeader: {
 			type: String,
 			default: 'student',
@@ -54,14 +58,14 @@ export default {
 	},
 	created(){
 		if(this.person_id) {
-			this.loadHeaderData();
+			this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
 		}
 	},
 	watch: {
 		person_id: {
 			handler(newVal) {
 				if (newVal) {
-					this.loadHeaderData();
+					this.loadHeaderData(newVal, this.mitarbeiter_uid);
 				}
 			},
 			deep: true,
@@ -76,9 +80,9 @@ export default {
 		};
 	},
 	methods: {
-		loadHeaderData(){
-			this.getHeader(this.person_id);
-			this.loadDepartmentData(this.mitarbeiter_uid)
+		loadHeaderData(person_id, mitarbeiter_uid){
+			this.getHeader(person_id);
+			this.loadDepartmentData(mitarbeiter_uid)
 				.then(() => {
 					// Call getLeitungOrg only after departmentData is loaded
 					this.getLeitungOrg(this.departmentData.oe_kurzbz);
@@ -112,11 +116,8 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		redirectToLeitung(){
-			this.$emit('redirectToLeitung', {
-				person_id: this.leitungData.person_id,
-				uid: this.leitungData.uid
-			});
+		async goToLeitung() {
+			this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid);
 		},
 		showModal(person_id){
 			this.$refs.modalFoto.open(person_id);
@@ -143,11 +144,11 @@ export default {
 		},
 		reload() {
 			if(this.person_id) {
-				this.loadHeaderData();
+				this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
 			}
-			else {
+/*			else {
 				this.$emit('reload');
-			}
+			}*/
 		},
 	},
 	template: `
@@ -282,7 +283,7 @@ export default {
 						{{departmentData.bezeichnung}}
 					<span v-if="leitungData.uid"> | </span>
 					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
-					<a href="#" @click.prevent="redirectToLeitung" >
+					<a href="#" @click.prevent="goToLeitung" >
 						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
 					</a>
 					<p>
@@ -297,25 +298,24 @@ export default {
 						</span>
 						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
 					</p>
+					<slot name="tag"></slot>
 				</div>
 
 				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
 					<div class="d-flex py-1">
-					<!--  TODO slots for Issue Tracking and Tags
-						<class="px-2">
-							<h4 class="mb-1">Issues<a class="refresh-issues" title="checkIssues Person" @click="checkPerson"><i class="fas fa-sync"></i></a></h4>
-							<h6 v-if="!isFetchingIssues" class="text-muted">122</h6>
-						</div> -->
-						<div class="px-2">
-							<h4 class="mb-1">PNr</h4>
-							<h6 class="text-muted">{{ headerDataMa?.person_id }}</h6>
-						</div>
-						<div class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1">UID</h4>
-							<h6 class="text-muted">{{ mitarbeiter_uid }}</h6>
-						</div>
+					<div class="px-2" style="min-width: 100px;">
+						<slot name="card"></slot>
+					</div>
+					<div class="px-2">
+						<h4 class="mb-1">PNr</h4>
+						<h6 class="text-muted">{{ headerDataMa?.personalnummer }}</h6>
+					</div>
+					<div class="px-2" style="border-left: 1px solid #EEE">
+						<h4 class="mb-1">UID</h4>
+						<h6 class="text-muted">{{ headerDataMa?.mitarbeiter_uid }}</h6>
 					</div>
 				</div>
+			</div>
 
 		</template>
 	</div>
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 53dd23fd4..ed4bec50e 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -37,10 +37,6 @@ export default {
 			this.mitarbeiter_uid = selection.uid;
 			this.person_id = selection.person_id;
 		},
-		redirectToLeitung(leitung){
-			this.person_id = leitung.person_id;
-			this.mitarbeiter_uid = leitung.uid;
-		}
 	},
 	template: `
 		<!-- Navigation component -->
@@ -60,11 +56,12 @@ export default {
 				<template #bottom>
 					<div class="col" v-if="person_id!=null">
 						<fhc-header
+							ref="CoreDetailsHeaderRef"
 							:person_id="person_id"
 							:mitarbeiter_uid="this.mitarbeiter_uid"
 							typeHeader="mitarbeiter"
+							:domain="config.domain"
 							fotoEditable
-							@redirectToLeitung="redirectToLeitung"
 						></fhc-header>
 						<vertraege-mitarbeiter
 							:endpoint="endpoint"

From 40512edef0905d76000f36507a960e23e9e924c6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 13 Oct 2025 16:46:29 +0200
Subject: [PATCH 0876/1357] add emit redirect to reload parent

---
 public/js/components/DetailHeader/DetailHeader.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index ba88eb31f..0378e8e9a 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -118,6 +118,13 @@ export default {
 		},
 		async goToLeitung() {
 			this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid);
+			this.redirectToLeitung();
+		},
+		redirectToLeitung() {
+			this.$emit('redirect', {
+				person_id: this.leitungData.person_id,
+				uid: this.leitungData.uid
+			});
 		},
 		showModal(person_id){
 			this.$refs.modalFoto.open(person_id);

From 15a9379c6e58883f09f2c1caef97bf08e459070b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 14 Oct 2025 15:45:11 +0200
Subject: [PATCH 0877/1357] use Slots for Core Detail Header: Tags, Issues,
 TileSlots

---
 .../components/DetailHeader/DetailHeader.js   | 45 ++++++++++++++-----
 .../Vertraege/Vertragsverwaltung.js           |  6 ++-
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0378e8e9a..5fe657c49 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -54,7 +54,20 @@ export default {
 			if (this.typeHeader === 'student') return this.headerData;
 			if (this.typeHeader === 'mitarbeiter') return this.person_id;
 			return null;
-		}
+		},
+		hasTileAlphaSlot() {
+			return !!this.$slots.titleAlphaTile
+		},
+		hasTileBetaSlot() {
+			return !!this.$slots.titleBetaTile
+		},
+		hasTileGammaSlot() {
+			return !!this.$slots.titleGammaTile
+		},
+		hasTileUIDSlot() {
+			return !!this.$slots.uid
+		},
+
 	},
 	created(){
 		if(this.person_id) {
@@ -310,19 +323,27 @@ export default {
 
 				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
 					<div class="d-flex py-1">
-					<div class="px-2" style="min-width: 100px;">
-						<slot name="card"></slot>
-					</div>
-					<div class="px-2">
-						<h4 class="mb-1">PNr</h4>
-						<h6 class="text-muted">{{ headerDataMa?.personalnummer }}</h6>
-					</div>
-					<div class="px-2" style="border-left: 1px solid #EEE">
-						<h4 class="mb-1">UID</h4>
-						<h6 class="text-muted">{{ headerDataMa?.mitarbeiter_uid }}</h6>
+						<div class="px-2" style="min-width: 100px;">
+							<slot name="issues"></slot>
+						</div>
+						<div v-if="hasTileGammaSlot" class="px-2">
+							<h4 class="mb-1"><slot name="titleGammaTile" :titleGammaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueGammaTile" :valueGammaTile="valueGammaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileBetaSlot" class="px-2">
+							<h4 class="mb-1"><slot name="titleBetaTile" :titleBetaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileAlphaSlot" class="px-2">
+							<h4 class="mb-1"><slot name="titleAlphaTile" :titleAlphaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueAlphaTile" :valueAlphaTile="valueAlphaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1">UID</h4>
+							<h6 class="text-muted"><slot name="uid"></slot></h6>
+						</div>
 					</div>
 				</div>
-			</div>
 
 		</template>
 	</div>
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index ed4bec50e..ff64874c6 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -62,7 +62,11 @@ export default {
 							typeHeader="mitarbeiter"
 							:domain="config.domain"
 							fotoEditable
-						></fhc-header>
+						>
+							<template #uid>{{mitarbeiter_uid}}</template>
+							<template #titleAlphaTile>pID</template>
+							<template #valueAlphaTile>{{person_id}}</template>
+						</fhc-header>
 						<vertraege-mitarbeiter
 							:endpoint="endpoint"
 							:person_id="this.person_id"

From 2aee86baba09b66e92ad99c2881b7685dd234a5a Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 14 Oct 2025 09:55:55 +0200
Subject: [PATCH 0878/1357] Changed phrase lvevaluierung/logoutText

---
 system/phrasesupdate.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 469815a46..ede5cc2e3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -49663,8 +49663,9 @@ and represent the current state of research on the topic. The prescribed citatio
 			array(
 				'sprache' => 'German',
 				'text' => '
-					<p>Ihr Feedback dient den Lehrenden zur Selbstevaluierung und Ihre Jahrgangsvertretungen werden von der Studiengangsleitung zum Jour-Fixe eingeladen, um die Ergebnisse zu besprechen.</p>
-					<p>Ihr Feedback dient der kontinuierlichen Weiterentwicklung der Lehrveranstaltung. Mehr Details dazu finden Sie hier: 
+					<p>Danke, dass Sie sich Zeit für das Feedback genommen haben! Ihre ehrliche und konstruktive Rückmeldung ist essenziell, damit Ihre Lehrenden und Ihre Studiengangsleitung die Lehrveranstaltung immer weiter verbessern und anpassen können!</p>
+					<p>Und was passiert jetzt mit Ihrem Feedback? Die Studiengangsleitung wird die Ergebnisse &amp; Maßnahmen zusammen mit Ihrer Jahrgangsvertretung besprechen. So tragen Sie aktiv dazu bei, die Lehrveranstaltung für zukünftige Semester noch spannender &amp; lehrreicher zu machen!</p>
+					<p>Gemeinsam für mehr Qualität in der Lehre!</p>
 				',
 				'description' => '',
 				'insertvon' => 'system'
@@ -49672,8 +49673,9 @@ and represent the current state of research on the topic. The prescribed citatio
 			array(
 				'sprache' => 'English',
 				'text' => '
-					<p>Your feedback is used by the lecturers for self-evaluation and your year representatives are invited to the Jour-Fixe by the head of degree program to discuss the results.</p>
-					<p>Your feedback is used for the continuous further development of the course. You can find more details here: 
+					<p>Thank you for taking the time to provide feedback! Your honest and constructive input is essential for your lecturers and degree program director to continuously improve and adapt the course.</p>
+					<p>What happens with your feedback? The degree program director will discuss the results and potential measures together with your academic year representatives. You have thus actively contributed to making the course even more engaging and educational for future semesters!</p>
+					<p>Working together for higher quality in teaching!</p>
 				',
 				'description' => '',
 				'insertvon' => 'system'

From 0d2e41cf2f841ea051639620a2abd4b140c3e5e7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 14 Oct 2025 16:45:28 +0200
Subject: [PATCH 0879/1357] added paabgabetyp columns "aktiv",
 "upload_allowed", "aktiv"; setting sensible default values for existing typen
 that are just the developers best guess really; accordion header with icons &
 tooltips; logLib in Abgabe API controller logging all successful
 delete/insert/update requests; show arbitrary '23:59' string after target
 date so it is clear until when the upload should be fulfilled, even though we
 still dont do anything technically different; new Termine can only be made
 with aktiv paabgabe typen; note & benotungsnotiz now tied to paabgabetyp
 benotbar flag instead of hardcoded for qgate1 & 2; added "noch nicht
 abgegeben" text in case the abgabedatum is null; modal now spawns in xl with
 fullscreen optionally enabled;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  60 +++++--
 public/css/components/abgabetool/abgabe.css   |  18 +--
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 117 ++++++++++----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  80 ++++++++--
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  10 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   2 +-
 .../61164_abgabetool_quality_gates.php        | 146 +++++++++++++++++-
 system/phrasesupdate.php                      | 120 ++++++++++++++
 8 files changed, 478 insertions(+), 75 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 9be560034..8586c99bc 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -43,6 +43,20 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->load->library('PhrasesLib');
 
+		// Loads LogLib with different debug trace levels to get data of the job that extends this class
+		// It also specify parameters to set database fields
+		$this->load->library('LogLib', array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API',
+			'requestId' => 'API',
+			'requestDataFormatter' => function ($data) {
+				return json_encode($data);
+			}
+		), 'logLib');
+		
 		$this->loadPhrases(
 			array(
 				'global',
@@ -150,7 +164,6 @@ class Abgabe extends FHCAPI_Controller
 			}
 		}
 		
-
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
 	}
 
@@ -161,7 +174,6 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function postStudentProjektarbeitZwischenabgabe()
 	{
-
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		$paabgabe_id = $_POST['paabgabe_id'];
 		$student_uid = $_POST['student_uid'];
@@ -189,6 +201,13 @@ class Abgabe extends FHCAPI_Controller
 				));
 
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+
+				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				), getAuthUID(), getAuthPersonId(), $student_uid));
+				
 				$this->terminateWithSuccess($res);
 			} else {
 				$this->terminateWithError('Error moving File');
@@ -197,7 +216,6 @@ class Abgabe extends FHCAPI_Controller
 		} else {
 			$this->terminateWithError('File missing');
 		}
-
 	}
 
 	/**
@@ -275,6 +293,13 @@ class Abgabe extends FHCAPI_Controller
 
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
+				$this->logLib->logInfoDB(array('endupload',$res, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				), getAuthUID(), getAuthPersonId(), array($projektarbeit_id,$sprache,$abstract,$abstract_en
+				,$schlagwoerter, $schlagwoerter_en, $seitenanzahl)));
+				
 				$this->terminateWithSuccess($res);
 			} else {
 				$this->terminateWithError('Error moving File');
@@ -531,6 +556,8 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
+
+			$this->logLib->logInfoDB(array('paabgabe created',$result, getAuthUID(), getAuthPersonId()));
 		} else {
 			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
 			// only notiz has changed.
@@ -554,6 +581,17 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				)
 			);
+
+			$this->logLib->logInfoDB(array('paabgabe updated',$result, array(
+				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+				'datum' => $datum,
+				'kurzbz' => $kurzbz,
+				'note' => $note,
+				'beurteilungsnotiz' => $beurteilungsnotiz,
+				'upload_allowed' => $upload_allowed,
+				'updatevon' => getAuthUID(),
+				'updateamum' => date('Y-m-d H:i:s')
+			), getAuthUID(), getAuthPersonId()));
 		}
 		
 		// check if $paaabgabe is a qual gate and its note is deemed negative
@@ -583,12 +621,10 @@ class Abgabe extends FHCAPI_Controller
 					} else { // benotung legitimately changed -> email
 						$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
 					}
-					
 				} else { // nothing existing previously -> send that mail
 					$this->sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe);
 				}
 				
-				
 			}
 		}
 		
@@ -603,15 +639,17 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
-		$result = $this->PaabgabeModel->load($paabgabe_id);
-		$result = $this->getDataOrTerminateWithError($result);
+		$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
+		$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult);
 
-		if(count($result) == 0)
+		if(count($paabgabeArr) == 0)
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		
-		if($result[0]->insertvon === getAuthUID()) {
+		if($paabgabeArr[0]->insertvon === getAuthUID()) {
 			$result = $this->PaabgabeModel->delete($paabgabe_id);
 			$result = $this->getDataOrTerminateWithError($result);
+
+			$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
 			$this->terminateWithSuccess($result);
 		}
 
@@ -705,6 +743,8 @@ class Abgabe extends FHCAPI_Controller
 			);
 		}
 
+		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
+
 		$this->terminateWithSuccess($res);
 
 	}
@@ -725,7 +765,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$result = $this->PaabgabeModel->getDeadlines($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
-
+		
 		$this->terminateWithSuccess($data);
 	}
 
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index 2c35da965..e8b0cb9da 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -3,7 +3,7 @@
 	background-color: var(--fhc-red-70);
 	font-weight: 600;
 	border-radius: 6px;
-	padding: 0px 0px 0px 32px;
+	padding: 0px 0px 0px 34px;
 	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
 	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
 }
@@ -31,7 +31,7 @@
 	background-color: var(--fhc-yellow-70);
 	font-weight: 600;
 	border-radius: 6px;
-	padding: 0px 0px 0px 32px;
+	padding: 0px 0px 0px 34px;
 	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
 	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
 }
@@ -56,29 +56,29 @@
 
 /* Base Header */
 .verspaetet-header {
-	background-color: var(--fhc-pink-70);
+	background-color: var(--fhc-pink-40);
 	font-weight: 600;
 	border-radius: 6px;
-	padding: 0px 0px 0px 32px;
+	padding: 0px 0px 0px 34px;
 	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
 	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
 }
 
 /* Hover State */
 .verspaetet-header:hover {
-	background-color: var(--fhc-pink-60);
+	background-color: var(--fhc-pink-20);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
 /* Active / Expanded State */
 .p-accordion-tab-active > .verspaetet-header {
-	background-color: var(--fhc-pink-50);
+	background-color: var(--fhc-pink-30);
 	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
 }
 
 /* Hover State Active*/
 .p-accordion-tab-active > .verspaetet-header:hover {
-	background-color: var(--fhc-pink-60);
+	background-color: var(--fhc-pink-20);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
@@ -87,7 +87,7 @@
 	background-color: var(--fhc-green-70);
 	font-weight: 600;
 	border-radius: 6px;
-	padding: 0px 0px 0px 32px;
+	padding: 0px 0px 0px 34px;
 	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
 	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
 }
@@ -115,7 +115,7 @@
 	background-color: var(--fhc-white-70);
 	font-weight: 600;
 	border-radius: 6px;
-	padding: 0px 0px 0px 32px;
+	padding: 0px 0px 0px 34px;
 	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
 	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
 }
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index d6b0040fd..fc804ea3a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -16,7 +16,13 @@ export const AbgabeMitarbeiterDetail = {
 		AccordionTab: primevue.accordiontab,
 		VueDatePicker
 	},
-	inject: ['abgabeTypeOptions', 'allowedNotenOptions', 'turnitin_link', 'old_abgabe_beurteilung_link', 'isMobile'],
+	inject: [
+		'abgabeTypeOptions',
+		'allowedNotenOptions',
+		'turnitin_link',
+		'old_abgabe_beurteilung_link',
+		'isMobile'
+	],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -164,23 +170,23 @@ export const AbgabeMitarbeiterDetail = {
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyle(termin, mode) {
+		getDateStyleClass(termin, mode) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
-					return 'verpasst-header'
+					return 'verpasst'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					return 'abzugeben-header'
+					return 'abzugeben'
 				} else {
-					return 'standard-header'
+					return 'standard'
 				} 
 			} else if(abgabedatum > datum) {
-				return 'verspaetet-header'
+				return 'verspaetet'
 			} else {
-				return 'abgegeben-header'
+				return 'abgegeben'
 			}
 		},
 		openBeurteilungLink(link) {
@@ -209,7 +215,7 @@ export const AbgabeMitarbeiterDetail = {
 			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
 			window.open(link, '_blank')
 		},
-		formatDate(dateParam) {
+		formatDate(dateParam, showTime = true) {
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -217,19 +223,21 @@ export const AbgabeMitarbeiterDetail = {
 			const month = padZero(date.getMonth() + 1); // Months are zero-based
 			const day = padZero(date.getDate());
 			const year = date.getFullYear();
-
-			return `${day}.${month}.${year}`;
+			
+			// abgabedatum should SHOW abgabezeit which should always be last minute of the day
+			return `${day}.${month}.${year}` + (showTime ? ' 23:59' : ''); 
 		},
 		getAccTabHeaderForTermin(termin) {
 			let tabTitle = ''
 			
-			const datumFormatted = this.formatDate(termin.datum)
+			const datumFormatted = this.formatDate(termin.datum, false)
 			tabTitle += termin.bezeichnung?.bezeichnung + ' ' + datumFormatted
 
 			return tabTitle
 		},
 		openCreateNewAbgabeModal() {
 			if(!this.newTermin) {
+				const typ = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen')
 				this.newTermin = {
 					'paabgabe_id': -1,
 					'projektarbeit_id': this.projektarbeit.projektarbeit_id,
@@ -238,9 +246,9 @@ export const AbgabeMitarbeiterDetail = {
 					'datum': new Date().toISOString().split('T')[0],
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 					'beurteilungsnotiz': '',
-					'upload_allowed': false,
+					'upload_allowed': typ.upload_allowed_default,
 					'paabgabetyp_kurzbz': '',
-					'bezeichnung': this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen'),
+					'bezeichnung': typ,
 					'abgabedatum': null,
 					'insertvon': this.viewData?.uid ?? ''
 				}
@@ -290,6 +298,9 @@ export const AbgabeMitarbeiterDetail = {
 			
 	},
 	computed: {
+		activeAbgabeTypeOptions() {
+			return this.abgabeTypeOptions?.filter(opt => opt.aktiv === true)
+		},
 		getEid() {
 			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
 		},
@@ -317,6 +328,36 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		getSpeedDialStyle() {
 			return 'position: static !important;'
+		},
+		getTooltipVerspaetet() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipVerspaetet'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipVerpasst() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipVerpasst'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipAbzugeben() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipAbzugeben'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipStandard() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipStandard'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipAbgegeben() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipAbgegeben'),
+				class: "custom-tooltip"
+			}
 		}
 	},
 	watch: {
@@ -326,6 +367,8 @@ export const AbgabeMitarbeiterDetail = {
 			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
 				this.newTermin.kurzbz = newVal.bezeichnung
 			}
+			
+			this.newTermin.upload_allowed = newVal.upload_allowed_default
 		}	
 	},
 	created() {
@@ -339,7 +382,7 @@ export const AbgabeMitarbeiterDetail = {
 			id="innerModalNewAbgabe" 
 			ref="modalContainerCreateNewAbgabe" 
 			class="bootstrap-prompt" 
-			dialogClass="bordered-modal modal-xl" 
+			dialogClass="bordered-modal modal-lg" 
 			:backdrop="true"
 			@hideBsModal="console.log('hideBsModal'); showAutomagicModalPhrase=false;"
 		>
@@ -383,13 +426,13 @@ export const AbgabeMitarbeiterDetail = {
 							<Dropdown
 								:style="{'width': '100%'}"
 								v-model="newTermin.bezeichnung"
-								:options="abgabeTypeOptions"
+								:options="activeAbgabeTypeOptions"
 								:optionLabel="getOptionLabelAbgabetyp"
 								scrollHeight="300px">
 							</Dropdown>
 						</div>
 					</div>
-					<div class="row mt-2" v-if="newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || newTermin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
 						<div class="col-8 col-md-9">
 							<Checkbox
@@ -403,7 +446,7 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 60"></Textarea>
 						</div>
 					</div>	
 				</div>
@@ -439,8 +482,21 @@ export const AbgabeMitarbeiterDetail = {
 			
 			<Accordion :multiple="true" :activeIndex="[0]">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
-							
+					<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
+						<template #header>
+							<div class="d-flex row w-100">
+								<div class="col-auto" style="transform: translateX(-62px)">
+									<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+								</div>
+								<div class="col-6 text-start">
+									<span>{{getAccTabHeaderForTermin(termin)}}</span>
+								</div>
+							</div>				
+						</template>
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
 							<div class="col-8 col-md-9">
@@ -476,7 +532,7 @@ export const AbgabeMitarbeiterDetail = {
 									:disabled="!termin.allowedToSave"
 									v-model="termin.bezeichnung"
 									@change="handleChangeAbgabetyp(termin)"
-									:options="abgabeTypeOptions"
+									:options="activeAbgabeTypeOptions"
 									:optionLabel="getOptionLabelAbgabetyp">
 								</Dropdown>
 							</div>
@@ -492,7 +548,7 @@ export const AbgabeMitarbeiterDetail = {
 								</Checkbox>
 							</div>
 						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
 							<div class="col-8 col-md-9">
 								<Dropdown
@@ -503,7 +559,7 @@ export const AbgabeMitarbeiterDetail = {
 								</Dropdown>
 							</div>
 						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGatev2')}}</div>
 							<div class="col-8 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
@@ -519,10 +575,15 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 							<div class="col-8 col-md-9">
-								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-									<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
-								</button>
+								<template v-if="termin?.abgabedatum">
+									{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+									<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+										<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+									</button>							
+								</template>
+								<template v-else>
+									{{ $p.t('abgabetool/c4nochNichtsAbgegeben') }}
+								</template>
 							</div>
 						</div>
 						<div class="row mt-2">
@@ -531,13 +592,13 @@ export const AbgabeMitarbeiterDetail = {
 							</div>
 							<div class="col-8 col-md-9">
 								<div class="row">
-									<div class="col-4">
+									<div class="col-auto">
 										<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
 											{{ $p.t('abgabetool/c4save') }}
 											<i class="fa-solid fa-floppy-disk"></i>
 										</button>
 									</div>
-									<div class="col-4">
+									<div class="col-auto">
 										<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-danger border-0" @click="handleDeleteTermin(termin)">
 											{{ $p.t('abgabetool/c4delete') }}
 											<i class="fa-solid fa-trash"></i>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 7898ce5b3..f79df80b5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -146,7 +146,7 @@ export const AbgabeStudentDetail = {
 		downloadAbgabe(termin) {
 			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
-		formatDate(dateParam) {
+		formatDate(dateParam, showTime = true) {
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -155,7 +155,7 @@ export const AbgabeStudentDetail = {
 			const day = padZero(date.getDate());
 			const year = date.getFullYear();
 
-			return `${day}.${month}.${year}`;
+			return `${day}.${month}.${year}` + (showTime ? ' 23:59' : '');
 		},
 		async upload(termin) {
 
@@ -211,23 +211,23 @@ export const AbgabeStudentDetail = {
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyle(termin, mode) {
+		getDateStyleClass(termin, mode) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
-					return 'verpasst-header'
+					return 'verpasst'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					return 'abzugeben-header'
+					return 'abzugeben'
 				} else {
-					return 'standard-header'
+					return 'standard'
 				}
 			} else if(abgabedatum > datum) {
-				return 'verspaetet-header'
+				return 'verspaetet'
 			} else {
-				return 'abgegeben-header'
+				return 'abgegeben'
 			}
 		},
 		openBeurteilungLink(link) {
@@ -243,7 +243,7 @@ export const AbgabeStudentDetail = {
 		getAccTabHeaderForTermin(termin) {
 			let tabTitle = ''
 
-			const datumFormatted = this.formatDate(termin.datum)
+			const datumFormatted = this.formatDate(termin.datum, false)
 			tabTitle += termin.bezeichnung + ' ' + datumFormatted
 			
 			return tabTitle
@@ -277,6 +277,36 @@ export const AbgabeStudentDetail = {
 				}
 			})
 			return qgatefound
+		},
+		getTooltipVerspaetet() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipVerspaetet'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipVerpasst() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipVerpasst'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipAbzugeben() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipAbzugeben'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipStandard() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipStandard'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipAbgegeben() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipAbgegeben'),
+				class: "custom-tooltip"
+			}
 		}
 	},
 	created() {
@@ -301,7 +331,21 @@ export const AbgabeStudentDetail = {
 			
 			<Accordion :multiple="true" :activeIndex="[0]">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :header="getAccTabHeaderForTermin(termin)" :headerClass="getDateStyle(termin)">
+					<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
+						<template #header>
+							<div class="d-flex row w-100">
+								<div class="col-auto" style="transform: translateX(-62px)">
+									<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
+									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+								</div>
+								<div class="col-6 text-start">
+									<span>{{getAccTabHeaderForTermin(termin)}}</span>
+								</div>
+							</div>				
+						</template>
 						<div class="row">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
 							<div class="col-8 col-md-9">
@@ -312,8 +356,6 @@ export const AbgabeStudentDetail = {
 									:pt="{ root: { class: 'ml-auto' }}"
 								>
 								</Checkbox>
-<!--								<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>-->
-<!--								<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>-->
 							</div>
 						</div>
 						
@@ -329,7 +371,6 @@ export const AbgabeStudentDetail = {
 									:text-input="true"
 									auto-apply>
 								</VueDatePicker>
-<!--								<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>-->
 							</div>
 						</div>
 						
@@ -366,10 +407,15 @@ export const AbgabeStudentDetail = {
 						<div class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 							<div class="col-8 col-md-9">
-								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-									<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
-								</button>
+								<template v-if="termin?.abgabedatum">
+									{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+									<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+										<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+									</button>							
+								</template>
+								<template v-else>
+									{{ $p.t('abgabetool/c4nochNichtsAbgegeben') }}
+								</template>
 							</div>
 						</div>
 						
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2c2b8fad8..d219c73e1 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -229,10 +229,8 @@ export const AbgabetoolMitarbeiter = {
 					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
 					
-					termin.bezeichnung = {
-						bezeichnung: termin.bezeichnung,
-						paabgabetyp_kurzbz: termin.paabgabetyp_kurzbz
-					}
+					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
+
 				})
 				pa.student_uid = details.student_uid
 				pa.student = `${pa.vorname} ${pa.nachname}`
@@ -355,7 +353,7 @@ export const AbgabetoolMitarbeiter = {
 
 	},
 	computed: {
-
+		
 	},
 	created() {
 		// fetch config to avoid hard coded links
@@ -448,7 +446,7 @@ export const AbgabetoolMitarbeiter = {
 		</bs-modal>	
 		
 		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
-			dialogClass="modal-fullscreen">
+			dialogClass="modal-xl" :allowFullscreenExpand="true">
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4abgabeMitarbeiterDetailTitle')}}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 81af1a422..fd245875e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -233,7 +233,7 @@ export const AbgabetoolStudent = {
 	template: `
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
-		dialogClass="modal-fullscreen">
+		dialogClass="modal-xl" :allowFullscreenExpand="true">
 		<template v-slot:title>
 			<div>
 				{{$p.t('abgabetool/c4abgabeStudentDetailTitle')}}
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 38506a742..83dd91c2d 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -1,12 +1,59 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
-// add campus.tbl_paabgabetyp options for Quality Gates
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabetyp' AND column_name = 'aktiv'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+
+		$qry = "ALTER TABLE campus.tbl_paabgabetyp
+				ADD COLUMN IF NOT EXISTS aktiv BOOLEAN DEFAULT true;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp column aktiv default true hinzugefuegt';
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabetyp' AND column_name = 'upload_allowed_default'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+
+		$qry = "ALTER TABLE campus.tbl_paabgabetyp
+				ADD COLUMN IF NOT EXISTS upload_allowed_default BOOLEAN DEFAULT true;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp column upload_allowed_default default true hinzugefuegt';
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'campus' AND table_name = 'tbl_paabgabetyp' AND column_name = 'benotbar'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+
+		$qry = "ALTER TABLE campus.tbl_paabgabetyp
+				ADD COLUMN IF NOT EXISTS benotbar BOOLEAN DEFAULT true;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp column benotbar default true hinzugefuegt';
+	}
+}
+
+// TODO DEFINE ACTUAL VALUES BENOTBAR / UPLOAD_ALLOWED_DEFAULT / AKTIV FOR EACH PAABGABETYPE - DEVLOPER DEFAULTS BELOW
 if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate1'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
-		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung) VALUES('qualgate1', 'Quality Gate 1');";
+		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung, benotbar, upload_allowed_default, aktiv)
+					VALUES('qualgate1', 'Quality Gate 1', true, true, true);";
 
 		if(!$db->db_query($qry))
 			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
@@ -15,11 +62,102 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 	}
 }
 
+// set new cols for zwischenabgabe
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='zwischen'"))
+{
+	if($db->db_num_rows($result) === 1)
+	{
+		$qry = "UPDATE campus.tbl_paabgabetyp 
+				SET benotbar = false,
+				    upload_allowed_default = true,
+				    aktiv = true
+				WHERE paabgabetyp_kurzbz='zwischen';";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp zwischen updated benotbar = false, upload_allowed_default = true, aktiv = true';
+	}
+}
+
+// set new cols for note
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='note'"))
+{
+	if($db->db_num_rows($result) === 1)
+	{
+		$qry = "UPDATE campus.tbl_paabgabetyp 
+				SET benotbar = false,
+				    upload_allowed_default = false,
+				    aktiv = false
+				WHERE paabgabetyp_kurzbz='note';";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp note updated benotbar = false, upload_allowed_default = false, aktiv = false';
+	}
+}
+
+// set new cols for abstract / entwurf
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='abstract'"))
+{
+	if($db->db_num_rows($result) === 1)
+	{
+		$qry = "UPDATE campus.tbl_paabgabetyp 
+				SET benotbar = false,
+				    upload_allowed_default = true,
+				    aktiv = true
+				WHERE paabgabetyp_kurzbz='abstract';";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp abstract updated benotbar = false, upload_allowed_default = true, aktiv = true';
+	}
+}
+
+// set new cols for endabgabe / end
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='end'"))
+{
+	if($db->db_num_rows($result) === 1)
+	{
+		$qry = "UPDATE campus.tbl_paabgabetyp 
+				SET benotbar = false,
+				    upload_allowed_default = true,
+				    aktiv = true
+				WHERE paabgabetyp_kurzbz='end';";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp end updated benotbar = false, upload_allowed_default = true, aktiv = true';
+	}
+}
+
+// set new cols for endabgabe im sekretariat / enda
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='enda'"))
+{
+	if($db->db_num_rows($result) === 1)
+	{
+		$qry = "UPDATE campus.tbl_paabgabetyp 
+				SET benotbar = false,
+				    upload_allowed_default = false,
+				    aktiv = false
+				WHERE paabgabetyp_kurzbz='enda';";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>paabgabetyp enda updated benotbar = false, upload_allowed_default = false, aktiv = false';
+	}
+}
+
 if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
-		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung) VALUES('qualgate2', 'Quality Gate 2');";
+		$qry = "INSERT INTO campus.tbl_paabgabetyp (paabgabetyp_kurzbz, bezeichnung, benotbar, upload_allowed_default, aktiv)
+					VALUES('qualgate2', 'Quality Gate 2', true, true, true);";
 
 		if(!$db->db_query($qry))
 			echo '<strong>campus.tbl_paabgabetyp: '.$db->db_last_error().'</strong><br>';
@@ -34,7 +172,7 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table
 	{
 
 		$qry = "ALTER TABLE campus.tbl_paabgabe
-				ADD COLUMN note SMALLINT DEFAULT NULL,
+				ADD COLUMN IF NOT EXISTS note SMALLINT DEFAULT NULL,
 				ADD CONSTRAINT tbl_paabgabe_note_fkey
 					FOREIGN KEY (note)
 					REFERENCES lehre.tbl_note(note)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dd7788265..21ea22a20 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42816,6 +42816,106 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipVerspaetet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Verspätet abgegeben",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submitted late',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipVerpasst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Termin überschritten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline exceeded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipAbzugeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Termin innerhalb von 12 Tagen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline within 12 days',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipStandard',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Termin mehr als 12 Tag entfernt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline more than 12 days away',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipAbgegeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Rechtzeitig abgegeben",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delivered on time',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42856,6 +42956,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4nochNichtsAbgegeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Abgabe vorhanden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No submission yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 7755dc12d0593b90b57f78bca8ddea706c07d315 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 15 Oct 2025 13:55:54 +0200
Subject: [PATCH 0880/1357] View Studierendenverwaltung

- add badge unruly
- add tileSlots for PersKz, MatrikelNr, person_id
- remove MatrikelNr and person_id from left side
- add attribut unruly to student object
---
 .../api/frontend/v1/stv/Students.php          |  1 +
 public/css/components/Detailheader.css        |  5 ++
 .../components/DetailHeader/DetailHeader.js   | 53 +++++++++++++------
 .../js/components/Stv/Studentenverwaltung.js  |  2 -
 .../Stv/Studentenverwaltung/Details.js        |  6 +++
 .../Stv/Studentenverwaltung/List.js           |  1 +
 6 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9de0c29b1..20d2be90d 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -805,6 +805,7 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
+		$this->PrestudentModel->addSelect('unruly');
 
 		/*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
 		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css
index dde2756f1..a81ec0283 100644
--- a/public/css/components/Detailheader.css
+++ b/public/css/components/Detailheader.css
@@ -1,3 +1,8 @@
 .foto-container:hover .fotoedit {
     opacity: 1 !important;
+}
+
+.bg-unruly {
+    background-color: #ad1010 !important;
+    color: white;
 }
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 5fe657c49..3e09f376a 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -228,18 +228,19 @@ export default {
 				</div>
 
 					<div v-if="headerData.length == 1">
-						<h2 class="h4">
-							{{headerData[0].titelpre}}
-							{{headerData[0].vorname}}
-							{{headerData[0].nachname}}
-							<span v-if="headerData[0].titelpost">, </span>
-							{{headerData[0].titelpost}}
-						</h2>
+						<div class="d-flex align-items-center gap-3">
+							<h2 class="h4">
+								{{headerData[0].titelpre}}
+								{{headerData[0].vorname}}
+								{{headerData[0].nachname}}
+								<span v-if="headerData[0].titelpost">, </span>
+								{{headerData[0].titelpost}}
+							</h2>
+							<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
+						</div>
 
 					<h5 class="h6">
-					 <strong class="text-muted">Person ID </strong>
-						{{headerData[0].person_id}}
-						<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+						<strong class="text-muted">{{$p.t('lehre', 'studiengang')}} </strong>
 						 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
 						<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
 						  {{headerData[0].semester}}
@@ -256,11 +257,33 @@ export default {
 						</span>
 						<strong v-if="headerData[0].statusofsemester" class="text-muted"> | Status </strong>
 						 {{headerData[0].statusofsemester}}
-						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
-						  {{headerData[0].matr_nr}}
 					  </h5>
 
 				</div>
+				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
+					<div class="d-flex py-1">
+						<div class="px-2" style="min-width: 100px;">
+							<slot name="issues"></slot>
+						</div>
+						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1"><slot name="titleGammaTile" :titleGammaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueGammaTile" :valueGammaTile="valueGammaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1"><slot name="titleBetaTile" :titleBetaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1"><slot name="titleAlphaTile" :titleAlphaTile="title"></slot></h4>
+							<h6 class="text-muted"><slot name="valueAlphaTile" :valueAlphaTile="valueAlphaTile"></slot></h6>
+						</div>
+						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
+							<h4 class="mb-1">UID</h4>
+							<h6 class="text-muted"><slot name="uid"></slot></h6>
+						</div>
+					</div>
+				</div>
+
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">
@@ -326,15 +349,15 @@ export default {
 						<div class="px-2" style="min-width: 100px;">
 							<slot name="issues"></slot>
 						</div>
-						<div v-if="hasTileGammaSlot" class="px-2">
+						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1"><slot name="titleGammaTile" :titleGammaTile="title"></slot></h4>
 							<h6 class="text-muted"><slot name="valueGammaTile" :valueGammaTile="valueGammaTile"></slot></h6>
 						</div>
-						<div v-if="hasTileBetaSlot" class="px-2">
+						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1"><slot name="titleBetaTile" :titleBetaTile="title"></slot></h4>
 							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
 						</div>
-						<div v-if="hasTileAlphaSlot" class="px-2">
+						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1"><slot name="titleAlphaTile" :titleAlphaTile="title"></slot></h4>
 							<h6 class="text-muted"><slot name="valueAlphaTile" :valueAlphaTile="valueAlphaTile"></slot></h6>
 						</div>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 1cfcbb1d7..3b759914a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -341,8 +341,6 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
-		//Test manu Systemerror
-		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		this.handlePersonUrl();
 	},
 	template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index dadb5ea6f..3c19c7cae 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -72,6 +72,12 @@ export default {
 				typeHeader="student"
 				@reload="reloadList"
 			>
+				<template #titleAlphaTile>P_ID</template>
+				<template #valueAlphaTile>{{students[0].person_id}}</template>
+				<template #titleBetaTile>MatrNr</template>
+				<template #valueBetaTile>{{students[0].matr_nr}}</template>
+				<template #titleGammaTile>PersKz</template>
+				<template #valueGammaTile>{{students[0].matrikelnr}}</template>
 			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..97d063cc2 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -107,6 +107,7 @@ export default {
 							"tristate":true, elementAttributes:{"value":"true"}
 						}, headerFilterEmptyCheck:function(value){return value === null}
 					},
+					{title:"Unruly", field:"unruly", visible:false},
 				],
 				rowFormatter(row) {
 					if (row.getData().bnaktiv === false) {

From 11205e9ec1c00f57c97054b049a1fb690c59cd52 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Oct 2025 08:38:17 +0200
Subject: [PATCH 0881/1357] Bugfix: multiple types in
 CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN config were concatenated wrong in CIS 4.0

---
 application/controllers/Cis/Documents.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php
index c5a6684d3..0b8d08a56 100644
--- a/application/controllers/Cis/Documents.php
+++ b/application/controllers/Cis/Documents.php
@@ -72,7 +72,7 @@ class Documents extends Auth_Controller
 
 		$stgs = [];
 		$stsemArray = [];
-		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
+		$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;

From e7788fc18fe01372a09b62984e486c30e55cb4c2 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 16 Oct 2025 08:38:59 +0200
Subject: [PATCH 0882/1357] Bugfix: format betrag in StV Konto correctly

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

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index a33680ea0..384452f3e 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -352,7 +352,7 @@ class Konto extends FHCAPI_Controller
 				continue;
 			}
 
-
+			
 			$result = $this->KontoModel->insert([
 				'person_id' => $buchung['person_id'],
 				'studiengang_kz' => $buchung['studiengang_kz'],
@@ -361,7 +361,7 @@ class Konto extends FHCAPI_Controller
 				'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
 				'credit_points' => $buchung['credit_points'],
 				'zahlungsreferenz' => $buchung['zahlungsreferenz'],
-				'betrag' => $betrag,
+				'betrag' => number_format($betrag, 2, '.', ''),
 				'buchungsdatum' => $buchungsdatum,
 				'mahnspanne' => '0',
 				'buchungsnr_verweis' => $buchung['buchungsnr'],

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

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

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

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

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

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

From 4495632393d4811760f3083665653edd96102025 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 17 Oct 2025 14:45:03 +0200
Subject: [PATCH 0885/1357] join only prestudent for studiengang_kz of student

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

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 604ae33c9..f97546288 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -637,7 +637,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				//? Send email to the Studiengangsassistentinnen
 				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
 				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
 				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);

From 6e9969d9e43c828f907e3f54a6c8c76d5717c60e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 20 Oct 2025 16:08:12 +0200
Subject: [PATCH 0886/1357] use shorter table names for columns stg and orgform
 , add column ausbildungssemester

---
 .../models/person/Profil_update_model.php     |  3 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 13 ++++--
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/application/models/person/Profil_update_model.php b/application/models/person/Profil_update_model.php
index 31005c4b7..039810537 100644
--- a/application/models/person/Profil_update_model.php
+++ b/application/models/person/Profil_update_model.php
@@ -135,7 +135,8 @@ class Profil_update_model extends DB_Model
 				attachment_id,
 				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
 				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
-				NULL as oezuordnung
+				NULL as oezuordnung,
+				tbl_student.semester
 			FROM public.tbl_profil_update
 			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 745f53002..24a5d8bc3 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -46,7 +46,6 @@ export default {
       loading: false,
       filter: "Pending",
       profil_update_id: Number(this.id),
-
   };
   },
 	computed: {
@@ -205,7 +204,7 @@ export default {
             //responsive:0,
           },
           {
-            title: this.$p.t("lehre", "studiengang") + ' (' + this.$p.t("profil", "studentIn") + ')',
+            title: this.$p.t("profil", "stg_short") + ' (' + this.$p.t("profil", "studentIn") + ')',
             field: "studiengang",
             minWidth: 50,
             resizable: true,
@@ -214,7 +213,7 @@ export default {
             //responsive:0,
           },
           {
-            title: this.$p.t("lehre", "organisationsform") + ' (' + this.$p.t("profil", "studentIn") + ')',
+            title: this.$p.t("profil", "orgform_short") + ' (' + this.$p.t("profil", "studentIn") + ')',
             field: "orgform",
             minWidth: 50,
             resizable: true,
@@ -278,6 +277,12 @@ export default {
             minWidth: 200,
             //responsive:0,
           },
+		  {
+		   title: this.$p.t("lehre", "ausbildungssemester"),
+		   field: "semester",
+		   headerFilter: "list",
+		   headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}
+		  },
           {
             title: this.$p.t("profilUpdate", "actions"),
             headerSort: false,
@@ -415,7 +420,7 @@ export default {
   },
   template: /*html*/ `
     <div>
-   
+
     <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
     <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d3833dc9..aace77876 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28596,6 +28596,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'stg_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'StG',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'degree Progr',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'orgform_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'OrgForm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'org Form',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//Profil Phrasen ende
 	// LvPlan Phrasen start
 	array(

From 87ec4fd482f4a568dbe4b8f7db8a43ac6fcd47ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 20 Oct 2025 17:32:43 +0200
Subject: [PATCH 0887/1357] =?UTF-8?q?Problem=20beim=20Drucken=20von=20Zeug?=
 =?UTF-8?q?nissen=20behoben=20wo=20die=20LV=20der=20Studienverpflichtung?=
 =?UTF-8?q?=20Sonderzeichen=20enth=C3=A4lt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rdf/lehrveranstaltungszeugnis_ktu.rdf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
index 9696978b3..8c614c21e 100644
--- a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
+++ b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
@@ -335,14 +335,14 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$anrechnung = new anrechnung();
 		$anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id);
 
-		$xml .= "<studienverpflichtung>";
+		$xml .= "<studienverpflichtung><![CDATA[";
 		$lehrveranstaltung_id_kompatibel = "";
 		if(count($anrechnung->result) === 1)
 		{
 		    $lehrveranstaltung_id_kompatibel = $anrechnung->result[0]->lehrveranstaltung_id;
 		    $xml .= $anrechnung->result[0]->lehrveranstaltung_bez;
 		}
-		$xml .= "</studienverpflichtung>";
+		$xml .= "]]></studienverpflichtung>";
 
                 if($lehrveranstaltung_id_kompatibel != "")
                 {

From 1423579a49ad245aa9fed4bac817f500027b6741 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 21 Oct 2025 14:42:02 +0200
Subject: [PATCH 0888/1357] refactor Profile Update for filter, backendfilter
 not active

---
 .../components/filters/ProfileUpdate.php      | 51 ++++++++++
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 96 +++++++++++++++++--
 system/filtersupdate.php                      | 57 +++++++++++
 3 files changed, 196 insertions(+), 8 deletions(-)
 create mode 100644 application/components/filters/ProfileUpdate.php

diff --git a/application/components/filters/ProfileUpdate.php b/application/components/filters/ProfileUpdate.php
new file mode 100644
index 000000000..1a53e5145
--- /dev/null
+++ b/application/components/filters/ProfileUpdate.php
@@ -0,0 +1,51 @@
+<?php
+$filterCmptArray = array(
+	"app" => 'core',
+	'datasetName' => 'profileupdate',
+	'query' =>  '
+			SELECT
+				profil_update_id,
+				tbl_profil_update.uid,
+				(tbl_person.vorname || \' \' || tbl_person.nachname) AS name ,
+				topic,
+				requested_change,
+				tbl_profil_update.updateamum,
+				tbl_profil_update.updatevon,
+				tbl_profil_update.insertamum,
+				tbl_profil_update.insertvon,
+				status,
+				public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated,
+				status_timestamp,
+				status_message,
+				attachment_id,
+				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
+				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
+				NULL as oezuordnung,
+				tbl_student.semester
+			FROM public.tbl_profil_update
+			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
+			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
+			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
+			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
+			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
+			LEFT JOIN (
+				select
+					pss.prestudent_id, COALESCE(sp.orgform_kurzbz, pss.orgform_kurzbz) as orgform_kurzbz
+				from (
+					select
+						prestudent_id, max(insertamum) as insertamum
+					from
+						public.tbl_prestudentstatus
+					where
+						datum <= NOW()
+					group by
+						prestudent_id
+				) mpss
+				join
+					public.tbl_prestudentstatus pss on pss.prestudent_id  = mpss.prestudent_id and pss.insertamum = mpss.insertamum
+				left join
+					lehre.tbl_studienplan sp on pss.studienplan_id = sp.studienplan_id
+			) of ON of.prestudent_id = public.tbl_student.prestudent_id
+		',
+	'requiredPermissions' => 'student/stammdaten'
+);
\ No newline at end of file
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 24a5d8bc3..bec825495 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -417,25 +417,105 @@ export default {
     if (sessionStorage.getItem("filter")) {
       this.filter = sessionStorage.getItem("filter");
     }
-  },
-  template: /*html*/ `
-    <div>
 
-    <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
-    <div  class="form-underline flex-fill ">
+	/*
+	    <div  class="form-underline flex-fill ">
       <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
-      
+
       <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
         <option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
         <option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
         <option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
         <option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
       </select>
-  
+
     </div>
+
+
+	:title="$p.t('profilUpdate','profilUpdateRequests')"
+
+	    <h3>{{$p.t('profilUpdate', 'profilUpdateRequests')}}</h3>
+
+
+    			<div class="col-auto row row-cols-lg-auto d-flex justify-content-end">
+					<div class="col-12">
+					  <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
+						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
+						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
+						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
+					  </select>
+					  </div>
+				</div>
+
+
+				//Version mit filter rechts in eigener zeile
+				    		<template #filter>
+    			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
+					<div class="col-12">
+					  <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
+						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
+						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
+						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
+					  </select>
+					  </div>
+				</div>
+			</template>
+
+
+			<div class="justify-content-end pb-3">
+
+			</div>
+
+			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
+
+	//backendfilter not working: no parameters provided
+	    <core-filter-cmpt
+    	v-if="profilUpdateStates && categoryLoaded"
+    	ref="UpdatesTable"
+    	:tabulatorEvents="profilUpdateEvents"
+    	:tabulator-options="profilUpdateOptions"
+    	filter-type="Profileupdate"
+    	:sideMenu="false">
+    </core-filter-cmpt>
+
+	*/
+
+
+
+
+  },
+  template: /*html*/ `
+    <div>
+
+    <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
+
+     <h3>{{$p.t('profilUpdate', 'profilUpdateRequests')}}</h3>
+     
     <loading ref="loadingModalRef" :timeout="0"></loading>
     
-    <core-filter-cmpt v-if="profilUpdateStates && categoryLoaded" :title="$p.t('profilUpdate','profilUpdateRequests')"  ref="UpdatesTable" :tabulatorEvents="profilUpdateEvents" :tabulator-options="profilUpdateOptions" tableOnly :sideMenu="false" />
+    			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
+    			
+					<div class="col-12">
+					  <select class="mb-0 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
+						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
+						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
+						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
+					  </select>
+					</div>
+				</div>
+
+    
+    <core-filter-cmpt 
+    	v-if="profilUpdateStates && categoryLoaded" 
+    	ref="UpdatesTable" 
+    	:tabulatorEvents="profilUpdateEvents" 
+    	:tabulator-options="profilUpdateOptions" 
+    	table-only
+    	:sideMenu="false">
+    </core-filter-cmpt>
 
     </div>`,
 };
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 9e3c62a33..2942bcb4e 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1558,6 +1558,63 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'profileupdate',
+		'filter_kurzbz' => 'ProfilupdatePending',
+		'description' => '{Ausstehende Anfragen}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Ausstehende Anfragen",
+				"columns": [
+					{"name": "uid"},
+					{"name": "name"},					
+					{"name": "studiengang"},
+					{"name": "orgform"},					
+					{"name": "oezuordnung"},
+					{"name": "status_translated"},
+					{"name": "topic"},
+					{"name": "insertamum_iso"},
+					{"name": "semester"}
+				],
+				"filters": [
+					{
+						"name": "status_translated",
+						"option": "",
+						"operation": "equal",
+						"condition": "true"
+					}
+					]
+			}',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'core',
+		'dataset_name' => 'profileupdate',
+		'filter_kurzbz' => 'ProfilupdateAlle',
+		'description' => '{Alle Anfragen}',
+		'sort' => 1,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "Alle Anfragen",
+				"columns": [
+					{"name": "uid"},
+					{"name": "name"},					
+					{"name": "studiengang"},
+					{"name": "orgform"},					
+					{"name": "oezuordnung"},
+					{"name": "status_translated"},
+					{"name": "topic"},
+					{"name": "insertamum_iso"},
+					{"name": "semester"}
+				],
+				"filters": []
+			}',
+		'oe_kurzbz' => null,
+	),
 
 );
 

From 6337869098d71547f4fc85535ec6bf232b81d94e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Oct 2025 10:23:24 +0200
Subject: [PATCH 0889/1357] new Multitab CombinePeople, start Function

---
 application/config/stv.php                    |  1 +
 .../api/frontend/v1/stv/Config.php            |  4 ++
 .../Details/CombinePeople.js                  | 57 +++++++++++++++++++
 system/phrasesupdate.php                      | 22 ++++++-
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js

diff --git a/application/config/stv.php b/application/config/stv.php
index 42afc318c..d6d06f44e 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -111,5 +111,6 @@ $config['students_tab_order'] = [
 	'status',
 	'groups',
 	'finalexam',
+	'combinePeople',
 	'archive',
 ];
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d52016943..20e43d23a 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -228,6 +228,10 @@ class Config extends FHCAPI_Controller
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
+		$result['combinePeople'] = [
+			'title' => $this->p->t('stv', 'tab_combine_people'),
+			'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
+		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
new file mode 100644
index 000000000..4374687fe
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
@@ -0,0 +1,57 @@
+export default {
+	name: "TabCombinePeople",
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
+	},
+	props: {
+		modelValue: Object,
+	},
+	computed: {
+		personIds(){
+			if (this.modelValue.person_id) {
+				return [this.modelValue.person_id];
+			}
+			return this.modelValue.map(e => e.person_id);
+		}
+	},
+	methods: {
+		combinePeople(){
+
+			let person1_id = this.personIds[0];
+			let person2_id = this.personIds[1];
+
+			if(person1_id == person2_id) {
+				return this.$fhcAlert.alertError("gleiche Person, keine Zusammenlegeung möglich");
+			}
+
+			let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
+
+			console.log(linkCombinePeople);
+			window.open(linkCombinePeople, '_blank');
+
+
+		}
+	},
+	data(){
+		return {}
+	},
+	template:  /*html*/ `
+		<div class="stv-details-combine-people h-100 pb-3">
+			<h4>Personen zusammenlegen</h4>
+
+			{{personIds}}
+
+			<div v-if="this.modelValue.length">
+
+				<p v-if="this.modelValue.length == 2">
+					<button class="btn btn-primary" @click="combinePeople"> Zusammenlegen</button>
+				</p>
+				<p v-else">
+					ungültige Anzahl: {{this.modelValue.length}}
+				</p>
+			</div>
+		</div>
+	`
+	};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d3833dc9..d931f85c2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -49982,7 +49982,27 @@ I have been informed that I am under no obligation to consent to the transmissio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_combine_people',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Personen zusammenlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Combine People',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 9a8fbabbe46f0519cecae6d6798bd8f7ee12d234 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 22 Oct 2025 14:25:43 +0200
Subject: [PATCH 0890/1357] move dropdown profileUpdateStates to
 FilterComponent, delete not needed code

---
 .../components/filters/ProfileUpdate.php      |  51 ------
 .../Cis/ProfilUpdate/ProfilUpdateView.js      | 146 +++++-------------
 system/filtersupdate.php                      |  58 -------
 system/phrasesupdate.php                      |  39 +++++
 4 files changed, 74 insertions(+), 220 deletions(-)
 delete mode 100644 application/components/filters/ProfileUpdate.php

diff --git a/application/components/filters/ProfileUpdate.php b/application/components/filters/ProfileUpdate.php
deleted file mode 100644
index 1a53e5145..000000000
--- a/application/components/filters/ProfileUpdate.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$filterCmptArray = array(
-	"app" => 'core',
-	'datasetName' => 'profileupdate',
-	'query' =>  '
-			SELECT
-				profil_update_id,
-				tbl_profil_update.uid,
-				(tbl_person.vorname || \' \' || tbl_person.nachname) AS name ,
-				topic,
-				requested_change,
-				tbl_profil_update.updateamum,
-				tbl_profil_update.updatevon,
-				tbl_profil_update.insertamum,
-				tbl_profil_update.insertvon,
-				status,
-				public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated,
-				status_timestamp,
-				status_message,
-				attachment_id,
-				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
-				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
-				NULL as oezuordnung,
-				tbl_student.semester
-			FROM public.tbl_profil_update
-			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
-			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
-			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
-			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
-			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
-			LEFT JOIN (
-				select
-					pss.prestudent_id, COALESCE(sp.orgform_kurzbz, pss.orgform_kurzbz) as orgform_kurzbz
-				from (
-					select
-						prestudent_id, max(insertamum) as insertamum
-					from
-						public.tbl_prestudentstatus
-					where
-						datum <= NOW()
-					group by
-						prestudent_id
-				) mpss
-				join
-					public.tbl_prestudentstatus pss on pss.prestudent_id  = mpss.prestudent_id and pss.insertamum = mpss.insertamum
-				left join
-					lehre.tbl_studienplan sp on pss.studienplan_id = sp.studienplan_id
-			) of ON of.prestudent_id = public.tbl_student.prestudent_id
-		',
-	'requiredPermissions' => 'student/stammdaten'
-);
\ No newline at end of file
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index bec825495..222290e98 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -212,7 +212,13 @@ export default {
             headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             //responsive:0,
           },
-          {
+		  {
+			title: this.$p.t("profil", "sem_short") + ' (' + this.$p.t("profil", "studentIn") + ')',
+			field: "semester",
+			headerFilter: "list",
+			headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}
+		  },
+		  {
             title: this.$p.t("profil", "orgform_short") + ' (' + this.$p.t("profil", "studentIn") + ')',
             field: "orgform",
             minWidth: 50,
@@ -221,8 +227,8 @@ export default {
             headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             //responsive:0,
           },
-          {
-            title: this.$p.t("lehre", "organisationseinheit") + ' (' + this.$p.t("profil", "mitarbeiterIn") + ')',
+		  {
+            title: this.$p.t("profil", "orgeinheit_short") + ' (' + this.$p.t("profil", "mitarbeiterIn") + ')',
             field: "oezuordnung",
             minWidth: 200,
             resizable: true,
@@ -230,7 +236,7 @@ export default {
             headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             //responsive:0,
           },
-          {
+		  {
             title: this.$p.t("profilUpdate", "Topic"),
             field: "topic",
             resizable: true,
@@ -239,7 +245,7 @@ export default {
             headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"},
             //responsive:0,
           },
-          {
+		  {
             title: this.$p.t("profilUpdate", "insertamum"),
             field: "insertamum_iso",
             resizable: true,
@@ -250,7 +256,7 @@ export default {
 			formatterParams: this.datetimeFormatterParams(),
             //responsive:0,
           },
-          {
+		  {
             title: this.$p.t("profilUpdate", "Status"),
             field: "status_translated",
             hozAlign: "center",
@@ -272,17 +278,10 @@ export default {
               }
               return `<div class='row justify-content-center'><div class='col-2'><i class='${iconClasses}'></i></div> <div class='col-4'><span>${cell.getValue()}</span></div></div>`;
             },
-
             resizable: true,
             minWidth: 200,
             //responsive:0,
           },
-		  {
-		   title: this.$p.t("lehre", "ausbildungssemester"),
-		   field: "semester",
-		   headerFilter: "list",
-		   headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}
-		  },
           {
             title: this.$p.t("profilUpdate", "actions"),
             headerSort: false,
@@ -314,7 +313,6 @@ export default {
         ],
       };
     }
-    
   },
   methods: {
     denyProfilUpdate: function (data) {
@@ -356,7 +354,6 @@ export default {
       this.showModal = false;
       this.modalData = null;
     },
-
     showAcceptDenyModal(value) {
       this.modalData = value;
       if (!this.modalData) {
@@ -369,7 +366,6 @@ export default {
         this.$refs.AcceptDenyModal.show();
       });
     },
-
     updateData: function (event) {
       this.$refs.UpdatesTable.tabulator.setData();
       //? store the selected view in the session storage of the browser
@@ -417,105 +413,33 @@ export default {
     if (sessionStorage.getItem("filter")) {
       this.filter = sessionStorage.getItem("filter");
     }
-
-	/*
-	    <div  class="form-underline flex-fill ">
-      <div class="form-underline-titel">{{$p.t('ui','anzeigen')}} </div>
-
-      <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
-        <option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
-        <option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
-        <option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
-        <option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
-      </select>
-
-    </div>
-
-
-	:title="$p.t('profilUpdate','profilUpdateRequests')"
-
-	    <h3>{{$p.t('profilUpdate', 'profilUpdateRequests')}}</h3>
-
-
-    			<div class="col-auto row row-cols-lg-auto d-flex justify-content-end">
-					<div class="col-12">
-					  <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
-						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
-						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
-						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
-						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
-					  </select>
-					  </div>
-				</div>
-
-
-				//Version mit filter rechts in eigener zeile
-				    		<template #filter>
-    			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
-					<div class="col-12">
-					  <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
-						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
-						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
-						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
-						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
-					  </select>
-					  </div>
-				</div>
-			</template>
-
-
-			<div class="justify-content-end pb-3">
-
-			</div>
-
-			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
-
-	//backendfilter not working: no parameters provided
-	    <core-filter-cmpt
-    	v-if="profilUpdateStates && categoryLoaded"
-    	ref="UpdatesTable"
-    	:tabulatorEvents="profilUpdateEvents"
-    	:tabulator-options="profilUpdateOptions"
-    	filter-type="Profileupdate"
-    	:sideMenu="false">
-    </core-filter-cmpt>
-
-	*/
-
-
-
-
   },
   template: /*html*/ `
     <div>
+		<accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
+		<h3>{{$p.t('profilUpdate', 'profilUpdateRequests')}}</h3>
+		<loading ref="loadingModalRef" :timeout="0"></loading>
 
-    <accept-deny-update :title="$p.t('profilUpdate','profilUpdateRequest')" v-if="showModal" ref="AcceptDenyModal" @hideBsModal="hideAcceptDenyModal" :value="JSON.parse(JSON.stringify(modalData))" :setLoading="setLoading" ></accept-deny-update>
-
-     <h3>{{$p.t('profilUpdate', 'profilUpdateRequests')}}</h3>
-     
-    <loading ref="loadingModalRef" :timeout="0"></loading>
-    
-    			<div class="col-auto row row-cols-lg-auto g-3 d-flex justify-content-end">
-    			
-					<div class="col-12">
-					  <select class="mb-0 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
-						<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
-						<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
-						<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
-						<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
-					  </select>
+		<core-filter-cmpt
+			v-if="profilUpdateStates && categoryLoaded"
+			ref="UpdatesTable"
+			:tabulatorEvents="profilUpdateEvents"
+			:tabulator-options="profilUpdateOptions"
+			table-only
+			:sideMenu="false">
+				  <template #actions>
+					<div style="width: 94vw;" class="d-flex justify-content-end">
+						<div>
+						  <select class="mb-4 form-select" v-model="filter" @change="updateData" aria-label="Profil updates display selection">
+							<option :selected="true" :value="profilUpdateStates['Pending']" >{{$p.t('profilUpdate','pendingRequests')}}</option>
+							<option :value="profilUpdateStates['Accepted']">{{$p.t('profilUpdate','acceptedRequests')}}</option>
+							<option :value="profilUpdateStates['Rejected']">{{$p.t('profilUpdate','rejectedRequests')}}</option>
+							<option :value="'Alle'">{{$p.t('profilUpdate','allRequests')}}</option>
+						  </select>
+						 </div>
 					</div>
-				</div>
+				</template>
+		</core-filter-cmpt>
 
-    
-    <core-filter-cmpt 
-    	v-if="profilUpdateStates && categoryLoaded" 
-    	ref="UpdatesTable" 
-    	:tabulatorEvents="profilUpdateEvents" 
-    	:tabulator-options="profilUpdateOptions" 
-    	table-only
-    	:sideMenu="false">
-    </core-filter-cmpt>
-
-    </div>`,
+	</div>`,
 };
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 2942bcb4e..a4deca527 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1558,64 +1558,6 @@ $filters = array(
 			}',
 		'oe_kurzbz' => null,
 	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'profileupdate',
-		'filter_kurzbz' => 'ProfilupdatePending',
-		'description' => '{Ausstehende Anfragen}',
-		'sort' => 1,
-		'default_filter' => true,
-		'filter' => '
-			{
-				"name": "Ausstehende Anfragen",
-				"columns": [
-					{"name": "uid"},
-					{"name": "name"},					
-					{"name": "studiengang"},
-					{"name": "orgform"},					
-					{"name": "oezuordnung"},
-					{"name": "status_translated"},
-					{"name": "topic"},
-					{"name": "insertamum_iso"},
-					{"name": "semester"}
-				],
-				"filters": [
-					{
-						"name": "status_translated",
-						"option": "",
-						"operation": "equal",
-						"condition": "true"
-					}
-					]
-			}',
-		'oe_kurzbz' => null,
-	),
-	array(
-		'app' => 'core',
-		'dataset_name' => 'profileupdate',
-		'filter_kurzbz' => 'ProfilupdateAlle',
-		'description' => '{Alle Anfragen}',
-		'sort' => 1,
-		'default_filter' => false,
-		'filter' => '
-			{
-				"name": "Alle Anfragen",
-				"columns": [
-					{"name": "uid"},
-					{"name": "name"},					
-					{"name": "studiengang"},
-					{"name": "orgform"},					
-					{"name": "oezuordnung"},
-					{"name": "status_translated"},
-					{"name": "topic"},
-					{"name": "insertamum_iso"},
-					{"name": "semester"}
-				],
-				"filters": []
-			}',
-		'oe_kurzbz' => null,
-	),
-
 );
 
 // Loop through the filters array
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index aace77876..ad8d52f0a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28636,6 +28636,45 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'orgeinheit_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'OrgEH',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'org Unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),	array(
+		'app' => 'core',
+		'category' => 'profil',
+		'phrase' => 'sem_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sem',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sem',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//Profil Phrasen ende
 	// LvPlan Phrasen start
 	array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From 9ed3251e5556427661121fecd713c3a9d5583243 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Oct 2025 12:55:14 +0200
Subject: [PATCH 0897/1357] open in iframe, only show tab if count in config is
 valid

---
 application/config/stv.php                    |  6 +-
 .../api/frontend/v1/stv/Config.php            |  1 +
 .../Details/CombinePeople.js                  | 75 +++++++++++++------
 public/js/components/Tabs.js                  | 62 ++++++++++++++-
 4 files changed, 119 insertions(+), 25 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index d6d06f44e..000242ac5 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -61,7 +61,11 @@ $config['tabs'] =
 		'notes' => [
 			//if true, the count of Messages will be shown in the header of the Tab Messages
 			'showCountNotes' => true
-		]
+		],
+		'combinePeople' => [
+			//multitab should only be shown with this length of selection
+			'validCountMulti' => 2,
+		],
 	];
 	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 20e43d23a..67b71c36d 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -231,6 +231,7 @@ class Config extends FHCAPI_Controller
 		$result['combinePeople'] = [
 			'title' => $this->p->t('stv', 'tab_combine_people'),
 			'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
+			'config' => $config['combinePeople']
 		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
index 4374687fe..facf8848f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
@@ -8,50 +8,83 @@ export default {
 	props: {
 		modelValue: Object,
 	},
+	data(){
+		return {
+			iframeUrl: null,
+			viewLoaded: false
+		}
+	},
 	computed: {
 		personIds(){
 			if (this.modelValue.person_id) {
 				return [this.modelValue.person_id];
 			}
 			return this.modelValue.map(e => e.person_id);
-		}
+		},
+		detailStringPerson1(){
+			let person1 = this.modelValue[0];
+			return person1.vorname + " " + person1.nachname + "(" + person1.person_id + ")";
+		},
+		detailStringPerson2(){
+			let person2 = this.modelValue[1];
+			return person2.vorname + " " + person2.nachname + "(" + person2.person_id+ ")";
+		},
+
 	},
 	methods: {
 		combinePeople(){
-
+			this.viewLoaded = true;
 			let person1_id = this.personIds[0];
 			let person2_id = this.personIds[1];
 
 			if(person1_id == person2_id) {
-				return this.$fhcAlert.alertError("gleiche Person, keine Zusammenlegeung möglich");
+				//TODO(Manu) Phrase
+				return this.$fhcAlert.alertError("gleiche Person, keine Zusammenlegung möglich");
 			}
 
-			let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
+		//	let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
+			let linkCombinePeople = 'https://c3p0.ma0068.technikum-wien.at/fhcomplete/vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
 
 			console.log(linkCombinePeople);
-			window.open(linkCombinePeople, '_blank');
-
-
+			//window.open(linkCombinePeople, '_blank');
+			this.openLink(linkCombinePeople);
+		},
+		openLink(url) {
+			this.iframeUrl = url;
+		},
+		goBack(){
+			this.viewLoaded = false;
+			this.iframeUrl = null;
 		}
 	},
-	data(){
-		return {}
-	},
 	template:  /*html*/ `
 		<div class="stv-details-combine-people h-100 pb-3">
-			<h4>Personen zusammenlegen</h4>
 
-			{{personIds}}
-
-			<div v-if="this.modelValue.length">
-
-				<p v-if="this.modelValue.length == 2">
-					<button class="btn btn-primary" @click="combinePeople"> Zusammenlegen</button>
-				</p>
-				<p v-else">
-					ungültige Anzahl: {{this.modelValue.length}}
-				</p>
+			<div v-if="!this.viewLoaded">
+				<h4>Personen zusammenlegen</h4>
+				<div v-if="this.modelValue.length">
+					<div v-if="this.modelValue.length == 2">
+					<!-- TODO(Manu) Phrases-->
+						<p>Die Personen <strong> {{detailStringPerson1}} und {{detailStringPerson2}} </strong> zusammenlegen? </p>
+						<button class="btn btn-primary" @click="combinePeople">{{$p.t('ui', 'ok')}}</button>
+					</div>
+					<div v-else>
+						 ungültige Anzahl: {{this.modelValue.length}} <!-- should not be seen anymore-->
+					</div>
+				</div>
 			</div>
+			<div v-else>
+				<button class="btn btn-secondary" @click="goBack">{{$p.t('ui', 'cancel')}}</button>
+			</div>
+	
+			<!-- Iframe-Section -->
+			<iframe
+			  v-if="iframeUrl"
+			  :src="iframeUrl"
+			  class="w-100 mt-4 border-0"
+			  style="height: 600px;"
+			></iframe>
+
 		</div>
 	`
 	};
\ No newline at end of file
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index aedd5c1c9..5db8d66ba 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -33,7 +33,8 @@ export default {
 	data() {
 		return {
 			current: null,
-			tabs: {}
+			tabs: {},
+			count: null
 		}
 	},
 	computed: {
@@ -113,10 +114,12 @@ export default {
 				};
 			}
 
-			if (Array.isArray(config))
+			if (Array.isArray(config)) {
 				config.forEach((item, key) => _addToTabs(key, item));
-			else
+			}
+			else {
 				Object.entries(config).forEach(([key, item]) => _addToTabs(key, item));
+			}
 
 			if (this.current === null || !tabs[this.current]) {
 				if (tabs[this.default])
@@ -129,6 +132,57 @@ export default {
 		updateSuffix() {
 			this.getTabSuffix(this.currentTab);
 		},
+		removeInvalidCountTabs(){
+			if(this.modelValue.length)
+			{
+				let countIst = this.modelValue.length;
+				const tabsToDelete = [];
+
+				Object.entries(this.config).forEach(([key, item]) => {
+
+					const target = item?.config ? item : item?.value || item;
+
+					// check config for validCountMulti
+					if (target.config?.validCountMulti !== undefined) {
+						let tab;
+						let countSoll;
+						tab = key;
+						countSoll = target.config.validCountMulti;
+
+						//check if tab is existing
+						if (countSoll !== undefined && countSoll == countIst) {
+							//add tab if it was removed before
+							if (tab in this.tabs == false) {
+								const value = Vue.reactive({
+									suffix: '',
+									showSuffix: item.showSuffix || false
+								});
+
+								this.tabs[tab] = {
+									component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
+									title: Vue.computed(() => item.title || tab),
+									config: item.config,
+									tab,
+									value,
+									suffixhelper: item.suffixhelper ?? null
+								};
+							}
+						}
+
+						//add to toDeleteArray if count is not allowed
+						if (countSoll !== undefined && countSoll !== countIst) {
+							tabsToDelete.push(tab);
+						}
+					}
+				});
+
+				// Delete all tabs with count not allowed
+				tabsToDelete.forEach(k => {
+					delete this.tabs[k];
+				});
+
+			}
+		},
 		async getTabSuffix(tab) {
 			if (!tab.value.showSuffix) {
 				return;
@@ -151,9 +205,11 @@ export default {
 	},
 	mounted() {
 		this.getTabSuffixes();
+		this.removeInvalidCountTabs();
 	},
 	updated() {
 		this.getTabSuffixes();
+		this.removeInvalidCountTabs();
 	},
 	template: `
 	<template v-if="useprimevue">

From 4be0a831a11ff60ffda370583b5d829d6d2748e0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 23 Oct 2025 13:49:05 +0200
Subject: [PATCH 0898/1357] add Phrases

---
 .../Details/CombinePeople.js                  | 21 ++++------
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
index facf8848f..81c1a6860 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
@@ -15,11 +15,10 @@ export default {
 		}
 	},
 	computed: {
-		personIds(){
-			if (this.modelValue.person_id) {
-				return [this.modelValue.person_id];
-			}
-			return this.modelValue.map(e => e.person_id);
+		personIds() {
+			return Array.isArray(this.modelValue)
+				? this.modelValue.map(e => e.person_id)
+				: [this.modelValue.person_id];
 		},
 		detailStringPerson1(){
 			let person1 = this.modelValue[0];
@@ -38,15 +37,10 @@ export default {
 			let person2_id = this.personIds[1];
 
 			if(person1_id == person2_id) {
-				//TODO(Manu) Phrase
-				return this.$fhcAlert.alertError("gleiche Person, keine Zusammenlegung möglich");
+				return this.$fhcAlert.alertError(this.$p.t('stv', 'error_combinePeople_samePerson'));
 			}
 
-		//	let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
-			let linkCombinePeople = 'https://c3p0.ma0068.technikum-wien.at/fhcomplete/vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
-
-			console.log(linkCombinePeople);
-			//window.open(linkCombinePeople, '_blank');
+			let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
 			this.openLink(linkCombinePeople);
 		},
 		openLink(url) {
@@ -64,8 +58,7 @@ export default {
 				<h4>Personen zusammenlegen</h4>
 				<div v-if="this.modelValue.length">
 					<div v-if="this.modelValue.length == 2">
-					<!-- TODO(Manu) Phrases-->
-						<p>Die Personen <strong> {{detailStringPerson1}} und {{detailStringPerson2}} </strong> zusammenlegen? </p>
+						<p>{{$p.t('stv', 'question_combine_people', { person1: detailStringPerson1, person2: detailStringPerson2 })}}</p>
 						<button class="btn btn-primary" @click="combinePeople">{{$p.t('ui', 'ok')}}</button>
 					</div>
 					<div v-else>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d931f85c2..879ca6cc2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -50003,6 +50003,46 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'question_combine_people',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Personen {person1} und {person2} zusammenlegen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Merge the persons {person1} and {person2}?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'error_combinePeople_samePerson',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Zusammenlegung möglich bei identischer Person ID!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No merging possible with identical person ID"',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

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

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

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

From 84bfea0be9e05c40f3ab548dcd33d7bf5805a57c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 24 Oct 2025 11:18:19 +0200
Subject: [PATCH 0900/1357] make Prestudent.js and Details.js responsive

---
 .../Studentenverwaltung/Details/Details.js    | 127 +++++++------
 .../Studentenverwaltung/Details/Prestudent.js | 167 +++++++++---------
 2 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 5bb673d1a..8be6c96c8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -171,10 +171,10 @@ export default {
 		<fieldset class="overflow-hidden">
 			<legend>Person</legend>
 			<template v-if="data">
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('person_id')"
-						container-class="col-4 stv-details-details-person_id"
+						container-class="col stv-details-details-person_id"
 						:label="$p.t('person', 'person_id')"
 						type="text"
 						v-model="data.person_id"
@@ -182,7 +182,7 @@ export default {
 						readonly
 						>
 					</form-input>
-					<div v-if="showZugangscode && !config.hiddenFields.includes('zugangscode')" class="col-4 stv-details-details-zugangscode">
+					<div v-if="showZugangscode && !config.hiddenFields.includes('zugangscode')" class="col stv-details-details-zugangscode">
 						<label>{{$p.t('global', 'zugangscode')}}</label>
 						<div class="align-self-center">
 							<span class="form-text">
@@ -192,7 +192,7 @@ export default {
 					</div>
 					<form-input
 						v-if="showBpk && !config.hiddenFields.includes('bpk')"
-						container-class="col-4 stv-details-details-bpk"
+						container-class="col stv-details-details-bpk"
 						:label="$p.t('person', 'bpk')"
 						type="text"
 						v-model="data.bpk"
@@ -200,11 +200,21 @@ export default {
 						maxlength="28"
  						>
 					</form-input>
+					<form-input
+						v-if="!config.hiddenFields.includes('ersatzkennzeichen')"
+						container-class="col stv-details-details-ersatzkennzeichen"
+						:label="$p.t('person', 'ersatzkennzeichen')"
+						type="text"
+						v-model="data.ersatzkennzeichen"
+						name="ersatzkennzeichen"
+						maxlength="10"
+ 						>
+					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('anrede')"
-						container-class="col-4 stv-details-details-anrede"
+						container-class="col stv-details-details-anrede"
 						:label="$p.t('person', 'anrede')"
 						type="text"
 						v-model="data.anrede"
@@ -214,7 +224,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('titelpre')"
-						container-class="col-4 stv-details-details-titelpre"
+						container-class="col stv-details-details-titelpre"
 						:label="$p.t('person', 'titelpre')"
 						type="text"
 						v-model="data.titelpre"
@@ -224,7 +234,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('titelpost')"
-						container-class="col-4 stv-details-details-titelpost"
+						container-class="col stv-details-details-titelpost"
 						:label="$p.t('person', 'titelpost')"
 						type="text"
 						v-model="data.titelpost"
@@ -233,10 +243,10 @@ export default {
  						>
 					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('nachname')"
-						container-class="col-4 stv-details-details-nachname"
+						container-class="col stv-details-details-nachname"
 						:label="$p.t('person', 'nachname')"
 						type="text"
 						v-model="data.nachname"
@@ -246,7 +256,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('vorname')"
-						container-class="col-4 stv-details-details-vorname"
+						container-class="col stv-details-details-vorname"
 						:label="$p.t('person', 'vorname')"
 						type="text"
 						v-model="data.vorname"
@@ -256,7 +266,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('vornamen')"
-						container-class="col-4 stv-details-details-vornamen"
+						container-class="col stv-details-details-vornamen"
 						:label="$p.t('person', 'vornamen')"
 						type="text"
 						v-model="data.vornamen"
@@ -264,11 +274,9 @@ export default {
 						maxlength="128"
  						>
 					</form-input>
-				</div>
-				<div class="row mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('wahlname')"
-						container-class="col-4 stv-details-details-wahlname"
+						container-class="col stv-details-details-wahlname"
 						:label="$p.t('person', 'wahlname')"
 						type="text"
 						v-model="data.wahlname"
@@ -276,11 +284,12 @@ export default {
 						maxlength="128"
  						>
 					</form-input>
+
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('gebdatum')"
-						container-class="col-4 stv-details-details-gebdatum"
+						container-class="col stv-details-details-gebdatum"
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
@@ -297,7 +306,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('gebort')"
-						container-class="col-4 stv-details-details-gebort"
+						container-class="col stv-details-details-gebort"
 						:label="$p.t('person', 'geburtsort')"
 						type="text"
 						v-model="data.gebort"
@@ -307,7 +316,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('geburtsnation')"
-						container-class="col-4 stv-details-details-geburtsnation"
+						container-class="col stv-details-details-geburtsnation"
 						:label="$p.t('person', 'geburtsnation')"
 						type="select"
 						v-model="data.geburtsnation"
@@ -316,23 +325,9 @@ export default {
 						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
-				</div>
-				<div class="row mb-3">
-					<form-input
-						v-if="!config.hiddenFields.includes('ersatzkennzeichen')"
-						container-class="col-4 stv-details-details-ersatzkennzeichen"
-						:label="$p.t('person', 'ersatzkennzeichen')"
-						type="text"
-						v-model="data.ersatzkennzeichen"
-						name="ersatzkennzeichen"
-						maxlength="10"
- 						>
-					</form-input>
-				</div>
-				<div class="row mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('staatsbuergerschaft')"
-						container-class="col-4 stv-details-details-staatsbuergerschaft"
+						container-class="col stv-details-details-staatsbuergerschaft"
 						:label="$p.t('person', 'staatsbuergerschaft')"
 						type="select"
 						v-model="data.staatsbuergerschaft"
@@ -341,9 +336,12 @@ export default {
 						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
+				</div>
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+
 					<form-input
 						v-if="!config.hiddenFields.includes('matr_nr')"
-						container-class="col-4 stv-details-details-matr_nr"
+						container-class="col stv-details-details-matr_nr"
 						:label="$p.t('person', 'matrikelnummer')"
 						type="text"
 						v-model="data.matr_nr"
@@ -353,7 +351,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('sprache')"
-						container-class="col-4 stv-details-details-sprache"
+						container-class="col stv-details-details-sprache"
 						:label="$p.t('person', 'sprache')"
 						type="select"
 						v-model="data.sprache"
@@ -361,11 +359,9 @@ export default {
  						>
 						<option v-for="sprache in lists.sprachen" :key="sprache.sprache" :value="sprache.sprache">{{sprache.sprache}}</option>
 					</form-input>
-				</div>
-				<div class="row mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('geschlecht')"
-						container-class="col-4 stv-details-details-geschlecht"
+						container-class="col stv-details-details-geschlecht"
 						:label="$p.t('person', 'geschlecht')"
 						type="select"
 						v-model="data.geschlecht"
@@ -375,7 +371,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('familienstand')"
-						container-class="col-4 stv-details-details-familienstand"
+						container-class="col stv-details-details-familienstand"
 						:label="$p.t('person', 'familienstand')"
 						type="select"
 						v-model="data.familienstand"
@@ -384,10 +380,10 @@ export default {
 						<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
 					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('foto')"
-						container-class="col-4 stv-details-details-foto"
+						container-class="col stv-details-details-foto"
 						:label="$p.t('person', 'foto')"
 						type="UploadImage"
 						v-model="data.foto"
@@ -397,7 +393,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('anmerkung')"
-						container-class="col-4 stv-details-details-anmerkung"
+						container-class="col stv-details-details-anmerkung"
 						:label="$p.t('global', 'anmerkung')"
 						type="textarea"
 						v-model="data.anmerkung"
@@ -407,7 +403,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('homepage')"
-						container-class="col-4 stv-details-details-homepage"
+						container-class="col stv-details-details-homepage"
 						:label="$p.t('person', 'homepage')"
 						type="text"
 						v-model="data.homepage"
@@ -433,10 +429,10 @@ export default {
 		<fieldset v-if="data?.student_uid" class="overflow-hidden">
 			<legend>{{$p.t('person', 'studentIn')}}</legend>
 			<template v-if="data">
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('student_uid')"
-						container-class="col-4 stv-details-details-student_uid"
+						container-class="col stv-details-details-student_uid"
 						:label="$p.t('person', 'uid')"
 						type="text"
 						v-model="data.student_uid"
@@ -446,7 +442,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('matrikelnr')"
-						container-class="col-4 stv-details-details-matrikelnr"
+						container-class="col stv-details-details-matrikelnr"
 						:label="$p.t('person', 'personenkennzeichen')"
 						type="text"
 						v-model="data.matrikelnr"
@@ -454,22 +450,31 @@ export default {
 						readonly
 						>
 					</form-input>
-					<div class="col-4 pt-4 d-flex align-items-center">
+					<template class="col-4 pt-4 d-flex align-items-center">
 						<form-input
 							v-if="!config.hiddenFields.includes('aktiv')"
-							container-class="form-check stv-details-details-aktiv"
+							container-class="col form-check stv-details-details-aktiv"
 							:label="$p.t('person', 'aktiv')"
 							type="checkbox"
 							v-model="data.aktiv"
 							name="aktiv"
 							>
 						</form-input>
-					</div>
+					</template>
+					<form-input
+						v-if="!config.hiddenFields.includes('alias')"
+						:label="$p.t('person', 'alias')"
+						type="text"
+						v-model="data.alias"
+						name="alias"
+						:disabled="aliasNotAllowed"
+						>
+					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('semester')"
-						container-class="col-4 stv-details-details-semester"
+						container-class="col stv-details-details-semester"
 						:label="$p.t('lehre', 'semester')"
 						type="text"
 						v-model="data.semester"
@@ -479,7 +484,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('verband')"
-						container-class="col-4 stv-details-details-verband"
+						container-class="col stv-details-details-verband"
 						:label="$p.t('lehre', 'verband')"
 						type="text"
 						v-model="data.verband"
@@ -489,7 +494,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('gruppe')"
-						container-class="col-4 stv-details-details-gruppe"
+						container-class="col stv-details-details-gruppe"
 						:label="$p.t('lehre', 'gruppe')"
 						type="text"
 						v-model="data.gruppe"
@@ -498,19 +503,7 @@ export default {
 						>
 					</form-input>
 				</div>
-				<div class="row mb-3">
-					<form-input
-						v-if="!config.hiddenFields.includes('alias')"
-						container-class="col-4 stv-details-details-alias"
-						:label="$p.t('person', 'alias')"
-						type="text"
-						v-model="data.alias"
-						name="alias"
-						:disabled="aliasNotAllowed"
-						>
-					</form-input>
-				</div>
-			</template>
+			</template>	
 			<div v-else>
 				{{$p.t('ui', 'dropdownLoading')}}...
 			</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index dc645dadc..ce43622cf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -237,10 +237,10 @@ export default {
 			</div>
 			<fieldset class="overflow-hidden">
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 					v-if="!config.hiddenFields.includes('prestudent_id')"
-						container-class="col-3 stv-details-prestudent-prestudent_id"
+						container-class="col stv-details-prestudent-prestudent_id"
 						:label="$p.t('ui', 'prestudent_id')"
 						type="text"
 						v-model="data.prestudent_id"
@@ -250,7 +250,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('person_id')"
-						container-class="col-3 stv-details-prestudent-person_id"
+						container-class="col stv-details-prestudent-person_id"
 						:label="$p.t('person', 'person_id')"
 						type="text"
 						v-model="data.person_id"
@@ -259,10 +259,10 @@ export default {
 						>
 					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgv_code')"
-						container-class="col-3 stv-details-prestudent-zgv_code"
+						container-class="col stv-details-prestudent-zgv_code"
 						label="ZGV"
 						type="autocomplete"
 						v-model="selectedZgv"
@@ -286,7 +286,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvOrt')"
-						container-class="col-3 stv-details-prestudent-zgvOrt"
+						container-class="col stv-details-prestudent-zgvOrt"
 						:label="$p.t('infocenter', 'zgvOrt')"
 						type="text"
 						v-model="data.zgvort"
@@ -295,7 +295,7 @@ export default {
 					</form-input>	
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvDatum')"
-						container-class="col-3 stv-details-prestudent-zgvDatum"
+						container-class="col stv-details-prestudent-zgvDatum"
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
@@ -311,7 +311,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvNation')"
-						container-class="col-3 stv-details-prestudent-zgvNation"
+						container-class="col stv-details-prestudent-zgvNation"
 						:label="$p.t('infocenter', 'zgvNation')"
 						type="select"
 						v-model="data.zgvnation"
@@ -322,10 +322,10 @@ export default {
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmas_code')"
-						container-class="col-3 stv-details-prestudent-zgvmas_code"
+						container-class="col stv-details-prestudent-zgvmas_code"
 						:label="$p.t('lehre', 'zgvMaster')"
 						type="autocomplete"
 						v-model="selectedMasterZgv"
@@ -349,7 +349,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmaort')"
-						container-class="col-3 stv-details-prestudent-zgvmaort"
+						container-class="col stv-details-prestudent-zgvmaort"
 						:label="$p.t('lehre', 'zgvMasterOrt')"
 						type="text"
 						v-model="data.zgvmaort"
@@ -358,7 +358,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmadatum')"
-						container-class="col-3 stv-details-prestudent-zgvmadatum"
+						container-class="col stv-details-prestudent-zgvmadatum"
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
@@ -374,7 +374,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmanation')"
-						container-class="col-3 stv-details-prestudent-zgvmanation"
+						container-class="col stv-details-prestudent-zgvmanation"
 						:label="$p.t('lehre', 'zgvMasterNation')"
 						type="select"
 						v-model="data.zgvmanation"
@@ -386,10 +386,10 @@ export default {
 					</form-input>
 				</div>
 				<!--ZGV Doktor-->
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktor_code')"
-						container-class="col-3 stv-details-prestudent-zgvdoktor_code"
+						container-class="col stv-details-prestudent-zgvdoktor_code"
 						:label="$p.t('lehre', 'zgvDoktor')"
 						type="autocomplete"
 						v-model="selectedDoktorZgv"
@@ -413,7 +413,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktorort')"
-						container-class="col-3 stv-details-prestudent-zgvdoktorort"
+						container-class="col stv-details-prestudent-zgvdoktorort"
 						:label="$p.t('lehre', 'zgvDoktorOrt')"
 						type="text"
 						v-model="data.zgvdoktorort"
@@ -422,7 +422,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktordatum')"
-						container-class="col-3 stv-details-prestudent-zgvdoktordatum"
+						container-class="col stv-details-prestudent-zgvdoktordatum"
 						:label="$p.t('lehre', 'zgvDoktorDatum')"
 						type="DatePicker"
 						v-model="data.zgvdoktordatum"
@@ -438,7 +438,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktornation')"
-						container-class="col-3 stv-details-prestudent-zgvdoktornation"
+						container-class="col stv-details-prestudent-zgvdoktornation"
 						:label="$p.t('lehre', 'zgvDoktorNation')"
 						type="select"
 						v-model="data.zgvdoktornation"
@@ -450,8 +450,8 @@ export default {
 					</form-input>
 				</div>
 																
-				<div class="row mb-3">
-					<div class="col-3 pt-4 d-flex align-items-center">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+					<template class="col pt-4 d-flex align-items-center">
 						<form-input
 							v-if="!config.hiddenFields.includes('zgv_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgv_erfuellt"
@@ -461,8 +461,8 @@ export default {
 							name="zgv_erfuellt"
 							>
 						</form-input>
-					</div>
-					<div class="col-3 pt-4 d-flex align-items-center">
+					</template>
+					<template class="col pt-4 d-flex align-items-center">
 						<form-input
 							v-if="!config.hiddenFields.includes('zgvmas_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgvmas_erfuellt"
@@ -472,8 +472,8 @@ export default {
 							name="zgvmas_erfuellt"
 							>
 						</form-input>
-					</div>
-					<div class="col-3 pt-4 d-flex align-items-center">
+					</template>
+					<template class="col pt-4 d-flex align-items-center">
 						<form-input
 							v-if="!config.hiddenFields.includes('zgvdoktor_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgvdoktor_erfuellt"
@@ -483,15 +483,15 @@ export default {
 							name="zgvdoktor_erfuellt"
 							>
 						</form-input>
-					</div>
+					</template>
 				</div>
 			</fieldset>
 			<fieldset class="overflow-hidden">
 				<legend>PrestudentIn</legend>
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('aufmerksamdurch_kurzbz')"
-						container-class="col-4 stv-details-prestudent-aufmerksamdurch_kurzbz"
+						container-class="col stv-details-prestudent-aufmerksamdurch_kurzbz"
 						:label="$p.t('person', 'aufmerksamDurch')"
 						type="select"
 						v-model="data.aufmerksamdurch_kurzbz"
@@ -501,7 +501,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('berufstaetigkeit_code')"
-						container-class="col-4 stv-details-prestudent-berufstaetigkeit_code"
+						container-class="col stv-details-prestudent-berufstaetigkeit_code"
 						:label="$p.t('person', 'berufstaetigkeit')"
 						type="select"
 						v-model="data.berufstaetigkeit_code"
@@ -512,7 +512,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('ausbildungcode')"
-						container-class="col-4 stv-details-prestudent-ausbildungcode"
+						container-class="col stv-details-prestudent-ausbildungcode"
 						:label="$p.t('person', 'ausbildung')"
 						type="select"
 						v-model="data.ausbildungcode"
@@ -523,10 +523,10 @@ export default {
 					</form-input>
 				</div>
 				
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('aufnahmeschluessel')"
-						container-class="col-4 stv-details-prestudent-aufnahmeschluessel"
+						container-class="col stv-details-prestudent-aufnahmeschluessel"
 						label="Aufnahmeschlüssel"
 						type="text"
 						v-model="data.aufnahmeschluessel"
@@ -535,7 +535,7 @@ export default {
 						>
 					</form-input>
 					
-					<div class="col-4 pt-4 d-flex align-items-center">
+					<template class="col pt-4 d-flex align-items-center">
 						<form-input
 							v-if="!config.hiddenFields.includes('facheinschlaegigBerufstaetig')"
 							container-class="form-check stv-details-prestudent-facheinschlaegigBerufstaetig"
@@ -545,11 +545,11 @@ export default {
 							name="facheinschlberuf"
 							>
 						</form-input>
-					</div>
+					</template>
 					
 					<form-input
 						v-if="!config.hiddenFields.includes('standort_code')"
-						container-class="col-4 stv-details-prestudent-standort_code"
+						container-class="col stv-details-prestudent-standort_code"
 						:label="$p.t('person', 'bisstandort')"
 						type="select"
 						v-model="data.standort_code"
@@ -559,10 +559,10 @@ export default {
 					</form-input>		 
 				</div>
 								
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('studiengang_kz')"
-						container-class="col-4 stv-details-prestudent-studiengang_kz"
+						container-class="col stv-details-prestudent-studiengang_kz"
 						:label="$p.t('lehre', 'studiengang')"
 						type="select"
 						v-model="data.studiengang_kz"
@@ -573,7 +573,7 @@ export default {
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('gsstudientyp_kurzbz')"
-						container-class="col-4 stv-details-prestudent-gsstudientyp_kurzbz"
+						container-class="col stv-details-prestudent-gsstudientyp_kurzbz"
 						:label="$p.t('lehre', 'studientyp')"
 						type="select"
 						v-model="data.gsstudientyp_kurzbz"
@@ -583,59 +583,66 @@ export default {
 					</form-input>
 				</div>
 				
-				<div class="row mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
 					<form-input
 						v-if="!config.hiddenFields.includes('anmerkung')"
-						container-class="col-4 stv-details-prestudent-anmerkung"
+						container-class="col stv-details-prestudent-anmerkung"
 						:label="$p.t('global', 'anmerkung')"
 						type="text"
 						v-model="data.anmerkung"
 						name="anmerkung"
 						>
 					</form-input>
-					<div class="col-2 pt-4 d-flex align-items-center">
-						<form-input
-							v-if="!config.hiddenFields.includes('bismelden')"
-							container-class="form-check stv-details-prestudent-bismelden"
-							:label="$p.t('person', 'bismelden')"
-							type="checkbox"
-							v-model="data.bismelden"
-							name="bismelden"
-							>
-						</form-input>
-					</div>
-					<div class="col-2 pt-4 d-flex align-items-center">
-						<form-input
-							v-if="!config.hiddenFields.includes('dual')"
-							container-class="form-check stv-details-prestudent-dual"
-							:label="$p.t('lehre', 'dual')"
-							type="checkbox"
-							v-model="data.dual"
-							name="dual"
-							>
-						</form-input>
+					<div class="col">
+						<div class="row g-3 align-items-center mb-3">
+							<template class="col-12 col-md-6 pt-4 d-flex align-items-center">
+								<form-input
+									v-if="!config.hiddenFields.includes('bismelden')"
+									container-class="col form-check stv-details-prestudent-bismelden"
+									:label="$p.t('person', 'bismelden')"
+									type="checkbox"
+									v-model="data.bismelden"
+									name="bismelden"
+									>
+								</form-input>
+							</template>
+							<template class="col-12 col-md-6 pt-4 d-flex align-items-center">
+								<form-input
+									v-if="!config.hiddenFields.includes('dual')"
+									container-class="col form-check stv-details-prestudent-dual"
+									:label="$p.t('lehre', 'dual')"
+									type="checkbox"
+									v-model="data.dual"
+									name="dual"
+									>
+								</form-input>
+							</template>
+						</div>
 					</div>
 					
-					<form-input
-						container-class="col-3"
-						:label="$p.t('lehre', 'foerderrelevant')"
-						type="select"
-						v-model="data.foerderrelevant"
-						name="foerderrelevant"
-						>
-						<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
-					</form-input>
-					
-					<form-input
-						v-if="!config.hiddenFields.includes('priorisierung')"
-						container-class="col-1"
-						:label="$p.t('lehre', 'prioritaet')"
-						type="text"
-						v-model="data.priorisierung"
-						name="priorisierung"
-						:disabled="!hasPrestudentPermission"
-						>
-					</form-input>
+					<div class="col">
+						<div class="row g-3 align-items-center">
+							<form-input
+								container-class="col-12 col-md-6"
+								:label="$p.t('lehre', 'foerderrelevant')"
+								type="select"
+								v-model="data.foerderrelevant"
+								name="foerderrelevant"
+								>
+								<option v-for="entry in listFoerderrelevant" :value="entry.value">{{entry.text}}</option>
+							</form-input>
+							<form-input
+								v-if="!config.hiddenFields.includes('priorisierung')"
+								container-class="col-12 col-md-6"
+								:label="$p.t('lehre', 'prioritaet')"
+								type="text"
+								v-model="data.priorisierung"
+								name="priorisierung"
+								:disabled="!hasPrestudentPermission"
+								>
+							</form-input>
+						</div>
+					</div>
 				</div>
 				<core-udf
 					v-if="!config.hideUDFs" 

From 2b53eb327fdd99db3b45d543100dc4dca9786103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 24 Oct 2025 13:10:41 +0200
Subject: [PATCH 0901/1357] =?UTF-8?q?LVRegeln=20-=20Abschlussregel=20bei?=
 =?UTF-8?q?=20Anmeldung=20entfernt=20da=20diese=20dort=20zu=20Problemen=20?=
 =?UTF-8?q?f=C3=BChrt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/studienplan.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
index 8545b2e34..a853cbcfe 100644
--- a/cis/private/profile/studienplan.php
+++ b/cis/private/profile/studienplan.php
@@ -107,16 +107,10 @@ if(isset($_GET['getAnmeldung']))
 				$abgeschlossen = false;
 				$semesterlock = false;
 				$regelerfuellt = true;
+
 				if ($kompatible_lv)
 				{
 					$lvregelExists = $lvregel->exists($kompatible_lv);
-					if($lvregelExists)
-					{
-						if($lvregel->isAbgeschlossen($uid, $kompatible_lv))
-							$abgeschlossen=true;
-						else
-							$abgeschlossen=false;
-					}
 
 					if(!$lvregel->checkSemester($kompatible_lv, $semester))
 					{
@@ -135,7 +129,7 @@ if(isset($_GET['getAnmeldung']))
 					}
 				}
 
-				if (!(($lvregelExists && !$abgeschlossen) || $semesterlock || !$regelerfuellt))
+				if (!$semesterlock || $regelerfuellt)
 				{
 					$anzahl++;
 					// LV wird angeboten und Anmeldefenster ist offen
@@ -152,7 +146,6 @@ if(isset($_GET['getAnmeldung']))
 						echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
 					}
 				}
-
 			}
 /*			else
 			{

From 3e52ea39d53f3403c41d0cbc17b54c970a4904bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 24 Oct 2025 13:36:11 +0200
Subject: [PATCH 0902/1357] LVRegel Fixed Semester Check

---
 cis/private/profile/studienplan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/profile/studienplan.php b/cis/private/profile/studienplan.php
index a853cbcfe..74102fd09 100644
--- a/cis/private/profile/studienplan.php
+++ b/cis/private/profile/studienplan.php
@@ -129,7 +129,7 @@ if(isset($_GET['getAnmeldung']))
 					}
 				}
 
-				if (!$semesterlock || $regelerfuellt)
+				if (!$semesterlock && $regelerfuellt)
 				{
 					$anzahl++;
 					// LV wird angeboten und Anmeldefenster ist offen

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

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

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

From c12678ca5a89f395b5266cfe9ece664bc9a85408 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 27 Oct 2025 13:43:59 +0100
Subject: [PATCH 0904/1357] buttons edit and delete foto: adapt for better
 visibility, add preview to upload

---
 public/css/components/Detailheader.css        | 58 ++++++++++++++++++-
 .../components/DetailHeader/DetailHeader.js   | 20 ++-----
 .../DetailHeader/Modal/UploadFoto.js          | 34 ++++++-----
 .../Stv/Studentenverwaltung/Details.js        |  1 +
 4 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css
index a81ec0283..e283a55cc 100644
--- a/public/css/components/Detailheader.css
+++ b/public/css/components/Detailheader.css
@@ -5,4 +5,60 @@
 .bg-unruly {
     background-color: #ad1010 !important;
     color: white;
-}
\ No newline at end of file
+}
+
+/*.fotosperre {
+    z-index: 1;
+    font-size: 1rem;
+    width: 1.25rem;
+    height: 1.25rem;
+}*/
+
+.foto-container .fotoedit {
+    opacity: 0;
+    transition: opacity 0.3s;
+    backdrop-filter: blur(2px);
+}
+
+.fotoedit {
+    background-color: rgba(0, 0, 0, 0.4);
+    color: white;
+    border: none;
+    z-index: 4;
+    font-size: 1rem;
+    width: 1.8rem;
+    height: 1.8rem;
+    opacity:0;
+    transition: opacity 0.2s;
+    top:20%;
+}
+
+/* fotoeditMa {
+    background-color: rgba(0, 0, 0, 0.4);
+    color: white;
+    border: none;
+    z-index: 4;
+    font-size: 1rem;
+    opacity:0;
+    transition: opacity 0.2s;
+    top:20%;
+}*/
+
+.buttonleft {
+    margin-left: 1rem;
+}
+
+.buttonright {
+    margin-right: 1rem;
+}
+
+/*.fotoEditMa {
+    z-index: 104;
+    font-size: 1rem;
+    width: 2.5rem;
+    height: 2.5rem;
+    opacity:0;
+    transition: opacity 0.2s;
+    top:13%;"
+    z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+}*/
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 3e09f376a..164030592 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -7,12 +7,6 @@ export default {
 	components: {
 		ModalUploadFoto
 	},
-/*	inject: {
-		domain: {
-			from: 'configDomain',
-			default: 'fhcomplete.info'
-		},
-	},*/
 	props: {
 		headerData: {
 			type: Object,
@@ -203,23 +197,21 @@ export default {
 					/>
 
 					<template v-if="person.foto_sperre">
-						<i
-						  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-						></i>
+						<i class="fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+						style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+						>
+						</i>
 					</template>
 					<template v-if="fotoEditable">
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							style="z-index: 4; font-size: 1rem; width: 1.5rem; height: 1.5rem; opacity:0; transition: opacity 0.2s; top:20%; left:2rem;"
+							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
 							@click="showDeleteModal(headerData[0].person_id)">
 							<i class="fa fa-xmark"></i>
 						</button>
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							style="z-index: 4; font-size: 1rem; width: 1.5rem; height: 1.5rem; opacity:0; transition: opacity 0.2s; top:20%; right:2rem;"
+							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
 							@click="showModal(headerData[0].person_id)">
 							<i class="fa fa-pen"></i>
 						</button>
diff --git a/public/js/components/DetailHeader/Modal/UploadFoto.js b/public/js/components/DetailHeader/Modal/UploadFoto.js
index 34f569828..a04677c67 100644
--- a/public/js/components/DetailHeader/Modal/UploadFoto.js
+++ b/public/js/components/DetailHeader/Modal/UploadFoto.js
@@ -19,11 +19,9 @@ export default {
 	},
 	data(){
 		return{
-			formData: {
-				file: null,
-				preview: null,
-				base64Image: null,
-			},
+			base64Image: null,
+			file: null,
+			preview: null,
 		}
 	},
 	methods:{
@@ -36,6 +34,7 @@ export default {
 
 			// convert File in base64
 			const reader = new FileReader();
+
 			reader.onload = (event) => {
 				this.base64Image = event.target.result;
 				this.preview = this.base64Image;
@@ -51,19 +50,23 @@ export default {
 
 			return this.$api
 				.call(ApiHandleFoto.uploadFoto(person_id, {
-						image: this.base64Image,    // Base64 String
-						filename: this.file.name    // Original name of file
+						image: this.base64Image,
+						filename: this.file.name
 							}))
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successFotoUpload'));
-					this.resetModal();
-					this.$refs.modalUploadFoto.hide();
+					this.closeModal();
 					this.$emit('reload');
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		resetModal(){
-			this.formData.foto = [];
+			this.base64Image = [];
+			this.file = null;
+		},
+		closeModal(){
+			this.resetModal();
+			this.$refs.modalUploadFoto.hide();
 		}
 	},
 	template: `
@@ -78,18 +81,19 @@ export default {
 				<form-form
 					ref="formUploadFoto"
 					>
-
 					  <div>
-						<input type="file" @change="onFileChange" accept="image/*" />
-						<div v-if="preview">
-						  <p>Preview:</p>
-						  <img :src="preview" width="200" />
+						<input class="form-control" type="file" @change="onFileChange" accept="image/*" />
+						<div class="mt-3">
+						   <div>
+						   	<img :src="base64Image" style="width:100px"/>
+						  </div>
 						</div>
 					  </div>
 				</form-form>
 
 				<template #footer>
 					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					    <button class="btn btn-secondary" @click="closeModal()">{{$p.t('ui', 'cancel')}}</button>
 						<button type="button" class="btn btn-primary" @click="uploadImage(person_id)">{{$p.t('ui', 'hochladen')}}</button>
 					</div>
 				</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 3c19c7cae..89c1a12be 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -71,6 +71,7 @@ export default {
 				:headerData="students"
 				typeHeader="student"
 				@reload="reloadList"
+				fotoEditable
 			>
 				<template #titleAlphaTile>P_ID</template>
 				<template #valueAlphaTile>{{students[0].person_id}}</template>

From 6a7de7417bf8ae2320fced31110ee578f0a16daa Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 27 Oct 2025 13:50:25 +0100
Subject: [PATCH 0905/1357] student view: reload after delete or upload

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

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 164030592..618be9df2 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -160,9 +160,9 @@ export default {
 			if(this.person_id) {
 				this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
 			}
-/*			else {
+			else {
 				this.$emit('reload');
-			}*/
+			}
 		},
 	},
 	template: `

From 259c2aec14b7f8a1cf269bb023d5805e5a2a1e96 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 27 Oct 2025 14:40:56 +0100
Subject: [PATCH 0906/1357] =?UTF-8?q?load=20projektarbeiten=20for=20studie?=
 =?UTF-8?q?ng=C3=A4nge=20->=20assistenz=20page;=20speed=20dial=20position?=
 =?UTF-8?q?=20rework;=20automagicmodal=20logic=20fix;=20activeTabIndex=20b?=
 =?UTF-8?q?y=20date=20in=20detail=20views;=20tooltips=20on=20icons;=20$cap?=
 =?UTF-8?q?italize=20phrasen=20to=20ensure=20capitalization;=20phrasenprom?=
 =?UTF-8?q?ise=20&=20resolve=20similar=20to=20anw;=20modal=20component=20e?=
 =?UTF-8?q?mits=20fullscreen=20event=20now;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/routes.php                 |   1 +
 application/controllers/Cis/Abgabetool.php    |  22 +-
 .../controllers/api/frontend/v1/Abgabe.php    |  43 +-
 .../models/education/Paabgabetyp_model.php    |   2 +-
 .../models/education/Projektarbeit_model.php  | 148 ++++-
 application/views/Cis/Abgabetool.php          |   1 +
 public/js/api/factory/abgabe.js               |   7 +
 public/js/apps/Abgabetool/Abgabetool.js       |   2 +
 public/js/apps/Dashboard/Fhc.js               |  12 +-
 public/js/components/Bootstrap/Modal.js       |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 449 +++++++++------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 191 ++++---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 534 ++++++++++++++++++
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  45 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  64 ++-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 public/js/helpers/StringHelpers.js            |   4 +
 system/phrasesupdate.php                      | 122 +++-
 vilesci/lehre/abgabe_assistenz.php            |   6 +-
 19 files changed, 1345 insertions(+), 314 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
 create mode 100644 public/js/helpers/StringHelpers.js

diff --git a/application/config/routes.php b/application/config/routes.php
index 9a3651f24..11315f47d 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -65,6 +65,7 @@ $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 
+$route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
 $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
 $route['Abgabetool/Student/.*'] = 'Cis/Abgabetool/Student/$1';
diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 35970b6e9..223af86f5 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -15,9 +15,10 @@ class Abgabetool extends Auth_Controller
 		parent::__construct([
 			'index' => self::PERM_LOGGED,
 			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'Mitarbeiter' => self::PERM_LOGGED,
-			'Student' => self::PERM_LOGGED,
-			'Deadlines' => self::PERM_LOGGED
+			'Mitarbeiter' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'Assistenz' => array('basis/abgabe_assistenz:rw'),
+			'Student' =>  array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'Deadlines' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
 		]);
 	}
 
@@ -29,6 +30,7 @@ class Abgabetool extends Auth_Controller
 	 */
 	public function index()
 	{
+		// TODO: do we even need this?
 
 		$viewData = array(
 			'uid'=>getAuthUID(),
@@ -71,6 +73,20 @@ class Abgabetool extends Auth_Controller
 		}
 	}
 
+	public function Assistenz()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		if(defined('CIS4') && CIS4) {
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
+		} else {
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz']);
+		}
+	}
+	
 	public function Deadlines()
 	{
 
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 8586c99bc..4a9706789 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -38,7 +38,8 @@ class Abgabe extends FHCAPI_Controller
 			'postSerientermin' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'fetchDeadlines' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'getPaAbgabetypen' => self::PERM_LOGGED,
-			'getNoten' => self::PERM_LOGGED
+			'getNoten' => self::PERM_LOGGED,
+			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw')
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -148,6 +149,9 @@ class Abgabe extends FHCAPI_Controller
 					$pa->email = $data[0]->private_email;
 				}
 				if($pa->zweitbetreuer_person_id !== null) {
+					
+					// TODO: dont have to wait for 2038, see assistenz query in projektarbeit_model
+					
 					// zweitbetreuer info since the 'getStudentProjektarbeitenWithBetreuer' query got quiete large,
 					// enjoy optimizing that one in 2038. we need this to render a string like
 					// Zweitbegutachter: FH-Prof. PD DI Dr. techn. Vorname Nachname MBA
@@ -850,4 +854,41 @@ class Abgabe extends FHCAPI_Controller
 			$subject
 		);
 	}
+	
+	public function getProjektarbeitenForStudiengang() {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$studiengang_kz = $this->input->get("studiengang_kz",TRUE);
+
+		if (!isset($studiengang_kz) || isEmptyString($studiengang_kz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// TODO revert arr return new/old
+//		$arr = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
+//		$result = $arr[0];
+		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
+		$projektarbeiten = $this->getDataOrTerminateWithError($result);
+
+		$mapFunc = function($projektarbeit) {
+			return $projektarbeit->projektarbeit_id;
+		};
+		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten);
+		
+		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret);
+		
+		// map the abgaben into projektarbeiten
+		
+		foreach($projektarbeiten as $projektarbeit) {
+			$filterFunc = function($projektabgabe) use ($projektarbeit) {
+				return $projektabgabe->projektarbeit_id == $projektarbeit->projektarbeit_id;
+			};
+
+			
+			$projektarbeit->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
+			
+		}
+		
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
+	}
 }
\ No newline at end of file
diff --git a/application/models/education/Paabgabetyp_model.php b/application/models/education/Paabgabetyp_model.php
index fce46b3a0..034daca44 100644
--- a/application/models/education/Paabgabetyp_model.php
+++ b/application/models/education/Paabgabetyp_model.php
@@ -13,7 +13,7 @@ class Paabgabetyp_model extends DB_Model
 	}
 	
 	public function getAll() {
-		$qry = "SELECT * FROM campus.tbl_paabgabetyp";
+		$qry = "SELECT * FROM campus.tbl_paabgabetyp ORDER BY bezeichnung";
 
 		return $this->execReadOnlyQuery($qry);
 	}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 76908600c..821a8d007 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -183,12 +183,32 @@ class Projektarbeit_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
 
+	public function getProjektarbeitenAbgabetermine($projektarbeiten_ids) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					campus.tbl_paabgabe.projektarbeit_id,
+					campus.tbl_paabgabe.fixtermin,
+					campus.tbl_paabgabe.kurzbz,
+					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabe.note,
+					campus.tbl_paabgabe.upload_allowed,
+					campus.tbl_paabgabe.beurteilungsnotiz,
+					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
+					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabe.abgabedatum,
+					campus.tbl_paabgabe.insertvon
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id IN ?
+				ORDER BY campus.tbl_paabgabe.datum";
+
+		return $this->execReadOnlyQuery($qry, array($projektarbeiten_ids));
+	}
+
 	public function getProjektbetreuerAnrede($bperson_id) {
-		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
+		$qry_betr="SELECT DISTINCT trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
 						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
 						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
-						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
-						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
+						LEFT JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
+						LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
 						WHERE public.tbl_person.person_id= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
@@ -298,6 +318,128 @@ class Projektarbeit_model extends DB_Model
 		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
 		return $version === null ? null : $version->isCurrent;
 	}
+	
+	public function getProjektarbeitenForStudiengang($studiengang_kz) {
+		
+		// TODO: select less fields, a lot of useless data over here
+		
+		$old_qry = "SELECT *,
+				   (SELECT orgform_kurzbz
+					FROM tbl_prestudentstatus
+					WHERE prestudent_id=(Select prestudent_id from tbl_student where student_uid=xy.uid limit 1)
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+				   ) as organisationsform
+			FROM (SELECT DISTINCT ON(tbl_projektarbeit.projektarbeit_id) public.tbl_studiengang.bezeichnung as stgbez,tbl_projekttyp.bezeichnung AS prjbez,* FROM lehre.tbl_projektarbeit
+						  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
+						  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
+						  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+						  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+						  LEFT JOIN public.tbl_studiengang using(studiengang_kz)
+						  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+				  WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+					AND public.tbl_benutzer.aktiv
+					AND lehre.tbl_projektarbeit.note IS NULL
+					AND public.tbl_studiengang.studiengang_kz = ?
+				  ORDER BY tbl_projektarbeit.projektarbeit_id desc) as xy
+			ORDER BY nachname";
+		
+		
+		$new_qry = "
+		SELECT
+		DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
+			tbl_projektarbeit.projekttyp_kurzbz,
+			tbl_projektarbeit.titel,
+			tbl_projektarbeit.projektarbeit_id,
+			tbl_studiengang.typ, tbl_studiengang.kurzbz,
+			student_benutzer.uid as student_uid,
+			student_person.vorname as student_vorname,
+			student_person.nachname as student_nachname,
+			tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+			betreuer_benutzer.uid as betreuer_benutzer_uid,
+			betreuer_person.vorname as betreuer_vorname,
+			betreuer_person.nachname as betreuer_nachname,
+			lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
+			lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
+			lehre.tbl_projektarbeit.sprache               as sprache,
+			lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
+			lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
+			lehre.tbl_projektarbeit.abstract              as abstract,
+			lehre.tbl_projektarbeit.abstract_en           as abstract_en,
+			lehre.tbl_projektarbeit.insertamum            as insertamum,
+			(
+			SELECT orgform_kurzbz
+			 FROM tbl_prestudentstatus
+			 WHERE prestudent_id = (SELECT prestudent_id
+									FROM tbl_student
+									WHERE student_uid = student_benutzer.uid
+									LIMIT 1)
+			 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+			 LIMIT 1
+			 )
+				as organisationsform,
+			(
+				SELECT person_id
+				 FROM lehre.tbl_projektbetreuer
+				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+				 LIMIT 1
+			 )
+				AS zweitbetreuer_person_id,
+			(
+				SELECT betreuerart_kurzbz
+				 FROM lehre.tbl_projektbetreuer
+				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+				 LIMIT 1
+			 )                                     
+				AS zweitbetreuer_betreuerart_kurzbz,
+			(
+				SELECT tbl_betreuerart.beschreibung
+				 FROM lehre.tbl_projektbetreuer
+						  JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
+				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+				 LIMIT 1
+			 )                                     
+				AS zweitbetreuer_betreuerart_beschreibung,
+			(
+				SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
+							 COALESCE(titelpost, ''))
+				 FROM public.tbl_person
+						  JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+						  LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+						  LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+				 LIMIT 1
+			 )                                    
+				as zweitbetreuer_full_name
+			   FROM lehre.tbl_projektarbeit
+						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
+						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
+						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)	
+			       		LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+						LEFT JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
+						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
+			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+				 AND student_benutzer.aktiv AND (lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter')
+		--   AND lehre.tbl_projektarbeit.note IS NULL
+		--   AND public.tbl_studiengang.studiengang_kz= 257
+				 AND public.tbl_studiengang.studiengang_kz = ?
+			   ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC
+		";
+//		$oldres = $this->execReadOnlyQuery($old_qry, array($studiengang_kz));
+//		$newres = $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
+//		return array($newres, $oldres);
+		
+		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
+	}
 
 	/**
 	 * Holt sich Version der Projektarbeit.
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 1b1994e0a..af259ca48 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -24,6 +24,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Abgabetool/Abgabetool.js',
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index c51da95fe..8f4ba61de 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -100,4 +100,11 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getNoten'
 		};
 	},
+	getProjektarbeitenForStudiengang(studiengang_kz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getProjektarbeitenForStudiengang',
+			params: { studiengang_kz }
+		};
+	}
 };
\ No newline at end of file
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
index 1336276af..ac73779e8 100644
--- a/public/js/apps/Abgabetool/Abgabetool.js
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -2,6 +2,7 @@ import PluginsPhrasen from '../../plugins/Phrasen.js';
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
+import {capitalize} from "../../helpers/StringHelpers.js";
 
 const app = Vue.createApp({
 	name: 'AbgabetoolApp',
@@ -51,6 +52,7 @@ const app = Vue.createApp({
 		</template>
 	`
 });
+app.config.globalProperties.$capitalize = capitalize;
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 31c59ef36..0a11c4986 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -14,11 +14,13 @@ import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
 
 import ApiRenderers from '../../api/factory/renderers.js';
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
+import {capitalize} from "../../helpers/StringHelpers.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -55,6 +57,12 @@ const router = VueRouter.createRouter({
 			component: AbgabetoolMitarbeiter,
 			props: true
 		},
+		{
+			path: `/Cis/Abgabetool/Assistenz`,
+			name: 'AbgabetoolAssistenz',
+			component: AbgabetoolAssistenz,
+			props: true
+		},
 		{
 			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
 			name: 'DeadlineOverview',
@@ -275,6 +283,7 @@ const app = Vue.createApp({
 		}
 	},
 	async created(){
+		
 		await this.$api
 			.call(ApiRenderers.loadRenderers())
 			.then(res => res.data)
@@ -315,6 +324,7 @@ const app = Vue.createApp({
 	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);
+		
 	},
 	beforeUnmount() {
 		document.removeEventListener('click', this.handleClick);
@@ -323,7 +333,7 @@ const app = Vue.createApp({
 
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
-
+app.config.globalProperties.$capitalize = capitalize;
 app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index a84d9d8d7..15253cfe8 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -46,7 +46,8 @@ export default {
 		"hiddenBsModal",
 		"hidePreventedBsModal",
 		"showBsModal",
-		"shownBsModal"
+		"shownBsModal",
+		"toggleFullscreen"
 	],
 	methods: {
 		dispose() {
@@ -66,6 +67,7 @@ export default {
 		},
 		toggleFullscreen() {
 			this.fullscreen = !this.fullscreen
+			this.$emit('toggleFullscreen')
 		}
 	},
 	mounted() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index fc804ea3a..fa202a020 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -27,12 +27,15 @@ export const AbgabeMitarbeiterDetail = {
 		projektarbeit: {
 			type: Object,
 			default: null
+		},
+		isFullscreen: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
 		return {
 			showAutomagicModalPhrase: false,
-			sdModel: [],
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
@@ -60,8 +63,8 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
-		openZusatzdatenModal(termin) {
-				
+		getPlaceholderTermin(termin) {
+			return termin?.bezeichnung?.bezeichnung ?? this.$p.t('abgabetool/abgabetypPlaceholder')	
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
@@ -97,10 +100,10 @@ export const AbgabeMitarbeiterDetail = {
 					// really bad feature imo that will be annoying to deal with
 					
 					// termin is completely new and has negative note
-					const savedNewWithNegative = !existingTerminRes && !newTerminRes.note?.positiv
+					const savedNewWithNegative = !existingTerminRes && !newTerminRes.note?.positiv && newTerminRes.note !== null
 
 					// termin existed previously + oldTermin had different note/positive note or no note at all
-					const savedExistingNoteAsNegativeAndWasNotNegativeBefore = existingTerminRes && !newTerminRes.note?.positiv && (existingTerminRes.note?.positiv || existingTerminRes.note === undefined)
+					const savedExistingNoteAsNegativeAndWasNotNegativeBefore = existingTerminRes && !newTerminRes.note?.positiv && newTerminRes.note !== null && (existingTerminRes.note?.positiv || existingTerminRes.note === undefined)
 
 					const openModalDueToNegativeBeurteilung = savedNewWithNegative || savedExistingNoteAsNegativeAndWasNotNegativeBefore
 					if(openModalDueToNegativeBeurteilung) {
@@ -198,6 +201,9 @@ export const AbgabeMitarbeiterDetail = {
 		getOptionLabelAbgabetyp(option){
 			return option.bezeichnung
 		},
+		getOptionDisabled(option) {
+			return !option.aktiv
+		},
 		getNotenOptionLabel(option) {
 			return option.bezeichnung
 		},
@@ -298,8 +304,23 @@ export const AbgabeMitarbeiterDetail = {
 			
 	},
 	computed: {
-		activeAbgabeTypeOptions() {
-			return this.abgabeTypeOptions?.filter(opt => opt.aktiv === true)
+		getActiveIndexTabArray() {
+			// here we try to do mind reading logic by assuming which abgabetermine are the most relevant to the current user
+
+			// lets try to take the termin with nearest date and watch who complains and why
+			let closestIndex = -1;
+			let minDiff = Infinity;
+			const today = new Date();
+
+			this.projektarbeit.abgabetermine.forEach((obj, i) => {
+				const diff = Math.abs(new Date(obj.datum) - today);
+				if (diff < minDiff) {
+					minDiff = diff;
+					closestIndex = i;
+				}
+			});
+			
+			return [closestIndex]
 		},
 		getEid() {
 			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
@@ -323,12 +344,16 @@ export const AbgabeMitarbeiterDetail = {
 			})
 			return qgatefound
 		},
-		getPageWrapperStyle() {
-			return 'position: relative; min-height: 100vh;'
-		},
 		getSpeedDialStyle() {
 			return 'position: static !important;'
 		},
+		getSpeedDialWrapperStyle() {
+			// fullscreen -> position wrapper fixed in right bottom corner of viewport/screen
+			if(this.isFullscreen) return 'position: fixed; z-index: 9999; bottom: 24px; right: 24px;'
+			
+			// non fullscreen -> wrapper is positioned on right bottom corner of modal, wherever that is
+			return 'position: absolute; z-index: 9999; bottom: -28px; right: -28px;'
+		},
 		getTooltipVerspaetet() {
 			return {
 				value: this.$p.t('abgabetool/c4tooltipVerspaetet'),
@@ -358,6 +383,24 @@ export const AbgabeMitarbeiterDetail = {
 				value: this.$p.t('abgabetool/c4tooltipAbgegeben'),
 				class: "custom-tooltip"
 			}
+		},
+		getTooltipFixtermin() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipFixtermin'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipNotAllowedToSave() {
+			return {
+				value: this.$p.t('abgabetool/c4notAllowedToEditAbgabeTermin'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipNotAllowedToDelete() {
+			return {
+				value: this.$p.t('abgabetool/c4notAllowedToDeleteAbgabeTermin'),
+				class: "custom-tooltip"
+			}
 		}
 	},
 	watch: {
@@ -378,23 +421,23 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-		<bs-modal 
-			id="innerModalNewAbgabe" 
-			ref="modalContainerCreateNewAbgabe" 
-			class="bootstrap-prompt" 
-			dialogClass="bordered-modal modal-lg" 
-			:backdrop="true"
-			@hideBsModal="console.log('hideBsModal'); showAutomagicModalPhrase=false;"
-		>
-			<template v-slot:title>
-				<div>
-					{{ $p.t('abgabetool/c4newAbgabetermin') }}
-				</div>
-			</template>
-			<template v-slot:default>
-				<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
+	<bs-modal 
+		id="innerModalNewAbgabe" 
+		ref="modalContainerCreateNewAbgabe" 
+		class="bootstrap-prompt" 
+		dialogClass="bordered-modal modal-lg" 
+		:backdrop="true"
+		@hideBsModal="console.log('hideBsModal'); showAutomagicModalPhrase=false;"
+	>
+		<template v-slot:title>
+			<div>
+				{{ $p.t('abgabetool/c4newAbgabetermin') }}
+			</div>
+		</template>
+		<template v-slot:default>
+			<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
 <!--				minheight to avoid z-index magic for the datepicker inside the modal inside the modal...-->
-				<div v-if="newTermin">
+			<div v-if="newTermin">
 <!--				fixtermin is not an option for lektors-->
 <!--					<div class="row">-->
 <!--						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
@@ -407,12 +450,132 @@ export const AbgabeMitarbeiterDetail = {
 <!--							</Checkbox>-->
 <!--						</div>-->
 <!--					</div>-->
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+					<div class="col-8 col-md-9">
+						<VueDatePicker
+							v-model="newTermin.datum"
+							:clearable="false"
+							:enable-time-picker="false"
+							:format="formatDate"
+							:text-input="true"
+							auto-apply>
+						</VueDatePicker>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
+					<div class="col-8 col-md-9">
+						<Dropdown
+							:style="{'width': '100%'}"
+							v-model="newTermin.bezeichnung"
+							:options="abgabeTypeOptions"
+							:optionLabel="getOptionLabelAbgabetyp"
+							scrollHeight="300px">
+						</Dropdown>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+					<div class="col-8 col-md-9">
+						<Checkbox
+							v-model="newTermin.upload_allowed"
+							:binary="true"
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
+				</div>
+				<div class="row mt-2">
+					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-8 col-md-9">
+						<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 60"></Textarea>
+					</div>
+				</div>	
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="handleSaveNewAbgabe(newTermin)">{{$capitalize( $p.t('abgabetool/c4saveNewAbgabetermin') )}}</button>
+		</template>
+	</bs-modal>
+
+	<div v-if="projektarbeit">
+		
+		<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">
+			<SpeedDial
+				:style="getSpeedDialStyle"
+				:model="speedDialItems" 
+				direction="up"
+				:radius="80"
+				type="linear"
+				buttonClass="p-button-rounded p-button-lg p-button-primary"
+				:tooltipOptions="{ position: 'left' }"
+			/>
+		</div>
+		
+		<h5>{{$capitalize( $p.t('abgabetool/c4abgabeMitarbeiterbereich') )}}</h5>
+
+		<div class="row">
+			<div class="col-6">
+				<p> {{projektarbeit?.student}}</p>
+				<p> {{projektarbeit?.titel}}</p>
+				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+			</div>
+			<div v-if="!isMobile" class="col-3"></div>
+			<div :class="isMobile ? 'col-6' : 'col-3'">
+				<SpeedDial
+					:model="speedDialItems" 
+					direction="left"
+					:radius="80"
+					type="linear"
+					buttonClass="p-button-rounded p-button-lg p-button-primary"
+					:tooltipOptions="{ position: 'down' }"
+				/>
+			</div>
+		</div>
+		
+		<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
+			<template v-for="termin in this.projektarbeit?.abgabetermine">
+				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
+					<template #header>
+						<div class="d-flex row w-100">
+							<div class="col-auto" style="transform: translateX(-62px)">
+								<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+							</div>
+							<div class="col-auto text-start" style="min-width: max(150px, 15%); max-width: min(300px, 30%); transform: translateX(-30px)">
+								<span>{{ termin?.bezeichnung?.bezeichnung }}</span>
+							</div>
+							<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
+								<span>{{ formatDate(termin.datum, false) }}</span>
+							</div>
+							<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
+								<i  v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
+							</div>
+						</div>				
+					</template>
+<!--						<div class="row">-->
+<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>-->
+<!--							<div class="col-8 col-md-9">-->
+<!--								<Checkbox -->
+<!--									v-model="termin.fixtermin"-->
+<!--									disabled-->
+<!--									:binary="true" -->
+<!--									:pt="{ root: { class: 'ml-auto' }}"-->
+<!--								>-->
+<!--								</Checkbox>-->
+<!--							</div>-->
+<!--						</div>-->
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 						<div class="col-8 col-md-9">
 							<VueDatePicker
-								v-model="newTermin.datum"
+								v-model="termin.datum"
 								:clearable="false"
+								:disabled="!termin.allowedToSave"
 								:enable-time-picker="false"
 								:format="formatDate"
 								:text-input="true"
@@ -421,196 +584,106 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
 						<div class="col-8 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
-								v-model="newTermin.bezeichnung"
-								:options="activeAbgabeTypeOptions"
+								:disabled="!termin.allowedToSave"
+								:placeholder="getPlaceholderTermin(termin)"
+								v-model="termin.bezeichnung"
+								@change="handleChangeAbgabetyp(termin)"
+								:options="abgabeTypeOptions"
 								:optionLabel="getOptionLabelAbgabetyp"
-								scrollHeight="300px">
+								:optionDisabled="getOptionDisabled">
 							</Dropdown>
 						</div>
 					</div>
-					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
+					<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
 						<div class="col-8 col-md-9">
 							<Checkbox
-								v-model="newTermin.upload_allowed"
+								v-model="termin.upload_allowed"
 								:binary="true"
 								:pt="{ root: { class: 'ml-auto' }}"
 							>
 							</Checkbox>
 						</div>
 					</div>
-					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 60"></Textarea>
+							<Dropdown
+								:style="{'width': '100%'}"
+								v-model="termin.note"
+								:options="allowedNotenOptions"
+								:optionLabel="getNotenOptionLabel">
+							</Dropdown>
 						</div>
-					</div>	
-				</div>
-			</template>
-			<template v-slot:footer>
-				<button type="button" class="btn btn-primary" @click="handleSaveNewAbgabe(newTermin)">{{ $p.t('abgabetool/c4saveNewAbgabetermin') }}</button>
-			</template>
-		</bs-modal>
-
-		<div v-if="projektarbeit">
-			
-			<div style="position: fixed; bottom: 24px; right: 24px; z-index: 9999;">
-				<SpeedDial
-					:style="getSpeedDialStyle"
-					:model="speedDialItems" 
-					direction="up"
-					:radius="80"
-					type="linear"
-					buttonClass="p-button-rounded p-button-lg p-button-primary"
-					:tooltipOptions="{ position: 'left' }"
-				/>
-			</div>
-			
-			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
-
-			<div class="row">
-				<div class="col-6">
-					<p> {{projektarbeit?.student}}</p>
-					<p> {{projektarbeit?.titel}}</p>
-					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
-				</div>
-			</div>
-			
-			<Accordion :multiple="true" :activeIndex="[0]">
-				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
-						<template #header>
-							<div class="d-flex row w-100">
-								<div class="col-auto" style="transform: translateX(-62px)">
-									<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
-								</div>
-								<div class="col-6 text-start">
-									<span>{{getAccTabHeaderForTermin(termin)}}</span>
-								</div>
-							</div>				
-						</template>
-						<div class="row">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
-							<div class="col-8 col-md-9">
-<!--							always keep fixtermin checkbox disabled for mitarbeiter tool -->
-								<Checkbox 
-									v-model="termin.fixtermin"
-									disabled
-									:binary="true" 
-									:pt="{ root: { class: 'ml-auto' }}"
-								>
-								</Checkbox>
-							</div>
+					</div>
+					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
+						<div class="col-8 col-md-9">
+							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
-						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
-							<div class="col-8 col-md-9">
-								<VueDatePicker
-									v-model="termin.datum"
-									:clearable="false"
-									:disabled="!termin.allowedToSave"
-									:enable-time-picker="false"
-									:format="formatDate"
-									:text-input="true"
-									auto-apply>
-								</VueDatePicker>
-							</div>
+					</div>
+					
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+						<div class="col-8 col-md-9">
+							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
-						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-							<div class="col-8 col-md-9">
-								<Dropdown
-									:style="{'width': '100%'}"
-									:disabled="!termin.allowedToSave"
-									v-model="termin.bezeichnung"
-									@change="handleChangeAbgabetyp(termin)"
-									:options="activeAbgabeTypeOptions"
-									:optionLabel="getOptionLabelAbgabetyp">
-								</Dropdown>
-							</div>
+					</div>
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
+						<div class="col-8 col-md-9">
+							<template v-if="termin?.abgabedatum">
+								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+									<a> {{$capitalize( $p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+								</button>							
+							</template>
+							<template v-else>
+								{{ $capitalize( $p.t('abgabetool/c4nochNichtsAbgegeben') )}}
+							</template>
 						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4upload_allowed')}}</div>
-							<div class="col-8 col-md-9">
-								<Checkbox
-									v-model="termin.upload_allowed"
-									:binary="true"
-									:pt="{ root: { class: 'ml-auto' }}"
-								>
-								</Checkbox>
-							</div>
-						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
-							<div class="col-8 col-md-9">
-								<Dropdown
-									:style="{'width': '100%'}"
-									v-model="termin.note"
-									:options="allowedNotenOptions"
-									:optionLabel="getNotenOptionLabel">
-								</Dropdown>
-							</div>
-						</div>
-						<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGatev2')}}</div>
-							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
-							</div>
-						</div>
-						
-						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
-							</div>
-						</div>
-						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-							<div class="col-8 col-md-9">
-								<template v-if="termin?.abgabedatum">
-									{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-									<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-										<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
-									</button>							
-								</template>
-								<template v-else>
-									{{ $p.t('abgabetool/c4nochNichtsAbgegeben') }}
-								</template>
-							</div>
-						</div>
-						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">
+					</div>
+					<div class="row mt-2">
+						<div class="col-4 col-md-3 fw-bold">
 <!--								 TODO: row description? -->
-							</div>
-							<div class="col-8 col-md-9">
-								<div class="row">
-									<div class="col-auto">
-										<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
-											{{ $p.t('abgabetool/c4save') }}
+						</div>
+						<div class="col-8 col-md-9">
+							<div class="row">
+								<div class="col-auto">
+									<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
+										{{ $capitalize( $p.t('abgabetool/c4save') )}}
+										<i class="fa-solid fa-floppy-disk"></i>
+									</button>
+									<div v-else v-tooltip.right="getTooltipNotAllowedToSave">
+										<button disabled style="max-height: 40px;" class="btn btn-primary border-0">
+											{{$capitalize( $p.t('abgabetool/c4save') )}}
 											<i class="fa-solid fa-floppy-disk"></i>
 										</button>
 									</div>
-									<div class="col-auto">
-										<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-danger border-0" @click="handleDeleteTermin(termin)">
-											{{ $p.t('abgabetool/c4delete') }}
+								</div>
+								<div class="col-auto">
+									<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" style="max-height: 40px;" class="btn btn-danger border-0" @click="handleDeleteTermin(termin)">
+										{{$capitalize( $p.t('abgabetool/c4delete') )}}
+										<i class="fa-solid fa-trash"></i>
+									</button>
+									<div v-else v-tooltip.right="getTooltipNotAllowedToDelete">
+										<button disabled style="max-height: 40px;" class="btn btn-danger border-0">
+											{{$capitalize( $p.t('abgabetool/c4delete') )}}
 											<i class="fa-solid fa-trash"></i>
 										</button>
 									</div>
 								</div>
 							</div>
 						</div>
-					</AccordionTab>
-				</template>
-			</Accordion>
-		 </div>
+					</div>
+				</AccordionTab>
+			</template>
+		</Accordion>
+	 </div>
 `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index f79df80b5..9c1682537 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -48,7 +48,7 @@ export const AbgabeStudentDetail = {
 	methods: {
 		async validate(termin, endupload = false) {
 			if(!termin.file.length) {
-				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
+				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningChooseFile')));
 				return false
 			}
 			
@@ -57,49 +57,49 @@ export const AbgabeStudentDetail = {
 				// check these input fields for length of entry
 				if(this.form['abstract'].length < 100 && await this.$fhcAlert.confirm({
 					message: this.$p.t('abgabetool/warningShortAbstract'),
-					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
 				}
 
 				if(this.form['abstract_en'].length < 100 && await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/warningShortAbstractEn'),
-					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					message: this.$capitalize(this.$p.t('abgabetool/warningShortAbstractEn')),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
 				}
 
 				if(this.form['schlagwoerter'].length < 50 && await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/warningShortSchlagwoerter'),
-					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerter')),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
 				}
 
 				if(this.form['schlagwoerter_en'].length < 50 && await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/warningShortSchlagwoerterEn'),
-					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerterEn')),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
 				}
 
 				if(this.form['seitenanzahl'] <= 5 && await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/warningSmallSeitenanzahl'),
-					acceptLabel: this.$p.t('abgabetool/c4AcceptAndProceed'),
+					message: this.$capitalize(this.$p.t('abgabetool/warningSmallSeitenanzahl')),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$p.t('abgabetool/c4Cancel'),
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
 					rejectClass: 'btn btn-outline-secondary'
 				}) === false) {
 					return false
@@ -192,13 +192,13 @@ export const AbgabeStudentDetail = {
 		},
 		handleUploadRes(res, termin) {
 			if(res.meta.status == "success") {
-				this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/c4fileUploadSuccessv3'))
+				this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4fileUploadSuccessv3')))
 
 				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
 				termin.abgabedatum = new Date().toISOString().split('T')[0];
 				
 			} else {
-				this.$fhcAlert.alertError(this.$p.t('abgabetool/c4fileUploadErrorv3'))
+				this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4fileUploadErrorv3')))
 			}
 			
 			if(res.meta.signaturInfo) {
@@ -262,8 +262,26 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	computed: {
+		getActiveIndexTabArray() {
+			// here we try to do mind reading logic by assuming which abgabetermine are the most relevant to the current user
+
+			// lets try to take the termin with nearest date and watch who complains and why
+			let closestIndex = -1;
+			let minDiff = Infinity;
+			const today = new Date();
+
+			this.projektarbeit.abgabetermine.forEach((obj, i) => {
+				const diff = Math.abs(new Date(obj.datum) - today);
+				if (diff < minDiff) {
+					minDiff = diff;
+					closestIndex = i;
+				}
+			});
+
+			return [closestIndex]
+		},
 		getEid() {
-			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
+			return this.$capitalize(this.$p.t('abgabetool/c4eidesstattlicheErklaerung'))
 		},
 		getAllowedToSendEndupload() {
 			return !this.eidAkzeptiert
@@ -280,37 +298,56 @@ export const AbgabeStudentDetail = {
 		},
 		getTooltipVerspaetet() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipVerspaetet'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerspaetet')),
 				class: "custom-tooltip"
 			}
 		},
 		getTooltipVerpasst() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipVerpasst'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerpasst')),
 				class: "custom-tooltip"
 			}
 		},
 		getTooltipAbzugeben() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipAbzugeben'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbzugeben')),
 				class: "custom-tooltip"
 			}
 		},
 		getTooltipStandard() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipStandard'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandard')),
 				class: "custom-tooltip"
 			}
 		},
 		getTooltipAbgegeben() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipAbgegeben'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgegeben')),
 				class: "custom-tooltip"
 			}
+		},
+		getTooltipFixtermin() {
+			return {
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipFixtermin')),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipNotAllowedToUpload() {
+			if(this.isViewMode) {
+				return {
+					value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedInViewMode')),
+					class: "custom-tooltip"
+				}
+			} else {
+				return {
+					value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegular')),
+					class: "custom-tooltip"
+				}
+			}
 		}
 	},
 	created() {
-
+		
 	},
 	mounted() {
 
@@ -320,16 +357,15 @@ export const AbgabeStudentDetail = {
 			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
 		</div>
 
-
 		<div v-if="projektarbeit">
 		
-			<h5>{{$p.t('abgabetool/c4abgabeStudentenbereich')}}</h5>
+			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
 			<div class="row">
 				<p> {{projektarbeit?.betreuer}}</p>
 				<p> {{projektarbeit?.titel}}</p>
 			</div>
 			
-			<Accordion :multiple="true" :activeIndex="[0]">
+			<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 						<template #header>
@@ -341,26 +377,32 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
 									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 								</div>
-								<div class="col-6 text-start">
-									<span>{{getAccTabHeaderForTermin(termin)}}</span>
+								<div class="col-auto text-start" style="min-width: max(150px, 15%); max-width: min(300px, 30%); transform: translateX(-30px)">
+									<span>{{ termin?.bezeichnung }}</span>
+								</div>
+								<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
+									<span>{{ formatDate(termin.datum, false) }}</span>
+								</div>
+								<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
+									<i v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
 								</div>
 							</div>				
 						</template>
-						<div class="row">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
-							<div class="col-8 col-md-9">
-								<Checkbox 
-									disabled
-									v-model="termin.fixtermin"
-									:binary="true" 
-									:pt="{ root: { class: 'ml-auto' }}"
-								>
-								</Checkbox>
-							</div>
-						</div>
+<!--						<div class="row">-->
+<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>-->
+<!--							<div class="col-8 col-md-9">-->
+<!--								<Checkbox -->
+<!--									disabled-->
+<!--									v-model="termin.fixtermin"-->
+<!--									:binary="true" -->
+<!--									:pt="{ root: { class: 'ml-auto' }}"-->
+<!--								>-->
+<!--								</Checkbox>-->
+<!--							</div>-->
+<!--						</div>-->
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 							<div class="col-8 col-md-9">
 								<VueDatePicker
 									v-model="termin.datum"
@@ -375,57 +417,56 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
 							<div class="col-8 col-md-9">
 								{{ termin.bezeichnung }}
 							</div>
 						</div>
 						
-						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4note')}}</div>
+						<div class="row mt-2" v-if="termin.note">
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
 							<div class="col-8 col-md-9">
-								<div v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'" class="col-1 d-flex justify-content-start align-items-start">
+								<div class="col-1 d-flex justify-content-start align-items-start">
 									{{ getTerminNoteBezeichnung(termin) }}
 								</div>
 							</div>
 						</div>
 						
 						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4notizQualGatev2')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
 							<div class="col-8 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" disabled></Textarea>
 							</div>
 						</div>
 						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 							<div class="col-8 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
 							</div>
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 							<div class="col-8 col-md-9">
 								<template v-if="termin?.abgabedatum">
 									{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 									<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-										<a> {{$p.t('abgabetool/c4downloadAbgabe')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+										<a> {{$capitalize($p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 									</button>							
 								</template>
 								<template v-else>
-									{{ $p.t('abgabetool/c4nochNichtsAbgegeben') }}
+									{{ $capitalize( $p.t('abgabetool/c4nochNichtsAbgegeben') )}}
 								</template>
 							</div>
 						</div>
 						
 						<div class="row mt-2" v-if="termin.upload_allowed">
-							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fileupload')}}</div>
+							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fileupload') )}}</div>
 							<div class="col-8 col-md-9">
-								<div class="row">
+								<div class="row" v-if="termin?.allowedToUpload">
 									<div class="col-12 col-sm-6 mb-2">
 										<Upload 
-											:disabled="!termin?.allowedToUpload || isViewMode" 
 											accept=".pdf" 
 											v-model="termin.file"
 										></Upload>
@@ -434,9 +475,27 @@ export const AbgabeStudentDetail = {
 										<button 
 											class="btn btn-primary border-0 w-100" 
 											@click="upload(termin)" 
-											:disabled="!termin.allowedToUpload || isViewMode"
 										>
-											{{$p.t('abgabetool/c4upload')}}
+											{{$capitalize( $p.t('abgabetool/c4upload') )}}
+											<i class="fa-solid fa-upload"></i>
+										</button>
+									</div>
+								</div>
+								<div class="row" v-else-if="!termin?.allowedToUpload || isViewMode" v-tooltip.right="getTooltipNotAllowedToUpload">
+									<div class="col-12 col-sm-6 mb-2">
+										<Upload 
+											disabled
+											accept=".pdf" 
+											v-model="termin.file"
+										></Upload>
+									</div>
+									<div class="col-12 col-sm-6">
+										<button 
+											class="btn btn-primary border-0 w-100" 
+											@click="upload(termin)" 
+											disabled
+										>
+											{{$capitalize( $p.t('abgabetool/c4upload') )}}
 											<i class="fa-solid fa-upload"></i>
 										</button>
 									</div>
@@ -454,7 +513,7 @@ export const AbgabeStudentDetail = {
 	 		dialogClass="bordered-modal modal-lg">
 			<template v-slot:title>
 				<div>
-					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
+					{{$capitalize( $p.t('abgabetool/c4enduploadZusatzdaten') )}}
 				</div>
 				<div class="row mb-3 align-items-start">
 					
@@ -463,13 +522,13 @@ export const AbgabeStudentDetail = {
 				</div>
 				<div class="row mb-3 align-items-start">
 					
-					<p class="ml-4 mr-4">{{$p.t('abgabetool/c4titel')}}: {{ projektarbeit?.titel }}</p>
+					<p class="ml-4 mr-4">{{$capitalize( $p.t('abgabetool/c4titel') )}}: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
 			<template v-slot:default>
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4Sprache') )}}</div>
 					<div class="row">
 						<Dropdown 
 							:style="{'width': '100%'}"
@@ -490,21 +549,21 @@ export const AbgabeStudentDetail = {
 <!--				-->
 <!--				</div>-->
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterGer') )}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter"></Textarea>
 					</div>
 				</div>
 				
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterEng') )}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter_en"></Textarea>
 					</div>
 				</div>
 				
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractGer') )}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract" rows="10" maxlength="5000"></Textarea>
 						<p>{{ form.abstract?.length ? form.abstract.length : 0 }} / 5000 characters</p>
@@ -512,7 +571,7 @@ export const AbgabeStudentDetail = {
 				</div>
 
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractEng') )}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract_en" rows="10" maxlength="5000"></Textarea>
 						<p>{{ form.abstract_en?.length ? form.abstract_en.length : 0 }} / 5000 characters</p>
@@ -520,7 +579,7 @@ export const AbgabeStudentDetail = {
 				</div>
 				
 				<div class="row mb-3 align-items-start">
-					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4seitenanzahl') )}}</div>
 					<div class="row">
 						<InputNumber 
 							v-model="form.seitenanzahl"
@@ -533,7 +592,7 @@ export const AbgabeStudentDetail = {
 					<div v-html="getEid"></div>
 					<div class="row">
 						<div class="col-9"></div>
-						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
+						<div class="col-2"><p>{{$capitalize( $p.t('abgabetool/c4gelesenUndAkzeptiert') )}}</p></div>
 						<div class="col-1">
 							
 							<Checkbox 
@@ -548,7 +607,7 @@ export const AbgabeStudentDetail = {
 				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" :disabled="getAllowedToSendEndupload" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
+				<button class="btn btn-primary" :disabled="getAllowedToSendEndupload" @click="triggerEndupload">{{$capitalize( $p.t('ui/hochladen') )}}</button>
 			</template>
 		</bs-modal>
 	 	
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
new file mode 100644
index 000000000..067ef3030
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -0,0 +1,534 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
+import VerticalSplit from "../../verticalsplit/verticalsplit.js"
+import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
+import ApiAbgabe from '../../../api/factory/abgabe.js'
+
+export const AbgabetoolAssistenz = {
+	name: "AbgabetoolAssistenz",
+	components: {
+		BsModal,
+		CoreFilterCmpt,
+		AbgabeDetail,
+		VerticalSplit,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea,
+		VueDatePicker
+	},
+	provide() {
+		return {
+			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
+			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
+			turnitin_link: Vue.computed(() => this.turnitin_link),
+			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
+		}
+	},
+	props: {
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			detailIsFullscreen: false,
+			showZweitbetreuerCol: false,
+			phrasenPromise: null,
+			phrasenResolved: false,
+			turnitin_link: null,
+			old_abgabe_beurteilung_link: null,
+			saving: false,
+			loading: false,
+			abgabeTypeOptions: null,
+			notenOptions: null,
+			allowedNotenOptions: null,
+			serienTermin: Vue.reactive({
+				datum: new Date(),
+				bezeichnung: {
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				kurzbz: ''
+			}),
+			showAll: false,
+			tabulatorUuid: Vue.ref(0),
+			selectedData: [],
+			domain: '',
+			student_uid: null,
+			detail: null,
+			detailOffset: 0,
+			projektarbeiten: null,
+			selectedProjektarbeit: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			abgabeTableOptions: {
+				minHeight: 250,
+				index: 'projektarbeit_id',
+				layout: 'fitDataStretch',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				selectable: true,
+				selectableCheck: this.selectionCheck,
+				rowHeight: 80,
+				columns: [
+					{
+						formatter: 'rowSelection',
+						titleFormatter: 'rowSelection',
+						titleFormatterParams: {
+							rowRange: "active" // Only toggle the values of the active filtered rows
+						},
+						hozAlign:"center",
+						headerSort: false,
+						frozen: true,
+						width: 70
+					},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, tooltip: false}
+					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', formatter: this.centeredTextFormatter, widthGrow: 1, visible: this.showZweitbetreuerCol}
+				],
+				persistence: false,
+			},
+			abgabeTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+				{
+					event: "cellClick",
+					handler: async (e, cell) => {
+						if(cell.getColumn().getField() === "details") {
+							this.setDetailComponent(cell.getValue())
+							this.undoSelection(cell)
+						} else if (cell.getColumn().getField() === "mail") {
+							this.undoSelection(cell)
+						}
+					}
+				},
+				{
+					event: "rowSelectionChanged",
+					handler: async(data) => {
+						this.selectedData = data
+					}
+				}
+			]};
+	},
+	methods: {
+		handleToggleFullscreenDetail() {
+			this.detailIsFullscreen = !this.detailIsFullscreen
+		},
+		getOptionLabelAbgabetyp(option){
+			return option.bezeichnung
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		undoSelection(cell) {
+			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
+			// but actually just revert it after the fact
+
+			const row = cell.getRow()
+			if(row.isSelected()) {
+				row.deselect();
+			}
+		},
+		selectionCheck(row) {
+			const data = row.getData()
+			if(data?.betreuerart_kurzbz == 'Zweitbegutachter') return false
+			return true
+		},
+		showDeadlines(){
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/Cis/Abgabetool/Deadlines'
+			window.open(link, '_blank')
+		},
+		toggleShowAll(showall) {
+			this.showAll = showall
+			this.loading = true
+			this.loadProjektarbeiten(showall, () => {
+				this.$refs.abgabeTable?.tabulator.redraw(true)
+				this.$refs.abgabeTable?.tabulator.setSort([]);
+				this.loading = false
+			})
+		},
+		openAddSeriesModal() {
+			this.$refs.modalContainerAddSeries.show()
+		},
+		addSeries() {
+			this.saving = true
+			this.$api.call(ApiAbgabe.postSerientermin(
+				this.serienTermin.datum.toISOString(),
+				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
+				this.serienTermin.bezeichnung.bezeichnung,
+				this.serienTermin.kurzbz,
+				this.selectedData?.map(projekt => projekt.projektarbeit_id)
+			)).then(res => {
+				if (res.meta.status === "success" && res.data) {
+					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
+					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
+					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
+				} else {
+					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
+				}
+			}).finally(()=>{
+				this.saving = false
+			})
+
+			this.$refs.modalContainerAddSeries.hide()
+		},
+		createInfoString(data) {
+			let str = '';
+
+			data.forEach(name => {
+				str += name
+				str += '; '
+			})
+
+			return str
+		},
+		isPastDate(date) {
+			return new Date(date) < new Date(Date.now())
+		},
+		setDetailComponent(details){
+			
+			const pa = this.projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+
+			// pa.isCurrent = res.data[1]
+
+			pa.abgabetermine.forEach(termin => {
+				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				termin.file = []
+
+				termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
+				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+
+				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
+
+			})
+			pa.student_uid = details.student_uid
+			pa.student = `${pa.vorname} ${pa.nachname}`
+
+			this.selectedProjektarbeit = pa
+
+			this.$refs.modalContainerAbgabeDetail.show()
+
+			
+		},
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+			if(!val) return
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
+		},
+		detailFormatter(cell) {
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
+		},
+		mailFormatter(cell) {
+			const val = cell.getValue()
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+		},
+		beurteilungFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			} else return '-'
+		},
+		pkzTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		abgabterminFormatter(termin) {
+			
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		buildMailToLink(abgabe) {
+			return 'mailto:' + abgabe.student_uid +'@'+ this.domain
+		},
+		buildPKZ(projekt) {
+			return `${projekt.student_uid} / ${projekt.matrikelnr}`
+		},
+		buildStg(projekt) {
+			return (projekt.typ + projekt.kurzbz)?.toUpperCase()
+		},
+		buildErstbetreuer(projekt) {
+			return projekt.betreuer_vorname + ' ' + projekt.betreuer_nachname + ' - ' + projekt.betreuerart + '(' + projekt.betreuer_benutzer_uid + ')'
+		},
+		buildZweitbetreuer(projekt) {
+			return projekt.zweitbetreuer_full_name ?? ''
+		},
+		setupData(data){
+			this.projektarbeiten = data[0]
+			this.domain = data[1]			
+			
+			const d = data[0].map(projekt => {
+				let mode = 'detailTermine'
+
+				// only show 2tbetreuer col if any projektarbeit has one
+				if(projekt.zweitbetreuer_full_name) this.showZweitbetreuerCol = true
+				
+				// first Abgabetermin in the past
+				projekt.abgabetermine.forEach(termin => {
+					const date = luxon.DateTime.fromISO(termin.datum)
+					termin.diff = date.diffNow('milliseconds')
+					
+					// console.log(termin.diff)
+				})
+				
+				// console.log('\n\n')
+					
+					
+				return {
+					...projekt,
+					abgabetermine: projekt.abgabetermine,
+					details: {
+						student_uid: projekt.uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+					},
+					pkz: this.buildPKZ(projekt),
+					beurteilung: projekt.beurteilungLink ?? null,
+					sem: projekt.studiensemester_kurzbz,
+					stg: this.buildStg(projekt),
+					mail: this.buildMailToLink(projekt),
+					erstbetreuer: this.buildErstbetreuer(projekt),
+					zweitbetreuer: this.buildZweitbetreuer(projekt),
+					typ: projekt.projekttyp_kurzbz,
+					titel: projekt.titel
+				}
+			})
+
+			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			this.$refs.abgabeTable.tabulator.setData(d);
+		},
+		loadProjektarbeiten(all = false, callback) {
+			this.loading = true
+			this.$api.call(ApiAbgabe.getProjektarbeitenForStudiengang(this.getCurrentStudiengang))
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				}).finally(() => {
+				if(callback) {
+					callback()
+				}
+			}).finally(()=>{
+				this.loading=false
+			})
+		},
+		loadAbgaben(details) {
+			return new Promise((resolve) => {
+				this.$api.call(ApiAbgabe.getStudentProjektabgaben(details))
+					.then(res => {
+						resolve(res)
+					})
+			})
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top - 80
+			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+
+			this.loadProjektarbeiten()
+
+			// this.$refs.verticalsplit.collapseBottom()
+			this.calcMaxTableHeight()
+
+		},
+		sendEmailBegutachter() {
+			// TODO: implement
+		},
+		sendEmailStudierende() {
+			// TODO: implement
+		}
+		
+	},
+	watch: {
+
+	},
+	computed: {
+		getCurrentStudiengang() {
+			// TODO: sophisticated logic pulling from default value by viewData or dropdown select
+			
+			return 257
+		}
+	},
+	created() {
+		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
+		// fetch config to avoid hard coded links
+		this.$api.call(ApiAbgabe.getConfig()).then(res => {
+			this.turnitin_link = res.data?.turnitin_link
+			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
+		}).catch(e => {
+			console.log(e)
+			this.loading = false
+		})
+
+		// fetch noten options
+		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
+		this.$api.call(ApiAbgabe.getNoten()).then(res => {
+			this.notenOptions = res.data
+			// TODO: more sophisticated way to filter for these two, in essence it is still hardcoded
+			this.allowedNotenOptions = this.notenOptions.filter(
+				opt => opt.bezeichnung === 'Bestanden'
+					|| opt.bezeichnung === 'Nicht bestanden'
+			)
+		}).catch(e => {
+			this.loading = false
+		})
+
+		// fetch abgabetypen options
+		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
+			this.abgabeTypeOptions = res.data
+		}).catch(e => {
+			this.loading = false
+		})
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<template v-if="phrasenResolved">
+		<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
+			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
+		</div>
+
+		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
+			dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{ $p.t('abgabetool/neueTerminserie') }}
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4zieldatum')}}
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabetypv2')}}
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabekurzbz')}}
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<div>
+							<VueDatePicker
+								style="width: 95%;"
+								v-model="serienTermin.datum"
+								:clearable="false"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
+						</div>				
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="serienTermin.bezeichnung"
+							:options="abgabeTypeOptions"
+							:optionLabel="getOptionLabelAbgabetyp">
+						</Dropdown>
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" cols="40"></Textarea>
+					</div>
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/speichern') }}</button>
+			</template>
+		</bs-modal>	
+		
+		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
+			dialogClass="modal-xl" :allowFullscreenExpand="true"
+			@toggle-fullscreen="handleToggleFullscreenDetail">
+			<template v-slot:title>
+				<div>
+					{{$p.t('abgabetool/c4abgabeMitarbeiterDetailTitle')}}
+				</div>
+			</template>
+			<template v-slot:default>
+				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen"></AbgabeDetail>
+				
+			</template>
+		</bs-modal>	
+		
+		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
+		<div style="max-height:40vw;">
+			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<hr>
+			<core-filter-cmpt
+				:title="''"  
+				@uuidDefined="handleUuidDefined"
+				ref="abgabeTable"
+				:newBtnShow="true"
+				:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
+				:newBtnDisabled="!selectedData.length"
+				@click:new=openAddSeriesModal
+				:tabulator-options="abgabeTableOptions"  
+				:tabulator-events="abgabeTableEventHandlers"
+				tableOnly
+				:sideMenu="false"
+				:useSelectionSpan="false"
+			>
+				<template #actions>
+					<button @click="sendEmailStudierende" role="button" class="btn btn-secondary ml-2">
+						{{ $p.t('abgabetool/sendEmailStudierende') }}
+					</button>
+					
+					<button @click="sendEmailBegutachter" role="button" class="btn btn-secondary ml-2">
+						{{ $p.t('abgabetool/sendEmailBegutachter') }}
+					</button>
+					
+				</template>
+			</core-filter-cmpt>
+		</div>
+	</template>
+    `,
+};
+
+export default AbgabetoolAssistenz;
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index d219c73e1..a50d9cf52 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -36,6 +36,9 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			detailIsFullscreen: false,
+			phrasenPromise: null,
+			phrasenResolved: false,
 			turnitin_link: null,
 			old_abgabe_beurteilung_link: null,
 			saving: false,
@@ -82,16 +85,16 @@ export const AbgabetoolMitarbeiter = {
 						frozen: true,
 						width: 70
 					},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1}
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerart'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1}
 				],
 				persistence: false,
 			},
@@ -121,6 +124,9 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		handleToggleFullscreenDetail() {
+			this.detailIsFullscreen = !this.detailIsFullscreen
+		},
 		getOptionLabelAbgabetyp(option){
 			return option.bezeichnung
 		},
@@ -202,6 +208,7 @@ export const AbgabetoolMitarbeiter = {
 			return new Date(date) < new Date(Date.now())
 		},
 		setDetailComponent(details){
+			this.loading=true
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
@@ -226,6 +233,7 @@ export const AbgabetoolMitarbeiter = {
 				pa.abgabetermine.forEach(termin => {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
+					
 					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
 					
@@ -239,7 +247,7 @@ export const AbgabetoolMitarbeiter = {
 				
 				this.$refs.modalContainerAbgabeDetail.show()
 			
-			})
+			}).finally(()=>{this.loading = false})
 		},
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
@@ -356,6 +364,8 @@ export const AbgabetoolMitarbeiter = {
 		
 	},
 	created() {
+		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 		// fetch config to avoid hard coded links
 		this.$api.call(ApiAbgabe.getConfig()).then(res => {
 			this.turnitin_link = res.data?.turnitin_link
@@ -389,6 +399,7 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
+	<template v-if="phrasenResolved">
 		<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
 			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
 		</div>
@@ -406,7 +417,7 @@ export const AbgabetoolMitarbeiter = {
 						{{$p.t('abgabetool/c4zieldatum')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabetyp')}}
+						{{$p.t('abgabetool/c4abgabetypv2')}}
 					</div>
 					<div class="col-6 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabekurzbz')}}
@@ -446,20 +457,21 @@ export const AbgabetoolMitarbeiter = {
 		</bs-modal>	
 		
 		<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
-			dialogClass="modal-xl" :allowFullscreenExpand="true">
+			dialogClass="modal-xl" :allowFullscreenExpand="true"
+			@toggle-fullscreen="handleToggleFullscreenDetail">
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4abgabeMitarbeiterDetailTitle')}}
 				</div>
 			</template>
 			<template v-slot:default>
-				<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen"></AbgabeDetail>
 				
 			</template>
 		</bs-modal>	
 		
-		<!--	low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways	-->
-		<div style="max-height:40vw;"> 
+		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
+		<div style="max-height:40vw;">
 		
 			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 			<hr>
@@ -493,6 +505,7 @@ export const AbgabetoolMitarbeiter = {
 			</core-filter-cmpt>
 		
 		</div>
+	</template>
     `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index fd245875e..d56b325f5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -34,6 +34,9 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			phrasenPromise: null,
+			phrasenResolved: false,
+			loading: false,
 			notenOptions: null,
 			domain: '',
 			student_uid: null,
@@ -64,6 +67,7 @@ export const AbgabetoolStudent = {
 			return new Date(date) < new Date(Date.now())	
 		},
 		setDetailComponent(details){
+			this.loading = true
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
@@ -71,16 +75,15 @@ export const AbgabetoolStudent = {
 					termin.file = []
 					termin.allowedToUpload = false
 					// termin.datum = '2025-10-16'
-					// TODO: fixtermin logic?
+					// TODO: change this and corresponding tooltips every time FH decides QG work different now
 					if(termin.paabgabetyp_kurzbz == 'end') {
-						
 						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
-					} else if(termin.paabgabetyp_kurzbz == 'qualgate1' || termin.paabgabetyp_kurzbz == 'qualgate2') {
-						termin.allowedToUpload = termin.upload_allowed
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
 					} else {
-						termin.allowedToUpload = true
+						// TODO: this will confuse people so much, by requirement we should NOT show people this flag
+						// but it still should have an effect?
+						termin.allowedToUpload = termin.upload_allowed 
 					}
 
 				})
@@ -92,7 +95,7 @@ export const AbgabetoolStudent = {
 				this.$refs.modalContainerAbgabeDetail.show()
 				// this.$refs.verticalsplit.showBoth()
 				
-			})
+			}).finally(()=>{this.loading=false})
 		},
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
@@ -137,9 +140,9 @@ export const AbgabetoolStudent = {
 			// this.projektarbeiten = data[0]
 			this.domain = data[1]
 			this.student_uid = data[2]
-			this.projektarbeiten = data[0] ?? null
-			if(!this.projektarbeiten) return
-			this.projektarbeiten = this.projektarbeiten.map(projekt => {
+			const projektarbeiten = data[0] ?? null
+			if(!projektarbeiten) return
+			this.projektarbeiten = projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
@@ -166,7 +169,7 @@ export const AbgabetoolStudent = {
 					titel: projekt.titel
 				}
 			})
-			
+
 		},
 		loadProjektarbeiten() {
 			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null))
@@ -218,11 +221,14 @@ export const AbgabetoolStudent = {
 		}
 	},
 	async created() {
+		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
+		
 		this.loading = true
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		await this.$api.call(ApiAbgabe.getNoten()).then(res => {
 			this.notenOptions = res.data
-		}).catch(e => {
+		}).finally(() => {
 			this.loading = false
 		})
 
@@ -231,12 +237,16 @@ export const AbgabetoolStudent = {
 		this.setupMounted()
 	},
 	template: `
+<template v-if="phrasenResolved">
+	<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
+		<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
+	</div>
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
 		dialogClass="modal-xl" :allowFullscreenExpand="true">
 		<template v-slot:title>
 			<div>
-				{{$p.t('abgabetool/c4abgabeStudentDetailTitle')}}
+				{{$capitalize( $p.t('abgabetool/c4abgabeStudentDetailTitle') )}}
 			</div>
 		</template>
 		<template v-slot:default>
@@ -245,11 +255,11 @@ export const AbgabetoolStudent = {
 		</template>
 	</bs-modal>
 	
-	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+	<h2>{{$capitalize( $p.t('abgabetool/abgabetoolTitle') )}}</h2>
 	<hr>
 	
 	<div v-if="projektarbeiten === null">
-		{{$p.t('abgabetool/c4abgabeStudentNoProjectsFound')}}
+		{{$capitalize( $p.t('abgabetool/c4abgabeStudentNoProjectsFound') )}}
 	</div>
 	
 	<Accordion :multiple="true" :activeIndex="[0]">
@@ -268,30 +278,30 @@ export const AbgabetoolStudent = {
 				</template>
 				
 				<div class="row">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4details')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4details') )}}</div>
 					<div class="col-8 col-md-9">
 						<button @click="setDetailComponent(projektarbeit.details)" class="btn btn-primary">
-							{{$p.t('abgabetool/c4projektdetailsOeffnen')}} <a><i class="fa fa-folder-open"></i></a>
+							{{$capitalize( $p.t('abgabetool/c4projektdetailsOeffnen') )}} <a><i class="fa fa-folder-open"></i></a>
 						</button>
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4beurteilung')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4beurteilung') )}}</div>
 					<div class="col-8 col-md-9">
 						<button v-if="projektarbeit.beurteilung" @click="handleDownloadBeurteilung(projektarbeit)" class="btn btn-primary">
-							<a> {{$p.t('abgabetool/c4downloadBeurteilung')}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilung') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
-						<a v-else>{{$p.t('abgabetool/c4nobeurteilungVorhanden')}}</a>
+						<a v-else>{{$capitalize( $p.t('abgabetool/c4nobeurteilungVorhanden') )}}</a>
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4sem')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4sem') )}}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.sem }}
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4stg')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4stg') )}}</div>
 					<div class="col-8 col-md-9">
 						<div class="col-1 d-flex justify-content-start align-items-start">
 							{{ projektarbeit.stg }}
@@ -299,31 +309,31 @@ export const AbgabetoolStudent = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4betreuer')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuer') )}}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.betreuer }}
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4betreuerEmailKontakt')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuerEmailKontakt') )}}</div>
 					<div class="col-8 col-md-9">
 						<a :href="getMailLink(projektarbeit)"><i class="fa fa-envelope" style="color:#00649C"></i></a>
 					</div>
 				</div>
-				<div v-if="projektarbeit.zweitbetreuer" class="row mt-2">
+				<div v-if="projektarbeit.zweitbetreuer_person_id || projektarbeit.zweitbetreuer" class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit.zweitbetreuer_betreuerart_kurzbz}}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.zweitbetreuer_betreuerart_beschreibung}}: {{ projektarbeit.zweitbetreuer?.first }}
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4projekttyp')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4projekttyp') )}}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.projekttypbezeichnung }}					
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4titel')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4titel') )}}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.titel }}	
 					</div>
@@ -331,7 +341,7 @@ export const AbgabetoolStudent = {
 			</AccordionTab>
 		</template>
 	</Accordion>
-	
+</template>
     `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index a5cc9a43b..1b842b27f 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -34,7 +34,7 @@ export const DeadlineOverview = {
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv2')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetyp')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetypv2')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
diff --git a/public/js/helpers/StringHelpers.js b/public/js/helpers/StringHelpers.js
new file mode 100644
index 000000000..27008192a
--- /dev/null
+++ b/public/js/helpers/StringHelpers.js
@@ -0,0 +1,4 @@
+export function capitalize(string) {
+	if (!string) return '';
+	return string[0].toUpperCase() + string.slice(1);
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 21ea22a20..33b9fb8de 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42059,18 +42059,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4abgabetyp',
+		'phrase' => 'c4abgabetypv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Abgabetyp",
+				'text' => "Projektfrist",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Type of document submitted",
+				'text' => "Type of project deadline",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42916,6 +42916,78 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipFixtermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Für den gesamten Studiengang verbindlicher Termin.  
+				
+				Liegt ein Termin in der Vergangenheit, kann nichts mehr hochgeladen werden. Ist es dennoch erforderlich, 
+				haben Studierende bei der Studiengangsassistenz um eine Korrektur dieses Termins anzusuchen.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This deadline is binding for the entire program. If a deadline is in the past,
+				nothing can be uploaded. If it is still necessary,
+				students must request a correction of this deadline from the program assistant.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notAllowedToEditAbgabeTermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+					'text' => "Sie sind nicht berechtigt diesen Abgabetermin zu bearbeiten.
+					 Es muss entweder eine Benotung vorgesehen sein oder sich um einen individuellen Termin handeln,
+					 welcher von Ihrem Benutzerkonto angelegt wurde.",
+					'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not authorized to edit this deadline.
+					It must either be scheduled for grading or be a custom due date
+					created by your user account.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notAllowedToDeleteAbgabeTermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Sie sind nicht berechtigt diesen Abgabetermin zu löschen.
+					 Sie benötigen mindestens die Berechtigung den Termin zu bearbeiten und es darf noch keine
+					 Dateiabgabe vorhanden sein.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not authorized to delete this deadline.
+					You need at least the permission to edit the deadline, and no file submissions must yet exist.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42936,6 +43008,50 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4studentAbgabeNotAllowedInViewMode',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projektabgabe im Ansichtsmodus ist nicht erlaubt!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project submission in view mode is not allowed!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4studentAbgabeNotAllowedRegular',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Verspätete Projektabgabe ist bei Terminen, welche von der Studiengangsassistenz für den gesamten Studiengang fixiert wurden nicht erlaubt!
+				
+				Um einen Endupload durchführen zu können, müssen Sie ein positiv benotetes Quality Gate 1 & Quality Gate 2 in der relevanten Projektarbeit absolviert haben.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Late project submissions are not permitted for deadlines set by the program assistant for the entire program!
+
+				To be able to complete a final upload, you must have successfully completed Quality Gate 1 and Quality Gate 2 for the relevant project work.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
diff --git a/vilesci/lehre/abgabe_assistenz.php b/vilesci/lehre/abgabe_assistenz.php
index 6d46e98cd..ababd4b69 100644
--- a/vilesci/lehre/abgabe_assistenz.php
+++ b/vilesci/lehre/abgabe_assistenz.php
@@ -80,9 +80,9 @@ $trenner->loadVariables($getuid);
 
 $sql_query = "SELECT *,
 			(SELECT orgform_kurzbz
-			FROM tbl_prestudentstatus
-			WHERE prestudent_id=(Select prestudent_id from tbl_student where student_uid=xy.uid limit 1)
-			ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
+				FROM tbl_prestudentstatus
+				WHERE prestudent_id=(Select prestudent_id from tbl_student where student_uid=xy.uid limit 1)
+				ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
 			) as organisationsform
 			FROM (SELECT DISTINCT ON(tbl_projektarbeit.projektarbeit_id) public.tbl_studiengang.bezeichnung as stgbez,tbl_projekttyp.bezeichnung AS prjbez,* FROM lehre.tbl_projektarbeit
 			LEFT JOIN public.tbl_benutzer on(uid=student_uid)

From c78eef8af52ab2adfba58af56432a225581ccb81 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 28 Oct 2025 09:31:04 +0100
Subject: [PATCH 0907/1357] add validation for required props, refactor slots

---
 .../components/DetailHeader/DetailHeader.js   | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 618be9df2..555f777dd 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -27,7 +27,7 @@ export default {
 		},
 		domain: {
 			type: String,
-			required: true
+			required: false
 		},
 		typeHeader: {
 			type: String,
@@ -64,7 +64,16 @@ export default {
 
 	},
 	created(){
-		if(this.person_id) {
+		if (this.typeHeader === 'student') {
+			if (!this.headerData) {
+				throw new Error('[DetailHeader] "headerData" is required.')
+			}
+		} else if (this.typeHeader === 'mitarbeiter') {
+			if (!this.person_id || !this.mitarbeiter_uid || !this.domain) {
+				throw new Error(
+					'[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are requried.'
+				)
+			}
 			this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
 		}
 	},
@@ -258,16 +267,16 @@ export default {
 							<slot name="issues"></slot>
 						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleGammaTile" :titleGammaTile="title"></slot></h4>
-							<h6 class="text-muted"><slot name="valueGammaTile" :valueGammaTile="valueGammaTile"></slot></h6>
+							<h4 class="mb-1"><slot name="titleGammaTile"></slot></h4>
+							<h6 class="text-muted"><slot name="valueGammaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleBetaTile" :titleBetaTile="title"></slot></h4>
-							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
+							<h4 class="mb-1"><slot name="titleBetaTile"></slot></h4>
+							<h6 class="text-muted"><slot name="valueBetaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleAlphaTile" :titleAlphaTile="title"></slot></h4>
-							<h6 class="text-muted"><slot name="valueAlphaTile" :valueAlphaTile="valueAlphaTile"></slot></h6>
+							<h4 class="mb-1"><slot name="titleAlphaTile"></slot></h4>
+							<h6 class="text-muted"><slot name="valueAlphaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1">UID</h4>
@@ -279,7 +288,7 @@ export default {
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">
-		
+
 				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
 					  class="d-block w-100 h-100 rounded"
@@ -342,16 +351,16 @@ export default {
 							<slot name="issues"></slot>
 						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleGammaTile" :titleGammaTile="title"></slot></h4>
-							<h6 class="text-muted"><slot name="valueGammaTile" :valueGammaTile="valueGammaTile"></slot></h6>
+							<h4 class="mb-1"><slot name="titleGammaTile"></slot></h4>
+							<h6 class="text-muted"><slot name="valueGammaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleBetaTile" :titleBetaTile="title"></slot></h4>
+							<h4 class="mb-1"><slot name="titleBetaTile"></slot></h4>
 							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleAlphaTile" :titleAlphaTile="title"></slot></h4>
-							<h6 class="text-muted"><slot name="valueAlphaTile" :valueAlphaTile="valueAlphaTile"></slot></h6>
+							<h4 class="mb-1"><slot name="titleAlphaTile"></slot></h4>
+							<h6 class="text-muted"><slot name="valueAlphaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
 							<h4 class="mb-1">UID</h4>

From a8535e6e0ffd755b6de70358a3729b2c5209a2f2 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 13:57:15 +0100
Subject: [PATCH 0908/1357] replace old $fhcApi calls with new $api

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d0543ad59..c4f7acc10 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -157,7 +157,7 @@ export default {
 			}
 		},
 		buildPrestudentSearchResultLink(data) {
-			return this.$fhcApi.getUri(
+			return this.$api.getUri(
 				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/prestudent/'
@@ -165,7 +165,7 @@ export default {
 				);
 		},
 		buildStudentSearchResultLink(data) {
-			return this.$fhcApi.getUri(
+			return this.$api.getUri(
 				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/student/'
@@ -173,7 +173,7 @@ export default {
 				);
 		},
 		buildPersonSearchResultLink(data) {
-			return this.$fhcApi.getUri(
+			return this.$api.getUri(
 				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/person/'

From 5a0134c6cc8182b1a756016afe36ef6754d74fda Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 13:58:18 +0100
Subject: [PATCH 0909/1357] searchbar: prevent clear on enter

---
 public/js/components/searchbar/searchbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 56fba15c6..f6e36a49e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -102,6 +102,7 @@ export default {
                 >
 				<button
 					v-if="searchsettings.searchstr"
+					type="button"
 					class="searchbar_input_clear btn btn-outline-secondary"
 					@click="clearInput"
 				>

From 539c78166f5d7ae54ff91fb4cb60abd73ccf8abb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 13:59:12 +0100
Subject: [PATCH 0910/1357] Stv list: allow post calls on tabulator

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..db79dae76 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -119,7 +119,7 @@ export default {
 					{
 						return Promise.resolve({ data: []});
 					}
-					return this.$api.call({url, params});
+					return this.$api.call({...config, url, params});
 				},
 				ajaxResponse: (url, params, response) => {
 					return response?.data;
@@ -214,7 +214,12 @@ export default {
 				encodeURIComponent(this.currentSemester)
 				);
 
-			const params = {}, filter = {};
+			let params = {}, filter = {}, method = 'get';
+			if (endpoint.params)
+				params = endpoint.params;
+			if (endpoint.method)
+				method = endpoint.method;
+
 			if (this.filterKontoCount0)
 				filter.konto_count_0 = this.filterKontoCount0;
 			if (this.filterKontoMissingCounter)
@@ -227,12 +232,13 @@ export default {
 				if (!this.$refs.table.tabulator) {
 					this.tabulatorOptions.ajaxURL = endpoint.url;
 					this.tabulatorOptions.ajaxParams = params;
+					this.tabulatorOptions.ajaxConfig = method;
 				} else
 					this.$refs.table.tabulator.on("tableBuilt", () => {
-						this.$refs.table.tabulator.setData(endpoint.url, params);
+						this.$refs.table.tabulator.setData(endpoint.url, params, method);
 					});
 			} else
-				this.$refs.table.tabulator.setData(endpoint.url, params);
+				this.$refs.table.tabulator.setData(endpoint.url, params, method);
 		},
 		onKeydown(e) { // TODO(chris): this should be in the filter component
 			if (!this.focusObj)

From 06b562786d3db07719565b93c9b2bb5f857e07c5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 14:00:03 +0100
Subject: [PATCH 0911/1357] searchbar: make abort function

---
 public/js/components/searchbar/searchbar.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index f6e36a49e..1c2747e3c 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -284,13 +284,7 @@ export default {
             this.calcSearchResultHeight();
         },
         search: function() {
-            if( this.searchtimer !== null ) {
-                clearTimeout(this.searchtimer);
-            }
-            if (this.abortController) {
-                this.abortController.abort();
-                this.abortController = null;
-            }
+            this.abort();
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.calcSearchResultExtent();
                 this.searchtimer = setTimeout(
@@ -301,6 +295,16 @@ export default {
                 this.showresult = false;
             }
         },
+        abort() {
+            if (this.searchtimer !== null) {
+                clearTimeout(this.searchtimer);
+            }
+            if (this.abortController) {
+                this.abortController.abort();
+                this.abortController = null;
+            }
+            this.searchresult = [];
+        },
         callsearchapi: function() {
             this.error = null;
             this.searchresult.splice(0, this.searchresult.length);

From 96996849461db3ca4032d86a973db6819f2063d2 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 14:00:41 +0100
Subject: [PATCH 0912/1357] Stv: students search function

---
 .../api/frontend/v1/stv/Students.php          | 80 +++++++++++++++++++
 public/js/api/factory/stv/students.js         |  8 ++
 2 files changed, 88 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9de0c29b1..44d1b43a5 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -721,6 +721,86 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * @param string		$studiensemester_kurzbz
+	 *
+	 * @return void
+	 */
+	public function search($studiensemester_kurzbz)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$this->load->library('SearchLib', [ 'config' => 'searchstv' ]);
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('searchstr', 'searchstr', 'required');
+		$this->form_validation->set_rules('types[]', 'types', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$result = $this->searchlib->search($this->input->post('searchstr'), $this->input->post('types'));
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->prepareQuery($studiensemester_kurzbz);
+
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
+		$this->addSelectPrioRel();
+
+		$this->addFilter($studiensemester_kurzbz);
+
+		$prestudent_ids = [];
+		$student_uids = [];
+			$this->addMeta('data', $data);
+		foreach ($data as $row) {
+			$dataset = json_decode($row->data);
+			if ($row->type == 'prestudent') {
+				$prestudent_ids[] = $dataset->prestudent_id;
+			} elseif ($row->type == 'student') {
+				$student_uids[] = $dataset->uid;
+			}
+		}
+
+		if ($prestudent_ids && $student_uids) {
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
+		} elseif ($prestudent_ids) {
+			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
+		} elseif ($student_uids) {
+			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
+		} else {
+			$this->terminateWithSuccess([]);
+		}
+
+		$result = $this->PrestudentModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	/**
 	 * @param string|null	$studiensemester_kurzbz
 	 * @param string		$type
diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js
index 18f3b1743..ce8214057 100644
--- a/public/js/api/factory/stv/students.js
+++ b/public/js/api/factory/stv/students.js
@@ -46,6 +46,14 @@ export default {
 			url: url
 		};
 	},
+	search(params, studiensemester_kurzbz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/students/search/'
+				+ encodeURIComponent(studiensemester_kurzbz),
+			params
+		};
+	},
 	verband(relative_path) {
 		return {
 			method: 'get',

From fc16a9e4c646296b3f85378b7bce56eebd9d82d1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 30 Oct 2025 14:01:46 +0100
Subject: [PATCH 0913/1357] Stv: add search results to student list

---
 public/js/components/Stv/Studentenverwaltung.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c4f7acc10..46570bd6e 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -267,6 +267,17 @@ export default {
 					});
 				}
 			}
+		},
+		onSearch(e) {
+			const searchsettings = this.$refs.searchbar.searchsettings;
+			if (searchsettings.searchstr.length >= 2) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
+				);
+				this.$refs.searchbar.$refs.input.blur();
+				this.$refs.searchbar.abort();
+				this.$refs.searchbar.hideresult();
+			}
 		}
 	},
 	created() {
@@ -345,15 +356,17 @@ export default {
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		this.handlePersonUrl();
 	},
-	template: `
+	template: /* html */`
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
 			<core-searchbar
+				ref="searchbar"
 				:searchoptions="searchbaroptions"
 				:searchfunction="searchfunction"
 				class="searchbar position-relative w-100"
+				@submit.prevent="onSearch"
 			></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">

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

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

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

From 3d51753419800ee6c049883a09c5d7e893710d40 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 31 Oct 2025 11:14:39 +0100
Subject: [PATCH 0915/1357] new bootstrap offcanvas component; projektarbeit
 abgabetermine timeline & status legende in offcanvas; fixtermin toggle &
 allowed to edit all termine for assistenz; studiengang selection + filter for
 getSTG_isEntitledFor('basis/abgabe_assistenz:rw'); moved filedownload from
 Cis/Abgabetool Auth Controller to Abgabe.php Api Controller; status symbol in
 table columns prevTermin/nextTermin; get_betreuer_details pgsql function to
 avoid rewriting the same subquery for every betreuer anrede;

---
 application/controllers/Cis/Abgabetool.php    |  40 --
 .../controllers/api/frontend/v1/Abgabe.php    |  64 ++-
 .../models/education/Projektarbeit_model.php  | 185 +++----
 .../models/organisation/Studiengang_model.php |  17 +
 application/views/Cis/Abgabetool.php          |   1 +
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/js/api/factory/abgabe.js               |   9 +-
 public/js/components/Bootstrap/Offcanvas.js   | 151 ++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  79 ++-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   2 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 502 ++++++++++++++++--
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   3 +
 .../Cis/Abgabetool/StatusLegende.js           |  57 ++
 .../61164_abgabetool_quality_gates.php        |  34 ++
 system/phrasesupdate.php                      | 166 +++++-
 15 files changed, 1081 insertions(+), 230 deletions(-)
 create mode 100644 public/js/components/Bootstrap/Offcanvas.js
 create mode 100644 public/js/components/Cis/Abgabetool/StatusLegende.js

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 223af86f5..6bf7d951c 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -14,7 +14,6 @@ class Abgabetool extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => self::PERM_LOGGED,
-			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
 			'Mitarbeiter' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
 			'Assistenz' => array('basis/abgabe_assistenz:rw'),
 			'Student' =>  array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
@@ -100,43 +99,4 @@ class Abgabetool extends Auth_Controller
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
 		}
 	}
-
-
-	public function getStudentProjektarbeitAbgabeFile() 
-	{
-		$this->_ci =& get_instance();
-		$this->_ci->load->helper('download');
-		
-		$paabgabe_id = $this->_ci->input->get('paabgabe_id');
-		$student_uid = $this->_ci->input->get('student_uid');
-
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
-			$this->terminateWithJsonError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		$isZugeteilterBetreuer = count($this->_ci->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
-		
-		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer) {
-			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
-			if(file_exists($file_path)) {
-				
-				header('Content-Description: File Transfer');
-				header('Content-Type: application/octet-stream');
-				header('Expires: 0');
-				header('Cache-Control: must-revalidate');
-				header('Pragma: public');
-				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
-				header('Content-Length: ' . filesize($file_path));
-
-				flush(); // send headers first just in case
-				readfile($file_path); // read file content to output buffer
-				
-			} else {
-				$this->terminateWithJsonError('File not found');
-			}
-		} else {
-			$this->terminateWithJsonError('Keine Zuordnung!');
-		}
-	}
 }
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 4a9706789..3a05bd6f6 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -39,7 +39,9 @@ class Abgabe extends FHCAPI_Controller
 			'fetchDeadlines' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
 			'getPaAbgabetypen' => self::PERM_LOGGED,
 			'getNoten' => self::PERM_LOGGED,
-			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw')
+			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
+			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
+			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -869,6 +871,10 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
 
+		if(count($projektarbeiten) == 0) { // avoid further abgabetermin queries if the are no projektarbeiten
+			$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
+		}
+		
 		$mapFunc = function($projektarbeit) {
 			return $projektarbeit->projektarbeit_id;
 		};
@@ -891,4 +897,60 @@ class Abgabe extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
+	
+	public function getStudiengaenge() {
+		$this->load->library('PermissionLib');
+		
+		$stg_allowed = $this->permissionlib->getSTG_isEntitledFor('basis/abgabe_assistenz:rw');
+		
+		if($stg_allowed == false) {
+			$this->terminateWithError($this->p->t('global', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		
+		$result = $this->StudiengangModel->getStudiengaengeFiltered($stg_allowed);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStudentProjektarbeitAbgabeFile()
+	{
+		$this->load->helper('download');
+
+		$paabgabe_id = $this->input->get('paabgabe_id');
+		$student_uid = $this->input->get('student_uid');
+
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
+		$isAssistenz = $this->permissionlib->isBerechtigt('extension/abgabe_assistenz');
+		
+		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer || $isAssistenz) {
+			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			if(file_exists($file_path)) {
+
+				header('Content-Description: File Transfer');
+				header('Content-Type: application/octet-stream');
+				header('Expires: 0');
+				header('Cache-Control: must-revalidate');
+				header('Pragma: public');
+				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
+				header('Content-Length: ' . filesize($file_path));
+
+				flush(); // send headers first just in case
+				readfile($file_path); // read file content to output buffer
+
+			} else {
+				$this->terminateWithError('File not found');
+			}
+		} else {
+			$this->terminateWithError('Keine Zuordnung!');
+		}
+	}
+	
 }
\ No newline at end of file
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 821a8d007..9cd28cdf8 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -320,107 +320,85 @@ class Projektarbeit_model extends DB_Model
 	}
 	
 	public function getProjektarbeitenForStudiengang($studiengang_kz) {
-		
-		// TODO: select less fields, a lot of useless data over here
-		
-		$old_qry = "SELECT *,
-				   (SELECT orgform_kurzbz
-					FROM tbl_prestudentstatus
-					WHERE prestudent_id=(Select prestudent_id from tbl_student where student_uid=xy.uid limit 1)
-					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1
-				   ) as organisationsform
-			FROM (SELECT DISTINCT ON(tbl_projektarbeit.projektarbeit_id) public.tbl_studiengang.bezeichnung as stgbez,tbl_projekttyp.bezeichnung AS prjbez,* FROM lehre.tbl_projektarbeit
-						  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
-						  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
-						  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-						  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-						  LEFT JOIN public.tbl_studiengang using(studiengang_kz)
-						  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-				  WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-					AND public.tbl_benutzer.aktiv
-					AND lehre.tbl_projektarbeit.note IS NULL
-					AND public.tbl_studiengang.studiengang_kz = ?
-				  ORDER BY tbl_projektarbeit.projektarbeit_id desc) as xy
-			ORDER BY nachname";
-		
-		
-		$new_qry = "
-		SELECT
-		DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
-			tbl_projektarbeit.projekttyp_kurzbz,
-			tbl_projektarbeit.titel,
-			tbl_projektarbeit.projektarbeit_id,
-			tbl_studiengang.typ, tbl_studiengang.kurzbz,
-			student_benutzer.uid as student_uid,
-			student_person.vorname as student_vorname,
-			student_person.nachname as student_nachname,
-			tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
-			betreuer_benutzer.uid as betreuer_benutzer_uid,
-			betreuer_person.vorname as betreuer_vorname,
-			betreuer_person.nachname as betreuer_nachname,
-			lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
-			lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
-			lehre.tbl_projektarbeit.sprache               as sprache,
-			lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
-			lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
-			lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
-			lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
-			lehre.tbl_projektarbeit.abstract              as abstract,
-			lehre.tbl_projektarbeit.abstract_en           as abstract_en,
-			lehre.tbl_projektarbeit.insertamum            as insertamum,
-			(
-			SELECT orgform_kurzbz
-			 FROM tbl_prestudentstatus
-			 WHERE prestudent_id = (SELECT prestudent_id
-									FROM tbl_student
-									WHERE student_uid = student_benutzer.uid
-									LIMIT 1)
-			 ORDER BY datum DESC, insertamum DESC, ext_id DESC
-			 LIMIT 1
-			 )
-				as organisationsform,
-			(
-				SELECT person_id
-				 FROM lehre.tbl_projektbetreuer
-				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
-				 LIMIT 1
-			 )
-				AS zweitbetreuer_person_id,
-			(
-				SELECT betreuerart_kurzbz
-				 FROM lehre.tbl_projektbetreuer
-				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
-				 LIMIT 1
-			 )                                     
-				AS zweitbetreuer_betreuerart_kurzbz,
-			(
-				SELECT tbl_betreuerart.beschreibung
-				 FROM lehre.tbl_projektbetreuer
-						  JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
-				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-				 LIMIT 1
-			 )                                     
-				AS zweitbetreuer_betreuerart_beschreibung,
-			(
-				SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
-							 COALESCE(titelpost, ''))
-				 FROM public.tbl_person
-						  JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-						  LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-						  LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-				 WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-				   AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
-				 LIMIT 1
-			 )                                    
-				as zweitbetreuer_full_name
+		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
+       		FROM(
+			   SELECT
+				   DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
+				   tbl_projektarbeit.projekttyp_kurzbz,
+				   tbl_projektarbeit.titel,
+				   tbl_projektarbeit.projektarbeit_id,
+				   tbl_studiengang.typ, tbl_studiengang.kurzbz,
+				   student_benutzer.uid as student_uid,
+				   student_person.vorname as student_vorname,
+				   student_person.nachname as student_nachname,
+				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
+				   betreuer_benutzer.uid as betreuer_benutzer_uid,
+				   betreuer_person.vorname as betreuer_vorname,
+				   betreuer_person.nachname as betreuer_nachname,
+				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
+				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
+				   lehre.tbl_projektarbeit.sprache               as sprache,
+				   lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
+				   lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
+				   lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
+				   lehre.tbl_projektarbeit.abstract              as abstract,
+				   lehre.tbl_projektarbeit.abstract_en           as abstract_en,
+				   lehre.tbl_projektarbeit.insertamum            as insertamum,
+				   lehre.tbl_projektarbeit.note					 as note,
+				   (
+					   SELECT orgform_kurzbz
+					   FROM tbl_prestudentstatus
+					   WHERE prestudent_id = (SELECT prestudent_id
+											  FROM tbl_student
+											  WHERE student_uid = student_benutzer.uid
+											  LIMIT 1)
+					   ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					   LIMIT 1
+				   )
+					   as organisationsform,
+				   (
+					   SELECT person_id
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_person_id,
+				   (
+					   SELECT betreuerart_kurzbz
+					   FROM lehre.tbl_projektbetreuer
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_kurzbz,
+				   (
+					   SELECT tbl_betreuerart.beschreibung
+					   FROM lehre.tbl_projektbetreuer
+								JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   AS zweitbetreuer_betreuerart_beschreibung,
+				   (
+					   SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
+								   COALESCE(titelpost, ''))
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_full_name
 			   FROM lehre.tbl_projektarbeit
 						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
 						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
-						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)	
-			       		LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
+						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
+						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
@@ -429,14 +407,11 @@ class Projektarbeit_model extends DB_Model
 						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
 			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
 				 AND student_benutzer.aktiv AND (lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter')
-		--   AND lehre.tbl_projektarbeit.note IS NULL
-		--   AND public.tbl_studiengang.studiengang_kz= 257
+				 --   AND lehre.tbl_projektarbeit.note IS NULL
+				 --   AND public.tbl_studiengang.studiengang_kz= 257
 				 AND public.tbl_studiengang.studiengang_kz = ?
-			   ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC
-		";
-//		$oldres = $this->execReadOnlyQuery($old_qry, array($studiengang_kz));
-//		$newres = $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
-//		return array($newres, $oldres);
+			   ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+		   ) as tmp";
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
 	}
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 02f972690..660657f28 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -801,4 +801,21 @@ class Studiengang_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz));
 	}
+	
+	public function getStudiengaengeFiltered($allowed_stg) {
+		$query ="SELECT DISTINCT
+					public.tbl_studiengang.studiengang_kz,
+					public.tbl_studiengang.bezeichnung,
+					public.tbl_studiengang.kurzbzlang,
+					public.tbl_studiengang.orgform_kurzbz
+				FROM public.tbl_studiengang JOIN lehre.tbl_studienordnung USING(studiengang_kz)
+					JOIN lehre.tbl_studienplan USING(studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester USING(studienplan_id)
+				WHERE public.tbl_studiengang.aktiv = true
+				
+				AND public.tbl_studiengang.studiengang_kz IN ?
+				ORDER BY public.tbl_studiengang.kurzbzlang";
+
+		return $this->execReadOnlyQuery($query, [$allowed_stg]);
+	}
 }
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index af259ca48..d47f33283 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -24,6 +24,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 5b16ceb87..4fa215f3d 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -32,6 +32,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 8f4ba61de..1087ec2a0 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -36,7 +36,7 @@ export default {
 		};
 	},
 	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
-		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
+		const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
 
 		window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 	},
@@ -106,5 +106,12 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getProjektarbeitenForStudiengang',
 			params: { studiengang_kz }
 		};
+	},
+	// TODO: this could also very well be generic info api :^)
+	getStudiengaenge() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getStudiengaenge'
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Bootstrap/Offcanvas.js b/public/js/components/Bootstrap/Offcanvas.js
new file mode 100644
index 000000000..aab2c55f5
--- /dev/null
+++ b/public/js/components/Bootstrap/Offcanvas.js
@@ -0,0 +1,151 @@
+export default {
+	name: 'BootstrapOffcanvas',
+	data: () => ({
+		offcanvas: null
+	}),
+	props: {
+		backdrop: {
+			type: [Boolean, String],
+			default: true,
+			validator(value) {
+				return ['static', true, false].includes(value);
+			}
+		},
+		keyboard: {
+			type: Boolean,
+			default: true
+		},
+		scroll: {
+			type: Boolean,
+			default: false
+		},
+		placement: {
+			type: String,
+			default: 'start', // start | end | top | bottom
+			validator(value) {
+				return ['start', 'end', 'top', 'bottom'].includes(value);
+			}
+		},
+		noCloseBtn: Boolean,
+		headerClass: {
+			type: [String, Array, Object],
+			default: ''
+		},
+		bodyClass: {
+			type: [String, Array, Object],
+			default: 'p-4'
+		},
+		footerClass: {
+			type: [String, Array, Object],
+			default: ''
+		},
+		dialogClass: [String, Array, Object]
+	},
+	emits: [
+		"hideBsOffcanvas",
+		"hiddenBsOffcanvas",
+		"hidePreventedBsOffcanvas",
+		"showBsOffcanvas",
+		"shownBsOffcanvas"
+	],
+	methods: {
+		dispose() {
+			return this.offcanvas?.dispose();
+		},
+		hide() {
+			return this.offcanvas?.hide();
+		},
+		show(relatedTarget) {
+			return this.offcanvas?.show(relatedTarget);
+		},
+		toggle() {
+			return this.offcanvas?.toggle();
+		},
+		popup(body, options, title, footer) {
+			const BsOffcanvas = this,
+				slots = {};
+
+			if (body !== undefined)
+				slots.default = () => body;
+			if (title !== undefined)
+				slots.title = () => title;
+			if (footer !== undefined)
+				slots.footer = () => footer;
+
+			let includedPrimevue = false;
+			if (typeof primevue !== 'undefined')
+				includedPrimevue = true;
+
+			return new Promise((resolve, reject) => {
+				const instance = Vue.createApp({
+					name: 'OffcanvasTmpApp',
+					setup() {
+						return () =>
+							Vue.h(BsOffcanvas, {
+								class: 'offcanvas-wrapper',
+								ref: 'offcanvas',
+								...options
+							}, slots);
+					},
+					mounted() {
+						this.$refs.offcanvas.show();
+					},
+					beforeUnmount() {
+						if (this.$refs.offcanvas)
+							this.$refs.offcanvas.result !== false ? resolve(this.$refs.offcanvas.result) : reject();
+					},
+					unmounted() {
+						wrapper.parentElement.removeChild(wrapper);
+					}
+				});
+				const wrapper = document.createElement('div');
+
+				if (includedPrimevue) {
+					instance.use(primevue.config.default, { zIndex: { overlay: 9999 } });
+				}
+
+				import('../../plugins/Phrasen.js').then((Phrasen) => {
+					instance.use(Phrasen.default);
+					instance.mount(wrapper);
+					document.body.appendChild(wrapper);
+				});
+			});
+		}
+	},
+	mounted() {
+		if (this.$refs.offcanvas) {
+			this.offcanvas = new bootstrap.Offcanvas(this.$refs.offcanvas, {
+				backdrop: this.backdrop,
+				keyboard: this.keyboard,
+				scroll: this.scroll
+			});
+		}
+	},
+	template: `
+		<div ref="offcanvas"
+			class="bootstrap-offcanvas offcanvas"
+			:class="['offcanvas-' + placement, dialogClass]"
+			tabindex="-1"
+			@[\`hide.bs.offcanvas\`]="$emit('hideBsOffcanvas')"
+			@[\`hidden.bs.offcanvas\`]="$emit('hiddenBsOffcanvas')"
+			@[\`hidePrevented.bs.offcanvas\`]="$emit('hidePreventedBsOffcanvas')"
+			@[\`show.bs.offcanvas\`]="$emit('showBsOffcanvas')"
+			@[\`shown.bs.offcanvas\`]="$emit('shownBsOffcanvas')"
+		>
+			<div class="offcanvas-header" :class="headerClass" v-if="$slots.title">
+				<h5 class="offcanvas-title">
+					<slot name="title"></slot>
+				</h5>
+				<button v-if="!noCloseBtn" type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+			</div>
+
+			<div class="offcanvas-body" :class="bodyClass">
+				<slot></slot>
+			</div>
+
+			<div v-if="$slots.footer" class="offcanvas-footer" :class="footerClass">
+				<slot name="footer"></slot>
+			</div>
+		</div>
+	`
+}
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index fa202a020..aa8b2b858 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -31,6 +31,10 @@ export const AbgabeMitarbeiterDetail = {
 		isFullscreen: {
 			type: Boolean,
 			default: false
+		},
+		assistenzMode: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
@@ -173,7 +177,7 @@ export const AbgabeMitarbeiterDetail = {
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyleClass(termin, mode) {
+		getDateStyleClass(termin) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
@@ -305,9 +309,9 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	computed: {
 		getActiveIndexTabArray() {
-			// here we try to do mind reading logic by assuming which abgabetermine are the most relevant to the current user
+			// here we try to assume which abgabetermine are the most relevant to the current user
 
-			// lets try to take the termin with nearest date and watch who complains and why
+			// lets try to take the termin with nearest date
 			let closestIndex = -1;
 			let minDiff = Infinity;
 			const today = new Date();
@@ -401,6 +405,17 @@ export const AbgabeMitarbeiterDetail = {
 				value: this.$p.t('abgabetool/c4notAllowedToDeleteAbgabeTermin'),
 				class: "custom-tooltip"
 			}
+		},
+		getProjektarbeitTitel() {
+			if(this.projektarbeit?.titel) return this.projektarbeit.titel
+			
+			return ''
+		},
+		getProjektarbeitStudent(){
+
+			if(this.projektarbeit?.student) return this.projektarbeit.student
+
+			return ''
 		}
 	},
 	watch: {
@@ -500,7 +515,6 @@ export const AbgabeMitarbeiterDetail = {
 	</bs-modal>
 
 	<div v-if="projektarbeit">
-		
 		<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">
 			<SpeedDial
 				:style="getSpeedDialStyle"
@@ -517,8 +531,8 @@ export const AbgabeMitarbeiterDetail = {
 
 		<div class="row">
 			<div class="col-6">
-				<p> {{projektarbeit?.student}}</p>
-				<p> {{projektarbeit?.titel}}</p>
+				<p> {{getProjektarbeitStudent}}</p>
+				<p> {{getProjektarbeitTitel}}</p>
 				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 			</div>
 			<div v-if="!isMobile" class="col-3"></div>
@@ -533,7 +547,6 @@ export const AbgabeMitarbeiterDetail = {
 				/>
 			</div>
 		</div>
-		
 		<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
@@ -546,7 +559,7 @@ export const AbgabeMitarbeiterDetail = {
 								<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 							</div>
-							<div class="col-auto text-start" style="min-width: max(150px, 15%); max-width: min(300px, 30%); transform: translateX(-30px)">
+							<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
 								<span>{{ termin?.bezeichnung?.bezeichnung }}</span>
 							</div>
 							<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
@@ -557,18 +570,17 @@ export const AbgabeMitarbeiterDetail = {
 							</div>
 						</div>				
 					</template>
-<!--						<div class="row">-->
-<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>-->
-<!--							<div class="col-8 col-md-9">-->
-<!--								<Checkbox -->
-<!--									v-model="termin.fixtermin"-->
-<!--									disabled-->
-<!--									:binary="true" -->
-<!--									:pt="{ root: { class: 'ml-auto' }}"-->
-<!--								>-->
-<!--								</Checkbox>-->
-<!--							</div>-->
-<!--						</div>-->
+					<div class="row mt-2" v-if="assistenzMode">
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
+						<div class="col-8 col-md-9">
+							<Checkbox 
+								v-model="termin.fixtermin"
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
 					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 						<div class="col-8 col-md-9">
@@ -584,7 +596,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
+						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 						<div class="col-8 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
@@ -637,10 +649,22 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 						<div class="col-8 col-md-9">
 							<template v-if="termin?.abgabedatum">
-								{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-								<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-									<a> {{$capitalize( $p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
-								</button>							
+								<div class="row">
+									<div style="width:250px">
+										<VueDatePicker
+											v-model="termin.abgabedatum"
+											:clearable="false"
+											:disabled="true"
+											:format="formatDate">
+										</VueDatePicker>
+									</div>
+
+									<div class="col-auto">
+										<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+											<a> {{$capitalize( $p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+										</button>	
+									</div>
+								</div>						
 							</template>
 							<template v-else>
 								{{ $capitalize( $p.t('abgabetool/c4nochNichtsAbgegeben') )}}
@@ -683,6 +707,11 @@ export const AbgabeMitarbeiterDetail = {
 				</AccordionTab>
 			</template>
 		</Accordion>
+		
+		<div v-if="projektarbeit?.abgabetermine.length == 0" style="display:flex; justify-content: center; align-content: center;">
+			<h3>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h3>
+		</div>
+</div>
 	 </div>
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 9c1682537..884023420 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -377,7 +377,7 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
 									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 								</div>
-								<div class="col-auto text-start" style="min-width: max(150px, 15%); max-width: min(300px, 30%); transform: translateX(-30px)">
+								<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
 									<span>{{ termin?.bezeichnung }}</span>
 								</div>
 								<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 067ef3030..40baf97bc 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -2,18 +2,27 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
+import BsOffcanvas from '../../Bootstrap/Offcanvas.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import AbgabeterminStatusLegende from "./StatusLegende.js";
+
+const todayISO = '2025-08-08'
+const today = new Date(todayISO)
 
 export const AbgabetoolAssistenz = {
 	name: "AbgabetoolAssistenz",
 	components: {
+		AbgabeterminStatusLegende,
 		BsModal,
+		BsOffcanvas,
 		CoreFilterCmpt,
 		AbgabeDetail,
 		VerticalSplit,
+		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
+		Timeline: primevue.timeline,
 		VueDatePicker
 	},
 	provide() {
@@ -36,6 +45,14 @@ export const AbgabetoolAssistenz = {
 	},
 	data() {
 		return {
+			headerFiltersRestored: false,
+			filtersRestored: false,
+			colLayoutRestored: false,
+			sortRestored: false,
+			stateRestored: false,
+			timelineProjekt: null,
+			selectedStudiengangOption: null,
+			studiengaengeOptions: null,
 			detailIsFullscreen: false,
 			showZweitbetreuerCol: false,
 			phrasenPromise: null,
@@ -69,13 +86,15 @@ export const AbgabetoolAssistenz = {
 			abgabeTableOptions: {
 				minHeight: 250,
 				index: 'projektarbeit_id',
-				layout: 'fitDataStretch',
-				placeholder: this.$p.t('global/noDataAvailable'),
+				layout: 'fitData',
+				placeholder: Vue.computed(() => this.$capitalize(this.$p.t('global/noDataAvailable'))),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
-				rowHeight: 80,
+				rowHeight: 40,
+				responsiveLayout: true,
 				columns: [
 					{
+						field: 'rowSelection',
 						formatter: 'rowSelection',
 						titleFormatter: 'rowSelection',
 						titleFormatterParams: {
@@ -84,23 +103,26 @@ export const AbgabetoolAssistenz = {
 						hozAlign:"center",
 						headerSort: false,
 						frozen: true,
-						width: 70
+						width: 40
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
-					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, tooltip: false}
-					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', formatter: this.centeredTextFormatter, widthGrow: 1, visible: this.showZweitbetreuerCol}
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150,},
+					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
+					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4termineTimeLine'))), headerFilter: true, field: 'abgabetermine',responsive:2, formatter: this.timelineFormatter, widthGrow: 1, tooltip: false},
+					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, visible: false, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: false, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: Vue.computed(()=>{return this.showZweitbetreuerCol})},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
+				persistenceID: "abgabetableV27"
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -108,17 +130,20 @@ export const AbgabetoolAssistenz = {
 					this.tableBuiltResolve()
 				}
 			},
-				{
-					event: "cellClick",
-					handler: async (e, cell) => {
-						if(cell.getColumn().getField() === "details") {
-							this.setDetailComponent(cell.getValue())
-							this.undoSelection(cell)
-						} else if (cell.getColumn().getField() === "mail") {
-							this.undoSelection(cell)
-						}
-					}
-				},
+				// {
+				// 	event: "cellClick",
+				// 	handler: async (e, cell) => {
+				// 		if(cell.getColumn().getField() === "details") {
+				// 			this.setDetailComponent(cell.getValue())
+				// 			this.undoSelection(cell)
+				// 		} else if (cell.getColumn().getField() === "mail") {
+				// 			this.undoSelection(cell)
+				// 		} else if (cell.getColumn().getField() === "abgabetermine") {
+				// 			this.openTimeline(cell.getValue())
+				// 			this.undoSelection(cell)
+				// 		}
+				// 	}
+				// },
 				{
 					event: "rowSelectionChanged",
 					handler: async(data) => {
@@ -128,13 +153,128 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		loadState() {
+			return JSON.parse(localStorage.getItem(this.abgabeTableOptions.persistenceID) || "null");
+		},
+		saveState(table) {
+			// avoid storing state after first restore part happened
+			if(!this.stateRestored) return
+			const rawLayout = table.getColumnLayout();
+			const state = {
+				columns: rawLayout.map(col => ({
+					field: col.field,
+					visible: col.visible,
+					width: col.width,
+				})),
+				sort: table.getSorters().map(s => ({
+					field: s.field,
+					dir: s.dir,
+				})),
+				filters: table.getFilters(),
+				headerFilters: table.getHeaderFilters()
+			};
+			
+			localStorage.setItem(this.abgabeTableOptions.persistenceID, JSON.stringify(state));
+		},
+		handleTableBuilt() {
+			const table = this.$refs.abgabeTable.tabulator
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
+
+			const saved = this.loadState();
+			
+			table.on("renderComplete", () => {
+				if(!this.stateRestored) {
+					debugger
+					if (saved?.columns && !this.colLayoutRestored) {
+						const layout = saved.columns.map(col => ({
+							field: col.field,
+							width: col.width,
+							visible: col.visible,
+							// add more if needed, but keep it simple
+						}));
+						
+						console.log(layout)
+
+						table.setColumnLayout(layout);
+						this.colLayoutRestored = true;
+					}
+
+					if (saved?.filters && !this.filtersRestored) {
+						this.filtersRestored = true // instantly avoid retriggers
+						table.setFilter(saved.filters);
+					}
+					if (saved?.headerFilters && !this.headerFiltersRestored) {
+						this.headerFiltersRestored = true // instantly avoid retriggers
+						for (let hf of saved.headerFilters) {
+							table.setHeaderFilterValue(hf.field, hf.value);
+						}
+					}
+
+					if (saved?.sort?.length && !this.sortRestored) {
+						this.sortRestored = true;
+
+						setTimeout(() => {
+							const sortList = saved.sort.map(s => {
+								const col = table.columnManager.findColumn(s.field);
+								if (!col) {
+									return null;
+								}
+								return { column: col, dir: s.dir };
+							}).filter(Boolean);
+
+							table.setSort(sortList);
+						}, 100);
+					}
+					this.stateRestored = true
+
+				}
+
+			});
+		},
 		handleToggleFullscreenDetail() {
 			this.detailIsFullscreen = !this.detailIsFullscreen
 		},
 		getOptionLabelAbgabetyp(option){
 			return option.bezeichnung
 		},
+		getOptionLabelStg(option){
+			return option.kurzbzlang + ' ' + option.bezeichnung
+		},
+		sgChanged(e) {
+			debugger	
+		},
 		formatDate(dateParam) {
+			if(dateParam === null) return ''
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -145,6 +285,43 @@ export const AbgabetoolAssistenz = {
 
 			return `${day}.${month}.${year}`;
 		},
+		formAction(cell) {
+			const actionButtons = document.createElement('div');
+			actionButtons.className = "d-flex gap-3"; // you can keep Bootstrap gap if loaded
+			actionButtons.style.display = "flex";
+			actionButtons.style.alignItems = "stretch"; // buttons stretch to full height
+			actionButtons.style.justifyContent = "center";
+			actionButtons.style.height = "100%"; // full grid cell height
+
+			const val = cell.getValue();
+
+			const createButton = (iconClass, titleKey, clickHandler) => {
+				const btn = document.createElement('button');
+				btn.className = 'btn btn-outline-secondary';
+				btn.style.display = "flex";
+				btn.style.alignItems = "center"; // center icon vertically
+				btn.style.justifyContent = "center"; // center icon horizontally
+				btn.style.height = "100%"; // fill parent container height
+				btn.style.aspectRatio = "1 / 1"; // keep square shape (optional)
+				btn.style.padding = "0"; // remove extra padding for compactness
+				btn.innerHTML = `<i class="${iconClass}" style="color:#00649C; font-size:1.1rem;"></i>`;
+				btn.title = this.$capitalize(this.$p.t(titleKey));
+				btn.addEventListener('click', (e) => {
+					e.stopPropagation();
+					e.stopImmediatePropagation();
+					clickHandler();
+				});
+				return btn;
+			};
+
+			actionButtons.append(
+				createButton('fa fa-folder-open', 'abgabetool/c4details', () => this.setDetailComponent(val)),
+				createButton('fa fa-timeline', 'abgabetool/c4termineTimeLine', () => this.openTimeline(val))
+			);
+
+			return actionButtons;
+		},
+
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
 			// but actually just revert it after the fact
@@ -221,27 +398,72 @@ export const AbgabetoolAssistenz = {
 				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 				termin.file = []
 
-				termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
-				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+				// assistenz should be able to edit every abgabe
+				termin.allowedToSave = true
+
+				// assistenz are not allowed to delete deadlines with existing submissions
+				termin.allowedToDelete = !termin.abgabedatum
 
 				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 
 			})
-			pa.student_uid = details.student_uid
-			pa.student = `${pa.vorname} ${pa.nachname}`
+			
+			// TODO: do same thing for sidebar
+			
+			const vorname = pa.vorname ?? pa.student_vorname
+			const nachname = pa.nachname ?? pa.student_nachname
+			pa.student = `${vorname} ${nachname}`
 
 			this.selectedProjektarbeit = pa
 
 			this.$refs.modalContainerAbgabeDetail.show()
+		},
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyleClass(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
 
-			
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					return 'verpasst'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					return 'abzugeben'
+				} else {
+					return 'standard'
+				}
+			} else if(abgabedatum > datum) {
+				return 'verspaetet'
+			} else {
+				return 'abgegeben'
+			}
+		},
+		openTimeline(val) {
+			const projekt = this.projektarbeiten.find(p => p.projektarbeit_id == val.projektarbeit_id)
+			if(!projekt) {
+
+				this.$fhcAlert.alertInfo('keine projektarbeit gefunden')
+				
+				return
+			}
+			projekt.abgabetermine.forEach(termin => {
+				// show note only on termine with abgabetypen which are benotbar
+				const terminTypOpt = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz == termin.paabgabetyp_kurzbz)
+				termin.benotbar = terminTypOpt.benotbar 
+			})
+			this.timelineProjekt = projekt
+			// this.timelineAbgabetermine = projekt.abgabetermine
+			this.$refs.drawer.show()
 		},
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
 			if(!val) return
 
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
+				'<p style="max-width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
 		},
 		detailFormatter(cell) {
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
@@ -252,6 +474,10 @@ export const AbgabetoolAssistenz = {
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
 		},
+		timelineFormatter() {
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a><i class="fa fa-timeline" style="color:#00649C"></i></a></div>'
+		},
 		beurteilungFormatter(cell) {
 			const val = cell.getValue()
 			if(val) {
@@ -265,7 +491,41 @@ export const AbgabetoolAssistenz = {
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
 		},
-		abgabterminFormatter(termin) {
+		abgabterminFormatter(cell) {
+			const val = cell.getValue()
+
+			if(val) {
+				let icon = ''
+				switch(val.dateStyle) {
+					case 'verspaetet':
+						icon = '<i class="fa-solid fa-triangle-exclamation"></i>'
+						break
+					case 'verpasst':
+						icon = '<i class="fa-solid fa-calendar-xmark"></i>'
+						break
+					case 'verpasst':
+						icon = '<i class="fa-solid fa-hourglass-half"></i>'
+						break
+					case 'standard':
+						icon = '<i class="fa-solid fa-clock"></i>'
+						break
+					case 'abgegeben':
+						icon = '<i class="fa-solid fa-check"></i>'
+						break
+				}
+				
+				return '<div style="display: flex; height: 100%">' +
+					'<div class=' + val.dateStyle + "-header" + ' style="width:48px; height: 100%; padding: 0px; display: flex; align-items: center; justify-content: center;">' +
+						icon +
+					'</div>' + 
+					'<div style="margin-left: 4px;">' +
+						'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val.bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
+					'</div>'+
+					'</div>'
+
+			} else {
+				return ''
+			}
 			
 		},
 		tableResolve(resolve) {
@@ -281,37 +541,56 @@ export const AbgabetoolAssistenz = {
 			return (projekt.typ + projekt.kurzbz)?.toUpperCase()
 		},
 		buildErstbetreuer(projekt) {
-			return projekt.betreuer_vorname + ' ' + projekt.betreuer_nachname + ' - ' + projekt.betreuerart + '(' + projekt.betreuer_benutzer_uid + ')'
+			if(projekt.erstbetreuer_full_name) return projekt.erstbetreuer_full_name
+			return projekt.betreuer_vorname + ' ' + projekt.betreuer_nachname
 		},
 		buildZweitbetreuer(projekt) {
 			return projekt.zweitbetreuer_full_name ?? ''
 		},
 		setupData(data){
 			this.projektarbeiten = data[0]
-			this.domain = data[1]			
-			
+			this.domain = data[1]
+
+			const now = luxon.DateTime.fromISO(todayISO)
+			// const now = luxon.DateTime.now();
 			const d = data[0].map(projekt => {
 				let mode = 'detailTermine'
 
+				projekt.prevTermin = undefined;
+				projekt.nextTermin = undefined;
+				
 				// only show 2tbetreuer col if any projektarbeit has one
 				if(projekt.zweitbetreuer_full_name) this.showZweitbetreuerCol = true
 				
-				// first Abgabetermin in the past
+				// calculate Abgabetermin time diff to now and assign last and next to projekt
 				projekt.abgabetermine.forEach(termin => {
+					
+					// while already looping through each termin, calculate datestyle beforehand
+					termin.dateStyle = this.getDateStyleClass(termin)
+					
 					const date = luxon.DateTime.fromISO(termin.datum)
-					termin.diff = date.diffNow('milliseconds')
-					
-					// console.log(termin.diff)
+					termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
+
+					if (termin.diffMs < 0) {
+						if (!projekt.prevTermin ||
+							termin.diffMs > projekt.prevTermin.diffMs // larger (less negative) = closer to now
+						) {
+							projekt.prevTermin = termin;
+						}
+					} else if (termin.diffMs > 0) {
+						if (!projekt.nextTermin ||
+							termin.diffMs < projekt.nextTermin.diffMs // smaller positive = closer to now
+						) {
+							projekt.nextTermin = termin;
+						}
+					}
 				})
-				
-				// console.log('\n\n')
-					
 					
 				return {
 					...projekt,
 					abgabetermine: projekt.abgabetermine,
 					details: {
-						student_uid: projekt.uid,
+						student_uid: projekt.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
 					},
 					pkz: this.buildPKZ(projekt),
@@ -326,6 +605,7 @@ export const AbgabetoolAssistenz = {
 				}
 			})
 
+			this.$refs.abgabeTable.tabulator.clearData()
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
@@ -378,19 +658,21 @@ export const AbgabetoolAssistenz = {
 		sendEmailStudierende() {
 			// TODO: implement
 		}
-		
 	},
 	watch: {
-
+		selectedStudiengangOption(newVal, oldVal) {
+			this.loadProjektarbeiten()
+		}
 	},
 	computed: {
 		getCurrentStudiengang() {
 			// TODO: sophisticated logic pulling from default value by viewData or dropdown select
 			
-			return 257
+			return this.selectedStudiengangOption?.studiengang_kz ?? 257
 		}
 	},
 	created() {
+		this.loading = true
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 		// fetch config to avoid hard coded links
@@ -402,6 +684,14 @@ export const AbgabetoolAssistenz = {
 			this.loading = false
 		})
 
+		// fetch studiengänge options
+		this.$api.call(ApiAbgabe.getStudiengaenge()).then(res => {
+			this.studiengaengeOptions = res.data
+			console.log(this.studiengaengeOptions)
+		}).catch(e => {
+			this.loading = false
+		})
+		
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
@@ -440,17 +730,28 @@ export const AbgabetoolAssistenz = {
 			</template>
 			<template v-slot:default>
 				<div class="row">
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4fixterminv2')}}
+					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4zieldatum')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabetypv2')}}
 					</div>
-					<div class="col-6 d-flex justify-content-center align-items-center">
+					<div class="col-5 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabekurzbz')}}
 					</div>
 				</div>
 				<div class="row">
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<Checkbox 
+							v-model="serienTermin.fixtermin"
+							:binary="true" 
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						<div>
 							<VueDatePicker
@@ -472,7 +773,7 @@ export const AbgabetoolAssistenz = {
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
-					<div class="col-6 d-flex justify-content-center align-items-center">
+					<div class="col-5 d-flex justify-content-center align-items-center">
 						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" cols="40"></Textarea>
 					</div>
 				</div>
@@ -492,14 +793,104 @@ export const AbgabetoolAssistenz = {
 				</div>
 			</template>
 			<template v-slot:default>
-				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen"></AbgabeDetail>
+				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen" :assistenzMode="true"></AbgabeDetail>
 				
 			</template>
 		</bs-modal>	
 		
+		<BsOffcanvas
+			ref="drawer"
+			placement="end"
+			:backdrop="true"
+			@shownBsOffcanvas="onShown"
+			@hiddenBsOffcanvas="onHidden"
+			:style="{ '--bs-offcanvas-width': '600px' }"
+		>
+			<template #title>
+				{{ $p.t('abgabetool/c4projektarbeitTimelineTitle') }}
+			</template>
+		
+			<Timeline 
+				:value="timelineProjekt?.abgabetermine"
+				align="right"	
+			>
+			
+				<template #marker="slotProps">
+					<div :class="slotProps.item.dateStyle + '-header'" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i v-if="slotProps.item.dateStyle == 'verspaetet'" class="fa-solid fa-triangle-exclamation"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'verpasst'" class="fa-solid fa-calendar-xmark"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'abzugeben'"  class="fa-solid fa-hourglass-half"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'standard'"  class="fa-solid fa-clock"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'abgegeben'"  class="fa-solid fa-check"></i>
+					</div>
+				</template>
+			
+				<template #opposite="slotProps">
+					<div class="row g-1">
+						<div class="col-5 fw-semibold text-end">
+							{{ $capitalize($p.t('abgabetool/c4zieldatum')) }}:
+						</div>
+						<div class="col-7">
+							{{ formatDate(slotProps.item.datum) }}
+						</div>
+					</div>
+				</template>
+				
+				<template #content="slotProps">
+				 	<div class="row g-1">
+						<div class="col-5 fw-semibold text-end">
+							{{ $capitalize($p.t('abgabetool/c4abgabetyp')) }}:
+						</div>
+						<div class="col-7">
+							{{ slotProps?.item?.bezeichnung?.bezeichnung ?? slotProps?.item?.bezeichnung }}
+						</div>
+				
+						<div class="col-5 fw-semibold text-end">
+							{{ $capitalize($p.t('abgabetool/c4abgabedatum')) }}:
+						</div>
+						<div class="col-7">
+							{{ formatDate(slotProps.item.abgabedatum) }}
+						</div>
+						
+						<div v-if="slotProps.item.benotbar" class="col-5 fw-semibold text-end">
+							{{ $capitalize($p.t('abgabetool/c4note')) }}:
+						</div>
+						<div v-if="slotProps.item.benotbar" class="col-7">
+							{{ slotProps.item.note }}
+						</div>
+				 	</div>
+				 	<hr/>
+				</template>
+				
+			</Timeline>
+			
+			<template #footer>
+				<AbgabeterminStatusLegende></AbgabeterminStatusLegende>
+			</template>
+		</BsOffcanvas>
+		
 		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
 		<div style="max-height:40vw;">
-			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<div class="row">
+				<div class="col-auto">
+					<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+				</div>
+				<div class="col-3">
+					<Dropdown
+						@change="sgChanged" 
+						:placeholder="$p.t('lehre/studiengang')" 
+						:style="{'width': '100%', 'scroll-behavior': 'auto !important'}" 
+						:optionLabel="getOptionLabelStg" 
+						v-model="selectedStudiengangOption" 
+						:options="studiengaengeOptions" 
+						showClear
+					>
+						<template #optionsgroup="slotProps">
+							<div> {{ option.kurzbzlang }} {{ option.bezeichnung }} </div>
+						</template>
+					</Dropdown>
+				</div>
+			</div>
 			<hr>
 			<core-filter-cmpt
 				:title="''"  
@@ -511,17 +902,18 @@ export const AbgabetoolAssistenz = {
 				@click:new=openAddSeriesModal
 				:tabulator-options="abgabeTableOptions"  
 				:tabulator-events="abgabeTableEventHandlers"
+				@tableBuilt="handleTableBuilt"
 				tableOnly
 				:sideMenu="false"
 				:useSelectionSpan="false"
 			>
 				<template #actions>
 					<button @click="sendEmailStudierende" role="button" class="btn btn-secondary ml-2">
-						{{ $p.t('abgabetool/sendEmailStudierende') }}
+						{{ $p.t('abgabetool/c4sendEmailStudierende') }}
 					</button>
 					
 					<button @click="sendEmailBegutachter" role="button" class="btn btn-secondary ml-2">
-						{{ $p.t('abgabetool/sendEmailBegutachter') }}
+						{{ $p.t('abgabetool/c4sendEmailBetreuer') }}
 					</button>
 					
 				</template>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index a50d9cf52..2e4cb64a0 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -234,7 +234,10 @@ export const AbgabetoolMitarbeiter = {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
 					
+					// lektoren are only allowed to edit their own deadline entries
 					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
+					
+					// lektoren are not allowed to delete deadlines with existing submissions
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
 					
 					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
new file mode 100644
index 000000000..557e27a89
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -0,0 +1,57 @@
+export const AbgabeterminStatusLegende = {
+	name: 'AbgabeterminStatusLegende',
+	template: `	
+		<div class="text-center">
+			<div class="col"  style="width: 50%; margin-left: 12px;">
+			
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto verspaetet-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-triangle-exclamation"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipVerspaetet')) }}</h5>
+					</div>
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto verpasst-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-calendar-xmark"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipVerpasst')) }}</h5>
+					</div>
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto abzugeben-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-hourglass-half"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipAbzugeben')) }}</h5>
+					</div>
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto standard-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-clock"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipStandard')) }}</h5>
+					</div>
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto abgegeben-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-check"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipAbgegeben')) }}</h5>
+					</div>
+					
+				</div>
+
+			</div>
+		</div>	
+	`
+};
+export default AbgabeterminStatusLegende;
\ No newline at end of file
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 83dd91c2d..9d743c91d 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -254,3 +254,37 @@ if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechti
 			echo "<br>system.tbl_berechtigung insert basis/abgabe_assistenz hinzugefuegt";
 	}
 }
+
+if($result = $db->db_query("SELECT 1 FROM information_schema.routines WHERE routine_schema = 'campus' AND routine_name = 'get_betreuer_details'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "CREATE OR REPLACE FUNCTION campus.get_betreuer_details(b_person_id INT)
+					RETURNS TABLE (
+						full_name TEXT
+					)
+				LANGUAGE sql
+				AS $$
+					SELECT DISTINCT 
+						trim(
+							COALESCE(titelpre,'') || ' ' ||
+							COALESCE(vorname,'') || ' ' ||
+							COALESCE(nachname,'') || ' ' ||
+							COALESCE(titelpost,'')
+						) AS full_name
+					FROM public.tbl_person
+					JOIN lehre.tbl_projektbetreuer 
+						ON lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id
+					LEFT JOIN public.tbl_benutzer 
+						ON public.tbl_benutzer.person_id = public.tbl_person.person_id
+					LEFT JOIN public.tbl_mitarbeiter 
+						ON public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid
+					WHERE public.tbl_person.person_id = b_person_id;
+				$$;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>campus.get_betreuer_details: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>campus.get_betreuer_details function hinzugefuegt";
+	}
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f48347e02..22a3a6e94 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41936,6 +41936,7 @@ array(
 			)
 		)
 	),
+	// ABGABETOOL PHRASEN BEGIN
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -42670,7 +42671,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Supervisor type',
+				'text' => 'Assessor type',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43286,7 +43287,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Emailcontact Assesor',
+				'text' => 'Emailcontact Assessor',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43607,6 +43608,167 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4prevAbgabetermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorheriger Termin',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Previous Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4nextAbgabetermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nächster Termin',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Next Deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4erstbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ErstbetreuerIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First Assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zweitbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZweitbetreuerIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Second Assessor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projektarbeitTimelineTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit Abgabetermine Zeitstrahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project Deadline Timeline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sendEmailStudierende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email an Studierende schicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send Email to students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sendEmailBetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email an Betreuende schicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send Email to assessors',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4keineAbgabetermineGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Projektarbeit hat keine zugeordneten Abgabetermine!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Project has no assigned Deadlines!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From d923f30ccf108bbe22535eb8acb6633ef487a8d4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 3 Nov 2025 11:05:26 +0100
Subject: [PATCH 0916/1357] Add search from url functionality

---
 public/js/apps/Studentenverwaltung.js         | 38 +++++++++++++
 .../js/components/Stv/Studentenverwaltung.js  | 57 ++++++++++++++++---
 .../Stv/Studentenverwaltung/List.js           | 21 ++++---
 3 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 5eda16dd6..e6f77d5f5 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -148,6 +148,44 @@ const router = VueRouter.createRouter({
 				next();
 			}
 		},
+		{
+			name: 'search',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/search/:searchstr`,
+			component: FhcStudentenverwaltung,
+			props(route) {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'search',
+					url_prestudent_id: route.params.searchstr
+				};
+			},
+			beforeEnter(to, from, next) {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			name: 'search_w_types',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/search/:types/:searchstr`,
+			component: FhcStudentenverwaltung,
+			props(route) {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'search',
+					url_prestudent_id: route.params.type + '/' + route.params.searchstr
+				};
+			},
+			beforeEnter(to, from, next) {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
 		{
 			path: '/:pathMatch(.*)*',
 			redirect: {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 46570bd6e..bfa427a6e 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -144,6 +144,9 @@ export default {
 		},
 		'url_mode': function () {
 			this.handlePersonUrl();
+		},
+		url_prestudent_id() {
+			this.handlePersonUrl();
 		}
 	},
 	methods: {
@@ -247,6 +250,21 @@ export default {
 					ApiStv.students.person(this.$route.params.person_id, 'CURRENT_SEMESTER'),
 					true
 					);
+			} else if (this.$route.params.searchstr) {
+				const searchsettings = {
+					searchstr: this.$route.params.searchstr,
+					types: this.$route.params.types?.split('+') || []
+				};
+
+				// init into student list
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
+				);
+
+				// init into searchbar
+				this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
+				this.$refs.searchbar.searchsettings.types = searchsettings.types;
+				this.$nextTick(this.blurSearchbar);
 			}
 		},
 		checkUrlStudiengang() {
@@ -269,15 +287,40 @@ export default {
 			}
 		},
 		onSearch(e) {
-			const searchsettings = this.$refs.searchbar.searchsettings;
+			const searchsettings = { ...this.$refs.searchbar.searchsettings };
 			if (searchsettings.searchstr.length >= 2) {
-				this.$refs.stvList.updateUrl(
-					ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
-				);
-				this.$refs.searchbar.$refs.input.blur();
-				this.$refs.searchbar.abort();
-				this.$refs.searchbar.hideresult();
+				this.blurSearchbar();
+				
+				if (!searchsettings.types.length || searchsettings.types.length == this.$refs.searchbar.types.length) {
+					this.$router.push({
+						name: 'search',
+						params: {
+							studiensemester_kurzbz: this.studiensemesterKurzbz,
+							searchstr: searchsettings.searchstr
+						}
+					});
+				} else {
+					this.$router.push({
+						name: 'search_w_types',
+						params: {
+							studiensemester_kurzbz: this.studiensemesterKurzbz,
+							searchstr: searchsettings.searchstr,
+							types: searchsettings.types.join('+')
+						}
+					});
+				}
+				/*this.$nextTick(() => {console.log(searchsettings);
+					this.$refs.stvList.updateUrl(
+						ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
+					);
+					
+				});*/
 			}
+		},
+		blurSearchbar() {
+			this.$refs.searchbar.$refs.input.blur();
+			this.$refs.searchbar.abort();
+			this.$refs.searchbar.hideresult();
 		}
 	},
 	created() {
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index db79dae76..53168bf36 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -119,7 +119,12 @@ export default {
 					{
 						return Promise.resolve({ data: []});
 					}
-					return this.$api.call({...config, url, params});
+					/**
+					 * NOTE(chris): Because of a bug in Tabulator
+					 * we need to get the params from elsewhere.
+					 * @see https://github.com/olifolkerd/tabulator/issues/4318
+					 */
+					return this.$api.call({...config, url, params: this.tabulatorOptions.ajaxParams});
 				},
 				ajaxResponse: (url, params, response) => {
 					return response?.data;
@@ -214,9 +219,9 @@ export default {
 				encodeURIComponent(this.currentSemester)
 				);
 
-			let params = {}, filter = {}, method = 'get';
+			var params = {}, filter = {}, method = 'get';
 			if (endpoint.params)
-				params = endpoint.params;
+				params = { ...endpoint.params };
 			if (endpoint.method)
 				method = endpoint.method;
 
@@ -228,15 +233,15 @@ export default {
 			if (filter.konto_count_0 || filter.konto_missing_counter)
 				params.filter = filter;
 
+			this.tabulatorOptions.ajaxURL = endpoint.url;
+			this.tabulatorOptions.ajaxParams = { ...params };
+			this.tabulatorOptions.ajaxConfig = method;
 			if (!this.$refs.table.tableBuilt) {
-				if (!this.$refs.table.tabulator) {
-					this.tabulatorOptions.ajaxURL = endpoint.url;
-					this.tabulatorOptions.ajaxParams = params;
-					this.tabulatorOptions.ajaxConfig = method;
-				} else
+				if (this.$refs.table.tabulator) {
 					this.$refs.table.tabulator.on("tableBuilt", () => {
 						this.$refs.table.tabulator.setData(endpoint.url, params, method);
 					});
+				}
 			} else
 				this.$refs.table.tabulator.setData(endpoint.url, params, method);
 		},

From 17540070a17daa04dd6f51c67cf31f4579e37df9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 3 Nov 2025 11:35:31 +0100
Subject: [PATCH 0917/1357] remove comments

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index bfa427a6e..43065c389 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -309,12 +309,6 @@ export default {
 						}
 					});
 				}
-				/*this.$nextTick(() => {console.log(searchsettings);
-					this.$refs.stvList.updateUrl(
-						ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
-					);
-					
-				});*/
 			}
 		},
 		blurSearchbar() {

From 398478e575b768ac78b7c5e5a9197f062246d7dc Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 3 Nov 2025 11:36:10 +0100
Subject: [PATCH 0918/1357] searchbar submit button

---
 public/js/components/searchbar/searchbar.js | 34 ++++++++++++++++-----
 system/phrasesupdate.php                    | 20 ++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 1c2747e3c..e11a3111d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -23,7 +23,17 @@ export default {
 		mergedStudent,
 		mergedPerson
 	},
-    props: [ "searchoptions", "searchfunction" ],
+    props: {
+    	searchoptions: {
+    		type: Object,
+    		required: true
+    	},
+    	searchfunction: {
+    		type: Function,
+    		required: true
+    	},
+    	showBtnSubmit: Boolean
+    },
     provide() {
         return {
             query: Vue.computed(() => this.lastQuery)
@@ -105,9 +115,19 @@ export default {
 					type="button"
 					class="searchbar_input_clear btn btn-outline-secondary"
 					@click="clearInput"
+					@focusin.stop
 				>
 					<i class="fas fa-close"></i>
 				</button>
+				<button
+					v-if="showBtnSubmit"
+					type="submit"
+					class="btn btn-primary"
+					:title="$p.t('search/submit')"
+					:aria-label="$p.t('search/submit')"
+				>
+					<i class="fas fa-search"></i>
+				</button>
                 <button
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"
@@ -220,12 +240,12 @@ export default {
 			});
 		}
 	},
-    methods: {
-    	clearInput() {
-    		this.searchsettings.searchstr = "";
-    		this.hideresult();
-    		this.$refs.input.focus()
-    	},
+	methods: {
+		clearInput() {
+			this.searchsettings.searchstr = "";
+			this.hideresult();
+			this.$refs.input.focus();
+		},
 		getInitiallySelectedTypes() {
 			let result = false;
 			if (this.searchoptions.origin) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 879ca6cc2..0b072f6e0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -48530,6 +48530,26 @@ and represent the current state of research on the topic. The prescribed citatio
 	// FHC-4 Finetuning END
 
 	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'submit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'suchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'search',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From d6c4e0db419a9f7d743510249da1877765800e20 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 3 Nov 2025 11:36:24 +0100
Subject: [PATCH 0919/1357] show submit btn in StV

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 43065c389..b25b735b2 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -403,6 +403,7 @@ export default {
 				:searchoptions="searchbaroptions"
 				:searchfunction="searchfunction"
 				class="searchbar position-relative w-100"
+				show-btn-submit
 				@submit.prevent="onSearch"
 			></core-searchbar>
 		</header>

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

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

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

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

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

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

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

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

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

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

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

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

From cc3da1439d28e2599fb087e91e512946e1972ffc Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 5 Nov 2025 11:06:45 +0100
Subject: [PATCH 0924/1357] StV: add user menu

---
 application/views/Studentenverwaltung.php     |  2 +
 public/css/Studentenverwaltung.css            |  6 ++
 .../js/components/Stv/Studentenverwaltung.js  | 35 +++++++++++
 public/js/components/navigation/Language.js   | 62 +++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 public/js/components/navigation/Language.js

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01e611657..16b8c0045 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -53,6 +53,8 @@ $configArray = [
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
 			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
+			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
+			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 			>
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index bb2588926..d92e3dfac 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -41,6 +41,12 @@ html {
 	width: 0%;
 }
 
+#nav-user-btn img {
+	object-fit: contain;
+	height: 2.5rem;
+	width: 2.5rem;
+}
+
 .tabulator-row.disabled.tabulator-row-odd .tabulator-cell {
 	color: var(--gray-400);
 }
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d0543ad59..c97d7a0bf 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -16,6 +16,7 @@
  */
 
 import CoreSearchbar from "../searchbar/searchbar.js";
+import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
@@ -31,6 +32,7 @@ export default {
 	name: 'Studentenverwaltung',
 	components: {
 		CoreSearchbar,
+		NavLanguage,
 		VerticalSplit,
 		StvVerband,
 		StvList,
@@ -43,6 +45,8 @@ export default {
 		permissions: Object,
 		stvRoot: String,
 		cisRoot: String,
+		avatarUrl: String,
+		logoutUrl: String,
 		activeAddons: String, // semicolon separated list of active addons
 		url_studiensemester_kurzbz: String,
 		url_mode: String,
@@ -355,6 +359,37 @@ export default {
 				:searchfunction="searchfunction"
 				class="searchbar position-relative w-100"
 			></core-searchbar>
+			<div id="nav-user" class="dropdown">
+				<button
+					id="nav-user-btn"
+					class="btn btn-link rounded-0 py-0"
+					type="button"
+					data-bs-toggle="dropdown"
+					data-bs-target="#nav-user-menu"
+					aria-expanded="false"
+					aria-controls="nav-user-menu"
+				>
+					<img
+						:src="avatarUrl"
+						:alt="$p.t('profilUpdate/profilBild')"
+						class="bg-light avatar rounded-circle border border-light"
+					/>
+				</button>
+				<ul
+					ref="navUserDropdown"
+					class="dropdown-menu dropdown-menu-dark dropdown-menu-end rounded-0 text-center m-0"
+					aria-labelledby="nav-user-btn"
+				>
+					<li>
+						<nav-language
+							item-class="dropdown-item border-left-dark"
+							@changed="tmpFunc"
+						/>
+					</li>
+					<li><hr class="dropdown-divider m-0"/></li>
+					<li><a class="dropdown-item" :href="logoutUrl">Logout</a></li>
+				</ul>
+			</div>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
diff --git a/public/js/components/navigation/Language.js b/public/js/components/navigation/Language.js
new file mode 100644
index 000000000..4d26dadc0
--- /dev/null
+++ b/public/js/components/navigation/Language.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	emits: [
+		'changed'
+	],
+	props: {
+		activeClass: {
+			type: String,
+			default: 'active'
+		},
+		itemClass: {
+			type: [String, Array, Object],
+			default: ''
+		}
+	},
+	data() {
+		return {
+			languages: FHC_JS_DATA_STORAGE_OBJECT.server_languages
+		};
+	}, 
+	methods:{
+		onChange(lang) {
+			if (this.languages.some(l => l.sprache === lang)) {
+				this.$p
+					.setLanguage(lang)
+					.then(() => {
+						if (document.querySelector('[cis4Reload]'))
+							window.location.reload();
+						else
+							this.$emit('changed', lang);
+					});
+			}
+		}
+	},
+	template: /*html*/`
+	<div class="navigation-language d-flex justify-content-center align-items-center flex-nowrap overflow-hidden">
+		<button
+			v-for="lang in languages"
+			:class="[itemClass, {[activeClass]: $p.user_language.value == lang.sprache}]"
+			:selected="$p.user_language.value == lang.sprache"
+			@click.prevent="onChange(lang.sprache)"
+		>
+			{{ lang.bezeichnung }}
+		</button>
+	</div>`
+};
\ No newline at end of file

From 601110913281ee722d8cab3dbb9eb6a3ffe899ed Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 5 Nov 2025 11:44:25 +0100
Subject: [PATCH 0925/1357] Fix language on details tabs

---
 .../Stv/Studentenverwaltung/Details.js        | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 8222d637e..2c141754e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -37,25 +37,34 @@ export default {
 			return this.configStudents;
 		}
 	},
+	watch: {
+		'$p.user_language.value'(n, o) {
+			if (n !== o && o !== undefined)
+				this.loadConfig();
+		}
+	},
 	methods: {
+		loadConfig() {
+			this.$api
+				.call(ApiStvApp.configStudent())
+				.then(result => {
+					this.configStudent = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+			this.$api
+				.call(ApiStvApp.configStudents())
+				.then(result => {
+					this.configStudents = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		reload() {
 			if (this.$refs.tabs?.$refs?.current?.reload)
 				this.$refs.tabs.$refs.current.reload();
 		}
 	},
 	created() {
-		this.$api
-			.call(ApiStvApp.configStudent())
-			.then(result => {
-				this.configStudent = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		this.$api
-			.call(ApiStvApp.configStudents())
-			.then(result => {
-				this.configStudents = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+		this.loadConfig();
 	},
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">

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

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

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

From 3878fce625fc5c5d3abe20797ea6151d81601a05 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 5 Nov 2025 15:34:10 +0100
Subject: [PATCH 0927/1357] wip abgabetool;

---
 application/config/cis.php                    |   2 +-
 .../controllers/api/frontend/v1/Abgabe.php    |  15 +-
 .../models/education/Projektarbeit_model.php  |   2 -
 application/views/Cis/Abgabetool.php          |   1 +
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/js/api/factory/abgabe.js               |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  12 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 295 ++++++++++++------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   3 +-
 .../Cis/Abgabetool/StatusLegende.js           |  10 +-
 public/js/components/Dashboard/Item.js        |   2 +
 public/js/plugins/Api.js                      |   3 +-
 system/phrasesupdate.php                      |  60 ++++
 13 files changed, 299 insertions(+), 111 deletions(-)

diff --git a/application/config/cis.php b/application/config/cis.php
index 8d3bc347e..430539392 100644
--- a/application/config/cis.php
+++ b/application/config/cis.php
@@ -4,7 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
 // CMS Content Id for CIS4 Menu Root
-$config['cis_menu_root_content_id'] = 11087;
+$config['cis_menu_root_content_id'] = 11091;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
 // Vilesci CI BaseUrl
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 3a05bd6f6..73f0d0a15 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -672,6 +672,7 @@ class Abgabe extends FHCAPI_Controller
 		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
 		$bezeichnung = $_POST['bezeichnung'];
 		$kurzbz = $_POST['kurzbz'];
+		$fixtermin = $_POST['fixtermin'];
 
 		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
 			|| !isset($datum) || isEmptyString($datum)
@@ -697,13 +698,14 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 		$res = [];
+		$abgaben = [];
 		foreach ($projektarbeit_ids as $projektarbeit_id) {
 
 			$result = $this->PaabgabeModel->insert(
 				array(
 					'projektarbeit_id' => $projektarbeit_id,
 					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
-					'fixtermin' => false,
+					'fixtermin' => $fixtermin,
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'insertvon' => getAuthUID(),
@@ -711,7 +713,9 @@ class Abgabe extends FHCAPI_Controller
 				)
 			);
 
-			$data = $this->getDataOrTerminateWithError($result);
+			$dataAbgabe  = $this->getDataOrTerminateWithError($result);
+			
+			$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
 
 //			$res[] = $data;
 
@@ -751,7 +755,7 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
 
-		$this->terminateWithSuccess($res);
+		$this->terminateWithSuccess(array($res, $abgaben));
 
 	}
 
@@ -865,9 +869,6 @@ class Abgabe extends FHCAPI_Controller
 		if (!isset($studiengang_kz) || isEmptyString($studiengang_kz))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		
-		// TODO revert arr return new/old
-//		$arr = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
-//		$result = $arr[0];
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
 
@@ -904,7 +905,7 @@ class Abgabe extends FHCAPI_Controller
 		$stg_allowed = $this->permissionlib->getSTG_isEntitledFor('basis/abgabe_assistenz:rw');
 		
 		if($stg_allowed == false) {
-			$this->terminateWithError($this->p->t('global', 'keineBerechtigung'), 'general');
+			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
 		}
 
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 9cd28cdf8..1f35ea856 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -407,8 +407,6 @@ class Projektarbeit_model extends DB_Model
 						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
 			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
 				 AND student_benutzer.aktiv AND (lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter')
-				 --   AND lehre.tbl_projektarbeit.note IS NULL
-				 --   AND public.tbl_studiengang.studiengang_kz= 257
 				 AND public.tbl_studiengang.studiengang_kz = ?
 			   ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index d47f33283..422ae1087 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -25,6 +25,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
+		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 4fa215f3d..af35cd4eb 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -33,6 +33,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/speeddial/speeddial.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
+		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 1087ec2a0..12615ee76 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -73,11 +73,11 @@ export default {
 			params: { paabgabe_id }
 		};
 	},
-	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids) {
+	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids, fixtermin) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/postSerientermin',
-			params: { datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids }
+			params: { datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids, fixtermin }
 		};
 	},
 	fetchDeadlines(person_id) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index aa8b2b858..aa184b4f6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -86,11 +86,17 @@ export const AbgabeMitarbeiterDetail = {
 					}
 					if(newTerminRes.note) newTerminRes.note = noteOpt
 					const existingTerminRes = res.data[1]
+					
+					const abgabeOpt = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz == newTerminRes.paabgabetyp_kurzbz)
+					
 					newTerminRes.bezeichnung = {
 						bezeichnung: termin.bezeichnung?.bezeichnung,
-						paabgabetyp_kurzbz: termin.bezeichnung?.paabgabetyp_kurzbz
+						paabgabetyp_kurzbz: termin.bezeichnung?.paabgabetyp_kurzbz,
+						benotbar: abgabeOpt.benotbar
 					}
 					
+					
+					
 					// only insert new abgabe if we actually created a new one, not when saving/editing existing
 					if(!existingTerminRes){
 						this.projektarbeit.abgabetermine.push(newTerminRes)
@@ -711,8 +717,8 @@ export const AbgabeMitarbeiterDetail = {
 		<div v-if="projektarbeit?.abgabetermine.length == 0" style="display:flex; justify-content: center; align-content: center;">
 			<h3>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h3>
 		</div>
-</div>
-	 </div>
+		
+	</div>
 `,
 };
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 40baf97bc..0ca163e33 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -7,8 +7,14 @@ import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import AbgabeterminStatusLegende from "./StatusLegende.js";
 
-const todayISO = '2025-08-08'
-const today = new Date(todayISO)
+// spoofed date testing
+// const todayISO = '2025-08-08'
+// const today = new Date(todayISO)
+// const now = luxon.DateTime.fromISO(todayISO)
+
+// prod code
+const today = new Date()
+const now = luxon.DateTime.now()
 
 export const AbgabetoolAssistenz = {
 	name: "AbgabetoolAssistenz",
@@ -21,6 +27,7 @@ export const AbgabetoolAssistenz = {
 		VerticalSplit,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
+		Inplace: primevue.inplace,
 		Textarea: primevue.textarea,
 		Timeline: primevue.timeline,
 		VueDatePicker
@@ -45,6 +52,8 @@ export const AbgabetoolAssistenz = {
 	},
 	data() {
 		return {
+			notenOptionFilter: null,
+			inplaceToggle: false,
 			headerFiltersRestored: false,
 			filtersRestored: false,
 			colLayoutRestored: false,
@@ -54,7 +63,6 @@ export const AbgabetoolAssistenz = {
 			selectedStudiengangOption: null,
 			studiengaengeOptions: null,
 			detailIsFullscreen: false,
-			showZweitbetreuerCol: false,
 			phrasenPromise: null,
 			phrasenResolved: false,
 			turnitin_link: null,
@@ -63,6 +71,7 @@ export const AbgabetoolAssistenz = {
 			loading: false,
 			abgabeTypeOptions: null,
 			notenOptions: null,
+			allowedNotenFilterOptions: null,
 			allowedNotenOptions: null,
 			serienTermin: Vue.reactive({
 				datum: new Date(),
@@ -70,7 +79,8 @@ export const AbgabetoolAssistenz = {
 					paabgabetyp_kurzbz: 'zwischen',
 					bezeichnung: 'Zwischenabgabe'
 				},
-				kurzbz: ''
+				kurzbz: '',
+				fixtermin: false
 			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
@@ -91,6 +101,7 @@ export const AbgabetoolAssistenz = {
 				selectable: true,
 				selectableCheck: this.selectionCheck,
 				rowHeight: 40,
+				renderVerticalBuffer: 2000,
 				responsiveLayout: true,
 				columns: [
 					{
@@ -106,6 +117,7 @@ export const AbgabetoolAssistenz = {
 						width: 40
 					},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150,},
+					{title: 'pa_id', field: 'projektarbeit_id', visible: true},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4termineTimeLine'))), headerFilter: true, field: 'abgabetermine',responsive:2, formatter: this.timelineFormatter, widthGrow: 1, tooltip: false},
@@ -114,10 +126,11 @@ export const AbgabetoolAssistenz = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: false, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: Vue.computed(()=>{return this.showZweitbetreuerCol})},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
@@ -153,6 +166,31 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		checkAbgabetermineProjektarbeit(projekt) {
+			// calculate Abgabetermin time diff to now and assign last and next to projekt
+			projekt.abgabetermine.forEach(termin => {
+
+				// while already looping through each termin, calculate datestyle beforehand
+				termin.dateStyle = this.getDateStyleClass(termin)
+
+				const date = luxon.DateTime.fromISO(termin.datum)
+				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
+
+				if (termin.diffMs < 0) {
+					if (!projekt.prevTermin ||
+						termin.diffMs > projekt.prevTermin.diffMs // larger (less negative) = closer to now
+					) {
+						projekt.prevTermin = termin;
+					}
+				} else if (termin.diffMs > 0) {
+					if (!projekt.nextTermin ||
+						termin.diffMs < projekt.nextTermin.diffMs // smaller positive = closer to now
+					) {
+						projekt.nextTermin = termin;
+					}
+				}
+			})
+		},
 		loadState() {
 			return JSON.parse(localStorage.getItem(this.abgabeTableOptions.persistenceID) || "null");
 		},
@@ -214,7 +252,7 @@ export const AbgabetoolAssistenz = {
 			
 			table.on("renderComplete", () => {
 				if(!this.stateRestored) {
-					debugger
+					
 					if (saved?.columns && !this.colLayoutRestored) {
 						const layout = saved.columns.map(col => ({
 							field: col.field,
@@ -222,10 +260,13 @@ export const AbgabetoolAssistenz = {
 							visible: col.visible,
 							// add more if needed, but keep it simple
 						}));
-						
-						console.log(layout)
 
-						table.setColumnLayout(layout);
+						const safeLayout = layout.filter(col =>
+							col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
+						);
+						
+						table.setColumnLayout(safeLayout);
+
 						this.colLayoutRestored = true;
 					}
 
@@ -270,6 +311,9 @@ export const AbgabetoolAssistenz = {
 		getOptionLabelStg(option){
 			return option.kurzbzlang + ' ' + option.bezeichnung
 		},
+		getNotenFilterOptionLabel(option) {
+			return option.bezeichnung	
+		},
 		sgChanged(e) {
 			debugger	
 		},
@@ -304,6 +348,7 @@ export const AbgabetoolAssistenz = {
 				btn.style.height = "100%"; // fill parent container height
 				btn.style.aspectRatio = "1 / 1"; // keep square shape (optional)
 				btn.style.padding = "0"; // remove extra padding for compactness
+				if(iconClass == 'fa fa-timeline') btn.style.transform = "rotate(90deg)";
 				btn.innerHTML = `<i class="${iconClass}" style="color:#00649C; font-size:1.1rem;"></i>`;
 				btn.title = this.$capitalize(this.$p.t(titleKey));
 				btn.addEventListener('click', (e) => {
@@ -354,27 +399,88 @@ export const AbgabetoolAssistenz = {
 			this.$refs.modalContainerAddSeries.show()
 		},
 		addSeries() {
+			const pids = this.selectedData?.map(projekt => projekt.projektarbeit_id)
 			this.saving = true
 			this.$api.call(ApiAbgabe.postSerientermin(
 				this.serienTermin.datum.toISOString(),
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
-				this.selectedData?.map(projekt => projekt.projektarbeit_id)
+				pids,
+				this.serienTermin.fixtermin
 			)).then(res => {
+				// TODO
+				// sticky lifetime somehow
+				
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
 					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
-					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
+					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data[0])]));
 				} else {
 					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
 				}
+				
+				// put new abgaben into projektarbeiten
+				const newAbgaben = res.data[1]
+				pids.forEach(pid => {
+					const abgabe = newAbgaben.find(abgabe => abgabe.projektarbeit_id == pid)
+					
+					const pa = this.projektarbeiten.find(pa => pa.projektarbeit_id == pid)
+				
+					abgabe.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz == abgabe.paabgabetyp_kurzbz)
+					
+					pa.abgabetermine.push(abgabe)
+					pa.abgabetermine.sort((a, b) => new Date(a.datum) - new Date(b.datum))
+				})
+				
+				// reset selection to empty
+				this.$refs.abgabeTable.tabulator.deselectRow()
+
+				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+
+				console.log('this.projektarbeiten', this.projektarbeiten)
+				console.log('mappedData', mappedData)
+				
+				this.$refs.abgabeTable.tabulator.clearData()
+				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+				this.$refs.abgabeTable.tabulator.replaceData(mappedData)
+				
+				// this.$refs.abgabeTable.tabulator.redraw(true)
 			}).finally(()=>{
 				this.saving = false
 			})
 
 			this.$refs.modalContainerAddSeries.hide()
 		},
+		mapProjekteToTableData(projekte) {
+			// const now = luxon.DateTime.now();
+			return projekte.map(projekt => {
+
+				projekt.prevTermin = null;
+				projekt.nextTermin = null;
+
+
+				this.checkAbgabetermineProjektarbeit(projekt)
+
+				return {
+					...projekt,
+					abgabetermine: projekt.abgabetermine,
+					details: {
+						student_uid: projekt.student_uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+					},
+					pkz: this.buildPKZ(projekt),
+					beurteilung: projekt.beurteilungLink ?? null,
+					sem: projekt.studiensemester_kurzbz,
+					stg: this.buildStg(projekt),
+					mail: this.buildMailToLink(projekt),
+					erstbetreuer: this.buildErstbetreuer(projekt),
+					zweitbetreuer: this.buildZweitbetreuer(projekt),
+					typ: projekt.projekttyp_kurzbz,
+					titel: projekt.titel
+				}
+			})
+		},
 		createInfoString(data) {
 			let str = '';
 
@@ -390,7 +496,7 @@ export const AbgabetoolAssistenz = {
 		},
 		setDetailComponent(details){
 			
-			const pa = this.projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+			const pa = this.projektarbeiten.find(projektarbeit => projektarbeit.projektarbeit_id == details.projektarbeit_id)
 
 			// pa.isCurrent = res.data[1]
 
@@ -445,7 +551,7 @@ export const AbgabetoolAssistenz = {
 			const projekt = this.projektarbeiten.find(p => p.projektarbeit_id == val.projektarbeit_id)
 			if(!projekt) {
 
-				this.$fhcAlert.alertInfo('keine projektarbeit gefunden')
+				this.$fhcAlert.alertInfo('Keine projektarbeit gefunden')
 				
 				return
 			}
@@ -455,7 +561,6 @@ export const AbgabetoolAssistenz = {
 				termin.benotbar = terminTypOpt.benotbar 
 			})
 			this.timelineProjekt = projekt
-			// this.timelineAbgabetermine = projekt.abgabetermine
 			this.$refs.drawer.show()
 		},
 		centeredTextFormatter(cell) {
@@ -503,7 +608,7 @@ export const AbgabetoolAssistenz = {
 					case 'verpasst':
 						icon = '<i class="fa-solid fa-calendar-xmark"></i>'
 						break
-					case 'verpasst':
+					case 'abzugeben':
 						icon = '<i class="fa-solid fa-hourglass-half"></i>'
 						break
 					case 'standard':
@@ -514,12 +619,14 @@ export const AbgabetoolAssistenz = {
 						break
 				}
 				
+				const bezeichnung = val.bezeichnung?.bezeichnung ?? val.bezeichnung
+				
 				return '<div style="display: flex; height: 100%">' +
 					'<div class=' + val.dateStyle + "-header" + ' style="width:48px; height: 100%; padding: 0px; display: flex; align-items: center; justify-content: center;">' +
 						icon +
 					'</div>' + 
 					'<div style="margin-left: 4px;">' +
-						'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val.bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
+						'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
 					'</div>'+
 					'</div>'
 
@@ -550,64 +657,12 @@ export const AbgabetoolAssistenz = {
 		setupData(data){
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
-
-			const now = luxon.DateTime.fromISO(todayISO)
-			// const now = luxon.DateTime.now();
-			const d = data[0].map(projekt => {
-				let mode = 'detailTermine'
-
-				projekt.prevTermin = undefined;
-				projekt.nextTermin = undefined;
-				
-				// only show 2tbetreuer col if any projektarbeit has one
-				if(projekt.zweitbetreuer_full_name) this.showZweitbetreuerCol = true
-				
-				// calculate Abgabetermin time diff to now and assign last and next to projekt
-				projekt.abgabetermine.forEach(termin => {
-					
-					// while already looping through each termin, calculate datestyle beforehand
-					termin.dateStyle = this.getDateStyleClass(termin)
-					
-					const date = luxon.DateTime.fromISO(termin.datum)
-					termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
-
-					if (termin.diffMs < 0) {
-						if (!projekt.prevTermin ||
-							termin.diffMs > projekt.prevTermin.diffMs // larger (less negative) = closer to now
-						) {
-							projekt.prevTermin = termin;
-						}
-					} else if (termin.diffMs > 0) {
-						if (!projekt.nextTermin ||
-							termin.diffMs < projekt.nextTermin.diffMs // smaller positive = closer to now
-						) {
-							projekt.nextTermin = termin;
-						}
-					}
-				})
-					
-				return {
-					...projekt,
-					abgabetermine: projekt.abgabetermine,
-					details: {
-						student_uid: projekt.student_uid,
-						projektarbeit_id: projekt.projektarbeit_id,
-					},
-					pkz: this.buildPKZ(projekt),
-					beurteilung: projekt.beurteilungLink ?? null,
-					sem: projekt.studiensemester_kurzbz,
-					stg: this.buildStg(projekt),
-					mail: this.buildMailToLink(projekt),
-					erstbetreuer: this.buildErstbetreuer(projekt),
-					zweitbetreuer: this.buildZweitbetreuer(projekt),
-					typ: projekt.projekttyp_kurzbz,
-					titel: projekt.titel
-				}
-			})
-
+			
+			const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+			
 			this.$refs.abgabeTable.tabulator.clearData()
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-			this.$refs.abgabeTable.tabulator.setData(d);
+			this.$refs.abgabeTable.tabulator.setData(mappedData);
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.loading = true
@@ -680,14 +735,12 @@ export const AbgabetoolAssistenz = {
 			this.turnitin_link = res.data?.turnitin_link
 			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
 		}).catch(e => {
-			console.log(e)
 			this.loading = false
 		})
 
 		// fetch studiengänge options
 		this.$api.call(ApiAbgabe.getStudiengaenge()).then(res => {
 			this.studiengaengeOptions = res.data
-			console.log(this.studiengaengeOptions)
 		}).catch(e => {
 			this.loading = false
 		})
@@ -701,6 +754,26 @@ export const AbgabetoolAssistenz = {
 				opt => opt.bezeichnung === 'Bestanden'
 					|| opt.bezeichnung === 'Nicht bestanden'
 			)
+			
+			// allowedNotenOptions apply to quality gates abgabetermine
+			// this selection is about graded projektarbeiten, so take different options here
+			this.allowedNotenFilterOptions = [
+				{
+					bezeichnung: this.$p.t('abgabetool/keineNoteEingetragen'),
+					note: null,
+				},
+				{
+					bezeichnung: this.$p.t('abgabetool/c4benotet'),
+					note: 1,
+				},
+				{
+					bezeichnung: Vue.computed(this.$p.t('abgabetool/showAll')),
+					note: -1,
+				},
+			]
+			
+			this.notenOptionFilter = this.allowedNotenFilterOptions[0]
+				
 		}).catch(e => {
 			this.loading = false
 		})
@@ -734,7 +807,7 @@ export const AbgabetoolAssistenz = {
 						{{$p.t('abgabetool/c4fixterminv2')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4zieldatum')}}
+						{{$capitalize($p.t('abgabetool/c4zieldatum'))}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabetypv2')}}
@@ -802,19 +875,53 @@ export const AbgabetoolAssistenz = {
 			ref="drawer"
 			placement="end"
 			:backdrop="true"
-			@shownBsOffcanvas="onShown"
-			@hiddenBsOffcanvas="onHidden"
 			:style="{ '--bs-offcanvas-width': '600px' }"
 		>
 			<template #title>
 				{{ $p.t('abgabetool/c4projektarbeitTimelineTitle') }}
 			</template>
+
+<!--			TODO: take care of absolute offset values -->
+			<div class="row">
+				<Inplace
+					closable
+					:closeButtonProps="{
+						style: {
+							position: 'absolute',
+							top: '80px',
+							right: '80px',
+							zIndex: 1
+						}
+					}"
+				>
+					<template #display> {{ $capitalize($p.t('abgabetool/showStudentDetails'))}} </template>
+					<template #content>
+						<div class="col-auto">
+							<div class="row">
+								<div class="col-2">Student: </div>
+								<div class="col-7">{{timelineProjekt?.student_vorname}} {{timelineProjekt?.student_nachname}}</div>
+							</div>
+							<div class="row">
+								<div class="col-2">Uid: </div>
+								<div class="col-7">{{timelineProjekt?.student_uid}}</div>
+							</div>
+							<div class="row">
+								<div class="col-2">{{timelineProjekt?.betreuerart}}: </div>
+								<div class="col-7">{{timelineProjekt?.erstbetreuer_full_name}}</div>
+							</div>
+							<div class="row">
+								<div class="col-2">Titel: </div>
+								<div class="col-7">{{timelineProjekt?.titel}}</div>
+							</div>
+						</div>
+					</template>
+				</Inplace>
+			</div>
 		
 			<Timeline 
 				:value="timelineProjekt?.abgabetermine"
-				align="right"	
-			>
-			
+				align="right"
+			>	
 				<template #marker="slotProps">
 					<div :class="slotProps.item.dateStyle + '-header'" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i v-if="slotProps.item.dateStyle == 'verspaetet'" class="fa-solid fa-triangle-exclamation"></i>
@@ -873,7 +980,7 @@ export const AbgabetoolAssistenz = {
 		<div style="max-height:40vw;">
 			<div class="row">
 				<div class="col-auto">
-					<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 				</div>
 				<div class="col-3">
 					<Dropdown
@@ -884,12 +991,29 @@ export const AbgabetoolAssistenz = {
 						v-model="selectedStudiengangOption" 
 						:options="studiengaengeOptions" 
 						showClear
+						:tabindex="2"
 					>
 						<template #optionsgroup="slotProps">
 							<div> {{ option.kurzbzlang }} {{ option.bezeichnung }} </div>
 						</template>
 					</Dropdown>
 				</div>
+				<div class="col-3">
+					<Dropdown
+						@change="sgChanged" 
+						:placeholder="$p.t('lehre/note')" 
+						:style="{'width': '100%', 'scroll-behavior': 'auto !important'}" 
+						:optionLabel="getNotenFilterOptionLabel" 
+						v-model="notenOptionFilter" 
+						:options="allowedNotenFilterOptions" 
+						showClear
+						:tabindex="2"
+					>
+						<template #optionsgroup="slotProps">
+							<div>{{ option.bezeichnung }} </div>
+						</template>
+					</Dropdown>
+				</div>
 			</div>
 			<hr>
 			<core-filter-cmpt
@@ -908,14 +1032,7 @@ export const AbgabetoolAssistenz = {
 				:useSelectionSpan="false"
 			>
 				<template #actions>
-					<button @click="sendEmailStudierende" role="button" class="btn btn-secondary ml-2">
-						{{ $p.t('abgabetool/c4sendEmailStudierende') }}
-					</button>
-					
-					<button @click="sendEmailBegutachter" role="button" class="btn btn-secondary ml-2">
-						{{ $p.t('abgabetool/c4sendEmailBetreuer') }}
-					</button>
-					
+
 				</template>
 			</core-filter-cmpt>
 		</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2e4cb64a0..ee7955148 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -179,7 +179,8 @@ export const AbgabetoolMitarbeiter = {
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
-				this.selectedData?.map(projekt => projekt.projektarbeit_id)
+				this.selectedData?.map(projekt => projekt.projektarbeit_id),
+				false
 			)).then(res => {
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index 557e27a89..efbad61d2 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -5,7 +5,7 @@ export const AbgabeterminStatusLegende = {
 			<div class="col"  style="width: 50%; margin-left: 12px;">
 			
 				<div class="row" style="margin-bottom: 2px">
-					<div class="col-auto verspaetet-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+					<div class="col-auto verspaetet-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i class="fa-solid fa-triangle-exclamation"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
@@ -14,7 +14,7 @@ export const AbgabeterminStatusLegende = {
 				</div>
 				
 				<div class="row" style="margin-bottom: 2px">
-					<div class="col-auto verpasst-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+					<div class="col-auto verpasst-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i class="fa-solid fa-calendar-xmark"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
@@ -23,7 +23,7 @@ export const AbgabeterminStatusLegende = {
 				</div>
 				
 				<div class="row" style="margin-bottom: 2px">
-					<div class="col-auto abzugeben-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+					<div class="col-auto abzugeben-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i class="fa-solid fa-hourglass-half"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
@@ -32,7 +32,7 @@ export const AbgabeterminStatusLegende = {
 				</div>
 				
 				<div class="row" style="margin-bottom: 2px">
-					<div class="col-auto standard-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+					<div class="col-auto standard-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i class="fa-solid fa-clock"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
@@ -41,7 +41,7 @@ export const AbgabeterminStatusLegende = {
 				</div>
 				
 				<div class="row" style="margin-bottom: 2px">
-					<div class="col-auto abgegeben-header" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+					<div class="col-auto abgegeben-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i class="fa-solid fa-check"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index d2ad4ae75..42aeca0b6 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -143,6 +143,8 @@ export default {
 		},
 	},
 	async created() {
+		debugger
+		
 		this.widget = await CachedWidgetLoader.loadWidget(this.id);
 		let component = (await import("../" + this.widget.setup.file)).default;
 		this.$options.components["widget" + this.widget.widget_id] = component;
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index ed40551de..c1cbd0d4c 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -380,7 +380,8 @@ export default {
 			}
 			return result;
 		}
-
+		
+		
 		const fhcApiAxios = axios.create({
 			timeout: 500000,
 			baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 22a3a6e94..e889dc78b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43173,6 +43173,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4benotet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Benotet",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Graded',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43768,6 +43788,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'showStudentDetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten Details anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'show student details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'keineNoteEingetragen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Note eingetragen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Not graded yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

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

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

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

From a97a1765224bfb3f54345e8e2c58f35d8692904e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 5 Nov 2025 16:47:31 +0100
Subject: [PATCH 0929/1357] use phrasen in stv list

---
 .../Stv/Studentenverwaltung/List.js           |  81 ++++++
 system/phrasesupdate.php                      | 260 ++++++++++++++++++
 2 files changed, 341 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 67cada523..1ac68e346 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -1,6 +1,8 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import ListNew from './List/New.js';
 
+import { capitalize } from '../../../helpers/StringHelpers.js';
+
 
 export default {
 	name: "ListPrestudents",
@@ -165,7 +167,85 @@ export default {
 			currentEndpointRawUrl: ''
 		}
 	},
+	watch: {
+		'$p.user_language.value'(n, o) {
+			if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
+				this.translateTabulator();
+			}
+		}
+	},
 	methods: {
+		translateTabulator() {
+			let cm = this.$refs.table.tabulator.columnManager;
+			this.$p
+				.loadCategory(['global', 'person', 'lehre', 'ui', 'profilUpdate', 'admission', 'stv'])
+				.then(() => {
+					const translations = {
+						uid: capitalize(this.$p.t('person/uid')),
+						titelpre: capitalize(this.$p.t('person/titelpre')),
+						nachname: capitalize(this.$p.t('person/nachname')),
+						vorname: capitalize(this.$p.t('person/vorname')),
+						wahlname: capitalize(this.$p.t('person/wahlname')),
+						vornamen: capitalize(this.$p.t('person/vornamen')),
+						titelpost: capitalize(this.$p.t('person/titelpost')),
+						ersatzkennzeichen: capitalize(this.$p.t('person/ersatzkennzeichen')),
+						gebdatum: capitalize(this.$p.t('person/geburtsdatum')),
+						geschlecht: capitalize(this.$p.t('person/geschlecht')),
+						semester: capitalize(this.$p.t('lehre/sem')),
+						verband: capitalize(this.$p.t('lehre/verb')),
+						gruppe: capitalize(this.$p.t('lehre/grp')),
+						studiengang: capitalize(this.$p.t('lehre/studiengang')),
+						studiengang_kz: capitalize(this.$p.t('lehre/studiengang_kz')),
+						matrikelnr: capitalize(this.$p.t('person/personenkennzeichen')),
+						person_id: capitalize(this.$p.t('person/person_id')),
+						status: capitalize(this.$p.t('global/status')),
+						status_datum: capitalize(this.$p.t('profilUpdate/statusDate')),
+						status_bestaetigung: capitalize(this.$p.t('global/status_bestaetigung')),
+						mail_privat: capitalize(this.$p.t('person/email_private')),
+						mail_intern: capitalize(this.$p.t('person/email_intern')),
+						anmerkungen: capitalize(this.$p.t('stv/notes_person')),
+						anmerkung: capitalize(this.$p.t('stv/notes_prestudent')),
+						orgform_kurzbz: capitalize(this.$p.t('lehre/orgform')),
+						aufmerksamdurch_kurzbz: capitalize(this.$p.t('person/aufmerksamDurch')),
+						punkte: capitalize(this.$p.t('admission/gesamtpunkte')),
+						aufnahmegruppe_kurzbz: capitalize(this.$p.t('stv/aufnahmegruppe_kurzbz')),
+						dual: capitalize(this.$p.t('lehre/dual_short')),
+						matr_nr: capitalize(this.$p.t('person/matrikelnummer')),
+						studienplan_bezeichnung: capitalize(this.$p.t('lehre/studienplan')),
+						prestudent_id: capitalize(this.$p.t('ui/prestudent_id')),
+						priorisierung_relativ: capitalize(this.$p.t('lehre/prioritaet')),
+						mentor: capitalize(this.$p.t('stv/mentor')),
+						bnaktiv: capitalize(this.$p.t('person/aktiv'))
+					};
+
+					/** NOTE(chris):
+					 * use this approach because updateDefinition
+					 * on the Tabulator columns is way slower and
+					 * freezes up the GUI.
+					 */
+					// Overwrite definition for column show/hide
+					this.$refs.table.tabulator.getColumns().forEach(col => {
+						const trans = translations[col.getField()];
+						if (!trans)
+							return;
+						col.getDefinition().title = trans;
+					});
+					// Overwrite node in dom
+					this.$refs.table.tabulator.element
+						.querySelectorAll('.tabulator-col[tabulator-field]')
+						.forEach(el => {
+							const field = el.getAttribute('tabulator-field');
+							if (!translations[field])
+								return;
+
+							const title = el.querySelector('.tabulator-col-title');
+							if (!title)
+								return;
+
+							title.innerText = translations[field];
+						});
+				});
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
@@ -327,6 +407,7 @@ export default {
 				*/`
 				:new-btn-label="$p.t('stv/action_new')"
 				@click:new="actionNewPrestudent"
+				@table-built="translateTabulator"
 			>
 			<template #filter>
 				<div class="card">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5d3833dc9..ef27601df 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -2502,6 +2502,46 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'email_private',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EMail (Privat)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'email (private)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'email_intern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EMail (Intern)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'email (intern)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -3084,6 +3124,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'orgform',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'OrgForm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'orgform',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3124,6 +3184,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'grp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Grp.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'grp.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3464,6 +3544,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sem.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sem.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3586,6 +3686,66 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'studiengang_kz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiengang KZ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study program no',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'verb',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verb.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'assoc.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'dual_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dual',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'dual',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//**********************	INFOCENTER/infocenter
 	array(
 		'app' => 'infocenter',
@@ -6221,6 +6381,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'status_bestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status Bestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -38480,6 +38660,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'notes_person',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'notes',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'notes_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkung Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'note Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'aufnahmegruppe_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmegruppe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'admission group',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'mentor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mentor',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'mentor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From 1cdebbe9770dd6d7471af76ce27c727530054e24 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 5 Nov 2025 16:49:12 +0100
Subject: [PATCH 0930/1357] remove unused changed eventlistener

---
 public/js/components/Stv/Studentenverwaltung.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c97d7a0bf..937e90c89 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -383,7 +383,6 @@ export default {
 					<li>
 						<nav-language
 							item-class="dropdown-item border-left-dark"
-							@changed="tmpFunc"
 						/>
 					</li>
 					<li><hr class="dropdown-divider m-0"/></li>

From 5ecd81bb098687010da7014c7867c7208a3f6873 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 5 Nov 2025 16:50:22 +0100
Subject: [PATCH 0931/1357] translate logout

---
 .../js/components/Stv/Studentenverwaltung.js  |  6 +++++-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 937e90c89..d53d9a789 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -386,7 +386,11 @@ export default {
 						/>
 					</li>
 					<li><hr class="dropdown-divider m-0"/></li>
-					<li><a class="dropdown-item" :href="logoutUrl">Logout</a></li>
+					<li>
+						<a class="dropdown-item" :href="logoutUrl">
+							{{ $p.t('ui/logout') }}
+						</a>
+					</li>
 				</ul>
 			</div>
 		</header>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ef27601df..97b62a0d9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1775,6 +1775,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'logout',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Logout',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Logout',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

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

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

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

From b1a1cdf23550fc42337a944d4661f72d582b809d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 6 Nov 2025 16:29:24 +0100
Subject: [PATCH 0933/1357] studiensemester dropdown filter, default all,
 options are current/next and op to 10 back; benotet/unbenotet/alle fetch
 parameter; WIP orgform/studstatus cols;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  8 +-
 .../v1/organisation/Studiensemester.php       | 16 ++-
 .../models/education/Projektarbeit_model.php  | 13 ++-
 public/js/api/factory/abgabe.js               |  6 +-
 public/js/api/factory/studiengang.js          | 11 +--
 public/js/api/factory/studiensemester.js      | 25 +++++
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 97 ++++++++++++++-----
 7 files changed, 135 insertions(+), 41 deletions(-)
 create mode 100644 public/js/api/factory/studiensemester.js

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 73f0d0a15..df687acea 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -864,12 +864,13 @@ class Abgabe extends FHCAPI_Controller
 	public function getProjektarbeitenForStudiengang() {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		
-		$studiengang_kz = $this->input->get("studiengang_kz",TRUE);
-
+		$studiengang_kz = $this->input->get("studiengang_kz", TRUE);
+		$benotet = $this->input->get("benotet", TRUE);
+		
 		if (!isset($studiengang_kz) || isEmptyString($studiengang_kz))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		
-		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz);
+		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
 
 		if(count($projektarbeiten) == 0) { // avoid further abgabetermin queries if the are no projektarbeiten
@@ -899,6 +900,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
 	
+	// TODO: this could be in a generic info controller and resused
 	public function getStudiengaenge() {
 		$this->load->library('PermissionLib');
 		
diff --git a/application/controllers/api/frontend/v1/organisation/Studiensemester.php b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
index bb56ea71a..06d5b93c9 100644
--- a/application/controllers/api/frontend/v1/organisation/Studiensemester.php
+++ b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
@@ -25,7 +25,8 @@ class Studiensemester extends FHCAPI_Controller
 			array(
 				'getAll' => self::PERM_LOGGED,
 				'getAktNext' => self::PERM_LOGGED,
-				'getStudienjahrByStudiensemester' => self::PERM_LOGGED
+				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
+				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -152,4 +153,17 @@ class Studiensemester extends FHCAPI_Controller
 
 		$this->terminateWithSuccess((getData(success($studienjahrObj))));
 	}
+
+	public function getAllStudiensemesterAndAktOrNext() {
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder("start", "DESC");
+		$result = $this->StudiensemesterModel->getAktOrNextSemester();
+		$aktuell = getData($result)[0];
+
+		$result = $this->StudiensemesterModel->getPreviousFrom($aktuell->studiensemester_kurzbz, 10);
+		$studiensemester = getData($result);
+		
+		$this->terminateWithSuccess(array($studiensemester, $aktuell));
+	}
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 1f35ea856..0f0461d91 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -319,7 +319,7 @@ class Projektarbeit_model extends DB_Model
 		return $version === null ? null : $version->isCurrent;
 	}
 	
-	public function getProjektarbeitenForStudiengang($studiengang_kz) {
+	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
 		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
        		FROM(
 			   SELECT
@@ -407,8 +407,15 @@ class Projektarbeit_model extends DB_Model
 						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
 			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
 				 AND student_benutzer.aktiv AND (lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter')
-				 AND public.tbl_studiengang.studiengang_kz = ?
-			   ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+				 AND public.tbl_studiengang.studiengang_kz = ?";
+		
+			     if($benotet == 0) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
+				 } else if ($benotet == 1) {
+					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
+				 }
+				 
+			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 12615ee76..417e5fab3 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -100,14 +100,14 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getNoten'
 		};
 	},
-	getProjektarbeitenForStudiengang(studiengang_kz) {
+	getProjektarbeitenForStudiengang(studiengang_kz, benotet = 0) {
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/Abgabe/getProjektarbeitenForStudiengang',
-			params: { studiengang_kz }
+			params: { studiengang_kz, benotet }
 		};
 	},
-	// TODO: this could also very well be generic info api :^)
+	// TODO: this could also very well be generic info api
 	getStudiengaenge() {
 		return {
 			method: 'get',
diff --git a/public/js/api/factory/studiengang.js b/public/js/api/factory/studiengang.js
index 6d5ae15aa..12322cb3a 100644
--- a/public/js/api/factory/studiengang.js
+++ b/public/js/api/factory/studiengang.js
@@ -16,17 +16,10 @@
  */
 
 export default {
-	studiengangInformation() {
+	getAllStudiensemesterAndAktOrNext() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Studgang/getStudiengangInfo'
+			url: '/api/frontend/v1/Studiensemester/getStudiengangInfo'
 		};
 	},
-	getStudiengangByKz(studiengang_kz) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/organisation/StudiengangEP/getStudiengangByKz',
-			params: { studiengang_kz }
-		};
-	}
 };
\ No newline at end of file
diff --git a/public/js/api/factory/studiensemester.js b/public/js/api/factory/studiensemester.js
new file mode 100644
index 000000000..82a4ee5cc
--- /dev/null
+++ b/public/js/api/factory/studiensemester.js
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAllStudiensemesterAndAktOrNext() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/organisation/Studiensemester/getAllStudiensemesterAndAktOrNext',
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 0ca163e33..e1087b4f2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -5,6 +5,7 @@ import BsModal from '../../Bootstrap/Modal.js';
 import BsOffcanvas from '../../Bootstrap/Offcanvas.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import ApiStudiensemester from '../../../api/factory/studiensemester.js';
 import AbgabeterminStatusLegende from "./StatusLegende.js";
 
 // spoofed date testing
@@ -52,6 +53,8 @@ export const AbgabetoolAssistenz = {
 	},
 	data() {
 		return {
+			allSem: null,
+			curSem: null,
 			notenOptionFilter: null,
 			inplaceToggle: false,
 			headerFiltersRestored: false,
@@ -126,7 +129,8 @@ export const AbgabetoolAssistenz = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,
+						responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: false, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -166,6 +170,22 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		semesterChanged(e) {
+			if(this.$refs.abgabeTable.tabulator) {
+				const table = this.$refs.abgabeTable.tabulator
+
+				// TODO: maybe check if existing synergy really works with many filters
+				const existing = table.getFilters().filter(f => f.field != 'studiensemester_kurzbz');
+
+				const compVal = e.value.studiensemester_kurzbz == 'Alle' ? '' : e.value.studiensemester_kurzbz
+				const compType = e.value.studiensemester_kurzbz == 'Alle' ? '!=' : '='
+				const newFilter = { field: "studiensemester_kurzbz", type: compType, value: compVal };
+
+				// merge and reapply
+				table.setFilter([...existing, newFilter]);
+			}
+			
+		},
 		checkAbgabetermineProjektarbeit(projekt) {
 			// calculate Abgabetermin time diff to now and assign last and next to projekt
 			projekt.abgabetermine.forEach(termin => {
@@ -311,12 +331,12 @@ export const AbgabetoolAssistenz = {
 		getOptionLabelStg(option){
 			return option.kurzbzlang + ' ' + option.bezeichnung
 		},
+		getOptionLabelStudiensemester(option){
+			return option.studiensemester_kurzbz
+		},
 		getNotenFilterOptionLabel(option) {
 			return option.bezeichnung	
 		},
-		sgChanged(e) {
-			debugger	
-		},
 		formatDate(dateParam) {
 			if(dateParam === null) return ''
 			const date = new Date(dateParam)
@@ -437,9 +457,6 @@ export const AbgabetoolAssistenz = {
 				this.$refs.abgabeTable.tabulator.deselectRow()
 
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
-
-				console.log('this.projektarbeiten', this.projektarbeiten)
-				console.log('mappedData', mappedData)
 				
 				this.$refs.abgabeTable.tabulator.clearData()
 				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
@@ -462,6 +479,13 @@ export const AbgabetoolAssistenz = {
 
 				this.checkAbgabetermineProjektarbeit(projekt)
 
+				if(this.notenOptions && projekt.note) {
+					const opt = this.notenOptions.find(n => n.note == projekt.note)
+				
+					// TODO: mehrsprachig englisch
+					projekt.note_bez = opt.bezeichnung
+				}
+				
 				return {
 					...projekt,
 					abgabetermine: projekt.abgabetermine,
@@ -666,7 +690,10 @@ export const AbgabetoolAssistenz = {
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.loading = true
-			this.$api.call(ApiAbgabe.getProjektarbeitenForStudiengang(this.getCurrentStudiengang))
+			this.$api.call(ApiAbgabe.getProjektarbeitenForStudiengang(
+				this.getCurrentStudiengang,
+				this.notenOptionFilter?.benotet ?? 0
+			))
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				}).finally(() => {
@@ -701,7 +728,9 @@ export const AbgabetoolAssistenz = {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
 
-			this.loadProjektarbeiten()
+			
+			// called through notenOptionFilter watcher on startup
+			// this.loadProjektarbeiten()
 
 			// this.$refs.verticalsplit.collapseBottom()
 			this.calcMaxTableHeight()
@@ -717,6 +746,11 @@ export const AbgabetoolAssistenz = {
 	watch: {
 		selectedStudiengangOption(newVal, oldVal) {
 			this.loadProjektarbeiten()
+		},
+		notenOptionFilter(newVal) {
+			// that single where clause is worth a decent load time so rather not filter tabulator but just 
+			// adapt the qry
+			this.loadProjektarbeiten()
 		}
 	},
 	computed: {
@@ -745,6 +779,17 @@ export const AbgabetoolAssistenz = {
 			this.loading = false
 		})
 		
+		this.$api.call(ApiStudiensemester.getAllStudiensemesterAndAktOrNext()).then((res) => {
+			this.allSem = res.data[0]
+			this.curSem = res.data[1]
+			
+			// TODO: maybe filter only for available semester from projektarbeiten dataset
+			this.studiensemesterOptions = [{studiensemester_kurzbz: 'Alle'}, ...this.allSem]
+		}).catch(e => {
+			this.loading = false
+		})
+
+
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
@@ -759,16 +804,16 @@ export const AbgabetoolAssistenz = {
 			// this selection is about graded projektarbeiten, so take different options here
 			this.allowedNotenFilterOptions = [
 				{
-					bezeichnung: this.$p.t('abgabetool/keineNoteEingetragen'),
-					note: null,
+					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/keineNoteEingetragen')),
+					benotet: 0,
 				},
 				{
-					bezeichnung: this.$p.t('abgabetool/c4benotet'),
-					note: 1,
+					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/c4benotet')),
+					benotet: 1,
 				},
 				{
-					bezeichnung: Vue.computed(this.$p.t('abgabetool/showAll')),
-					note: -1,
+					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/showAll')),
+					benotet: -1,
 				},
 			]
 			
@@ -882,7 +927,7 @@ export const AbgabetoolAssistenz = {
 			</template>
 
 <!--			TODO: take care of absolute offset values -->
-			<div class="row">
+			<div class="row" style="margin-bottom: 12px;">
 				<Inplace
 					closable
 					:closeButtonProps="{
@@ -984,8 +1029,7 @@ export const AbgabetoolAssistenz = {
 				</div>
 				<div class="col-3">
 					<Dropdown
-						@change="sgChanged" 
-						:placeholder="$p.t('lehre/studiengang')" 
+						:placeholder="$capitalize($p.t('lehre/studiengang'))" 
 						:style="{'width': '100%', 'scroll-behavior': 'auto !important'}" 
 						:optionLabel="getOptionLabelStg" 
 						v-model="selectedStudiengangOption" 
@@ -1000,14 +1044,12 @@ export const AbgabetoolAssistenz = {
 				</div>
 				<div class="col-3">
 					<Dropdown
-						@change="sgChanged" 
 						:placeholder="$p.t('lehre/note')" 
 						:style="{'width': '100%', 'scroll-behavior': 'auto !important'}" 
 						:optionLabel="getNotenFilterOptionLabel" 
 						v-model="notenOptionFilter" 
 						:options="allowedNotenFilterOptions" 
-						showClear
-						:tabindex="2"
+						:tabindex="3"
 					>
 						<template #optionsgroup="slotProps">
 							<div>{{ option.bezeichnung }} </div>
@@ -1032,7 +1074,18 @@ export const AbgabetoolAssistenz = {
 				:useSelectionSpan="false"
 			>
 				<template #actions>
-
+					<Dropdown
+						@change="semesterChanged" 
+						:placeholder="$capitalize($p.t('lehre/studiensemester'))" 
+						:style="{'scroll-behavior': 'auto !important'}" 
+						:optionLabel="getOptionLabelStudiensemester" 
+						v-model="curSem" 
+						:options="studiensemesterOptions" 
+					>
+						<template #optionsgroup="slotProps">
+							<div>{{ option.studiensemester_kurzbz }}</div>
+						</template>
+					</Dropdown>
 				</template>
 			</core-filter-cmpt>
 		</div>

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

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

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

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

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

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

From a61d5b1d62c6602f4750de8525e31958547c5442 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 7 Nov 2025 11:17:59 +0100
Subject: [PATCH 0936/1357] orgform/studstatus cols;

---
 .../models/education/Projektarbeit_model.php  | 20 ++++++++++++++++++-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  2 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 0f0461d91..9def13ddb 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -393,7 +393,25 @@ class Projektarbeit_model extends DB_Model
 						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
 					   LIMIT 1
 				   )
-					   as zweitbetreuer_full_name
+					   as zweitbetreuer_full_name,
+			       (
+					   SELECT
+						   COALESCE(tbl_studienplan.orgform_kurzbz,
+									tbl_prestudentstatus.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) as
+							   orgform
+					   FROM
+						   public.tbl_prestudent
+							   JOIN public.tbl_prestudentstatus USING(prestudent_id)
+							   JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
+							   JOIN public.tbl_studiengang USING(studiengang_kz)
+							   LEFT JOIN lehre.tbl_studienplan USING(studienplan_id)
+					   WHERE
+						   prestudent_id=tbl_student.prestudent_id
+					   ORDER BY tbl_prestudentstatus.datum DESC LIMIT 1
+				   ) as orgform,
+				   (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+					WHERE prestudent_id=tbl_student.prestudent_id
+					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
 			   FROM lehre.tbl_projektarbeit
 						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
 						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index e1087b4f2..7c59b793a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -127,6 +127,8 @@ export const AbgabetoolAssistenz = {
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, visible: false, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgform'))), field: 'orgform', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,

From cef0046acd3c3f125dc9ee3f5755ee94428d76d6 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 7 Nov 2025 14:19:17 +0100
Subject: [PATCH 0937/1357] speeddial icon/positioning; textarea styles;
 fixtermin phrase; wip inverting fixtermin bool logic to avoid double negative
 semantics

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 56 +++++++++++--------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 14 ++---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  4 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  2 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |  2 +-
 system/phrasesupdate.php                      |  6 +-
 6 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index aa184b4f6..1e39e0ddb 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -358,11 +358,8 @@ export const AbgabeMitarbeiterDetail = {
 			return 'position: static !important;'
 		},
 		getSpeedDialWrapperStyle() {
-			// fullscreen -> position wrapper fixed in right bottom corner of viewport/screen
-			if(this.isFullscreen) return 'position: fixed; z-index: 9999; bottom: 24px; right: 24px;'
-			
 			// non fullscreen -> wrapper is positioned on right bottom corner of modal, wherever that is
-			return 'position: absolute; z-index: 9999; bottom: -28px; right: -28px;'
+			return 'position: absolute; z-index: 9999; left: 0px; bottom: 0.5rem;'
 		},
 		getTooltipVerspaetet() {
 			return {
@@ -510,7 +507,7 @@ export const AbgabeMitarbeiterDetail = {
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 					<div class="col-8 col-md-9">
-						<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" :cols=" isMobile ? 30 : 60"></Textarea>
+						<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
 				</div>	
 			</div>
@@ -521,17 +518,17 @@ export const AbgabeMitarbeiterDetail = {
 	</bs-modal>
 
 	<div v-if="projektarbeit">
-		<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">
-			<SpeedDial
-				:style="getSpeedDialStyle"
-				:model="speedDialItems" 
-				direction="up"
-				:radius="80"
-				type="linear"
-				buttonClass="p-button-rounded p-button-lg p-button-primary"
-				:tooltipOptions="{ position: 'left' }"
-			/>
-		</div>
+<!--		<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">-->
+<!--			<SpeedDial-->
+<!--				:style="getSpeedDialStyle"-->
+<!--				:model="speedDialItems" -->
+<!--				direction="up"-->
+<!--				:radius="80"-->
+<!--				type="linear"-->
+<!--				buttonClass="p-button-rounded p-button-lg p-button-primary"-->
+<!--				:tooltipOptions="{ position: 'left' }"-->
+<!--			/>-->
+<!--		</div>-->
 		
 		<h5>{{$capitalize( $p.t('abgabetool/c4abgabeMitarbeiterbereich') )}}</h5>
 
@@ -541,8 +538,8 @@ export const AbgabeMitarbeiterDetail = {
 				<p> {{getProjektarbeitTitel}}</p>
 				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 			</div>
-			<div v-if="!isMobile" class="col-3"></div>
-			<div :class="isMobile ? 'col-6' : 'col-3'">
+			<div class="col-6 d-flex justify-content-end align-items-start">
+<!--				<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">-->
 				<SpeedDial
 					:model="speedDialItems" 
 					direction="left"
@@ -550,7 +547,22 @@ export const AbgabeMitarbeiterDetail = {
 					type="linear"
 					buttonClass="p-button-rounded p-button-lg p-button-primary"
 					:tooltipOptions="{ position: 'down' }"
-				/>
+				>
+					<template #icon>
+
+						<i class="fa-solid fa-bars"></i>
+
+					</template>
+				</SpeedDial>
+<!--				</div>-->
+			</div>
+		</div>
+		<div class="row" style="margin-bottom: 12px;">
+			<div class="col-auto">
+				<button type="button" class="btn btn-primary" @click="openCreateNewAbgabeModal">
+					<i class="fa-solid fa-plus"></i>
+					{{$capitalize( $p.t('abgabetool/c4newAbgabetermin') )}}
+				</button>
 			</div>
 		</div>
 		<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
@@ -577,7 +589,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>				
 					</template>
 					<div class="row mt-2" v-if="assistenzMode">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>
+						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv3')}}</div>
 						<div class="col-8 col-md-9">
 							<Checkbox 
 								v-model="termin.fixtermin"
@@ -641,14 +653,14 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
 						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					
 					<div class="row mt-2">
 						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 						<div class="col-8 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 30 : 90" :disabled="!termin.allowedToSave"></Textarea>
+							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" class="w-100" rows="1" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					<div class="row mt-2">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 884023420..047a5ea52 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -389,7 +389,7 @@ export const AbgabeStudentDetail = {
 							</div>				
 						</template>
 <!--						<div class="row">-->
-<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv2')}}</div>-->
+<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv3')}}</div>-->
 <!--							<div class="col-8 col-md-9">-->
 <!--								<Checkbox -->
 <!--									disabled-->
@@ -435,14 +435,14 @@ export const AbgabeStudentDetail = {
 						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
 							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" :cols=" isMobile ? 30 : 90" disabled></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" disabled></Textarea>
 							</div>
 						</div>
 						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
 							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 							<div class="col-8 col-md-9">
-								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" :cols=" isMobile ? 25 : 90" :disabled="true"></Textarea>
+								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" class="w-100" :disabled="true"></Textarea>
 							</div>
 						</div>
 						
@@ -551,21 +551,21 @@ export const AbgabeStudentDetail = {
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterGer') )}}</div>
 					<div class="row">
-						<Textarea v-model="form.schlagwoerter"></Textarea>
+						<Textarea v-model="form.schlagwoerter" class="w-100"></Textarea>
 					</div>
 				</div>
 				
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterEng') )}}</div>
 					<div class="row">
-						<Textarea v-model="form.schlagwoerter_en"></Textarea>
+						<Textarea v-model="form.schlagwoerter_en" class="w-100"></Textarea>
 					</div>
 				</div>
 				
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractGer') )}}</div>
 					<div class="row">
-						<Textarea v-model="form.abstract" rows="10" maxlength="5000"></Textarea>
+						<Textarea v-model="form.abstract" rows="10" maxlength="5000" class="w-100"></Textarea>
 						<p>{{ form.abstract?.length ? form.abstract.length : 0 }} / 5000 characters</p>
 					</div>
 				</div>
@@ -573,7 +573,7 @@ export const AbgabeStudentDetail = {
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractEng') )}}</div>
 					<div class="row">
-						<Textarea v-model="form.abstract_en" rows="10" maxlength="5000"></Textarea>
+						<Textarea v-model="form.abstract_en" rows="10" maxlength="5000" class="w-100"></Textarea>
 						<p>{{ form.abstract_en?.length ? form.abstract_en.length : 0 }} / 5000 characters</p>
 					</div>				
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 7c59b793a..8260fdbeb 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -851,7 +851,7 @@ export const AbgabetoolAssistenz = {
 			<template v-slot:default>
 				<div class="row">
 					<div class="col-1 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4fixterminv2')}}
+						{{$p.t('abgabetool/c4fixterminv3')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						{{$capitalize($p.t('abgabetool/c4zieldatum'))}}
@@ -894,7 +894,7 @@ export const AbgabetoolAssistenz = {
 						</Dropdown>
 					</div>
 					<div class="col-5 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" cols="40"></Textarea>
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
 				</div>
 				
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index ee7955148..6caa35fe7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -450,7 +450,7 @@ export const AbgabetoolMitarbeiter = {
 						</Dropdown>
 					</div>
 					<div class="col-6 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" cols="40"></Textarea>
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
 				</div>
 				
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 1b842b27f..ae6595d6c 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -33,7 +33,7 @@ export const DeadlineOverview = {
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv2')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv3')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetypv2')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e889dc78b..766c53daf 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42120,18 +42120,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fixterminv2',
+		'phrase' => 'c4fixterminv3',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Fixtermin",
+				'text' => "kein Nachreichen möglich",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Fixed Deadline",
+				'text' => "no late submission possible",
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 775d8658787888d84e74d2b072b6cbc9c64b1414 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 10 Nov 2025 12:38:57 +0100
Subject: [PATCH 0938/1357] StV settings

---
 .../api/frontend/v1/stv/Config.php            | 61 ++++++++++++
 .../api/frontend/v1/stv/Verband.php           |  1 +
 public/js/api/factory/stv/config.js           | 32 +++++++
 .../js/components/Stv/Studentenverwaltung.js  | 20 +++-
 .../Stv/Studentenverwaltung/Config.js         | 96 +++++++++++++++++++
 .../Stv/Studentenverwaltung/Verband.js        | 21 ++++
 system/phrasesupdate.php                      | 20 ++++
 7 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 public/js/api/factory/stv/config.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Config.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d52016943..4d3a5f8ee 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -33,6 +33,8 @@ class Config extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
 			'student' => ['admin:r', 'assistenz:r'],
 			'students' => ['admin:r', 'assistenz:r']
 		]);
@@ -52,6 +54,65 @@ class Config extends FHCAPI_Controller
 		$this->load->config('stv');
 	}
 
+	/**
+	 * get App config
+	 */
+	public function get()
+	{
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$this->load->config('stv');
+
+		$config = [];
+
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$config['number_displayed_past_studiensemester'] = [
+			"type" => "number",
+			"label" => "Anzahl angezeigter vergangender Studiensemester",// TODO(chris): phrase
+			"value" => $data['number_displayed_past_studiensemester']
+				?? $number_displayed_past_studiensemester_default
+		];
+
+		// TODO(chris): Event
+
+		$this->terminateWithSuccess($config);
+	}
+
+	/**
+	 * set App config
+	 */
+	public function set()
+	{
+		// TODO(chris): rewrite to batch saving
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules(
+			'number_displayed_past_studiensemester',
+			"Anzahl angezeigter vergangender Studiensemester",// TODO(chris): phrase
+			'required|integer'
+		);
+
+		// TODO(chris): Event
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+
+		$this->VariableModel->setVariable(
+			getAuthUID(),
+			'number_displayed_past_studiensemester',
+			$this->input->post('number_displayed_past_studiensemester')
+		);
+
+		// TODO(chris): Event
+
+		$this->terminateWithSuccess();
+	}
+
 	public function student()
 	{
 		$result = [];
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index 6487b6263..030593293 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -188,6 +188,7 @@ class Verband extends FHCAPI_Controller
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
+			'no_sem_reload' => true,
 			'stg_kz' => (int)$studiengang_kz,
 			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
 		]);
diff --git a/public/js/api/factory/stv/config.js b/public/js/api/factory/stv/config.js
new file mode 100644
index 000000000..c54b2f8b2
--- /dev/null
+++ b/public/js/api/factory/stv/config.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/config/get'
+		};
+	},
+	set(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/config/set',
+			params
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d53d9a789..9db3f9e7b 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -22,6 +22,7 @@ import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
 import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
+import StvConfig from "./Studentenverwaltung/Config.js";
 
 import ApiSearchbar from "../../api/factory/searchbar.js";
 import ApiStv from "../../api/factory/stv.js";
@@ -37,7 +38,8 @@ export default {
 		StvVerband,
 		StvList,
 		StvDetails,
-		StvStudiensemester
+		StvStudiensemester,
+		StvConfig
 	},
 	props: {
 		defaultSemester: String,
@@ -78,11 +80,13 @@ export default {
 			},
 			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
 			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
-			configUseReihungstestPunkte: this.config.useReihungstestPunkte
+			configUseReihungstestPunkte: this.config.useReihungstestPunkte,
+			appConfig: Vue.computed(() => this.appconfig)
 		}
 	},
 	data() {
 		return {
+			appconfig: {},
 			selected: [],
 			searchbaroptions: {
 				origin: 'stv',
@@ -380,6 +384,17 @@ export default {
 					class="dropdown-menu dropdown-menu-dark dropdown-menu-end rounded-0 text-center m-0"
 					aria-labelledby="nav-user-btn"
 				>
+					<li>
+						<button
+							type="button"
+							class="dropdown-item"
+							data-bs-toggle="modal"
+							data-bs-target="#configModal"
+						>
+							{{ $p.t('ui/settings') }}
+						</button>
+					</li>
+					<li><hr class="dropdown-divider m-0"/></li>
 					<li>
 						<nav-language
 							item-class="dropdown-item border-left-dark"
@@ -415,5 +430,6 @@ export default {
 				</main>
 			</div>
 		</div>
+		<stv-config v-model="appconfig"></stv-config>
 	</div>`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Config.js b/public/js/components/Stv/Studentenverwaltung/Config.js
new file mode 100644
index 000000000..f7a6363cd
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Config.js
@@ -0,0 +1,96 @@
+/**
+ * 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 BsModal from "../../Bootstrap/Modal.js";
+import FhcForm from "../../Form/Form.js";
+import FormInput from "../../Form/Input.js";
+
+import ApiStvConfig from '../../../api/factory/stv/config.js';
+
+
+export default {
+	name: 'StvConfig',
+	components: {
+		BsModal,
+		FhcForm,
+		FormInput
+	},
+	emits: [
+		'update:modelValue'
+	],
+	props: {
+		modelValue: Object
+	},
+	data() {
+		return {
+			setup: {},
+			tempValues: {}
+		};
+	},
+	methods: {
+		update() {
+			this.$refs.form
+				.call(ApiStvConfig.set(this.tempValues))
+				.then(() => {
+					// TODO(chris): phrase
+					this.$emit('update:modelValue', { ...this.tempValues });
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess('config updated');
+				})
+				.catch(this.$fhcAlert.handleSystemErrors);
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiStvConfig.get())
+			.then(res => {
+				this.setup = {};
+				Object.keys(res.data).forEach(key => {
+					const conf = { ...res.data[key] };
+					this.tempValues[key] = conf.value;
+					delete conf.value;
+					this.setup[key] = conf;
+				});
+				this.$emit('update:modelValue', { ...this.tempValues });
+			})
+			.catch(this.$fhcAlert.handleSystemErrors);
+	},
+	template: /* html */`
+	<fhc-form class="stv-config" ref="form" @submit.prevent="update">
+		<bs-modal
+			ref="modal"
+			class="fade"
+			id="configModal"
+			dialog-class="modal-lg"
+			@hidden-bs-modal="tempValues = { ...modelValue }"
+		>
+			<template #title>{{ $p.t('ui/settings') }}</template>
+			<template #default>
+				<form-input
+					v-for="(value, key) in setup"
+					v-model="tempValues[key]"
+					v-bind="value"
+				></form-input>
+			</template>
+			<template #footer>
+				<button class="btn btn-primary" type="submit">
+					{{ $p.t('ui/speichern') }}
+				</button>
+			</template>
+		</bs-modal>
+	</fhc-form>`
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 072e0e952..4ebc7866a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -5,6 +5,9 @@ export default {
 		PvTreetable: primevue.treetable,
 		PvColumn: primevue.column
 	},
+	inject: [
+		'appConfig'
+	],
 	emits: [
 		'selectVerband'
 	],
@@ -34,6 +37,9 @@ export default {
 				return this.nodes.filter(node => this.favorites.list.includes(node.key));
 			
 			return this.nodes;
+		},
+		noSemReloadNodes() {
+			return this.nodes.reduce(this.mapNodesToNoSemReloadNodes, []);
 		}
 	},
 	watch: {
@@ -41,6 +47,14 @@ export default {
 			if (newVal !== oldVal) {
 				this.setPreselection();
 			}
+		},
+		'appConfig.number_displayed_past_studiensemester'(newVal, oldVal) {
+			if (oldVal !== undefined) {
+				this.noSemReloadNodes.forEach(node => {
+					delete node.children;
+					this.onExpandTreeNode(node);
+				});
+			}
 		}
 	},
 	methods: {
@@ -98,6 +112,13 @@ export default {
 			if (node.data.link)
 				this.$emit('selectVerband', {link: node.data.link, studiengang_kz: node.data.stg_kz});
 		},
+		mapNodesToNoSemReloadNodes(result, node) {
+			if (node.data.no_sem_reload)
+				result.push(node);
+			if (node.children)
+				result = node.children.reduce(this.mapNodesToNoSemReloadNodes, result);
+			return result;
+		},
 		mapResultToTreeData(el) {
 			const cp = {
 				key: ("" + el.link).replace('/', '-'),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 97b62a0d9..8f6421a39 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1795,6 +1795,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'settings',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einstellungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Settings',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From 0b6dc342207c4a908d7bedb68f9e75a8d8f723fc Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Mon, 10 Nov 2025 15:41:01 +0100
Subject: [PATCH 0939/1357] If docsbox queue is slow, the DocsboxLib can stop
 checking the queued document status and raise an error

---
 application/libraries/DocsboxLib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
index f9167c379..31169d579 100644
--- a/application/libraries/DocsboxLib.php
+++ b/application/libraries/DocsboxLib.php
@@ -157,6 +157,8 @@ class DocsboxLib
 					->expectsJson()
 					->send();
 
+				error_log(print_r($getStatusResponse, 1));
+
 				// Checks that:
 				// - the response is not empty
 				// - the reponse body has the property id
@@ -180,7 +182,8 @@ class DocsboxLib
 					}
 					// Just started or still working on it
 					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
-						|| $getStatusResponse->body->status == self::STATUS_STARTED)
+						|| $getStatusResponse->body->status == self::STATUS_STARTED
+						|| $getStatusResponse->body->status == self::STATUS_QUEUED)
 					{
 						// go on!
 					}

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

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

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

From 410f0c4b6afb35d6834ce5eab7bfbc09e8caffb8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 11 Nov 2025 13:44:47 +0100
Subject: [PATCH 0941/1357] fixtermin -> "kein neichreichen erlaubt"
 phrase/bool logic change; signatur message on enduploads fetched from
 signatur server on every load request; Inplace toggle for further infos in
 offcanvas timeline & student details on mobile view(tooltips); reworked
 col/row structure on detail views for mobile;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 127 ++++++----
 application/views/Cis/Abgabetool.php          |   1 +
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/js/api/factory/abgabe.js               |   5 -
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 117 ++++++---
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 172 +++++++++----
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  12 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  14 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 system/phrasesupdate.php                      | 226 +++++++++++++++++-
 10 files changed, 528 insertions(+), 149 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index df687acea..b1eaa9914 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -45,6 +45,7 @@ class Abgabe extends FHCAPI_Controller
 		]);
 
 		$this->load->library('PhrasesLib');
+		$this->load->library('SignatureLib');
 
 		// Loads LogLib with different debug trace levels to get data of the job that extends this class
 		// It also specify parameters to set database fields
@@ -113,6 +114,10 @@ class Abgabe extends FHCAPI_Controller
 
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 
+		foreach($ret->retval as $termin) {
+			$this->checkAbgabeSignatur($termin, $projektarbeit);
+		}
+		
 		$this->terminateWithSuccess(array($ret, $paIsCurrent));
 	}
 
@@ -134,7 +139,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
 
-		if ($isMitarbeiter && $isZugeteilterBetreuer){
+		if ($isMitarbeiter) {
 			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
 		} else {
 			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
@@ -152,7 +157,7 @@ class Abgabe extends FHCAPI_Controller
 				}
 				if($pa->zweitbetreuer_person_id !== null) {
 					
-					// TODO: dont have to wait for 2038, see assistenz query in projektarbeit_model
+					// TODO: see assistenz query in projektarbeit_model
 					
 					// zweitbetreuer info since the 'getStudentProjektarbeitenWithBetreuer' query got quiete large,
 					// enjoy optimizing that one in 2038. we need this to render a string like
@@ -165,8 +170,6 @@ class Abgabe extends FHCAPI_Controller
 						$pa->zweitbetreuer = $data[0];
 					}
 				}
-				
-				
 			}
 		}
 		
@@ -206,7 +209,8 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				));
 
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				// TODO: consider this for daily abgabetool email job
+//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -256,48 +260,53 @@ class Abgabe extends FHCAPI_Controller
 
 			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
 
-				// Loads Libraries
-				$this->load->library('SignatureLib');
+				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-				// Check if the document is signed
-				$signaturVorhanden = true;
-				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
-				if (is_array($signList) && count($signList) > 0)
-				{
-					// The document is signed
-					$uploadedDocumentSigned = 'The document is signed';
-				}
-				elseif ($signList === null)
-				{
-					$uploadedDocumentSigned = 'WARNING: signature server error';
-				}
-				else
-				{
-					$signaturVorhanden = false;
-					$uploadedDocumentSigned = 'No document signature found';
-				}
-				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
+				$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+				$projektarbeitArr = $this->getDataOrTerminateWithError($result);
 
-				if ($signaturVorhanden === false)
+				if(count($projektarbeitArr) > 0) {
+					$projektarbeit = $projektarbeitArr[0];
+				} else {
+					$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+				}
+
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$result = $this->PaabgabeModel->load($paabgabe_id);
+				$paabgabeArr = $this->getDataOrTerminateWithError($result);
+
+				if(count($paabgabeArr) > 0) {
+					$paabgabe = $paabgabeArr[0];
+				} else {
+					$this->terminateWithError($this->p->t('global','projektabgabeNichtGefunden'), 'general');
+				}
+				
+				$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
+				$signaturstatus = $paabgabe->signatur;
+				
+				if ($paabgabe->signatur === false)
 				{
 					$this->signaturFehltEmail($student_uid);
 				}
 				
 				// update projektarbeit cols
-				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
 					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
 
 
 				// update paabgabe datum
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 				$res = $this->PaabgabeModel->update($paabgabe_id, array(
 					'abgabedatum' => date('Y-m-d'),
 					'updatevon' => getAuthUID(),
 					'updateamum' => date('Y-m-d H:i:s')
 				));
 
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$res = $this->PaabgabeModel->load($res->retval);
+				$abgabe = getData($res)[0];
+				$abgabe->signatur = $signaturstatus;
+					
+				// TODO: consider for email job
+//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('endupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -306,7 +315,7 @@ class Abgabe extends FHCAPI_Controller
 				), getAuthUID(), getAuthPersonId(), array($projektarbeit_id,$sprache,$abstract,$abstract_en
 				,$schlagwoerter, $schlagwoerter_en, $seitenanzahl)));
 				
-				$this->terminateWithSuccess($res);
+				$this->terminateWithSuccess($abgabe);
 			} else {
 				$this->terminateWithError('Error moving File');
 			}
@@ -436,12 +445,12 @@ class Abgabe extends FHCAPI_Controller
 				
 				if ($zweitbegutachterRes)
 				{
-					$zweitbegutachterResults = $zweitbegutachterRes->retval;
+					$zweitbegutachterResults = getData($zweitbegutachterRes->retval)[0];
 
 					foreach ($zweitbegutachterResults as $begutachter)
 					{
 						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
-						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
+						$tokenGenRes = $this->ProjektbetreuerModel->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
 
 						if (!$tokenGenRes)
 						{
@@ -870,6 +879,7 @@ class Abgabe extends FHCAPI_Controller
 		if (!isset($studiengang_kz) || isEmptyString($studiengang_kz))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		
+		
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
 
@@ -886,15 +896,17 @@ class Abgabe extends FHCAPI_Controller
 		$projektabgaben = $this->getDataOrTerminateWithError($ret);
 		
 		// map the abgaben into projektarbeiten
-		
 		foreach($projektarbeiten as $projektarbeit) {
 			$filterFunc = function($projektabgabe) use ($projektarbeit) {
 				return $projektabgabe->projektarbeit_id == $projektarbeit->projektarbeit_id;
 			};
-
 			
 			$projektarbeit->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
-			
+
+			// check the signature status for enduploads
+			foreach($projektarbeit->abgabetermine as $abgabe) {
+				$this->checkAbgabeSignatur($abgabe, $projektarbeit);
+			}
 		}
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
@@ -935,18 +947,10 @@ class Abgabe extends FHCAPI_Controller
 		
 		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer || $isAssistenz) {
 			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			
+			
 			if(file_exists($file_path)) {
-
-				header('Content-Description: File Transfer');
-				header('Content-Type: application/octet-stream');
-				header('Expires: 0');
-				header('Cache-Control: must-revalidate');
-				header('Pragma: public');
-				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
-				header('Content-Length: ' . filesize($file_path));
-
-				flush(); // send headers first just in case
-				readfile($file_path); // read file content to output buffer
+				$this->terminateWithFileOutput('application/octet-stream', filesize($file_path), basename($file_path));
 
 			} else {
 				$this->terminateWithError('File not found');
@@ -955,5 +959,36 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError('Keine Zuordnung!');
 		}
 	}
+
+	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
+		if($abgabe->paabgabetyp_kurzbz != 'end') {
+			return;
+		}
+		
+		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$projektarbeit->student_uid.'.pdf';
+		
+		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
+		if(file_exists($path)) {
+
+			// Check if the document is signed
+			$signList = SignatureLib::list($path);
+			if (is_array($signList) && count($signList) > 0)
+			{
+				// The document is signed
+				$signaturVorhanden = true;
+			}
+			elseif ($signList === null)
+			{
+				// frontend knows to handle it this way for signatures
+				$signaturVorhanden = 'error';
+			}
+			else
+			{
+				$signaturVorhanden = false;
+			}
+
+			$abgabe->signatur = $signaturVorhanden;
+		}
+	}
 	
 }
\ No newline at end of file
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 422ae1087..2e1daf2cd 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -26,6 +26,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
+		'vendor/npm-asset/primevue/message/message.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index af35cd4eb..1b3e767b2 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -34,6 +34,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
+		'vendor/npm-asset/primevue/message/message.min.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 417e5fab3..6f86939b5 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -35,11 +35,6 @@ export default {
 			config: {Headers: { "Content-Type": "multipart/form-data" }}
 		};
 	},
-	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
-		const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
-
-		window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
-	},
 	getMitarbeiterProjektarbeiten(all) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 1e39e0ddb..e46067c38 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -14,6 +14,7 @@ export const AbgabeMitarbeiterDetail = {
 		SpeedDial: primevue.speeddial,
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
+		Message: primevue.message,
 		VueDatePicker
 	},
 	inject: [
@@ -74,6 +75,9 @@ export const AbgabeMitarbeiterDetail = {
 			const paabgabe_id = termin.paabgabe_id
 			termin.note_pk = termin.note?.note ?? null
 			termin.betreuer_person_id = this.projektarbeit.betreuer_person_id
+			
+			// phrasentext 'no late submission allowed' to 'late submission allowed' + boolean UI invert
+			termin.fixtermin = !termin.invertedFixtermin
 			return this.$api.call(ApiAbgabe.postProjektarbeitAbgabe(termin)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
@@ -121,6 +125,7 @@ export const AbgabeMitarbeiterDetail = {
 							'paabgabe_id': -1,
 							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 							'fixtermin': false,
+							'inertedFixtermin': true,
 							'kurzbz': '', // todo kurzbz textfield value vorschlag für qualgates
 							'datum': new Date().toISOString().split('T')[0],
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
@@ -177,7 +182,10 @@ export const AbgabeMitarbeiterDetail = {
 			return true;
 		},
 		downloadAbgabe(termin) {
-			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}`;
+
+			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
+			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
 		dateDiffInDays(datum, today){
 			const oneDayMs = 1000 * 60 * 60 * 24
@@ -258,6 +266,7 @@ export const AbgabeMitarbeiterDetail = {
 					'paabgabe_id': -1,
 					'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 					'fixtermin': false,
+					'invertedFixtermin': true,
 					'kurzbz': '',
 					'datum': new Date().toISOString().split('T')[0],
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
@@ -292,6 +301,7 @@ export const AbgabeMitarbeiterDetail = {
 				'paabgabe_id': -1,
 				'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 				'fixtermin': false,
+				'invertedFixtermin': true,
 				'kurzbz': '',
 				'datum': new Date().toISOString().split('T')[0],
 				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
@@ -314,6 +324,21 @@ export const AbgabeMitarbeiterDetail = {
 			
 	},
 	computed: {
+		getMessagePtStyle() {
+			// adjust outer spacing and internal padding to appear similar to doenload button in size
+			return {
+				root: {
+					style: {
+						margin: '0px'
+					}
+				},
+				wrapper: {
+					style: {
+						padding: '6px'
+					}
+				}
+			}	
+		},
 		getActiveIndexTabArray() {
 			// here we try to assume which abgabetermine are the most relevant to the current user
 
@@ -397,6 +422,12 @@ export const AbgabeMitarbeiterDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipAbgabeDetected() {
+			return {
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')),
+				class: "custom-tooltip"
+			}
+		},
 		getTooltipNotAllowedToSave() {
 			return {
 				value: this.$p.t('abgabetool/c4notAllowedToEditAbgabeTermin'),
@@ -430,7 +461,12 @@ export const AbgabeMitarbeiterDetail = {
 			}
 			
 			this.newTermin.upload_allowed = newVal.upload_allowed_default
-		}	
+		},
+		'projektarbeit'(newVal) {
+			// set invertedFixtermin field for UI/UX purposes -> avoid double negation in text
+			
+			newVal?.abgabetermine?.forEach(termin => termin.invertedFixtermin = !termin.fixtermin)
+		}
 	},
 	created() {
 
@@ -454,20 +490,18 @@ export const AbgabeMitarbeiterDetail = {
 		</template>
 		<template v-slot:default>
 			<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
-<!--				minheight to avoid z-index magic for the datepicker inside the modal inside the modal...-->
 			<div v-if="newTermin">
-<!--				fixtermin is not an option for lektors-->
-<!--					<div class="row">-->
-<!--						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>-->
-<!--						<div class="col-8 col-md-9">-->
-<!--							<Checkbox -->
-<!--								v-model="newTermin.fixtermin"-->
-<!--								:binary="true" -->
-<!--								:pt="{ root: { class: 'ml-auto' }}"-->
-<!--							>-->
-<!--							</Checkbox>-->
-<!--						</div>-->
-<!--					</div>-->
+				<div v-if="assistenzMode" class="row">
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-8 col-md-9">
+						<Checkbox 
+							v-model="newTermin.invertedFixtermin"
+							:binary="true" 
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
+				</div>
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 					<div class="col-8 col-md-9">
@@ -586,13 +620,16 @@ export const AbgabeMitarbeiterDetail = {
 							<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
 								<i  v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
 							</div>
+							<div v-if="termin?.abgabedatum" class="col-auto" style="transform: translateX(-30px)">
+								<i v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
+							</div>
 						</div>				
 					</template>
 					<div class="row mt-2" v-if="assistenzMode">
-						<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv3')}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
+						<div class="col-12 col-md-9">
 							<Checkbox 
-								v-model="termin.fixtermin"
+								v-model="termin.invertedFixtermin"
 								:binary="true" 
 								:pt="{ root: { class: 'ml-auto' }}"
 							>
@@ -600,8 +637,8 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+						<div class="col-12 col-md-9">
 							<VueDatePicker
 								v-model="termin.datum"
 								:clearable="false"
@@ -614,8 +651,8 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
+						<div class="col-12 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
 								:disabled="!termin.allowedToSave"
@@ -629,8 +666,8 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+						<div class="col-12 col-md-9">
 							<Checkbox
 								v-model="termin.upload_allowed"
 								:binary="true"
@@ -640,8 +677,8 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
+						<div class="col-12 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
 								v-model="termin.note"
@@ -651,21 +688,21 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
+						<div class="col-12 col-md-9">
 							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+						<div class="col-12 col-md-9">
 							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" class="w-100" rows="1" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
+						<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
 								<div class="row">
 									<div style="width:250px">
@@ -682,6 +719,16 @@ export const AbgabeMitarbeiterDetail = {
 											<a> {{$capitalize( $p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 										</button>	
 									</div>
+									
+									<div v-if="termin?.signatur !== undefined && termin?.signatur !== null" class="col-auto">
+										<Message v-if="termin?.signatur == true" severity="success" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturGefunden') }} </Message>
+										<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4keineSignatur') }} </Message>
+										<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
+									</div>
+									<div v-else class="col-auto">
+										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>
+									</div>
+									
 								</div>						
 							</template>
 							<template v-else>
@@ -690,10 +737,10 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-4 col-md-3 fw-bold">
-<!--								 TODO: row description? -->
+						<div class="col-12 col-md-3 fw-bold">
+								 {{ $capitalize( $p.t('abgabetool/c4actions') )}}
 						</div>
-						<div class="col-8 col-md-9">
+						<div class="col-12 col-md-9">
 							<div class="row">
 								<div class="col-auto">
 									<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 047a5ea52..d0503798a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -15,6 +15,8 @@ export const AbgabeStudentDetail = {
 		Textarea: primevue.textarea,
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
+		Message: primevue.message,
+		Inplace: primevue.inplace,
 		VueDatePicker
 	},
 	inject: ['notenOptions', 'isMobile', 'isViewMode'],
@@ -144,7 +146,10 @@ export const AbgabeStudentDetail = {
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
-			this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}`;
+
+			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
+			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
 		formatDate(dateParam, showTime = true) {
 			const date = new Date(dateParam)
@@ -196,6 +201,9 @@ export const AbgabeStudentDetail = {
 
 				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
 				termin.abgabedatum = new Date().toISOString().split('T')[0];
+				if(res?.data?.signatur !== undefined) {
+					termin.signatur = res.data.signatur
+				}
 				
 			} else {
 				this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4fileUploadErrorv3')))
@@ -215,6 +223,7 @@ export const AbgabeStudentDetail = {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
+			// avoid renaming these statuses as their names are used as css keys
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
@@ -259,9 +268,29 @@ export const AbgabeStudentDetail = {
 			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
 			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
 			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
+			
+			// get dateStyles for each abgabetermin
+			newVal?.abgabetermine?.forEach(termin => {
+				termin.dateStyle = this.getDateStyleClass(termin)
+			})
 		}
 	},
 	computed: {
+		getMessagePtStyle() {
+			// adjust outer spacing and internal padding to appear similar to doenload button in size
+			return {
+				root: {
+					style: {
+						margin: '0px'
+					}
+				},
+				wrapper: {
+					style: {
+						padding: '6px'
+					}
+				}
+			}
+		},
 		getActiveIndexTabArray() {
 			// here we try to do mind reading logic by assuming which abgabetermine are the most relevant to the current user
 
@@ -332,6 +361,12 @@ export const AbgabeStudentDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipAbgabeDetected() {
+			return {
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')),
+				class: "custom-tooltip"
+			}
+		},
 		getTooltipNotAllowedToUpload() {
 			if(this.isViewMode) {
 				return {
@@ -367,43 +402,69 @@ export const AbgabeStudentDetail = {
 			
 			<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
-					<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
+					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
-							<div class="d-flex row w-100">
+							<div class="d-flex row w-100 flex-nowrap">
 								<div class="col-auto" style="transform: translateX(-62px)">
-									<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
-									<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+									<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
+									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
+									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
+									<i v-else-if="termin.dateStyle == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
+									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 								</div>
-								<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
+								<div class="col-auto text-start pl-2 pr-0 pt-0 pb-0" style="min-width: max(120px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
 									<span>{{ termin?.bezeichnung }}</span>
 								</div>
-								<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
+								<div class="col-auto text-start p-0" style="min-width: max(80px, 15%); transform: translateX(-30px)">
 									<span>{{ formatDate(termin.datum, false) }}</span>
 								</div>
-								<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
-									<i v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
+								<div class="col-auto" style="transform: translateX(-30px); min-width: 42px;">
+									<i v-if="termin?.fixtermin" v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
+									<i v-if="termin?.abgabedatum && isMobile" v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
+								</div>
+								<div v-if="termin?.abgabedatum && !isMobile" class="col-auto" style="transform: translateX(-30px); min-width: 42px;">
+									<i  v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
 								</div>
 							</div>				
 						</template>
-<!--						<div class="row">-->
-<!--							<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv3')}}</div>-->
-<!--							<div class="col-8 col-md-9">-->
-<!--								<Checkbox -->
-<!--									disabled-->
-<!--									v-model="termin.fixtermin"-->
-<!--									:binary="true" -->
-<!--									:pt="{ root: { class: 'ml-auto' }}"-->
-<!--								>-->
-<!--								</Checkbox>-->
-<!--							</div>-->
-<!--						</div>-->
+						
+						<div v-if="isMobile" class="row mt-2 align-items-center">						
+							<Inplace
+								closable
+								:closeButtonProps="{
+									style: {
+										position: 'relative',
+										bottom: '100px',
+										left: '80%',
+										zIndex: 1
+									}
+								}"
+							>
+								<template #display>{{ $capitalize($p.t('abgabetool/c4tapForTooltipInfo'))}}</template>
+								<template #content>
+									<div class="col-auto">
+										<div class="row">
+											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4abgabeZeitstatus')) }}</div>
+											<div class="col-12 col-md-9">{{$p.t('abgabetool/c4tooltip' + $capitalize(termin?.dateStyle) )}}</div>
+										</div>
+										<div class="row">
+											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4fixterminv4')) }}</div>
+											<div class="col-12 col-md-9">{{!termin?.fixtermin}}</div>
+										</div>
+										<div class="row">
+											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4fileUploaded')) }}</div>
+											<div class="col-12 col-md-9">{{termin?.abgabedatum !== null}}</div>
+										</div>
+									</div>
+								</template>
+							</Inplace>
+
+						
+						</div>
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+							<div class="col-12 col-md-9">
 								<VueDatePicker
 									v-model="termin.datum"
 									:clearable="false"
@@ -417,15 +478,15 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
+							<div class="col-12 col-md-9">
 								{{ termin.bezeichnung }}
 							</div>
 						</div>
 						
 						<div class="row mt-2" v-if="termin.note">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
+							<div class="col-12 col-md-9">
 								<div class="col-1 d-flex justify-content-start align-items-start">
 									{{ getTerminNoteBezeichnung(termin) }}
 								</div>
@@ -433,37 +494,54 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
+							<div class="col-12 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" disabled></Textarea>
 							</div>
 						</div>
 						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+							<div class="col-12 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" class="w-100" :disabled="true"></Textarea>
 							</div>
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
-							<div class="col-8 col-md-9">
-								<template v-if="termin?.abgabedatum">
-									{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-									<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
-										<a> {{$capitalize($p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
-									</button>							
-								</template>
-								<template v-else>
-									{{ $capitalize( $p.t('abgabetool/c4nochNichtsAbgegeben') )}}
-								</template>
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
+							<div class="col-12 col-md-9">
+							<template v-if="termin?.abgabedatum">
+								<div class="row">
+									<div style="width:100px">
+										<h6>{{ termin.abgabedatum?.split("-").reverse().join(".") }}</h6>
+									</div>
+									
+									<div class="col-auto">
+										<button v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" class="btn btn-primary">
+											<a> {{$capitalize($p.t('abgabetool/c4downloadAbgabe') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+										</button>
+									</div>	
+									<template v-if="termin.paabgabetyp_kurzbz == 'end'">	
+										<div v-if="termin?.signatur !== undefined" class="col-auto">
+											<Message v-if="termin?.signatur == true" severity="success" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturGefunden') }} </Message>
+											<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4keineSignatur') }} </Message>
+											<Message v-else-if="termin?.signatur == null" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
+										</div>
+										<div v-else class="col-auto">
+											<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>
+										</div>
+									</template>
+								</div>					
+							</template>
+							<template v-else>
+								{{ $capitalize( $p.t('abgabetool/c4nochNichtsAbgegeben') )}}
+							</template>
 							</div>
 						</div>
 						
 						<div class="row mt-2" v-if="termin.upload_allowed">
-							<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fileupload') )}}</div>
-							<div class="col-8 col-md-9">
+							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fileupload') )}}</div>
+							<div class="col-12 col-md-9">
 								<div class="row" v-if="termin?.allowedToUpload">
 									<div class="col-12 col-sm-6 mb-2">
 										<Upload 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 8260fdbeb..71fe73432 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -53,6 +53,7 @@ export const AbgabetoolAssistenz = {
 	},
 	data() {
 		return {
+			studiensemesterOptions: null,
 			allSem: null,
 			curSem: null,
 			notenOptionFilter: null,
@@ -851,7 +852,7 @@ export const AbgabetoolAssistenz = {
 			<template v-slot:default>
 				<div class="row">
 					<div class="col-1 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4fixterminv3')}}
+						{{$p.t('abgabetool/c4fixterminv4')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
 						{{$capitalize($p.t('abgabetool/c4zieldatum'))}}
@@ -928,7 +929,6 @@ export const AbgabetoolAssistenz = {
 				{{ $p.t('abgabetool/c4projektarbeitTimelineTitle') }}
 			</template>
 
-<!--			TODO: take care of absolute offset values -->
 			<div class="row" style="margin-bottom: 12px;">
 				<Inplace
 					closable
@@ -945,19 +945,19 @@ export const AbgabetoolAssistenz = {
 					<template #content>
 						<div class="col-auto">
 							<div class="row">
-								<div class="col-2">Student: </div>
+								<div class="col-3">Student: </div>
 								<div class="col-7">{{timelineProjekt?.student_vorname}} {{timelineProjekt?.student_nachname}}</div>
 							</div>
 							<div class="row">
-								<div class="col-2">Uid: </div>
+								<div class="col-3">Uid: </div>
 								<div class="col-7">{{timelineProjekt?.student_uid}}</div>
 							</div>
 							<div class="row">
-								<div class="col-2">{{timelineProjekt?.betreuerart}}: </div>
+								<div class="col-3">{{timelineProjekt?.betreuerart}}: </div>
 								<div class="col-7">{{timelineProjekt?.erstbetreuer_full_name}}</div>
 							</div>
 							<div class="row">
-								<div class="col-2">Titel: </div>
+								<div class="col-3">Titel: </div>
 								<div class="col-7">{{timelineProjekt?.titel}}</div>
 							</div>
 						</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index d56b325f5..937e12b24 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -74,15 +74,18 @@ export const AbgabetoolStudent = {
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
 					termin.allowedToUpload = false
-					// termin.datum = '2025-10-16'
-					// TODO: change this and corresponding tooltips every time FH decides QG work different now
+					
 					if(termin.paabgabetyp_kurzbz == 'end') {
+						// production logic
 						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
+						
+						// development purposes
+						// termin.allowedToUpload = this.checkQualityGates(pa.abgabetermine)
+
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
 					} else {
-						// TODO: this will confuse people so much, by requirement we should NOT show people this flag
-						// but it still should have an effect?
+						// this could confuse people since we should dont show people this flag
 						termin.allowedToUpload = termin.upload_allowed 
 					}
 
@@ -251,7 +254,6 @@ export const AbgabetoolStudent = {
 		</template>
 		<template v-slot:default>
 			<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-			
 		</template>
 	</bs-modal>
 	
@@ -268,7 +270,7 @@ export const AbgabetoolStudent = {
 				
 				<template #header>
 					<div class="d-flex row w-100">
-						<div class="col-6 text-start">
+						<div class="text-start" :class="projektarbeit.note != null ? 'col-6' : 'col-12'">
 							<span>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
 						</div>
 						<div class="col-6 text-end">
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index ae6595d6c..25e781df2 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -33,7 +33,7 @@ export const DeadlineOverview = {
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv3')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv4')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetypv2')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 766c53daf..b395636b7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42120,18 +42120,178 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fixterminv3',
+		'phrase' => 'c4fixterminv4',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "kein Nachreichen möglich",
+				'text' => "Nachreichen möglich",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "no late submission possible",
+				'text' => "late submission possible",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4orgform',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Organisationseinheit",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "organization unit",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4studstatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Studierendenstatus",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "student status",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4signaturGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Digitale Signatur gefunden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "digital signature found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4keineSignatur',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Digitale Signatur gefunden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "no digital signature found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4signaturServerError',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Signatur Server Error",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "signature server error",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4noFileFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Datei wurde nicht gefunden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "file not found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fileUploaded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Datei hochgeladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "file uploaded",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4actions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Aktionen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "actions",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43062,6 +43222,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipAbgabeDetected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zu diesem Abgabetermin wurde bereits eine Datei hochgeladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'a file has been uploaded for this deadline',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tapForTooltipInfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Tippen Sie für Tooltip-Informationen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'tap for tooltip information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeZeitstatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zeitstatus",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'time status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 74937db20416237877cef2f5b52a84560e6f1a76 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 11 Nov 2025 15:52:04 +0100
Subject: [PATCH 0942/1357] WIP email logs to read/send in job;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 145 +++++++++++-------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   2 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   3 +-
 3 files changed, 92 insertions(+), 58 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index b1eaa9914..01b5dca32 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -210,7 +210,7 @@ class Abgabe extends FHCAPI_Controller
 				));
 
 				// TODO: consider this for daily abgabetool email job
-//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -286,7 +286,8 @@ class Abgabe extends FHCAPI_Controller
 				
 				if ($paabgabe->signatur === false)
 				{
-					$this->signaturFehltEmail($student_uid);
+					// TODO: decide if we need this email at all, if yes -> nightly job sends email
+//					$this->signaturFehltEmail($student_uid);
 				}
 				
 				// update projektarbeit cols
@@ -306,7 +307,7 @@ class Abgabe extends FHCAPI_Controller
 				$abgabe->signatur = $signaturstatus;
 					
 				// TODO: consider for email job
-//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('endupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -362,14 +363,15 @@ class Abgabe extends FHCAPI_Controller
 			'studiengang' => $stg_obj->bezeichnung
 		);
 
-		$mailres = sendSanchoMail(
-			'ParbeitsbeurteilungSiganturFehlt',
-			$data,
-			$tomail,
-			$subject,
-			'sancho_header_min_bw.jpg',
-			'sancho_footer_min_bw.jpg'
-		);
+		
+//		$mailres = sendSanchoMail(
+//			'ParbeitsbeurteilungSiganturFehlt',
+//			$data,
+//			$tomail,
+//			$subject,
+//			'sancho_header_min_bw.jpg',
+//			'sancho_footer_min_bw.jpg'
+//		);
 	}
 
 	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
@@ -420,34 +422,54 @@ class Abgabe extends FHCAPI_Controller
 			
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
 
-			$mailres = sendSanchoMail(
-				'ParbeitsbeurteilungEndupload',
-				$maildata,
-				$email,
-				$subject,
-				'sancho_header_min_bw.jpg',
-				'sancho_footer_min_bw.jpg',
-				get_uid()."@".DOMAIN);
+			$this->addMeta('$maildata', $maildata);
+			// TODO: dont acutally send the mail but save it somewhere for job to send later?
+			$sanchoData = array('ParbeitsbeurteilungEndupload', $maildata, $email, $subject, 'sancho_header_min_bw.jpg', 'sancho_footer_min_bw.jpg', get_uid()."@".DOMAIN);
+			
+//			$this->logLib->logInfoDB(
+//				array(
+//					'zwischenupload',
+//					$sanchoData, 
+//					array(
+//						'abgabedatum' => date('Y-m-d'),
+//						'updatevon' => getAuthUID(),
+//						'updateamum' => date('Y-m-d H:i:s')
+//					),
+//					getAuthUID(),
+//					getAuthPersonId(),
+//					$student_uid
+//				)
+//			);
 
-			if(!$mailres)
-			{
-				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-			}
+
+//			$mailres = sendSanchoMail(
+//				'ParbeitsbeurteilungEndupload',
+//				$maildata,
+//				$email,
+//				$subject,
+//				'sancho_header_min_bw.jpg',
+//				'sancho_footer_min_bw.jpg',
+//				get_uid()."@".DOMAIN);
+
+//			if(!$mailres)
+//			{
+//				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+//			}
 
 			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
 			if ($paabgabetyp_kurzbz == 'end')
 			{
 				// Zweitbegutachter holen
 				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
-				$zweitbegutachterRes = $this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
+				$zweitbegutachterRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid));
 				
-				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRes);
+				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
 				
-				if ($zweitbegutachterRes)
+				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
 				{
-					$zweitbegutachterResults = getData($zweitbegutachterRes->retval)[0];
+//					$zweitbegutachterResults = $zweitbegutachterRetval[0];
 
-					foreach ($zweitbegutachterResults as $begutachter)
+					foreach ($zweitbegutachterRetval as $begutachter)
 					{
 						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
 						$tokenGenRes = $this->ProjektbetreuerModel->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
@@ -457,18 +479,22 @@ class Abgabe extends FHCAPI_Controller
 							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
 						}
 						
-						$begutachterMitTokenRes = $this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
+						
+						$this->addMeta('$begutachterMitTokenRes', $begutachterMitTokenRetval);
+						
 //						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
 
-						if (!$begutachterMitTokenRes)
+						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
 							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
 						}
 
-						// Email an Zweitbegutachter senden
-						if (isset($zweitbegutachterMitToken->result[0]))
-						{
-							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
+						// was this check ever necessary?
+//						// Email an Zweitbegutachter senden
+//						if (isset($zweitbegutachterMitToken->result[0]))
+//						{
+							$begutachterMitToken = $begutachterMitTokenRetval[0];
 
 							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
 							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
@@ -487,22 +513,24 @@ class Abgabe extends FHCAPI_Controller
 							$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
 							$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
 							
-
-							$mailres = sendSanchoMail(
-								'ParbeitsbeurteilungEndupload',
-								$zweitbetmaildata,
-								$begutachterMitToken->email,
-								$subject,
-								'sancho_header_min_bw.jpg',
-								'sancho_footer_min_bw.jpg',
-								get_uid()."@".DOMAIN
-							);
-
-							if (!$mailres)
-							{
-								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-							}
-						}
+							$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
+							
+//							TODO: persist email event somehow, let job bundle the updates later?
+//							$mailres = sendSanchoMail(
+//								'ParbeitsbeurteilungEndupload',
+//								$zweitbetmaildata,
+//								$begutachterMitToken->email,
+//								$subject,
+//								'sancho_header_min_bw.jpg',
+//								'sancho_footer_min_bw.jpg',
+//								get_uid()."@".DOMAIN
+//							);
+//
+//							if (!$mailres)
+//							{
+//								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+//							}
+						
 					}
 				}
 			}
@@ -754,12 +782,14 @@ class Abgabe extends FHCAPI_Controller
 
 			$email = $data[0]->uid."@".DOMAIN;
 
-			sendSanchoMail(
-				'neuerAbgabetermin',
-				$body_fields,
-				$email,
-				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
-			);
+			// TODO: nightly email job informing about new serientermine
+			
+//			sendSanchoMail(
+//				'neuerAbgabetermin',
+//				$body_fields,
+//				$email,
+//				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
+//			);
 		}
 
 		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
@@ -862,6 +892,9 @@ class Abgabe extends FHCAPI_Controller
 
 //		$this->addMeta('$emaildata', $data);
 		
+		// students still get theirs on event, since it is very unlikely that this
+		// leads to spam on their end
+		
 		$mailres = sendSanchoMail(
 			'QualGateNegativ',
 			$data,
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index d0503798a..96e01a2ed 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -512,7 +512,7 @@ export const AbgabeStudentDetail = {
 							<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
 								<div class="row">
-									<div style="width:100px">
+									<div style="width:100px; align-content: center;">
 										<h6>{{ termin.abgabedatum?.split("-").reverse().join(".") }}</h6>
 									</div>
 									
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 937e12b24..5f86d5100 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -77,10 +77,11 @@ export const AbgabetoolStudent = {
 					
 					if(termin.paabgabetyp_kurzbz == 'end') {
 						// production logic
-						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
+						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
 						
 						// development purposes
 						// termin.allowedToUpload = this.checkQualityGates(pa.abgabetermine)
+						termin.allowedToUpload = true
 
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)

From 2920c68f05fbf3139f06953d0a901dcd6f42da6d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 11 Nov 2025 15:59:42 +0100
Subject: [PATCH 0943/1357] wip

---
 application/controllers/api/frontend/v1/Abgabe.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 01b5dca32..690c2a768 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -599,7 +599,7 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
-
+			// TODO: consider this in nightly email job
 			$this->logLib->logInfoDB(array('paabgabe created',$result, getAuthUID(), getAuthPersonId()));
 		} else {
 			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
@@ -625,6 +625,8 @@ class Abgabe extends FHCAPI_Controller
 				)
 			);
 
+			// TODO: consider this in nightly email job
+			
 			$this->logLib->logInfoDB(array('paabgabe updated',$result, array(
 				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
 				'datum' => $datum,
@@ -692,6 +694,8 @@ class Abgabe extends FHCAPI_Controller
 			$result = $this->PaabgabeModel->delete($paabgabe_id);
 			$result = $this->getDataOrTerminateWithError($result);
 
+			// TODO: consider this in nightly email job
+			
 			$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
 			$this->terminateWithSuccess($result);
 		}

From 77604c5e15ac769cc26f43e16b464cbdc6bfcb17 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 12 Nov 2025 08:02:06 +0100
Subject: [PATCH 0944/1357] StV: Font Size setting

---
 .../api/frontend/v1/stv/Config.php            | 27 +++++++++++++++-
 public/css/Studentenverwaltung.css            | 12 +++++++
 .../js/components/Stv/Studentenverwaltung.js  | 18 ++++++++++-
 .../Stv/Studentenverwaltung/Config.js         | 31 +++++++++++++------
 system/dbupdate_3.4.php                       |  1 +
 system/dbupdate_3.4/68744_StV_settings.php    | 16 ++++++++++
 6 files changed, 94 insertions(+), 11 deletions(-)
 create mode 100644 system/dbupdate_3.4/68744_StV_settings.php

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 4d3a5f8ee..ad6f50c72 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -64,6 +64,7 @@ class Config extends FHCAPI_Controller
 
 		$config = [];
 
+		#number_displayed_past_studiensemester
 		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -76,6 +77,21 @@ class Config extends FHCAPI_Controller
 				?? $number_displayed_past_studiensemester_default
 		];
 
+		#font_size
+		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_font_size']);
+		$data = $this->getDataOrTerminateWithError($result);
+		$config['font_size'] = [
+			"type" => "select",
+			"label" => "Font size",
+			"value" => $data['stv_font_size'] ?? "fs_normal",
+			"options" => [
+				"fs_small" => "klein",// TODO(chris): phrase
+				"fs_normal" => "normal",// TODO(chris): phrase
+				"fs_big" => "groß",// TODO(chris): phrase
+				"fs_huge" => "sehr groß"// TODO(chris): phrase
+			]
+		];
+
 		// TODO(chris): Event
 
 		$this->terminateWithSuccess($config);
@@ -86,7 +102,6 @@ class Config extends FHCAPI_Controller
 	 */
 	public function set()
 	{
-		// TODO(chris): rewrite to batch saving
 		$this->load->model('system/Variable_model', 'VariableModel');
 		$this->load->library('form_validation');
 
@@ -95,6 +110,11 @@ class Config extends FHCAPI_Controller
 			"Anzahl angezeigter vergangender Studiensemester",// TODO(chris): phrase
 			'required|integer'
 		);
+		$this->form_validation->set_rules(
+			'font_size',
+			"Font size",// TODO(chris): phrase
+			'required|in_list[fs_small,fs_normal,fs_big,fs_huge]'
+		);
 
 		// TODO(chris): Event
 
@@ -107,6 +127,11 @@ class Config extends FHCAPI_Controller
 			'number_displayed_past_studiensemester',
 			$this->input->post('number_displayed_past_studiensemester')
 		);
+		$this->VariableModel->setVariable(
+			getAuthUID(),
+			'stv_font_size',
+			$this->input->post('font_size')
+		);
 
 		// TODO(chris): Event
 
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index d92e3dfac..a91b10bd7 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -9,6 +9,18 @@
 html {
   font-size: .875em;
 }
+html.fs_small {
+  font-size: .5em;
+}
+html.fs_normal {
+  font-size: .875em;
+}
+html.fs_big {
+  font-size: 1em;
+}
+html.fs_huge {
+  font-size: 1.4em;
+}
 
 .navbar-dark .navbar-brand:focus {
 	box-shadow: 0 0 0 .25rem rgba(13,110,253,.25);
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9db3f9e7b..b98f5cb50 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -152,6 +152,22 @@ export default {
 		},
 		'url_mode': function () {
 			this.handlePersonUrl();
+		},
+		'appconfig.font_size'() {
+			// add to html class
+			const classList = Object.keys(this.$refs.config.setup.font_size.options);
+			classList.forEach(cn => document.documentElement.classList.remove(cn));
+			document.documentElement.classList.add(this.appconfig.font_size);
+			// recalc Tabulator heights
+			if (this.$el) {
+				const tabulatorEls = this.$el.querySelectorAll('.tabulator');
+				for (const el of tabulatorEls) {
+					const tabulators = Tabulator.findTable(el);
+					if (tabulators) {
+						tabulators[0].searchRows().forEach(row => row.normalizeHeight());
+					}
+				}
+			}
 		}
 	},
 	methods: {
@@ -430,6 +446,6 @@ export default {
 				</main>
 			</div>
 		</div>
-		<stv-config v-model="appconfig"></stv-config>
+		<stv-config ref="config" v-model="appconfig"></stv-config>
 	</div>`
 };
diff --git a/public/js/components/Stv/Studentenverwaltung/Config.js b/public/js/components/Stv/Studentenverwaltung/Config.js
index f7a6363cd..7c89fc3ea 100644
--- a/public/js/components/Stv/Studentenverwaltung/Config.js
+++ b/public/js/components/Stv/Studentenverwaltung/Config.js
@@ -60,10 +60,15 @@ export default {
 			.then(res => {
 				this.setup = {};
 				Object.keys(res.data).forEach(key => {
-					const conf = { ...res.data[key] };
-					this.tempValues[key] = conf.value;
-					delete conf.value;
-					this.setup[key] = conf;
+					const binding = { ...res.data[key] };
+					delete binding.value;
+					delete binding.options;
+					const options = res.data[key].options;
+					this.tempValues[key] = res.data[key].value;
+					this.setup[key] = {
+						binding,
+						options
+					};
 				});
 				this.$emit('update:modelValue', { ...this.tempValues });
 			})
@@ -80,11 +85,19 @@ export default {
 		>
 			<template #title>{{ $p.t('ui/settings') }}</template>
 			<template #default>
-				<form-input
-					v-for="(value, key) in setup"
-					v-model="tempValues[key]"
-					v-bind="value"
-				></form-input>
+				<div class="d-flex flex-column gap-5">
+					<form-input
+						v-for="(value, key) in setup"
+						v-model="tempValues[key]"
+						v-bind="value.binding"
+					>
+						<option
+							v-for="(label, val) in value.options"
+							:key="val"
+							:value="val"
+						>{{ label }}</option>
+					</form-input>
+				</div>
 			</template>
 			<template #footer>
 				<button class="btn btn-primary" type="submit">
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f9c889110..ed50b0df1 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -85,6 +85,7 @@ require_once('dbupdate_3.4/66982_berufsschule.php');
 require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
+require_once('dbupdate_3.4/68744_StV_settings.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/68744_StV_settings.php b/system/dbupdate_3.4/68744_StV_settings.php
new file mode 100644
index 000000000..73b105ce0
--- /dev/null
+++ b/system/dbupdate_3.4/68744_StV_settings.php
@@ -0,0 +1,16 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add new name type in public.tbl_variablenname
+if ($result = @$db->db_query("SELECT 1 FROM public.tbl_variablenname WHERE name = 'stv_font_size';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_variablenname(name, defaultwert) VALUES('stv_font_size', null);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_variablenname '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'public.tbl_variablenname: Added name "stv_font_size"<br>';
+	}
+}

From 8b851221b0f8b39aaddd415021e3eb3866f421c7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 12 Nov 2025 12:05:48 +0100
Subject: [PATCH 0945/1357] cis4 main content element shrinkability with
 style="min-width: 0;"

---
 application/views/templates/CISVUE-Header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 358fc75c9..804a43821 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -36,4 +36,4 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		></cis-menu>
 </header>
 
-<main id="cis-main" class="flex-grow-1 p-4 pt-2">
\ No newline at end of file
+<main id="cis-main" class="flex-grow-1 p-4 pt-2" style="min-width: 0;">
\ No newline at end of file

From 7566e8aac248009493e417463243eb914d781e7a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 08:48:54 +0100
Subject: [PATCH 0946/1357] Make AppConfig a general Component

---
 .../Config.js => AppConfig.js}                | 23 +++++++++++--------
 .../js/components/Stv/Studentenverwaltung.js  | 10 ++++----
 2 files changed, 20 insertions(+), 13 deletions(-)
 rename public/js/components/{Stv/Studentenverwaltung/Config.js => AppConfig.js} (88%)

diff --git a/public/js/components/Stv/Studentenverwaltung/Config.js b/public/js/components/AppConfig.js
similarity index 88%
rename from public/js/components/Stv/Studentenverwaltung/Config.js
rename to public/js/components/AppConfig.js
index 7c89fc3ea..cc5d6d478 100644
--- a/public/js/components/Stv/Studentenverwaltung/Config.js
+++ b/public/js/components/AppConfig.js
@@ -15,15 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import BsModal from "../../Bootstrap/Modal.js";
-import FhcForm from "../../Form/Form.js";
-import FormInput from "../../Form/Input.js";
-
-import ApiStvConfig from '../../../api/factory/stv/config.js';
+import BsModal from "./Bootstrap/Modal.js";
+import FhcForm from "./Form/Form.js";
+import FormInput from "./Form/Input.js";
 
 
 export default {
-	name: 'StvConfig',
+	name: 'AppConfig',
 	components: {
 		BsModal,
 		FhcForm,
@@ -33,7 +31,14 @@ export default {
 		'update:modelValue'
 	],
 	props: {
-		modelValue: Object
+		modelValue: {
+			type: Object,
+			required: true
+		},
+		endpoints: {
+			type: Object,
+			required: true
+		}
 	},
 	data() {
 		return {
@@ -44,7 +49,7 @@ export default {
 	methods: {
 		update() {
 			this.$refs.form
-				.call(ApiStvConfig.set(this.tempValues))
+				.call(this.endpoints.set(this.tempValues))
 				.then(() => {
 					// TODO(chris): phrase
 					this.$emit('update:modelValue', { ...this.tempValues });
@@ -56,7 +61,7 @@ export default {
 	},
 	created() {
 		this.$api
-			.call(ApiStvConfig.get())
+			.call(this.endpoints.get())
 			.then(res => {
 				this.setup = {};
 				Object.keys(res.data).forEach(key => {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c661138bb..5e76e0936 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -19,15 +19,16 @@ import CoreSearchbar from "../searchbar/searchbar.js";
 import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
 import AppMenu from "../AppMenu.js";
+import AppConfig from "../AppConfig.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
 import StvList from "./Studentenverwaltung/List.js";
 import StvDetails from "./Studentenverwaltung/Details.js";
 import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
-import StvConfig from "./Studentenverwaltung/Config.js";
 
 import ApiSearchbar from "../../api/factory/searchbar.js";
 import ApiStv from "../../api/factory/stv.js";
 import ApiStvVerband from '../../api/factory/stv/verband.js';
+import ApiStvConfig from '../../api/factory/stv/config.js';
 
 
 export default {
@@ -37,11 +38,11 @@ export default {
 		NavLanguage,
 		VerticalSplit,
 		AppMenu,
+		AppConfig,
 		StvVerband,
 		StvList,
 		StvDetails,
-		StvStudiensemester,
-		StvConfig
+		StvStudiensemester
 	},
 	props: {
 		defaultSemester: String,
@@ -89,6 +90,7 @@ export default {
 	data() {
 		return {
 			appconfig: {},
+			configEndpoints: ApiStvConfig,
 			selected: [],
 			searchbaroptions: {
 				origin: 'stv',
@@ -480,6 +482,6 @@ export default {
 				</main>
 			</div>
 		</div>
-		<stv-config ref="config" v-model="appconfig"></stv-config>
+		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>
 	</div>`
 };

From 5d957e38aed85aa33c82b706c7e93cbec674031f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 08:52:47 +0100
Subject: [PATCH 0947/1357] Phrase settings saved

---
 public/js/components/AppConfig.js |  3 +--
 system/phrasesupdate.php          | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/public/js/components/AppConfig.js b/public/js/components/AppConfig.js
index cc5d6d478..0b2110617 100644
--- a/public/js/components/AppConfig.js
+++ b/public/js/components/AppConfig.js
@@ -51,10 +51,9 @@ export default {
 			this.$refs.form
 				.call(this.endpoints.set(this.tempValues))
 				.then(() => {
-					// TODO(chris): phrase
 					this.$emit('update:modelValue', { ...this.tempValues });
 					this.$refs.modal.hide();
-					this.$fhcAlert.alertSuccess('config updated');
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/settings_saved'));
 				})
 				.catch(this.$fhcAlert.handleSystemErrors);
 		}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 45e8e96dc..e4689e8eb 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1835,6 +1835,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'settings_saved',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einstellungen gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Settings saved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From 95f1c666849a623e81f992443063b87622d370f4 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 09:11:06 +0100
Subject: [PATCH 0948/1357] Stv Settings Phrases

---
 .../api/frontend/v1/stv/Config.php            |  25 ++--
 system/phrasesupdate.php                      | 120 ++++++++++++++++++
 2 files changed, 134 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 097562e6b..d9219be7b 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -74,7 +74,7 @@ class Config extends FHCAPI_Controller
 
 		$config['number_displayed_past_studiensemester'] = [
 			"type" => "number",
-			"label" => "Anzahl angezeigter vergangender Studiensemester",// TODO(chris): phrase
+			"label" => $this->p->t('stv', 'settings_no_displayed_past_sem'),
 			"value" => $data['number_displayed_past_studiensemester']
 				?? $number_displayed_past_studiensemester_default
 		];
@@ -84,17 +84,20 @@ class Config extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$config['font_size'] = [
 			"type" => "select",
-			"label" => "Font size",
+			"label" => $this->p->t('stv', 'settings_fontsize'),
 			"value" => $data['stv_font_size'] ?? "fs_normal",
 			"options" => [
-				"fs_small" => "klein",// TODO(chris): phrase
-				"fs_normal" => "normal",// TODO(chris): phrase
-				"fs_big" => "groß",// TODO(chris): phrase
-				"fs_huge" => "sehr groß"// TODO(chris): phrase
+				"fs_small" => $this->p->t('stv', 'settings_fontsize_small'),
+				"fs_normal" => $this->p->t('stv', 'settings_fontsize_normal'),
+				"fs_big" => $this->p->t('stv', 'settings_fontsize_big'),
+				"fs_huge" => $this->p->t('stv', 'settings_fontsize_huge')
 			]
 		];
 
-		// TODO(chris): Event
+		#others
+		Events::trigger('stv_config_get', function & () use (&$config) {
+			return $config;
+		});
 
 		$this->terminateWithSuccess($config);
 	}
@@ -109,16 +112,16 @@ class Config extends FHCAPI_Controller
 
 		$this->form_validation->set_rules(
 			'number_displayed_past_studiensemester',
-			"Anzahl angezeigter vergangender Studiensemester",// TODO(chris): phrase
+			$this->p->t('stv', 'settings_no_displayed_past_sem'),
 			'required|integer'
 		);
 		$this->form_validation->set_rules(
 			'font_size',
-			"Font size",// TODO(chris): phrase
+			$this->p->t('stv', 'settings_fontsize'),
 			'required|in_list[fs_small,fs_normal,fs_big,fs_huge]'
 		);
 
-		// TODO(chris): Event
+		Events::trigger('stv_config_validation', $this->form_validation);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
@@ -135,7 +138,7 @@ class Config extends FHCAPI_Controller
 			$this->input->post('font_size')
 		);
 
-		// TODO(chris): Event
+		Events::trigger('stv_config_set', $this->input);
 
 		$this->terminateWithSuccess();
 	}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e4689e8eb..3558fba36 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38760,6 +38760,126 @@ array(
 		)
 	),
 	//****************************	 CORE/stv
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_no_displayed_past_sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anzahl angezeigter vergangender Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Number of past semesters of study displayed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zoom',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Zoom',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_small',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Klein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Small',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_normal',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Normal',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Normal',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_big',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Groß',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Big',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_huge',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sehr groß',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Very big',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From cd574cd12c940c1abee83d2c6538f239d8e91dfd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 09:39:38 +0100
Subject: [PATCH 0949/1357] Reload settings setup on language change

---
 public/js/components/AppConfig.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/public/js/components/AppConfig.js b/public/js/components/AppConfig.js
index 0b2110617..b6b6aaeac 100644
--- a/public/js/components/AppConfig.js
+++ b/public/js/components/AppConfig.js
@@ -46,6 +46,29 @@ export default {
 			tempValues: {}
 		};
 	},
+	watch: {
+		'$p.user_language.value'(n, o) {
+			if (n !== o && o !== undefined && Object.keys(this.setup).length) {
+				this.$api
+					.call(this.endpoints.get())
+					.then(res => {
+						this.setup = {};
+						Object.keys(res.data).forEach(key => {
+							const binding = { ...res.data[key] };
+							delete binding.value;
+							delete binding.options;
+							const options = res.data[key].options;
+							this.setup[key] = {
+								binding,
+								options
+							};
+						});
+					})
+					.catch(this.$fhcAlert.handleSystemErrors);
+			}
+		}
+
+	},
 	methods: {
 		update() {
 			this.$refs.form
@@ -62,7 +85,6 @@ export default {
 		this.$api
 			.call(this.endpoints.get())
 			.then(res => {
-				this.setup = {};
 				Object.keys(res.data).forEach(key => {
 					const binding = { ...res.data[key] };
 					delete binding.value;

From 43281c6ba2d9e6010ec3e165d2ba7ac5dad15718 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 13 Nov 2025 09:48:54 +0100
Subject: [PATCH 0950/1357] Removed test buttons from FhcChart basic template

---
 public/js/components/Chart/FhcChart.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/js/components/Chart/FhcChart.js b/public/js/components/Chart/FhcChart.js
index 0733811f1..723ac0159 100644
--- a/public/js/components/Chart/FhcChart.js
+++ b/public/js/components/Chart/FhcChart.js
@@ -8,12 +8,6 @@ export const FhcChart = {
 	},
 	template: `
 	<div style="width:100%;height:100%;overflow:auto">
-		<div role="group" aria-label="Chart Modus">
-			<Button :class="(chartOptions.chart.type === 'pie' ? 'active ' : '') + 'btn btn-outline-secondary'" style="width: 48px;" @click="chartOptions.chart.type='pie'"><i class="fa-solid fa-chart-pie"></i></Button>
-			<Button :class="(chartOptions.chart.type === 'bar' ? 'active ' : '') + 'btn btn-outline-secondary'" style="width: 48px;" @click="chartOptions.chart.type='bar'"><i class="fa-solid fa-chart-bar"></i></Button>
-			<Button :class="(chartOptions.chart.type === 'column' ? 'active ' : '') + 'btn btn-outline-secondary'" style="width: 48px;" @click="chartOptions.chart.type='column'"><i class="fa-solid fa-chart-simple"></i></Button>
-			<Button :class="(chartOptions.chart.type === 'line' ? 'active ' : '') + 'btn btn-outline-secondary'" style="width: 48px;" @click="chartOptions.chart.type='line'"><i class="fa-solid fa-chart-line"></i></Button>
-		</div>
 		<figure>
 			<highcharts class="chart" :options="chartOptions"></highcharts>
 		</figure>

From e36e86fd503731718d23a9634182eb706a5ac75d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 09:54:56 +0100
Subject: [PATCH 0951/1357] Code Quality

---
 .../controllers/api/frontend/v1/stv/Verband.php     | 13 +++++++++++--
 .../js/components/Stv/Studentenverwaltung/List.js   |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index f1ed26fbe..db832b30b 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -165,7 +165,17 @@ class Verband extends FHCAPI_Controller
 		
 		$this->StudiengangModel->addDistinct();
 		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
-		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
+		$this->StudiengangModel->addSelect("CONCAT(
+			UPPER(CONCAT(typ, kurzbz)), 
+			'-', 
+			semester, 
+			(
+				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
+				FROM public.tbl_lehrverband 
+				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
+				ORDER BY verband, gruppe LIMIT 1
+			)
+		) AS name", false);
 
 		$this->StudiengangModel->addSelect('semester');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
@@ -217,7 +227,6 @@ class Verband extends FHCAPI_Controller
 					$list = array_merge($list, $result);
 				}
 			}
-
 		}
 		$this->terminateWithSuccess($list);
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index d9338658f..1f0f7917c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -239,7 +239,6 @@ export default {
 	},
 	methods: {
 		translateTabulator() {
-			let cm = this.$refs.table.tabulator.columnManager;
 			this.$p
 				.loadCategory(['global', 'person', 'lehre', 'ui', 'profilUpdate', 'admission', 'stv'])
 				.then(() => {

From 0a118a1427a8d49f7403e32c12382682ab97cb4f Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 13 Nov 2025 10:50:36 +0100
Subject: [PATCH 0952/1357] Clustered LV-Evaluierung phrases after merge

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 096d5086c..77015ae18 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51467,6 +51467,535 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	// LVEVALUIERUNG ---------------------------------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'abschicken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abschicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'zurueckZumStart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurück zum Start',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Back to Start',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lvevaluierungAbschicken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung abschicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submit Course Evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lvevaluierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextCodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte geben Sie Ihren Code ein, um die Evaluierung zu starten:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please enter your code to start the evaluation:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginCodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierung-Code eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter your Evaluation-Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextLvevaluierung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>Die folgende LV-Evaluierung umfasst</p>
+					</div>
+					<ul class="text-start small">
+						<li>zwei (geschlossene) Pflichtfragen</li>
+						<li>die Möglichkeit, optional zu einzelnen Bereichen konkreteres Feedback zu geben</li>
+						<li>zwei optionale Freitextfragen</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>The following course evaluation includes</p>
+					</div>
+					<ul class="text-start small">
+						<li>two (closed) mandatory questions</li>
+						<li>the opportunity to optionally provide more specific feedback on individual areas</li>
+						<li>two optional free-text questions</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'loginTextAntwortoptionen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>Die Antwortoptionen umfassen 5 Stufen:</p>
+					</div>
+					<ul class="text-start small">
+						<li>Sehr gut</li>
+						<li>Gut</li>
+						<li>Mittel</li>
+						<li>Schlecht</li>
+						<li>Sehr schlecht</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<div class="text-start mb-3">
+						<p>The answer options comprise 5 levels:</p>
+					</div>
+					<ul class="text-start small">
+						<li>Excellent</li>
+						<li>Good</li>
+						<li>Satisfactory</li>
+						<li>Poor</li>
+						<li>Insufficient</li>
+					</ul>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungPeriodeBeendet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Evaluierungszeitraum endete am {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation period was closed on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungPeriodeStartetErst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Evaluierungszeitraum startet erst am {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation period starts on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungEingereicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierung wurde am {date} eingereicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation was submitted on {date}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtMehrVerfuegbar',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Evaluierung ist nicht mehr verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation is no longer available.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtVerfuegbar',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Evaluierung ist nicht verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation is not available yet.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'logoutTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Danke!<br>Was passiert nun mit Ihrem Feedback?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Thank you!<br>What happens to your feedback now?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'logoutText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '
+					<p>Danke, dass Sie sich Zeit für das Feedback genommen haben! Ihre ehrliche und konstruktive Rückmeldung ist essenziell, damit Ihre Lehrenden und Ihre Studiengangsleitung die Lehrveranstaltung immer weiter verbessern und anpassen können!</p>
+					<p>Und was passiert jetzt mit Ihrem Feedback? Die Studiengangsleitung wird die Ergebnisse &amp; Maßnahmen zusammen mit Ihrer Jahrgangsvertretung besprechen. So tragen Sie aktiv dazu bei, die Lehrveranstaltung für zukünftige Semester noch spannender &amp; lehrreicher zu machen!</p>
+					<p>Gemeinsam für mehr Qualität in der Lehre!</p>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '
+					<p>Thank you for taking the time to provide feedback! Your honest and constructive input is essential for your lecturers and degree program director to continuously improve and adapt the course.</p>
+					<p>What happens with your feedback? The degree program director will discuss the results and potential measures together with your academic year representatives. You have thus actively contributed to making the course even more engaging and educational for future semesters!</p>
+					<p>Working together for higher quality in teaching!</p>
+				',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungZeitAbgelaufen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierungszeit ist abgelaufen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Evaluation time is over',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungAntwortenNichtUebermittelt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ihre Antworten wurden nicht übermittelt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your responses were not submitted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungCodeExistiertNicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieser Evaluierungscode exisitiert nicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This evaluation code does not exist',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungNichtAktiv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Evaluierung ist nicht aktiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation is not active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'zeitLaeuftAb',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zeit läuft bald ab – zum Speichern bitte ‚Abschicken‘ klicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Time is running out — please click ‘Submit’ to save your answers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'spracheAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sprache auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select language',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'fhtwLogo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'FH Technikum Wien Logo',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'UAS Technikum Wien Logo',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'evaluierungscodeEingeben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierungscode eingeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enter Evaluation code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'fragebogen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fragebogen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Questionnaire',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 );
 

From 993dff3351bda12dfaf75268a228f6c8005111bb Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 13 Nov 2025 11:11:37 +0100
Subject: [PATCH 0953/1357] Gendered phrase lektorInnen (FHTW style)

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 77015ae18..ac3cba8f4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -13357,13 +13357,13 @@ Any unusual occurrences
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'LektorInnen',
+				'text' => 'Lehrende',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Lectors',
+				'text' => 'Lecturers',
 				'description' => '',
 				'insertvon' => 'system'
 			)

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

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

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

From 65df13ca9fba69bf4a74ecd826d6f806b70198c8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 16:23:04 +0100
Subject: [PATCH 0955/1357] add slot to AppMenu

---
 public/js/components/AppMenu.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/AppMenu.js b/public/js/components/AppMenu.js
index 33d35f8df..9e85debcd 100644
--- a/public/js/components/AppMenu.js
+++ b/public/js/components/AppMenu.js
@@ -64,5 +64,6 @@ export default {
 				{{ menu.description }}
 			</a>
 		</li>
+		<slot />
 	</ul>`
 };

From dbf9547f9c8d61742ecc728c80418a2fb6fdf2e7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 13 Nov 2025 16:23:57 +0100
Subject: [PATCH 0956/1357] add CSS class disabled to AppMenu

---
 public/css/components/AppMenu.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/components/AppMenu.css b/public/css/components/AppMenu.css
index b980c1efc..e142858f8 100644
--- a/public/css/components/AppMenu.css
+++ b/public/css/components/AppMenu.css
@@ -16,11 +16,15 @@
 	padding: .5rem 1rem;
 	text-decoration: none;
 }
+.fhc-app-menu li a.disabled {
+	--bs-link-opacity: .5;
+}
 .fhc-app-menu li a.active,
 .fhc-app-menu li a:hover {
 	--bs-link-color-rgb: var(--bs-link-hover-color-rgb);
 	background: var(--surface-hover);
 }
+.fhc-app-menu li a.disabled,
 .fhc-app-menu li a.active {
 	pointer-events: none;
 }

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

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

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

From cff71ec829eb043552e6585f2cca500089a92219 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 13 Nov 2025 17:16:51 +0100
Subject: [PATCH 0958/1357] AbgabetoolJob notifyStudentMail function to send
 Emails to students about their changed abgabetermine inside the configurable
 threshold;

---
 application/config/abgabe.php                 |   2 +
 .../controllers/api/frontend/v1/Abgabe.php    |  94 ++++++++++-
 .../controllers/jobs/AbgabetoolJob.php        | 151 ++++++++++++++++++
 application/models/crm/Student_model.php      |   8 +
 .../models/education/Paabgabe_model.php       |  18 ++-
 system/phrasesupdate.php                      |  20 +++
 6 files changed, 290 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/jobs/AbgabetoolJob.php

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index e2092a367..beacb2b87 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -7,3 +7,5 @@ $config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/s
 
 $config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
 
+//$config['PAABGABE_EMAIL_THRESHOLD_MS'] = 86400000; // 1 day
+$config['PAABGABE_EMAIL_THRESHOLD_MS'] = 864000000; // 10 day
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 690c2a768..c3dd3f06d 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -42,7 +42,8 @@ class Abgabe extends FHCAPI_Controller
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
 			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-		]);
+			'notifyStudentMail' => self::PERM_LOGGED
+			]);
 
 		$this->load->library('PhrasesLib');
 		$this->load->library('SignatureLib');
@@ -68,7 +69,7 @@ class Abgabe extends FHCAPI_Controller
 				'abgabetool'
 			)
 		);
-
+		$this->load->config('abgabe');
 		$this->load->helper('hlp_sancho_helper');
 	}
 
@@ -997,6 +998,95 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
+	
+	
+	// test method for abgabe nightly email job
+	public function notifyStudentMail()
+	{
+		// send all new projektarbeit abgabe since the last job run to the related student
+
+//		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		
+		$milliseconds = $this->config->item('PAABGABE_EMAIL_THRESHOLD_MS');
+
+		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
+		$retval = getData($result);
+
+		// group results per projektarbeit/student_uid
+		$student_uids = [];
+		forEach($retval as $paabgabe) {
+			if(!isset($student_uids[$paabgabe->student_uid])) {
+				$student_uids[$paabgabe->student_uid] = [];
+			}
+				
+			$student_uids[$paabgabe->student_uid][] = $paabgabe;
+		}
+
+		foreach ($student_uids as $uid => $abgaben) {
+			// $uid is the student's UID
+			$result = $this->StudentModel->getEmailAnredeForStudentUID($uid);
+			$data = getData($result)[0];
+			
+			// $abgabe is the array of paabgabe objects
+			$anredeFillString = $data->anrede=="Herr"?"r":"";
+			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
+
+			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+			// php has spaceships 🚀🚀🚀🚀🚀
+			usort($abgaben, function($a, $b) {
+				return strtotime($a->datum) <=> strtotime($b->datum);
+			});
+			
+			$projektarbeit_titel = $abgaben[0]->titel;
+			$abgabenString = '<br /><br />';
+			forEach($abgaben as $abgabe) {
+				$datetime = new DateTime($abgabe->datum);
+				$dateEmailFormatted = $datetime->format('d.m.Y');
+				
+				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
+			}
+
+			// Link to Entschuldigungsmanagement
+			if(defined('CIS4') && CIS4) {
+				$ci3BootstrapFilePath = "cis.php";
+			} else {
+				$ci3BootstrapFilePath = "index.ci.php";
+			}
+			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
+
+//			$linkAbgabetool = '';
+			$body_fields = array(
+				'anrede' => $data->anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'paTitel' => $projektarbeit_titel,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+			
+			// send email with bundled info
+			sendSanchoMail(
+				'paabgabeUpdatesSammelmail',
+				$body_fields,
+				$uid.'@'.DOMAIN,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+			
+		}
+
+		$this->terminateWithSuccess(
+			array(
+				'student_uids' => $student_uids,
+				'result' => $result,
+				'body_fields' => $body_fields
+			)
+		);
+		
+	}
+
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
 			return;
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
new file mode 100644
index 000000000..24c32db11
--- /dev/null
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -0,0 +1,151 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class AbgabetoolJob extends JOB_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->helper('hlp_sancho_helper');
+		
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		// signatur fehlt mail
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		
+		
+		// 2. begutachter mail
+		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+
+		$this->loadPhrases([
+			'abgabetool'
+		]);
+		
+//		$this->_ci->load->model('extensions/FHC-Core-Anwesenheiten/QR_model', 'QRModel');
+//		$this->_ci->load->config('extensions/FHC-Core-Anwesenheiten/qrsettings');
+	}
+
+
+
+	public function notifyBetreuerMail()
+	{
+		// send all new projektarbeit abgabe since the lat job run to the related betreuer
+		
+//		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+
+		$milliseconds = $this->_ci->config->item('PAABGABE_UPDATEAMUM_EMAIL_THRESHOLD_MILLISECONDS');
+
+		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
+		$retval = getData($result);
+
+		// group results per projektarbeit/student_uid
+		$student_uids = [];
+		forEach($retval as $paabgabe) {
+			if(!in_array($paabgabe->student_uid, $student_uids, true)) {
+				$student_uids[$paabgabe->student_uid] = [$paabgabe];
+			} else {
+				$student_uids[$paabgabe->student_uid][] = $paabgabe;
+			}
+		}
+		
+		
+		
+		// send emails with bundled info
+		
+//		$rows_affected = $this->QRModel->db->affected_rows();
+//
+//		if (isError($result))
+//		{
+//			$this->logError(getError($result), $milliseconds);
+//		} else {
+//			$this->logInfo($rows_affected." QR Codes deleted.");
+//		}
+//
+//		$this->logInfo('End job queue scheduler FHC-Core->notifyBetreuerMail');
+	}
+
+	public function notifyStudentMail()
+	{
+		// send all new projektarbeit abgabe since the last job run to the related student
+
+		$this->logInfo('Start job queue scheduler FHC-Core->notifyStudentMail');
+
+		$milliseconds = $this->_ci->config->item('PAABGABE_EMAIL_THRESHOLD_MS');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
+		$retval = getData($result);
+
+		// group results per projektarbeit/student_uid
+		$student_uids = [];
+		forEach($retval as $paabgabe) {
+			if(!isset($student_uids[$paabgabe->student_uid])) {
+				$student_uids[$paabgabe->student_uid] = [];
+			}
+
+			$student_uids[$paabgabe->student_uid][] = $paabgabe;
+		}
+
+		foreach ($student_uids as $uid => $abgaben) {
+			// $uid is the student's UID
+			$result = $this->_ci->StudentModel->getEmailAnredeForStudentUID($uid);
+			$data = getData($result)[0];
+
+			// $abgabe is the array of paabgabe objects
+			$anredeFillString = $data->anrede=="Herr"?"r":"";
+			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
+
+			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+			// php has spaceships 🚀🚀🚀🚀🚀
+			usort($abgaben, function($a, $b) {
+				return strtotime($a->datum) <=> strtotime($b->datum);
+			});
+
+			$projektarbeit_titel = $abgaben[0]->titel;
+			$abgabenString = '<br /><br />';
+			forEach($abgaben as $abgabe) {
+				$datetime = new DateTime($abgabe->datum);
+				$dateEmailFormatted = $datetime->format('d.m.Y');
+
+				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
+			}
+
+			// TODO: check this config flag in job context
+			// Link to Entschuldigungsmanagement
+			if(defined('CIS4') && CIS4) {
+				$ci3BootstrapFilePath = "cis.php";
+			} else {
+				$ci3BootstrapFilePath = "index.ci.php";
+			}
+			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
+			
+			$body_fields = array(
+				'anrede' => $data->anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'paTitel' => $projektarbeit_titel,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			// send email with bundled info
+			sendSanchoMail(
+				'paabgabeUpdatesSammelmail',
+				$body_fields,
+				$uid.'@'.DOMAIN,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+		}
+
+		$this->logInfo('End job queue scheduler FHC-Core->notifyStudentMail');
+	}
+}
\ No newline at end of file
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 539c3cf56..19e57b6dc 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -279,4 +279,12 @@ class Student_model extends DB_Model
 	{
 		return $student_uid . '@' . DOMAIN;
 	}
+	
+	public function getEmailAnredeForStudentUID($student_uid) {
+		$qry = "SELECT anrede, titelpre, vorname, vornamen, nachname, titelpost
+				FROM campus.vw_student 
+				WHERE uid = ?";
+
+		return $this->execReadOnlyQuery($qry, array($student_uid));
+	}
 }
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 343a86706..e2ccfaaca 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -60,5 +60,21 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
-	
+
+	public function findAbgabenNewOrUpdatedSince($milliseconds)
+	{
+		$interval = $milliseconds . ' milliseconds';
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel
+				FROM campus.tbl_paabgabe 
+					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+				
+				WHERE campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+					OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?
+	";
+
+		return $this->execQuery($query, [$interval, $interval]);
+	}
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b395636b7..cf4262333 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44048,6 +44048,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'changedAbgabeterminev2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Updates: Abgabetermine Bachelor-/Masterarbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Updates: Deadlines Bachelor's-/Master's Thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From f89a53b156e5afe90bb432253073b480a901651f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 17 Nov 2025 11:47:00 +0100
Subject: [PATCH 0965/1357] fix getProjektbetreuerAnrede function since
 betreuer are not necessarily mitarbeiter with such an uid; notify students
 config from milliseconds to pgsql interval '1 day'; ported notifyBetreuerMail
 & notifyStudentMail to AbgabetoolJob.php;

---
 application/config/abgabe.php                 |   3 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 396 ++++++++++--------
 .../controllers/jobs/AbgabetoolJob.php        | 125 ++++--
 .../models/education/Paabgabe_model.php       |  23 +-
 .../models/education/Projektarbeit_model.php  |   9 +-
 5 files changed, 338 insertions(+), 218 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index beacb2b87..9265c70be 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -7,5 +7,4 @@ $config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/s
 
 $config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
 
-//$config['PAABGABE_EMAIL_THRESHOLD_MS'] = 86400000; // 1 day
-$config['PAABGABE_EMAIL_THRESHOLD_MS'] = 864000000; // 10 day
\ No newline at end of file
+$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c3dd3f06d..f25b30e83 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -41,8 +41,9 @@ class Abgabe extends FHCAPI_Controller
 			'getNoten' => self::PERM_LOGGED,
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
-			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'notifyStudentMail' => self::PERM_LOGGED
+			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
+//			'notifyStudentMail' => self::PERM_LOGGED,
+//			'notifyBetreuerMail' => self::PERM_LOGGED
 			]);
 
 		$this->load->library('PhrasesLib');
@@ -396,6 +397,17 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
 		}
 
+		// Link to Abgabetool
+		if (defined('CIS4') && CIS4) {
+			$ci3BootstrapFilePath = "cis.php";
+		} else {
+			$ci3BootstrapFilePath = "index.ci.php";
+		}
+		$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
+
+		$this->addMeta('betreuerArray', $resBetr->retval);
+		
+		// getProjektbetreuerAnrede fetches distinct on person_id, so there should be one row. zweitbetreuer is handled seperately afterwards 
 		foreach($resBetr->retval as $betreuerRow) {
 
 			// query student benutzer view for every betreuer row
@@ -415,7 +427,7 @@ class Abgabe extends FHCAPI_Controller
 			$maildata['student_anrede'] = $studentUser->anrede;
 			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
 			$maildata['abgabetyp'] = $abgabetyp;
-			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
+			$maildata['parbeituebersichtlink'] = "<p><a href='$url'>Zur Projektarbeitsübersicht</a></p>";
 			$maildata['bewertunglink'] = $projektarbeitIsCurrent && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
 			$maildata['token'] = "";
 			
@@ -424,38 +436,20 @@ class Abgabe extends FHCAPI_Controller
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
 
 			$this->addMeta('$maildata', $maildata);
-			// TODO: dont acutally send the mail but save it somewhere for job to send later?
-			$sanchoData = array('ParbeitsbeurteilungEndupload', $maildata, $email, $subject, 'sancho_header_min_bw.jpg', 'sancho_footer_min_bw.jpg', get_uid()."@".DOMAIN);
-			
-//			$this->logLib->logInfoDB(
-//				array(
-//					'zwischenupload',
-//					$sanchoData, 
-//					array(
-//						'abgabedatum' => date('Y-m-d'),
-//						'updatevon' => getAuthUID(),
-//						'updateamum' => date('Y-m-d H:i:s')
-//					),
-//					getAuthUID(),
-//					getAuthPersonId(),
-//					$student_uid
-//				)
-//			);
 
+			$mailres = sendSanchoMail(
+				'ParbeitsbeurteilungEndupload',
+				$maildata,
+				$email,
+				$subject,
+				'sancho_header_min_bw.jpg',
+				'sancho_footer_min_bw.jpg',
+				get_uid()."@".DOMAIN);
 
-//			$mailres = sendSanchoMail(
-//				'ParbeitsbeurteilungEndupload',
-//				$maildata,
-//				$email,
-//				$subject,
-//				'sancho_header_min_bw.jpg',
-//				'sancho_footer_min_bw.jpg',
-//				get_uid()."@".DOMAIN);
-
-//			if(!$mailres)
-//			{
-//				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-//			}
+			if(!$mailres)
+			{
+				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			}
 
 			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
 			if ($paabgabetyp_kurzbz == 'end')
@@ -468,7 +462,6 @@ class Abgabe extends FHCAPI_Controller
 				
 				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
 				{
-//					$zweitbegutachterResults = $zweitbegutachterRetval[0];
 
 					foreach ($zweitbegutachterRetval as $begutachter)
 					{
@@ -482,56 +475,50 @@ class Abgabe extends FHCAPI_Controller
 						
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
 						
-						$this->addMeta('$begutachterMitTokenRes', $begutachterMitTokenRetval);
+						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
 						
-//						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
-
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
 							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
 						}
-
-						// was this check ever necessary?
-//						// Email an Zweitbegutachter senden
-//						if (isset($zweitbegutachterMitToken->result[0]))
-//						{
-							$begutachterMitToken = $begutachterMitTokenRetval[0];
-
-							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
-							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-							$intern = isset($begutachterMitToken->uid);
-							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
-
-							$zweitbetmaildata = array();
-							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
-							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
-							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
-							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
-							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
-							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
-							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
-							$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
-							$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-							
-							$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
-							
-//							TODO: persist email event somehow, let job bundle the updates later?
-//							$mailres = sendSanchoMail(
-//								'ParbeitsbeurteilungEndupload',
-//								$zweitbetmaildata,
-//								$begutachterMitToken->email,
-//								$subject,
-//								'sancho_header_min_bw.jpg',
-//								'sancho_footer_min_bw.jpg',
-//								get_uid()."@".DOMAIN
-//							);
-//
-//							if (!$mailres)
-//							{
-//								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-//							}
 						
+						$begutachterMitToken = $begutachterMitTokenRetval[0];
+
+						$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
+						$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
+						$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+						$intern = isset($begutachterMitToken->uid);
+						$mail_link = $intern ? $mail_fulllink : $mail_baselink;
+
+						$zweitbetmaildata = array();
+						$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
+						$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
+						$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
+						$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
+						$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
+						$zweitbetmaildata['abgabetyp'] = $abgabetyp;
+						$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
+						$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+						$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+						
+						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
+						
+//							TODO: persist email event somehow, let job bundle the updates later?
+						$mailres = sendSanchoMail(
+							'ParbeitsbeurteilungEndupload',
+							$zweitbetmaildata,
+							$begutachterMitToken->email,
+							$subject,
+							'sancho_header_min_bw.jpg',
+							'sancho_footer_min_bw.jpg',
+							get_uid()."@".DOMAIN
+						);
+
+						if (!$mailres)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+						}
+					
 					}
 				}
 			}
@@ -998,94 +985,171 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
-	
-	
-	// test method for abgabe nightly email job
-	public function notifyStudentMail()
-	{
-		// send all new projektarbeit abgabe since the last job run to the related student
-
-//		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		
-		$milliseconds = $this->config->item('PAABGABE_EMAIL_THRESHOLD_MS');
-
-		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
-		$retval = getData($result);
-
-		// group results per projektarbeit/student_uid
-		$student_uids = [];
-		forEach($retval as $paabgabe) {
-			if(!isset($student_uids[$paabgabe->student_uid])) {
-				$student_uids[$paabgabe->student_uid] = [];
-			}
-				
-			$student_uids[$paabgabe->student_uid][] = $paabgabe;
-		}
-
-		foreach ($student_uids as $uid => $abgaben) {
-			// $uid is the student's UID
-			$result = $this->StudentModel->getEmailAnredeForStudentUID($uid);
-			$data = getData($result)[0];
-			
-			// $abgabe is the array of paabgabe objects
-			$anredeFillString = $data->anrede=="Herr"?"r":"";
-			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
-
-			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
-			// php has spaceships 🚀🚀🚀🚀🚀
-			usort($abgaben, function($a, $b) {
-				return strtotime($a->datum) <=> strtotime($b->datum);
-			});
-			
-			$projektarbeit_titel = $abgaben[0]->titel;
-			$abgabenString = '<br /><br />';
-			forEach($abgaben as $abgabe) {
-				$datetime = new DateTime($abgabe->datum);
-				$dateEmailFormatted = $datetime->format('d.m.Y');
-				
-				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
-			}
-
-			// Link to Entschuldigungsmanagement
-			if(defined('CIS4') && CIS4) {
-				$ci3BootstrapFilePath = "cis.php";
-			} else {
-				$ci3BootstrapFilePath = "index.ci.php";
-			}
-			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
-
-//			$linkAbgabetool = '';
-			$body_fields = array(
-				'anrede' => $data->anrede,
-				'anredeFillString' => $anredeFillString,
-				'fullFormattedNameString' => $fullFormattedNameString,
-				'paTitel' => $projektarbeit_titel,
-				'abgabenString' => $abgabenString,
-				'linkAbgabetool' => $url
-			);
-			
-			// send email with bundled info
-			sendSanchoMail(
-				'paabgabeUpdatesSammelmail',
-				$body_fields,
-				$uid.'@'.DOMAIN,
-				$this->p->t('abgabetool', 'changedAbgabeterminev2')
-			);
-			
-		}
-
-		$this->terminateWithSuccess(
-			array(
-				'student_uids' => $student_uids,
-				'result' => $result,
-				'body_fields' => $body_fields
-			)
-		);
-		
-	}
+//	public function notifyBetreuerMail() {
+//		// send all new projektarbeit abgabe UPLOADS since the last job run to the related betreuer
+//		// this job gathers all new or changed file uploads via field 'abgabedatum', enduploads still
+//		// send an email directly after happening since they are kind of important
+//
+////		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+//		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+//		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+//		$this->load->model('crm/Student_model', 'StudentModel');
+//		
+//		$interval = $this->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+//
+//		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
+//		$retval = getData($result);
+//
+//		// retval are paabgaben joined with projektarbeit and betreuer
+//		if(count($retval) == 0) return; // TODO: terminate appropriately
+//		
+//		// group contents per betreuer person_id
+//		$betreuer_uids = [];
+//		forEach($retval as $paabgabe) {
+//			if(!isset($betreuer_uids[$paabgabe->person_id])) {
+//				$betreuer_uids[$paabgabe->person_id] = [];
+//			}
+//
+//			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
+//		}
+//
+//		forEach ($betreuer_uids as $person_id => $abgaben) {
+//			// $person_id is from betreuer
+//
+//			$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
+//			$data = getData($result)[0];
+//
+//			// $abgabe is the array of paabgabe objects
+//			$anrede = $data->anrede;
+//			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+//			$fullFormattedNameString = $data->first;
+//
+//			$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($paabgabe->projektarbeit_id);
+//			$data = getData($result)[0];
+//			
+//			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+//			// php has spaceships 🚀🚀🚀🚀🚀
+//			usort($abgaben, function ($a, $b) {
+//				return strtotime($a->datum) <=> strtotime($b->datum);
+//			});
+//
+//			$projektarbeit_titel = $abgaben[0]->titel;
+//			$abgabenString = '<br /><br />';
+//			foreach ($abgaben as $abgabe) {
+//				$datetime = new DateTime($abgabe->datum);
+//				$dateEmailFormatted = $datetime->format('d.m.Y');
+//
+//				$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
+//				$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+//
+//				$abgabenString .= 'Abgabedatum: '.$abgabedatumFormatted.' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ' . $abgabe->kurzbz . '<br />';
+//			}
+//
+//			// Link to Abgabetool
+//			if (defined('CIS4') && CIS4) {
+//				$ci3BootstrapFilePath = "cis.php";
+//			} else {
+//				$ci3BootstrapFilePath = "index.ci.php";
+//			}
+//			$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
+//			
+//			$body_fields = array(
+//				'anrede' => $anrede,
+//				'anredeFillString' => $anredeFillString,
+//				'fullFormattedNameString' => $fullFormattedNameString,
+//				'paTitel' => $projektarbeit_titel,
+//				'abgabenString' => $abgabenString,
+//				'linkAbgabetool' => $url
+//			);
+//
+//			// send email with bundled info
+//			sendSanchoMail(
+//				'paabgabeUpdatesBetSM',
+//				$body_fields,
+//				$data->private_email,
+//				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+//			);
+//		}
+//	}
+//	
+//	public function notifyStudentMail()
+//	{
+//		// send all new projektarbeit abgabe since the last job run to the related student
+//
+////		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+//		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+//		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+//		$this->load->model('crm/Student_model', 'StudentModel');
+//		
+//		$interval = $this->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+//
+//		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+//		$retval = getData($result);
+//
+//		if(count($retval) == 0) return; // TODO: terminate appropriately
+//		
+//		// group results per projektarbeit/student_uid
+//		$student_uids = [];
+//		forEach($retval as $paabgabe) {
+//			if(!isset($student_uids[$paabgabe->student_uid])) {
+//				$student_uids[$paabgabe->student_uid] = [];
+//			}
+//				
+//			$student_uids[$paabgabe->student_uid][] = $paabgabe;
+//		}
+//
+//		foreach ($student_uids as $uid => $abgaben) {
+//			// $uid is the student's UID
+//			$result = $this->StudentModel->getEmailAnredeForStudentUID($uid);
+//			$data = getData($result)[0];
+//			
+//			// $abgabe is the array of paabgabe objects
+//			$anredeFillString = $data->anrede=="Herr"?"r":"";
+//			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
+//
+//			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+//			// php has spaceships 🚀🚀🚀🚀🚀
+//			usort($abgaben, function($a, $b) {
+//				return strtotime($a->datum) <=> strtotime($b->datum);
+//			});
+//			
+//			$projektarbeit_titel = $abgaben[0]->titel;
+//			$abgabenString = '<br /><br />';
+//			forEach($abgaben as $abgabe) {
+//				$datetime = new DateTime($abgabe->datum);
+//				$dateEmailFormatted = $datetime->format('d.m.Y');
+//				
+//				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
+//			}
+//
+//			// Link to Entschuldigungsmanagement
+//			if(defined('CIS4') && CIS4) {
+//				$ci3BootstrapFilePath = "cis.php";
+//			} else {
+//				$ci3BootstrapFilePath = "index.ci.php";
+//			}
+//			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
+//
+////			$linkAbgabetool = '';
+//			$body_fields = array(
+//				'anrede' => $data->anrede,
+//				'anredeFillString' => $anredeFillString,
+//				'fullFormattedNameString' => $fullFormattedNameString,
+//				'paTitel' => $projektarbeit_titel,
+//				'abgabenString' => $abgabenString,
+//				'linkAbgabetool' => $url
+//			);
+//			
+//			// send email with bundled info
+//			sendSanchoMail(
+//				'paabgabeUpdatesSammelmail',
+//				$body_fields,
+//				$uid.'@'.DOMAIN,
+//				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+//			);
+//			
+//		}
+//	}
 
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 24c32db11..17eff0f74 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -15,76 +15,117 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci =& get_instance();
 
 		$this->_ci->load->helper('hlp_sancho_helper');
-		
+
 		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
-
-		// signatur fehlt mail
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
-		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		
-		
-		// 2. begutachter mail
-		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
 
 		$this->loadPhrases([
 			'abgabetool'
 		]);
-		
-//		$this->_ci->load->model('extensions/FHC-Core-Anwesenheiten/QR_model', 'QRModel');
-//		$this->_ci->load->config('extensions/FHC-Core-Anwesenheiten/qrsettings');
 	}
 
 
 
-	public function notifyBetreuerMail()
-	{
-		// send all new projektarbeit abgabe since the lat job run to the related betreuer
-		
-//		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+	public function notifyBetreuerMail() {
+		// send all new projektarbeit abgabe UPLOADS since the last job run to the related betreuer
+		// this job gathers all new or changed file uploads via field 'abgabedatum', enduploads still
+		// send an email directly after happening since they are kind of important
 
-		$milliseconds = $this->_ci->config->item('PAABGABE_UPDATEAMUM_EMAIL_THRESHOLD_MILLISECONDS');
+		$this->_ci->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
 
-		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
 		$retval = getData($result);
 
-		// group results per projektarbeit/student_uid
-		$student_uids = [];
+		// retval are paabgaben joined with projektarbeit and betreuer
+		if(count($retval) == 0) return; // TODO: terminate appropriately
+
+		// group contents per betreuer person_id
+		$betreuer_uids = [];
 		forEach($retval as $paabgabe) {
-			if(!in_array($paabgabe->student_uid, $student_uids, true)) {
-				$student_uids[$paabgabe->student_uid] = [$paabgabe];
-			} else {
-				$student_uids[$paabgabe->student_uid][] = $paabgabe;
+			if(!isset($betreuer_uids[$paabgabe->person_id])) {
+				$betreuer_uids[$paabgabe->person_id] = [];
 			}
+
+			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
 		}
-		
-		
-		
-		// send emails with bundled info
-		
-//		$rows_affected = $this->QRModel->db->affected_rows();
-//
-//		if (isError($result))
-//		{
-//			$this->logError(getError($result), $milliseconds);
-//		} else {
-//			$this->logInfo($rows_affected." QR Codes deleted.");
-//		}
-//
-//		$this->logInfo('End job queue scheduler FHC-Core->notifyBetreuerMail');
+
+		forEach ($betreuer_uids as $person_id => $abgaben) {
+			// $person_id is from betreuer
+
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
+			$data = getData($result)[0];
+
+			// $abgabe is the array of paabgabe objects
+			$anrede = $data->anrede;
+			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $data->first;
+
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerEmail($paabgabe->projektarbeit_id);
+			$data = getData($result)[0];
+
+			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
+			// php has spaceships 🚀🚀🚀🚀🚀
+			usort($abgaben, function ($a, $b) {
+				return strtotime($a->datum) <=> strtotime($b->datum);
+			});
+
+			$projektarbeit_titel = $abgaben[0]->titel;
+			$abgabenString = '<br /><br />';
+			foreach ($abgaben as $abgabe) {
+				$datetime = new DateTime($abgabe->datum);
+				$dateEmailFormatted = $datetime->format('d.m.Y');
+
+				$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
+				$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+
+				$abgabenString .= 'Abgabedatum: '.$abgabedatumFormatted.' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ' . $abgabe->kurzbz . '<br />';
+			}
+
+			// Link to Abgabetool
+			if (defined('CIS4') && CIS4) {
+				$ci3BootstrapFilePath = "cis.php";
+			} else {
+				$ci3BootstrapFilePath = "index.ci.php";
+			}
+			$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'paTitel' => $projektarbeit_titel,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			// send email with bundled info
+			sendSanchoMail(
+				'paabgabeUpdatesBetSM',
+				$body_fields,
+				$data->private_email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+		}
+
+		$this->_ci->logInfo('End job queue scheduler FHC-Core->notifyBetreuerMail');
 	}
 
 	public function notifyStudentMail()
 	{
 		// send all new projektarbeit abgabe since the last job run to the related student
 
-		$this->logInfo('Start job queue scheduler FHC-Core->notifyStudentMail');
+		$this->_ci->logInfo('Start job queue scheduler FHC-Core->notifyStudentMail');
 
-		$milliseconds = $this->_ci->config->item('PAABGABE_EMAIL_THRESHOLD_MS');
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($milliseconds);
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
 		$retval = getData($result);
 
+		if(count($retval) == 0) return; // TODO: terminate appropriately
+		
 		// group results per projektarbeit/student_uid
 		$student_uids = [];
 		forEach($retval as $paabgabe) {
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index e2ccfaaca..9edfc68ac 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -61,9 +61,9 @@ class Paabgabe_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
 
-	public function findAbgabenNewOrUpdatedSince($milliseconds)
+	public function findAbgabenNewOrUpdatedSince($interval)
 	{
-		$interval = $milliseconds . ' milliseconds';
+
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
 					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel
@@ -77,4 +77,23 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($query, [$interval, $interval]);
 	}
+
+	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
+
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id
+				FROM campus.tbl_paabgabe 
+					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+					JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				
+				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?
+				ORDER BY abgabedatum DESC
+	";
+
+		return $this->execQuery($query, [$interval]);
+	}
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 9def13ddb..bd1a06b60 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -204,12 +204,9 @@ class Projektarbeit_model extends DB_Model
 	}
 
 	public function getProjektbetreuerAnrede($bperson_id) {
-		$qry_betr="SELECT DISTINCT trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
-						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
-						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
-						LEFT JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
-						LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
-						WHERE public.tbl_person.person_id= ?";
+		$qry_betr="SELECT DISTINCT ON(public.tbl_person.person_id) trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first, anrede
+			FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+			WHERE public.tbl_person.person_id= ?";
 
 		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
 	}

From 1120b823d2753145dbb326b743f75920cb646e40 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 17 Nov 2025 12:06:07 +0100
Subject: [PATCH 0966/1357] log email count and early job termination in case
 of new events to notify for

---
 .../controllers/jobs/AbgabetoolJob.php        | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 17eff0f74..c38306240 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -40,7 +40,10 @@ class AbgabetoolJob extends JOB_Controller
 		$retval = getData($result);
 
 		// retval are paabgaben joined with projektarbeit and betreuer
-		if(count($retval) == 0) return; // TODO: terminate appropriately
+		if(count($retval) == 0) {
+			$this->logInfo("Keine Emails an Betreuer versandt");
+			return;
+		}
 
 		// group contents per betreuer person_id
 		$betreuer_uids = [];
@@ -52,6 +55,7 @@ class AbgabetoolJob extends JOB_Controller
 			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
 		}
 
+		$count = 0;
 		forEach ($betreuer_uids as $person_id => $abgaben) {
 			// $person_id is from betreuer
 
@@ -108,8 +112,11 @@ class AbgabetoolJob extends JOB_Controller
 				$data->private_email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
 			);
+			
+			$count++;
 		}
-
+		
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
 		$this->_ci->logInfo('End job queue scheduler FHC-Core->notifyBetreuerMail');
 	}
 
@@ -124,7 +131,10 @@ class AbgabetoolJob extends JOB_Controller
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
 		$retval = getData($result);
 
-		if(count($retval) == 0) return; // TODO: terminate appropriately
+		if(count($retval) == 0) {
+			$this->logInfo("Keine Emails an Studenten versandt");
+			return;
+		}
 		
 		// group results per projektarbeit/student_uid
 		$student_uids = [];
@@ -136,6 +146,7 @@ class AbgabetoolJob extends JOB_Controller
 			$student_uids[$paabgabe->student_uid][] = $paabgabe;
 		}
 
+		$count = 0;
 		foreach ($student_uids as $uid => $abgaben) {
 			// $uid is the student's UID
 			$result = $this->_ci->StudentModel->getEmailAnredeForStudentUID($uid);
@@ -185,8 +196,12 @@ class AbgabetoolJob extends JOB_Controller
 				$uid.'@'.DOMAIN,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
 			);
+
+			$count++;
+			
 		}
 
-		$this->logInfo('End job queue scheduler FHC-Core->notifyStudentMail');
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job queue scheduler FHC-Core->notifyStudentMail');
 	}
 }
\ No newline at end of file

From 03b31820009b264d5d1bbca11c462cfa63aa5159 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 17 Nov 2025 13:09:16 +0100
Subject: [PATCH 0967/1357] adding Notenspiegel to AppMenu

---
 .../js/components/Stv/Studentenverwaltung.js  | 64 ++++++++++++++-
 system/phrasesupdate.php                      | 80 +++++++++++++++++++
 2 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 06bb07aec..05325346a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -133,6 +133,44 @@ export default {
 			verbandEndpoint: ApiStvVerband
 		}
 	},
+	computed: {
+		appMenuExtraItems() {
+			const extraItems = [];
+
+			if (this.studiengangKz !== undefined && this.selected_semester !== undefined) {
+				const studiengang_kz = String(this.studiengangKz);
+				const semester = String(this.selected_semester);
+				const orgform = this.selected_orgform || '';
+
+				extraItems.push({
+					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+						+ 'content/statistik/notenspiegel.php?type=xls'
+						+ '&studiengang_kz=' + studiengang_kz
+						+ '&semester=' + semester
+						+ '&orgform=' + orgform,
+					description: 'stv/grade_report_xls'
+				});
+				extraItems.push({
+					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+						+ 'content/statistik/notenspiegel_erweitert.php?typ=xls'
+						+ '&studiengang_kz=' + studiengang_kz
+						+ '&semester=' + semester
+						+ '&orgform=' + orgform,
+					description: 'stv/grade_report_xls_extended'
+				});
+				extraItems.push({
+					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
+						+ 'content/statistik/notenspiegel.php?type=html'
+						+ '&studiengang_kz=' + studiengang_kz
+						+ '&semester=' + semester
+						+ '&orgform=' + orgform,
+					description: 'stv/grade_report_html'
+				});
+			}
+
+			return extraItems;
+		}
+	},
 	watch: {
 		'url_studiensemester_kurzbz': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
@@ -393,7 +431,31 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<div class="offcanvas-body">
-						<app-menu app-identifier="stv" />
+						<app-menu app-identifier="stv">
+							<li class="dropend">
+								<a
+									class="dropdown-toggle"
+									href="#"
+									role="button"
+									data-bs-toggle="dropdown"
+									aria-expanded="false"
+									:class="{ disabled: !appMenuExtraItems.length }"
+									data-bs-popper-config='{"strategy":"fixed"}'
+								>
+									{{ $p.t('stv/grade_report') }}
+								</a>
+								<ul class="dropdown-menu p-0">
+									<li
+										v-for="(item, key) in appMenuExtraItems"
+										:key="key"
+									>
+										<a class="dropdown-item" :href="item.link" target="_blank">
+											{{ $p.t(item.description) }}
+										</a>
+									</li>
+								</ul>
+							</li>
+						</app-menu>
 					</div>
 				</aside>
 				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 096d5086c..1aa1089b2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38720,6 +38720,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'grade_report',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notenspiegel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade report',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'grade_report_xls',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notenspiegel EXCEL',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade report EXCEL',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'grade_report_xls_extended',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notenspiegel erweitert EXCEL',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade report extended EXCEL',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'grade_report_html',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notenspiegel HTML',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grade report HTML',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From ad7012367cff5ef8a4854e23ec05f93810d7641c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 17 Nov 2025 14:52:58 +0100
Subject: [PATCH 0968/1357] added Link to company management in project work
 management

---
 .../Details/Projektarbeit/Details.js          | 34 ++++++++++++-------
 .../Details/Projektarbeit/Projektarbeit.js    |  4 +--
 system/phrasesupdate.php                      | 20 +++++++++++
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index a51342c7c..63b80ba37 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -40,6 +40,9 @@ export default {
 			}
 
 			return lehreinheiten;
+		},
+		firmenverwaltungLink(){
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'vilesci/stammdaten/firma_frameset.html';
 		}
 	},
 	props: {
@@ -255,18 +258,25 @@ export default {
 
 
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-projektarbeit-firma"
-						:label="$p.t('projektarbeit', 'firma')"
-						type="autocomplete"
-						optionLabel="name"
-						v-model="formData.firma"
-						name="firma"
-						:suggestions="filteredFirmen"
-						@complete="searchFirma"
-						:min-length="3"
-						>
-					</form-input>
+					<div class="col-10">
+						<form-input
+							container-class="stv-details-projektarbeit-firma"
+							:label="$p.t('projektarbeit', 'firma')"
+							type="autocomplete"
+							optionLabel="name"
+							v-model="formData.firma"
+							name="firma"
+							:suggestions="filteredFirmen"
+							@complete="searchFirma"
+							:min-length="3"
+							>
+						</form-input>
+					</div>
+					<div class="col-2 align-content-center">
+						<a :href="firmenverwaltungLink" target="_blank">
+							{{ $p.t('projektarbeit', 'zurFirmenverwaltung') }}
+						</a>
+					</div>
 				</div>
 
 				<div class="row mb-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index d4f941e4b..31be69ff8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -396,8 +396,8 @@ export default {
 
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
-					<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
-					<button v-if="!statusNew && activeTab == 'details'" class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-if="statusNew" class="btn btn-primary" @click="addNewProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-if="!statusNew && activeTab == 'details'" class="btn btn-primary" @click="updateProjektarbeit()"> {{$p.t('ui', 'speichern')}}</button>
 			</template>
 
 		</bs-modal>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7752042a0..257b05c03 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51645,6 +51645,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'zurFirmenverwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zur Firmenverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Company management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
 	array(

From 6cd0e3a57451a6d94eb801ce5a98446e41793d6e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 17 Nov 2025 15:57:53 +0100
Subject: [PATCH 0969/1357] email tbl_vorlage inserts dbupdate script;
 index.ci.php/Abgabetool/Assistenz/stg_kz? optional param route in old cis &
 cis4; no data placeholder phrase fix;

---
 application/config/routes.php                 |  3 +-
 application/controllers/Cis/Abgabetool.php    | 13 +--
 application/views/Cis/Abgabetool.php          |  5 +-
 public/js/apps/Abgabetool/Abgabetool.js       | 12 ++-
 public/js/apps/Dashboard/Fhc.js               |  2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  4 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 85 +++++++------------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  5 +-
 .../Cis/Abgabetool/StatusLegende.js           |  2 +-
 .../61164_abgabetool_quality_gates.php        | 46 +++++++++-
 system/phrasesupdate.php                      |  2 +-
 11 files changed, 104 insertions(+), 75 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 11315f47d..e561753ba 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -66,9 +66,10 @@ $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
 
 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
+$route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
 $route['Abgabetool/Mitarbeiter'] = 'Cis/Abgabetool/Mitarbeiter';
 $route['Abgabetool/Student'] = 'Cis/Abgabetool/Student';
-$route['Abgabetool/Student/.*'] = 'Cis/Abgabetool/Student/$1';
+$route['Abgabetool/Student/(:any)'] = 'Cis/Abgabetool/Student/$1';
 $route['Abgabetool/Deadlines'] = 'Cis/Abgabetool/Deadlines';
 
 // Studierendenverwaltung List Routes
diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 6bf7d951c..04338b1a9 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -29,7 +29,7 @@ class Abgabetool extends Auth_Controller
 	 */
 	public function index()
 	{
-		// TODO: do we even need this?
+		// TODO: routing from index based on berechtigung?
 
 		$viewData = array(
 			'uid'=>getAuthUID(),
@@ -44,12 +44,9 @@ class Abgabetool extends Auth_Controller
 
 	public function Student($student_uid_prop = '')
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
-
-		
 		
 		if(defined('CIS4') && CIS4) {
 			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
@@ -60,7 +57,6 @@ class Abgabetool extends Auth_Controller
 
 	public function Mitarbeiter()
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
@@ -72,9 +68,9 @@ class Abgabetool extends Auth_Controller
 		}
 	}
 
-	public function Assistenz()
+	public function Assistenz($stg_kz_prop = '')
 	{
-
+		
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
@@ -82,13 +78,12 @@ class Abgabetool extends Auth_Controller
 		if(defined('CIS4') && CIS4) {
 			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
 		} else {
-			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz']);
+			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
 	}
 	
 	public function Deadlines()
 	{
-
 		$viewData = array(
 			'uid'=>getAuthUID(),
 		);
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 2e1daf2cd..1d53cfa77 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -37,7 +37,10 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" route=<?php echo json_encode($route) ?> uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '' ?>>
+<div id="abgabetoolroot" class="h-100" route=<?php echo json_encode($route) ?> 
+	uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '""' ?>
+	stg_kz_prop=<?php echo $stg_kz_prop ?? '""' ?>
+	>
 
 </div>
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
index ac73779e8..9d9e34214 100644
--- a/public/js/apps/Abgabetool/Abgabetool.js
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -1,6 +1,7 @@
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import {capitalize} from "../../helpers/StringHelpers.js";
 
@@ -9,13 +10,15 @@ const app = Vue.createApp({
 	components: {
 		AbgabetoolStudent,
 		AbgabetoolMitarbeiter,
+		AbgabetoolAssistenz,
 		DeadlineOverview
 	},
 	data: function() {
 		return {
 			comp: null,
 			uid: null,
-			student_uid: null
+			student_uid: null,
+			stg_kz: null
 		};
 	},
 	methods: {
@@ -27,6 +30,9 @@ const app = Vue.createApp({
 		},
 		student_uid_computed() {
 			return this.student_uid ?? null
+		},
+		stg_kz_computed() {
+			return this.stg_kz ?? null
 		}
 	},
 	created() {
@@ -40,6 +46,9 @@ const app = Vue.createApp({
 		const uid = root.getAttribute("uid");
 		this.uid = uid
 
+		const stg_kz = root.getAttribute("stg_kz_prop");
+		this.stg_kz = stg_kz
+
 		const student_uid = root.getAttribute("student_uid_prop");
 		this.student_uid = student_uid
 		
@@ -48,6 +57,7 @@ const app = Vue.createApp({
 		<template v-if="comp && uid">
 			<AbgabetoolStudent v-if="comp == 'AbgabetoolStudent'" :viewData="viewData" :student_uid_prop="student_uid_computed"></AbgabetoolStudent>
 			<AbgabetoolMitarbeiter v-if="comp == 'AbgabetoolMitarbeiter'" :viewData="viewData"></AbgabetoolMitarbeiter>
+			<AbgabetoolAssistenz v-if="comp == 'AbgabetoolAssistenz'" :viewData="viewData" :stg_kz_prop="stg_kz_computed"></AbgabetoolAssistenz>
 			<DeadlineOverview v-if="comp == 'DeadlinesOverview'" :viewData="viewData"></DeadlineOverview>
 		</template>
 	`
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 0a11c4986..540a74f06 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -58,7 +58,7 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Abgabetool/Assistenz`,
+			path: `/Cis/Abgabetool/Assistenz/:stg_kz_prop?`,
 			name: 'AbgabetoolAssistenz',
 			component: AbgabetoolAssistenz,
 			props: true
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index e46067c38..aaffad68d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -125,7 +125,7 @@ export const AbgabeMitarbeiterDetail = {
 							'paabgabe_id': -1,
 							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
 							'fixtermin': false,
-							'inertedFixtermin': true,
+							'invertedFixtermin': true,
 							'kurzbz': '', // todo kurzbz textfield value vorschlag für qualgates
 							'datum': new Date().toISOString().split('T')[0],
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
@@ -492,7 +492,7 @@ export const AbgabeMitarbeiterDetail = {
 			<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
 			<div v-if="newTermin">
 				<div v-if="assistenzMode" class="row">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv4')}}</div>
 					<div class="col-8 col-md-9">
 						<Checkbox 
 							v-model="newTermin.invertedFixtermin"
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 71fe73432..6752e727e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -42,6 +42,9 @@ export const AbgabetoolAssistenz = {
 		}
 	},
 	props: {
+		stg_kz_prop: {
+			default: null
+		},
 		viewData: {
 			type: Object,
 			required: true,
@@ -121,7 +124,7 @@ export const AbgabetoolAssistenz = {
 						width: 40
 					},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150,},
-					{title: 'pa_id', field: 'projektarbeit_id', visible: true},
+					// {title: 'pa_id', field: 'projektarbeit_id', visible: true},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4termineTimeLine'))), headerFilter: true, field: 'abgabetermine',responsive:2, formatter: this.timelineFormatter, widthGrow: 1, tooltip: false},
@@ -134,7 +137,7 @@ export const AbgabetoolAssistenz = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,
 						responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: false, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
@@ -150,26 +153,12 @@ export const AbgabetoolAssistenz = {
 					this.tableBuiltResolve()
 				}
 			},
-				// {
-				// 	event: "cellClick",
-				// 	handler: async (e, cell) => {
-				// 		if(cell.getColumn().getField() === "details") {
-				// 			this.setDetailComponent(cell.getValue())
-				// 			this.undoSelection(cell)
-				// 		} else if (cell.getColumn().getField() === "mail") {
-				// 			this.undoSelection(cell)
-				// 		} else if (cell.getColumn().getField() === "abgabetermine") {
-				// 			this.openTimeline(cell.getValue())
-				// 			this.undoSelection(cell)
-				// 		}
-				// 	}
-				// },
-				{
-					event: "rowSelectionChanged",
-					handler: async(data) => {
-						this.selectedData = data
-					}
+			{
+				event: "rowSelectionChanged",
+				handler: async(data) => {
+					this.selectedData = data
 				}
+			}
 			]};
 	},
 	methods: {
@@ -409,15 +398,6 @@ export const AbgabetoolAssistenz = {
 				+ '/Cis/Abgabetool/Deadlines'
 			window.open(link, '_blank')
 		},
-		toggleShowAll(showall) {
-			this.showAll = showall
-			this.loading = true
-			this.loadProjektarbeiten(showall, () => {
-				this.$refs.abgabeTable?.tabulator.redraw(true)
-				this.$refs.abgabeTable?.tabulator.setSort([]);
-				this.loading = false
-			})
-		},
 		openAddSeriesModal() {
 			this.$refs.modalContainerAddSeries.show()
 		},
@@ -460,6 +440,9 @@ export const AbgabetoolAssistenz = {
 				this.$refs.abgabeTable.tabulator.deselectRow()
 
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+
+								
+				if(!this.$refs.abgabeTable.tabulator) return
 				
 				this.$refs.abgabeTable.tabulator.clearData()
 				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
@@ -541,8 +524,6 @@ export const AbgabetoolAssistenz = {
 
 			})
 			
-			// TODO: do same thing for sidebar
-			
 			const vorname = pa.vorname ?? pa.student_vorname
 			const nachname = pa.nachname ?? pa.student_nachname
 			pa.student = `${vorname} ${nachname}`
@@ -694,7 +675,7 @@ export const AbgabetoolAssistenz = {
 		loadProjektarbeiten(all = false, callback) {
 			this.loading = true
 			this.$api.call(ApiAbgabe.getProjektarbeitenForStudiengang(
-				this.getCurrentStudiengang,
+				this.selectedStudiengangOption.studiengang_kz,
 				this.notenOptionFilter?.benotet ?? 0
 			))
 				.then(res => {
@@ -730,37 +711,27 @@ export const AbgabetoolAssistenz = {
 		async setupMounted() {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
-
 			
-			// called through notenOptionFilter watcher on startup
+			// called through notenOptionFilter/selectedStudiengangOption watcher on startup
 			// this.loadProjektarbeiten()
 
-			// this.$refs.verticalsplit.collapseBottom()
 			this.calcMaxTableHeight()
-
-		},
-		sendEmailBegutachter() {
-			// TODO: implement
-		},
-		sendEmailStudierende() {
-			// TODO: implement
 		}
 	},
 	watch: {
 		selectedStudiengangOption(newVal, oldVal) {
-			this.loadProjektarbeiten()
+			// implicitely avoids juggling around promises for created api calls,
+			// since we need note & stg flags for loadProjektarbeiten
+			if(this.notenOptionFilter !== null && this.selectedStudiengangOption !== null) {
+				this.loadProjektarbeiten()
+			}
 		},
 		notenOptionFilter(newVal) {
 			// that single where clause is worth a decent load time so rather not filter tabulator but just 
 			// adapt the qry
-			this.loadProjektarbeiten()
-		}
-	},
-	computed: {
-		getCurrentStudiengang() {
-			// TODO: sophisticated logic pulling from default value by viewData or dropdown select
-			
-			return this.selectedStudiengangOption?.studiengang_kz ?? 257
+			if(this.notenOptionFilter !== null && this.selectedStudiengangOption !== null) {
+				this.loadProjektarbeiten()
+			}
 		}
 	},
 	created() {
@@ -778,6 +749,13 @@ export const AbgabetoolAssistenz = {
 		// fetch studiengänge options
 		this.$api.call(ApiAbgabe.getStudiengaenge()).then(res => {
 			this.studiengaengeOptions = res.data
+			if(this.studiengaengeOptions?.length) {
+				
+				// use this.stg_kz_prop as default selected in case of url param usage
+				
+				this.selectedStudiengangOption = this.stg_kz_prop ? res.data.find(stgOpt => stgOpt.studiengang_kz == this.stg_kz_prop) : res.data[0]
+			}
+			
 		}).catch(e => {
 			this.loading = false
 		})
@@ -1035,8 +1013,7 @@ export const AbgabetoolAssistenz = {
 						:style="{'width': '100%', 'scroll-behavior': 'auto !important'}" 
 						:optionLabel="getOptionLabelStg" 
 						v-model="selectedStudiengangOption" 
-						:options="studiengaengeOptions" 
-						showClear
+						:options="studiengaengeOptions"
 						:tabindex="2"
 					>
 						<template #optionsgroup="slotProps">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 6caa35fe7..aab23c737 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -69,7 +69,7 @@ export const AbgabetoolMitarbeiter = {
 				minHeight: 250,
 				index: 'projektarbeit_id',
 				layout: 'fitDataStretch',
-				placeholder: this.$p.t('global/noDataAvailable'),
+				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
 				rowHeight: 80,
@@ -299,7 +299,6 @@ export const AbgabetoolMitarbeiter = {
 			this.domain = data[1]
 			
 			const d = data[0]?.retval?.map(projekt => {
-				let mode = 'detailTermine'
 
 				return {
 					...projekt,
@@ -316,7 +315,7 @@ export const AbgabetoolMitarbeiter = {
 					titel: projekt.titel
 				}
 			})
-
+			
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index efbad61d2..4b359e380 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -2,7 +2,7 @@ export const AbgabeterminStatusLegende = {
 	name: 'AbgabeterminStatusLegende',
 	template: `	
 		<div class="text-center">
-			<div class="col"  style="width: 50%; margin-left: 12px;">
+			<div class="col"  style="width: 80%; margin-left: 12px;">
 			
 				<div class="row" style="margin-bottom: 2px">
 					<div class="col-auto verspaetet-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 9d743c91d..cb732eca2 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -287,4 +287,48 @@ if($result = $db->db_query("SELECT 1 FROM information_schema.routines WHERE rout
 		else
 			echo "<br>campus.get_betreuer_details function hinzugefuegt";
 	}
-}
\ No newline at end of file
+}
+
+if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/abgabe_assistenz'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung)
+				SELECT 'basis/abgabe_assistenz', 'Recht um Abgabetool für Assistenzen zu bedienen'";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_berechtigung insert basis/abgabe_assistenz hinzugefuegt";
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'paabgabeUpdatesBetSM'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('paabgabeUpdatesBetSM', 'paabgabeUpdatesBetSM', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage paabgabeUpdatesBetSM hinzugefuegt";
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'paabgabeUpdatesSammelmail'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('paabgabeUpdatesSammelmail', 'paabgabeUpdatesSammelmail', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage paabgabeUpdatesSammelmail hinzugefuegt";
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cf4262333..45c6e1800 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43647,7 +43647,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Download Abgabe',
+				'text' => 'Download File',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 96fdc357de0f0293f55ade5f3f7962c92dcda362 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 17 Nov 2025 16:39:19 +0100
Subject: [PATCH 0970/1357] move getDateStyleClass to AbgabetoolStudent.js from
 AbgabeStudentDetail.js

---
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 29 -------------------
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 29 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 96e01a2ed..cca30d490 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -3,7 +3,6 @@ import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 
-const today = new Date()
 export const AbgabeStudentDetail = {
 	name: "AbgabeStudentDetail",
 	components: {
@@ -214,30 +213,6 @@ export const AbgabeStudentDetail = {
 			}
 			
 			
-		},
-		dateDiffInDays(datum, today){
-			const oneDayMs = 1000 * 60 * 60 * 24
-			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
-		},
-		getDateStyleClass(termin, mode) {
-			const datum = new Date(termin.datum)
-			const abgabedatum = new Date(termin.abgabedatum)
-			
-			// avoid renaming these statuses as their names are used as css keys
-			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			if (termin.abgabedatum === null) {
-				if(datum < today) {
-					return 'verpasst'
-				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					return 'abzugeben'
-				} else {
-					return 'standard'
-				}
-			} else if(abgabedatum > datum) {
-				return 'verspaetet'
-			} else {
-				return 'abgegeben'
-			}
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -269,10 +244,6 @@ export const AbgabeStudentDetail = {
 			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
 			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
 			
-			// get dateStyles for each abgabetermin
-			newVal?.abgabetermine?.forEach(termin => {
-				termin.dateStyle = this.getDateStyleClass(termin)
-			})
 		}
 	},
 	computed: {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 5f86d5100..fec6f5b06 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -3,6 +3,7 @@ import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
 
+const today = new Date()
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
@@ -46,6 +47,30 @@ export const AbgabetoolStudent = {
 		};
 	},
 	methods: {
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyleClass(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
+
+			// avoid renaming these statuses as their names are used as css keys
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					return 'verpasst'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					return 'abzugeben'
+				} else {
+					return 'standard'
+				}
+			} else if(abgabedatum > datum) {
+				return 'verspaetet'
+			} else {
+				return 'abgegeben'
+			}
+		},
 		checkQualityGates(termine) {
 			let qgate1Passed = false
 			let qgate2Passed = false
@@ -90,10 +115,12 @@ export const AbgabetoolStudent = {
 						termin.allowedToUpload = termin.upload_allowed 
 					}
 
+					termin.dateStyle = this.getDateStyleClass(termin)
 				})
+				
 				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = this.student_uid
-
+				
 				this.selectedProjektarbeit = pa
 
 				this.$refs.modalContainerAbgabeDetail.show()

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

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

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

From a4fee77301bb3dcbf5767e7e0baede98176ae208 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 18 Nov 2025 15:01:43 +0100
Subject: [PATCH 0972/1357] link url in abgabetoolJob per config; comment out
 addMeta;

---
 application/config/abgabe.php                 |   6 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 188 +-----------------
 .../controllers/jobs/AbgabetoolJob.php        |  25 +--
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 175 ++++++++--------
 4 files changed, 109 insertions(+), 285 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 9265c70be..63c5699c3 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -7,4 +7,8 @@ $config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/s
 
 $config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
 
-$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
\ No newline at end of file
+$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
+// used as APP_ROOT.URL_STUDENTS -> cis4
+$config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
+// used as APP_ROOT.URL_MITARBEITER -> old cis 
+$config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index f25b30e83..349a60985 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -138,7 +138,7 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+//		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
 
 		if ($isMitarbeiter) {
@@ -211,8 +211,8 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				));
 
-				// TODO: consider this for daily abgabetool email job
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				// enable this when lektor cry that they dont receive enough emails
+//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -308,7 +308,6 @@ class Abgabe extends FHCAPI_Controller
 				$abgabe = getData($res)[0];
 				$abgabe->signatur = $signaturstatus;
 					
-				// TODO: consider for email job
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('endupload',$res, array(
@@ -403,9 +402,11 @@ class Abgabe extends FHCAPI_Controller
 		} else {
 			$ci3BootstrapFilePath = "index.ci.php";
 		}
-		$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
 
-		$this->addMeta('betreuerArray', $resBetr->retval);
+		$path = $this->_ci->config->item('URL_MITARBEITER');
+		$url = APP_ROOT.$path;
+
+//		$this->addMeta('betreuerArray', $resBetr->retval);
 		
 		// getProjektbetreuerAnrede fetches distinct on person_id, so there should be one row. zweitbetreuer is handled seperately afterwards 
 		foreach($resBetr->retval as $betreuerRow) {
@@ -435,7 +436,7 @@ class Abgabe extends FHCAPI_Controller
 			
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
 
-			$this->addMeta('$maildata', $maildata);
+//			$this->addMeta('$maildata', $maildata);
 
 			$mailres = sendSanchoMail(
 				'ParbeitsbeurteilungEndupload',
@@ -458,7 +459,7 @@ class Abgabe extends FHCAPI_Controller
 				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
 				$zweitbegutachterRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid));
 				
-				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
+//				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
 				
 				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
 				{
@@ -475,7 +476,7 @@ class Abgabe extends FHCAPI_Controller
 						
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
 						
-						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
+//						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
 						
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
@@ -501,9 +502,8 @@ class Abgabe extends FHCAPI_Controller
 						$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
 						$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
 						
-						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
+//						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
 						
-//							TODO: persist email event somehow, let job bundle the updates later?
 						$mailres = sendSanchoMail(
 							'ParbeitsbeurteilungEndupload',
 							$zweitbetmaildata,
@@ -985,172 +985,6 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
-//	public function notifyBetreuerMail() {
-//		// send all new projektarbeit abgabe UPLOADS since the last job run to the related betreuer
-//		// this job gathers all new or changed file uploads via field 'abgabedatum', enduploads still
-//		// send an email directly after happening since they are kind of important
-//
-////		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
-//		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-//		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-//		$this->load->model('crm/Student_model', 'StudentModel');
-//		
-//		$interval = $this->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-//
-//		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
-//		$retval = getData($result);
-//
-//		// retval are paabgaben joined with projektarbeit and betreuer
-//		if(count($retval) == 0) return; // TODO: terminate appropriately
-//		
-//		// group contents per betreuer person_id
-//		$betreuer_uids = [];
-//		forEach($retval as $paabgabe) {
-//			if(!isset($betreuer_uids[$paabgabe->person_id])) {
-//				$betreuer_uids[$paabgabe->person_id] = [];
-//			}
-//
-//			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
-//		}
-//
-//		forEach ($betreuer_uids as $person_id => $abgaben) {
-//			// $person_id is from betreuer
-//
-//			$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
-//			$data = getData($result)[0];
-//
-//			// $abgabe is the array of paabgabe objects
-//			$anrede = $data->anrede;
-//			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
-//			$fullFormattedNameString = $data->first;
-//
-//			$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($paabgabe->projektarbeit_id);
-//			$data = getData($result)[0];
-//			
-//			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
-//			// php has spaceships 🚀🚀🚀🚀🚀
-//			usort($abgaben, function ($a, $b) {
-//				return strtotime($a->datum) <=> strtotime($b->datum);
-//			});
-//
-//			$projektarbeit_titel = $abgaben[0]->titel;
-//			$abgabenString = '<br /><br />';
-//			foreach ($abgaben as $abgabe) {
-//				$datetime = new DateTime($abgabe->datum);
-//				$dateEmailFormatted = $datetime->format('d.m.Y');
-//
-//				$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
-//				$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
-//
-//				$abgabenString .= 'Abgabedatum: '.$abgabedatumFormatted.' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ' . $abgabe->kurzbz . '<br />';
-//			}
-//
-//			// Link to Abgabetool
-//			if (defined('CIS4') && CIS4) {
-//				$ci3BootstrapFilePath = "cis.php";
-//			} else {
-//				$ci3BootstrapFilePath = "index.ci.php";
-//			}
-//			$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
-//			
-//			$body_fields = array(
-//				'anrede' => $anrede,
-//				'anredeFillString' => $anredeFillString,
-//				'fullFormattedNameString' => $fullFormattedNameString,
-//				'paTitel' => $projektarbeit_titel,
-//				'abgabenString' => $abgabenString,
-//				'linkAbgabetool' => $url
-//			);
-//
-//			// send email with bundled info
-//			sendSanchoMail(
-//				'paabgabeUpdatesBetSM',
-//				$body_fields,
-//				$data->private_email,
-//				$this->p->t('abgabetool', 'changedAbgabeterminev2')
-//			);
-//		}
-//	}
-//	
-//	public function notifyStudentMail()
-//	{
-//		// send all new projektarbeit abgabe since the last job run to the related student
-//
-////		$this->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
-//		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-//		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-//		$this->load->model('crm/Student_model', 'StudentModel');
-//		
-//		$interval = $this->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-//
-//		$result = $this->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
-//		$retval = getData($result);
-//
-//		if(count($retval) == 0) return; // TODO: terminate appropriately
-//		
-//		// group results per projektarbeit/student_uid
-//		$student_uids = [];
-//		forEach($retval as $paabgabe) {
-//			if(!isset($student_uids[$paabgabe->student_uid])) {
-//				$student_uids[$paabgabe->student_uid] = [];
-//			}
-//				
-//			$student_uids[$paabgabe->student_uid][] = $paabgabe;
-//		}
-//
-//		foreach ($student_uids as $uid => $abgaben) {
-//			// $uid is the student's UID
-//			$result = $this->StudentModel->getEmailAnredeForStudentUID($uid);
-//			$data = getData($result)[0];
-//			
-//			// $abgabe is the array of paabgabe objects
-//			$anredeFillString = $data->anrede=="Herr"?"r":"";
-//			$fullFormattedNameString = trim($data->titelpre." ".$data->vorname." ".$data->vornamen." ".$data->nachname." ".$data->titelpost);
-//
-//			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
-//			// php has spaceships 🚀🚀🚀🚀🚀
-//			usort($abgaben, function($a, $b) {
-//				return strtotime($a->datum) <=> strtotime($b->datum);
-//			});
-//			
-//			$projektarbeit_titel = $abgaben[0]->titel;
-//			$abgabenString = '<br /><br />';
-//			forEach($abgaben as $abgabe) {
-//				$datetime = new DateTime($abgabe->datum);
-//				$dateEmailFormatted = $datetime->format('d.m.Y');
-//				
-//				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
-//			}
-//
-//			// Link to Entschuldigungsmanagement
-//			if(defined('CIS4') && CIS4) {
-//				$ci3BootstrapFilePath = "cis.php";
-//			} else {
-//				$ci3BootstrapFilePath = "index.ci.php";
-//			}
-//			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
-//
-////			$linkAbgabetool = '';
-//			$body_fields = array(
-//				'anrede' => $data->anrede,
-//				'anredeFillString' => $anredeFillString,
-//				'fullFormattedNameString' => $fullFormattedNameString,
-//				'paTitel' => $projektarbeit_titel,
-//				'abgabenString' => $abgabenString,
-//				'linkAbgabetool' => $url
-//			);
-//			
-//			// send email with bundled info
-//			sendSanchoMail(
-//				'paabgabeUpdatesSammelmail',
-//				$body_fields,
-//				$uid.'@'.DOMAIN,
-//				$this->p->t('abgabetool', 'changedAbgabeterminev2')
-//			);
-//			
-//		}
-//	}
-
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
 			return;
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index c38306240..301e747c1 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -87,15 +87,10 @@ class AbgabetoolJob extends JOB_Controller
 
 				$abgabenString .= 'Abgabedatum: '.$abgabedatumFormatted.' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ' . $abgabe->kurzbz . '<br />';
 			}
-
-			// Link to Abgabetool
-			if (defined('CIS4') && CIS4) {
-				$ci3BootstrapFilePath = "cis.php";
-			} else {
-				$ci3BootstrapFilePath = "index.ci.php";
-			}
-			$url = APP_ROOT . $ci3BootstrapFilePath . '/Cis/Abgabetool/Mitarbeiter';
-
+			
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = APP_ROOT.$path;
+			
 			$body_fields = array(
 				'anrede' => $anrede,
 				'anredeFillString' => $anredeFillString,
@@ -170,16 +165,10 @@ class AbgabetoolJob extends JOB_Controller
 
 				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
 			}
-
-			// TODO: check this config flag in job context
-			// Link to Entschuldigungsmanagement
-			if(defined('CIS4') && CIS4) {
-				$ci3BootstrapFilePath = "cis.php";
-			} else {
-				$ci3BootstrapFilePath = "index.ci.php";
-			}
-			$url = APP_ROOT.$ci3BootstrapFilePath.'/Cis/Abgabetool/Student';
 			
+			$route =  $this->_ci->config->item('URL_STUDENTS');
+			$url = APP_ROOT.$route;
+
 			$body_fields = array(
 				'anrede' => $data->anrede,
 				'anredeFillString' => $anredeFillString,
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 6752e727e..c987f1613 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -228,91 +228,91 @@ export const AbgabetoolAssistenz = {
 		},
 		handleTableBuilt() {
 			const table = this.$refs.abgabeTable.tabulator
-			table.on("columnMoved", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnResized", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnVisibilityChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("filterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("headerFilterChanged", () => {
-				this.saveState(table);
-			});
-
-			table.on("dataSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("columnSorted", () => {
-				this.saveState(table);
-			});
-
-			table.on("sortersChanged", () => {
-				this.saveState(table);
-			});
-
-			const saved = this.loadState();
+			// table.on("columnMoved", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("columnResized", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("columnVisibilityChanged", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("filterChanged", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("headerFilterChanged", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("dataSorted", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("columnSorted", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// table.on("sortersChanged", () => {
+			// 	this.saveState(table);
+			// });
+			//
+			// const saved = this.loadState();
 			
-			table.on("renderComplete", () => {
-				if(!this.stateRestored) {
-					
-					if (saved?.columns && !this.colLayoutRestored) {
-						const layout = saved.columns.map(col => ({
-							field: col.field,
-							width: col.width,
-							visible: col.visible,
-							// add more if needed, but keep it simple
-						}));
-
-						const safeLayout = layout.filter(col =>
-							col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
-						);
-						
-						table.setColumnLayout(safeLayout);
-
-						this.colLayoutRestored = true;
-					}
-
-					if (saved?.filters && !this.filtersRestored) {
-						this.filtersRestored = true // instantly avoid retriggers
-						table.setFilter(saved.filters);
-					}
-					if (saved?.headerFilters && !this.headerFiltersRestored) {
-						this.headerFiltersRestored = true // instantly avoid retriggers
-						for (let hf of saved.headerFilters) {
-							table.setHeaderFilterValue(hf.field, hf.value);
-						}
-					}
-
-					if (saved?.sort?.length && !this.sortRestored) {
-						this.sortRestored = true;
-
-						setTimeout(() => {
-							const sortList = saved.sort.map(s => {
-								const col = table.columnManager.findColumn(s.field);
-								if (!col) {
-									return null;
-								}
-								return { column: col, dir: s.dir };
-							}).filter(Boolean);
-
-							table.setSort(sortList);
-						}, 100);
-					}
-					this.stateRestored = true
-
-				}
-
-			});
+			// table.on("renderComplete", () => {
+			// 	if(!this.stateRestored) {
+			//		
+			// 		if (saved?.columns && !this.colLayoutRestored) {
+			// 			const layout = saved.columns.map(col => ({
+			// 				field: col.field,
+			// 				width: col.width,
+			// 				visible: col.visible,
+			// 				// add more if needed, but keep it simple
+			// 			}));
+			//
+			// 			const safeLayout = layout.filter(col =>
+			// 				col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
+			// 			);
+			//			
+			// 			table.setColumnLayout(safeLayout);
+			//
+			// 			this.colLayoutRestored = true;
+			// 		}
+			//
+			// 		if (saved?.filters && !this.filtersRestored) {
+			// 			this.filtersRestored = true // instantly avoid retriggers
+			// 			table.setFilter(saved.filters);
+			// 		}
+			// 		if (saved?.headerFilters && !this.headerFiltersRestored) {
+			// 			this.headerFiltersRestored = true // instantly avoid retriggers
+			// 			for (let hf of saved.headerFilters) {
+			// 				table.setHeaderFilterValue(hf.field, hf.value);
+			// 			}
+			// 		}
+			//
+			// 		if (saved?.sort?.length && !this.sortRestored) {
+			// 			this.sortRestored = true;
+			//
+			// 			setTimeout(() => {
+			// 				const sortList = saved.sort.map(s => {
+			// 					const col = table.columnManager.findColumn(s.field);
+			// 					if (!col) {
+			// 						return null;
+			// 					}
+			// 					return { column: col, dir: s.dir };
+			// 				}).filter(Boolean);
+			//
+			// 				table.setSort(sortList);
+			// 			}, 100);
+			// 		}
+			// 		this.stateRestored = true
+			//
+			// 	}
+			//
+			// });
 		},
 		handleToggleFullscreenDetail() {
 			this.detailIsFullscreen = !this.detailIsFullscreen
@@ -441,10 +441,7 @@ export const AbgabetoolAssistenz = {
 
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
 
-								
-				if(!this.$refs.abgabeTable.tabulator) return
 				
-				this.$refs.abgabeTable.tabulator.clearData()
 				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 				this.$refs.abgabeTable.tabulator.replaceData(mappedData)
 				
@@ -765,7 +762,8 @@ export const AbgabetoolAssistenz = {
 			this.curSem = res.data[1]
 			
 			// TODO: maybe filter only for available semester from projektarbeiten dataset
-			this.studiensemesterOptions = [{studiensemester_kurzbz: 'Alle'}, ...this.allSem]
+			this.studiensemesterOptions = [{studiensemester_kurzbz: 'Alle'}, this.curSem, ...this.allSem]
+
 		}).catch(e => {
 			this.loading = false
 		})
@@ -1001,7 +999,6 @@ export const AbgabetoolAssistenz = {
 			</template>
 		</BsOffcanvas>
 		
-		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
 		<div style="max-height:40vw;">
 			<div class="row">
 				<div class="col-auto">

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

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

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

From e837101651b5abbd6b304dc9c0fed741864b99d7 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Wed, 19 Nov 2025 10:53:59 +0100
Subject: [PATCH 0974/1357] PHP8 compatibility: replaced the curly brackets {}
 with square brackets [] where used in combination with strings

---
 application/controllers/api/v1/person/Person.php |  6 +++---
 include/File/CSV.php                             | 12 ++++++------
 include/File/Util.php                            | 10 +++++-----
 include/filter.class.php                         |  2 +-
 include/securimage/WavFile.php                   |  2 +-
 include/securimage/securimage.php                |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/v1/person/Person.php b/application/controllers/api/v1/person/Person.php
index 6a373137f..935fbae62 100644
--- a/application/controllers/api/v1/person/Person.php
+++ b/application/controllers/api/v1/person/Person.php
@@ -233,10 +233,10 @@ class Person extends API_Controller
 				//Quersumme bilden
 				for ($i = 0; $i < 10; $i++)
 				{
-					$erg += $gewichtung[$i] * $tmpSvnr{$i};
+					$erg += $gewichtung[$i] * $tmpSvnr[$i];
 				}
 
-				if ($tmpSvnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
+				if ($tmpSvnr[3] != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
 				{
 					return error('SVNR ist ungueltig');
 				}
@@ -244,7 +244,7 @@ class Person extends API_Controller
 				if (mb_strlen($person['svnr']) == 12)
 				{
 					$last = substr($person['svnr'], 10, 12);
-					if ($last{0} != 'v' || !is_numeric($last{1}))
+					if ($last[0] != 'v' || !is_numeric($last[1]))
 					{
 						return error('SVNR ist ungueltig');
 					}
diff --git a/include/File/CSV.php b/include/File/CSV.php
index c4c4d44ad..ea67181f1 100644
--- a/include/File/CSV.php
+++ b/include/File/CSV.php
@@ -178,7 +178,7 @@ class File_CSV
             return $field;
         }
 
-        if ($quote && $field{0} == $quote && $field{strlen($field)-1} == $quote) {
+        if ($quote && $field[0] == $quote && $field[strlen($field) - 1] == $quote) {
             return substr($field, 1, -1);
         }
         return $field;
@@ -230,7 +230,7 @@ class File_CSV
                 } elseif ($c == "\n" || $c == "\r") {
                     $sub = ($prev == "\r") ? 2 : 1;
                     if ((strlen($buff) >= $sub) &&
-                        ($buff{strlen($buff) - $sub} == $quote))
+                        ($buff[strlen($buff) - $sub] == $quote))
                     {
                         $in_quote = false;
                     }
@@ -312,9 +312,9 @@ class File_CSV
             $last =& $fields[count($fields) - 1];
             // Fallback to read the line with readQuoted when guess
             // that the simple explode won't work right
-            if (($last{strlen($last) - 1} == "\n"
-                && $last{0} == $conf['quote']
-                && $last{strlen(rtrim($last)) - 1} != $conf['quote'])
+            if (($last[strlen($last) - 1] == "\n"
+                && $last[0] == $conf['quote']
+                && $last[strlen(rtrim($last)) - 1] != $conf['quote'])
                 ||
                 (count($fields) != $conf['fields'])
                 // XXX perhaps there is a separator inside a quoted field
@@ -511,4 +511,4 @@ class File_CSV
         return true;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/File/Util.php b/include/File/Util.php
index 941c61441..5474bc2a7 100644
--- a/include/File/Util.php
+++ b/include/File/Util.php
@@ -96,7 +96,7 @@ class File_Util
     {
         if (File_Util::isAbsolute($path)) {
             if (FILE_WIN32) {
-                return substr($path, $path{3} == '\\' ? 4 : 3);
+                return substr($path, $path[3] == '\\' ? 4 : 3);
             }
             return ltrim($path, '/');
         }
@@ -182,7 +182,7 @@ class File_Util
         if (FILE_WIN32) {
             return preg_match('/^[a-zA-Z]:(\\\|\/)/', $path);
         }
-        return ($path{0} == '/') || ($path{0} == '~');
+        return ($path[0] == '/') || ($path[0] == '~');
     } 
 
     /**
@@ -244,11 +244,11 @@ class File_Util
             } else {
                 $cwd   = getcwd();
                 $drive = substr($cwd, 0, 2);
-                if ($path{0} !== $separator{0}) {
+                if ($path[0] !== $separator[0]) {
                     $path  = substr($cwd, 3) . $separator . $path;
                 }
             }
-        } elseif ($path{0} !== $separator) {
+        } elseif ($path[0] !== $separator) {
             $path = getcwd() . $separator . $path;
         }
         
@@ -323,7 +323,7 @@ class File_Util
         
         $entries = array();
         for ($dir = dir($path); false !== $entry = $dir->read(); ) {
-            if ($list & FILE_LIST_DOTS || $entry{0} !== '.') {
+            if ($list & FILE_LIST_DOTS || $entry[0] !== '.') {
                 $isRef = ($entry === '.' || $entry === '..');
                 $isDir = $isRef || is_dir($path .'/'. $entry);
                 if (    ((!$isDir && $list & FILE_LIST_FILES)   ||
diff --git a/include/filter.class.php b/include/filter.class.php
index c3d1d6ac1..7100e6562 100644
--- a/include/filter.class.php
+++ b/include/filter.class.php
@@ -240,7 +240,7 @@ class filter extends basis_db
 								{
 									//$value->value = preg_replace('/(.*?)selected=.selected./', '$1', $value->value);
 									//$value->value = preg_replace('/(.*?)\s*[selected=?selected?]/', '$1', $value->value);
-									//$value->value = preg_replace('/(.*?)\s*selected="selected"\s*/', '${1}', $value->value);
+									//$value->value = preg_replace('/(.*?)\s*selected="selected"\s*/', '$[1]', $value->value);
 									//$value->value = preg_replace('/^\s*selected=.*?selected.*?\s*/', ' ', $value->value);
 									//$value->value = str_replace('selected=', '', $value->value);
 
diff --git a/include/securimage/WavFile.php b/include/securimage/WavFile.php
index 6d84fc725..d56dbd942 100644
--- a/include/securimage/WavFile.php
+++ b/include/securimage/WavFile.php
@@ -1532,7 +1532,7 @@ class WavFile
         } else {
             // replace
             for ($i = 0; $i < $sampleBytes; ++$i) {
-                $this->_samples{$offset + $i} = $sampleBinary{$i};
+                $this->_samples[$offset + $i] = $sampleBinary[$i];
             }
         }
 
diff --git a/include/securimage/securimage.php b/include/securimage/securimage.php
index 51d876672..820e8b92f 100644
--- a/include/securimage/securimage.php
+++ b/include/securimage/securimage.php
@@ -1435,7 +1435,7 @@ class Securimage
             $length = strlen($code['display']);
 
             for($i = 0; $i < $length; ++$i) {
-                $letter    = $code['display']{$i};
+                $letter    = $code['display'][$i];
                 $letters[] = $letter;
             }
         }

From bab15bc5b2d8945c794ec0c2e87ea83459e31b05 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 19 Nov 2025 13:01:47 +0100
Subject: [PATCH 0975/1357] add fs_x-small and fs_xx-small and ajust css em
 settings

---
 .../api/frontend/v1/stv/Config.php            |  4 +-
 public/css/Studentenverwaltung.css            | 10 ++++-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d9219be7b..00a9610d9 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -87,6 +87,8 @@ class Config extends FHCAPI_Controller
 			"label" => $this->p->t('stv', 'settings_fontsize'),
 			"value" => $data['stv_font_size'] ?? "fs_normal",
 			"options" => [
+				"fs_xx-small" => $this->p->t('stv', 'settings_fontsize_xx-small'),
+				"fs_x-small" => $this->p->t('stv', 'settings_fontsize_x-small'),
 				"fs_small" => $this->p->t('stv', 'settings_fontsize_small'),
 				"fs_normal" => $this->p->t('stv', 'settings_fontsize_normal'),
 				"fs_big" => $this->p->t('stv', 'settings_fontsize_big'),
@@ -118,7 +120,7 @@ class Config extends FHCAPI_Controller
 		$this->form_validation->set_rules(
 			'font_size',
 			$this->p->t('stv', 'settings_fontsize'),
-			'required|in_list[fs_small,fs_normal,fs_big,fs_huge]'
+			'required|in_list[fs_xx-small,fs_x-small,fs_small,fs_normal,fs_big,fs_huge]'
 		);
 
 		Events::trigger('stv_config_validation', $this->form_validation);
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index efd37400e..eb6becc15 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -11,8 +11,14 @@
 html {
   font-size: .875em;
 }
+html.fs_xx-small {
+	font-size: .5em;
+}
+html.fs_x-small {
+	font-size: .625em;
+}
 html.fs_small {
-  font-size: .5em;
+	font-size: .75em;
 }
 html.fs_normal {
   font-size: .875em;
@@ -21,7 +27,7 @@ html.fs_big {
   font-size: 1em;
 }
 html.fs_huge {
-  font-size: 1.4em;
+	font-size: 1.125em;
 }
 
 #appMenu {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 32dcf4774..5a9bf0262 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38960,6 +38960,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_xx-small',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sehr Klein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Very Small',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'settings_fontsize_x-small',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kleiner',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Smaller',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From 352638ed90182320bbd502eed5e1f1bf6c8ba0b3 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 20 Nov 2025 10:36:23 +0100
Subject: [PATCH 0976/1357] code cleanup;

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js    |  6 +++---
 .../Cis/Abgabetool/AbgabeStudentDetail.js        |  3 ---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js      |  3 ---
 .../Cis/Abgabetool/AbgabetoolStudent.js          |  5 +----
 .../Cis/Abgabetool/DeadlineOverview.js           | 16 ++++++++--------
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index aaffad68d..ae4777876 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -721,9 +721,9 @@ export const AbgabeMitarbeiterDetail = {
 									</div>
 									
 									<div v-if="termin?.signatur !== undefined && termin?.signatur !== null" class="col-auto">
-										<Message v-if="termin?.signatur == true" severity="success" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturGefunden') }} </Message>
-										<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4keineSignatur') }} </Message>
-										<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
+										<Message v-if="termin?.signatur == true" severity="success" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4signaturGefunden')) }} </Message>
+										<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4keineSignatur')) }} </Message>
+										<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4signaturServerError')) }} </Message>
 									</div>
 									<div v-else class="col-auto">
 										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index cca30d490..46e600d25 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -213,9 +213,6 @@ export const AbgabeStudentDetail = {
 			}
 			
 			
-		},
-		openBeurteilungLink(link) {
-			window.open(link, '_blank')
 		},
 		getOptionLabel(option) {
 			return option.sprache
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index aab23c737..245ff7cfb 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -1,6 +1,5 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
-import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
@@ -11,7 +10,6 @@ export const AbgabetoolMitarbeiter = {
 		BsModal,
 		CoreFilterCmpt,
 		AbgabeDetail,
-		VerticalSplit,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
 		VueDatePicker
@@ -355,7 +353,6 @@ export const AbgabetoolMitarbeiter = {
 
 			this.loadProjektarbeiten()
 
-			// this.$refs.verticalsplit.collapseBottom()
 			this.calcMaxTableHeight()
 			
 		}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index fec6f5b06..fea0cf58f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,5 +1,4 @@
 import AbgabeDetail from "./AbgabeStudentDetail.js";
-import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
 
@@ -10,8 +9,7 @@ export const AbgabetoolStudent = {
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
 		BsModal,
-		AbgabeDetail,
-		VerticalSplit
+		AbgabeDetail
 	},
 	inject: ['isMobile'],
 	provide() {
@@ -124,7 +122,6 @@ export const AbgabetoolStudent = {
 				this.selectedProjektarbeit = pa
 
 				this.$refs.modalContainerAbgabeDetail.show()
-				// this.$refs.verticalsplit.showBoth()
 				
 			}).finally(()=>{this.loading=false})
 		},
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 25e781df2..d5db18ae9 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -30,15 +30,15 @@ export const DeadlineOverview = {
 				height: 700,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
-				placeholder: this.$p.t('global/noDataAvailable'),
+				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				columns: [
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixterminv4')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetypv2')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
-					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'semester', formatter: this.centeredTextFormatter, widthGrow: 1}
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zieldatum'))), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4fixterminv4'))), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabetypv2'))), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabekurzbz'))), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('person/studentIn'))), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'semester', formatter: this.centeredTextFormatter, widthGrow: 1}
 				],
 				persistence: false,
 			},

From c447fb9632b01c752f441ae89ce5fa15f2992776 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 20 Nov 2025 11:33:30 +0100
Subject: [PATCH 0977/1357] properly center loadingOverlay in center of screen,
 not center of content + put that template away in a FhcOverlay.js component

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  2 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  8 +++---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 10 +++-----
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 10 ++++----
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  8 +++---
 .../Cis/Abgabetool/DeadlineOverview.js        |  5 +++-
 public/js/components/Overlay/FhcOverlay.js    | 25 +++++++++++++++++++
 7 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 public/js/components/Overlay/FhcOverlay.js

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index ae4777876..8109bf05d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -774,7 +774,7 @@ export const AbgabeMitarbeiterDetail = {
 		</Accordion>
 		
 		<div v-if="projektarbeit?.abgabetermine.length == 0" style="display:flex; justify-content: center; align-content: center;">
-			<h3>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h3>
+			<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
 		</div>
 		
 	</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 46e600d25..79b86023c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -2,6 +2,7 @@ import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import FhcOverlay from "../../Overlay/FhcOverlay.js";
 
 export const AbgabeStudentDetail = {
 	name: "AbgabeStudentDetail",
@@ -16,7 +17,8 @@ export const AbgabeStudentDetail = {
 		AccordionTab: primevue.accordiontab,
 		Message: primevue.message,
 		Inplace: primevue.inplace,
-		VueDatePicker
+		VueDatePicker,
+		FhcOverlay
 	},
 	inject: ['notenOptions', 'isMobile', 'isViewMode'],
 	props: {
@@ -356,9 +358,7 @@ export const AbgabeStudentDetail = {
 
 	},
 	template: `
-		<div id="loadingOverlay" v-show="loading" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
-			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
-		</div>
+		<FhcOverlay :active="loading || saving"></FhcOverlay>
 
 		<div v-if="projektarbeit">
 		
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index c987f1613..a86349b55 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1,12 +1,12 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
-import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
 import BsOffcanvas from '../../Bootstrap/Offcanvas.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import ApiStudiensemester from '../../../api/factory/studiensemester.js';
 import AbgabeterminStatusLegende from "./StatusLegende.js";
+import FhcOverlay from "../../Overlay/FhcOverlay.js";
 
 // spoofed date testing
 // const todayISO = '2025-08-08'
@@ -25,13 +25,13 @@ export const AbgabetoolAssistenz = {
 		BsOffcanvas,
 		CoreFilterCmpt,
 		AbgabeDetail,
-		VerticalSplit,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Inplace: primevue.inplace,
 		Textarea: primevue.textarea,
 		Timeline: primevue.timeline,
-		VueDatePicker
+		VueDatePicker,
+		FhcOverlay
 	},
 	provide() {
 		return {
@@ -814,9 +814,7 @@ export const AbgabetoolAssistenz = {
 	},
 	template: `
 	<template v-if="phrasenResolved">
-		<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
-			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
-		</div>
+		<FhcOverlay :active="loading || saving"></FhcOverlay>
 
 		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
 			dialogClass="modal-lg">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 245ff7cfb..d444ba7a8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -3,6 +3,7 @@ import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import FhcOverlay from "../../Overlay/FhcOverlay.js";
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -12,7 +13,8 @@ export const AbgabetoolMitarbeiter = {
 		AbgabeDetail,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
-		VueDatePicker
+		VueDatePicker,
+		FhcOverlay
 	},
 	provide() {
 		return {
@@ -354,7 +356,7 @@ export const AbgabetoolMitarbeiter = {
 			this.loadProjektarbeiten()
 
 			this.calcMaxTableHeight()
-			
+
 		}
 	},
 	watch: {
@@ -400,9 +402,7 @@ export const AbgabetoolMitarbeiter = {
 	},
 	template: `
 	<template v-if="phrasenResolved">
-		<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
-			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
-		</div>
+		<FhcOverlay :active="loading || saving"></FhcOverlay>
 
 		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
 			dialogClass="modal-lg">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index fea0cf58f..3a7bb7f88 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,6 +1,7 @@
 import AbgabeDetail from "./AbgabeStudentDetail.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
+import FhcOverlay from "../../Overlay/FhcOverlay.js";
 
 const today = new Date()
 export const AbgabetoolStudent = {
@@ -9,7 +10,8 @@ export const AbgabetoolStudent = {
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
 		BsModal,
-		AbgabeDetail
+		AbgabeDetail,
+		FhcOverlay
 	},
 	inject: ['isMobile'],
 	provide() {
@@ -266,9 +268,7 @@ export const AbgabetoolStudent = {
 	},
 	template: `
 <template v-if="phrasenResolved">
-	<div id="loadingOverlay" v-show="loading || saving" style="position: absolute; width: 100vw; height: 100vh; display: flex; align-items: center; justify-content: center; background: rgba(255,255,255,0.5); z-index: 99999999999;">
-		<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
-	</div>
+	<FhcOverlay :active="loading || saving"></FhcOverlay>
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
 		dialogClass="modal-xl" :allowFullscreenExpand="true">
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index d5db18ae9..3ec564c6c 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -26,6 +26,8 @@ export const DeadlineOverview = {
 			tabulatorUuid: Vue.ref(0),
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
+			phrasenPromise: null,
+			phrasenResolved: false,
 			deadlineTableOptions: {
 				height: 700,
 				index: 'projektarbeit_id',
@@ -128,7 +130,8 @@ export const DeadlineOverview = {
 
 	},
 	created() {
-
+		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
+		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 	},
 	mounted() {
 		this.setupMounted()
diff --git a/public/js/components/Overlay/FhcOverlay.js b/public/js/components/Overlay/FhcOverlay.js
new file mode 100644
index 000000000..dd7e7fe37
--- /dev/null
+++ b/public/js/components/Overlay/FhcOverlay.js
@@ -0,0 +1,25 @@
+export const FhcOverlay = {
+	name: 'FhcOverlay',
+	props: {
+		active: {
+			type: Boolean,
+			default: false
+		}	
+	},
+	template: `	
+		<div v-show="active"
+			style="
+				position: fixed;
+				inset: 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: rgba(255,255,255,0.5);
+				z-index: 99999999999;
+				pointer-events: none;
+			">
+			<i class="fa-solid fa-spinner fa-pulse fa-5x"></i>
+		</div>
+	`
+};
+export default FhcOverlay;
\ No newline at end of file

From d001e3c168af5a9307926148a63bf9e957b495ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 20 Nov 2025 13:40:10 +0100
Subject: [PATCH 0978/1357] add option to deactivate livesearch, so the
 searchresult in studvw is shown in tabulator

---
 public/js/components/Stv/Studentenverwaltung.js | 1 +
 public/js/components/searchbar/searchbar.js     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 6c2f7fe1f..2d8473825 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -95,6 +95,7 @@ export default {
 			searchbaroptions: {
 				origin: 'stv',
 				calcheightonly: true,
+				nolivesearch: true,
 				types: {
 					student: Vue.computed(() => this.$p.t('search/type_student')),
 					prestudent: Vue.computed(() => this.$p.t('search/type_prestudent'))
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index e11a3111d..d6c93198e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -304,6 +304,8 @@ export default {
             this.calcSearchResultHeight();
         },
         search: function() {
+            if(this.searchoptions?.nolivesearch === true) return;
+
             this.abort();
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.calcSearchResultExtent();
@@ -417,6 +419,8 @@ export default {
             window.removeEventListener('resize', this.calcSearchResultExtent);
         },
         showsearchresult: function() {
+            if(this.searchoptions?.nolivesearch === true) return;
+
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.showresult = true;
                 window.addEventListener('resize', this.calcSearchResultExtent);

From 6357aca656c75cf90a592c148ae04697d9247ddb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 20 Nov 2025 15:19:36 +0100
Subject: [PATCH 0979/1357] show combine person tab only if permission
 basis/person, restore endpoint handling logic in List.js

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

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 5d076ffc4..3bf48bf5b 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -497,11 +497,15 @@ class Config extends FHCAPI_Controller
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
-		$result['combinePeople'] = [
-			'title' => $this->p->t('stv', 'tab_combine_people'),
-			'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
-			'config' => $config['combinePeople']
-		];
+
+		if($this->permissionlib->isBerechtigt('basis/person'))
+		{
+			$result['combinePeople'] = [
+				'title' => $this->p->t('stv', 'tab_combine_people'),
+				'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
+				'config' => $config['combinePeople']
+			];
+		}
 
 		$result['kontaktieren'] = [
 			'title' => $this->p->t('stv', 'tab_kontaktieren'),
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 689515bbe..11b80efd0 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -374,7 +374,8 @@ export default {
 				encodeURIComponent(this.currentSemester)
 				);
 
-			const params = {};
+			const params = (endpoint?.params !== undefined) ? endpoint.params : {};
+			const method = (endpoint?.method !== undefined) ? endpoint.method : 'get';
 			if (this.filter.length)
 				params.filter = this.filter;
 

From d76e84639fc6ddaeabc0e45190abd7d459fd7787 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 20 Nov 2025 16:18:55 +0100
Subject: [PATCH 0980/1357] neue Phrasen bzw. Phrasenupdate zu
 Abmeldungsgruende Studierendenantrag

---
 .../Studierendenantrag/Form/AbmeldungStgl.js  |  10 +-
 system/phrasesupdate.php                      | 176 +++++++++++++++++-
 2 files changed, 177 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 81106e64c..332c2a16a 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -192,7 +192,15 @@ export default {
 							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
-							</option>	
+							</option>
+							<option value="textLong_Studienwechsel">{{$p.t('studierendenantrag', 'dropdown_Studienwechsel')}}
+							</option>
+							<option value="textLong_Studienabbruch_allgemein">{{$p.t('studierendenantrag', 'dropdown_Studienabbruch_allgemein')}}
+							</option>
+							<option value="textLong_vsCodeOfConduct">{{$p.t('studierendenantrag', 'dropdown_vsCodeOfConduct')}}
+							</option>
+							<option value="textLong_additionalReason">{{$p.t('studierendenantrag', 'dropdown_additionalReason')}}
+							</option>
 <!--
 							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'dropdown_unruly')}}
 							</option>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 096d5086c..72bcfe746 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25019,13 +25019,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'text' => 'Die Zugangsvoraussetzung zum Studium wurde nicht erfüllt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Entry requirements BA (resp. MA) not fulfilled)',
+				'text' => 'The entry requirements for the course were not met.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25059,13 +25059,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Student*in hat nicht bezahlt',
+				'text' => 'Studierende*r hat Studienbeitrag nicht bezahlt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Student has not paid',
+				'text' => 'Student has not paid their tuition fees.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25099,13 +25099,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Student*in hat Prüfunstermine nicht eingehalten',
+				'text' => 'Nichteinhalten von Prüfungsterminen bzw. Abgabeterminen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Student failed to meet exam dates',
+				'text' => 'Failure to meet exam or submission deadlines',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25179,13 +25179,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Zugangsvoraussetzung BA (bzw. MA) nicht erfüllt',
+				'text' => 'Zugangsvoraussetzungen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Entry requirements BA (resp. MA) not fulfilled',
+				'text' => 'Entry requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -25271,6 +25271,166 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_Studienwechsel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienwechsel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Change of studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_Studienwechsel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienwechsel: Der*Die Studierende hat uns mitgeteilt, dass er*sie das Studium wechseln wird und bittet um Abmeldung vom Studium.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Change of studies: The student has informed us that he/she will be changing his/her studies and requests to be deregistered from his/her studies.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_Studienabbruch_allgemein',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemeiner Studienabbruch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'General withdrawal from studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_Studienabbruch_allgemein',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemeiner Studienabbruch: Der*Die Studierende hat uns mitgeteilt, dass er*sie das Studium abbrechen wird und bittet um Abmeldung vom Studium.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'General withdrawal from studies: The student has informed us that he/she will be dropping out of his/her studies and requests to be deregistered from the program.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_vsCodeOfConduct',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verstoß gegen Code of Conduct',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Violation of the Code of Conduct',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_vsCodeOfConduct',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verstoß gegen Code of Conduct',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Violation of the Code of Conduct',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_additionalReason',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Grund zutreffend, Details:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No reason applies, details:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_additionalReason',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Grund zutreffend, Details:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No reason applies, details:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',

From dd92c815dac414c2224d611386a6aae2d1ee122d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 20 Nov 2025 18:59:44 +0100
Subject: [PATCH 0981/1357] fix back button behavior in studvw and lvverwaltung

---
 .../components/LVVerwaltung/LVVerwaltung.js   |  7 +++-
 .../js/components/Stv/Studentenverwaltung.js  | 14 ++++++-
 .../Stv/Studentenverwaltung/Verband.js        | 42 +++++++++++--------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index f9b153ead..7f394a01d 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -124,6 +124,10 @@ export default {
 					? `${this.stg}/${this.semester}`
 					: this.stg;
 			}
+			else
+			{
+				this.selectedStudiengang = '';
+			}
 			this.filter = filter;
 		},
 		handleRowClicked(data)
@@ -163,6 +167,7 @@ export default {
 			const routeName = this.filter.emp ? 'byEmp' : 'byStg';
 			const params = { stg };
 
+			params.semester = '';
 			if (semester !== null)
 				params.semester = semester;
 			if (studiensemester_kurzbz)
@@ -281,7 +286,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-					<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester vnull-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 2d8473825..74ae8b01f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -356,6 +356,18 @@ export default {
 					});
 				}
 			}
+			else
+			{
+				this.studiengangKz = undefined;
+				this.studiengangKuerzel = '';
+				if(['index', 'studiensemester'].includes(this.$route.name))
+				{
+					if(this.$refs?.stvList?.$refs?.table?.tabulator)
+					{
+						this.$refs.stvList.$refs.table.tabulator.setData([]);
+					}
+				}
+			}
 		},
 		onSearch(e) {
 			const searchsettings = { ...this.$refs.searchbar.searchsettings };
@@ -585,7 +597,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband :preselectedKey="'' + studiengangKz" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index d9c0e1b73..1ff9d2ed9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -16,14 +16,17 @@ export default {
 	inject: {
 		$reloadList: {
 			from: '$reloadList',
-			required: true
+			default: () => {}
 		},
 		currentSemester: {
 			from: 'currentSemester',
 			required: true
 		},
 		appConfig: {
-			from: 'appConfig'
+			from: 'appConfig',
+			default: {
+				number_displayed_past_studiensemester: 5
+			}
 		}
 	},
 	emits: [
@@ -208,22 +211,25 @@ export default {
 			if (!currentNode)
 				return;
 
-			const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
-			if (currentSelectedKey) {
-				if (currentSelectedKey == currentKey)
-					return;
-				/**
-				 * Do not select a new entry if the current is a child of the new one.
-				 * This happens if a child entry of a new stg is selected and the router
-				 * tries to select the stg root entry (because subtrees do not have
-				 * routes yet)
-				 */
-				const isChild = this.findNodeByKey(
-					currentSelectedKey,
-					currentNode.children
-				);
-				if (isChild)
-					return;
+			if(this.selectedKey)
+			{
+				const currentSelectedKey = Object.keys(this.selectedKey).find(Boolean);
+				if (currentSelectedKey) {
+					if (currentSelectedKey == currentKey)
+						return;
+					/**
+					 * Do not select a new entry if the current is a child of the new one.
+					 * This happens if a child entry of a new stg is selected and the router
+					 * tries to select the stg root entry (because subtrees do not have
+					 * routes yet)
+					 */
+					const isChild = this.findNodeByKey(
+						currentSelectedKey,
+						currentNode.children || []
+					);
+					if (isChild)
+						return;
+				}
 			}
 
 			for (let i = 1; i < parts.length; i++)

From be35fd5313721c947f30e871a7171b5efd6e465f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 20 Nov 2025 19:09:31 +0100
Subject: [PATCH 0982/1357] fix typo

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

diff --git a/public/js/components/LVVerwaltung/LVVerwaltung.js b/public/js/components/LVVerwaltung/LVVerwaltung.js
index 7f394a01d..42c50bdfa 100644
--- a/public/js/components/LVVerwaltung/LVVerwaltung.js
+++ b/public/js/components/LVVerwaltung/LVVerwaltung.js
@@ -286,7 +286,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband :preselectedKey="selectedStudiengang" :endpoint="endpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-					<stv-studiensemester vnull-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester v-model:studiensemester-kurzbz="selectedStudiensemester" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">

From d916c6ab3170cc8d8f00d62d57efba7262d3130d Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 21 Nov 2025 08:27:05 +0100
Subject: [PATCH 0983/1357] make Pruefung->insertPruefung() behave exactly like
 old FAS

---
 .../api/frontend/v1/stv/Pruefung.php          | 205 +++++++++---------
 .../Details/Pruefung/Pruefunglist.js          |   5 +-
 2 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
index e205c85b8..1cdbf86bd 100644
--- a/application/controllers/api/frontend/v1/stv/Pruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 /**
  * This controller operates between (interface) the JS (GUI) and the back-end
  * Provides data to the ajax get calls about addresses
@@ -111,7 +113,7 @@ class Pruefung extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'global', 'ui','lehre'
+			'global', 'ui', 'lehre', 'exam'
 		]);
 	}
 
@@ -172,15 +174,7 @@ class Pruefung extends FHCAPI_Controller
 	 *
 	 * @param lehrveranstaltung_id, student_uid, lehreinheit_id
 	 *
-	 * @return values on success
-	 * 			retval 0: pruefung inserted
-	 * 			reval 1: pruefung and zeugnisnote inserted
-	 * 			retval 2: pruefung inserted, no insert Zeugnisnote
-	 * 					(change after date of examination)
-	 * 			retval 3: pruefung of type Termin2 inserted
-	 * 						and pruefung of type Termin1 as well
-	 *			retval 5: prueufungen Termin 2 and 1 inserted
-	 * 						and no insert Zeugnisnote (change after date of examination)
+	 * @return void
 	 */
 	public function insertPruefung()
 	{
@@ -188,9 +182,6 @@ class Pruefung extends FHCAPI_Controller
 
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
-		]);
 		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
 		]);
@@ -208,20 +199,57 @@ class Pruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		//calculate studiensemester_kurzbz this from lehreinheit (case newPruefung)
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-		if (!$studiensemester_kurzbz)
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$this->PruefungModel->db->trans_start();
+
+		if ($this->input->post('pruefungstyp_kurzbz') == "Termin2")
 		{
-			$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+			//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
+			//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
+			$resultP = $this->PruefungModel->loadWhere(array(
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'pruefungstyp_kurzbz' => 'Termin1'));
 
-			$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
-
-			$lehreinheit = $this->getDataOrTerminateWithError($result);
-			$studiensemester_kurzbz = current($lehreinheit)->studiensemester_kurzbz;
-
-			if (isError($result))
+			$termin1 = $this->getDataOrTerminateWithError($resultP);
+			if (!$termin1)
 			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				//check if existing Zeugnisnote
+				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
+
+				$this->ZeugnisnoteModel->db->where(
+					'lehre.tbl_zeugnisnote.studiensemester_kurzbz',
+					'lehre.tbl_lehreinheit.studiensemester_kurzbz',
+					false
+				);
+				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
+					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+					'student_uid' => $this->input->post('student_uid')
+				));
+
+				$zeugnisnoten = $this->getDataOrTerminateWithError($resultP);
+				if ($zeugnisnoten)
+				{
+					$zeugnisnote = current($zeugnisnoten);
+
+					$resultN = $this->PruefungModel->insert([
+						'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+						'student_uid' => $this->input->post('student_uid'),
+						'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+						'datum' => $zeugnisnote->benotungsdatum,
+						'pruefungstyp_kurzbz' => 'Termin1',
+						'note' => $zeugnisnote->note,
+						'punkte' => $zeugnisnote->punkte,
+						'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
+						'insertamum' => date('c'),
+						'insertvon' => $authUID,
+					]);
+
+					$this->getDataOrTerminateWithError($resultN);
+				}
+				//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
+				//1.Termin angelegt
 			}
 		}
 
@@ -235,111 +263,90 @@ class Pruefung extends FHCAPI_Controller
 			'anmerkung' => $this->input->post('anmerkung'),
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
+			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
 		]);
 
 		$this->getDataOrTerminateWithError($result);
 
-		//check if existing zeugnisnote
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		//get studiensemester_kurzbz and lehreveranstaltung_id from lehreinheit
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 
-		$result = $this->ZeugnisnoteModel->loadWhere(array(
-			'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz));
+		$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
 
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$lehreinheiten = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehreinheiten) {
+			$this->terminateWithValidationErrors([
+				'lehreinheit_id' => $this->p->t('ui', 'error_fieldNotFound', [
+					'field' => $this->p->t('lehre', 'lehreinheit')
+				])
+			]);
 		}
+		$lehreinheit = current($lehreinheiten);
+		$studiensemester_kurzbz = $lehreinheit->studiensemester_kurzbz;
+		$lehrveranstaltung_id = $lehreinheit->lehrveranstaltung_id;
 
-		if (!hasData($result))
+		//check if existing zeugnisnote
+		$result = $this->ZeugnisnoteModel->loadWhere(array(
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$zeugnisnoten = $this->getDataOrTerminateWithError($result);
+
+		if (!$zeugnisnoten)
 		{
 			//insert zeugnisnote, if not existing
 			$result = $this->ZeugnisnoteModel->insert(array(
-				'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+				'lehrveranstaltung_id' => $lehrveranstaltung_id,
 				'student_uid' => $this->input->post('student_uid'),
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
 				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
-				'insertvon' =>  $authUID
+				'insertvon' =>  $authUID,
+				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
 			));
 
-			if (isError($result))
-			{
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-			}
-			$this->terminateWithSuccess(1);
+			$this->getDataOrTerminateWithError($result);
+
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess();
 		}
 
-		$return_code = 0;
-
-		//handling Termin1 if not existing
-		if($this->input->post('pruefungstyp_kurzbz') == "Termin2")
-		{
-			$resultP = $this->PruefungModel->loadWhere(array(
-				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'pruefungstyp_kurzbz' => 'Termin1'));
-
-			if (isError($resultP))
-			{
-				$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
-			}
-			if(!hasData($resultP))
-			{
-				//check if existing Zeugnisnote
-				$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
-
-				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
-					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-					'student_uid' => $this->input->input->post('student_uid'),
-					'lehre.tbl_zeugnisnote.studiensemester_kurzbz' => $studiensemester_kurzbz));
-				if (isError($resultP))
-				{
-					$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
-				}
-				if (!hasData($resultP))
-				{
-					$this->terminateWithError("Zeugnisnote existiert nicht", self::ERROR_TYPE_GENERAL);
-				}
-				$dataNote = current(getData($resultP));
-
-				$resultN = $this->PruefungModel->insert([
-					'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-					'student_uid' => $this->input->post('student_uid'),
-					'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-					'datum' => $dataNote->benotungsdatum,
-					'pruefungstyp_kurzbz' => 'Termin1',
-					'note' => $dataNote->note,
-					'punkte' => $dataNote->punkte,
-					'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
-					'insertamum' => date('c'),
-					'insertvon' => $authUID,
-				]);
-
-				if (isError($resultN)) {
-					$this->terminateWithError(getError($resultN), self::ERROR_TYPE_GENERAL);
-				}
-				$return_code = 3;
-			}
-		}
-
-		$note = current(getData($result));
+		$note = current($zeugnisnoten);
 		$uebernahmedatum = new DateTime($note->uebernahmedatum);
 		$benotungsdatum = new DateTime($note->benotungsdatum);
 
-		$checkDate = $uebernahmedatum  === '' || $benotungsdatum  > $uebernahmedatum
+		$checkDate = $uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
 			? $benotungsdatum
 			: $uebernahmedatum;
 
 		if ($checkDate >= $this->input->post('datum') && $note !== $note->note)
 		{
-			$this->terminateWithSuccess($return_code + 2);
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
 		}
-		$this->terminateWithSuccess($return_code + 2);
+		
+		//update zeugnisnote, if existing and valid datum
+		$result = $this->ZeugnisnoteModel->update([
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		], [
+			'note' => $this->input->post('note'),
+			'uebernahmedatum' => date('c'),
+			'benotungsdatum' => $this->input->post('datum'),
+			'updateamum' => date('c'),
+			'updatevon' =>  $authUID,
+			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+		]);
+
+
+		$this->PruefungModel->db->trans_complete();
+		$this->terminateWithSuccess();
 	}
 
 	/**
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 4dd3139ab..c0c3fd448 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -229,9 +229,8 @@ export default{
 			return this.$refs.examData
 				.call(ApiStvExam.addPruefung(this.pruefungData))
 				.then(response => {
-					this.checkData = response.data;
-					if (this.checkData === 2 || this.checkData === 5)
-						this.$fhcAlert.alertInfo(this.$p.t('exam', 'hinweis_changeAfterExamDate'));
+					if (response.data)
+						this.$fhcAlert.alertDefault('info', 'Info', response.data, true);
 					else
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('pruefungModal');

From 1666ba82b2bb940fc3ae8ec9ff39a8cc9bfc09b7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 21 Nov 2025 10:42:13 +0100
Subject: [PATCH 0984/1357] Bugfix: correct compare values in
 Pruefung->insertPruefung()

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

diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
index 1cdbf86bd..56f0d9597 100644
--- a/application/controllers/api/frontend/v1/stv/Pruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -324,7 +324,7 @@ class Pruefung extends FHCAPI_Controller
 			? $benotungsdatum
 			: $uebernahmedatum;
 
-		if ($checkDate >= $this->input->post('datum') && $note !== $note->note)
+		if ($checkDate >= $this->input->post('datum') && $this->input->post('note') !== $note->note)
 		{
 			$this->PruefungModel->db->trans_complete();
 			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
@@ -344,7 +344,6 @@ class Pruefung extends FHCAPI_Controller
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
 		]);
 
-
 		$this->PruefungModel->db->trans_complete();
 		$this->terminateWithSuccess();
 	}

From 7eee6d51aaab72080b6c0a1af1b75539b2985486 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 21 Nov 2025 10:55:01 +0100
Subject: [PATCH 0985/1357] clear tabulator when returning to index or
 studiensemester route from search route

---
 .../js/components/Stv/Studentenverwaltung.js  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 74ae8b01f..982605da0 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -337,6 +337,19 @@ export default {
 				this.$refs.searchbar.searchsettings.types = searchsettings.types;
 				this.$nextTick(this.blurSearchbar);
 			}
+			else
+			{
+				this.clearTabulator();
+			}
+		},
+		clearTabulator() {
+			if(['index', 'studiensemester'].includes(this.$route.name))
+			{
+				if(this.$refs?.stvList?.$refs?.table?.tabulator)
+				{
+					this.$refs.stvList.$refs.table.tabulator.setData([]);
+				}
+			}
 		},
 		checkUrlStudiengang() {
 			if (this.url_studiengang) {
@@ -360,13 +373,7 @@ export default {
 			{
 				this.studiengangKz = undefined;
 				this.studiengangKuerzel = '';
-				if(['index', 'studiensemester'].includes(this.$route.name))
-				{
-					if(this.$refs?.stvList?.$refs?.table?.tabulator)
-					{
-						this.$refs.stvList.$refs.table.tabulator.setData([]);
-					}
-				}
+				this.clearTabulator();
 			}
 		},
 		onSearch(e) {

From 3b7ed523b47a383a5091331876d7c85c3dae14a5 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 21 Nov 2025 12:36:03 +0100
Subject: [PATCH 0986/1357] postStudentProjektarbeitZusatzdaten in detail view
 for Betreuer/Assistenz;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  51 +++-
 public/js/api/factory/abgabe.js               |   8 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 261 +++++++++++++++---
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  20 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |   4 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  21 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 system/phrasesupdate.php                      |  28 +-
 8 files changed, 323 insertions(+), 72 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 349a60985..0cef197fe 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -41,9 +41,8 @@ class Abgabe extends FHCAPI_Controller
 			'getNoten' => self::PERM_LOGGED,
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
-			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
-//			'notifyStudentMail' => self::PERM_LOGGED,
-//			'notifyBetreuerMail' => self::PERM_LOGGED
+			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
 			]);
 
 		$this->load->library('PhrasesLib');
@@ -254,7 +253,7 @@ class Abgabe extends FHCAPI_Controller
 			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz)
 			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
 			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
-			|| !isset($seitenanzahl))
+			|| !isset($seitenanzahl) || !isset($sprache))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 
 		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
@@ -985,6 +984,50 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
+	public function postStudentProjektarbeitZusatzdaten(){
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		
+		$sprache = $_POST['sprache'];
+		$abstract = $_POST['abstract'];
+		$abstract_en = $_POST['abstract_en'];
+		$schlagwoerter = $_POST['schlagwoerter'];
+		$schlagwoerter_en = $_POST['schlagwoerter_en'];
+		$seitenanzahl = $_POST['seitenanzahl'];
+
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
+			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
+			|| !isset($seitenanzahl) || !isset($sprache)) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+			
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+
+		if(count($projektarbeitArr) > 0) {
+			$projektarbeit = $projektarbeitArr[0];
+		} else {
+			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+		}
+		
+		// update projektarbeit cols
+		$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
+			,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
+
+		$this->logLib->logInfoDB(array('zusatzdatenEditMitarbeiter', array(
+			'updatevon' => getAuthUID(),
+			'updateamum' => date('Y-m-d H:i:s')
+		), getAuthUID(), getAuthPersonId(), array($projektarbeit_id,$sprache,$abstract,$abstract_en
+		,$schlagwoerter, $schlagwoerter_en, $seitenanzahl)));
+				
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		
+		$this->terminateWithSuccess($result);
+	}
+	
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
 			return;
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 6f86939b5..21852349b 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -108,5 +108,13 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/Abgabe/getStudiengaenge'
 		};
+	},
+	postStudentProjektarbeitZusatzdaten(formData) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitZusatzdaten',
+			params: formData,
+			config: {Headers: { "Content-Type": "multipart/form-data" }}
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 8109bf05d..2acf9e719 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -64,7 +64,16 @@ export const AbgabeMitarbeiterDetail = {
 				icon: "fa fa-eye",
 				command: this.openStudentPage
 			}],
-			newTermin: null
+			newTermin: null,
+			form: Vue.reactive({
+				sprache: '',
+				abstract: '',
+				abstract_en: '',
+				schlagwoerter: '',
+				schlagwoerter_en: '',
+				kontrollschlagwoerter: '',
+				seitenanzahl: 1,
+			})
 		}
 	},
 	methods: {
@@ -89,6 +98,7 @@ export const AbgabeMitarbeiterDetail = {
 						...res.data[0]
 					}
 					if(newTerminRes.note) newTerminRes.note = noteOpt
+					newTerminRes.invertedFixtermin = !newTerminRes.fixtermin
 					const existingTerminRes = res.data[1]
 					
 					const abgabeOpt = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz == newTerminRes.paabgabetyp_kurzbz)
@@ -148,6 +158,104 @@ export const AbgabeMitarbeiterDetail = {
 				}
 			})
 		},
+		openZusatzdatenModal() {
+			this.$refs.modalContainerZusatzdaten.show()
+		},
+		async saveZusatzdaten(){
+			if (!await this.validateZusatzdaten())
+			{
+				return false;
+			}
+			
+			const pa = this.projektarbeit
+
+			// post endabgabe
+			const formData = new FormData();
+			formData.append('projektarbeit_id', this.projektarbeit.projektarbeit_id);
+
+			formData.append('sprache', this.form['sprache'].sprache)
+			formData.append('abstract', this.form['abstract'])
+			formData.append('abstract_en', this.form['abstract_en'])
+			formData.append('schlagwoerter', this.form['schlagwoerter'])
+			formData.append('schlagwoerter_en', this.form['schlagwoerter_en'])
+			formData.append('seitenanzahl', this.form['seitenanzahl'])
+			
+			this.loading = true
+			this.$api.call(ApiAbgabe.postStudentProjektarbeitZusatzdaten(formData))
+				.then(res => {
+					if(res.meta.status == 'success') {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
+						if(!data?.retval?.[0]) return
+						const paRes = data.retval[0]
+						pa.seitenanzahl = paRes.seitenanzahl ?? 1
+						pa.kontrollschlagwoerter = paRes.kontrollschlagwoerter ?? ''
+						pa.schlagwoerter = paRes.schlagwoerter ?? ''
+						pa.sprache = paRes.sprache ?? ''
+						pa.schlagwoerter_en = paRes.schlagwoerter_en ?? ''
+						pa.abstract = paRes.abstract ?? ''
+						pa.abstract_en = paRes.abstract_en ?? ''
+					}
+					
+				}).finally(()=> {
+				this.loading = false
+			})
+
+			this.$refs.modalContainerZusatzdaten.hide()
+		},
+		async validateZusatzdaten() {
+			// check these input fields for length of entry
+			if(this.form['abstract'].length < 100 && await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/warningShortAbstract'),
+				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+				acceptClass: 'btn btn-danger',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			}
+
+			if(this.form['abstract_en'].length < 100 && await this.$fhcAlert.confirm({
+				message: this.$capitalize(this.$p.t('abgabetool/warningShortAbstractEn')),
+				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+				acceptClass: 'btn btn-danger',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			}
+
+			if(this.form['schlagwoerter'].length < 50 && await this.$fhcAlert.confirm({
+				message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerter')),
+				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+				acceptClass: 'btn btn-danger',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			}
+
+			if(this.form['schlagwoerter_en'].length < 50 && await this.$fhcAlert.confirm({
+				message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerterEn')),
+				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+				acceptClass: 'btn btn-danger',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			}
+
+			if(this.form['seitenanzahl'] <= 5 && await this.$fhcAlert.confirm({
+				message: this.$capitalize(this.$p.t('abgabetool/warningSmallSeitenanzahl')),
+				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+				acceptClass: 'btn btn-danger',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'btn btn-outline-secondary'
+			}) === false) {
+				return false
+			}
+			
+			return true
+		},
 		async handleDeleteTermin(termin){
 			if(await this.$fhcAlert.confirm({
 				message: this.$p.t('abgabetool/c4confirm_delete'),
@@ -466,7 +574,17 @@ export const AbgabeMitarbeiterDetail = {
 			// set invertedFixtermin field for UI/UX purposes -> avoid double negation in text
 			
 			newVal?.abgabetermine?.forEach(termin => termin.invertedFixtermin = !termin.fixtermin)
-		}
+			
+			// default select german if projektarbeit sprache was null
+			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
+			this.form.abstract = newVal.abstract ?? ''
+			this.form.abstract_en = newVal.abstract_en ?? ''
+			this.form.schlagwoerter = newVal.schlagwoerter ?? ''
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
+			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
+			
+		},
 	},
 	created() {
 
@@ -475,7 +593,7 @@ export const AbgabeMitarbeiterDetail = {
 
 	},
 	template: `
-	<bs-modal 
+	<bs-modal
 		id="innerModalNewAbgabe" 
 		ref="modalContainerCreateNewAbgabe" 
 		class="bootstrap-prompt" 
@@ -492,7 +610,7 @@ export const AbgabeMitarbeiterDetail = {
 			<div v-if="showAutomagicModalPhrase" class="text-center"><p>{{$p.t('abgabetool/c4abgabeQualGateNegativAddNewAutomagisch')}}</p></div>
 			<div v-if="newTermin">
 				<div v-if="assistenzMode" class="row">
-					<div class="col-4 col-md-3 fw-bold">{{$p.t('abgabetool/c4fixterminv4')}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{$p.t('abgabetool/c4fixterminv4')}}</div>
 					<div class="col-8 col-md-9">
 						<Checkbox 
 							v-model="newTermin.invertedFixtermin"
@@ -503,7 +621,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 					<div class="col-8 col-md-9">
 						<VueDatePicker
 							v-model="newTermin.datum"
@@ -516,7 +634,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 					<div class="col-8 col-md-9">
 						<Dropdown
 							:style="{'width': '100%'}"
@@ -528,7 +646,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
 					<div class="col-8 col-md-9">
 						<Checkbox
 							v-model="newTermin.upload_allowed"
@@ -539,7 +657,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 					<div class="col-8 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
@@ -552,18 +670,6 @@ export const AbgabeMitarbeiterDetail = {
 	</bs-modal>
 
 	<div v-if="projektarbeit">
-<!--		<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">-->
-<!--			<SpeedDial-->
-<!--				:style="getSpeedDialStyle"-->
-<!--				:model="speedDialItems" -->
-<!--				direction="up"-->
-<!--				:radius="80"-->
-<!--				type="linear"-->
-<!--				buttonClass="p-button-rounded p-button-lg p-button-primary"-->
-<!--				:tooltipOptions="{ position: 'left' }"-->
-<!--			/>-->
-<!--		</div>-->
-		
 		<h5>{{$capitalize( $p.t('abgabetool/c4abgabeMitarbeiterbereich') )}}</h5>
 
 		<div class="row">
@@ -573,7 +679,6 @@ export const AbgabeMitarbeiterDetail = {
 				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 			</div>
 			<div class="col-6 d-flex justify-content-end align-items-start">
-<!--				<div id="speedDialWrapper" :style="getSpeedDialWrapperStyle">-->
 				<SpeedDial
 					:model="speedDialItems" 
 					direction="left"
@@ -583,12 +688,9 @@ export const AbgabeMitarbeiterDetail = {
 					:tooltipOptions="{ position: 'down' }"
 				>
 					<template #icon>
-
 						<i class="fa-solid fa-bars"></i>
-
 					</template>
 				</SpeedDial>
-<!--				</div>-->
 			</div>
 		</div>
 		<div class="row" style="margin-bottom: 12px;">
@@ -597,6 +699,13 @@ export const AbgabeMitarbeiterDetail = {
 					<i class="fa-solid fa-plus"></i>
 					{{$capitalize( $p.t('abgabetool/c4newAbgabetermin') )}}
 				</button>
+				
+			</div>
+			<div class="col-auto">
+				<button type="button" class="btn btn-primary ml-4" @click="openZusatzdatenModal">
+					<i class="fa-solid fa-pen-to-square"></i>
+					{{$capitalize( $p.t('abgabetool/c4ZusatzdatenBearbeiten') )}}
+				</button>
 			</div>
 		</div>
 		<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
@@ -626,7 +735,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>				
 					</template>
 					<div class="row mt-2" v-if="assistenzMode">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
 						<div class="col-12 col-md-9">
 							<Checkbox 
 								v-model="termin.invertedFixtermin"
@@ -637,7 +746,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 						<div class="col-12 col-md-9">
 							<VueDatePicker
 								v-model="termin.datum"
@@ -651,7 +760,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 						<div class="col-12 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
@@ -666,7 +775,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2'">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
 						<div class="col-12 col-md-9">
 							<Checkbox
 								v-model="termin.upload_allowed"
@@ -677,7 +786,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
 						<div class="col-12 col-md-9">
 							<Dropdown
 								:style="{'width': '100%'}"
@@ -688,20 +797,20 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
 						<div class="col-12 col-md-9">
 							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 						<div class="col-12 col-md-9">
 							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" class="w-100" rows="1" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 						<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
 								<div class="row">
@@ -737,7 +846,7 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold">
+						<div class="col-12 col-md-3 fw-bold align-content-center">
 								 {{ $capitalize( $p.t('abgabetool/c4actions') )}}
 						</div>
 						<div class="col-12 col-md-9">
@@ -777,6 +886,92 @@ export const AbgabeMitarbeiterDetail = {
 			<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
 		</div>
 		
+		<bs-modal 
+	 		ref="modalContainerZusatzdaten"
+	 		class="bootstrap-prompt"
+	 		dialogClass="bordered-modal modal-lg">
+			<template v-slot:title>
+				<div>
+					{{$capitalize( $p.t('abgabetool/c4enduploadZusatzdaten') )}}
+				</div>
+				<div class="row mb-3 align-items-start">
+					
+					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
+				
+				</div>
+				<div class="row mb-3 align-items-start">
+					
+					<p class="ml-4 mr-4">{{$capitalize( $p.t('abgabetool/c4titel') )}}: {{ projektarbeit?.titel }}</p>
+				
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4Sprache') )}}</div>
+					<div class="row">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="form.sprache"
+							:options="allActiveLanguages"
+							:optionLabel="getOptionLabelSprache">
+						</Dropdown>
+					</div>
+				</div>
+<!--				 lektor fills these out-->
+<!--				<div class="row mb-3 align-items-start">-->
+<!--					<div class="row">Kontrollierte Schlagwörter</div>-->
+<!--					<div class="row">-->
+<!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
+<!--					</div>-->
+<!--					-->
+<!--				-->
+<!--				</div>-->
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterGer') )}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter" class="w-100"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterEng') )}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter_en" class="w-100"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractGer') )}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract" rows="10" maxlength="5000" class="w-100"></Textarea>
+						<p>{{ form.abstract?.length ? form.abstract.length : 0 }} / 5000 characters</p>
+					</div>
+				</div>
+
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4abstractEng') )}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract_en" rows="10" maxlength="5000" class="w-100"></Textarea>
+						<p>{{ form.abstract_en?.length ? form.abstract_en.length : 0 }} / 5000 characters</p>
+					</div>				
+				</div>
+				
+				<div class="row mb-3 align-items-start">
+					<div class="row">{{$capitalize( $p.t('abgabetool/c4seitenanzahl') )}}</div>
+					<div class="row">
+						<InputNumber 
+							v-model="form.seitenanzahl"
+							inputId="seitenanzahlInput" :min="1" :max="100000">
+						</InputNumber>
+					</div>		
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button class="btn btn-primary" @click="saveZusatzdaten">{{ $capitalize( $p.t('abgabetool/c4save') )}}</button>
+			</template>
+		</bs-modal>
+		
 	</div>
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 79b86023c..cbf4dea83 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -412,15 +412,15 @@ export const AbgabeStudentDetail = {
 								<template #content>
 									<div class="col-auto">
 										<div class="row">
-											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4abgabeZeitstatus')) }}</div>
+											<div class="col-12 col-md-3 fw-bold align-content-center">{{ $capitalize($p.t('abgabetool/c4abgabeZeitstatus')) }}</div>
 											<div class="col-12 col-md-9">{{$p.t('abgabetool/c4tooltip' + $capitalize(termin?.dateStyle) )}}</div>
 										</div>
 										<div class="row">
-											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4fixterminv4')) }}</div>
+											<div class="col-12 col-md-3 fw-bold align-content-center">{{ $capitalize($p.t('abgabetool/c4fixterminv4')) }}</div>
 											<div class="col-12 col-md-9">{{!termin?.fixtermin}}</div>
 										</div>
 										<div class="row">
-											<div class="col-12 col-md-3 fw-bold">{{ $capitalize($p.t('abgabetool/c4fileUploaded')) }}</div>
+											<div class="col-12 col-md-3 fw-bold align-content-center">{{ $capitalize($p.t('abgabetool/c4fileUploaded')) }}</div>
 											<div class="col-12 col-md-9">{{termin?.abgabedatum !== null}}</div>
 										</div>
 									</div>
@@ -431,7 +431,7 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 							<div class="col-12 col-md-9">
 								<VueDatePicker
 									v-model="termin.datum"
@@ -446,14 +446,14 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabetypv2') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 							<div class="col-12 col-md-9">
 								{{ termin.bezeichnung }}
 							</div>
 						</div>
 						
 						<div class="row mt-2" v-if="termin.note">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
 							<div class="col-12 col-md-9">
 								<div class="col-1 d-flex justify-content-start align-items-start">
 									{{ getTerminNoteBezeichnung(termin) }}
@@ -462,21 +462,21 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2" v-if="termin.paabgabetyp_kurzbz === 'qualgate1' || termin.paabgabetyp_kurzbz === 'qualgate2'">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
 							<div class="col-12 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" disabled></Textarea>
 							</div>
 						</div>
 						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
 							<div class="col-12 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" class="w-100" :disabled="true"></Textarea>
 							</div>
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 							<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
 								<div class="row">
@@ -508,7 +508,7 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2" v-if="termin.upload_allowed">
-							<div class="col-12 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4fileupload') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4fileupload') )}}</div>
 							<div class="col-12 col-md-9">
 								<div class="row" v-if="termin?.allowedToUpload">
 									<div class="col-12 col-sm-6 mb-2">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index a86349b55..0ba4c7fec 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -665,7 +665,7 @@ export const AbgabetoolAssistenz = {
 			
 			const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
 			
-			this.$refs.abgabeTable.tabulator.clearData()
+			// this.$refs.abgabeTable.tabulator.clearData()
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(mappedData);
 		},
@@ -832,7 +832,7 @@ export const AbgabetoolAssistenz = {
 						{{$capitalize($p.t('abgabetool/c4zieldatum'))}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabetypv2')}}
+						{{$p.t('abgabetool/c4abgabetyp')}}
 					</div>
 					<div class="col-5 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabekurzbz')}}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index d444ba7a8..9a155492c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -87,7 +87,7 @@ export const AbgabetoolMitarbeiter = {
 					},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -215,27 +215,12 @@ export const AbgabetoolMitarbeiter = {
 				pa.abgabetermine = res.data[0].retval
 				pa.isCurrent = res.data[1]
 				
-				// pa.abgabetermine.push({ // new abgatermin row
-				//
-				// 	'paabgabe_id': -1,
-				// 	'projektarbeit_id': pa.projektarbeit_id,
-				// 	'fixtermin': false,
-				// 	'kurzbz': '',
-				// 	'datum': new Date().toISOString().split('T')[0],
-				// 	'note': this.allowedNotenOptions.find(opt => opt.note == 9),
-				// 	'upload_allowed': false,
-				// 	'paabgabetyp_kurzbz': '',
-				// 	'bezeichnung': '',
-				// 	'abgabedatum': null,
-				// 	'insertvon': this.viewData?.uid ?? ''
-				//	
-				// })
-				
 				pa.abgabetermine.forEach(termin => {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
 					
 					// lektoren are only allowed to edit their own deadline entries
+					// TODO: cis old
 					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
 					
 					// lektoren are not allowed to delete deadlines with existing submissions
@@ -417,7 +402,7 @@ export const AbgabetoolMitarbeiter = {
 						{{$p.t('abgabetool/c4zieldatum')}}
 					</div>
 					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabetypv2')}}
+						{{$p.t('abgabetool/c4abgabetyp')}}
 					</div>
 					<div class="col-6 d-flex justify-content-center align-items-center">
 						{{$p.t('abgabetool/c4abgabekurzbz')}}
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 3ec564c6c..274d94120 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -36,7 +36,7 @@ export const DeadlineOverview = {
 				columns: [
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zieldatum'))), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4fixterminv4'))), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabetypv2'))), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabetyp'))), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabekurzbz'))), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('person/studentIn'))), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 45c6e1800..b615fbbd9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42845,13 +42845,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Alle anzeigen",
+				'text' => "Alle betreuten Projektarbeiten anzeigen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Show All',
+				'text' => 'Show all supervised project work',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42865,13 +42865,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Deadlines anzeigen",
+				'text' => "Deadline Übersicht anzeigen ",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Show Deadlines',
+				'text' => 'Show Deadline Overview',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43329,6 +43329,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4ZusatzdatenBearbeiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zusatzdaten bearbeiten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit additional Data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 4964a2c06d5fa642692b26f81e92d236bbe799c8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 24 Nov 2025 09:40:33 +0100
Subject: [PATCH 0987/1357] set tabulator layout to fitDataStretchFrozen when
 frozen columns are defined, change css classes to display disabled status use
 the same as in students list

---
 public/js/components/Messages/Details/TableMessages.js      | 5 +++--
 .../Details/Abschlusspruefung/Abschlusspruefung.js          | 4 ++--
 .../Details/Anrechnungen/Anrechnungen.js                    | 4 ++--
 .../Details/Aufnahmetermine/Aufnahmetermine.js              | 4 ++--
 .../Studentenverwaltung/Details/Mobility/List/Purpose.js    | 4 ++--
 .../Studentenverwaltung/Details/Mobility/List/Support.js    | 4 ++--
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js    | 4 ++--
 .../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js        | 3 ++-
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 6 +++---
 .../Details/Projektarbeit/Projektarbeit.js                  | 4 ++--
 .../Details/Projektarbeit/Projektbetreuer.js                | 4 ++--
 11 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 2a12128eb..3b3ca39b5 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -132,9 +132,10 @@ export default {
 						frozen: true
 					}
 					],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData:	false,
 				height: '400',
+				selectable: 1,
 				selectableRangeMode: 'click',
 				index: 'message_id',
 				pagination: true,
@@ -147,7 +148,7 @@ export default {
 				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
 				dataTreeChildIndent: 15,
 				dataTreeStartExpanded: false,
-				persistenceID: 'core-message',
+				persistenceID: 'core-message-2025112401',
 				locale: 'de',
 				"langs": {
 					"de":{ //German language definition
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 6e862fc01..6ed710c29 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -163,12 +163,12 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '200',
 				index: 'abschlusspruefung_id',
-				persistenceID: 'stv-details-finalexam'
+				persistenceID: 'stv-details-finalexam-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 4c29cec3e..a2029b0b9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -107,10 +107,10 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				height: '500',
 				index: 'anrechnung_id',
-				persistenceID: 'stv-details-anrechnungen'
+				persistenceID: 'stv-details-anrechnungen-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 266c6774e..d03569df4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -120,12 +120,12 @@ export default {
 						frozen: true
 					}
 				],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: 200,
 				index: 'aufnahmetermin_id',
-				persistenceID: 'stv-details-table_admission-dates'
+				persistenceID: 'stv-details-table_admission-dates-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
index 296d29e8d..f877eea78 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
@@ -71,10 +71,10 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 200,
-				persistenceID: 'core-mobility-purpose'
+				persistenceID: 'core-mobility-purpose-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
index 3ad523073..d61c60007 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
@@ -69,10 +69,10 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 200,
-				persistenceID: 'core-mobility-support'
+				persistenceID: 'core-mobility-support-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index a2b54e7b5..ae7f522b5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -109,12 +109,12 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: 200,
 				index: 'bisio_id',
-				persistenceID: 'stv-details-table_mobiliy'
+				persistenceID: 'stv-details-table_mobiliy-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index d3ca1a25e..4d0996b6b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -217,9 +217,10 @@ export default {
 				},
 				columns,
 				height: '100%',
+				layout: 'fitDataStretchFrozen',
 				selectable: 1,
 				selectableRangeMode: 'click',
-				persistenceID: 'stv-details-noten-zeugnis-2025111801',
+				persistenceID: 'stv-details-noten-zeugnis-2025112401',
 				persistence:{
 					columns: ["width", "visible", "frozen"]
 				}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 9f55d26c2..2828faa59 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -227,15 +227,15 @@ export default{
 					const rowData = row.getData();
 					if (this.dataMeldestichtag && this.dataMeldestichtag > rowData.datum)
 					{
-						row.getElement().classList.add('disabled');
+						row.getElement().classList.add('text-black','text-opacity-50','fst-italic');
 					}
 				},
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				selectable: false,
 				index: 'statusId',
-				persistenceID: 'stv-multistatus'
+				persistenceID: 'stv-multistatus-2025112401'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index d4f941e4b..b9a237fba 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -240,7 +240,7 @@ export default {
 						frozen: true
 					},
 				],
-				//layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				height: 'auto',
 				minHeight: '200',
 				selectable: 1,
@@ -248,7 +248,7 @@ export default {
 				persistence:{
 					columns: true, //persist column layout
 				},
-				persistenceID: 'stv-details-projektarbeit'
+				persistenceID: 'stv-details-projektarbeit-2025112401'
 			}
 			return options;
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index adcf2f2a8..4bb007b76 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -115,7 +115,7 @@ export default {
 						frozen: true
 					},
 				],
-				//layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '100',
@@ -125,7 +125,7 @@ export default {
 				persistence:{
 					columns: true, //persist column layout
 				},
-				persistenceID: 'stv-details-projektbetreuer'
+				persistenceID: 'stv-details-projektbetreuer-2025112401'
 			},
 			tabulatorEvents: [
 				{

From 239a9c89d71d531bcc64ec3cd3976f315616dc8d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 24 Nov 2025 09:46:53 +0100
Subject: [PATCH 0988/1357] compare DateTime with DateTime instead of String

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

diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
index 56f0d9597..d68e89532 100644
--- a/application/controllers/api/frontend/v1/stv/Pruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -319,12 +319,13 @@ class Pruefung extends FHCAPI_Controller
 		$note = current($zeugnisnoten);
 		$uebernahmedatum = new DateTime($note->uebernahmedatum);
 		$benotungsdatum = new DateTime($note->benotungsdatum);
+		$pruefungsdatum = new DateTime($this->input->post('datum'));
 
 		$checkDate = $uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
 			? $benotungsdatum
 			: $uebernahmedatum;
 
-		if ($checkDate >= $this->input->post('datum') && $this->input->post('note') !== $note->note)
+		if ($checkDate >= $pruefungsdatum) && $this->input->post('note') !== $note->note)
 		{
 			$this->PruefungModel->db->trans_complete();
 			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));

From cdc1933ce4c16a6f3e241bc7650e8eba34242076 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 24 Nov 2025 09:48:05 +0100
Subject: [PATCH 0989/1357] fix typo

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

diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
index d68e89532..a539a4d79 100644
--- a/application/controllers/api/frontend/v1/stv/Pruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -325,7 +325,7 @@ class Pruefung extends FHCAPI_Controller
 			? $benotungsdatum
 			: $uebernahmedatum;
 
-		if ($checkDate >= $pruefungsdatum) && $this->input->post('note') !== $note->note)
+		if ($checkDate >= $pruefungsdatum && $this->input->post('note') !== $note->note)
 		{
 			$this->PruefungModel->db->trans_complete();
 			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));

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

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

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

From f4ca34f2476c03763d8d99dace3e21053ebcb4a7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Nov 2025 14:14:46 +0100
Subject: [PATCH 0991/1357] remove email sent to alert on serientermin since we
 do this in cronjob now;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 39 +------------------
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  9 +----
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  2 -
 system/phrasesupdate.php                      |  2 +-
 4 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 0cef197fe..1a31ed674 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -744,48 +744,11 @@ class Abgabe extends FHCAPI_Controller
 			$dataAbgabe  = $this->getDataOrTerminateWithError($result);
 			
 			$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
-
-//			$res[] = $data;
-
-			// send mail to student
-			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
-			$data = $this->getDataOrTerminateWithError($result);
-
-//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
-
-			$datetime = new DateTime($datum);
-			$dateEmailFormatted = $datetime->format('d.m.Y');
-
-			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
-
-			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
-			$res[] = $fullFormattedNameString;
-
-			// Prepare mail content
-			$body_fields = array(
-				'anrede' => $data[0]->anrede,
-				'anredeFillString' => $anredeFillString,
-				'datum' => $dateEmailFormatted,
-				'bezeichnung' => $bezeichnung,
-				'fullFormattedNameString' => $fullFormattedNameString,
-				'kurzbz' => $kurzbz
-			);
-
-			$email = $data[0]->uid."@".DOMAIN;
-
-			// TODO: nightly email job informing about new serientermine
-			
-//			sendSanchoMail(
-//				'neuerAbgabetermin',
-//				$body_fields,
-//				$email,
-//				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
-//			);
 		}
 
 		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
 
-		$this->terminateWithSuccess(array($res, $abgaben));
+		$this->terminateWithSuccess($abgaben);
 
 	}
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 0ba4c7fec..bdd613bab 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -412,19 +412,15 @@ export const AbgabetoolAssistenz = {
 				pids,
 				this.serienTermin.fixtermin
 			)).then(res => {
-				// TODO
-				// sticky lifetime somehow
 				
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
-					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
-					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data[0])]));
 				} else {
 					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
 				}
 				
 				// put new abgaben into projektarbeiten
-				const newAbgaben = res.data[1]
+				const newAbgaben = res.data
 				pids.forEach(pid => {
 					const abgabe = newAbgaben.find(abgabe => abgabe.projektarbeit_id == pid)
 					
@@ -444,8 +440,7 @@ export const AbgabetoolAssistenz = {
 				
 				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 				this.$refs.abgabeTable.tabulator.replaceData(mappedData)
-				
-				// this.$refs.abgabeTable.tabulator.redraw(true)
+				this.$refs.abgabeTable.tabulator.redraw(true)
 			}).finally(()=>{
 				this.saving = false
 			})
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 9a155492c..85219fe30 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -184,8 +184,6 @@ export const AbgabetoolMitarbeiter = {
 			)).then(res => {
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
-					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
-					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
 				} else {
 					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
 				}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b615fbbd9..f9e5544ff 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43343,7 +43343,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Edit additional Data',
+				'text' => 'Edit additional data',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 9ac7ff2a4c66fd03754e16720b12085b7ce3f2c4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Nov 2025 14:16:07 +0100
Subject: [PATCH 0992/1357] allowed to upload on endtermin switch to production
 logic (date & quality gates)

---
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 3a7bb7f88..deb0a6f52 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -102,11 +102,11 @@ export const AbgabetoolStudent = {
 					
 					if(termin.paabgabetyp_kurzbz == 'end') {
 						// production logic
-						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
+						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
 						
 						// development purposes
 						// termin.allowedToUpload = this.checkQualityGates(pa.abgabetermine)
-						termin.allowedToUpload = true
+						// termin.allowedToUpload = true
 
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)

From 6b4f5778c2dafd335aa992c70083459050114c54 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 24 Nov 2025 16:26:11 +0100
Subject: [PATCH 0993/1357] refactor stv Pruefung Tab and API endpoint to use
 same logic for insert and update, use luxon lib to initialize datepicker with
 iso date and send iso date format to api endpoint

---
 .../api/frontend/v1/stv/Pruefung.php          | 409 +++++++++---------
 application/views/Studentenverwaltung.php     |   3 +-
 .../Details/Noten/Zeugnis.js                  |   3 +-
 .../Details/Pruefung/Pruefunglist.js          |  38 +-
 4 files changed, 208 insertions(+), 245 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Pruefung.php b/application/controllers/api/frontend/v1/stv/Pruefung.php
index a539a4d79..4521c2033 100644
--- a/application/controllers/api/frontend/v1/stv/Pruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Pruefung.php
@@ -178,175 +178,7 @@ class Pruefung extends FHCAPI_Controller
 	 */
 	public function insertPruefung()
 	{
-		$authUID = getAuthUID();
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
-		]);
-		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
-		]);
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			['is_valid_date']
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
-		$this->PruefungModel->db->trans_start();
-
-		if ($this->input->post('pruefungstyp_kurzbz') == "Termin2")
-		{
-			//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
-			//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
-			$resultP = $this->PruefungModel->loadWhere(array(
-				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'pruefungstyp_kurzbz' => 'Termin1'));
-
-			$termin1 = $this->getDataOrTerminateWithError($resultP);
-			if (!$termin1)
-			{
-				//check if existing Zeugnisnote
-				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
-
-				$this->ZeugnisnoteModel->db->where(
-					'lehre.tbl_zeugnisnote.studiensemester_kurzbz',
-					'lehre.tbl_lehreinheit.studiensemester_kurzbz',
-					false
-				);
-				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
-					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-					'student_uid' => $this->input->post('student_uid')
-				));
-
-				$zeugnisnoten = $this->getDataOrTerminateWithError($resultP);
-				if ($zeugnisnoten)
-				{
-					$zeugnisnote = current($zeugnisnoten);
-
-					$resultN = $this->PruefungModel->insert([
-						'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-						'student_uid' => $this->input->post('student_uid'),
-						'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-						'datum' => $zeugnisnote->benotungsdatum,
-						'pruefungstyp_kurzbz' => 'Termin1',
-						'note' => $zeugnisnote->note,
-						'punkte' => $zeugnisnote->punkte,
-						'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
-						'insertamum' => date('c'),
-						'insertvon' => $authUID,
-					]);
-
-					$this->getDataOrTerminateWithError($resultN);
-				}
-				//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
-				//1.Termin angelegt
-			}
-		}
-
-		$result = $this->PruefungModel->insert([
-			'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-			'student_uid' => $this->input->post('student_uid'),
-			'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-			'datum' => $this->input->post('datum'),
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
-			'insertamum' => date('c'),
-			'insertvon' => $authUID,
-			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-		]);
-
-		$this->getDataOrTerminateWithError($result);
-
-		//get studiensemester_kurzbz and lehreveranstaltung_id from lehreinheit
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
-
-		$lehreinheiten = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehreinheiten) {
-			$this->terminateWithValidationErrors([
-				'lehreinheit_id' => $this->p->t('ui', 'error_fieldNotFound', [
-					'field' => $this->p->t('lehre', 'lehreinheit')
-				])
-			]);
-		}
-		$lehreinheit = current($lehreinheiten);
-		$studiensemester_kurzbz = $lehreinheit->studiensemester_kurzbz;
-		$lehrveranstaltung_id = $lehreinheit->lehrveranstaltung_id;
-
-		//check if existing zeugnisnote
-		$result = $this->ZeugnisnoteModel->loadWhere(array(
-			'lehrveranstaltung_id' => $lehrveranstaltung_id,
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$zeugnisnoten = $this->getDataOrTerminateWithError($result);
-
-		if (!$zeugnisnoten)
-		{
-			//insert zeugnisnote, if not existing
-			$result = $this->ZeugnisnoteModel->insert(array(
-				'lehrveranstaltung_id' => $lehrveranstaltung_id,
-				'student_uid' => $this->input->post('student_uid'),
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'note' => $this->input->post('note'),
-				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $this->input->post('datum'),
-				'insertamum' => date('c'),
-				'insertvon' =>  $authUID,
-				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-			));
-
-			$this->getDataOrTerminateWithError($result);
-
-			$this->PruefungModel->db->trans_complete();
-			$this->terminateWithSuccess();
-		}
-
-		$note = current($zeugnisnoten);
-		$uebernahmedatum = new DateTime($note->uebernahmedatum);
-		$benotungsdatum = new DateTime($note->benotungsdatum);
-		$pruefungsdatum = new DateTime($this->input->post('datum'));
-
-		$checkDate = $uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
-			? $benotungsdatum
-			: $uebernahmedatum;
-
-		if ($checkDate >= $pruefungsdatum && $this->input->post('note') !== $note->note)
-		{
-			$this->PruefungModel->db->trans_complete();
-			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
-		}
-		
-		//update zeugnisnote, if existing and valid datum
-		$result = $this->ZeugnisnoteModel->update([
-			'lehrveranstaltung_id' => $lehrveranstaltung_id,
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		], [
-			'note' => $this->input->post('note'),
-			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $this->input->post('datum'),
-			'updateamum' => date('c'),
-			'updatevon' =>  $authUID,
-			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-		]);
-
-		$this->PruefungModel->db->trans_complete();
-		$this->terminateWithSuccess();
+		$this->insertOrUpdatePruefung();
 	}
 
 	/**
@@ -355,8 +187,6 @@ class Pruefung extends FHCAPI_Controller
 	 * @param pruefung_id
 	 *
 	 * @return success or error
-	 *
-	 * no impact on lehre.tbl_zeugnisnote
 	 */
 	public function updatePruefung($pruefung_id)
 	{
@@ -366,48 +196,7 @@ class Pruefung extends FHCAPI_Controller
 		if (!$oldpruefung)
 			show_404(); // Pruefung that should be updated does not exist
 
-		$authUID = getAuthUID();
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
-		]);
-		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
-		]);
-		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
-		]);
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			['is_valid_date']
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$result = $this->PruefungModel->update(
-			[
-				'pruefung_id' => $pruefung_id
-			],
-			[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' =>  $this->input->post('student_uid'),
-				'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
-				'note' => $this->input->post('note'),
-				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-				'datum' => $this->input->post('datum'),
-				'anmerkung' => $this->input->post('anmerkung'),
-				'updatevon' => $authUID,
-				'updateamum' => date('c'),
-			]
-		);
-		$this->getDataOrTerminateWithError($result);
-
-		return $this->outputJsonSuccess(true);
+		$this->insertOrUpdatePruefung($pruefung_id);
 	}
 
 	/**
@@ -581,4 +370,198 @@ class Pruefung extends FHCAPI_Controller
 
 		return $this->terminateWithSuccess($data);
 	}
+
+	protected function insertOrUpdatePruefung($pruefung_id=null)
+	{
+		$authUID = getAuthUID();
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+		]);
+		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+		]);
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			['is_valid_date']
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$this->PruefungModel->db->trans_start();
+
+		if ($this->input->post('pruefungstyp_kurzbz') == "Termin2")
+		{
+			//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
+			//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
+			$resultP = $this->PruefungModel->loadWhere(array(
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'pruefungstyp_kurzbz' => 'Termin1'));
+
+			$termin1 = $this->getDataOrTerminateWithError($resultP);
+			if (!$termin1)
+			{
+				//check if existing Zeugnisnote
+				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
+
+				$this->ZeugnisnoteModel->db->where(
+					'lehre.tbl_zeugnisnote.studiensemester_kurzbz',
+					'lehre.tbl_lehreinheit.studiensemester_kurzbz',
+					false
+				);
+				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
+					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+					'student_uid' => $this->input->post('student_uid')
+				));
+
+				$zeugnisnoten = $this->getDataOrTerminateWithError($resultP);
+				if ($zeugnisnoten)
+				{
+					$zeugnisnote = current($zeugnisnoten);
+
+					$resultN = $this->PruefungModel->insert([
+						'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+						'student_uid' => $this->input->post('student_uid'),
+						'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+						'datum' => $zeugnisnote->benotungsdatum,
+						'pruefungstyp_kurzbz' => 'Termin1',
+						'note' => $zeugnisnote->note,
+						'punkte' => $zeugnisnote->punkte,
+						'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
+						'insertamum' => date('c'),
+						'insertvon' => $authUID,
+					]);
+
+					$this->getDataOrTerminateWithError($resultN);
+				}
+				//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
+				//1.Termin angelegt
+			}
+		}
+
+		if(intval($pruefung_id) > 0)
+		{
+			$result = $this->PruefungModel->update(
+				[
+					'pruefung_id' => $pruefung_id
+				],
+				[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+					'student_uid' =>  $this->input->post('student_uid'),
+					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
+					'note' => $this->input->post('note'),
+					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+					'datum' => $this->input->post('datum'),
+					'anmerkung' => $this->input->post('anmerkung'),
+					'updatevon' => $authUID,
+					'updateamum' => date('c'),
+				]
+			);
+		}
+		else
+		{
+			$result = $this->PruefungModel->insert([
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+				'datum' => $this->input->post('datum'),
+				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+				'note' => $this->input->post('note'),
+				'anmerkung' => $this->input->post('anmerkung'),
+				'insertamum' => date('c'),
+				'insertvon' => $authUID,
+				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+			]);
+		}
+
+		$this->getDataOrTerminateWithError($result);
+
+		//get studiensemester_kurzbz and lehreveranstaltung_id from lehreinheit
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
+
+		$lehreinheiten = $this->getDataOrTerminateWithError($result);
+
+		if (!$lehreinheiten) {
+			$this->terminateWithValidationErrors([
+				'lehreinheit_id' => $this->p->t('ui', 'error_fieldNotFound', [
+					'field' => $this->p->t('lehre', 'lehreinheit')
+				])
+			]);
+		}
+		$lehreinheit = current($lehreinheiten);
+		$studiensemester_kurzbz = $lehreinheit->studiensemester_kurzbz;
+		$lehrveranstaltung_id = $lehreinheit->lehrveranstaltung_id;
+
+		//check if existing zeugnisnote
+		$result = $this->ZeugnisnoteModel->loadWhere(array(
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$zeugnisnoten = $this->getDataOrTerminateWithError($result);
+
+		if (!$zeugnisnoten)
+		{
+			//insert zeugnisnote, if not existing
+			$result = $this->ZeugnisnoteModel->insert(array(
+				'lehrveranstaltung_id' => $lehrveranstaltung_id,
+				'student_uid' => $this->input->post('student_uid'),
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'note' => $this->input->post('note'),
+				'uebernahmedatum' => date('c'),
+				'benotungsdatum' => $this->input->post('datum'),
+				'insertamum' => date('c'),
+				'insertvon' =>  $authUID,
+				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+			));
+
+			$this->getDataOrTerminateWithError($result);
+
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess();
+		}
+
+		$note = current($zeugnisnoten);
+		$uebernahmedatum = new DateTime($note->uebernahmedatum);
+		$benotungsdatum = new DateTime($note->benotungsdatum);
+		$pruefungsdatum = new DateTime($this->input->post('datum'));
+
+		$checkDate = $note->uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
+			? $benotungsdatum
+			: $uebernahmedatum;
+
+		if ($checkDate > $pruefungsdatum && $this->input->post('note') !== $note->note)
+		{
+			$this->PruefungModel->db->trans_complete();
+			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
+		}
+
+		//update zeugnisnote, if existing and valid datum
+		$result = $this->ZeugnisnoteModel->update([
+			'lehrveranstaltung_id' => $lehrveranstaltung_id,
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		], [
+			'note' => $this->input->post('note'),
+			'uebernahmedatum' => date('c'),
+			'benotungsdatum' => $this->input->post('datum'),
+			'updateamum' => date('c'),
+			'updatevon' =>  $authUID,
+			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
+		]);
+
+		$this->PruefungModel->db->trans_complete();
+		$this->terminateWithSuccess();
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 01e611657..385935d27 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -22,7 +22,8 @@
 			'public/css/components/function.css'
 		],
 		'customJSs' => [
-			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
+			'vendor/moment/luxonjs/luxon.min.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index d3ca1a25e..4d0996b6b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -217,9 +217,10 @@ export default {
 				},
 				columns,
 				height: '100%',
+				layout: 'fitDataStretchFrozen',
 				selectable: 1,
 				selectableRangeMode: 'click',
-				persistenceID: 'stv-details-noten-zeugnis-2025111801',
+				persistenceID: 'stv-details-noten-zeugnis-2025112401',
 				persistence:{
 					columns: ["width", "visible", "frozen"]
 				}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index c0c3fd448..62cd47547 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -46,8 +46,6 @@ export default{
 					{title: "Punkte", field: "punkte", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
-						minWidth: 150,
-						maxWidth: 150,
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
@@ -93,7 +91,7 @@ export default{
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				index: 'pruefung_id',
-				persistenceID: 'stv-details-pruefung-list'
+				persistenceID: 'stv-details-pruefung-list-2025112402'
 			},
 			tabulatorEvents: [
 				{
@@ -148,7 +146,6 @@ export default{
 			listMas: [],
 			listMarks: [],
 			zeugnisData: [],
-			checkData:[],
 			filter: false,
 			statusNew: true,
 			isStartDropDown: false,
@@ -181,7 +178,7 @@ export default{
 
 			this.pruefungData.student_uid = this.uid;
 			this.pruefungData.note = 9;
-			this.pruefungData.datum = new Date();
+			this.pruefungData.datum = luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 			this.pruefungData.pruefungstyp_kurzbz = null;
 			if(lv_id){
 				this.pruefungData.lehrveranstaltung_id = lv_id;
@@ -193,7 +190,7 @@ export default{
 			this.isStartDropDown = false;
 			this.loadPruefung(pruefung_id).then(() => {
 				this.pruefungData.note = 9;
-				this.pruefungData.datum = new Date();
+				this.pruefungData.datum = luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
 				this.pruefungData.pruefungstyp_kurzbz = null;
 				this.pruefungData.anmerkung = null;
 				this.prepareDropdowns();
@@ -242,12 +239,13 @@ export default{
 				});
 		},
 		updatePruefung(pruefung_id){
-			this.checkChangeAfterExamDate();
 			return this.$refs.examData
 				.call(ApiStvExam.updatePruefung(pruefung_id, this.pruefungData))
 				.then(response => {
-					this.checkData = response.data;
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					if (response.data)
+						this.$fhcAlert.alertDefault('info', 'Info', response.data, true);
+					else
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal('pruefungModal');
 					this.resetModal();
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -265,27 +263,6 @@ export default{
 			else
 				this.showHint = false;
 		},
-		checkChangeAfterExamDate() {
-			const data = {
-				student_uid: this.pruefungData.student_uid,
-				studiensemester_kurzbz: this.pruefungData.studiensemester_kurzbz,
-				lehrveranstaltung_id: this.pruefungData.lehrveranstaltung_id
-			};
-			return this.$api
-				.call(ApiStvExam.checkZeugnisnoteLv(data))
-				.then(result => {
-					this.zeugnisData = result.data;
-					let checkDate = this.zeugnisData[0].uebernahmedatum === '' ||
-					this.zeugnisData[0].benotungsdatum > this.zeugnisData[0].uebernahmedatum
-						? this.zeugnisData[0].benotungsdatum
-						: this.zeugnisData[0].uebernahmedatum;
-					if (checkDate >= this.pruefungData.datum
-						&& this.pruefungData.note !== this.zeugnisData[0].note) {
-						this.$fhcAlert.alertInfo(this.$p.t('exam', 'hinweis_changeAfterExamDate'));
-					}
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		deletePruefung(pruefung_id) {
 			return this.$api
 				.call(ApiStvExam.deletePruefung(pruefung_id))
@@ -533,6 +510,7 @@ export default{
 					container-class="mb-3"
 					type="DatePicker"
 					v-model="pruefungData.datum"
+					model-type="yyyy-MM-dd"
 					name="datum"
 					:label="$p.t('global/datum')"
 					auto-apply

From f0e0bdc082ae4b6d5958dc3e6d7f7bbf5afeeb73 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 24 Nov 2025 18:37:30 +0100
Subject: [PATCH 0994/1357] add optional query parameter studiensemester to
 notenspiegel and notenspiegel_erweitert to override semester_aktuell if
 multiple tabs in new studvw have different current semesters

---
 content/statistik/notenspiegel.php              | 5 +++++
 content/statistik/notenspiegel_erweitert.php    | 5 +++++
 public/js/components/Stv/Studentenverwaltung.js | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/content/statistik/notenspiegel.php b/content/statistik/notenspiegel.php
index 1a7651296..0901b834f 100644
--- a/content/statistik/notenspiegel.php
+++ b/content/statistik/notenspiegel.php
@@ -62,6 +62,11 @@ if(!$rechte->isBerechtigt('student/noten',$studiengang_kz, 's'))
 $semester = isset($_GET['semester'])?$_GET['semester']:'';
 $typ = isset($_GET['typ'])?$_GET['typ']:'';
 
+if(isset($_GET['studiensemester']) && preg_match('/[WS]S[0-9]{4}/', $_GET['studiensemester']))
+{
+	$semester_aktuell = $_GET['studiensemester'];
+}
+
 if($semester=='')
 	die('Bitte ein Semester auswaehlen');
 	
diff --git a/content/statistik/notenspiegel_erweitert.php b/content/statistik/notenspiegel_erweitert.php
index 2849a1895..67097ed22 100644
--- a/content/statistik/notenspiegel_erweitert.php
+++ b/content/statistik/notenspiegel_erweitert.php
@@ -64,6 +64,11 @@ if (!$rechte->isBerechtigt('student/noten', $studiengang_kz, 's'))
 $semester = isset($_GET['semester']) ? $_GET['semester'] : '';
 $typ = isset($_GET['typ']) ? $_GET['typ'] : '';
 
+if(isset($_GET['studiensemester']) && preg_match('/[WS]S[0-9]{4}/', $_GET['studiensemester']))
+{
+	$semester_aktuell = $_GET['studiensemester'];
+}
+
 if ($semester == '')
 	die('Bitte ein Semester auswaehlen');
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 982605da0..3a51a2d45 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -158,6 +158,7 @@ export default {
 						+ 'content/statistik/notenspiegel.php?type=xls'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_xls'
 				});
@@ -166,6 +167,7 @@ export default {
 						+ 'content/statistik/notenspiegel_erweitert.php?typ=xls'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_xls_extended'
 				});
@@ -174,6 +176,7 @@ export default {
 						+ 'content/statistik/notenspiegel.php?type=html'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
+						+ '&studiensemester=' + this.studiensemesterKurzbz
 						+ '&orgform=' + orgform,
 					description: 'stv/grade_report_html'
 				});

From 38e8f91fdf404ce565f06205cd567c9bc7d5354b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 25 Nov 2025 10:48:57 +0100
Subject: [PATCH 0995/1357] add kurzbzlang to studentDropdown suggestion

---
 application/models/organisation/Studiengang_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 02f972690..08f40f6d4 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -594,7 +594,8 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname,
+				' (', " . $this->dbTable . ".bezeichnung, ', ',		" . $this->dbTable . ".kurzbzlang,')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

From a413b6c779a473a9e9365dab622e90ed7839e85e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 25 Nov 2025 14:00:31 +0100
Subject: [PATCH 0996/1357] fix bug when changing studiensemester on route
 search

---
 .../js/components/Stv/Studentenverwaltung.js  | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 3a51a2d45..03f84f75e 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -189,8 +189,15 @@ export default {
 		'url_studiensemester_kurzbz': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
 				this.studiensemesterKurzbz = newVal;
-				this.$refs.stvList.updateUrl();
-				this.$refs.details.reload();
+				if(this.$route.name === 'search')
+				{
+					this.handleSearchUrl();
+				}
+				else
+				{
+					this.$refs.stvList.updateUrl();
+					this.$refs.details.reload();
+				}
 			}
 		},
 		'url_studiengang': function (newVal, oldVal) {
@@ -298,9 +305,6 @@ export default {
 					studiensemester_kurzbz: v
 				}
 			});
-
-			this.$refs.stvList.updateUrl();
-			this.$refs.details.reload();
 		},
 		reloadList() {
 			this.$refs.stvList.reload();
@@ -325,26 +329,29 @@ export default {
 					true
 					);
 			} else if (this.$route.params.searchstr) {
-				const searchsettings = {
-					searchstr: this.$route.params.searchstr,
-					types: this.$route.params.types?.split('+') || []
-				};
-
-				// init into student list
-				this.$refs.stvList.updateUrl(
-					ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
-				);
-
-				// init into searchbar
-				this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
-				this.$refs.searchbar.searchsettings.types = searchsettings.types;
-				this.$nextTick(this.blurSearchbar);
+				this.handleSearchUrl();
 			}
 			else
 			{
 				this.clearTabulator();
 			}
 		},
+		handleSearchUrl() {
+			const searchsettings = {
+				searchstr: this.$route.params.searchstr,
+				types: this.$route.params.types?.split('+') || []
+			};
+
+			// init into student list
+			this.$refs.stvList.updateUrl(
+				ApiStv.students.search(searchsettings, this.studiensemesterKurzbz)
+			);
+
+			// init into searchbar
+			this.$refs.searchbar.searchsettings.searchstr = searchsettings.searchstr;
+			this.$refs.searchbar.searchsettings.types = searchsettings.types;
+			this.$nextTick(this.blurSearchbar);
+		},
 		clearTabulator() {
 			if(['index', 'studiensemester'].includes(this.$route.name))
 			{

From 93e25bb5fcc17a5a8987953a50dbe78d730278d5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 25 Nov 2025 17:35:44 +0100
Subject: [PATCH 0997/1357] added Reminder for Unterbrecher for Student

---
 application/config/studierendenantrag.php  |  2 +-
 application/controllers/jobs/AntragJob.php | 71 +++++++++++++++++++++-
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 4e25aef28..e0ef5486b 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -57,7 +57,7 @@ $config['wiederholung_note_nicht_zugelassen'] = 20;
  * @var string	        A string formated as PHP DateTime modifier
  * @see https://www.php.net/manual/de/datetime.modify.php
  */
-$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
+$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+166 days';
 
 /**
  * The Job will sent a request to everyone who faild the 3rd committee exam
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index debcfe391..9441a349b 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -200,13 +200,14 @@ class AntragJob extends JOB_Controller
 	}
 
 	/**
-	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
+	 * Send reminder to Assistant and to Student for Wiedereinstieg Unterbrecher
 	 *
 	 */
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
+
 		if (!$modifier)
 			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
 
@@ -230,6 +231,7 @@ class AntragJob extends JOB_Controller
 
 		$antraege = getData($result) ?: [];
 		$count = 0;
+		$countReminderStudent = 0;
 		foreach ($antraege as $antrag)
 		{
 			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
@@ -257,7 +259,57 @@ class AntragJob extends JOB_Controller
 				$data['UID'] = $student->student_uid;
 			}
 
-			// NOTE(chris): Sancho mail
+			//Data für Email Student
+			$result = $this->PrestudentModel->load($antrag->prestudent_id);
+			$dataPrestudent = current(getData($result));
+			$person_id = $dataPrestudent->person_id;
+
+			$this->KontaktModel->addSelect('kontakt');
+			$this->KontaktModel->addLimit(1);
+
+			$result = $this->KontaktModel->loadWhere([
+				'person_id'=> $person_id,
+				'zustellung' => true,
+				'kontakttyp' => 'email'
+			]);
+			if (hasData($result)) {
+				$dataKontakt = current(getData($result));
+				$email_student_privat = $dataKontakt->kontakt;
+			}
+
+			$email_student_FH = $this->StudentModel->getEmailFH($this->StudentModel->getUID($antrag->prestudent_id));
+
+			//studiensemester
+			$result = $this->StudiensemesterModel->getByDate($datum->format('d.m.Y'));
+			if (hasData($result)) {
+				$dataSem = current(getData($result));
+			}
+
+			$studiensemester = $dataSem->studiensemester_kurzbz;
+			$studsemShort = substr($studiensemester, 0, 2);
+
+			if($studsemShort == "SS")
+			{
+				$data['studSemShort_Eng'] = "summer semester";
+				$data['meldenBis'] = "15.1.";
+				$data['meldenBis_Eng'] = "January 15";
+			}
+			elseif ($studsemShort == "WS") {
+				$data['studSemShort_Eng'] = "winter semester";
+				$data['meldenBis'] = "1.8.";
+				$data['meldenBis_Eng'] = "August 1";
+			}
+			else
+			{
+				$studsemShort = "SS/WS";
+				$data['studSemShort_Eng'] = "summer/winter semester";
+				$data['meldenBis'] = "15.1. (bei Einstieg ins SS) / 1.8. (bei Einstieg ins WS)";
+				$data['meldenBis_Eng'] = "January 15 (for sommer semester enrollment) / August 1 (for winter semester enrollment)";
+			}
+
+			$data['studSemShort'] = $studsemShort;
+
+			// NOTE(chris): Sancho mail Assistant
 			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
 			{
 				$count++;
@@ -267,8 +319,21 @@ class AntragJob extends JOB_Controller
 					'insertvon' => 'AntragJob'
 				]);
 			}
+
+			//Mail to Student
+			if(sendSanchoMail(
+				'Sancho_Mail_Antrag_U_Remind_Stud',
+				$data,
+				$email_student_FH,
+				'Reminder: Unterbrechung Wiedereinstieg',
+				'',
+				'',
+				'',
+				$email_student_privat)) {
+				$countReminderStudent++;
+			}
 		}
-		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
+		$this->logInfo($count . ' Reminder an Assistenz und ' . $countReminderStudent . ' Reminder an Student gesendet  - Ende Job sendReminderWiedereinstieg');
 	}
 
 	/**

From 6d27c3f6e23bcc898285ef6ac41797d3bdb152fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 26 Nov 2025 08:27:14 +0100
Subject: [PATCH 0998/1357] PHPInfo entfernt

---
 system/phpinfo.php | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 system/phpinfo.php

diff --git a/system/phpinfo.php b/system/phpinfo.php
deleted file mode 100644
index c18f4c6d5..000000000
--- a/system/phpinfo.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	phpinfo();
-?>
\ No newline at end of file

From eb1c3189b52502e87de3dce609e51bd2f9a6b19b Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Nov 2025 16:45:51 +0100
Subject: [PATCH 0999/1357] Studierendenverwaltung Projektarbeit: title not
 required anymore

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

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 75478332f..9cc604184 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -268,10 +268,6 @@ class Projektarbeit extends FHCAPI_Controller
 	{
 		$this->form_validation->set_data($formData);
 
-		$this->form_validation->set_rules('titel', 'Titel', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Titel'])
-		]);
-
 		$this->form_validation->set_rules('projekttyp_kurzbz', 'Projekttyp', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);

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 1000/1357] 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 aa84bdec1e3dd02e1fb9f8c6fc09161576186cb5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 27 Nov 2025 14:46:55 +0100
Subject: [PATCH 1001/1357] ---staging----

---
 application/config/stv.php                    |   1 +
 .../api/frontend/v1/messages/Messages.php     | 292 ++++++++++++++----
 .../api/frontend/v1/stv/Config.php            |   6 +-
 public/js/api/factory/messages/messages.js    |  47 ++-
 .../Messages/Details/NewMessage/Modal.js      |  62 ++--
 .../Messages/Details/TableMessages.js         |   4 +-
 public/js/components/Messages/Messages.js     |   8 +-
 .../Studentenverwaltung/Details/Messages.js   |  58 ++--
 8 files changed, 368 insertions(+), 110 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index e03c00084..913b1c015 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -115,6 +115,7 @@ $config['student_tab_order'] = [
 $config['students_tab_order'] = [
 	'banking',
 	'status',
+	'messages',
 	'groups',
 	'finalexam',
 	'archive',
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 355fe79a4..f3a40f72f 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -14,13 +14,16 @@ class Messages extends FHCAPI_Controller
 			'getMsgVarsPrestudent' => ['admin:r', 'assistenz:r'],
 			'getMsgVarsLoggedInUser' => ['admin:r', 'assistenz:r'],
 			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
+			'getNameOfDefaultRecipients' => ['admin:r', 'assistenz:r'],
 			'sendMessage' => ['admin:r', 'assistenz:r'],
+			'sendMessages' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getDataVorlage' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
 			'getUid' => ['admin:r', 'assistenz:r'],
+			'getUids' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -110,13 +113,39 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getMsgVarsPrestudent($id, $typeId)
+/*	public function getMsgVarsPrestudent($id, $typeId)
 	{
 		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
+	}*/
+
+	public function getMsgVarsPrestudent($typeId)
+	{
+		$ids = $this->input->post('ids');
+		$messageVarsPrestudent = [];
+
+		if($typeId == 'uid')
+		{
+			$prestudent_ids = [];
+			foreach ($ids as $id)
+			{
+				$prestudent_ids[] =  $this->_getPrestudentIdFromUid($id);
+			}
+		}
+		else
+			$prestudent_ids = $ids;
+
+		foreach ($prestudent_ids as $prestudent_id)
+		{
+			$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$messageVarsPrestudent[] = current($data);
+		}
+
+		$this->terminateWithSuccess($messageVarsPrestudent);
 	}
 
 	public function getMsgVarsLoggedInUser()
@@ -127,7 +156,7 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getNameOfDefaultRecipient($id, $type_id)
+/*	public function getNameOfDefaultRecipient($id, $type_id)
 	{
 		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
 
@@ -138,11 +167,84 @@ class Messages extends FHCAPI_Controller
 		$name = current($data);
 
 		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
+	}*/
+
+	public function getNameOfDefaultRecipients($type_id)
+	{
+		$ids = $this->input->post('ids');
+		$recipients = [];
+
+		if (empty($ids)) {
+			throw new InvalidArgumentException("Keine ID(s) übergeben.");
+		}
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		if($type_id != 'person_id'){
+			foreach ($ids as $id)
+			{
+				$person_id =  $this->_getPersonId($id, $type_id);
+				$result = $this->PersonModel->load($person_id);
+				$data = $this->getDataOrTerminateWithError($result);
+				$name = current($data);
+				$recipients[$id] = $name->vorname . " " . $name->nachname;
+			}
+		}
+		else {
+			foreach ($ids as $id) {
+				$result = $this->PersonModel->load($id);
+				$data = $this->getDataOrTerminateWithError($result);
+				$name = current($data);
+				$recipients[$id] = $name->vorname . " " . $name->nachname;
+			}
+		}
+
+		$this->terminateWithSuccess($recipients);
 	}
 
-	public function sendMessage($recipient_id)
+	public function sendMessages()
 	{
-		//has to be uid
+/*		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+		}
+		else
+			$this->terminateWithError("Data missing ", self::ERROR_TYPE_GENERAL);
+
+		if (isset($_POST['ids']))
+		{
+			$ids = json_decode($_POST['ids']);
+			unset($_POST['ids']);
+		}
+		else
+			$this->terminateWithError("IDs missing ", self::ERROR_TYPE_GENERAL);
+
+
+		if (isset($_POST['uids']))
+		{
+			$uids = json_decode($_POST['uids']);
+			unset($_POST['uids']);
+		}
+		else
+			$this->terminateWithError("UIDs missing ", self::ERROR_TYPE_GENERAL);
+*/
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$this->terminateWithSuccess($data);
+
+	}
+
+	public function sendMessage($recipient_id, $return=false)
+	{
+		//has to be uid TODO(Manu) check
 		//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
 
 		//default setting
@@ -186,46 +288,51 @@ class Messages extends FHCAPI_Controller
 		$relationmessage_id = $this->input->post('relationmessage_id');
 
 		$typeId = $this->input->post('type_id');
-		$id = $this->input->post('id');
+		$ids = $this->input->post('id');
 
-		if($typeId == 'uid')
+		foreach ($ids as $id)
 		{
-			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
+			if($typeId == 'uid')
+			{
+				$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-			//parseMessagetext for variables Prestudent
-			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		if($typeId == 'mitarbeiter_uid')
-		{
-			$person_id = $this->_getPersonId($id, $typeId);
+				//parseMessagetext for variables Prestudent
+				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+			}
+			if($typeId == 'mitarbeiter_uid')
+			{
+				$person_id = $this->_getPersonId($id, $typeId);
 
-			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
+				$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+				$this->terminateWithError($bodyParsed[$id], self::ERROR_TYPE_GENERAL);
 
+			}
+			elseif($typeId == 'person_id')
+			{
+				$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
+				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+			}
+			elseif($typeId == 'prestudent_id')
+			{
+				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
+				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+			}
+			else
+			{
+				$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+			}
 		}
-		elseif($typeId == 'person_id')
-		{
-			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		elseif($typeId == 'prestudent_id')
-		{
-			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
-			$bodyParsed = $this->getDataOrTerminateWithError($result);
-		}
-		else
-		{
-			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
-		}
+
+
 
 		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
 
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getPreviewText($id, $type_id)
+	public function getPreviewText($type_id)
 	{
 		if (isset($_POST['data']))
 		{
@@ -235,30 +342,45 @@ class Messages extends FHCAPI_Controller
 		else
 			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
 
-		switch($type_id)
+		if (isset($_POST['ids']))
 		{
-			case 'uid':
-				$prestudent_id = $this->_getPrestudentIdFromUid($id);
-				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
-				break;
-			case 'prestudent_id':
-				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
-				break;
-			case 'person_id':
-				$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
-				break;
-			case 'mitarbeiter_uid':
-				{
-					$person_id = $this->_getPersonId($id, $type_id);
-					$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
-				}
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
+			$ids = json_decode($_POST['ids']);
+			unset($_POST['ids']);
 		}
+		else
+			$this->terminateWithError("IDs missing ", self::ERROR_TYPE_GENERAL);
 
-		$bodyParsed = $this->getDataOrTerminateWithError($result);
+		$bodyParsed = [];
+
+		foreach ($ids as $id)
+		{
+			switch($type_id)
+			{
+				case 'uid':
+					$prestudent_id = $this->_getPrestudentIdFromUid($id);
+					$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'prestudent_id':
+					$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'person_id':
+					$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
+					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					break;
+				case 'mitarbeiter_uid':
+					{
+						$person_id = $this->_getPersonId($id, $type_id);
+						$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
+						$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+					}
+					break;
+				default:
+					$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+					break;
+			}
+		}
 
 		$this->terminateWithSuccess($bodyParsed);
 	}
@@ -343,7 +465,7 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($person->person_id);
 	}
 
-	public function getUid($id, $typeId)
+	public function getUid($typeId)
 	{
 		if (!$typeId)
 		{
@@ -387,6 +509,68 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($benutzer->uid);
 	}
 
+	public function getUids($typeId)
+	{
+		$ids = $this->input->post('ids');
+		$benutzerIds = [];
+
+		if (!$typeId)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
+		}
+		elseif ($typeId == 'person_id')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			foreach ($ids as $id)
+			{
+				$result = $this->BenutzerModel->loadWhere(
+					['person_id' => $id]
+				);
+				$data = $this->getDataOrTerminateWithError($result);
+				$benutzer = current($data);
+
+				$benutzerIds[$id] = $benutzer->uid;
+			}
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			foreach ($ids as $id)
+			{
+				$result = $this->PrestudentModel->loadWhere(
+					['prestudent_id' => $id]
+				);
+
+				$data = $this->getDataOrTerminateWithError($result);
+				$person = current($data);
+				$person_id = $person->person_id;
+
+				$this->load->model('person/Benutzer_model', 'BenutzerModel');
+				$result = $this->BenutzerModel->loadWhere(
+					['person_id' => $person_id]
+				);
+				$data = $this->getDataOrTerminateWithError($result);
+				$benutzer = current($data);
+
+				$benutzerIds[$id] = $benutzer->uid;
+			}
+		}
+		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
+		{
+			$this->terminateWithSuccess($ids);
+		}
+		else
+		{
+			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
+		}
+
+
+		//$data = $this->getDataOrTerminateWithError($resultBenutzer);
+		//$benutzer = current($data);
+
+		$this->terminateWithSuccess($benutzerIds);
+	}
+
 	private function _getPersonId($id, $typeId)
 	{
 		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 97d626246..1dced3911 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -271,7 +271,6 @@ class Config extends FHCAPI_Controller
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
 			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
-			'showOnlyWithUid' => true
 		];
 
 		$result['grades'] = [
@@ -412,6 +411,11 @@ class Config extends FHCAPI_Controller
 			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js'),
 		];
 
+		$result['messages'] = [
+			'title' => $this->p->t('stv', 'tab_messages'),
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
+		];
+
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
 		});
diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index c6d4b67b6..1c2bbe66e 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -44,23 +44,40 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getMessageVarsPerson/' + userParams.id + '/' + userParams.type_id
 		};
 	},
-	getMsgVarsPrestudent(userParams){
+	//TODO(Manu) enable for id_array
+/*	getMsgVarsPrestudent(userParams){
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + userParams.id + '/' + userParams.type_id
 		};
+	},	*/
+	getMsgVarsPrestudent(ids, type_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + type_id,
+			params: {ids}
+		};
 	},
+	//TODO(Manu) enable for id_array
 	getPersonId(params){
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/getPersonId/' + params.id + '/' + params.type_id
 		};
 	},
-	getUid(userParams){
+	//TODO(Manu) enable for id_array
+/*	getUid(userParams){
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
 		};
+	},	*/
+	getUid(ids, type_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getUids/' + type_id,
+			params: {ids}
+		};
 	},
 	getDataVorlage(vorlage_kurzbz){
 		return {
@@ -68,16 +85,25 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz
 		};
 	},
-	getNameOfDefaultRecipient(params){
+/*	getNameOfDefaultRecipient(params){
+		console.log(params.id);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id
 		};
-	},
-	getPreviewText(userParams, params){
+	},*/
+	//TODO(Manu) enable for id_array
+	getNameOfDefaultRecipients(ids, type_id){
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/messages/messages/getPreviewText/' + userParams.id + '/' + userParams.type_id,
+			url: 'api/frontend/v1/messages/messages/getNameOfDefaultRecipients/' + type_id,
+			params: {ids}
+		};
+	},
+	getPreviewText(type_id, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getPreviewText/' + type_id,
 			params
 		};
 	},
@@ -87,12 +113,19 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getReplyData/' + messageId
 		};
 	},
-	sendMessageFromModalContext(id, params) {
+/*	sendMessageFromModalContext(id, params) {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
 			params
 		};
+	},	*/
+	sendMessageFromModalContext(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/sendMessages/',
+			params
+		};
 	},
 	sendMessage(id, params) {
 		return {
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index ce9235617..87b8d7c87 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -20,7 +20,7 @@ export default {
 		},
 		typeId: String,
 		id: {
-			type: [Number, String],
+			type: Array,
 			required: true
 		},
 		messageId: {
@@ -43,6 +43,8 @@ export default {
 			vorlagen: [],
 			recipientsArray: [],
 			defaultRecipient: null,
+			defaultRecipients: [],
+			defaultRecipientString: null,
 			editor: null,
 			fieldsUser: [],
 			fieldsPerson: [],
@@ -57,6 +59,7 @@ export default {
 			previewBody: "",
 			replyData: null,
 			uid: null,
+			uids: null //necessary?
 		}
 	},
 	methods: {
@@ -111,6 +114,10 @@ export default {
 		},
 		sendMessage() {
 			const data = new FormData();
+			data.append('data', JSON.stringify(this.formData));
+			data.append('ids', JSON.stringify(this.id));
+			data.append('uids', JSON.stringify(this.uid));
+
 			const params = {
 				id: this.id,
 				type_id: this.typeId
@@ -121,8 +128,9 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
+			//Modal Context?
 			return this.$refs.formMessage
-				.call(this.endpoint.sendMessageFromModalContext(this.uid, data))
+				.call(this.endpoint.sendMessageFromModalContext(data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -146,14 +154,15 @@ export default {
 		},
 		getPreviewText(){
 			const data = new FormData();
-
 			data.append('data', JSON.stringify(this.formData.body));
+			data.append('ids', JSON.stringify(this.id));
+
 			return this.$api
-				.call(this.endpoint.getPreviewText({
-					id: this.id,
-					type_id: this.typeId}, data))
+				.call(this.endpoint.getPreviewText(
+					this.typeId, data))
 				.then(response => {
-					this.previewText = response.data;
+					const previews = response.data;
+					this.previewText = previews[this.defaultRecipient];
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					//this.resetForm();
@@ -201,13 +210,10 @@ export default {
 				this.previewBody = this.previewText;
 			});
 		},
+		//TODO(Manu) check if No_UID
 		getUid(id, typeId){
-			const params = {
-				id: id,
-				type_id: typeId
-			};
 			this.$api
-				.call(this.endpoint.getUid(params))
+				.call(this.endpoint.getUid(this.id, this.typeId))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -281,12 +287,8 @@ export default {
 		}
 
 		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
-			const params = {
-				id: this.id,
-				type_id: this.typeId
-			};
 			this.$api
-				.call(this.endpoint.getMsgVarsPrestudent(params))
+				.call(this.endpoint.getMsgVarsPrestudent(this.id, this.typeId))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -310,7 +312,7 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$api
+/*		this.$api
 			.call(this.endpoint.getNameOfDefaultRecipient({
 				id: this.id,
 				type_id: this.typeId}))
@@ -320,6 +322,16 @@ export default {
 					'uid': this.uid,
 					'details': this.defaultRecipient});
 			})
+			.catch(this.$fhcAlert.handleSystemError);*/
+
+		//for multiaction too
+		this.$api
+			.call(this.endpoint.getNameOfDefaultRecipients(this.id, this.typeId))
+			.then(result => {
+				this.defaultRecipients = result.data;
+				this.defaultRecipientString =  Object.values(this.defaultRecipients).join("; ");
+
+			})
 			.catch(this.$fhcAlert.handleSystemError);
 
 		//case of reply
@@ -367,6 +379,8 @@ export default {
 			</template>
 
 			<form-form ref="formNewMassage">
+			
+			{{defaultRecipients}} | {{defaultRecipient}} || {{uid}}
 
 			<div class="tab-content" id="msg_preview_content">
 				<div class="tab-pane fade show active" id="msg" role="tabpanel" aria-labelledby="msg-tab">
@@ -381,7 +395,7 @@ export default {
 									type="text"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
+									v-model="defaultRecipientString"
 									disabled
 								>
 								</form-input>
@@ -502,17 +516,17 @@ export default {
 								>
 									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
 									<option
-										v-for="recipient in recipientsArray"
-										:key="recipient.uid"
-										:value="recipient.uid" 
-										>{{recipient.details}}
+										v-for="(name, id) in defaultRecipients"
+										  :key="id" 
+										  :value="Number(id)"
+										> {{name}}
 									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn btn-secondary" @click="showPreview()">{{ $p.t('ui', 'btnAktualisieren') }}</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(defaultRecipient)">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 2a12128eb..172607022 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -19,7 +19,7 @@ export default {
 		},
 		typeId: String,
 		id: {
-			type: [Number, String],
+			type: Array,
 			required: true
 		},
 		messageLayout: String,
@@ -346,7 +346,7 @@ export default {
 		});*/
 	},
 	created(){
-		if(this.typeId != 'person_id') {
+		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
 				type_id: this.typeId
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 176c05b6b..53692d6a3 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -31,7 +31,7 @@ export default {
 			}
 		},
 		id: {
-			type: [Number, String],
+			type: Array,
 			required: true
 		},
 		showTable: Boolean,
@@ -124,6 +124,7 @@ export default {
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
+	{{typeId}} {{id}} 
 
 		<message-modal
 			ref="modalMsg"
@@ -150,9 +151,8 @@ export default {
 			>
 			</form-only>
 		</div>
-
-		
-		<div v-if="showTable">
+	
+		<div v-if="showTable && id.length==1">
 			<table-messages
 				ref="templateTableMessage"
 				:type-id="typeId"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 59650eaab..a0634be97 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -14,26 +14,48 @@ export default {
 			endpoint: ApiMessages
 		};
 	},
+	computed: {
+		prestudent_ids() {
+			if (this.modelValue.prestudent_id)
+			{
+				return [this.modelValue.prestudent_id];
+			}
+			return this.modelValue.map(e => e.prestudent_id);
+		},
+		person_ids() {
+			if (this.modelValue.person_id)
+			{
+				return [this.modelValue.person_id];
+			}
+			return this.modelValue.map(e => e.person_id);
+		},
+	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
-	
-	<template v-if="modelValue.prestudent_id">
-		<core-messages
-			ref="formc"
-			:endpoint="endpoint"
-			type-id="prestudent_id"
-			:id="modelValue.prestudent_id"
-			messageLayout="twoColumnsTableLeft"
-			open-mode="modal"
-			show-table
-			>
-		</core-messages>
-	</template>
-	<template v-else>
-		 <h3><strong>No valid prestudent_id!</strong></h3>
-		 <p>{{modelValue.anmerkungen}}</p>
-	</template>
-
+		<template v-if="prestudent_ids">
+			<core-messages
+				ref="formc"
+				:endpoint="endpoint"
+				type-id="prestudent_id"
+				:id="prestudent_ids"
+				messageLayout="twoColumnsTableLeft"
+				open-mode="modal"
+				show-table
+				>
+			</core-messages>
+		</template>
+		<template v-else >
+			<core-messages
+				ref="formc"
+				:endpoint="endpoint"
+				type-id="person_id"
+				:id="person_ids"
+				messageLayout="twoColumnsTableLeft"
+				open-mode="modal"
+				show-table
+				>
+			</core-messages>
+		</template>
 	</div>
 	`
 };
\ No newline at end of file

From 095d5acbc59cb4f3e20415505b91095f8bc21fcb Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 27 Nov 2025 16:53:50 +0100
Subject: [PATCH 1002/1357] load all studiensemester for assistenz; load
 paabgabetyp benotbar for all paabgaben; datediff calc luxon; new dateclass
 'beurteilungrequired'; 2nd quality gate validation logic option; filter
 notenoptions as per config; filter abgabetypoptions as per config;
 upload_allowed checkbox for serientermine; serientermin modal layout
 rearranged; abgabetoolJob fixes; 23:59 in the descriptive col, not
 datepicker; zusatzdaten are required; activeIndex for accordion calulated on
 demand by method instead of reading a computed value;

---
 application/config/abgabe.php                 |   6 +-
 .../controllers/api/frontend/v1/Abgabe.php    |  17 +-
 .../v1/organisation/Studiensemester.php       |   4 +-
 .../controllers/jobs/AbgabetoolJob.php        |  15 +-
 .../models/education/Projektarbeit_model.php  |   1 +
 public/css/components/abgabetool/abgabe.css   |  29 +++
 public/js/api/factory/abgabe.js               |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 208 ++++++++++--------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  21 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 118 ++++++----
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  87 +++++---
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  76 +++++--
 system/phrasesupdate.php                      |  80 +++++++
 13 files changed, 461 insertions(+), 205 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 63c5699c3..6a91a4d12 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -11,4 +11,8 @@ $config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
 // used as APP_ROOT.URL_STUDENTS -> cis4
 $config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
 // used as APP_ROOT.URL_MITARBEITER -> old cis 
-$config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
\ No newline at end of file
+$config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
+
+// lehre.tbl_paabgabetyp bezeichnung
+$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
+$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 1a31ed674..17d8f0811 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -82,11 +82,13 @@ class Abgabe extends FHCAPI_Controller
 	public function getConfig() {
 		$this->load->config('abgabe');
 		$old_abgabe_beurteilung_link =$this->config->item('old_abgabe_beurteilung_link');
-		$turnitin_link =$this->config->item('turnitin_link');
+		$turnitin_link = $this->config->item('turnitin_link');
+		$abgabetypenBetreuer = $this->config->item('ALLOWED_ABGABETYPEN_BETREUER');
 		
 		$ret = array(
 			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
-			'turnitin_link' => $turnitin_link
+			'turnitin_link' => $turnitin_link,
+			'abgabetypenBetreuer' => $abgabetypenBetreuer
 		);
 		
 		$this->terminateWithSuccess($ret);
@@ -402,7 +404,7 @@ class Abgabe extends FHCAPI_Controller
 			$ci3BootstrapFilePath = "index.ci.php";
 		}
 
-		$path = $this->_ci->config->item('URL_MITARBEITER');
+		$path = $this->config->item('URL_MITARBEITER');
 		$url = APP_ROOT.$path;
 
 //		$this->addMeta('betreuerArray', $resBetr->retval);
@@ -701,6 +703,7 @@ class Abgabe extends FHCAPI_Controller
 		$bezeichnung = $_POST['bezeichnung'];
 		$kurzbz = $_POST['kurzbz'];
 		$fixtermin = $_POST['fixtermin'];
+		$upload_allowed = $_POST['upload_allowed'];
 
 		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
 			|| !isset($datum) || isEmptyString($datum)
@@ -736,6 +739,7 @@ class Abgabe extends FHCAPI_Controller
 					'fixtermin' => $fixtermin,
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
+					'upload_allowed' => $upload_allowed,
 					'insertvon' => getAuthUID(),
 					'insertamum' => date('Y-m-d H:i:s')
 				)
@@ -800,7 +804,10 @@ class Abgabe extends FHCAPI_Controller
 
 		$result = $this->NoteModel->getAllActive();
 		$noten = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($noten);
+
+		$allowed_noten_abgabetool = $this->config->item('ALLOWED_NOTEN_ABGABETOOL');
+
+		$this->terminateWithSuccess(array($noten, $allowed_noten_abgabetool));
 	}
 	
 	private function sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe) {
@@ -904,7 +911,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 		
 		$stg_allowed = $this->permissionlib->getSTG_isEntitledFor('basis/abgabe_assistenz:rw');
-		
+
 		if($stg_allowed == false) {
 			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
 		}
diff --git a/application/controllers/api/frontend/v1/organisation/Studiensemester.php b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
index 06d5b93c9..3c6b72d2f 100644
--- a/application/controllers/api/frontend/v1/organisation/Studiensemester.php
+++ b/application/controllers/api/frontend/v1/organisation/Studiensemester.php
@@ -160,8 +160,8 @@ class Studiensemester extends FHCAPI_Controller
 		$this->StudiensemesterModel->addOrder("start", "DESC");
 		$result = $this->StudiensemesterModel->getAktOrNextSemester();
 		$aktuell = getData($result)[0];
-
-		$result = $this->StudiensemesterModel->getPreviousFrom($aktuell->studiensemester_kurzbz, 10);
+		$this->StudiensemesterModel->addSelect('*');
+		$result = $this->StudiensemesterModel->load();
 		$studiensemester = getData($result);
 		
 		$this->terminateWithSuccess(array($studiensemester, $aktuell));
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 301e747c1..c380f344b 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -20,6 +20,7 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
+		$this->_ci->load->config('abgabe');
 		$this->loadPhrases([
 			'abgabetool'
 		]);
@@ -32,7 +33,7 @@ class AbgabetoolJob extends JOB_Controller
 		// this job gathers all new or changed file uploads via field 'abgabedatum', enduploads still
 		// send an email directly after happening since they are kind of important
 
-		$this->_ci->logInfo('Start job queue scheduler FHC-Core->notifyBetreuerMail');
+		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerMail');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
@@ -102,7 +103,7 @@ class AbgabetoolJob extends JOB_Controller
 
 			// send email with bundled info
 			sendSanchoMail(
-				'paabgabeUpdatesBetSM',
+				'PaabgabeUpdatesBetSM',
 				$body_fields,
 				$data->private_email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
@@ -112,14 +113,14 @@ class AbgabetoolJob extends JOB_Controller
 		}
 		
 		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
-		$this->_ci->logInfo('End job queue scheduler FHC-Core->notifyBetreuerMail');
+		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerMail');
 	}
 
 	public function notifyStudentMail()
 	{
 		// send all new projektarbeit abgabe since the last job run to the related student
 
-		$this->_ci->logInfo('Start job queue scheduler FHC-Core->notifyStudentMail');
+		$this->_ci->logInfo('Start job FHC-Core->notifyStudentMail');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
@@ -127,7 +128,7 @@ class AbgabetoolJob extends JOB_Controller
 		$retval = getData($result);
 
 		if(count($retval) == 0) {
-			$this->logInfo("Keine Emails an Studenten versandt");
+			$this->_ci->logInfo("Keine Emails an Studenten versandt");
 			return;
 		}
 		
@@ -180,7 +181,7 @@ class AbgabetoolJob extends JOB_Controller
 
 			// send email with bundled info
 			sendSanchoMail(
-				'paabgabeUpdatesSammelmail',
+				'PaabgabeUpdatesSammelmail',
 				$body_fields,
 				$uid.'@'.DOMAIN,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
@@ -191,6 +192,6 @@ class AbgabetoolJob extends JOB_Controller
 		}
 
 		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
-		$this->_ci->logInfo('End job queue scheduler FHC-Core->notifyStudentMail');
+		$this->_ci->logInfo('End job FHC-Core->notifyStudentMail');
 	}
 }
\ No newline at end of file
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 0c00629df..361fd71b0 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -175,6 +175,7 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.beurteilungsnotiz,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabetyp.benotbar, 
 					campus.tbl_paabgabe.abgabedatum,
 					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index e8b0cb9da..ea980dc29 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -54,6 +54,35 @@
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
+/* Base Header */
+.beurteilungerforderlich-header {
+	background-color: var(--fhc-orange-70);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 34px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+
+/* Hover State */
+.beurteilungerforderlich-header:hover {
+	background-color: var(--fhc-orange-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .beurteilungerforderlich-header {
+	background-color: var(--fhc-orange-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .beurteilungerforderlich-header:hover {
+	background-color: var(--fhc-orange-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
 /* Base Header */
 .verspaetet-header {
 	background-color: var(--fhc-pink-40);
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 21852349b..891fe02da 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -68,11 +68,11 @@ export default {
 			params: { paabgabe_id }
 		};
 	},
-	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids, fixtermin) {
+	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/postSerientermin',
-			params: { datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids, fixtermin }
+			params: { datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin }
 		};
 	},
 	fetchDeadlines(person_id) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 2acf9e719..9354ad184 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -19,6 +19,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	inject: [
 		'abgabeTypeOptions',
+		'abgabetypenBetreuer',
 		'allowedNotenOptions',
 		'turnitin_link',
 		'old_abgabe_beurteilung_link',
@@ -40,6 +41,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
+			activeIndexArray: null,
 			showAutomagicModalPhrase: false,
 			eidAkzeptiert: false,
 			enduploadTermin: null,
@@ -77,6 +79,25 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
+		getActiveIndexTabArray(additional = []) {
+			// here we try to assume which abgabetermine are the most relevant to the current user
+
+			// lets try to take the termin with nearest date
+			let closestIndex = -1;
+			let minDiff = Infinity;
+			const today = new Date();
+
+
+			this.projektarbeit.abgabetermine.forEach((obj, i) => {
+				const diff = Math.abs(new Date(obj.datum) - today);
+				if (diff < minDiff) {
+					minDiff = diff;
+					closestIndex = i;
+				}
+			});
+
+			return [closestIndex, ...additional]
+		},
 		getPlaceholderTermin(termin) {
 			return termin?.bezeichnung?.bezeichnung ?? this.$p.t('abgabetool/abgabetypPlaceholder')	
 		},
@@ -114,12 +135,16 @@ export const AbgabeMitarbeiterDetail = {
 					// only insert new abgabe if we actually created a new one, not when saving/editing existing
 					if(!existingTerminRes){
 						this.projektarbeit.abgabetermine.push(newTerminRes)
-						this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
 					} else {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
 					}
 					
+					this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
+					
+					const index = this.projektarbeit.abgabetermine.findIndex(t => termin.paabgabe_id == t.paabgabe_id)
+					this.activeIndexArray = this.getActiveIndexTabArray([index])
+					
 					// negative abgabe -> automagically open new termin modal
 					// really bad feature imo that will be annoying to deal with
 					
@@ -203,49 +228,9 @@ export const AbgabeMitarbeiterDetail = {
 			this.$refs.modalContainerZusatzdaten.hide()
 		},
 		async validateZusatzdaten() {
-			// check these input fields for length of entry
-			if(this.form['abstract'].length < 100 && await this.$fhcAlert.confirm({
-				message: this.$p.t('abgabetool/warningShortAbstract'),
-				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-				acceptClass: 'btn btn-danger',
-				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-				rejectClass: 'btn btn-outline-secondary'
-			}) === false) {
-				return false
-			}
-
-			if(this.form['abstract_en'].length < 100 && await this.$fhcAlert.confirm({
-				message: this.$capitalize(this.$p.t('abgabetool/warningShortAbstractEn')),
-				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-				acceptClass: 'btn btn-danger',
-				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-				rejectClass: 'btn btn-outline-secondary'
-			}) === false) {
-				return false
-			}
-
-			if(this.form['schlagwoerter'].length < 50 && await this.$fhcAlert.confirm({
-				message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerter')),
-				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-				acceptClass: 'btn btn-danger',
-				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-				rejectClass: 'btn btn-outline-secondary'
-			}) === false) {
-				return false
-			}
-
-			if(this.form['schlagwoerter_en'].length < 50 && await this.$fhcAlert.confirm({
-				message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerterEn')),
-				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-				acceptClass: 'btn btn-danger',
-				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-				rejectClass: 'btn btn-outline-secondary'
-			}) === false) {
-				return false
-			}
-
-			if(this.form['seitenanzahl'] <= 5 && await this.$fhcAlert.confirm({
-				message: this.$capitalize(this.$p.t('abgabetool/warningSmallSeitenanzahl')),
+			// just ask once
+			if(await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
 				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 				acceptClass: 'btn btn-danger',
 				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
@@ -295,27 +280,61 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
-		dateDiffInDays(datum, today){
-			const oneDayMs = 1000 * 60 * 60 * 24
-			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		convertDateToIsoString(date) {
+			// 1. Check if it is a Date object AND if the date value is valid (not 'Invalid Date')
+			if (param instanceof Date && !isNaN(param.getTime())) {
+				const year = param.getFullYear();
+				// getMonth() is 0-indexed, so we add 1.
+				const month = param.getMonth() + 1;
+				const day = param.getDate();
+		
+				// Helper to pad single-digit numbers with a leading zero
+				const pad = (num) => String(num).padStart(2, '0');
+		
+				// Return the formatted string: YYYY-MM-DD
+				return `${year}-${pad(month)}-${pad(day)}`;
+			}
+		
+			// If it's not a valid Date, return the original parameter
+			return param;
+		},
+		dateDiffInDays(datumParam){
+			let datum = datumParam
+			if(datumParam instanceof Date && !isNaN(datum.getTime()))
+			{
+				const year = datumParam.getFullYear();
+				const month = datumParam.getMonth() + 1;	// getMonth() is 0-indexed
+				const day = datumParam.getDate();
+				const pad = (num) => String(num).padStart(2, '0');
+				datum = `${year}-${pad(month)}-${pad(day)}`	
+			}
+			
+			const dateToday = luxon.DateTime.now().startOf('day');
+			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
+			const duration = dateDatum.diff(dateToday, 'days');
+			
+			return duration.values.days;
 		},
 		getDateStyleClass(termin) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
-			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			if (termin.abgabedatum === null) {
+			termin.diffindays = this.dateDiffInDays(termin.datum)
+			
+			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
-					return 'verpasst'
-				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
-					return 'abzugeben'
+					return 'verpasst' // needs upload, missed it and has not submitted anything 
+				} else if (datum > today && termin.diffindays <= 12) {
+					return 'abzugeben' // needs to upload soon
 				} else {
-					return 'standard'
-				} 
-			} else if(abgabedatum > datum) {
-				return 'verspaetet'
+					return 'standard' // upload in distant future
+				}
+			}
+			else if(abgabedatum > datum) {
+				return 'verspaetet' // needs upload, missed it and has submitted smth late
 			} else {
-				return 'abgegeben'
+				return 'abgegeben' // nothing else to do for that termin
 			}
 		},
 		openBeurteilungLink(link) {
@@ -343,11 +362,19 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(link, '_blank')
 		},
 		openBenotung() {
-			const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
-			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
-			window.open(link, '_blank')
+			// old link check ?
+			
+			if(this.getSemesterBenotbar && this.projektarbeit?.abgabetermine.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null)) {
+				// TODO: shouldnt be hardcoded here, at least config in abgabetool -> ideally event sourced from projektarbeitsbeurteilung
+				
+				const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
+				const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
+				window.open(link, '_blank')
+			} else {
+				window.open(this.old_abgabe_beurteilung_link, '_blank')
+			}
 		},
-		formatDate(dateParam, showTime = true) {
+		formatDate(dateParam) {
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -356,13 +383,12 @@ export const AbgabeMitarbeiterDetail = {
 			const day = padZero(date.getDate());
 			const year = date.getFullYear();
 			
-			// abgabedatum should SHOW abgabezeit which should always be last minute of the day
-			return `${day}.${month}.${year}` + (showTime ? ' 23:59' : ''); 
+			return `${day}.${month}.${year}`
 		},
 		getAccTabHeaderForTermin(termin) {
 			let tabTitle = ''
 			
-			const datumFormatted = this.formatDate(termin.datum, false)
+			const datumFormatted = this.formatDate(termin.datum)
 			tabTitle += termin.bezeichnung?.bezeichnung + ' ' + datumFormatted
 
 			return tabTitle
@@ -432,6 +458,16 @@ export const AbgabeMitarbeiterDetail = {
 			
 	},
 	computed: {
+		allowedToSaveZusatzdaten() {
+				return this.form.schlagwoerter.length > 0 && this.form.schlagwoerter_en.length > 0 && this.form.abstract.length > 0 && this.form.abstract_en.length > 0 && this.form.seitenanzahl > 0
+		},
+		getAllowedAbgabeTypeOptions() {
+			if(this.assistenzMode) {
+				return this.abgabeTypeOptions
+			} else {
+				return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.bezeichnung))
+			}
+		},
 		getMessagePtStyle() {
 			// adjust outer spacing and internal padding to appear similar to doenload button in size
 			return {
@@ -447,24 +483,6 @@ export const AbgabeMitarbeiterDetail = {
 				}
 			}	
 		},
-		getActiveIndexTabArray() {
-			// here we try to assume which abgabetermine are the most relevant to the current user
-
-			// lets try to take the termin with nearest date
-			let closestIndex = -1;
-			let minDiff = Infinity;
-			const today = new Date();
-
-			this.projektarbeit.abgabetermine.forEach((obj, i) => {
-				const diff = Math.abs(new Date(obj.datum) - today);
-				if (diff < minDiff) {
-					minDiff = diff;
-					closestIndex = i;
-				}
-			});
-			
-			return [closestIndex]
-		},
 		getEid() {
 			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
 		},
@@ -518,6 +536,12 @@ export const AbgabeMitarbeiterDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipBeurteilungerforderlich() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipBeurteilungerfolderlich'),
+				class: "custom-tooltip"
+			}
+		},
 		getTooltipAbgegeben() {
 			return {
 				value: this.$p.t('abgabetool/c4tooltipAbgegeben'),
@@ -573,6 +597,8 @@ export const AbgabeMitarbeiterDetail = {
 		'projektarbeit'(newVal) {
 			// set invertedFixtermin field for UI/UX purposes -> avoid double negation in text
 			
+			this.activeIndexArray = this.getActiveIndexTabArray()
+			
 			newVal?.abgabetermine?.forEach(termin => termin.invertedFixtermin = !termin.fixtermin)
 			
 			// default select german if projektarbeit sprache was null
@@ -639,7 +665,7 @@ export const AbgabeMitarbeiterDetail = {
 						<Dropdown
 							:style="{'width': '100%'}"
 							v-model="newTermin.bezeichnung"
-							:options="abgabeTypeOptions"
+							:options="getAllowedAbgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp"
 							scrollHeight="300px">
 						</Dropdown>
@@ -708,7 +734,7 @@ export const AbgabeMitarbeiterDetail = {
 				</button>
 			</div>
 		</div>
-		<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
+		<Accordion :multiple="true" :activeIndex="activeIndexArray">
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 					<template #header>
@@ -719,12 +745,13 @@ export const AbgabeMitarbeiterDetail = {
 								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 							</div>
 							<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
 								<span>{{ termin?.bezeichnung?.bezeichnung }}</span>
 							</div>
 							<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
-								<span>{{ formatDate(termin.datum, false) }}</span>
+								<span>{{ formatDate(termin.datum) }}</span>
 							</div>
 							<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
 								<i  v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
@@ -746,7 +773,10 @@ export const AbgabeMitarbeiterDetail = {
 						</div>
 					</div>
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+						<div class="col-12 col-md-3 align-content-center">
+							<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+							<div class="row fw-light" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4abgabeuntil2359') )}}</div>
+						</div>
 						<div class="col-12 col-md-9">
 							<VueDatePicker
 								v-model="termin.datum"
@@ -768,7 +798,7 @@ export const AbgabeMitarbeiterDetail = {
 								:placeholder="getPlaceholderTermin(termin)"
 								v-model="termin.bezeichnung"
 								@change="handleChangeAbgabetyp(termin)"
-								:options="abgabeTypeOptions"
+								:options="getAllowedAbgabeTypeOptions"
 								:optionLabel="getOptionLabelAbgabetyp"
 								:optionDisabled="getOptionDisabled">
 							</Dropdown>
@@ -778,6 +808,7 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
 						<div class="col-12 col-md-9">
 							<Checkbox
+								:disabled="!termin.allowedToSave"
 								v-model="termin.upload_allowed"
 								:binary="true"
 								:pt="{ root: { class: 'ml-auto' }}"
@@ -968,7 +999,8 @@ export const AbgabeMitarbeiterDetail = {
 				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" @click="saveZusatzdaten">{{ $capitalize( $p.t('abgabetool/c4save') )}}</button>
+				<div v-show="!allowedToSaveZusatzdaten">{{ $p.t('abgabetool/c4zusatzdatenausfuellen') }}</div>
+				<button class="btn btn-primary" :disabled="!allowedToSaveZusatzdaten" @click="saveZusatzdaten">{{ $capitalize( $p.t('abgabetool/c4save') )}}</button>
 			</template>
 		</bs-modal>
 		
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index cbf4dea83..07fe3de65 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -152,7 +152,7 @@ export const AbgabeStudentDetail = {
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
-		formatDate(dateParam, showTime = true) {
+		formatDate(dateParam) {
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -161,7 +161,7 @@ export const AbgabeStudentDetail = {
 			const day = padZero(date.getDate());
 			const year = date.getFullYear();
 
-			return `${day}.${month}.${year}` + (showTime ? ' 23:59' : '');
+			return `${day}.${month}.${year}`
 		},
 		async upload(termin) {
 
@@ -226,7 +226,7 @@ export const AbgabeStudentDetail = {
 		getAccTabHeaderForTermin(termin) {
 			let tabTitle = ''
 
-			const datumFormatted = this.formatDate(termin.datum, false)
+			const datumFormatted = this.formatDate(termin.datum)
 			tabTitle += termin.bezeichnung + ' ' + datumFormatted
 			
 			return tabTitle
@@ -282,8 +282,11 @@ export const AbgabeStudentDetail = {
 		getEid() {
 			return this.$capitalize(this.$p.t('abgabetool/c4eidesstattlicheErklaerung'))
 		},
+		allowedToSaveZusatzdaten() {
+			return this.form.schlagwoerter.length > 0 && this.form.schlagwoerter_en.length > 0 && this.form.abstract.length > 0 && this.form.abstract_en.length > 0 && this.form.seitenanzahl > 0
+		},
 		getAllowedToSendEndupload() {
-			return !this.eidAkzeptiert
+			return this.eidAkzeptiert && this.allowedToSaveZusatzdaten
 		},
 		qualityGateTerminAvailable() {
 			let qgatefound = false
@@ -384,7 +387,7 @@ export const AbgabeStudentDetail = {
 									<span>{{ termin?.bezeichnung }}</span>
 								</div>
 								<div class="col-auto text-start p-0" style="min-width: max(80px, 15%); transform: translateX(-30px)">
-									<span>{{ formatDate(termin.datum, false) }}</span>
+									<span>{{ formatDate(termin.datum) }}</span>
 								</div>
 								<div class="col-auto" style="transform: translateX(-30px); min-width: 42px;">
 									<i v-if="termin?.fixtermin" v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
@@ -431,7 +434,10 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+							<div class="col-12 col-md-3 align-content-center">
+								<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+								<div class="row fw-light" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4abgabeuntil2359') )}}</div>
+							</div>
 							<div class="col-12 col-md-9">
 								<VueDatePicker
 									v-model="termin.datum"
@@ -653,7 +659,8 @@ export const AbgabeStudentDetail = {
 				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" :disabled="getAllowedToSendEndupload" @click="triggerEndupload">{{$capitalize( $p.t('ui/hochladen') )}}</button>
+				<div v-show="!allowedToSaveZusatzdaten">{{ $p.t('abgabetool/c4zusatzdatenausfuellen') }}</div>
+				<button class="btn btn-primary" :disabled="!getAllowedToSendEndupload" @click="triggerEndupload">{{$capitalize( $p.t('ui/hochladen') )}}</button>
 			</template>
 		</bs-modal>
 	 	
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index bdd613bab..2cfa0e308 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -409,6 +409,7 @@ export const AbgabetoolAssistenz = {
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
+				this.serienTermin.upload_allowed,
 				pids,
 				this.serienTermin.fixtermin
 			)).then(res => {
@@ -524,19 +525,27 @@ export const AbgabetoolAssistenz = {
 
 			this.$refs.modalContainerAbgabeDetail.show()
 		},
-		dateDiffInDays(datum, today){
-			const oneDayMs = 1000 * 60 * 60 * 24
-			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		dateDiffInDays(datum){
+			const dateToday = luxon.DateTime.now().startOf('day');
+
+			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
+
+			const duration = dateDatum.diff(dateToday, 'days');
+
+			return duration.values.days;
 		},
 		getDateStyleClass(termin) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
-			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			if (termin.abgabedatum === null) {
+			termin.diffindays = this.dateDiffInDays(termin.datum)
+
+			// seperate status if termin is in the past, it needs a note but doesnt have one yet			
+			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			else if (termin.abgabedatum === null) {
 				if(datum < today) {
-					return 'verpasst'
-				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					return termin.upload_allowed ? 'verpasst' : 'abgegeben'
+				} else if (datum > today && termin.diffindays <= 12) {
 					return 'abzugeben'
 				} else {
 					return 'standard'
@@ -754,10 +763,10 @@ export const AbgabetoolAssistenz = {
 		
 		this.$api.call(ApiStudiensemester.getAllStudiensemesterAndAktOrNext()).then((res) => {
 			this.allSem = res.data[0]
-			this.curSem = res.data[1]
+			const all = {studiensemester_kurzbz: 'Alle'}
+			this.curSem = all // res.data[1]
 			
-			// TODO: maybe filter only for available semester from projektarbeiten dataset
-			this.studiensemesterOptions = [{studiensemester_kurzbz: 'Alle'}, this.curSem, ...this.allSem]
+			this.studiensemesterOptions = [all, ...this.allSem]
 
 		}).catch(e => {
 			this.loading = false
@@ -767,12 +776,13 @@ export const AbgabetoolAssistenz = {
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
-			this.notenOptions = res.data
-			// TODO: more sophisticated way to filter for these two, in essence it is still hardcoded
-			this.allowedNotenOptions = this.notenOptions.filter(
-				opt => opt.bezeichnung === 'Bestanden'
-					|| opt.bezeichnung === 'Nicht bestanden'
-			)
+			if(res.meta.status == 'success') {
+				this.notenOptions = res.data[0]
+
+				this.allowedNotenOptions = this.notenOptions.filter(
+					opt => res.data[1].includes(opt.bezeichnung)
+				)
+			}
 			
 			// allowedNotenOptions apply to quality gates abgabetermine
 			// this selection is about graded projektarbeiten, so take different options here
@@ -819,43 +829,51 @@ export const AbgabetoolAssistenz = {
 				</div>
 			</template>
 			<template v-slot:default>
-				<div class="row">
-					<div class="col-1 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4fixterminv4')}}
-					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$capitalize($p.t('abgabetool/c4zieldatum'))}}
-					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabetyp')}}
-					</div>
-					<div class="col-5 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabekurzbz')}}
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-1 d-flex justify-content-center align-items-center">
-						<Checkbox 
+			
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
+					<div class="col-12 col-md-9">
+						<Checkbox
 							v-model="serienTermin.fixtermin"
-							:binary="true" 
+							:binary="true"
 							:pt="{ root: { class: 'ml-auto' }}"
 						>
 						</Checkbox>
 					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						<div>
-							<VueDatePicker
-								style="width: 95%;"
-								v-model="serienTermin.datum"
-								:clearable="false"
-								:enable-time-picker="false"
-								:format="formatDate"
-								:text-input="true"
-								auto-apply>
-							</VueDatePicker>
-						</div>				
+				</div>
+			
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 align-content-center">
+						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
+					<div class="col-12 col-md-9">
+						<VueDatePicker
+							style="width: 95%;"
+							v-model="serienTermin.datum"
+							:clearable="false"
+							:enable-time-picker="false"
+							:format="formatDate"
+							:text-input="true"
+							auto-apply>
+						</VueDatePicker>
+					</div>
+				</div>
+			
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+					<div class="col-12 col-md-9">
+						<Checkbox
+							v-model="serienTermin.upload_allowed"
+							:binary="true"
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
+					</div>
+				</div>
+				
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
+					<div class="col-12 col-md-9">
 						<Dropdown 
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
@@ -863,7 +881,11 @@ export const AbgabetoolAssistenz = {
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
-					<div class="col-5 d-flex justify-content-center align-items-center">
+				</div>
+				
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-12 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 85219fe30..a4fa5a211 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -11,6 +11,7 @@ export const AbgabetoolMitarbeiter = {
 		BsModal,
 		CoreFilterCmpt,
 		AbgabeDetail,
+		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
 		VueDatePicker,
@@ -19,6 +20,7 @@ export const AbgabetoolMitarbeiter = {
 	provide() {
 		return {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
+			abgabetypenBetreuer: Vue.computed(() => this.abgabetypenBetreuer),
 			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
 			turnitin_link: Vue.computed(() => this.turnitin_link),
 			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
@@ -36,6 +38,7 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			abgabetypenBetreuer: null,
 			detailIsFullscreen: false,
 			phrasenPromise: null,
 			phrasenResolved: false,
@@ -52,7 +55,8 @@ export const AbgabetoolMitarbeiter = {
 					paabgabetyp_kurzbz: 'zwischen',
 					bezeichnung: 'Zwischenabgabe'
 				},
-				kurzbz: ''
+				kurzbz: '',
+				upload_allowed: false
 			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
@@ -179,6 +183,7 @@ export const AbgabetoolMitarbeiter = {
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
+				this.serienTermin.upload_allowed,
 				this.selectedData?.map(projekt => projekt.projektarbeit_id),
 				false
 			)).then(res => {
@@ -346,7 +351,9 @@ export const AbgabetoolMitarbeiter = {
 
 	},
 	computed: {
-		
+		getAllowedAbgabeTypeOptions() {
+			return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.bezeichnung))
+		}
 	},
 	created() {
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
@@ -355,6 +362,7 @@ export const AbgabetoolMitarbeiter = {
 		this.$api.call(ApiAbgabe.getConfig()).then(res => {
 			this.turnitin_link = res.data?.turnitin_link
 			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
+			this.abgabetypenBetreuer = res.data?.abgabetypenBetreuer
 		}).catch(e => {
 			console.log(e)
 			this.loading = false
@@ -363,12 +371,14 @@ export const AbgabetoolMitarbeiter = {
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
-			this.notenOptions = res.data
-			// TODO: more sophisticated way to filter for these two, in essence it is still hardcoded
-			this.allowedNotenOptions = this.notenOptions.filter(
-				opt => opt.bezeichnung === 'Bestanden' 
-					|| opt.bezeichnung === 'Nicht bestanden'
-			)
+			if(res.meta.status == 'success') {
+				this.notenOptions = res.data[0]
+
+				this.allowedNotenOptions = this.notenOptions.filter(
+					opt => res.data[1].includes(opt.bezeichnung)
+				)
+			}
+			
 		}).catch(e => {
 			this.loading = false
 		})
@@ -395,40 +405,53 @@ export const AbgabetoolMitarbeiter = {
 				</div>
 			</template>
 			<template v-slot:default>
-				<div class="row">
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4zieldatum')}}
+			
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 align-content-center">
+						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
 					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabetyp')}}
-					</div>
-					<div class="col-6 d-flex justify-content-center align-items-center">
-						{{$p.t('abgabetool/c4abgabekurzbz')}}
+					<div class="col-12 col-md-9">
+						<VueDatePicker
+							style="width: 95%;"
+							v-model="serienTermin.datum"
+							:clearable="false"
+							:enable-time-picker="false"
+							:format="formatDate"
+							:text-input="true"
+							auto-apply>
+						</VueDatePicker>
 					</div>
 				</div>
-				<div class="row">
-					<div class="col-3 d-flex justify-content-center align-items-center">
-						<div>
-							<VueDatePicker
-								style="width: 95%;"
-								v-model="serienTermin.datum"
-								:clearable="false"
-								:enable-time-picker="false"
-								:format="formatDate"
-								:text-input="true"
-								auto-apply>
-							</VueDatePicker>
-						</div>				
+			
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4upload_allowed') )}}</div>
+					<div class="col-12 col-md-9">
+						<Checkbox
+							v-model="serienTermin.upload_allowed"
+							:binary="true"
+							:pt="{ root: { class: 'ml-auto' }}"
+						>
+						</Checkbox>
 					</div>
-					<div class="col-3 d-flex justify-content-center align-items-center">
+				</div>
+				
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
+					<div class="col-12 col-md-9"
+						v-if="abgabetypenBetreuer && abgabeTypeOptions"
+					>
 						<Dropdown 
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
-							:options="abgabeTypeOptions"
+							:options="getAllowedAbgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
-					<div class="col-6 d-flex justify-content-center align-items-center">
+				</div>
+				
+				<div class="row mt-2">
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-12 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index deb0a6f52..d851235aa 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -47,20 +47,26 @@ export const AbgabetoolStudent = {
 		};
 	},
 	methods: {
-		dateDiffInDays(datum, today){
-			const oneDayMs = 1000 * 60 * 60 * 24
-			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		dateDiffInDays(datum){
+			const dateToday = luxon.DateTime.now().startOf('day');
+
+			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
+
+			const duration = dateDatum.diff(dateToday, 'days');
+
+			return duration.values.days;
 		},
 		getDateStyleClass(termin) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 
-			// avoid renaming these statuses as their names are used as css keys
-			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
-			if (termin.abgabedatum === null) {
+			termin.diffindays = this.dateDiffInDays(termin.datum)
+
+			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			else if (termin.abgabedatum === null) {
 				if(datum < today) {
-					return 'verpasst'
-				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					return termin.upload_allowed ? 'verpasst' : 'abgegeben'
+				} else if (datum > today && termin.diffindays <= 12) {
 					return 'abzugeben'
 				} else {
 					return 'standard'
@@ -71,7 +77,7 @@ export const AbgabetoolStudent = {
 				return 'abgegeben'
 			}
 		},
-		checkQualityGates(termine) {
+		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
 			let qgate2Passed = false
 			
@@ -88,6 +94,40 @@ export const AbgabetoolStudent = {
 
 			return qgate1Passed && qgate2Passed
 		},
+		checkQualityGatesOptional(termine) {
+			const qgate1found =  termine.find(t => t.paabgabetyp_kurzbz == 'qualgate1')
+			const qgate2found =  termine.find(t => t.paabgabetyp_kurzbz == 'qualgate2')
+			
+			let qgate1positiv = true
+			if(qgate1found) {
+				qgate1positiv = false
+
+				termine.forEach(t => {
+					const noteOption = this.notenOptions?.find(opt => opt.note == t.note)
+					if(noteOption && noteOption.positiv) {
+						if (t.paabgabetyp_kurzbz == 'qualgate1') {
+							qgate1positiv = true
+						}
+					}
+				})
+			}
+
+			let qgate2positiv = true
+			if(qgate2found) {
+				qgate2positiv = false
+
+				termine.forEach(t => {
+					const noteOption = this.notenOptions?.find(opt => opt.note == t.note)
+					if(noteOption && noteOption.positiv) {
+						if (t.paabgabetyp_kurzbz == 'qualgate2') {
+							qgate2positiv = true
+						}
+					}
+				})
+			}
+
+			return qgate1positiv && qgate2positiv
+		},
 		isPastDate(date) {
 			return new Date(date) < new Date(Date.now())	
 		},
@@ -101,11 +141,15 @@ export const AbgabetoolStudent = {
 					termin.allowedToUpload = false
 					
 					if(termin.paabgabetyp_kurzbz == 'end') {
-						// production logic
-						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGates(pa.abgabetermine)
+						// production logic when qgates are required
+						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesStrict(pa.abgabetermine)
 						
+						// larifari we want qgates but they are optional fhtw mode
+						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesOptional(pa.abgabetermine)
+
+
 						// development purposes
-						// termin.allowedToUpload = this.checkQualityGates(pa.abgabetermine)
+						// termin.allowedToUpload = this.checkQualityGatesStrict(pa.abgabetermine)
 						// termin.allowedToUpload = true
 
 					} else if(termin.fixtermin) {
@@ -257,7 +301,13 @@ export const AbgabetoolStudent = {
 		this.loading = true
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		await this.$api.call(ApiAbgabe.getNoten()).then(res => {
-			this.notenOptions = res.data
+			if(res.meta.status == 'success') {
+				this.notenOptions = res.data[0]
+
+				this.allowedNotenOptions = this.notenOptions.filter(
+					opt => res.data[1].includes(opt.bezeichnung)
+				)
+			}
 		}).finally(() => {
 			this.loading = false
 		})
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d1f4a485a..18e2393dc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42538,6 +42538,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeuntil2359',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabe bis 23:59",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Submission until 23:59",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43558,6 +43578,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipBeurteilungerforderlich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Beurteilung erforderlich",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Grading necessary',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -44114,6 +44154,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'confirmEnduploadSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Möchten Sie den Endupload durchführen?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you want to complete the final upload?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zusatzdatenausfuellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Alle Zusatzdatenfelder benötigen Eingabewerte!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All additional data fields are required!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 0372853df24de8264944fad41c495529369fc537 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 28 Nov 2025 14:01:20 +0100
Subject: [PATCH 1003/1357] Aufnahmetermine: fix error persiting boolean, GS:
 sortorder studiensemester, Gruppen exclude generated groups from search
 result

---
 .../controllers/api/frontend/v1/stv/Aufnahmetermine.php        | 2 +-
 .../controllers/api/frontend/v1/stv/GemeinsameStudien.php      | 2 +-
 application/controllers/api/frontend/v1/stv/Gruppen.php        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 86b739c90..26033908d 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -298,7 +298,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
-				: null;
+				: false;
 		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']
diff --git a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
index 97dad48fd..8f3d6419a 100644
--- a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
+++ b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
@@ -83,7 +83,7 @@ class GemeinsameStudien extends FHCAPI_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
 		$result = $this->StudiensemesterModel->load();
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
index c45165b41..b10cfb328 100644
--- a/application/controllers/api/frontend/v1/stv/Gruppen.php
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -147,7 +147,8 @@ class Gruppen extends FHCAPI_Controller
 			'lehre' => true,
 			'sichtbar' => true,
 			'aktiv' => true,
-			'direktinskription' => false
+			'direktinskription' => false,
+			'generiert' => false
 		]);
 
 		$data = $this->getDataOrTerminateWithError($result);

From aee6ace42e73668d33a25dd2951161bcaede3878 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 28 Nov 2025 14:09:53 +0100
Subject: [PATCH 1004/1357] termine without uploads can now only have
 'standard' or 'abgegeben' status based on datum; FHC_Api_Controller method
 checkUploadSize() -> checks input->server('CONTENT_LENGTH') against
 min($max_upload, $max_post, $memory_limit) and throws a designated
 filesizeExceeded error message; added fhc-orange palette for new status
 'beurteilungerforderlich';

---
 .../controllers/api/frontend/v1/Abgabe.php    |  4 +-
 application/core/FHCAPI_Controller.php        | 27 +++++++++++-
 public/css/theme/default.css                  | 12 ++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  3 ++
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 18 ++++----
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 18 ++++----
 system/phrasesupdate.php                      | 41 ++++++++++++++++++-
 7 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 17d8f0811..b256d6779 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -186,6 +186,8 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function postStudentProjektarbeitZwischenabgabe()
 	{
+		$this->checkUploadSize();
+		
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		$paabgabe_id = $_POST['paabgabe_id'];
 		$student_uid = $_POST['student_uid'];
@@ -236,6 +238,7 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function postStudentProjektarbeitEndupload()
 	{
+		$this->checkUploadSize();
 
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		$paabgabe_id = $_POST['paabgabe_id'];
@@ -1028,5 +1031,4 @@ class Abgabe extends FHCAPI_Controller
 			$abgabe->signatur = $signaturVorhanden;
 		}
 	}
-	
 }
\ No newline at end of file
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index dad56334d..a2f13cc99 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -266,7 +266,7 @@ class FHCAPI_Controller extends Auth_Controller
 	}
 
 	// ---------------------------------------------------------------
-	// Security
+	// Security Begin
 	// ---------------------------------------------------------------
 
 	/**
@@ -287,4 +287,29 @@ class FHCAPI_Controller extends Auth_Controller
 			'required_permissions' => $this->_rpsToString($requiredPermissions, $this->router->method)
 		], self::ERROR_TYPE_AUTH);
 	}
+
+	// ---------------------------------------------------------------
+	// Security End
+	// ---------------------------------------------------------------
+
+	/**
+	 * Checks the client's total request size (Content-Length) against the minimum
+	 * effective PHP limit (min of upload_max_filesize, post_max_size, memory_limit).
+	 * This preempts failures that result in vague "missing parameters" errors on large files.
+	 *
+	 * @return void
+	 */
+	protected function checkUploadSize() {
+		$content_length = (int)$this->input->server('CONTENT_LENGTH');
+
+		//get max serverside size upload
+		$max_upload = (int)(ini_get('upload_max_filesize'));
+		$max_post = (int)(ini_get('post_max_size'));
+		$memory_limit = (int)(ini_get('memory_limit'));
+		$max_upload_mb = min($max_upload, $max_post, $memory_limit);    // smallest of 3 config values
+
+		if($content_length >= $max_upload_mb) {
+			$this->terminateWithError($this->p->t('global', 'filesizeExceeded'), 'general');
+		}
+	}
 }
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 51bbeceb6..699a60f93 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -85,6 +85,18 @@
 	--fhc-pink-70: rgb(160, 40, 90);
 	--fhc-pink-80: rgb(130, 25, 70);
 	--fhc-pink-90: rgb(100, 15, 50);
+
+	/* --- Orange --- */
+	--fhc-orange-5:  rgb(255, 250, 240);
+	--fhc-orange-10: rgb(255, 235, 200);
+	--fhc-orange-20: rgb(255, 210, 140);
+	--fhc-orange-30: rgb(255, 185, 80);
+	--fhc-orange-40: rgb(255, 155, 40);
+	--fhc-orange-50: rgb(255, 128, 0);
+	--fhc-orange-60: rgb(230, 110, 0);
+	--fhc-orange-70: rgb(200, 90, 0);
+	--fhc-orange-80: rgb(170, 70, 0);
+	--fhc-orange-90: rgb(130, 50, 0);
 	
 	--fhc-beige-10: rgba(245, 233, 215, 0.5);
 	--fhc-beige-20: rgba(172, 153, 125, 0.5);
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 9354ad184..e1ca760ed 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -333,6 +333,9 @@ export const AbgabeMitarbeiterDetail = {
 			}
 			else if(abgabedatum > datum) {
 				return 'verspaetet' // needs upload, missed it and has submitted smth late
+			} else if(!termin.upload_allowed) {
+				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				else if (today > datum) return 'abgegeben'
 			} else {
 				return 'abgegeben' // nothing else to do for that termin
 			}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 2cfa0e308..5c939d37a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -542,18 +542,22 @@ export const AbgabetoolAssistenz = {
 
 			// seperate status if termin is in the past, it needs a note but doesnt have one yet			
 			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
-			else if (termin.abgabedatum === null) {
+			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
-					return termin.upload_allowed ? 'verpasst' : 'abgegeben'
+					return 'verpasst' // needs upload, missed it and has not submitted anything 
 				} else if (datum > today && termin.diffindays <= 12) {
-					return 'abzugeben'
+					return 'abzugeben' // needs to upload soon
 				} else {
-					return 'standard'
+					return 'standard' // upload in distant future
 				}
-			} else if(abgabedatum > datum) {
-				return 'verspaetet'
+			}
+			else if(abgabedatum > datum) {
+				return 'verspaetet' // needs upload, missed it and has submitted smth late
+			} else if(!termin.upload_allowed) {
+				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				else if (today > datum) return 'abgegeben'
 			} else {
-				return 'abgegeben'
+				return 'abgegeben' // nothing else to do for that termin
 			}
 		},
 		openTimeline(val) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index d851235aa..247c36263 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -63,18 +63,22 @@ export const AbgabetoolStudent = {
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
 			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
-			else if (termin.abgabedatum === null) {
+			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
-					return termin.upload_allowed ? 'verpasst' : 'abgegeben'
+					return 'verpasst' // needs upload, missed it and has not submitted anything 
 				} else if (datum > today && termin.diffindays <= 12) {
-					return 'abzugeben'
+					return 'abzugeben' // needs to upload soon
 				} else {
-					return 'standard'
+					return 'standard' // upload in distant future
 				}
-			} else if(abgabedatum > datum) {
-				return 'verspaetet'
+			}
+			else if(abgabedatum > datum) {
+				return 'verspaetet' // needs upload, missed it and has submitted smth late
+			} else if(!termin.upload_allowed) {
+				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				else if (today > datum) return 'abgegeben'
 			} else {
-				return 'abgegeben'
+				return 'abgegeben' // nothing else to do for that termin
 			}
 		},
 		checkQualityGatesStrict(termine) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 18e2393dc..ab93b2234 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1453,7 +1453,46 @@ $phrases = array(
 			)
 		)
 	),
-
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'unknown_error',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ein unbekannter Fehler ist aufgetreten: {error}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An unknown error occurred: {error}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'filesizeExceeded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die maximale Dateigröße wurde überschritten!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The maximum file size has been exceeded!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//*******************************		CORE/ui
 	array(
 		'app' => 'core',

From 17519eac83f66f0a5303fdbd05f6ca6c58333de7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 1 Dec 2025 13:27:42 +0100
Subject: [PATCH 1005/1357] refactor Messaging

- headerFilter for table Messages
- multiactions for sendMessages for openmodes modal and inSamePage
---
 .../api/frontend/v1/messages/Messages.php     | 112 +++++---------
 public/js/api/factory/messages/messages.js    |  40 ++---
 .../Messages/Details/NewMessage/Modal.js      |  56 +------
 .../Messages/Details/NewMessage/NewDiv.js     | 140 +++++++-----------
 .../Messages/Details/TableMessages.js         |  43 ++++--
 public/js/components/Messages/Messages.js     |   2 +-
 .../Studentenverwaltung/Details/Messages.js   |   5 +-
 7 files changed, 141 insertions(+), 257 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index f3a40f72f..b3cb31bb6 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -16,7 +16,6 @@ class Messages extends FHCAPI_Controller
 			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
 			'getNameOfDefaultRecipients' => ['admin:r', 'assistenz:r'],
 			'sendMessage' => ['admin:r', 'assistenz:r'],
-			'sendMessages' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getDataVorlage' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
@@ -104,24 +103,22 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($vorlage);
 	}
 
-	public function getMessageVarsPerson($id, $typeId)
+	public function getMessageVarsPerson($typeId)
 	{
-		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
-		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-		$data = $this->getDataOrTerminateWithError($result);
+		$ids = $this->input->post('ids');
+		$messageVarsPerson = [];
 
-		$this->terminateWithSuccess($data);
+		foreach ($ids as $id)
+		{
+			$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+			$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$messageVarsPerson[] = current($data);
+		}
+
+		$this->terminateWithSuccess($messageVarsPerson);
 	}
 
-/*	public function getMsgVarsPrestudent($id, $typeId)
-	{
-		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
-		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}*/
-
 	public function getMsgVarsPrestudent($typeId)
 	{
 		$ids = $this->input->post('ids');
@@ -201,55 +198,9 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($recipients);
 	}
 
-	public function sendMessages()
+	public function sendMessage($typeId)
 	{
-/*		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-		}
-		else
-			$this->terminateWithError("Data missing ", self::ERROR_TYPE_GENERAL);
-
-		if (isset($_POST['ids']))
-		{
-			$ids = json_decode($_POST['ids']);
-			unset($_POST['ids']);
-		}
-		else
-			$this->terminateWithError("IDs missing ", self::ERROR_TYPE_GENERAL);
-
-
-		if (isset($_POST['uids']))
-		{
-			$uids = json_decode($_POST['uids']);
-			unset($_POST['uids']);
-		}
-		else
-			$this->terminateWithError("UIDs missing ", self::ERROR_TYPE_GENERAL);
-*/
-
-		if (isset($_POST['data']))
-		{
-			$data = json_decode($_POST['data']);
-			unset($_POST['data']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
-
-		$this->terminateWithSuccess($data);
-
-	}
-
-	public function sendMessage($recipient_id, $return=false)
-	{
-		//has to be uid TODO(Manu) check
-		//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
-
-		//default setting
-		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
-
+		$resultReturn = [];
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$result = $this->BenutzerModel->loadWhere(
@@ -287,49 +238,54 @@ class Messages extends FHCAPI_Controller
 		$body = $this->input->post('body');
 		$relationmessage_id = $this->input->post('relationmessage_id');
 
-		$typeId = $this->input->post('type_id');
-		$ids = $this->input->post('id');
+		if (isset($_POST['ids']))
+		{
+			$ids = json_decode($_POST['ids']);
+			unset($_POST['ids']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
 		foreach ($ids as $id)
 		{
+			$receiversPersonId = $typeId == "person_id" ? $id : $this->_getPersonId($id, $typeId);
+
 			if($typeId == 'uid')
 			{
 				$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-				//parseMessagetext for variables Prestudent
 				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
-				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
 			}
 			if($typeId == 'mitarbeiter_uid')
 			{
 				$person_id = $this->_getPersonId($id, $typeId);
 
 				$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
-				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
-				$this->terminateWithError($bodyParsed[$id], self::ERROR_TYPE_GENERAL);
-
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
 			}
 			elseif($typeId == 'person_id')
 			{
 				$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
-				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
 			}
 			elseif($typeId == 'prestudent_id')
 			{
 				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
-				$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
+				$bodyParsed = $this->getDataOrTerminateWithError($result);
 			}
 			else
 			{
 				$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
 			}
+
+			$result =$this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
+			$data = $this->getDataOrTerminateWithError($result);
+			$resultReturn[] = current($data);
+
 		}
-
-
-
-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
-
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($resultReturn);
 	}
 
 	public function getPreviewText($type_id)
diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index 1c2bbe66e..c3542308a 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -38,19 +38,13 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/'
 		};
 	},
-	getMessageVarsPerson(userParams){
+	getMessageVarsPerson(ids, type_id){
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/messages/messages/getMessageVarsPerson/' + userParams.id + '/' + userParams.type_id
+			url: 'api/frontend/v1/messages/messages/getMessageVarsPerson/' + type_id,
+			params: {ids}
 		};
 	},
-	//TODO(Manu) enable for id_array
-/*	getMsgVarsPrestudent(userParams){
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + userParams.id + '/' + userParams.type_id
-		};
-	},	*/
 	getMsgVarsPrestudent(ids, type_id){
 		return {
 			method: 'post',
@@ -58,41 +52,25 @@ export default {
 			params: {ids}
 		};
 	},
-	//TODO(Manu) enable for id_array
 	getPersonId(params){
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/getPersonId/' + params.id + '/' + params.type_id
 		};
 	},
-	//TODO(Manu) enable for id_array
-/*	getUid(userParams){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
-		};
-	},	*/
-	getUid(ids, type_id){
+/*	getUid(ids, type_id){
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/getUids/' + type_id,
 			params: {ids}
 		};
-	},
+	},*/
 	getDataVorlage(vorlage_kurzbz){
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz
 		};
 	},
-/*	getNameOfDefaultRecipient(params){
-		console.log(params.id);
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id
-		};
-	},*/
-	//TODO(Manu) enable for id_array
 	getNameOfDefaultRecipients(ids, type_id){
 		return {
 			method: 'post',
@@ -120,17 +98,17 @@ export default {
 			params
 		};
 	},	*/
-	sendMessageFromModalContext(params) {
+	sendMessageFromModalContext(type_id, params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/messages/messages/sendMessages/',
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + type_id,
 			params
 		};
 	},
-	sendMessage(id, params) {
+	sendMessage(type_id, params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + type_id,
 			params
 		};
 	},
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 87b8d7c87..d173bc7d0 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -58,8 +58,7 @@ export default {
 			previewText: null,
 			previewBody: "",
 			replyData: null,
-			uid: null,
-			uids: null //necessary?
+
 		}
 	},
 	methods: {
@@ -116,31 +115,20 @@ export default {
 			const data = new FormData();
 			data.append('data', JSON.stringify(this.formData));
 			data.append('ids', JSON.stringify(this.id));
-			data.append('uids', JSON.stringify(this.uid));
 
-			const params = {
-				id: this.id,
-				type_id: this.typeId
-			};
-			const merged = {
-				...this.formData,
-				...params
-			};
-			data.append('data', JSON.stringify(merged));
-
-			//Modal Context?
 			return this.$refs.formMessage
-				.call(this.endpoint.sendMessageFromModalContext(data))
+				.call(this.endpoint.sendMessageFromModalContext(this.typeId, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
 					this.resetForm();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-						//this.resetForm();
-						//closeModal
-						//closewindwo
+
+					//just emit if no multitasking
+					if(this.id.length == 1){
 						this.$emit('reloadTable');
+						}
 					}
 				);
 		},
@@ -210,15 +198,6 @@ export default {
 				this.previewBody = this.previewText;
 			});
 		},
-		//TODO(Manu) check if No_UID
-		getUid(id, typeId){
-			this.$api
-				.call(this.endpoint.getUid(this.id, this.typeId))
-				.then(result => {
-					this.uid = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		show(){
 			this.$refs.modalNewMessage.show();
 		},
@@ -266,15 +245,9 @@ export default {
 		}
 	},
 	created(){
-		this.getUid(this.id, this.typeId);
-
 		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
-			const params = {
-				id: this.id,
-				type_id: this.typeId
-			};
 			this.$api
-				.call(this.endpoint.getMessageVarsPerson(params))
+				.call(this.endpoint.getMessageVarsPerson(this.id, this.typeId))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -312,19 +285,6 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-/*		this.$api
-			.call(this.endpoint.getNameOfDefaultRecipient({
-				id: this.id,
-				type_id: this.typeId}))
-			.then(result => {
-				this.defaultRecipient = result.data;
-				this.recipientsArray.push({
-					'uid': this.uid,
-					'details': this.defaultRecipient});
-			})
-			.catch(this.$fhcAlert.handleSystemError);*/
-
-		//for multiaction too
 		this.$api
 			.call(this.endpoint.getNameOfDefaultRecipients(this.id, this.typeId))
 			.then(result => {
@@ -379,8 +339,6 @@ export default {
 			</template>
 
 			<form-form ref="formNewMassage">
-			
-			{{defaultRecipients}} | {{defaultRecipient}} || {{uid}}
 
 			<div class="tab-content" id="msg_preview_content">
 				<div class="tab-pane fade show active" id="msg" role="tabpanel" aria-labelledby="msg-tab">
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 24674fd3f..07fdf569d 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,6 +2,7 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
+import ApiMessages from "../../../../api/factory/messages/messages.js"; //props not working with route
 
 export default {
 	name: "ComponentNewMessages",
@@ -19,7 +20,7 @@ export default {
 		openMode: String,
 		tempTypeId: String,
 		tempId: {
-			type: [Number, String],
+			type: Array,
 			required: false
 		},
 		tempMessageId: {
@@ -37,7 +38,7 @@ export default {
 		},
 		messageId(){
 			return this.$props.tempMessageId ||this.$route.params.messageId;
-		}
+		},
 	},
 	data(){
 		return {
@@ -53,6 +54,8 @@ export default {
 			vorlagen: [],
 			recipientsArray: [],
 			defaultRecipient: null,
+			defaultRecipients: [],
+			defaultRecipientString: null,
 			editor: null,
 			isVisible: false,
 			fieldsUser: [],
@@ -67,8 +70,7 @@ export default {
 			previewText: null,
 			previewBody: "",
 			replyData: null,
-			uid: null,
-			messageSent: false
+			messageSent: false,
 		}
 	},
 	methods: {
@@ -106,19 +108,11 @@ export default {
 		},
 		sendMessage() {
 			const data = new FormData();
+			data.append('data', JSON.stringify(this.formData));
+			data.append('ids', JSON.stringify(this.id));
 
-			const params = {
-				id: this.id,
-				type_id: this.typeId
-			};
-
-			const merged = {
-				...this.formData,
-				...params
-			};
-			data.append('data', JSON.stringify(merged));
 			return this.$api
-				.call(this.endpoint.sendMessage(this.uid, data))
+				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
@@ -126,37 +120,34 @@ export default {
 					this.messageSent = true;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					//TODO(Manu) hier route definieren für openmode in Tab, Page?
-					// ist kein child sondern mit route aufgerufen
-					//würde allerdings neues fenster aktualisiert öffnen, altes bleibt ohne reload gleich
-					//Reload vorheriges tab???
-					if(this.openMode == "inSamePage"){
+					if(this.openMode == "inSamePage" && this.id.length == 1 ){
 						this.$emit('reloadTable');
 						}
+					this.resetForm();
 					}
 				);
 		},
 		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
+				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
 		},
-		getPreviewText(id, typeId){
+		getPreviewText(){
 			const data = new FormData();
-
 			data.append('data', JSON.stringify(this.formData.body));
+			data.append('ids', JSON.stringify(this.id));
+
 			return this.$api
-				.call(this.endpoint.getPreviewText({
-					id: this.id,
-					type_id: this.typeId}, data))
+				.call(ApiMessages.getPreviewText(
+					this.typeId, data))
 				.then(response => {
-					this.previewText = response.data;
+					const previews = response.data;
+					this.previewText = previews[this.defaultRecipient];
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					//this.resetForm();
 				});
 		},
 		insertVariable(selectedItem){
@@ -177,11 +168,13 @@ export default {
 				vorlage_kurzbz: null,
 				body: null,
 				subject: null,
+				recipient: null,
+				selectedValue: null
 			};
 			if (this.editor) {
 				this.editor.setContent("");
 			}
-			this.$refs.dropdownComp.setValue(null);
+		//	this.$refs.dropdownComp.setValue(null);
 
 			this.previewBody = null;
 
@@ -202,23 +195,11 @@ export default {
 			if (this.openMode == "inSamePage")
 				this.isVisible = true;
 		},
-		showPreview(id, typeId){
-			this.getPreviewText(id, typeId).then(() => {
+		showPreview(){
+			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
-		getUid(id, typeId){
-			const params = {
-				id: id,
-				type_id: typeId
-			};
-			this.$api
-				.call(this.endpoint.getUid(params))
-				.then(result => {
-					this.uid = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
 	},
 	watch: {
 		'formData.body': {
@@ -242,38 +223,26 @@ export default {
 		},
 	},
 	created(){
-		this.getUid(this.id, this.typeId);
-
-		if (['person_id', 'mitarbeiter_uid'].includes(this.typeId)){
-				const params = {
-					id: this.id,
-					type_id: this.typeId
-				};
-
-				this.$api
-				.call(this.endpoint.getMessageVarsPerson(params))
-					.then(result => {
-						this.fieldsPerson = result.data;
-						const person = this.fieldsPerson[0];
-						this.itemsPerson = Object.entries(person).map(([key, value]) => ({
-							label: key.toLowerCase(),
-							value: '{' + key.toLowerCase() + '}'
-						}));
-					})
-					.catch(this.$fhcAlert.handleSystemError);
-			}
-
-		if (['prestudent_id', 'uid'].includes(this.typeId)){
-				const params = {
-				id: this.id,
-				type_id: this.typeId
-			};
+		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
 			this.$api
-				.call(this.endpoint.getMsgVarsPrestudent(params))
+				.call(ApiMessages.getMessageVarsPerson(this.id, this.typeId))
+				.then(result => {
+					this.fieldsPerson = result.data;
+					const person = this.fieldsPerson[0];
+					this.itemsPerson = Object.entries(person).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
+			this.$api
+				.call(ApiMessages.getMsgVarsPrestudent(this.id, this.typeId))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'
@@ -283,7 +252,7 @@ export default {
 		}
 
 		this.$api
-			.call(this.endpoint.getMsgVarsLoggedInUser())
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -295,21 +264,18 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(this.endpoint.getNameOfDefaultRecipient({
-				id: this.id,
-				type_id: this.typeId}))
+			.call(ApiMessages.getNameOfDefaultRecipients(this.id, this.typeId))
 			.then(result => {
-				this.defaultRecipient = result.data;
-				this.recipientsArray.push({
-					'uid': this.uid,
-					'details': this.defaultRecipient});
+				this.defaultRecipients = result.data;
+				this.defaultRecipientString = Object.values(this.defaultRecipients).join("; ");
+
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
 		//case of reply
 		if(this.messageId != null) {
 			this.$api
-				.call(this.endpoint.getReplyData(this.messageId))
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
@@ -343,7 +309,7 @@ export default {
 									type="text"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
+									v-model="defaultRecipientString"
 									disabled
 								>
 								</form-input>
@@ -472,18 +438,18 @@ export default {
 									v-model="defaultRecipient"
 								>
 									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
-									<option 
-										v-for="recipient in recipientsArray"
-										:key="recipient.uid" 
-										:value="recipient.uid" 
-										>{{recipient.details}}
+									<option
+										v-for="(name, id) in defaultRecipients"
+										  :key="id" 
+										  :value="Number(id)"
+										> {{name}}
 									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn btn-secondary" @click="showPreview(id, typeId)">{{ $p.t('ui', 'btnAktualisieren') }}</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(defaultRecipient)">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 172607022..dd1725507 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -38,12 +38,13 @@ export default {
 				},
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				columns: [
-					{title: "subject", field: "subject"},
-					{title: "body", field: "body", formatter: "html", visible: false},
-					{title: "message_id", field: "message_id", visible: false},
+					{title: "subject", field: "subject", headerFilter: true},
+					{title: "body", field: "body", formatter: "html", visible: false, headerFilter: true},
+					{title: "message_id", field: "message_id", visible: false, headerFilter: true},
 					{
 						title: "Datum",
 						field: "insertamum",
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -55,16 +56,28 @@ export default {
 								minute: "2-digit",
 								hour12: false
 							});
+						},
+						headerFilterFunc(headerValue, rowValue) {
+							const matches = headerValue.match(/^(([0-9]{2})\.)?([0-9]{2})\.([0-9]{4})?$/);
+							let comparestr = headerValue;
+							if(matches !== null) {
+								const year = (matches[4] !== undefined) ? matches[4] : '';
+								const month = matches[3];
+								const day = (matches[2] !== undefined) ? matches[2] : '';
+								comparestr = year + '-' + month + '-' + day;
+							}
+							return rowValue.match(comparestr);
 						}
 					},
-					{title: "sender", field: "sender"},
-					{title: "recipient", field: "recipient"},
-					{title: "senderId", field: "sender_id"},
-					{title: "recipientId", field: "recipient_id"},
-					{title: "Relationmessage ID", field: "relationmessage_id"},
+					{title: "sender", field: "sender", headerFilter: true},
+					{title: "recipient", field: "recipient", headerFilter: true},
+					{title: "senderId", field: "sender_id", headerFilter: true},
+					{title: "recipientId", field: "recipient_id", headerFilter: true},
+					{title: "Relationmessage ID", field: "relationmessage_id", headerFilter: true},
 					{
 						title: "Status",
 						field: "status",
+						headerFilter: true,
 						formatterParams: [
 							"unread",
 							"read",
@@ -73,11 +86,12 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							return formatterParams[cell.getValue()];
-						}
+						},
 					},
 					{
 						title: "letzte Änderung",
 						field: "statusdatum",
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -89,6 +103,17 @@ export default {
 								minute: "2-digit",
 								hour12: false
 							});
+						},
+						headerFilterFunc(headerValue, rowValue) {
+							const matches = headerValue.match(/^(([0-9]{2})\.)?([0-9]{2})\.([0-9]{4})?$/);
+							let comparestr = headerValue;
+							if(matches !== null) {
+								const year = (matches[4] !== undefined) ? matches[4] : '';
+								const month = matches[3];
+								const day = (matches[2] !== undefined) ? matches[2] : '';
+								comparestr = year + '-' + month + '-' + day;
+							}
+							return rowValue.match(comparestr);
 						}
 					},
 					{
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 53692d6a3..0785877d8 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -98,6 +98,7 @@ export default {
 			}
 
 			const newTab = window.open(path, "_blank");
+
 		},
 		openInNewWindow(id, typeId, messageId){
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
@@ -124,7 +125,6 @@ export default {
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
-	{{typeId}} {{id}} 
 
 		<message-modal
 			ref="modalMsg"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index a0634be97..e009dd4a7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -32,6 +32,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+
 		<template v-if="prestudent_ids">
 			<core-messages
 				ref="formc"
@@ -39,7 +40,7 @@ export default {
 				type-id="prestudent_id"
 				:id="prestudent_ids"
 				messageLayout="twoColumnsTableLeft"
-				open-mode="modal"
+				open-mode="inSamePage"
 				show-table
 				>
 			</core-messages>
@@ -51,7 +52,7 @@ export default {
 				type-id="person_id"
 				:id="person_ids"
 				messageLayout="twoColumnsTableLeft"
-				open-mode="modal"
+				open-mode="inSamePage"
 				show-table
 				>
 			</core-messages>

From be2b578f82e63953fdf95925babce4dab5b07c46 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 1 Dec 2025 14:43:21 +0100
Subject: [PATCH 1006/1357] reset default openmode to modal

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index e009dd4a7..4acb0aef4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -40,7 +40,7 @@ export default {
 				type-id="prestudent_id"
 				:id="prestudent_ids"
 				messageLayout="twoColumnsTableLeft"
-				open-mode="inSamePage"
+				open-mode="modal"
 				show-table
 				>
 			</core-messages>
@@ -52,7 +52,7 @@ export default {
 				type-id="person_id"
 				:id="person_ids"
 				messageLayout="twoColumnsTableLeft"
-				open-mode="inSamePage"
+				open-mode="modal"
 				show-table
 				>
 			</core-messages>

From afb3ce4cae98d7b325659d653d2355d4b01e0377 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 2 Dec 2025 07:54:13 +0100
Subject: [PATCH 1007/1357] modify using open mode newTab or window with
 multiple Recipients via post request

---
 application/controllers/NeueNachricht.php     |  9 ++-
 .../api/frontend/v1/messages/Messages.php     | 10 +++
 application/views/Nachrichten.php             |  4 ++
 public/js/apps/Nachrichten.js                 |  7 ++-
 .../Messages/Details/NewMessage/NewDiv.js     | 39 +++++++-----
 public/js/components/Messages/Messages.js     | 61 +++++++++++++------
 6 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/application/controllers/NeueNachricht.php b/application/controllers/NeueNachricht.php
index 9b61b78ef..b0ff5c554 100644
--- a/application/controllers/NeueNachricht.php
+++ b/application/controllers/NeueNachricht.php
@@ -20,11 +20,18 @@ class NeueNachricht extends Auth_Controller
 	 */
 	public function _remap()
 	{
+		$typeid = $this->input->post('typeid');
+		$ids = ($this->input->post('ids') && strpos($this->input->post('ids'), ',')) 
+			? explode(',', $this->input->post('ids'))
+			: $this->input->post('ids');
+
 		//now working
 		$this->load->view('Nachrichten', [
 			'permissions' => [
 				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-			]
+			],
+			'ids' => $ids,
+			'typeid' => $typeid
 		]);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index b3cb31bb6..714492203 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -122,6 +122,9 @@ class Messages extends FHCAPI_Controller
 	public function getMsgVarsPrestudent($typeId)
 	{
 		$ids = $this->input->post('ids');
+		if(!is_array($ids)) {
+			$ids = array($ids);
+		}
 		$messageVarsPrestudent = [];
 
 		if($typeId == 'uid')
@@ -169,6 +172,9 @@ class Messages extends FHCAPI_Controller
 	public function getNameOfDefaultRecipients($type_id)
 	{
 		$ids = $this->input->post('ids');
+		if(!is_array($ids)) {
+			$ids = array($ids);
+		}
 		$recipients = [];
 
 		if (empty($ids)) {
@@ -301,6 +307,10 @@ class Messages extends FHCAPI_Controller
 		if (isset($_POST['ids']))
 		{
 			$ids = json_decode($_POST['ids']);
+			if(!is_array($ids))
+			{
+				$ids = array($ids);
+			}
 			unset($_POST['ids']);
 		}
 		else
diff --git a/application/views/Nachrichten.php b/application/views/Nachrichten.php
index cf34bfd53..0d0e8e707 100644
--- a/application/views/Nachrichten.php
+++ b/application/views/Nachrichten.php
@@ -40,6 +40,10 @@ $configArray = [
 		cis-root="<?= CIS_ROOT; ?>"
 		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+<?php if($ids !== null && $typeid !== null) { ?>
+		:id ="<?= htmlspecialchars(json_encode($ids)); ?>"
+		type-id ="<?= htmlspecialchars($typeid); ?>"
+<?php } ?>
 	>
 	</router-view>
 </div>
diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js
index 84b9ddee5..ab9baf084 100644
--- a/public/js/apps/Nachrichten.js
+++ b/public/js/apps/Nachrichten.js
@@ -1,14 +1,15 @@
 import NewMessage from "../components/Messages/Details/NewMessage/NewDiv.js";
 
-import Phrasen from "../plugin/Phrasen.js";
+import Phrasen from "../plugins/Phrasen.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
-		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
-		{ path: `/${ciPath}/NeueNachricht/:id/:typeId/:messageId`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht`, component: NewMessage, props: true },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage, props: true },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId/:messageId`, component: NewMessage, props: true },
 	]
 });
 
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 07fdf569d..8c8e371a0 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -13,33 +13,23 @@ export default {
 		DropdownComponent,
 	},
 	props: {
+/*
 		endpoint: {
 			type: Object,
 			required: true
 		},
+*/
 		openMode: String,
-		tempTypeId: String,
-		tempId: {
+		typeId: String,
+		id: {
 			type: Array,
 			required: false
 		},
-		tempMessageId: {
+		messageId: {
 			type: Number,
 			required: false,
 		}
 	},
-	computed: {
-		//params with routes for new tab and new window AND props for inSamePage
-		id(){
-			return this.$props.tempId || this.$route.params.id;
-		},
-		typeId(){
-			return this.$props.tempTypeId || this.$route.params.typeId;
-		},
-		messageId(){
-			return this.$props.tempMessageId ||this.$route.params.messageId;
-		},
-	},
 	data(){
 		return {
 			formData: {
@@ -223,6 +213,25 @@ export default {
 		},
 	},
 	created(){
+		const missingparamsmsgs = [];
+		if(!this.typeId)
+		{
+			// TODO(bh) Phrase
+			missingparamsmsgs.push('Fehlender oder ungültiger Parameter Empfänger-Id-Typ.');
+		}
+
+		if(!this.id || this.id.length < 1)
+		{
+			// TODO(bh) Phrase
+			missingparamsmsgs.push('Fehlender oder ungültiger Parameter Empfänger-Id(s).');
+		}
+
+		if(missingparamsmsgs.length > 0)
+		{
+			this.$fhcAlert.alertMultiple(missingparamsmsgs, 'warn', 'Warning', true);
+			return;
+		}
+
 		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
 			this.$api
 				.call(ApiMessages.getMessageVarsPerson(this.id, this.typeId))
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 0785877d8..61a260ffd 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -65,15 +65,20 @@ export default {
 		}
 	},
 	methods: {
+		getControllerUrl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/NeueNachricht';
+		},
 		reloadTable(){
 			this.$refs.templateTableMessage.reload();
 		},
 		handleMessage(id, typeId, messageId){
 			this.messageId = messageId;
 			if (this.openMode == "window") {
+				//this.$refs['newMsgForm'].submit();
 				this.openInNewWindow(id, typeId, messageId);
 			}
 			else if (this.openMode == "newTab"){
+				//this.$refs['newMsgForm'].submit();
 				this.openInNewTab(id, typeId, messageId);
 			}
 			else if (this.openMode == "modal"){
@@ -85,37 +90,48 @@ export default {
 			else
 				console.log("no valid openMode");
 		},
-		openInNewTab(id, typeId, messageId= null){
+		openInNewTab(id, typeId, messageId=null){
+			if(id.length > 1)
+			{
+				this.$refs['newMsgForm'].submit();
+				return;
+			}
 
-			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			let path = this.getControllerUrl();
 
 			if (messageId){
-				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
+				path += "/" + encodeURIComponent(id) + "/" + encodeURIComponent(typeId) + "/" + encodeURIComponent(messageId);
 			}
 
 			else {
-				path += "/NeueNachricht/" + id + "/" + typeId;
+				path += "/" + encodeURIComponent(id) + "/" + encodeURIComponent(typeId);
 			}
 
 			const newTab = window.open(path, "_blank");
-
 		},
 		openInNewWindow(id, typeId, messageId){
-			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-
-			if (messageId){
-				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
-			}
-
-			else {
-				path += "/NeueNachricht/" + id + "/" + typeId;
-			}
-
 			const width = Math.round(window.innerWidth * 0.75);
 			const height = Math.round(window.innerHeight * 0.75);
 			const left = Math.round((window.innerWidth - width) / 2);
 			const top = Math.round((window.innerHeight - height) / 2);
 
+				if(id.length > 1)
+			{
+				const newWindow = window.open('', "NewMsgWindow", `width=${width},height=${height},left=${left},top=${top}`);
+				this.$refs['newMsgForm'].submit();
+				return;
+			}
+
+			let path = this.getControllerUrl();
+
+			if (messageId){
+				path += "/" + encodeURIComponent(id) + "/" + encodeURIComponent(typeId) + "/" + encodeURIComponent(messageId);
+			}
+
+			else {
+				path += "/" + encodeURIComponent(id) + "/" + encodeURIComponent(typeId);
+			}
+
 			const newWindow = window.open(path, "_blank", `width=${width},height=${height},left=${left},top=${top}`);
 		},
 		resetMessageId(){
@@ -125,6 +141,15 @@ export default {
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
+		<!-- TODO(bh) set target _self for debugging post but _blank for newTab -->
+		<form ref="newMsgForm"
+			method="post"
+			:action="getControllerUrl()"
+			:target="(openMode === 'window') ? 'NewMsgWindow' : '_blank'"
+		>
+			<input type="hidden" name="typeid" :value="typeId">
+			<input type="hidden" name="ids" :value="id">
+		</form>
 
 		<message-modal
 			ref="modalMsg"
@@ -142,9 +167,9 @@ export default {
 		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
 				ref="templateNewMessage"
-				:temp-type-id="typeId"
-				:temp-id="id"
-				:temp-message-id="messageId"
+				:type-id="typeId"
+				:id="id"
+				:message-id="messageId"
 				:endpoint="endpoint"
 				:openMode="openMode"
 				@reloadTable="reloadTable"

From 6359dc0fc930d8e25efb70707c221247d0f585e3 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 2 Dec 2025 13:13:42 +0100
Subject: [PATCH 1008/1357] use sendUploadMail on endupload, no events for
 that; remove extensive form validation from student detail; serientermin
 update table format fix; WIP new job informing betreuer about changes to thei
 betreued PA's; zweitbetreuer/erstbetreuer beurteilungslink switch in
 abgabetoolStudent; WIP getting that link from event not hardcoded; fix
 checkUploadSize calculation bytes to megabytes; added beurteilungerforderlich
 class to accordion headers;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 421 +++++++++---------
 .../controllers/jobs/AbgabetoolJob.php        |   8 +-
 application/core/FHCAPI_Controller.php        |  17 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  47 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  11 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  27 +-
 .../Cis/Abgabetool/StatusLegende.js           |  10 +
 7 files changed, 266 insertions(+), 275 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index b256d6779..708f7f692 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -214,9 +214,6 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				));
 
-				// enable this when lektor cry that they dont receive enough emails
-//				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-
 				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
 					'abgabedatum' => date('Y-m-d'),
 					'updatevon' => getAuthUID(),
@@ -290,12 +287,6 @@ class Abgabe extends FHCAPI_Controller
 				$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
 				$signaturstatus = $paabgabe->signatur;
 				
-				if ($paabgabe->signatur === false)
-				{
-					// TODO: decide if we need this email at all, if yes -> nightly job sends email
-//					$this->signaturFehltEmail($student_uid);
-				}
-				
 				// update projektarbeit cols
 				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
 					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
@@ -311,7 +302,7 @@ class Abgabe extends FHCAPI_Controller
 				$res = $this->PaabgabeModel->load($res->retval);
 				$abgabe = getData($res)[0];
 				$abgabe->signatur = $signaturstatus;
-					
+
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
 				$this->logLib->logInfoDB(array('endupload',$res, array(
@@ -332,203 +323,11 @@ class Abgabe extends FHCAPI_Controller
 
 	}
 
-	private function signaturFehltEmail($student_uid) {
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudentModel->addJoin('public.tbl_benutzer', 'ON (public.tbl_benutzer.uid = public.tbl_student.student_uid)');
-		$this->StudentModel->addJoin('public.tbl_person', 'person_id');
-
-//		$this->StudentModel->load($student_uid); -> this loads all students for some reason
-		$result = $this->StudentModel->loadWhere(array('student_uid' => $student_uid));
-		$this->StudentModel->resetQuery();
-		
-		$studentArr = $this->getDataOrTerminateWithError($result);
-
-		if(count($studentArr) > 0) {
-			$student = $studentArr[0];
-		} else {
-			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
-		}
-		
-		$result = $this->StudiengangModel->load($student->studiengang_kz);
-		$studiengangArr = $this->getDataOrTerminateWithError($result);
-
-		if(count($studiengangArr) > 0) {
-			$stg_obj = $studiengangArr[0];
-		} else {
-			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
-		}
-
-		$subject = 'Abgabe ohne Signatur';
-		$tomail = $stg_obj->email;
-		$data = array(
-			'vorname' => $student->vorname,
-			'nachname' => $student->nachname,
-			'studiengang' => $stg_obj->bezeichnung
-		);
-
-		
-//		$mailres = sendSanchoMail(
-//			'ParbeitsbeurteilungSiganturFehlt',
-//			$data,
-//			$tomail,
-//			$subject,
-//			'sancho_header_min_bw.jpg',
-//			'sancho_footer_min_bw.jpg'
-//		);
-	}
-
-	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
-
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-
-		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
-
-
-		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
-
-		if(count($projektarbeitArr) > 0) {
-			$projektarbeit = $projektarbeitArr[0];
-		} else {
-			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
-		}
-
-		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
-		if(!$projektarbeitIsCurrent) {
-			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
-		}
-
-		// Link to Abgabetool
-		if (defined('CIS4') && CIS4) {
-			$ci3BootstrapFilePath = "cis.php";
-		} else {
-			$ci3BootstrapFilePath = "index.ci.php";
-		}
-
-		$path = $this->config->item('URL_MITARBEITER');
-		$url = APP_ROOT.$path;
-
-//		$this->addMeta('betreuerArray', $resBetr->retval);
-		
-		// getProjektbetreuerAnrede fetches distinct on person_id, so there should be one row. zweitbetreuer is handled seperately afterwards 
-		foreach($resBetr->retval as $betreuerRow) {
-
-			// query student benutzer view for every betreuer row
-			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
-			
-			// 1. Begutachter mail ohne Token
-			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
-			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-			$projekttyp_kurzbz = $projektarbeit->projekttyp_kurzbz;
-			$subject = $projektarbeit->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
-			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
-
-			$maildata = array();
-			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
-			$maildata['anrede'] = $betreuerRow->anrede;
-			$maildata['betreuer_voller_name'] = $betreuerRow->first;
-			$maildata['student_anrede'] = $studentUser->anrede;
-			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
-			$maildata['abgabetyp'] = $abgabetyp;
-			$maildata['parbeituebersichtlink'] = "<p><a href='$url'>Zur Projektarbeitsübersicht</a></p>";
-			$maildata['bewertunglink'] = $projektarbeitIsCurrent && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
-			$maildata['token'] = "";
-			
-			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
-			
-			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-
-//			$this->addMeta('$maildata', $maildata);
-
-			$mailres = sendSanchoMail(
-				'ParbeitsbeurteilungEndupload',
-				$maildata,
-				$email,
-				$subject,
-				'sancho_header_min_bw.jpg',
-				'sancho_footer_min_bw.jpg',
-				get_uid()."@".DOMAIN);
-
-			if(!$mailres)
-			{
-				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-			}
-
-			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
-			if ($paabgabetyp_kurzbz == 'end')
-			{
-				// Zweitbegutachter holen
-				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
-				$zweitbegutachterRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid));
-				
-//				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
-				
-				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
-				{
-
-					foreach ($zweitbegutachterRetval as $begutachter)
-					{
-						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
-						$tokenGenRes = $this->ProjektbetreuerModel->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
-
-						if (!$tokenGenRes)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
-						
-//						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
-						
-						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
-						}
-						
-						$begutachterMitToken = $begutachterMitTokenRetval[0];
-
-						$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-						$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
-						$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
-						$intern = isset($begutachterMitToken->uid);
-						$mail_link = $intern ? $mail_fulllink : $mail_baselink;
-
-						$zweitbetmaildata = array();
-						$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
-						$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
-						$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
-						$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
-						$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
-						$zweitbetmaildata['abgabetyp'] = $abgabetyp;
-						$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
-						$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
-						$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-						
-//						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
-						
-						$mailres = sendSanchoMail(
-							'ParbeitsbeurteilungEndupload',
-							$zweitbetmaildata,
-							$begutachterMitToken->email,
-							$subject,
-							'sancho_header_min_bw.jpg',
-							'sancho_footer_min_bw.jpg',
-							get_uid()."@".DOMAIN
-						);
-
-						if (!$mailres)
-						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-						}
-					
-					}
-				}
-			}
-		}
-	}
-
+	/**
+	 * tabulator tabledata fetch for abgabetool/mitarbeiter
+	 * initially fetches all currently active projektarbeiten with assigned mentorship
+	 * showAll functionality also retrieves older finished projektarbeiten
+	 */
 	public function getMitarbeiterProjektarbeiten() {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -553,7 +352,10 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
 	
-	// called by abgabetool/mitarbeiter when adding a new termin
+	/**
+	 * called by abgabetool/mitarbeiter in mitarbeiterdetail.js when adding a single new abgabetermin
+	 * initially fetches all
+	 */
 	public function postProjektarbeitAbgabe() {
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		$paabgabe_id = $_POST['paabgabe_id'];
@@ -668,6 +470,11 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess([$paabgabe, $existingPaabgabe]);
 	}
 
+	/**
+	 * called by abgabetool/mitarbeiter in mitarbeiterdetail.js when deleting an abgabetermin
+	 * deletion is only possible if user is assistenz OR betreuer deletes their own custom termin
+	 * none of these roles are allowed to delete if students uploaded something for that termin
+	 */
 	public function deleteProjektarbeitAbgabe() {
 		$paabgabe_id = $_POST['paabgabe_id'];
 
@@ -759,6 +566,11 @@ class Abgabe extends FHCAPI_Controller
 
 	}
 
+	/**
+	 * called by Abgabetool/Deadlines
+	 * fetches the next upcoming abgabtermine for a given betreuer person_id
+	 * resembles the legacy abgabetool functionality of "show deadlines"
+	 */
 	public function fetchDeadlines() {
 		$person_id = $_POST['person_id'];
 
@@ -779,6 +591,11 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * called by Abgabetool/Mitarbeiter & Abgabetool/Assistenz
+	 * fetches all available paabgabetypen to enable a logical selection of them
+	 * based on active status and role assistenz/betreuer
+	 */
 	public function getPaAbgabetypen() {
 		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
 
@@ -788,7 +605,10 @@ class Abgabe extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($paabgabetypen);
 	}
-	
+
+	/**
+	 * helper function to fetch the correct email for a projektarbeits erstbetreuer
+	 */
 	private function getProjektbetreuerEmail($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
@@ -812,7 +632,11 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->terminateWithSuccess(array($noten, $allowed_noten_abgabetool));
 	}
-	
+
+	/**
+	 * helper function to send a sancho mail to students if a betreuer or assistenz grades a quality gate
+	 * termin as negative (nicht bestanden)
+	 */
 	private function sendQualGateNegativEmail($projektarbeit_id, $betreuer_person_id, $paabgabe) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		
@@ -866,7 +690,11 @@ class Abgabe extends FHCAPI_Controller
 			$subject
 		);
 	}
-	
+
+	/**
+	 * tabulator tabledata fetch for abgabetool/assistenz
+	 * initially fetches all ungraded projektarbeiten with all their abgabetermine
+	 */
 	public function getProjektarbeitenForStudiengang() {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		
@@ -909,7 +737,12 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
 	
-	// TODO: this could be in a generic info controller and resused
+	// TODO: this could be in a generic info controller and reused
+	/**
+	 * GET METHOD
+	 * returns List of all studiengang_kz a user has the assigned permission 'basis/abgabe_assistenz:rw' for
+	 * used in Abgabetool/Assistenz to populate Studiengang Dropdown
+	 */
 	public function getStudiengaenge() {
 		$this->load->library('PermissionLib');
 		
@@ -927,6 +760,10 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * GET METHOD
+	 * endpoint to download the abgabe of a paabgabe termin zwischenabgabe or endupload
+	 */
 	public function getStudentProjektarbeitAbgabeFile()
 	{
 		$this->load->helper('download');
@@ -957,6 +794,11 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
+	/**
+	 * POST METHOD
+	 * endpoint to enable Assistenz/Betreuer to edit the zusatzdate of a projektarbeit, in case the student somehow
+	 * can't do it themself
+	 */
 	public function postStudentProjektarbeitZusatzdaten(){
 		$projektarbeit_id = $_POST['projektarbeit_id'];
 		
@@ -1000,7 +842,10 @@ class Abgabe extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($result);
 	}
-	
+
+	/**
+	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
+	 */
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
 			return;
@@ -1031,4 +876,154 @@ class Abgabe extends FHCAPI_Controller
 			$abgabe->signatur = $signaturVorhanden;
 		}
 	}
+
+	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
+
+
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+
+		if(count($projektarbeitArr) > 0) {
+			$projektarbeit = $projektarbeitArr[0];
+		} else {
+			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+		}
+
+		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
+		if(!$projektarbeitIsCurrent) {
+			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+		}
+
+		// Link to Abgabetool
+		if (defined('CIS4') && CIS4) {
+			$ci3BootstrapFilePath = "cis.php";
+		} else {
+			$ci3BootstrapFilePath = "index.ci.php";
+		}
+
+		$path = $this->config->item('URL_MITARBEITER');
+		$url = APP_ROOT.$path;
+
+//		$this->addMeta('betreuerArray', $resBetr->retval);
+
+		// getProjektbetreuerAnrede fetches distinct on person_id, so there should be one row. zweitbetreuer is handled seperately afterwards 
+		foreach($resBetr->retval as $betreuerRow) {
+
+			// query student benutzer view for every betreuer row
+			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
+
+			// 1. Begutachter mail ohne Token
+			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
+			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+			$projekttyp_kurzbz = $projektarbeit->projekttyp_kurzbz;
+			$subject = $projektarbeit->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
+			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
+
+			$maildata = array();
+			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
+			$maildata['anrede'] = $betreuerRow->anrede;
+			$maildata['betreuer_voller_name'] = $betreuerRow->first;
+			$maildata['student_anrede'] = $studentUser->anrede;
+			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
+			$maildata['abgabetyp'] = $abgabetyp;
+			$maildata['parbeituebersichtlink'] = "<p><a href='$url'>Zur Projektarbeitsübersicht</a></p>";
+			$maildata['bewertunglink'] = $projektarbeitIsCurrent && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
+			$maildata['token'] = "";
+
+			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
+
+			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+
+//			$this->addMeta('$maildata', $maildata);
+
+			$mailres = sendSanchoMail(
+				'ParbeitsbeurteilungEndupload',
+				$maildata,
+				$email,
+				$subject,
+				'sancho_header_min_bw.jpg',
+				'sancho_footer_min_bw.jpg',
+				get_uid()."@".DOMAIN);
+
+			if(!$mailres)
+			{
+				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			}
+
+			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
+			if ($paabgabetyp_kurzbz == 'end')
+			{
+				// Zweitbegutachter holen
+				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+				$zweitbegutachterRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid));
+
+//				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
+
+				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
+				{
+
+					foreach ($zweitbegutachterRetval as $begutachter)
+					{
+						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
+						$tokenGenRes = $this->ProjektbetreuerModel->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
+
+						if (!$tokenGenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+
+						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
+
+//						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
+
+						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+
+						$begutachterMitToken = $begutachterMitTokenRetval[0];
+
+						$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
+						$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
+						$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+						$intern = isset($begutachterMitToken->uid);
+						$mail_link = $intern ? $mail_fulllink : $mail_baselink;
+
+						$zweitbetmaildata = array();
+						$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
+						$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
+						$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
+						$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
+						$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
+						$zweitbetmaildata['abgabetyp'] = $abgabetyp;
+						$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
+						$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+						$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+
+//						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
+
+						$mailres = sendSanchoMail(
+							'ParbeitsbeurteilungEndupload',
+							$zweitbetmaildata,
+							$begutachterMitToken->email,
+							$subject,
+							'sancho_header_min_bw.jpg',
+							'sancho_footer_min_bw.jpg',
+							get_uid()."@".DOMAIN
+						);
+
+						if (!$mailres)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+						}
+
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index c380f344b..84fe8f1a1 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -25,8 +25,10 @@ class AbgabetoolJob extends JOB_Controller
 			'abgabetool'
 		]);
 	}
-
-
+	
+	public function notifyBetreuerAboutChangedAbgaben() {
+		
+	}
 
 	public function notifyBetreuerMail() {
 		// send all new projektarbeit abgabe UPLOADS since the last job run to the related betreuer
@@ -73,6 +75,8 @@ class AbgabetoolJob extends JOB_Controller
 
 			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
 			// php has spaceships 🚀🚀🚀🚀🚀
+			
+			// sorting $abgaben array by datum
 			usort($abgaben, function ($a, $b) {
 				return strtotime($a->datum) <=> strtotime($b->datum);
 			});
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index a2f13cc99..1ef321d14 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -300,14 +300,25 @@ class FHCAPI_Controller extends Auth_Controller
 	 * @return void
 	 */
 	protected function checkUploadSize() {
-		$content_length = (int)$this->input->server('CONTENT_LENGTH');
-
-		//get max serverside size upload
+		// this number represents bytes
+		$content_length_bytes = (int)$this->input->server('CONTENT_LENGTH');
+		$content_length = $content_length_bytes / 1000000;
+		
+		//get max serverside size upload -> this comes in megabytes
 		$max_upload = (int)(ini_get('upload_max_filesize'));
 		$max_post = (int)(ini_get('post_max_size'));
 		$memory_limit = (int)(ini_get('memory_limit'));
 		$max_upload_mb = min($max_upload, $max_post, $memory_limit);    // smallest of 3 config values
 
+		$this->addMeta('stats', array(
+			'$content_length_bytes' => $content_length_bytes,
+			'$content_length' => $content_length,
+			'$max_upload' => $max_upload,
+			'$max_post' => $max_post,
+			'$memory_limit' => $memory_limit,
+			'$max_upload_mb' => $max_upload_mb,
+		));
+		
 		if($content_length >= $max_upload_mb) {
 			$this->terminateWithError($this->p->t('global', 'filesizeExceeded'), 'general');
 		}
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 07fe3de65..7fb2ffc3d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -57,49 +57,8 @@ export const AbgabeStudentDetail = {
 			
 			// TODO: define these
 			if(endupload) {
-				// check these input fields for length of entry
-				if(this.form['abstract'].length < 100 && await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/warningShortAbstract'),
-					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-					rejectClass: 'btn btn-outline-secondary'
-				}) === false) {
-					return false
-				}
-
-				if(this.form['abstract_en'].length < 100 && await this.$fhcAlert.confirm({
-					message: this.$capitalize(this.$p.t('abgabetool/warningShortAbstractEn')),
-					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-					rejectClass: 'btn btn-outline-secondary'
-				}) === false) {
-					return false
-				}
-
-				if(this.form['schlagwoerter'].length < 50 && await this.$fhcAlert.confirm({
-					message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerter')),
-					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-					rejectClass: 'btn btn-outline-secondary'
-				}) === false) {
-					return false
-				}
-
-				if(this.form['schlagwoerter_en'].length < 50 && await this.$fhcAlert.confirm({
-					message: this.$capitalize(this.$p.t('abgabetool/warningShortSchlagwoerterEn')),
-					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-					acceptClass: 'btn btn-danger',
-					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-					rejectClass: 'btn btn-outline-secondary'
-				}) === false) {
-					return false
-				}
-
-				if(this.form['seitenanzahl'] <= 5 && await this.$fhcAlert.confirm({
-					message: this.$capitalize(this.$p.t('abgabetool/warningSmallSeitenanzahl')),
+				if(await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
 					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
 					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
@@ -461,7 +420,7 @@ export const AbgabeStudentDetail = {
 						<div class="row mt-2" v-if="termin.note">
 							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4note') )}}</div>
 							<div class="col-12 col-md-9">
-								<div class="col-1 d-flex justify-content-start align-items-start">
+								<div class="col-auto d-flex justify-content-start align-items-start">
 									{{ getTerminNoteBezeichnung(termin) }}
 								</div>
 							</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 5c939d37a..60e317863 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -87,7 +87,9 @@ export const AbgabetoolAssistenz = {
 					bezeichnung: 'Zwischenabgabe'
 				},
 				kurzbz: '',
-				fixtermin: false
+				fixtermin: false,
+				upload_allowed: false
+				
 			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
@@ -123,7 +125,7 @@ export const AbgabetoolAssistenz = {
 						frozen: true,
 						width: 40
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150,},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150, visible: true},
 					// {title: 'pa_id', field: 'projektarbeit_id', visible: true},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
@@ -437,11 +439,10 @@ export const AbgabetoolAssistenz = {
 				this.$refs.abgabeTable.tabulator.deselectRow()
 
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
-
 				
 				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-				this.$refs.abgabeTable.tabulator.replaceData(mappedData)
-				this.$refs.abgabeTable.tabulator.redraw(true)
+				this.$refs.abgabeTable.tabulator.setData(mappedData)
+				
 			}).finally(()=>{
 				this.saving = false
 			})
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 247c36263..1c9dae63c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -145,10 +145,10 @@ export const AbgabetoolStudent = {
 					termin.allowedToUpload = false
 					
 					if(termin.paabgabetyp_kurzbz == 'end') {
-						// production logic when qgates are required
+						// old assumed production logic when qgates are required
 						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesStrict(pa.abgabetermine)
 						
-						// larifari we want qgates but they are optional fhtw mode
+						// new larifari we want qgates but they are optional fhtw mode
 						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesOptional(pa.abgabetermine)
 
 
@@ -225,8 +225,12 @@ export const AbgabetoolStudent = {
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
 					// mode = 'beurteilungDownload' // build dl link for both betreuer documents
-					projekt.beurteilungLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.bperson_id
-
+					
+					// TODO: if switch zweitbetreuer beurteilung / erstbetreuer beurteilung download
+					projekt.beurteilungLink1 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.bperson_id
+					if(projekt.zweitbetreuer_abgeschickt && projekt.zweitbetreuer_betreuerart_kurzbz && projekt.zweitbetreuer_person_id) {
+						projekt.beurteilungLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.zweitbetreuer_betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.zweitbetreuer_person_id
+					}
 				}
 				
 				return {
@@ -238,7 +242,8 @@ export const AbgabetoolStudent = {
 						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
 						mode
 					},
-					beurteilung: projekt.beurteilungLink ?? null,
+					beurteilung1: projekt.beurteilungLink1 ?? null,
+					beurteilung2: projekt.beurteilungLink2 ?? null,
 					sem: projekt.studiensemester_kurzbz,
 					stg: projekt.kurzbzlang,
 					mail: this.buildMailToLink(projekt),
@@ -286,8 +291,11 @@ export const AbgabetoolStudent = {
 				return ''
 			}
 		},
-		handleDownloadBeurteilung(projektarbeit) {
-			window.open(projektarbeit.beurteilung)
+		handleDownloadBeurteilung1(projektarbeit) {
+			window.open(projektarbeit.beurteilung1)
+		},
+		handleDownloadBeurteilung2(projektarbeit) {
+			window.open(projektarbeit.beurteilung2)
 		}
 	},
 	watch: {
@@ -369,10 +377,13 @@ export const AbgabetoolStudent = {
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4beurteilung') )}}</div>
 					<div class="col-8 col-md-9">
-						<button v-if="projektarbeit.beurteilung" @click="handleDownloadBeurteilung(projektarbeit)" class="btn btn-primary">
+						<button v-if="projektarbeit.beurteilung1" @click="handleDownloadBeurteilung1(projektarbeit)" class="btn btn-primary">
 							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilung') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
 						<a v-else>{{$capitalize( $p.t('abgabetool/c4nobeurteilungVorhanden') )}}</a>
+						<button v-if="projektarbeit.beurteilung2" @click="handleDownloadBeurteilung2(projektarbeit)" class="btn btn-primary">
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilung') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+						</button>
 					</div>
 				</div>
 				<div class="row mt-2">
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index 4b359e380..25761e238 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -49,6 +49,16 @@ export const AbgabeterminStatusLegende = {
 					</div>
 					
 				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto beurteilungerforderlich-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-list-check"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipBeurteilungerforderlich')) }}</h5>
+					</div>
+					
+				</div>
 
 			</div>
 		</div>	

From 257038a2d17373fbfeefa5f0e51a88e0d5c5cecc Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Dec 2025 13:25:46 +0100
Subject: [PATCH 1009/1357] negative stunden markieren headerfilter angepasst
 fuer minusstunden

---
 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..7bf86c119 100644
--- a/public/js/tabulator/filters/extendedHeaderFilter.js
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -13,7 +13,7 @@ function parseFilterExpression(expression)
 
 			andParts.forEach(term => {
 
-				const comparisonMatch = term.match(/^(<=|>=|<|>|=|!=)\s*(\d+(?:[.,]\d+)?)$/);
+				const comparisonMatch = term.match(/^(<=|>=|<|>|=|!=)\s*(-?\d+(?:[.,]\d+)?)$/);
 
 				if (comparisonMatch)
 				{

From 5c9710f44d77747473ecec9e11ebb69bc092348d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Dec 2025 13:49:05 +0100
Subject: [PATCH 1010/1357] externe ueberwachung v1

---
 cis/testtool/externeueberwachung.js           |  35 +++
 cis/testtool/frage.php                        |   6 +-
 cis/testtool/index.php                        |  63 ++++++
 cis/testtool/login.php                        |  19 +-
 cis/testtool/menu.php                         |  30 ++-
 cis/testtool/resetconnection.php              |  25 +++
 cis/testtool/session_init.php                 |  11 +
 cis/testtool/topbar.php                       |  14 +-
 composer.json                                 |   3 +-
 config/cis.config-default.inc.php             |   6 +
 include/externe_ueberwachung.class.php        | 203 ++++++++++++++++++
 include/reihungstest.class.php                |  10 +-
 system/dbupdate_3.4.php                       |   3 +-
 ...hungstest_ueberwachung_mit_constructor.php |  42 ++++
 vilesci/stammdaten/reihungstestverwaltung.php |   8 +
 15 files changed, 461 insertions(+), 17 deletions(-)
 create mode 100644 cis/testtool/externeueberwachung.js
 create mode 100644 cis/testtool/resetconnection.php
 create mode 100644 cis/testtool/session_init.php
 create mode 100644 include/externe_ueberwachung.class.php
 create mode 100644 system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php

diff --git a/cis/testtool/externeueberwachung.js b/cis/testtool/externeueberwachung.js
new file mode 100644
index 000000000..a40a93e05
--- /dev/null
+++ b/cis/testtool/externeueberwachung.js
@@ -0,0 +1,35 @@
+(function () {
+	/*
+
+	const params = new URLSearchParams(location.search);
+	let expectedOrigin = params.get("examus-client-origin");
+
+	if (!expectedOrigin)
+	{
+		window.top.location.href = 'resetconnection.php';
+		return;
+	}
+	*/
+	let proctoringOK = false;
+
+	window.addEventListener("message", function (e) {
+		/*if (e.origin !== expectedOrigin) {
+			return;
+		}*/
+
+		const data = e.data || {};
+
+		if (data.proctoringIsActive)
+		{
+			proctoringOK = true;
+		}
+	});
+
+	setTimeout(function () {
+		if (!proctoringOK)
+		{
+			console.warn("Constructor nicht aktiv!")
+			//window.location.href='resetconnection.php';
+		}
+	}, 1000);
+})();
\ No newline at end of file
diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
index c38229cdf..4267d6a13 100644
--- a/cis/testtool/frage.php
+++ b/cis/testtool/frage.php
@@ -45,7 +45,7 @@ if (!$db = new basis_db())
 $PHP_SELF=$_SERVER["PHP_SELF"];
 
 // Start session
-session_start();
+require_once './session_init.php';
 
 // If language is changed by language select menu, reset language variables
 if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
@@ -182,6 +182,10 @@ echo '
 if(!isset($_SESSION['pruefling_id']))
 	die($p->t('testtool/bitteZuerstAnmelden'));
 
+if (!empty($_SESSION['externe_ueberwachung']) && isset($_SESSION['externe_ueberwachung_verified'])): ?>
+	<script type="text/javascript" src="externeueberwachung.js"></script>
+<?php endif;
+
 $pruefling = new pruefling();
 $pruefling->load($_SESSION['pruefling_id']);
 
diff --git a/cis/testtool/index.php b/cis/testtool/index.php
index d235e6ce9..9aa6c3f84 100644
--- a/cis/testtool/index.php
+++ b/cis/testtool/index.php
@@ -1,16 +1,78 @@
 <?php
 $contentpage = 'login.php';
 
+require_once './session_init.php';
+
 if(isset($_GET['prestudent']) && is_numeric($_GET['prestudent']))
 {
 	$contentpage = 'login.php?prestudent='.$_GET['prestudent'];
 }
+
+if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
+{
+	header("Location: resetconnection.php");
+	exit;
+}
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html>
 <head>
 	<title>TestTool - FH Technikum Wien</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
+	<?php
+	if (!empty($_SESSION['externe_ueberwachung'])) : ?>
+	<script>
+		function loadInContent(url)
+		{
+			if (url.includes('logout=true'))
+			{
+				return doLogout(url);
+			}
+
+			let frame = document.getElementById('content_testtool');
+			if (frame)
+			{
+				frame.src = url;
+			}
+		}
+
+		function doLogout(url)
+		{
+			fetch(url)
+			let topbarFrame = window.frames['topbar'];
+			let menuFrame = window.frames['menu'];
+			let contentFrame = window.frames['content'];
+
+			if (contentFrame)
+				contentFrame.location.href = 'logout.html';
+
+			if (menuFrame)
+				menuFrame.location.href = menuFrame.location.pathname;
+
+			if (topbarFrame)
+				topbarFrame.location.href = topbarFrame.location.pathname;
+			return false;
+		}
+
+		function changeSprache(content_params, sprache)
+		{
+			let topbarFrame = window.frames['topbar'];
+			let menuFrame = window.frames['menu'];
+			let contentFrame = window.frames['content'];
+
+			if (topbarFrame)
+				topbarFrame.location.href = topbarFrame.location.pathname + '?sprache_user=' + sprache;
+
+			if (menuFrame)
+				menuFrame.location.href = menuFrame.location.pathname + '?sprache_user=' + sprache;
+
+			if (contentFrame)
+				contentFrame.location.href = contentFrame.location.pathname + '?' + content_params;
+		}
+
+	</script>
+	<?php endif; ?>
 </head>
 
 <frameset rows="13%,*" cols="*" frameborder="NO" border="0" framespacing="0">
@@ -26,3 +88,4 @@ if(isset($_GET['prestudent']) && is_numeric($_GET['prestudent']))
 	</noframes>
 </frameset>
 </html>
+
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 5a2ae0dea..2b4e678fa 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -40,8 +40,7 @@ if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
 
 // Start session
-session_start();
-
+require_once './session_init.php';
 // Logout (triggered by logout button in menu.php)
 if (isset($_GET['logout']) && $_GET['logout'] == true)
 {
@@ -173,6 +172,12 @@ if (isset($_REQUEST['prestudent']))
 						else
 							$reload_menu = true;
 					}
+
+					if ($rt->externe_ueberwachung)
+					{
+						$_SESSION['externe_ueberwachung'] = true;
+						$_SESSION['externe_ueberwachung_verified'] = false;
+					}
 				}
 
 				$pruefling = new pruefling();
@@ -339,6 +344,8 @@ if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
 	!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code'])) ||
 	(isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
 	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
+	isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
 	isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])))
 {
 	$pruefling = new pruefling();
@@ -468,7 +475,13 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 
 <?php
 
-if (isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
+if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
+{
+	echo "<script> top.location.href = 'resetconnection.php';</script>";
+	exit;
+}
+else if (isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
 	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === false)
 {
 	echo '
diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
index 7c8b12b9d..2c027c886 100644
--- a/cis/testtool/menu.php
+++ b/cis/testtool/menu.php
@@ -34,7 +34,7 @@ if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
 
 // Start session
-session_start();
+require_once './session_init.php';
 
 // If language is changed by language select menu, reset language and session variables
 if(isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
@@ -73,7 +73,7 @@ if (isset($_SESSION['pruefling_id']))
 
 // Link zur Startseite
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-			<a class="ItemTesttool navButton" href="login.php" target="content">'.$p->t('testtool/startseite').'</a>
+			<a class="ItemTesttool navButton" href="login.php" onclick="return loadContent(this.href);">'.$p->t('testtool/startseite').'</a>
 		</td></tr>';
 
 // Link zur Einleitung
@@ -83,7 +83,7 @@ if (isset($_SESSION['pruefling_id']))
 		{
 			echo '
 				<tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-					<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" target="content">'.$p->t('testtool/einleitung').'</a>
+					<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" onclick="return loadContent(this.href);">'.$p->t('testtool/einleitung').'</a>
 				</td></tr>
 			';
 		}
@@ -379,10 +379,13 @@ if (isset($_SESSION['pruefling_id']))
 				}
 			}
 
+
 			echo '<tr>
 					<!--<td width="10" class="ItemTesttoolLeft" nowrap>&nbsp;</td>-->
+
 						<td class="'.$class.'">
-							<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="document.location.reload()" target="content" style="'.$style.'">'.$gebietbezeichnung.'</a>
+								<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="return loadContent(this.href);"  style="'.$style.'">'.$gebietbezeichnung.'</a>
+								
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
@@ -401,7 +404,7 @@ if (isset($_SESSION['pruefling_id']))
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-			<a class="ItemTesttool navButton" href="login.php?logout=true" target="content">Logout</a>
+			<a class="ItemTesttool navButton" href="login.php?logout=true" onclick="return loadContent(this.href);">Logout</a>
 		</td></tr>';
 
 	echo '</td></tr></table>';
@@ -461,5 +464,22 @@ else
                 '</td></tr>');
         }
     });
+
+	function loadContent(url)
+	{
+		if (parent && typeof parent.loadInContent === 'function')
+		{
+			parent.loadInContent(url);
+			return false;
+		}
+
+		let frame = parent?.frames?.["content"];
+		if (frame)
+		{
+			frame.location.href = url;
+			return false;
+		}
+	}
+
 </script>
 </html>
diff --git a/cis/testtool/resetconnection.php b/cis/testtool/resetconnection.php
new file mode 100644
index 000000000..200b3d778
--- /dev/null
+++ b/cis/testtool/resetconnection.php
@@ -0,0 +1,25 @@
+<?php
+
+
+require_once './session_init.php';
+
+require_once('../../config/cis.config.inc.php');
+require_once('../../config/global.config.inc.php');
+require_once '../../include/externe_ueberwachung.class.php';
+if (!$db = new basis_db())
+	die('Fehler beim Oeffnen der Datenbankverbindung');
+
+if (isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true)
+{
+	$ueberwachung = new externeUeberwachung();
+	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID']);
+	$urlSafe = htmlspecialchars($url, ENT_QUOTES);
+
+
+	//var_dump($urlSafe);
+
+	header("Location: $urlSafe");
+	//echo "<script>window.open('{$urlSafe}');</script>";
+	$_SESSION['externe_ueberwachung_verified'] = true;
+
+}
\ No newline at end of file
diff --git a/cis/testtool/session_init.php b/cis/testtool/session_init.php
new file mode 100644
index 000000000..fd7f0b5f3
--- /dev/null
+++ b/cis/testtool/session_init.php
@@ -0,0 +1,11 @@
+<?php
+if (session_status() === PHP_SESSION_NONE) {
+	session_set_cookie_params(
+		0,
+		'/; samesite=None',
+		'',
+		true,
+		true
+	);
+	session_start();
+}
\ No newline at end of file
diff --git a/cis/testtool/topbar.php b/cis/testtool/topbar.php
index 7ca218ede..03bc30e07 100644
--- a/cis/testtool/topbar.php
+++ b/cis/testtool/topbar.php
@@ -67,9 +67,17 @@ function changeSprache(sprache)
     content_params.set('sprache_user', sprache); // add or replace sprache_user
 
     // Pass GET-param sprache_user to topbar.php, menu.php and content (login.php or frage.php) and refresh the frames.
-    location.href = location.pathname + '?sprache_user=' + sprache; // refreshes topbar.php
-    parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
-    parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
+	if (parent && typeof parent.changeSprache === 'function')
+	{
+		parent.changeSprache(content_params, sprache);
+		return false;
+	}
+	else
+	{
+		location.href = location.pathname + '?sprache_user=' + sprache; // refreshes topbar.php
+		parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
+		parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
+	}
 }
 
 	$(document).on("keydown", function (e) {
diff --git a/composer.json b/composer.json
index 370c2eda1..35499ec61 100644
--- a/composer.json
+++ b/composer.json
@@ -517,6 +517,7 @@
 		"phpmd/phpmd": "2.*",
 		"phpmetrics/phpmetrics": "2.*",
 		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6"
+		"phpunit/phpunit": "^6",
+		"firebase/php-jwt": "^6.0"
 	}
 }
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 9985a90d4..b6607ca4a 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -301,4 +301,10 @@ define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
 // Weiterleiten zu CIS neu (wenn Rechte vorhanden)
 define('CIS_REDIRECT_TO_CIS4', false);
+
+//Externe Ueberwachung
+define('EXTERNE_UEBERWACHUNG_PROTOCOL_URL', 'https://example.com');
+define('EXTERNE_UEBERWACHUNG_SECRET_KEY', null);
+define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
+
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
new file mode 100644
index 000000000..0e2e06ec9
--- /dev/null
+++ b/include/externe_ueberwachung.class.php
@@ -0,0 +1,203 @@
+<?php
+
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/prestudent.class.php');
+require_once(dirname(__FILE__).'/person.class.php');
+require_once(dirname(__FILE__).'/reihungstest.class.php');
+
+require_once(dirname(__FILE__).'/../vendor/autoload.php');
+use Firebase\JWT\JWT;
+
+class externeUeberwachung extends basis_db
+{
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function getStatusByPrestudent($prestudent_id)
+	{
+		$session_id = $this->getSessionByPrestudent($prestudent_id);
+		return $this->getSessionStatus($session_id);
+	}
+	public function start($prestudent_id, $reihungstest_id)
+	{
+		$session_id = $this->getSessionByPrestudent($prestudent_id);
+
+		if (!$session_id)
+		{
+			$session_id = $this->createSession($prestudent_id);
+		}
+		else
+		{
+			$status = $this->getSessionStatus($session_id);
+
+			if (in_array($status, array('late_to_start', 'finished')))
+			{
+				$session_id = $this->createSession($prestudent_id);
+			}
+		}
+
+		$payload = $this->getPayload($session_id, $prestudent_id, $reihungstest_id);
+		return $this->getStartUrl($payload);
+	}
+
+
+	private function createSession($prestudent_id)
+	{
+		if (is_null($prestudent_id))
+		{
+			$this->errormsg = 'Falsche Parameterübergabe';
+			return false;
+		}
+
+		$uuid = $this->genereateUUID();
+
+		$qry = "INSERT INTO testtool.tbl_externe_ueberwachung (prestudent_id, session_id, insertvon)
+				VALUES (".
+			$this->db_add_param($prestudent_id).",".
+			$this->db_add_param($uuid).",".
+			$this->db_add_param(get_uid()).")";
+
+		if($this->db_query($qry))
+		{
+			return $uuid;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Antwort';
+			return false;
+		}
+	}
+	public function getSessionByPrestudent($prestudent_id)
+	{
+		if (is_null($prestudent_id))
+		{
+			$this->errormsg = 'Falsche Parameterübergabe';
+			return false;
+		}
+
+		$qry = "SELECT session_id
+				FROM testtool.tbl_externe_ueberwachung
+				ORDER BY insertamum DESC
+				LIMIT 1";
+
+		if($result = $this->db_query($qry))
+		{
+			if ($row = $this->db_fetch_object($result))
+			{
+				return $row->session_id;
+			}
+			else
+			{
+				$this->errormsg = 'Daten konnten nicht geladen werden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
+
+	public function getSessionStatus($session_id)
+	{
+		$payload = $this->getSessionPayload($session_id);
+		$jwt = $this->createToken($payload);
+
+		$url = $this->getSessionUrl($session_id);
+
+		$ch = curl_init($url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, [
+			"Authorization: JWT {$jwt}",
+			"Content-Type: application/json",
+		]);
+		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
+
+		$response = curl_exec($ch);
+		$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+		curl_close($ch);
+
+		$data = json_decode($response, true);
+		return isset($data['status']) ? $data['status'] : false;
+	}
+
+	private function getSessionPayload($session_id)
+	{
+		return [
+			"session_id" => $session_id,
+			"iat" => time(),
+			"exp" => time() + 120,
+		];
+	}
+
+	private function getPayload($session_id, $prestudent_id, $reihungstest_id)
+	{
+		$prestudent = new prestudent($prestudent_id);
+		$person = new Person($prestudent->person_id);
+
+		$reihungstest = new Reihungstest($reihungstest_id);
+
+		$datetime = new DateTime();
+		$today = $datetime->format('Y-m-d');
+
+		$payload = [
+			"userId"=> $prestudent_id,
+			"lastName"=> $person->nachname,
+			"firstName"=> $person->vorname,
+			"language"=> $person->sprache,
+			"accountName"=> "technikum_wien",
+			"accountId"=> "technikum_wien",
+			"examId" => !is_null(trim($reihungstest->anmerkung)) ? $reihungstest->anmerkung : ($today . " RT Test"),
+			"examName" => !is_null(trim($reihungstest->anmerkung)) ? $reihungstest->anmerkung : ($today . " RT Test"),
+			"allowMultipleDisplays" => true,
+			"allowMakingRoomScanSecondCamera" => false,
+			"duration"=> 120,
+			"schedule"=> false,
+			"trial"=> true,
+			"proctoring"=> "offline",
+			"identification"=> "skip",
+			"startDate"=> "2018-03-27T00:00:00Z", //TODO anpassen
+			"endDate"=> "2027-03-30T12:55:00Z", // TODO anpassen
+			"sessionId"=> $session_id,
+			"sessionUrl"=> "https://demo.dev.technikum-wien.at/cis/testtool/index.php"
+		];
+		return $payload;
+	}
+
+	private function getSessionUrl($session_id)
+	{
+		return EXTERNE_UEBERWACHUNG_PROTOCOL_URL . "/api/v2/integration/simple/". EXTERNE_UEBERWACHUNG_INTEGRATION_NAME . "/sessions/". urlencode($session_id) ."/status/";
+	}
+
+	private function getStartUrl($payload)
+	{
+		$token = $this->createToken($payload);
+		$query = http_build_query(['token' => $token]);
+
+		return EXTERNE_UEBERWACHUNG_PROTOCOL_URL . '/integration/simple/'. EXTERNE_UEBERWACHUNG_INTEGRATION_NAME .'/start?' . $query;
+	}
+
+	private function createToken($payload)
+	{
+		return JWT::encode($payload, EXTERNE_UEBERWACHUNG_SECRET_KEY, 'HS256');
+	}
+
+	private function genereateUUID()
+	{
+		$data = openssl_random_pseudo_bytes(16);
+
+		$data[6] = chr(ord($data[6]) & 0x0f | 0x40);
+		$data[8] = chr(ord($data[8]) & 0x3f | 0x80);
+
+		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
+	}
+}
+
+?>
+
+
+
diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index df4134ebf..94d064c25 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -63,6 +63,7 @@ class reihungstest extends basis_db
 	
 	public $zugangs_ueberpruefung = false; //boolean
 	public $zugangscode; //smallint
+	public $externe_ueberwachung = false; //boolean
 
 
 	/**
@@ -119,6 +120,7 @@ class reihungstest extends basis_db
 				$this->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$this->zugangs_ueberpruefung = $this->db_parse_bool($row->zugangs_ueberpruefung);
 				$this->zugangscode = $row->zugangscode;
+				$this->externe_ueberwachung = $this->db_parse_bool($row->externe_ueberwachung);
 
 				return true;
 			}
@@ -234,7 +236,7 @@ class reihungstest extends basis_db
 
 			$qry = 'BEGIN; INSERT INTO public.tbl_reihungstest (studiengang_kz, ort_kurzbz, anmerkung, datum, uhrzeit,
 				insertamum, insertvon, updateamum, updatevon, max_teilnehmer, oeffentlich, freigeschaltet,
-				studiensemester_kurzbz, stufe, anmeldefrist, aufnahmegruppe_kurzbz, zugangs_ueberpruefung, zugangscode) VALUES('.
+				studiensemester_kurzbz, stufe, anmeldefrist, aufnahmegruppe_kurzbz, zugangs_ueberpruefung, zugangscode, externe_ueberwachung) VALUES('.
 				$this->db_add_param($this->studiengang_kz, FHC_INTEGER).', '.
 				$this->db_add_param($this->ort_kurzbz).', '.
 				$this->db_add_param($this->anmerkung).', '.
@@ -250,7 +252,8 @@ class reihungstest extends basis_db
 				$this->db_add_param($this->anmeldefrist).','.
 				$this->db_add_param($this->aufnahmegruppe_kurzbz). ',' .
 				$this->db_add_param($this->zugangs_ueberpruefung, FHC_BOOLEAN).','.
-				$this->db_add_param($this->zugangscode) . ');';
+				$this->db_add_param($this->zugangscode) . ','.
+				$this->db_add_param($this->externe_ueberwachung, FHC_BOOLEAN) . ');';
 		}
 		else
 		{
@@ -270,7 +273,8 @@ class reihungstest extends basis_db
 				'anmeldefrist='.$this->db_add_param($this->anmeldefrist).', '.
 				'aufnahmegruppe_kurzbz='.$this->db_add_param($this->aufnahmegruppe_kurzbz).', '.
 				'zugangs_ueberpruefung='.$this->db_add_param($this->zugangs_ueberpruefung, FHC_BOOLEAN).', '.
-				'zugangscode='.$this->db_add_param($this->zugangscode).' '.
+				'zugangscode='.$this->db_add_param($this->zugangscode).', '.
+				'externe_ueberwachung='.$this->db_add_param($this->externe_ueberwachung, FHC_BOOLEAN).' '.
 				'WHERE reihungstest_id='.$this->db_add_param($this->reihungstest_id, FHC_INTEGER, false).';';
 		}
 
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index ed50b0df1..708e69717 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -86,6 +86,7 @@ require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
 require_once('dbupdate_3.4/68744_StV_settings.php');
+require_once('dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -358,7 +359,7 @@ $tabellen=array(
 	"public.tbl_profil_update_status" => array("status_kurzbz","beschreibung","bezeichnung_mehrsprachig"),
 	"public.tbl_profil_update_topic" => array("topic_kurzbz","beschreibung","bezeichnung_mehrsprachig"),
 	"public.tbl_raumtyp"  => array("raumtyp_kurzbz","beschreibung","kosten","aktiv"),
-	"public.tbl_reihungstest"  => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet","max_teilnehmer","oeffentlich","studiensemester_kurzbz","aufnahmegruppe_kurzbz","stufe","anmeldefrist","zugangs_ueberpruefung","zugangscode"),
+	"public.tbl_reihungstest"  => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet","max_teilnehmer","oeffentlich","studiensemester_kurzbz","aufnahmegruppe_kurzbz","stufe","anmeldefrist","zugangs_ueberpruefung","zugangscode", "externe_ueberwachung"),
 	"public.tbl_rueckstellung" => array("rueckstellung_id","person_id","status_kurzbz","datum_bis","insertamum","insertvon"),
 	"public.tbl_rueckstellung_status" => array("status_kurzbz", "bezeichnung_mehrsprachig", "sort", "aktiv"),
 	"public.tbl_rt_ort" => array("rt_id","ort_kurzbz","uid"),
diff --git a/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php b/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php
new file mode 100644
index 000000000..7f306e3d9
--- /dev/null
+++ b/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php
@@ -0,0 +1,42 @@
+<?php
+
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if(!$result = @$db->db_query("SELECT externe_ueberwachung FROM public.tbl_reihungstest LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_reihungstest ADD COLUMN externe_ueberwachung boolean NOT NULL DEFAULT false;";
+	
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_reihungstest: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_reihungstest: Spalte externe_ueberwachung hinzugefuegt';
+}
+
+if(!$result = @$db->db_query("SELECT 1 FROM testtool.tbl_externe_ueberwachung LIMIT 1"))
+{
+	$qry = "CREATE TABLE testtool.tbl_externe_ueberwachung (
+			externe_ueberwachung_id		INTEGER NOT NULL,
+			prestudent_id				INTEGER NOT NULL,
+			session_id					UUID NOT NULL,
+			insertamum					TIMESTAMP DEFAULT NOW(),
+			insertvon					VARCHAR(32) NOT NULL,
+			CONSTRAINT tbl_externe_ueberwachung_pk PRIMARY KEY(externe_ueberwachung_id)
+		);
+		CREATE SEQUENCE testtool.tbl_externe_ueberwachungg_id_seq
+			INCREMENT BY 1
+			NO MAXVALUE
+			NO MINVALUE
+			CACHE 1;
+		ALTER TABLE testtool.tbl_externe_ueberwachung ALTER COLUMN externe_ueberwachung_id SET DEFAULT nextval('testtool.tbl_externe_ueberwachungg_id_seq');
+		ALTER TABLE testtool.tbl_externe_ueberwachung ADD CONSTRAINT fk_prestudent_externe_ueberwachung FOREIGN KEY (prestudent_id) REFERENCES public.tbl_prestudent (prestudent_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+		ALTER TABLE testtool.tbl_externe_ueberwachung ADD CONSTRAINT unique_externe_ueberwachung_session_id UNIQUE (session_id);
+		GRANT SELECT, INSERT ON testtool.tbl_externe_ueberwachung TO vilesci;
+		GRANT SELECT, INSERT ON testtool.tbl_externe_ueberwachung TO web;
+		GRANT SELECT, UPDATE ON testtool.tbl_externe_ueberwachungg_id_seq TO vilesci;
+		GRANT SELECT, UPDATE ON testtool.tbl_externe_ueberwachungg_id_seq TO web;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>testtool.tbl_externe_ueberwachung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>testtool.tbl_externe_ueberwachung: table created';
+}
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 07e88183c..babbc3ce4 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -1458,6 +1458,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 			$reihungstest->anmeldefrist = $datum_obj->formatDatum($_POST['anmeldefrist']);
 			$reihungstest->zugangs_ueberpruefung = false;
 			$reihungstest->zugangscode = null;
+			$reihungstest->externe_ueberwachung = false;
 		}
 		else
 		{
@@ -1474,6 +1475,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 			$reihungstest->updatevon = $user;
 			$reihungstest->zugangs_ueberpruefung = isset($_POST['zugangs_ueberpruefung']);
 			$reihungstest->zugangscode = ($_POST['zugangcode'] === '' ? null : $_POST['zugangcode']);
+			$reihungstest->externe_ueberwachung = isset($_POST['externe_ueberwachung']);
 		}
 		$reihungstest->studiengang_kz = $_POST['studiengang_kz'];
 		//$reihungstest->ort_kurzbz = $_POST['ort_kurzbz'];
@@ -2571,6 +2573,12 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 				<input type="number" class="input" id="zugangcode" name="zugangcode" value="<?php echo $db->convert_html_chars($reihungstest->zugangscode) ?>"> (Verpflichtend, wenn die Zugangsüberprüfung aktiviert ist)
 			</td>
 		</tr>
+			<tr>
+				<td class="feldtitel">Externe Überwachnung</td>
+				<td>
+					<input type="checkbox" id="externe_ueberwachung" name="externe_ueberwachung"<?php echo $reihungstest->externe_ueberwachung ? 'checked="checked"' : '' ?>>
+				</td>
+			</tr>
 		<tr>
 			<td>&nbsp;</td>
 		</tr>

From d8e57d43f901a5a7307bdafb3cd5af6c080f8629 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 2 Dec 2025 13:53:38 +0100
Subject: [PATCH 1011/1357] session url in die config verschoben

---
 config/cis.config-default.inc.php      | 1 +
 include/externe_ueberwachung.class.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index b6607ca4a..81f09f697 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -306,5 +306,6 @@ define('CIS_REDIRECT_TO_CIS4', false);
 define('EXTERNE_UEBERWACHUNG_PROTOCOL_URL', 'https://example.com');
 define('EXTERNE_UEBERWACHUNG_SECRET_KEY', null);
 define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
+define('EXTERNE_UEBERWACHUNG_SESSION_URL', 'https://example.com');
 
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index 0e2e06ec9..8adbee8a2 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -163,7 +163,7 @@ class externeUeberwachung extends basis_db
 			"startDate"=> "2018-03-27T00:00:00Z", //TODO anpassen
 			"endDate"=> "2027-03-30T12:55:00Z", // TODO anpassen
 			"sessionId"=> $session_id,
-			"sessionUrl"=> "https://demo.dev.technikum-wien.at/cis/testtool/index.php"
+			"sessionUrl"=> EXTERNE_UEBERWACHUNG_SESSION_URL
 		];
 		return $payload;
 	}

From 7747857583cbecf1b601017c4343113445bf92d2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 2 Dec 2025 16:07:26 +0100
Subject: [PATCH 1012/1357] AbgabetoolStudent beurteilung
 erstbetreuer/zweitbetreuer switch + get the actual link from the
 projektarbeitsbeurteilung extension via event
 'projektbeurteilung_download_link' + fallback from config in case that fails;
 WIP implementing the switch for lektor beurteilungstemplate based on
 isCurrent/Semester etc in an Event in the pabu extension;

---
 application/config/abgabe.php                 |  4 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 69 ++++++++++++++++++-
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 19 ++---
 system/phrasesupdate.php                      | 26 ++++++-
 4 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 6a91a4d12..64cffbd30 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -15,4 +15,6 @@ $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
 
 // lehre.tbl_paabgabetyp bezeichnung
 $config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
-$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
\ No newline at end of file
+$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
+
+$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 708f7f692..4a0e6dea7 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use CI3_Events as Events;
+
 class Abgabe extends FHCAPI_Controller
 {
 
@@ -80,7 +82,6 @@ class Abgabe extends FHCAPI_Controller
 	 * loads config related to abgabetool, found in application/config/abgabe
 	 */
 	public function getConfig() {
-		$this->load->config('abgabe');
 		$old_abgabe_beurteilung_link =$this->config->item('old_abgabe_beurteilung_link');
 		$turnitin_link = $this->config->item('turnitin_link');
 		$abgabetypenBetreuer = $this->config->item('ALLOWED_ABGABETYPEN_BETREUER');
@@ -152,6 +153,38 @@ class Abgabe extends FHCAPI_Controller
 		
 		if(count($projektarbeiten)) {
 			foreach($projektarbeiten as $pa) {
+				
+				if($pa->babgeschickt) {
+					$downloadLink1 = '';
+					$downloadLinkFunc1 = function ($link) use (&$downloadLink1) {
+						$downloadLink1 = $link;
+					};
+					
+					Events::trigger('projektbeurteilung_download_link', $pa->projektarbeit_id, $pa->betreuerart_kurzbz, $pa->bperson_id, $downloadLinkFunc1);
+					
+					// use config fallback in case the event fails
+					if($downloadLink1 == '') {
+						$fallback = $this->config->item('beurteilung_link_fallback');
+
+						$search = array(
+							'betreuerart_kurzbz=?',
+							'projektarbeit_id=?',
+							'person_id=?'
+						);
+
+						$replace = array(
+							'betreuerart_kurzbz=' . $pa->betreuerart_kurzbz,
+							'projektarbeit_id=' . $pa->projektarbeit_id,
+							'person_id=' . $pa->bperson_id
+						);
+
+						$fallback = str_replace($search, $replace, $fallback);
+						$downloadLink1 = APP_ROOT.$fallback;
+						
+					}
+					$pa->downloadLink1 = $downloadLink1;
+				}
+				
 				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
 				
 				$data = getData($result);
@@ -159,6 +192,39 @@ class Abgabe extends FHCAPI_Controller
 					$pa->email = $data[0]->private_email;
 				}
 				if($pa->zweitbetreuer_person_id !== null) {
+
+					if($pa->zweitbetreuer_abgeschickt) {
+						$downloadLink2 = '';
+						$downloadLinkFunc2 = function ($link) use (&$downloadLink2) {
+							$downloadLink2 = $link;
+						};
+
+						Events::trigger('projektbeurteilung_download_link', $pa->projektarbeit_id, $pa->zweitbetreuer_betreuerart_kurzbz, $pa->zweitbetreuer_person_id, $downloadLinkFunc2);
+
+						// use config fallback in case the event fails
+						if($downloadLink2 == '') {
+							$fallback = $this->config->item('beurteilung_link_fallback');
+
+							$search = array(
+								'betreuerart_kurzbz=?',
+								'projektarbeit_id=?',
+								'person_id=?'
+							);
+
+							$replace = array(
+								'betreuerart_kurzbz=' . $pa->zweitbetreuer_betreuerart_kurzbz,
+								'projektarbeit_id=' . $pa->projektarbeit_id,
+								'person_id=' . $pa->zweitbetreuer_person_id
+							);
+
+							$fallback = str_replace($search, $replace, $fallback);
+							$downloadLink2 = APP_ROOT.$fallback;
+
+						}
+						
+						$pa->downloadLink2 = $downloadLink2;
+					}
+					
 					
 					// TODO: see assistenz query in projektarbeit_model
 					
@@ -1026,4 +1092,5 @@ class Abgabe extends FHCAPI_Controller
 			}
 		}
 	}
+
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 1c9dae63c..774f089c8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -223,15 +223,6 @@ export const AbgabetoolStudent = {
 			this.projektarbeiten = projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
 				
-				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
-					// mode = 'beurteilungDownload' // build dl link for both betreuer documents
-					
-					// TODO: if switch zweitbetreuer beurteilung / erstbetreuer beurteilung download
-					projekt.beurteilungLink1 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.bperson_id
-					if(projekt.zweitbetreuer_abgeschickt && projekt.zweitbetreuer_betreuerart_kurzbz && projekt.zweitbetreuer_person_id) {
-						projekt.beurteilungLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.zweitbetreuer_betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.zweitbetreuer_person_id
-					}
-				}
 				
 				return {
 					...projekt,
@@ -242,8 +233,8 @@ export const AbgabetoolStudent = {
 						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
 						mode
 					},
-					beurteilung1: projekt.beurteilungLink1 ?? null,
-					beurteilung2: projekt.beurteilungLink2 ?? null,
+					beurteilung1: projekt.downloadLink1 ?? null,
+					beurteilung2: projekt.downloadLink2 ?? null,
 					sem: projekt.studiensemester_kurzbz,
 					stg: projekt.kurzbzlang,
 					mail: this.buildMailToLink(projekt),
@@ -378,11 +369,11 @@ export const AbgabetoolStudent = {
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4beurteilung') )}}</div>
 					<div class="col-8 col-md-9">
 						<button v-if="projektarbeit.beurteilung1" @click="handleDownloadBeurteilung1(projektarbeit)" class="btn btn-primary">
-							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilung') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungErstbetreuer') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
 						<a v-else>{{$capitalize( $p.t('abgabetool/c4nobeurteilungVorhanden') )}}</a>
-						<button v-if="projektarbeit.beurteilung2" @click="handleDownloadBeurteilung2(projektarbeit)" class="btn btn-primary">
-							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilung') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+						<button v-if="projektarbeit.beurteilung2" @click="handleDownloadBeurteilung2(projektarbeit)" class="btn btn-primary" style="margin-left: 4px;">
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungZweitbetreuer') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
 					</div>
 				</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ab93b2234..bf5267e1c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44096,18 +44096,38 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4downloadBeurteilung',
+		'phrase' => 'c4downloadBeurteilungErstbetreuer',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Beurteilung herunterladen",
+				'text' => "Erstbetreuer Beurteilung herunterladen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Download Evaluation',
+				'text' => 'Download evaluation of first assesor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4downloadBeurteilungZweitbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zweitbetreuer Beurteilung herunterladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download evaluation of second assesor',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From d75939a8f80cec947137e2de0da41082f997beb9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 2 Dec 2025 16:08:13 +0100
Subject: [PATCH 1013/1357] refactor Messages

- endpoint: using apiMessages instead of prop
- add Phrases
- openMode Modal: resetModal if no messageId
- openMode inSamePage: loadReplyData
- function getNameOfDefaulRecipients: add missing check, if id[]
---
 .../api/frontend/v1/messages/Messages.php     | 101 +++++------------
 .../Messages/Details/NewMessage/Modal.js      |  27 +++--
 .../Messages/Details/NewMessage/NewDiv.js     |  42 +++++---
 .../Messages/Details/TableMessages.js         |  12 +--
 public/js/components/Messages/Messages.js     |  22 ++--
 .../Studentenverwaltung/Details/Messages.js   |   6 +-
 system/phrasesupdate.php                      | 102 ++++++++++++++++++
 7 files changed, 186 insertions(+), 126 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 714492203..3035e532d 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -1,6 +1,5 @@
 <?php
 
-
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class Messages extends FHCAPI_Controller
@@ -39,7 +38,7 @@ class Messages extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui'
+			'ui', 'messages'
 		]);
 	}
 
@@ -156,19 +155,6 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-/*	public function getNameOfDefaultRecipient($id, $type_id)
-	{
-		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
-
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$result = $this->PersonModel->load($id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$name = current($data);
-
-		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
-	}*/
-
 	public function getNameOfDefaultRecipients($type_id)
 	{
 		$ids = $this->input->post('ids');
@@ -178,7 +164,8 @@ class Messages extends FHCAPI_Controller
 		$recipients = [];
 
 		if (empty($ids)) {
-			throw new InvalidArgumentException("Keine ID(s) übergeben.");
+
+			throw new InvalidArgumentException($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->load->model('person/Person_model', 'PersonModel');
@@ -253,6 +240,10 @@ class Messages extends FHCAPI_Controller
 			}
 		}
 
+		if (!is_array($ids)) {
+			$ids = [$ids];
+		}
+
 		foreach ($ids as $id)
 		{
 			$receiversPersonId = $typeId == "person_id" ? $id : $this->_getPersonId($id, $typeId);
@@ -283,7 +274,7 @@ class Messages extends FHCAPI_Controller
 			}
 			else
 			{
-				$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+				$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
 			}
 
 			$result =$this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
@@ -302,7 +293,7 @@ class Messages extends FHCAPI_Controller
 			unset($_POST['data']);
 		}
 		else
-			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('messages', 'errorMissingOrInvalidParameters', ['parameter'=> "Textbody"]), self::ERROR_TYPE_GENERAL);
 
 		if (isset($_POST['ids']))
 		{
@@ -314,7 +305,7 @@ class Messages extends FHCAPI_Controller
 			unset($_POST['ids']);
 		}
 		else
-			$this->terminateWithError("IDs missing ", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
 
 		$bodyParsed = [];
 
@@ -343,7 +334,7 @@ class Messages extends FHCAPI_Controller
 					}
 					break;
 				default:
-					$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+					$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $type_id]), self::ERROR_TYPE_GENERAL);
 					break;
 			}
 		}
@@ -353,7 +344,9 @@ class Messages extends FHCAPI_Controller
 
 	public function getReplyData($messageId)
 	{
-		//TODO(Manu) validation of messageId: if number
+		if (!is_numeric($messageId)) {
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value'=> 'Message ID']), self::ERROR_TYPE_GENERAL);
+		}
 
 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
@@ -376,7 +369,6 @@ class Messages extends FHCAPI_Controller
 		$replyBody = $this->_getReplyBody($body, $dataMessage[0]->nachname, $dataMessage[0]->vorname, $dataMessage[0]->insertamum);
 
 		$dataMessage[0]->replyBody = $replyBody;
-		$dataMessage[0]->rest = "Help Manu";
 		$dataMessage[0]->replySubject = $prefix . $subject;
 
 		$this->terminateWithSuccess($dataMessage);
@@ -424,6 +416,11 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
+		else
+		{
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+		}
+
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$person = current($data);
@@ -431,50 +428,6 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($person->person_id);
 	}
 
-	public function getUid($typeId)
-	{
-		if (!$typeId)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
-		}
-		elseif ($typeId == 'person_id')
-		{
-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->loadWhere(
-				['person_id' => $id]
-			);
-		}
-		elseif($typeId == 'prestudent_id')
-		{
-			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			$result = $this->PrestudentModel->loadWhere(
-				['prestudent_id' => $id]
-			);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$person = current($data);
-			$person_id = $person->person_id;
-
-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$result = $this->BenutzerModel->loadWhere(
-				['person_id' => $person_id]
-			);
-		}
-		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
-		{
-			$this->terminateWithSuccess($id);
-		}
-		else
-		{
-			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
-		}
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$benutzer = current($data);
-
-		$this->terminateWithSuccess($benutzer->uid);
-	}
-
 	public function getUids($typeId)
 	{
 		$ids = $this->input->post('ids');
@@ -527,13 +480,9 @@ class Messages extends FHCAPI_Controller
 		}
 		else
 		{
-			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
 		}
 
-
-		//$data = $this->getDataOrTerminateWithError($resultBenutzer);
-		//$benutzer = current($data);
-
 		$this->terminateWithSuccess($benutzerIds);
 	}
 
@@ -553,11 +502,16 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
+		else
+		{
+			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+		}
+
 
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError('Error: Messages API no person_id found.');
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 		$person = current($data);
 
@@ -566,7 +520,6 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
-		//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
@@ -575,7 +528,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError('Error: Messages API no prestudent_id found.');
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
 		}
 		$student = current($data);
 
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index d173bc7d0..6b8768609 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -4,6 +4,8 @@ import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
+import ApiMessages from '../../../../api/factory/messages/messages.js';
+
 export default {
 	name: "ModalNewMessages",
 	components: {
@@ -14,10 +16,6 @@ export default {
 		ListBox
 	},
 	props: {
-		endpoint: {
-			type: Object,
-			required: true
-		},
 		typeId: String,
 		id: {
 			type: Array,
@@ -117,7 +115,7 @@ export default {
 			data.append('ids', JSON.stringify(this.id));
 
 			return this.$refs.formMessage
-				.call(this.endpoint.sendMessageFromModalContext(this.typeId, data))
+				.call(ApiMessages.sendMessageFromModalContext(this.typeId, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -134,7 +132,7 @@ export default {
 		},
 		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
+				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
@@ -146,14 +144,14 @@ export default {
 			data.append('ids', JSON.stringify(this.id));
 
 			return this.$api
-				.call(this.endpoint.getPreviewText(
+				.call(ApiMessages.getPreviewText(
 					this.typeId, data))
 				.then(response => {
 					const previews = response.data;
 					this.previewText = previews[this.defaultRecipient];
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					//this.resetForm();
+					this.resetForm();
 					//closeModal
 					//closewindwo
 				});
@@ -177,6 +175,7 @@ export default {
 				body: null,
 				subject: null,
 			};
+
 			this.$emit('resetMessageId');
 
 			if (this.editor) {
@@ -230,7 +229,7 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					const result = await this.$api.call(this.endpoint.getReplyData(newMessageId));
+					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
@@ -247,7 +246,7 @@ export default {
 	created(){
 		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
 			this.$api
-				.call(this.endpoint.getMessageVarsPerson(this.id, this.typeId))
+				.call(ApiMessages.getMessageVarsPerson(this.id, this.typeId))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -261,7 +260,7 @@ export default {
 
 		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
 			this.$api
-				.call(this.endpoint.getMsgVarsPrestudent(this.id, this.typeId))
+				.call(ApiMessages.getMsgVarsPrestudent(this.id, this.typeId))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -274,7 +273,7 @@ export default {
 		}
 
 		this.$api
-			.call(this.endpoint.getMsgVarsLoggedInUser())
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -286,7 +285,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(this.endpoint.getNameOfDefaultRecipients(this.id, this.typeId))
+			.call(ApiMessages.getNameOfDefaultRecipients(this.id, this.typeId))
 			.then(result => {
 				this.defaultRecipients = result.data;
 				this.defaultRecipientString =  Object.values(this.defaultRecipients).join("; ");
@@ -297,7 +296,7 @@ export default {
 		//case of reply
 		if(this.messageId) {
 			this.$api
-				.call(this.endpoint.getReplyData(this.messageId))
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 8c8e371a0..b0c52f0f7 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -13,12 +13,6 @@ export default {
 		DropdownComponent,
 	},
 	props: {
-/*
-		endpoint: {
-			type: Object,
-			required: true
-		},
-*/
 		openMode: String,
 		typeId: String,
 		id: {
@@ -113,7 +107,6 @@ export default {
 					if(this.openMode == "inSamePage" && this.id.length == 1 ){
 						this.$emit('reloadTable');
 						}
-					this.resetForm();
 					}
 				);
 		},
@@ -126,10 +119,14 @@ export default {
 				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(){
+			console.log("subj" + this.formData.subject);
 			const data = new FormData();
+
 			data.append('data', JSON.stringify(this.formData.body));
 			data.append('ids', JSON.stringify(this.id));
 
+			console.log("subj" + this.formData.subject);
+
 			return this.$api
 				.call(ApiMessages.getPreviewText(
 					this.typeId, data))
@@ -150,7 +147,7 @@ export default {
 				this.editor.save();
 
 			} else {
-				console.error("Editor instance is not available.");
+				console.error(this.$p.t('messages', 'errorEditorNotAvailable'));
 			}
 		},
 		resetForm(){
@@ -182,14 +179,28 @@ export default {
 				this.isVisible = false;
 		},
 		showTemplate(){
-			if (this.openMode == "inSamePage")
+			if (this.openMode == "inSamePage") {
 				this.isVisible = true;
+				//to enable send newMessage after sentMessage
+				this.messageSent = false;
+			}
 		},
 		showPreview(){
 			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
+		loadReplyData(messageId){
+			this.$api
+				.call(ApiMessages.getReplyData(messageId))
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -216,14 +227,12 @@ export default {
 		const missingparamsmsgs = [];
 		if(!this.typeId)
 		{
-			// TODO(bh) Phrase
-			missingparamsmsgs.push('Fehlender oder ungültiger Parameter Empfänger-Id-Typ.');
+			missingparamsmsgs.push(this.$p.t('messages', 'errorMissingOrInvalidParameterRecipientTypeId'));
 		}
 
 		if(!this.id || this.id.length < 1)
 		{
-			// TODO(bh) Phrase
-			missingparamsmsgs.push('Fehlender oder ungültiger Parameter Empfänger-Id(s).');
+			missingparamsmsgs.push(this.$p.t('messages', 'errorMissingOrInvalidParameterRecipientIds'));
 		}
 
 		if(missingparamsmsgs.length > 0)
@@ -283,7 +292,8 @@ export default {
 
 		//case of reply
 		if(this.messageId != null) {
-			this.$api
+			this.loadReplyData(this.messageId);
+/*			this.$api
 				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
@@ -291,7 +301,7 @@ export default {
 					this.formData.body = this.replyData[0].replyBody;
 					this.formData.relationmessage_id = this.messageId;
 				})
-				.catch(this.$fhcAlert.handleSystemError);
+				.catch(this.$fhcAlert.handleSystemError);*/
 		}
 
 	},
@@ -305,7 +315,7 @@ export default {
 
 	<div class="messages-detail-newmessage-newdiv">
 			<!--new page-->
-			<div v-if="!messageSent" class="overflow-auto m-3">
+			<div v-if="!messageSent" ref="divNewMessage" class="overflow-auto m-3">
 				<h4>{{ $p.t('messages', 'neueNachricht') }}</h4>
 
 				<div class="row">
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 4654bed8c..a55ddec63 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,6 +1,8 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 
+import ApiMessages from "../../../api/factory/messages/messages.js"
+
 export default {
 	name: "TableMessages",
 	components: {
@@ -13,10 +15,6 @@ export default {
 		},
 	},
 	props: {
-		endpoint: {
-			type: Object,
-			required: true
-		},
 		typeId: String,
 		id: {
 			type: Array,
@@ -281,7 +279,7 @@ export default {
 		},
 		deleteMessage(message_id){
 			return this.$api
-				.call(this.endpoint.deleteMessage(message_id))
+				.call(ApiMessages.deleteMessage(message_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -347,7 +345,7 @@ export default {
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				this.endpoint.getMessages(params)
+				ApiMessages.getMessages(params)
 			);
 		}
 	},
@@ -378,7 +376,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(this.endpoint.getPersonId(params))
+				.call(ApiMessages.getPersonId(params))
 				.then(result => {
 					this.personId = result.data;
 				})
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 61a260ffd..1f9afcb9e 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -14,10 +14,6 @@ export default {
 		}
 	},
 	props: {
-		endpoint: {
-			type: Object,
-			required: true
-		},
 		typeId: {
 			type: String,
 			required: true,
@@ -74,18 +70,25 @@ export default {
 		handleMessage(id, typeId, messageId){
 			this.messageId = messageId;
 			if (this.openMode == "window") {
-				//this.$refs['newMsgForm'].submit();
 				this.openInNewWindow(id, typeId, messageId);
 			}
 			else if (this.openMode == "newTab"){
-				//this.$refs['newMsgForm'].submit();
 				this.openInNewTab(id, typeId, messageId);
 			}
 			else if (this.openMode == "modal"){
+				if(!messageId)
+					this.$refs.modalMsg.resetForm();
 				this.$refs.modalMsg.show();
 			}
 			else if (this.openMode == "inSamePage"){
+				console.log("in same Page");
 				this.isVisibleDiv = true;
+				if(messageId)
+					this.$refs.templateNewDivMessage.loadReplyData(messageId);
+				else
+					this.$refs.templateNewDivMessage.resetForm();
+
+				this.$refs.templateNewDivMessage.showTemplate();
 			}
 			else
 				console.log("no valid openMode");
@@ -156,7 +159,6 @@ export default {
 			:type-id="typeId"
 			:id="id"
 			:message-id="messageId"
-			:endpoint="endpoint"
 			:openMode="openMode"
 			@reloadTable="reloadTable"
 			@resetMessageId="resetMessageId"
@@ -164,13 +166,12 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
+		<div v-show="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
-				ref="templateNewMessage"
+				ref="templateNewDivMessage"
 				:type-id="typeId"
 				:id="id"
 				:message-id="messageId"
-				:endpoint="endpoint"
 				:openMode="openMode"
 				@reloadTable="reloadTable"
 			>
@@ -182,7 +183,6 @@ export default {
 				ref="templateTableMessage"
 				:type-id="typeId"
 				:id="id"
-				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
 				@newMessage="handleMessage"		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 4acb0aef4..8bbb596d6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,5 +1,5 @@
 import CoreMessages from "../../../Messages/Messages.js";
-import ApiMessages from "../../../../api/factory/messages/messages.js";
+//import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "TabMessages",
@@ -11,7 +11,7 @@ export default {
 	},
 	data(){
 		return {
-			endpoint: ApiMessages
+			//endpoint: ApiMessages
 		};
 	},
 	computed: {
@@ -36,7 +36,6 @@ export default {
 		<template v-if="prestudent_ids">
 			<core-messages
 				ref="formc"
-				:endpoint="endpoint"
 				type-id="prestudent_id"
 				:id="prestudent_ids"
 				messageLayout="twoColumnsTableLeft"
@@ -48,7 +47,6 @@ export default {
 		<template v-else >
 			<core-messages
 				ref="formc"
-				:endpoint="endpoint"
 				type-id="person_id"
 				:id="person_ids"
 				messageLayout="twoColumnsTableLeft"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4e538f172..6c5db0b32 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -52330,6 +52330,108 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Personen zusammenlegen Phrasen END
+	// ### Refactor Messages START
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'errorMissingOrInvalidParameterRecipientTypeId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlender oder ungültiger Parameter Type_ID Empfänger',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing or invalid parameter type ID Recipient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'errorMissingOrInvalidParameterRecipientIds',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlende(r) oder ungültige(r) Parameter Empfänger-Id(s)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing or invalid parameter(s) Recipient ID(s)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'errorMissingOrInvalidParameters',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehlende(r) oder ungültige(r) Parameter {parameter}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Missing or invalid parameter(s) {parameter}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'errorEditorNotAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Editor-Instanz nicht verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Editor instance is not available.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'error_missingLogic',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Logik für Type ID {type} nicht implementiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'logic for type ID {type} not implemented.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ### Refactor Messages END
 );
 
 

From c849b5defaf530d47be413229c3398b9d66dfbe5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 2 Dec 2025 18:08:03 +0100
Subject: [PATCH 1014/1357] fix broken filters

---
 .../Stv/Studentenverwaltung/List.js           | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 11b80efd0..69111d11c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -140,7 +140,12 @@ export default {
 					 * we need to get the params from elsewhere.
 					 * @see https://github.com/olifolkerd/tabulator/issues/4318
 					 */
-					return this.$api.call({...config, url, params: this.tabulatorOptions.ajaxParams});
+					const apiconfig = {
+						...this.tabulatorOptions.ajaxConfig,
+						url: this.tabulatorOptions.ajaxURL,
+						params: this.tabulatorOptions.ajaxParams
+					};
+					return this.$api.call(apiconfig);
 				},
 				ajaxResponse: (url, params, response) => {
 					return response?.data;
@@ -182,7 +187,7 @@ export default {
 			count: 0,
 			filteredcount: 0,
 			selectedcount: 0,
-			currentEndpointRawUrl: ''
+			currentEndpoint: null
 		}
 	},
 	computed: {
@@ -357,16 +362,20 @@ export default {
 		updateUrl(endpoint, first) {
 			this.lastSelected = first ? undefined : this.selected;
 
-			if( endpoint === undefined ) 
+			console.log('function param endpoint: ' + JSON.stringify(endpoint));
+			console.log('current endpoint: ' + JSON.stringify(this.currentEndpoint));
+
+			if( endpoint === undefined && this.currentEndpoint === null)
 			{
-				endpoint = {url: this.currentEndpointRawUrl};
-			} 
-			else if( endpoint.url === undefined ) 
+				endpoint = { url: '' };
+			}
+			else if( endpoint === undefined )
 			{
-				endpoint.url = this.currentEndpointRawUrl;
-			} else
+				endpoint = JSON.parse(JSON.stringify(this.currentEndpoint));
+			}
+			else
 			{
-				this.currentEndpointRawUrl = endpoint.url;
+				this.currentEndpoint = JSON.parse(JSON.stringify(endpoint));
 			}
 
 			endpoint.url = endpoint.url.replace(
@@ -375,13 +384,16 @@ export default {
 				);
 
 			const params = (endpoint?.params !== undefined) ? endpoint.params : {};
-			const method = (endpoint?.method !== undefined) ? endpoint.method : 'get';
+			let method = (endpoint?.method !== undefined) ? endpoint.method : 'get';
 			if (this.filter.length)
+			{
 				params.filter = this.filter;
+				method = 'post';
+			}
 
 			this.tabulatorOptions.ajaxURL = endpoint.url;
 			this.tabulatorOptions.ajaxParams = { ...params };
-			this.tabulatorOptions.ajaxConfig = method;
+			this.tabulatorOptions.ajaxConfig = {method};
 			if (!this.$refs.table.tableBuilt) {
 				if (this.$refs.table.tabulator) {
 					this.$refs.table.tabulator.on("tableBuilt", () => {

From abcc1269eb3a017a208609ce11463c0397150807 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 3 Dec 2025 09:44:34 +0100
Subject: [PATCH 1015/1357] add permission to show profile images in new studvw

---
 application/controllers/Cis/Pub.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/Cis/Pub.php b/application/controllers/Cis/Pub.php
index bebc844ab..de456145b 100644
--- a/application/controllers/Cis/Pub.php
+++ b/application/controllers/Cis/Pub.php
@@ -14,7 +14,7 @@ class Pub extends Auth_Controller
 	{
 		parent::__construct(
 		    array(
-			'bild' => ['basis/cis:r']
+			'bild' => ['basis/cis:r', 'assistenz:r']
 		    )
 		);
 	}

From 5a970c3f2e0e9fdc65aacbc7e7ef62cc2d9360fd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 3 Dec 2025 09:58:33 +0100
Subject: [PATCH 1016/1357] fix typo

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4e538f172..5fd4404ef 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38928,7 +38928,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Anzahl angezeigter vergangender Studiensemester',
+				'text' => 'Anzahl angezeigter vergangener Studiensemester',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 7726c3ce2161fda7856a8ec8aa55be2ba35db5cf Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Dec 2025 10:23:58 +0100
Subject: [PATCH 1017/1357] disable pruefungsnotizen

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 6ed710c29..2f15a57ef 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -438,11 +438,9 @@ export default {
 
 			if (this.stgInfo.typ === 'b') {
 				this.formData.pruefungstyp_kurzbz = 'Bachelor';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
 			}
 			if (this.stgInfo.typ === 'd' || this.stgInfo === 'm') {
 				this.formData.pruefungstyp_kurzbz = 'Diplom';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
 			}
 			if (this.stgInfo.typ === 'lg') {
 				this.formData.pruefungstyp_kurzbz = 'lgabschluss';

From 541d6d78cc762fe1c5695e84b95ebbe248170040 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 3 Dec 2025 11:35:49 +0100
Subject: [PATCH 1018/1357] projektbeurteilung_formular_link event for benotung
 link AbgabetoolMitarbeiterDetail.js; projektarbeit_is_current event for
 abstracted logic in Abgabetool; show endupload missing message on benoten if
 neither old nor new link are eligable;

---
 application/config/abgabe.php                 |   5 +-
 .../controllers/api/frontend/v1/Abgabe.php    |  42 ++++++-
 .../models/education/Projektarbeit_model.php  | 108 +-----------------
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  33 ++++--
 system/phrasesupdate.php                      |  24 +++-
 5 files changed, 90 insertions(+), 122 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 64cffbd30..b897e92e0 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -17,4 +17,7 @@ $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
 $config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
 $config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
 
-$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
\ No newline at end of file
+$config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
+
+$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
+$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 4a0e6dea7..8b6afef11 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -114,15 +114,22 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
 		}
 		
-		$paIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
+//		$paIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
 
+		$projektarbeitIsCurrent = false;
+		$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
+			$projektarbeitIsCurrent = $result;
+		};
+		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
+//		$this->addMeta('isCurrent', $projektarbeitIsCurrent);
+		
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 
 		foreach($ret->retval as $termin) {
 			$this->checkAbgabeSignatur($termin, $projektarbeit);
 		}
 		
-		$this->terminateWithSuccess(array($ret, $paIsCurrent));
+		$this->terminateWithSuccess(array($ret, $projektarbeitIsCurrent));
 	}
 
 	/**
@@ -415,6 +422,22 @@ class Abgabe extends FHCAPI_Controller
 
 		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
 
+
+		forEach($projektarbeiten->retval as $pa) {
+
+			$oldLink = ''; // show this when paIsCurrent == false -> moodle course template
+			$newLink = ''; // get curated path for betreuer type
+			$returnFunc = function ( $resultOld, $resultNew) use (&$oldLink, &$newLink) {
+				$newLink = $resultNew;
+				$oldLink = $resultOld;
+			};
+			
+			Events::trigger('projektbeurteilung_formular_link', $pa->betreuerart_kurzbz, APP_ROOT, $returnFunc);
+			$pa->beurteilungLinkNew = $newLink;
+			$pa->beurteilungLinkOld = $oldLink;
+		}
+		
+		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
 	
@@ -958,8 +981,16 @@ class Abgabe extends FHCAPI_Controller
 		} else {
 			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
 		}
-
-		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
+		
+		$projektarbeitIsCurrent = false;
+		$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
+			$projektarbeitIsCurrent = $result;
+		};
+		
+		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
+		$this->addMeta('isCurrent', $projektarbeitIsCurrent);
+		
+//		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
 		if(!$projektarbeitIsCurrent) {
 			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
 		}
@@ -983,7 +1014,8 @@ class Abgabe extends FHCAPI_Controller
 			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
 
 			// 1. Begutachter mail ohne Token
-			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
+			$mail_baselink = APP_ROOT.$this->config->item('PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER');
+//			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
 			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
 			$projekttyp_kurzbz = $projektarbeit->projekttyp_kurzbz;
 			$subject = $projektarbeit->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 361fd71b0..e1b800673 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -437,113 +437,7 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
 	}
-
-	/**
-	 * Holt sich Version der Projektarbeit.
-	 * Liefert auch mit, ob die Version die aktuellste ist.
-	 * z.B.: Masterarbeiten waren ab der Änderung zur Gewichtung der Punkte aktuell,
-	 * Bachelorarbeiten waren ab dem Umstieg auf das Online Beurteilungsformular aktuell.
-	 * @param $projektarbeit_id
-	 * @return objekt mit Versionsinfo, null im Fehlerfall
-	 */
-	private function getVersion($projektarbeit_id) {
-		$_versions_query = array(
-			'Diplom' => array(
-				'SS2025',
-				'SS2023',
-				'SS2022'
-			),
-			'Others' => array(
-				'SS2025',
-				'SS2022',
-			)
-		);
-
-		$_versions_check = array(
-			'Diplom' => array(
-				'SS2025' => 3,
-				'SS2023' => 2,
-				'SS2022' => 1
-			),
-			'Others' => array(
-				'SS2025' => 2,
-				'SS2022' => 1
-			)
-		);
-		
-		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
-		$qry="
-			SELECT
-				CASE
-					WHEN semesters_diplom.studiensemester_kurzbz IS NOT NULL
-					THEN semesters_diplom.studiensemester_kurzbz
-					ELSE semesters.studiensemester_kurzbz 
-				END AS version_studiensemester_kurzbz,
-				pa.projekttyp_kurzbz
-			FROM
-				lehre.tbl_projektarbeit pa
-				JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				JOIN public.tbl_studiensemester sem USING(studiensemester_kurzbz)
-				LEFT JOIN (
-					SELECT
-						start, studiensemester_kurzbz
-					FROM
-						public.tbl_studiensemester
-					WHERE
-						studiensemester_kurzbz IN ?
-				) semesters ON sem.start >= semesters.start AND pa.projekttyp_kurzbz <> 'Diplom'
-				LEFT JOIN (
-					SELECT
-						start, studiensemester_kurzbz
-					FROM
-						public.tbl_studiensemester
-					WHERE
-						studiensemester_kurzbz IN ?
-				) semesters_diplom ON sem.start >= semesters_diplom.start AND pa.projekttyp_kurzbz = 'Diplom'
-			WHERE
-				projektarbeit_id = ?
-			ORDER BY
-				semesters.start DESC, semesters_diplom.start DESC
-			LIMIT 1";
-
-		$resultociniBambini = $this->execReadOnlyQuery($qry, array($_versions_query['Others'], $_versions_query['Diplom'], $projektarbeit_id));
-		
-		if(hasData($resultociniBambini)) {
-			$data =	getData($resultociniBambini);
-			if(count($data) > 0) {
-				$row = $data[0];
-				
-				// known project types
-				if (isset($_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]))
-				{
-					$row->versionNumber = $_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz];
-					$row->isCurrent =
-						$_versions_check[$row->projekttyp_kurzbz][$row->version_studiensemester_kurzbz]
-						== max($_versions_check[$row->projekttyp_kurzbz]);
-
-				}
-				elseif (isset($_versions_check['Others'][$row->version_studiensemester_kurzbz]))
-				{
-					$row->versionNumber = $_versions_check['Others'][$row->version_studiensemester_kurzbz];
-					$row->isCurrent =
-						$_versions_check['Others'][$row->version_studiensemester_kurzbz]
-						== max($_versions_check['Others']);
-				}
-				else
-				{
-					$row->isCurrent = false;
-					$row->versionNumber = 0;
-				}
-				return $row;
-				
-			} else {
-				return null;
-			}
-		} else {
-			return null;
-		}
-	}
-
+	
 	/**
 	 *
 	 * @param
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index e1ca760ed..2f85b78c5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -364,17 +364,36 @@ export const AbgabeMitarbeiterDetail = {
 			const link = this.turnitin_link
 			window.open(link, '_blank')
 		},
-		openBenotung() {
+		async openBenotung() {
 			// old link check ?
 			
-			if(this.getSemesterBenotbar && this.projektarbeit?.abgabetermine.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null)) {
-				// TODO: shouldnt be hardcoded here, at least config in abgabetool -> ideally event sourced from projektarbeitsbeurteilung
-				
-				const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
-				const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
+			if(this.getSemesterBenotbar && this.projektarbeit?.abgabetermine.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null) && this.projektarbeit?.beurteilungLinkNew) {
+				const link = this.projektarbeit?.beurteilungLinkNew
+				window.open(link, '_blank')
+			} else if(this.projektarbeit?.abgabetermine.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null) && this.projektarbeit?.beurteilungLinkOld) {
+				if(await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/c4aeltereParbeitBenoten'),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
+
+				const link = this.projektarbeit?.beurteilungLinkOld
 				window.open(link, '_blank')
 			} else {
-				window.open(this.old_abgabe_beurteilung_link, '_blank')
+				// show info text that no endupload with abgabe has been found
+				if(await this.$fhcAlert.confirm({
+					message: this.$p.t('abgabetool/c4keinEnduploadErfolgt'),
+					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
+					acceptClass: 'btn btn-danger',
+					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+					rejectClass: 'btn btn-outline-secondary'
+				}) === false) {
+					return false
+				}
 			}
 		},
 		formatDate(dateParam) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bf5267e1c..47402ba32 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42885,13 +42885,33 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Projektarbeit für älteres Semester, bitte <a href="{0}" target="_blank">Word-Formular zur Benotung</a> verwenden!',
+				'text' => 'Projektarbeit für älteres Semester, bitte Word-Formular in Moodle zur Benotung verwenden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Thesis handed in for older semester, please <a href="{0}" target="_blank">use word form for assessment</a>!',
+				'text' => 'Thesis handed in for older semester, please use word form in moodle for assessment!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4keinEnduploadErfolgt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Endupload ist noch nicht erfolgt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Final version not uploaded yet',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From d33af0ae21bf4848c33bdfe0fd6eebdebd58c3db Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 3 Dec 2025 15:14:26 +0100
Subject: [PATCH 1019/1357] bugfix: resetModal in openMode modal

---
 public/js/api/factory/messages/messages.js    | 21 -------------------
 .../Messages/Details/NewMessage/Modal.js      |  6 ++----
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index c3542308a..b7b21dd8a 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -58,13 +58,6 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getPersonId/' + params.id + '/' + params.type_id
 		};
 	},
-/*	getUid(ids, type_id){
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/messages/messages/getUids/' + type_id,
-			params: {ids}
-		};
-	},*/
 	getDataVorlage(vorlage_kurzbz){
 		return {
 			method: 'get',
@@ -91,20 +84,6 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getReplyData/' + messageId
 		};
 	},
-/*	sendMessageFromModalContext(id, params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
-			params
-		};
-	},	*/
-	sendMessageFromModalContext(type_id, params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/messages/messages/sendMessage/' + type_id,
-			params
-		};
-	},
 	sendMessage(type_id, params) {
 		return {
 			method: 'post',
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 6b8768609..47187de89 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -56,7 +56,6 @@ export default {
 			previewText: null,
 			previewBody: "",
 			replyData: null,
-
 		}
 	},
 	methods: {
@@ -115,7 +114,7 @@ export default {
 			data.append('ids', JSON.stringify(this.id));
 
 			return this.$refs.formMessage
-				.call(ApiMessages.sendMessageFromModalContext(this.typeId, data))
+				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -151,7 +150,6 @@ export default {
 					this.previewText = previews[this.defaultRecipient];
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					this.resetForm();
 					//closeModal
 					//closewindwo
 				});
@@ -166,7 +164,7 @@ export default {
 				this.editor.save();
 
 			} else {
-				console.error("Editor instance is not available.");
+				console.error(this.$p.t('messages', 'errorEditorNotAvailable'));
 			}
 		},
 		resetForm(){

From 77a1067ea569874c07ecde06d3f2f140d88986eb Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 3 Dec 2025 15:32:21 +0100
Subject: [PATCH 1020/1357] Studierendenverwaltung Projektbetreuer: default
 Stunden coming from global config, Stundensatz is requested each time
 BetreuerIn is selected

---
 application/config/stv.php                    | 13 ++-
 .../api/frontend/v1/stv/Projektbetreuer.php   | 22 ++++-
 .../models/ressource/Stundensatz_model.php    | 38 +++++---
 .../Details/Projektarbeit/Projektbetreuer.js  | 88 +++++++++++--------
 4 files changed, 104 insertions(+), 57 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index e03c00084..2be148621 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -83,10 +83,15 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 		$fieldsZgvDoktor
 	);
 }
-
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] = '4.0';
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] = '5.0';
-$config['tabs']['projektarbeit']['lvLektroinnenzuteilungFixangestelltStundensatz'] = true;
+error_log(print_r(defined(FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR), true));
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] =
+	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR')
+	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR
+	: '0.0';
+$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] =
+	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER')
+	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER
+	: '0.0';
 $config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
 
 $config['student_tab_order'] = [
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 98567ecde..a84248a35 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -114,18 +114,36 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
 
+		if (isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) && !is_numeric($projektbetreuer['stunden']))
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_fieldNotNumeric', ['field'=> 'Stunden', 'Field'=> 'Stunden']), self::ERROR_TYPE_GENERAL
+			);
+		}
+
+		if (isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) && !is_numeric($projektbetreuer['stundensatz']))
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_fieldNotNumeric', ['field'=> 'Stundensatz', 'Field'=> 'Stundensatz']), self::ERROR_TYPE_GENERAL
+			);
+		}
+
 		$projektbetreuer = $this->input->post('projektbetreuer');
 
 		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$result = null;
 
+		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null; 
+		$stundensatz =
+			isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) ? $projektbetreuer['stundensatz'] : null;
+
 		$betreuer = [
 			'projektarbeit_id' => $projektarbeit_id,
 			'person_id' => $projektbetreuer['person_id'],
 			'note' => $projektbetreuer['note'],
-			'stunden' => $projektbetreuer['stunden'],
-			'stundensatz' => $projektbetreuer['stundensatz'],
+			'stunden' => $stunden,
+			'stundensatz' => $stundensatz,
 			'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
 		];
 
diff --git a/application/models/ressource/Stundensatz_model.php b/application/models/ressource/Stundensatz_model.php
index c8ee367d8..2a7418924 100644
--- a/application/models/ressource/Stundensatz_model.php
+++ b/application/models/ressource/Stundensatz_model.php
@@ -47,7 +47,6 @@ class Stundensatz_model extends DB_Model
 	{
 		$this->load->config('stv');
 
-		$useFixangestelltStundensatz = $this->config->item('tabs')['projektarbeit']['lvLektroinnenzuteilungFixangestelltStundensatz'];
 		$defaultStundensatz = $this->config->item('tabs')['projektarbeit']['defaultProjektbetreuerStundensatz'];
 
 		$stundensatz = '';
@@ -63,7 +62,7 @@ class Stundensatz_model extends DB_Model
 			{
 				$studiensemester = getData($result)[0];
 
-				if (isset($useFixangestelltStundensatz) && !$useFixangestelltStundensatz)
+				if (defined('FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ') && !FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ)
 				{
 					// load Mitarbeiter
 					$params = [$person_id];
@@ -83,19 +82,30 @@ class Stundensatz_model extends DB_Model
 
 					if (hasData($result))
 					{
-						foreach (getData($result) as $ma)
-						{
-							if (!$ma->fixangestellt)
-							{
-								$stundensatzRes = $this->getStundensatzByDatum(
-									$ma->mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre'
-								);
+						$ma = getData($result)[0];
 
-								if (hasData($stundensatzRes))
-									$stundensatz = getData($stundensatzRes)[0]->stundensatz;
-								else
-									$stundensatz = '0.00';
-							}
+						$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
+						$echterdv_result = $this->DienstverhaeltnisModel->existsDienstverhaeltnis(
+							$ma->mitarbeiter_uid,
+							$studiensemester->start,
+							$studiensemester->ende,
+							'echterdv'
+						);
+
+						if (hasData($echterdv_result))
+						{
+							$stundensatz = null;
+						}
+						else
+						{
+							$stundensatzRes = $this->getStundensatzByDatum(
+								$ma->mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre'
+							);
+
+							if (hasData($stundensatzRes))
+								$stundensatz = getData($stundensatzRes)[0]->stundensatz;
+							else
+								$stundensatz = '0.00';
 						}
 					}
 					else
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index adcf2f2a8..f847a1e92 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -152,6 +152,7 @@ export default {
 				stunden: null,
 				stundensatz: null
 			},
+			defaultStundensatz: null,
 			newMode: false,
 			editMode: false,
 			initialFormData: null,
@@ -179,45 +180,40 @@ export default {
 		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
 			this.editMode = true;
 			this.newMode = false;
-			this.$api
-				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
-				.then(result => {
-					this.resetForm();
+			this.resetForm();
+			this.getDefaultStundensaetze(person_id).finally(() => {
 
-					// get betreuer from tabulator list
-					let projektbetreuerListe = this.$refs.projektbetreuerTable.tabulator.getData();
-					const idx = projektbetreuerListe.findIndex(
-							betr =>
-								betr.person_id === person_id &&
-								betr.projektarbeit_id === projektarbeit_id &&
-								betr.betreuerart_kurzbz === betreuerart_kurzbz
-						);
+				// get betreuer from tabulator list
+				let projektbetreuerListe = this.$refs.projektbetreuerTable.tabulator.getData();
+				const idx = projektbetreuerListe.findIndex(
+						betr =>
+							betr.person_id === person_id &&
+							betr.projektarbeit_id === projektarbeit_id &&
+							betr.betreuerart_kurzbz === betreuerart_kurzbz
+					);
 
-					if (idx >= 0) { // if betreuer found
+				if (idx >= 0) { // if betreuer found
 
-						// set currently edited betreuer (deep copy)
-						this.formData = JSON.parse(JSON.stringify(projektbetreuerListe[idx]));
+					// set currently edited betreuer (deep copy)
+					this.formData = JSON.parse(JSON.stringify(projektbetreuerListe[idx]));
 
-						// set download link
-						if (this.formData.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = this.formData.beurteilungDownloadLink;
+					// set download link
+					if (this.formData.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = this.formData.beurteilungDownloadLink;
 
-						// set betreuer for autocomplete field
-						this.autocompleteSelectedBetreuer = {
-							person_id: this.formData.person_id,
-							name: this.formData.name,
-							vorname: this.formData.vorname,
-							nachname: this.formData.nachname,
-							vertrag_id: this.formData.vertrag_id
-						};
-					}
+					// set betreuer for autocomplete field
+					this.autocompleteSelectedBetreuer = {
+						person_id: this.formData.person_id,
+						name: this.formData.name,
+						vorname: this.formData.vorname,
+						nachname: this.formData.nachname,
+						vertrag_id: this.formData.vertrag_id
+					};
+				}
 
-					// set default stundensatz (if no other is set yet)
-					if (this.formData.stundensatz == null) this.formData.stundensatz = result.data;
+				// capture initial form data for detecting changes
+				this.captureFormData();
+			});
 
-					// capture initial form data for detecting changes
-					this.captureFormData();
-				})
-				.catch(this.$fhcAlert.handleSystemError);
 		},
 		actionDeleteProjektbetreuer(betreuer_id, projektarbeit_id, person_id, betreuerart_kurzbz) {
 			this.$fhcAlert
@@ -239,6 +235,7 @@ export default {
 			// default Stundensätze from config
 			this.defaultFormDataValues.stunden = this.getDefaultStunden(projekttyp_kurzbz);
 			this.defaultFormDataValues.stundensatz = this.config.defaultProjektbetreuerStundensatz;
+			this.defaultStundensatz = this.config.defaultProjektbetreuerStundensatz;
 
 			// get other initial data
 			this.$api
@@ -271,7 +268,7 @@ export default {
 					})
 					.catch(this.$fhcAlert.handleSystemError);
 			} else {
-				this.emptyBetreuer();
+				this.emptyBetreuerList();
 			}
 		},
 		saveProjektbetreuer() {
@@ -297,11 +294,13 @@ export default {
 					this.filteredBetreuer = result.data;
 				});
 		},
-		emptyBetreuer() {
+		emptyBetreuerList() {
 			this.$refs.projektbetreuerTable.tabulator.clearData();
 		},
 		resetForm() {
-			this.formData = this.getDefaultFormData();
+			const defaultFormData = this.getDefaultFormData();
+			this.formData = defaultFormData;
+			this.defaultStundensatz = defaultFormData.stundensatz;
 			if (this.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = '';
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
@@ -369,6 +368,16 @@ export default {
 				this.formData.stunden = defaultStunden;
 			}
 		},
+		getDefaultStundensaetze(person_id) {
+			return this.$api
+				.call(ApiStvProjektbetreuer.getDefaultStundensaetze(person_id, this.studiensemester_kurzbz))
+				.then(result => {
+					// set default stundensatz (if no other is set yet)
+					this.defaultStundensatz = result.data;
+					this.formData.stundensatz = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		// check if form data has been modified since initial data has been captured
 		formDataModified() {
 			if (this.autocompleteSelectedBetreuer != null) return true;
@@ -401,6 +410,9 @@ export default {
 		// disable fields which are dependent on Vertrag status
 		disableVertragFields(statusAkzeptiert) {
 			this.vertragFieldsDisabled = statusAkzeptiert;
+		},
+		onBetreuerSelected(ev) {
+			this.getDefaultStundensaetze(ev.value.person_id);
 		}
 	},
 	template: `
@@ -422,7 +434,7 @@ export default {
 				>
 			</core-filter-cmpt>
 
-			<form-form ref="formProjektbetreuer" v-show="betreuerFormOpened" @submit.prevent>
+			<form-form ref="formProjektbetreuer" v-show="betreuerFormOpened" class="mt-3" @submit.prevent >
 				<div class="row mb-3">
 					<form-input
 						container-class="stv-details-projektarbeit-betreuer"
@@ -433,6 +445,8 @@ export default {
 						name="person_id"
 						:suggestions="filteredBetreuer"
 						@complete="searchBetreuer"
+						@item-select="onBetreuerSelected"
+						@option-select="onBetreuerSelected"
 						:min-length="3"
 						:disabled="vertragFieldsDisabled"
 						>
@@ -502,7 +516,7 @@ export default {
 							container-class="stv-details-projektarbeit-stundensatz"
 							type="text"
 							name="stundensatz"
-							:label="$p.t('projektarbeit', 'stundensatz')"
+							:label="$p.t('projektarbeit', 'stundensatz') + (defaultStundensatz ? ' (Default ' + defaultStundensatz + ')' : '')"
 							:disabled="vertragFieldsDisabled"
 							v-model="formData.stundensatz"
 							>

From 0c5af137dbf84ad79181b2303e1939ef528bcea7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 3 Dec 2025 16:49:49 +0100
Subject: [PATCH 1021/1357] WIP
 notifyBetreuerAboutNewOrChangedAbgabenForBetreuedProjektarbeiten Email Job;
 allowed abgabetypen & allowed noten as per config now via db primary key; new
 ProjektbetreuerModel method "getAllBetreuerOfProjektarbeit" to do just that;

---
 application/config/abgabe.php                 |  6 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 76 ++++++++++++++++++-
 .../controllers/jobs/AbgabetoolJob.php        | 36 +++++++++
 .../models/education/Projektarbeit_model.php  | 12 +--
 .../education/Projektbetreuer_model.php       | 37 +++++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  2 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  2 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  2 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  4 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  2 +-
 10 files changed, 159 insertions(+), 20 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index b897e92e0..da77da22e 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -14,8 +14,10 @@ $config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
 $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
 
 // lehre.tbl_paabgabetyp bezeichnung
-$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
-$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
+//$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
+$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
+//$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
+$config['ALLOWED_NOTEN_ABGABETOOL'] = ['10', '14']; // tbl_note pk
 
 $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 8b6afef11..0b85e2370 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -44,7 +44,8 @@ class Abgabe extends FHCAPI_Controller
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
 			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
+			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'notifyBetreuerAboutChangedAbgaben' =>  self::PERM_LOGGED
 			]);
 
 		$this->load->library('PhrasesLib');
@@ -1125,4 +1126,77 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 
+	public function notifyBetreuerAboutChangedAbgaben() {
+	//	$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+		
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
+		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+	
+		// get all new or changed termine in interval
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$retval = getData($result);
+	
+		if(count($retval) == 0) {
+	//		$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
+	
+		$this->addMeta('retval', $retval);
+		
+		// group changed/new abgaben for projektarbeiten
+		$projektarbeiten = [];
+		foreach($retval as $newOrChangedAbgabe) {
+	
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
+	
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+	
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+		}
+		
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$betreuer = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+			
+//			$projektarbeiten[$projektarbeit_id]['betreuer'] = $betreuerResult;
+//			$projektarbeit->betreuer = $betreuerResult;
+			forEach($betreuerResult->retval as $betreuerRow) {
+				
+			}
+			if (isset($betreuerResult->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+			
+		}
+		$this->addMeta('$projektarbeiten', $projektarbeiten);
+//		$result = $this->_ci->PaabgabeModel->findNewOrChangedTermineByOtherUsersSince($interval);
+	
+	
+	//	$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+	}
+	
 }
\ No newline at end of file
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 84fe8f1a1..c3e879963 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -27,7 +27,43 @@ class AbgabetoolJob extends JOB_Controller
 	}
 	
 	public function notifyBetreuerAboutChangedAbgaben() {
+		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		// get all new or changed termine in interval
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$retval = getData($result);
+
+		if(count($retval) == 0) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
 		
+		// group changed/new abgaben for projektarbeiten, then look up their betreuer and send them email
+		$projektarbeiten = [];
+		foreach($retval as $newOrChangedAbgabe) {
+
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($newOrChangedAbgabe['projektarbeit_id'])) {
+				$projektarbeitId = $newOrChangedAbgabe['projektarbeit_id'];
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+			
+		}
+		$result = $this->_ci->PaabgabeModel->findNewOrChangedTermineByOtherUsersSince($interval);
+
+
+		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
 	}
 
 	public function notifyBetreuerMail() {
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index e1b800673..c595d7585 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -306,17 +306,7 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
-
-	/**
-	 * Prüft ob Projektarbeit aktuell ist (also zurzeit online bewertet wird).
-	 * @param $projektarbeit_id
-	 * @return boolean
-	 */
-	public function projektarbeitIsCurrent($projektarbeit_id) {
-		$version = $this->getVersion($projektarbeit_id);
-		// paarbeit sollte nur ab einem Studiensemester online bewertet werden
-		return $version === null ? null : $version->isCurrent;
-	}
+	
 	
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
 		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
diff --git a/application/models/education/Projektbetreuer_model.php b/application/models/education/Projektbetreuer_model.php
index 02368ae21..47e0239d6 100644
--- a/application/models/education/Projektbetreuer_model.php
+++ b/application/models/education/Projektbetreuer_model.php
@@ -232,4 +232,41 @@ class Projektbetreuer_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id, $betreuer_person_id));
 	}
+
+	/**
+	 * Gets all Betreuer of a Projektarbeit.
+	 * Returns one row for each person.
+	 * @param int $projektarbeit_id
+	 * @return array success with number of Betreuer or error
+	 */
+	public function getAllBetreuerOfProjektarbeit($projektarbeit_id)
+	{
+		$qry = "SELECT DISTINCT ON (pers.person_id) pers.person_id, betreuerart_kurzbz, vorname, nachname,
+				trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as voller_name,
+				anrede, titelpre, titelpost, gebdatum, geschlecht, pa.projekttyp_kurzbz,
+				ben.uid, ben.alias, ma.personalnummer, mitarbeiter_uid, student_uid,
+				(
+					SELECT kontakt
+					FROM public.tbl_kontakt
+					WHERE kontakttyp = 'email'
+					AND person_id = pers.person_id
+					ORDER BY
+						CASE WHEN zustellung THEN 0 ELSE 1 END,
+						insertamum DESC NULLS LAST
+					LIMIT 1
+				) AS private_email
+				FROM lehre.tbl_projektarbeit pa
+				JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				JOIN public.tbl_person pers USING (person_id)
+				LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+				WHERE (ben.aktiv OR ben.aktiv IS NULL)
+				AND projektarbeit_id = ?
+				ORDER BY pers.person_id, CASE WHEN ma.mitarbeiter_uid IS NULL THEN 1 ELSE 0 END, /*Mitarbeiter account first*/
+						CASE WHEN ben.uid IS NULL THEN 1 ELSE 0 END, /*user with account first*/
+						ben.insertamum";
+
+		return $this->execQuery($qry, array($projektarbeit_id));
+	}
+
 }
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 2f85b78c5..289102f87 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -487,7 +487,7 @@ export const AbgabeMitarbeiterDetail = {
 			if(this.assistenzMode) {
 				return this.abgabeTypeOptions
 			} else {
-				return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.bezeichnung))
+				return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.paabgabetyp_kurzbz))
 			}
 		},
 		getMessagePtStyle() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 7fb2ffc3d..dd6c86f78 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -55,7 +55,6 @@ export const AbgabeStudentDetail = {
 				return false
 			}
 			
-			// TODO: define these
 			if(endupload) {
 				if(await this.$fhcAlert.confirm({
 					message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
@@ -341,6 +340,7 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
 									<i v-else-if="termin.dateStyle == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
 									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+									<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 								</div>
 								<div class="col-auto text-start pl-2 pr-0 pt-0 pb-0" style="min-width: max(120px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
 									<span>{{ termin?.bezeichnung }}</span>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 60e317863..0da8c2f5e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -785,7 +785,7 @@ export const AbgabetoolAssistenz = {
 				this.notenOptions = res.data[0]
 
 				this.allowedNotenOptions = this.notenOptions.filter(
-					opt => res.data[1].includes(opt.bezeichnung)
+					opt => res.data[1].includes(opt.note)
 				)
 			}
 			
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index a4fa5a211..387a6606e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -352,7 +352,7 @@ export const AbgabetoolMitarbeiter = {
 	},
 	computed: {
 		getAllowedAbgabeTypeOptions() {
-			return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.bezeichnung))
+			return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.paabgabetyp_kurzbz))
 		}
 	},
 	created() {
@@ -375,7 +375,7 @@ export const AbgabetoolMitarbeiter = {
 				this.notenOptions = res.data[0]
 
 				this.allowedNotenOptions = this.notenOptions.filter(
-					opt => res.data[1].includes(opt.bezeichnung)
+					opt => res.data[1].includes(opt.note)
 				)
 			}
 			
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 774f089c8..e8ed7eef4 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -308,7 +308,7 @@ export const AbgabetoolStudent = {
 				this.notenOptions = res.data[0]
 
 				this.allowedNotenOptions = this.notenOptions.filter(
-					opt => res.data[1].includes(opt.bezeichnung)
+					opt => res.data[1].includes(opt.note)
 				)
 			}
 		}).finally(() => {

From c79ff24c89f77d400390bb3650fd115592e5d580 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 3 Dec 2025 19:29:42 +0100
Subject: [PATCH 1022/1357] Studierendenverwaltung Projektarbeit: added
 Studiensemester dropdown for Lv-Teil

---
 .../api/frontend/v1/stv/Projektarbeit.php     | 14 +++-
 public/js/api/factory/stv/projektarbeit.js    |  6 ++
 .../Details/Projektarbeit/Details.js          | 68 +++++++++++++++----
 .../Details/Projektarbeit/Projektarbeit.js    |  2 +-
 4 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 9cc604184..168472b62 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -17,7 +17,8 @@ class Projektarbeit extends FHCAPI_Controller
 			'getTypenProjektarbeit' => ['admin:r', 'assistenz:r'],
 			'getFirmen' => ['admin:r', 'assistenz:r'],
 			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
-			'getNoten' => ['admin:r', 'assistenz:r']
+			'getNoten' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r']
 		]);
 
 		// Load Libraries
@@ -40,6 +41,7 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('education/Note_model', 'NoteModel');
 		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		// load libraries
 		$this->load->library('PermissionLib');
@@ -259,6 +261,16 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	public function getStudiensemester()
+	{
+		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+
+		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
 	/**
 	 *
 	 * @param
diff --git a/public/js/api/factory/stv/projektarbeit.js b/public/js/api/factory/stv/projektarbeit.js
index 4412f1842..e9b3e7efc 100644
--- a/public/js/api/factory/stv/projektarbeit.js
+++ b/public/js/api/factory/stv/projektarbeit.js
@@ -49,6 +49,12 @@ export default {
 			url: 'api/frontend/v1/stv/projektarbeit/getNoten'
 		};
 	},
+	getStudiensemester() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/projektarbeit/getStudiensemester'
+		};
+	},
 	loadProjektarbeit(projektarbeit_id) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 63b80ba37..d14f618e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -69,10 +69,13 @@ export default {
 				final: true,
 				anmerkung: null
 			},
+			studiensemester: null,
 			arrTypen: [],
 			arrFirmen: [],
 			arrLvs: [],
 			arrNoten: [],
+			arrStudiensemester: [],
+			additional_lehrveranstaltung_id: null,
 			filteredFirmen: [],
 			abortController: {
 				firma: null
@@ -103,7 +106,11 @@ export default {
 			this.formData.anmerkung = null;
 			this.$refs.formDetails.clearValidation();
 		},
-		getFormData(statusNew, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
+		getFormData(newProjektarbeit, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
+
+			this.additional_lehrveranstaltung_id = additional_lehrveranstaltung_id;
+			this.studiensemester = studiensemester_kurzbz || this.defaultSemester;
+			this.newProjektarbeit = newProjektarbeit;
 
 			this.$api
 				.call(ApiStvProjektarbeit.getTypenProjektarbeit())
@@ -112,18 +119,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 
-			this.$api
-				.call(ApiStvProjektarbeit.getLehrveranstaltungen(
-					this.student.uid,
-					statusNew ? this.student.studiengang_kz : null,
-					studiensemester_kurzbz ?? this.defaultSemester,
-					additional_lehrveranstaltung_id
-				))
-				.then(result => {
-						this.arrLvs = result.data
-					}
-				)
-				.catch(this.$fhcAlert.handleSystemError);
+			this.getLehrveranstaltungen();
 
 			this.$api
 				.call(ApiStvProjektarbeit.getNoten())
@@ -132,7 +128,14 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 
-			if (statusNew) this.resetForm();
+			this.$api
+				.call(ApiStvProjektarbeit.getStudiensemester())
+				.then(result => {
+					this.arrStudiensemester = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+			if (this.newProjektarbeit) this.resetForm();
 		},
 		loadProjektarbeit(projektarbeit_id) {
 
@@ -178,6 +181,24 @@ export default {
 					this.filteredFirmen = result.data;
 				});
 		},
+		getLehrveranstaltungen() {
+			return this.$api
+				.call(ApiStvProjektarbeit.getLehrveranstaltungen(
+					this.student.uid,
+					this.newProjektarbeit ? this.student.studiengang_kz : null,
+					this.studiensemester,
+					this.additional_lehrveranstaltung_id
+				))
+				.then(result => {
+						this.arrLvs = result.data
+					}
+				)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		studiensemesterChanged() {
+			this.formData.lehreinheit_id = null;
+			this.getLehrveranstaltungen();
+		},
 		lvChanged(event) {
 			this.formData.lehreinheit_id = null;
 		},
@@ -281,7 +302,7 @@ export default {
 
 				<div class="row mb-3">
 					<form-input
-						container-class="stv-details-projektarbeit-lv"
+						container-class="stv-details-projektarbeit-lv col-10"
 						:label="$p.t('projektarbeit', 'lehrveranstaltung')"
 						type="select"
 						v-model="formData.lehrveranstaltung_id"
@@ -297,6 +318,23 @@ export default {
 							{{lv.bezeichnung + (lv.orgform_kurzbz ? ' ' + lv.orgform_kurzbz : '') + ' (' + lv.semester + ' Sem) ID: ' + lv.lehrveranstaltung_id}}
 						</option>
 					</form-input>
+					<form-input
+						container-class="col-2"
+						:label="$p.t('lehre', 'studiensemester')"
+						type="select"
+						v-model="studiensemester"
+						name="studiensemester"
+						@change="studiensemesterChanged"
+						>
+						<option :value="null"> -- {{$p.t('fehlermonitoring', 'keineAuswahl')}} -- </option>
+						<option
+							v-for="sem in arrStudiensemester"
+							:key="sem.studiensemester_kurzbz"
+							:value="sem.studiensemester_kurzbz"
+							>
+							{{sem.studiensemester_kurzbz}}
+						</option>
+					</form-input>
 				</div>
 
 				<div class="row mb-3">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 31be69ff8..f831ece7d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -258,7 +258,7 @@ export default {
 			this.statusNew = true;
 			this.editedProjektarbeit = null;
 			this.toggleMenu('details');
-			this.$refs.projektarbeitDetails.getFormData(this.statusNew);
+			this.$refs.projektarbeitDetails.getFormData(this.statusNew, null, null);
 			this.$refs.projektarbeitModal.show();
 		},
 		actionEditProjektarbeit() {

From 841b4736a97f5b23260afffd78a9fdb3cc61a7a8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 4 Dec 2025 08:39:37 +0100
Subject: [PATCH 1023/1357] do not send filters to backend when search endpoint
 is used

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 69111d11c..953462a74 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -385,7 +385,7 @@ export default {
 
 			const params = (endpoint?.params !== undefined) ? endpoint.params : {};
 			let method = (endpoint?.method !== undefined) ? endpoint.method : 'get';
-			if (this.filter.length)
+			if (this.filter.length && !endpoint.url.match(/\/search\//))
 			{
 				params.filter = this.filter;
 				method = 'post';

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

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

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

From 391a4753d5120ecbcd52f444d92cd142238c8334 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 4 Dec 2025 14:38:30 +0100
Subject: [PATCH 1025/1357] fix flex-grow with tabulator exceeding width (found
 by ma0646)

---
 public/css/Cis4/Cis.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index ff1b181dd..2bb467048 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -407,6 +407,7 @@ html {
   background-color: var(--fhc-background);
   border-color: var(--fhc-border);
   padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
+  min-width: 0; /* fix flex-grow with tabulator exceeding width */
 }
 
 #cis-main .fa-arrow-up-right-from-square {
@@ -854,4 +855,4 @@ html {
 #cis-main .modal-footer {
 	background-color: var(--fhc-secondary);
 	
-}
\ No newline at end of file
+}

From e3c1287664c09c796f798abbed092c851f6649cb Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Dec 2025 14:49:05 +0100
Subject: [PATCH 1026/1357] WIP

---
 application/config/abgabe.php                 |   2 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 104 ++++++++++++++++--
 .../controllers/jobs/AbgabetoolJob.php        |   1 -
 .../models/education/Paabgabe_model.php       |  24 ++--
 4 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index da77da22e..c6a3c4d85 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -7,7 +7,7 @@ $config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/s
 
 $config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
 
-$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
+$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '2 day';
 // used as APP_ROOT.URL_STUDENTS -> cis4
 $config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
 // used as APP_ROOT.URL_MITARBEITER -> old cis 
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 0b85e2370..36b2280b5 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -1169,7 +1169,7 @@ class Abgabe extends FHCAPI_Controller
 		}
 		
 		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
-		$betreuer = [];
+		$betreuerMap = [];
 		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
 			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
 			
@@ -1177,22 +1177,110 @@ class Abgabe extends FHCAPI_Controller
 //			$projektarbeit->betreuer = $betreuerResult;
 			forEach($betreuerResult->retval as $betreuerRow) {
 				
-			}
-			if (isset($betreuerResult->projektarbeit_id)) {
-				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
-
 				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
 				// initialize it as an empty array.
-				if (!isset($projektarbeiten[$projektarbeitId])) {
-					$projektarbeiten[$projektarbeitId] = [];
+				if (!isset($betreuerMap[$betreuerRow->person_id])) {
+					$betreuerMap[$betreuerRow->person_id] = [];
 				}
 
+				
 				// Add the current row to the array associated with its 'projektarbeit_id'.
-				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+				$betreuerMap[$betreuerRow->person_id][] = [$projektarbeit_id, $betreuerRow];
+				
+			}
+		}
+
+		$count = 0;
+		// now iterate over the betreuerMap and build 1 email about all projektarbeiten and their new/changed termine
+
+		// $tupel = [$projektarbeit_id, $betreuerRow], each betreuer has 0..n [projektarbeit_id, changedAbgaben] tupel
+		forEach($betreuerMap as $betreuer_person_id => $tupelArr) {
+
+			$abgabenString = '<br /><br />';
+			
+//			$betreuerRow = $tupel[1];
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
+			$data = getData($result)[0];
+
+			$anrede = $data->anrede;
+			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $data->first;
+			
+			forEach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$betreuerRow = $tupel[1];
+
+				
+
+				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				// filter for abgaben which where not inserted by the current betreuer iteration if there is no updateamum
+				// or not changed by the betreuer if there is updateamum
+				$relevantAbgaben = array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
+					// new termin not created by that betreuer
+					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
+						return $abgabetermin;
+					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
+						return $abgabetermin;
+					}
+				});
+				
+				if(count($relevantAbgaben) == 0) {
+					break; // skip that projektarbeit if only changes originate from the betreuer in question
+				}
+
+				$projektarbeit_titel = $relevantAbgaben[0]->titel ?? 'Kein Titel vergeben';
+//				$abgabenString = '<br /><br />';
+				$abgabenString .= 'Projektarbeit: '.$projektarbeit_titel.' ('.$betreuerRow->betreuerart_kurzbz.') ID:'.$projektarbeit_id.'<br/>';
+				$abgabeString .= 'Stg: '.$stgtyp.$stgkz.'<br/>';
+				foreach ($relevantAbgaben as $abgabe) {
+					$datetime = new DateTime($abgabe->datum);
+					$dateEmailFormatted = $datetime->format('d.m.Y');
+
+					$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
+					$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+
+					$abgabenString .= ' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ';
+					if($abgabe->kurzbz != '') {
+						$abgabenString .= $abgabe->kurzbz . '<br />';
+					}
+				}
+
+				$abgabenString .= '<br/><br/>';
+				
+				
 			}
 			
+			// done with building the change list, now send it
+			$betreuerRow = $tupelArr[0][1];
+			
+
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = APP_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+//			if(count($tupelArr) <= 2) break; // testing code 
+			
+			// send email with bundled info
+			sendSanchoMail(
+				'PAAChangesBetSM',
+				$body_fields,
+				$betreuerRow->private_email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
 		}
+		
 		$this->addMeta('$projektarbeiten', $projektarbeiten);
+		$this->addMeta('$betreuerMap', $betreuerMap);
 //		$result = $this->_ci->PaabgabeModel->findNewOrChangedTermineByOtherUsersSince($interval);
 	
 	
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index c3e879963..adedb0f78 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -101,7 +101,6 @@ class AbgabetoolJob extends JOB_Controller
 			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
 			$data = getData($result)[0];
 
-			// $abgabe is the array of paabgabe objects
 			$anrede = $data->anrede;
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 9edfc68ac..09542be12 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -64,16 +64,20 @@ class Paabgabe_model extends DB_Model
 	public function findAbgabenNewOrUpdatedSince($interval)
 	{
 
-		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
-					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
-					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel
-				FROM campus.tbl_paabgabe 
-					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
-					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-				
-				WHERE campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-					OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?
-	";
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel, 
+			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz
+		FROM campus.tbl_paabgabe
+				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+		
+		
+		WHERE campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?";
 
 		return $this->execQuery($query, [$interval, $interval]);
 	}

From 7e0acdbf4555a97153ca631e58133249dd0f4bba Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 4 Dec 2025 14:57:03 +0100
Subject: [PATCH 1027/1357] fix typo

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 03f84f75e..e3a750e0c 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -155,7 +155,7 @@ export default {
 
 				extraItems.push({
 					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
-						+ 'content/statistik/notenspiegel.php?type=xls'
+						+ 'content/statistik/notenspiegel.php?typ=xls'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
 						+ '&studiensemester=' + this.studiensemesterKurzbz
@@ -173,7 +173,7 @@ export default {
 				});
 				extraItems.push({
 					link: FHC_JS_DATA_STORAGE_OBJECT.app_root
-						+ 'content/statistik/notenspiegel.php?type=html'
+						+ 'content/statistik/notenspiegel.php?typ=html'
 						+ '&studiengang_kz=' + studiengang_kz
 						+ '&semester=' + semester
 						+ '&studiensemester=' + this.studiensemesterKurzbz

From e7a737b7aad9963045a64e476286de3864b6a5a5 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Dec 2025 15:36:24 +0100
Subject: [PATCH 1028/1357] write stg_kz & semester_kurzbz into sammelmail
 about each projektarbeit; move method from abgabe.php api controller to
 abgabejob.php

---
 application/config/abgabe.php                 |   2 +-
 .../controllers/api/frontend/v1/Abgabe.php    | 211 +-----------------
 .../controllers/jobs/AbgabetoolJob.php        | 113 +++++++++-
 .../models/education/Paabgabe_model.php       |   2 +-
 4 files changed, 114 insertions(+), 214 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index c6a3c4d85..da77da22e 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -7,7 +7,7 @@ $config['turnitin_link'] = 'https://technikum-wien.turnitin.com/sso/sp/redwood/s
 
 $config['old_abgabe_beurteilung_link'] = 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052';
 
-$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '2 day';
+$config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
 // used as APP_ROOT.URL_STUDENTS -> cis4
 $config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
 // used as APP_ROOT.URL_MITARBEITER -> old cis 
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 36b2280b5..ccedb658f 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -44,8 +44,7 @@ class Abgabe extends FHCAPI_Controller
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
 			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'notifyBetreuerAboutChangedAbgaben' =>  self::PERM_LOGGED
+			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
 			]);
 
 		$this->load->library('PhrasesLib');
@@ -115,14 +114,11 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
 		}
 		
-//		$paIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
-
 		$projektarbeitIsCurrent = false;
 		$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
 			$projektarbeitIsCurrent = $result;
 		};
 		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
-//		$this->addMeta('isCurrent', $projektarbeitIsCurrent);
 		
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 
@@ -147,7 +143,8 @@ class Abgabe extends FHCAPI_Controller
 			$uid = getAuthUID();
 		}
 
-		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		// TODO: check if this zugriffsberechtigung is alright
+//		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
 //		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
 
@@ -232,13 +229,6 @@ class Abgabe extends FHCAPI_Controller
 						
 						$pa->downloadLink2 = $downloadLink2;
 					}
-					
-					
-					// TODO: see assistenz query in projektarbeit_model
-					
-					// zweitbetreuer info since the 'getStudentProjektarbeitenWithBetreuer' query got quiete large,
-					// enjoy optimizing that one in 2038. we need this to render a string like
-					// Zweitbegutachter: FH-Prof. PD DI Dr. techn. Vorname Nachname MBA
 
 					$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($pa->zweitbetreuer_person_id);
 
@@ -483,7 +473,6 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
-			// TODO: consider this in nightly email job
 			$this->logLib->logInfoDB(array('paabgabe created',$result, getAuthUID(), getAuthPersonId()));
 		} else {
 			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
@@ -508,8 +497,6 @@ class Abgabe extends FHCAPI_Controller
 					'updateamum' => date('Y-m-d H:i:s')
 				)
 			);
-
-			// TODO: consider this in nightly email job
 			
 			$this->logLib->logInfoDB(array('paabgabe updated',$result, array(
 				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
@@ -530,7 +517,6 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->PaabgabeModel->load($paabgabe_id);
 		$paabgabeArr = $this->getDataOrTerminateWithError($result);
 		$paabgabe = $paabgabeArr[0];
-//		$this->addMeta('paabgabe', $paabgabeArr);
 
 		// check if abgabe even has note
 		if($paabgabe->note) {
@@ -539,7 +525,6 @@ class Abgabe extends FHCAPI_Controller
 			$noteArr = $this->getDataOrTerminateWithError($result);
 			$note = $noteArr[0];
 			if($note->positiv === false) {
-//				$this->addMeta('noteNegativ', true);
 				
 				if($existingPaabgabe && $existingPaabgabe->note) {
 					$result = $this->NoteModel->load($paabgabe->note);
@@ -767,8 +752,6 @@ class Abgabe extends FHCAPI_Controller
 			'datum' => $dateEmailFormatted,
 			'projektarbeitname' => $projektarbeit->titel
 		);
-
-//		$this->addMeta('$emaildata', $data);
 		
 		// students still get theirs on event, since it is very unlikely that this
 		// leads to spam on their end
@@ -898,8 +881,7 @@ class Abgabe extends FHCAPI_Controller
 		$schlagwoerter = $_POST['schlagwoerter'];
 		$schlagwoerter_en = $_POST['schlagwoerter_en'];
 		$seitenanzahl = $_POST['seitenanzahl'];
-
-
+		
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
 			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
 			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
@@ -987,11 +969,7 @@ class Abgabe extends FHCAPI_Controller
 		$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
 			$projektarbeitIsCurrent = $result;
 		};
-		
 		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
-		$this->addMeta('isCurrent', $projektarbeitIsCurrent);
-		
-//		$projektarbeitIsCurrent = $this->ProjektarbeitModel->projektarbeitIsCurrent($projektarbeit_id);
 		if(!$projektarbeitIsCurrent) {
 			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
 		}
@@ -1005,9 +983,7 @@ class Abgabe extends FHCAPI_Controller
 
 		$path = $this->config->item('URL_MITARBEITER');
 		$url = APP_ROOT.$path;
-
-//		$this->addMeta('betreuerArray', $resBetr->retval);
-
+		
 		// getProjektbetreuerAnrede fetches distinct on person_id, so there should be one row. zweitbetreuer is handled seperately afterwards 
 		foreach($resBetr->retval as $betreuerRow) {
 
@@ -1036,9 +1012,7 @@ class Abgabe extends FHCAPI_Controller
 			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
 
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
-
-//			$this->addMeta('$maildata', $maildata);
-
+			
 			$mailres = sendSanchoMail(
 				'ParbeitsbeurteilungEndupload',
 				$maildata,
@@ -1059,9 +1033,7 @@ class Abgabe extends FHCAPI_Controller
 				// Zweitbegutachter holen
 				$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
 				$zweitbegutachterRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid));
-
-//				$this->addMeta('$zweitbegutachterRes', $zweitbegutachterRetval);
-
+				
 				if ($zweitbegutachterRetval && count($zweitbegutachterRetval) > 0)
 				{
 
@@ -1076,9 +1048,7 @@ class Abgabe extends FHCAPI_Controller
 						}
 
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
-
-//						$this->addMeta('$begutachterMitTokenRetval', $begutachterMitTokenRetval);
-
+						
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
 							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
@@ -1102,9 +1072,7 @@ class Abgabe extends FHCAPI_Controller
 						$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
 						$zweitbetmaildata['bewertunglink'] = $projektarbeitIsCurrent ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
 						$zweitbetmaildata['token'] = $projektarbeitIsCurrent && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
-
-//						$this->addMeta('$zweitbetmaildata', $zweitbetmaildata);
-
+						
 						$mailres = sendSanchoMail(
 							'ParbeitsbeurteilungEndupload',
 							$zweitbetmaildata,
@@ -1125,166 +1093,5 @@ class Abgabe extends FHCAPI_Controller
 			}
 		}
 	}
-
-	public function notifyBetreuerAboutChangedAbgaben() {
-	//	$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
-		
-		$this->_ci =& get_instance();
-		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
-		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$this->_ci->load->model('crm/Student_model', 'StudentModel');
-		
-		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-	
-		// get all new or changed termine in interval
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
-		$retval = getData($result);
-	
-		if(count($retval) == 0) {
-	//		$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
-	
-		$this->addMeta('retval', $retval);
-		
-		// group changed/new abgaben for projektarbeiten
-		$projektarbeiten = [];
-		foreach($retval as $newOrChangedAbgabe) {
-	
-			// Check if the current item has a 'projektarbeit_id' field.
-			// Replace 'projektarbeit_id' with the actual key name if it's different.
-			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
-				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
-	
-				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
-				// initialize it as an empty array.
-				if (!isset($projektarbeiten[$projektarbeitId])) {
-					$projektarbeiten[$projektarbeitId] = [];
-				}
-	
-				// Add the current row to the array associated with its 'projektarbeit_id'.
-				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
-			}
-		}
-		
-		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
-		$betreuerMap = [];
-		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
-			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
-			
-//			$projektarbeiten[$projektarbeit_id]['betreuer'] = $betreuerResult;
-//			$projektarbeit->betreuer = $betreuerResult;
-			forEach($betreuerResult->retval as $betreuerRow) {
-				
-				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
-				// initialize it as an empty array.
-				if (!isset($betreuerMap[$betreuerRow->person_id])) {
-					$betreuerMap[$betreuerRow->person_id] = [];
-				}
-
-				
-				// Add the current row to the array associated with its 'projektarbeit_id'.
-				$betreuerMap[$betreuerRow->person_id][] = [$projektarbeit_id, $betreuerRow];
-				
-			}
-		}
-
-		$count = 0;
-		// now iterate over the betreuerMap and build 1 email about all projektarbeiten and their new/changed termine
-
-		// $tupel = [$projektarbeit_id, $betreuerRow], each betreuer has 0..n [projektarbeit_id, changedAbgaben] tupel
-		forEach($betreuerMap as $betreuer_person_id => $tupelArr) {
-
-			$abgabenString = '<br /><br />';
-			
-//			$betreuerRow = $tupel[1];
-			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
-			$data = getData($result)[0];
-
-			$anrede = $data->anrede;
-			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
-			$fullFormattedNameString = $data->first;
-			
-			forEach($tupelArr as $tupel) {
-				$projektarbeit_id = $tupel[0];
-				$betreuerRow = $tupel[1];
-
-				
-
-				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
-
-				// filter for abgaben which where not inserted by the current betreuer iteration if there is no updateamum
-				// or not changed by the betreuer if there is updateamum
-				$relevantAbgaben = array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
-					// new termin not created by that betreuer
-					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
-						return $abgabetermin;
-					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
-						return $abgabetermin;
-					}
-				});
-				
-				if(count($relevantAbgaben) == 0) {
-					break; // skip that projektarbeit if only changes originate from the betreuer in question
-				}
-
-				$projektarbeit_titel = $relevantAbgaben[0]->titel ?? 'Kein Titel vergeben';
-//				$abgabenString = '<br /><br />';
-				$abgabenString .= 'Projektarbeit: '.$projektarbeit_titel.' ('.$betreuerRow->betreuerart_kurzbz.') ID:'.$projektarbeit_id.'<br/>';
-				$abgabeString .= 'Stg: '.$stgtyp.$stgkz.'<br/>';
-				foreach ($relevantAbgaben as $abgabe) {
-					$datetime = new DateTime($abgabe->datum);
-					$dateEmailFormatted = $datetime->format('d.m.Y');
-
-					$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
-					$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
-
-					$abgabenString .= ' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ';
-					if($abgabe->kurzbz != '') {
-						$abgabenString .= $abgabe->kurzbz . '<br />';
-					}
-				}
-
-				$abgabenString .= '<br/><br/>';
-				
-				
-			}
-			
-			// done with building the change list, now send it
-			$betreuerRow = $tupelArr[0][1];
-			
-
-			$path = $this->_ci->config->item('URL_MITARBEITER');
-			$url = APP_ROOT.$path;
-
-			$body_fields = array(
-				'anrede' => $anrede,
-				'anredeFillString' => $anredeFillString,
-				'fullFormattedNameString' => $fullFormattedNameString,
-				'abgabenString' => $abgabenString,
-				'linkAbgabetool' => $url
-			);
-
-//			if(count($tupelArr) <= 2) break; // testing code 
-			
-			// send email with bundled info
-			sendSanchoMail(
-				'PAAChangesBetSM',
-				$body_fields,
-				$betreuerRow->private_email,
-				$this->p->t('abgabetool', 'changedAbgabeterminev2')
-			);
-
-			$count++;
-		}
-		
-		$this->addMeta('$projektarbeiten', $projektarbeiten);
-		$this->addMeta('$betreuerMap', $betreuerMap);
-//		$result = $this->_ci->PaabgabeModel->findNewOrChangedTermineByOtherUsersSince($interval);
-	
-	
-	//	$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
-	}
 	
 }
\ No newline at end of file
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index adedb0f78..fcdb33f48 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -17,6 +17,7 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->load->helper('hlp_sancho_helper');
 
 		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
 		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 
@@ -25,12 +26,11 @@ class AbgabetoolJob extends JOB_Controller
 			'abgabetool'
 		]);
 	}
-	
+
 	public function notifyBetreuerAboutChangedAbgaben() {
 		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
-
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
 		$retval = getData($result);
@@ -39,15 +39,14 @@ class AbgabetoolJob extends JOB_Controller
 			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
 			return;
 		}
-		
-		// group changed/new abgaben for projektarbeiten, then look up their betreuer and send them email
+
+		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
 		foreach($retval as $newOrChangedAbgabe) {
-
 			// Check if the current item has a 'projektarbeit_id' field.
 			// Replace 'projektarbeit_id' with the actual key name if it's different.
-			if (isset($newOrChangedAbgabe['projektarbeit_id'])) {
-				$projektarbeitId = $newOrChangedAbgabe['projektarbeit_id'];
+			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
 
 				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
 				// initialize it as an empty array.
@@ -58,11 +57,105 @@ class AbgabetoolJob extends JOB_Controller
 				// Add the current row to the array associated with its 'projektarbeit_id'.
 				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
 			}
-			
 		}
-		$result = $this->_ci->PaabgabeModel->findNewOrChangedTermineByOtherUsersSince($interval);
+
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$betreuerMap = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+			
+			forEach($betreuerResult->retval as $betreuerRow) {
+				if (!isset($betreuerMap[$betreuerRow->person_id])) {
+					$betreuerMap[$betreuerRow->person_id] = [];
+				}
+				
+				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
+				$betreuerMap[$betreuerRow->person_id][] = [$projektarbeit_id, $betreuerRow];
+			}
+		}
+
+		$count = 0;
+		// now iterate over the betreuerMap and build 1 email about all projektarbeiten and their new/changed termine
+		// $tupel = [$projektarbeit_id, $betreuerRow], each betreuer has 0..n [projektarbeit_id, changedAbgaben] tupel
+		forEach($betreuerMap as $betreuer_person_id => $tupelArr) {
+
+			$abgabenString = '<br /><br />';
+			
+			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
+			$data = getData($result)[0];
+
+			$anrede = $data->anrede;
+			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $data->first;
+
+			forEach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$betreuerRow = $tupel[1];
+
+				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				// filter for abgaben which where not inserted by the current betreuer iteration if there is no updateamum
+				// or not changed by the betreuer if there is updateamum
+				$relevantAbgaben = array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
+					// new termin not created by that betreuer
+					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
+						return $abgabetermin;
+					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
+						return $abgabetermin;
+					}
+				});
+
+				if(count($relevantAbgaben) == 0) {
+					break; // skip that projektarbeit if only changes originate from the betreuer in question
+				}
+
+				$projektarbeit_titel = $relevantAbgaben[0]->titel ?? 'Kein Titel vergeben';
+				$abgabenString .= 'Projektarbeit: '.$projektarbeit_titel.' ('.$betreuerRow->betreuerart_kurzbz.') ID:'.$projektarbeit_id.'<br/>';
+				$abgabenString .= 'Stg: '.$relevantAbgaben[0]->stgtyp.$relevantAbgaben[0]->stgkz.' Semester: '.$relevantAbgaben[0]->studiensemester_kurzbz.'<br/>';
+				foreach ($relevantAbgaben as $abgabe) {
+					$datetime = new DateTime($abgabe->datum);
+					$dateEmailFormatted = $datetime->format('d.m.Y');
+
+					$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
+					$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+
+					$abgabenString .= ' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ';
+					if($abgabe->kurzbz != '') {
+						$abgabenString .= $abgabe->kurzbz . '<br />';
+					}
+				}
+
+				$abgabenString .= '<br/><br/>';
 
 
+			}
+
+			// done with building the change list, now send it
+			$betreuerRow = $tupelArr[0][1];
+			
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = APP_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			// send email with bundled info
+			sendSanchoMail(
+				'PAAChangesBetSM',
+				$body_fields,
+				$betreuerRow->private_email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
 		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
 	}
 
@@ -80,7 +173,7 @@ class AbgabetoolJob extends JOB_Controller
 
 		// retval are paabgaben joined with projektarbeit and betreuer
 		if(count($retval) == 0) {
-			$this->logInfo("Keine Emails an Betreuer versandt");
+			$this->logInfo("Keine Emails über neue Paabgaben an Betreuer versandt");
 			return;
 		}
 
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 09542be12..cc4c06924 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -67,7 +67,7 @@ class Paabgabe_model extends DB_Model
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
 			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel, 
-			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz
+			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, tbl_lehreinheit.studiensemester_kurzbz
 		FROM campus.tbl_paabgabe
 				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)

From 035e844fab2458071b94fa6780ebc6f6422e0ccd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Dec 2025 15:40:45 +0100
Subject: [PATCH 1029/1357] added tbl_vorlage insert for PAAChangesBetSM.txt

---
 .../61164_abgabetool_quality_gates.php            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index cb732eca2..49e68d46e 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -332,3 +332,18 @@ if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzb
 			echo "<br>system.tbl_vorlage paabgabeUpdatesSammelmail hinzugefuegt";
 	}
 }
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PAAChangesBetSM'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('PAAChangesBetSM', 'PAAChangesBetSM', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage PAAChangesBetSM hinzugefuegt";
+	}
+}

From ec7ebc8286186b5821d600dc18d9164e0c1d7f5c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Dec 2025 16:57:24 +0100
Subject: [PATCH 1030/1357] allowedNoten config integer instead of string so
 javascript array.includes() doesnt miss the noten options

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

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index da77da22e..8ebcf2777 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -17,7 +17,7 @@ $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
 //$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
 $config['ALLOWED_ABGABETYPEN_BETREUER'] = ['zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
 //$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
-$config['ALLOWED_NOTEN_ABGABETOOL'] = ['10', '14']; // tbl_note pk
+$config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 
 $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 

From ca152dc1ea33e9d1670eb7aaf67fc87ea99a271e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 4 Dec 2025 17:28:16 +0100
Subject: [PATCH 1031/1357] add projektarbeit_id & student_uid to
 projektbeurteilung_formular_link event in projektarbeitsbeurteilungsextension

---
 application/controllers/api/frontend/v1/Abgabe.php   | 2 +-
 application/models/education/Projektarbeit_model.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index ccedb658f..e1c35ba5b 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -423,7 +423,7 @@ class Abgabe extends FHCAPI_Controller
 				$oldLink = $resultOld;
 			};
 			
-			Events::trigger('projektbeurteilung_formular_link', $pa->betreuerart_kurzbz, APP_ROOT, $returnFunc);
+			Events::trigger('projektbeurteilung_formular_link', $pa->betreuerart_kurzbz, APP_ROOT, $pa->projektarbeit_id, $pa->student_uid, $returnFunc);
 			$pa->beurteilungLinkNew = $newLink;
 			$pa->beurteilungLinkOld = $oldLink;
 		}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index c595d7585..35d38401a 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -269,7 +269,7 @@ class Projektarbeit_model extends DB_Model
 					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
 							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
 							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
 					 FROM lehre.tbl_projektarbeit
 							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
 							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)

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 1032/1357] - 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 e1959b9e40ed6b050589fce8269b3e1aac3258c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 5 Dec 2025 13:21:46 +0100
Subject: [PATCH 1033/1357] =?UTF-8?q?Quality=20Gate=20Aenderungen=20im=20D?=
 =?UTF-8?q?BUpdate=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/dbupdate_3.4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f9c889110..87ebd8212 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -85,6 +85,7 @@ require_once('dbupdate_3.4/66982_berufsschule.php');
 require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
+require_once('dbupdate_3.4/61164_abgabetool_quality_gates.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

From 112e30ab39b60f8e61c957a5148bfabf007c2845 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 5 Dec 2025 22:01:35 +0100
Subject: [PATCH 1034/1357] Studierendenverwaltung Projektarbeit: added
 concatenated Betreuer, sorted autocomplete suggestions, added Gesamtnote,
 freigegeben check removed when lock date set, added phrases

---
 .../api/frontend/v1/stv/Projektarbeit.php     |   5 +-
 .../api/frontend/v1/stv/Projektbetreuer.php   |  52 +++++---
 .../models/education/Projektarbeit_model.php  |  19 ++-
 .../Details/Projektarbeit/Details.js          |   8 +-
 .../Details/Projektarbeit/Projektarbeit.js    |  21 ++-
 .../Details/Projektarbeit/Projektbetreuer.js  |  43 ++++++-
 system/phrasesupdate.php                      | 120 ++++++++++++++++++
 7 files changed, 238 insertions(+), 30 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 168472b62..1752cee92 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -55,10 +55,7 @@ class Projektarbeit extends FHCAPI_Controller
 
 		$result = $this->ProjektarbeitModel->getProjektarbeit($student_uid);
 
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
+		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
 		if (!hasData($result)) $this->terminateWithSuccess([]);
 
diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index a84248a35..4eec773c5 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -50,21 +50,30 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!isset($projektarbeit_id))
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
 
-		$this->ProjektbetreuerModel->addSelect(
-			'projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
-			stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost'
-		);
-		$this->ProjektbetreuerModel->addSelect("CASE
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
-				THEN 'Mitarbeiter'
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=pers.person_id)
-				THEN 'Student'
-				ELSE 'Person'
-			END AS status");
-		$this->ProjektbetreuerModel->addJoin('public.tbl_person pers', 'person_id');
-		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
+		$qry = "
+			SELECT * FROM (
+				SELECT
+					projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
+					stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost,
+					CASE
+						WHEN EXISTS
+							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
+						THEN 'Mitarbeiter'
+						WHEN EXISTS
+							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=pers.person_id)
+						THEN 'Student'
+						ELSE 'Person'
+					END AS status
+				FROM
+					lehre.tbl_projektbetreuer
+					JOIN public.tbl_person pers USING (person_id)
+				WHERE
+					projektarbeit_id = ?
+			) betreuer
+			ORDER BY
+				CASE WHEN status = 'Mitarbeiter' THEN 0 WHEN status = 'Person' THEN 1 ELSE 2 END";
+
+		$result = $this->ProjektbetreuerModel->execReadOnlyQuery($qry, [$projektarbeit_id]);
 
 		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
@@ -245,7 +254,18 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result)) : []);
+		// sort persons
+		if (!hasData($result)) $this->terminateWithSuccess([]);
+
+		$persons = $this->_addFullNameToBetreuer(getData($result));
+		usort($persons, function($a, $b)
+		{
+			$statusRanks = ['Mitarbeiter' => 0, 'Person' => 1, 'Student' => 2];
+			return (isset($statusRanks[$a->status]) ? $statusRanks[$a->status] : count($statusRanks) + 1)
+				- (isset($statusRanks[$b->status]) ? $statusRanks[$b->status] : count($statusRanks) + 1);
+		});
+
+		return $this->terminateWithSuccess($persons);
 	}
 
 	public function getPerson()
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 1ca2a18a8..414d1d1be 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -24,17 +24,28 @@ class Projektarbeit_model extends DB_Model
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
 		$qry = "SELECT
-					tbl_projektarbeit.*, tbl_projekttyp.bezeichnung,
+					pa.*, tbl_projekttyp.bezeichnung,
 					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
-					tbl_firma.name AS firma_name
+					tbl_firma.name AS firma_name,
+					(
+						SELECT
+							STRING_AGG(trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')), ', ')
+						FROM
+							lehre.tbl_projektbetreuer
+							JOIN public.tbl_person USING (person_id)
+						WHERE
+							projektarbeit_id = pa.projektarbeit_id
+							AND student_uid = pa.student_uid
+						GROUP BY projektarbeit_id
+					) AS projektbetreuer
 				FROM
-					lehre.tbl_projektarbeit
+					lehre.tbl_projektarbeit pa
 					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
-					tbl_projektarbeit.student_uid = ?";
+					pa.student_uid = ?";
 
 		$params = array($student_uid);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index d14f618e1..34dd99c8f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -195,12 +195,15 @@ export default {
 				)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		lvChanged(event) {
+			this.formData.lehreinheit_id = null;
+		},
 		studiensemesterChanged() {
 			this.formData.lehreinheit_id = null;
 			this.getLehrveranstaltungen();
 		},
-		lvChanged(event) {
-			this.formData.lehreinheit_id = null;
+		gesperrtBisChanged(newSperrdatum) {
+			this.formData.freigegeben = newSperrdatum == null || newSperrdatum == '';
 		},
 		// enrich and modify data before sending
 		getPreparedFormData() {
@@ -400,6 +403,7 @@ export default {
 						format="dd.MM.yyyy"
 						model-type="yyyy-MM-dd"
 						name="gesperrtbis"
+						@update:model-value="gesperrtBisChanged"
 						>
 					</form-input>
 					<div class="col-4">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index f831ece7d..5c41d6ecc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -47,16 +47,25 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'projektarbeit']);
+						await this.$p.loadCategory(['global', 'person', 'lehre', 'stv', 'ui', 'projektarbeit']);
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'typKurzbezeichnung')
+						});
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'typ')
 						});
+						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});
 						cm.getColumnByField('titel').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'titel')
 						});
+						cm.getColumnByField('note').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'gesamtnote')
+						});
 						cm.getColumnByField('beginn').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'beginn')
 						});
@@ -78,6 +87,12 @@ export default {
 						cm.getColumnByField('firma_id').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'firmaId')
 						});
+						cm.getColumnByField('abgabedatum').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'abgabeEndupload')
+						});
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});
 					}
 				},
 			],
@@ -101,6 +116,7 @@ export default {
 					{title: "Typ Kurzbz", field: "projekttyp_kurzbz", visible: false},
 					{title: "Studiensemester", field: "studiensemester_kurzbz"},
 					{title: "Titel", field: "titel"},
+					{title: "Gesamtnote", field: "note"},
 					{
 						title: "Abgabe Enduplad",
 						field: "abgabedatum",
@@ -183,6 +199,7 @@ export default {
 					{title: "Anmerkung", field: "anmerkung", visible: false},
 					{title: "Lehreinheit ID", field: "lehreinheit_id", visible: false},
 					{title: "Student UID", field: "student_uid", visible: false},
+					{title: "Projektbetreuer", field: "projektbetreuer", visible: false},
 					{
 						title:"Final",
 						field:"final",
@@ -388,7 +405,7 @@ export default {
 				<div class="tab-pane fade show" :class="activeTab == 'betreuer' ? 'active' : ''" id="betreuer" role="tabpanel" aria-labelledby="betreuer-tab">
 					<div class="row">
 						<div class="col-12">
-							<projektbetreuer ref="projektbetreuer" :config="config"></projektbetreuer>
+							<projektbetreuer ref="projektbetreuer" :config="config" @betreuer-saved="reload"></projektbetreuer>
 						</div>
 					</div>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index f847a1e92..a36284f32 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -20,6 +20,7 @@ export default {
 		Contact,
 		Vertrag
 	},
+	emits: ['betreuerSaved'],
 	provide() {
 		return {
 			configShowVertragsdetails: this.config.showVertragsdetails
@@ -131,7 +132,43 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'projektarbeit', 'ui']);
+						await this.$p.loadCategory(['global', 'person', 'lehre', 'stv', 'projektarbeit', 'ui']);
+
+						let cm = this.$refs.projektbetreuerTable.tabulator.columnManager;
+
+						cm.getColumnByField('nachname').component.updateDefinition({
+							title: this.$p.t('person', 'nachname')
+						});
+						cm.getColumnByField('vorname').component.updateDefinition({
+							title: this.$p.t('person', 'vorname')
+						});
+						cm.getColumnByField('note').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'note')
+						});
+						cm.getColumnByField('punkte').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'titel')
+						});
+						cm.getColumnByField('stunden').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'stunden')
+						});
+						cm.getColumnByField('stundensatz').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'stundensatz')
+						});
+						cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'betreuerart_kurzbz')
+						});
+						cm.getColumnByField('person_id').component.updateDefinition({
+							title: this.$p.t('system', 'person_id')
+						});
+						cm.getColumnByField('vertrag_id').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'vertrag_id')
+						});
+						cm.getColumnByField('projektarbeit_id').component.updateDefinition({
+							title: this.$p.t('projektarbeit', 'projektarbeit_id')
+						});
+						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'actions')
+						});
 
 						// Force layout recalculation for handling overflow text
 						this.$refs.projektbetreuerTable.tabulator.redraw(true);
@@ -173,6 +210,7 @@ export default {
 	methods: {
 		actionNewProjektbetreuer() {
 			this.resetForm();
+			this.defaultStundensatz = this.config.defaultProjektbetreuerStundensatz;
 			this.newMode = !this.newMode;
 			this.editMode = false;
 			this.captureFormData();
@@ -279,6 +317,7 @@ export default {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.getProjektbetreuer(this.projektarbeit_id, this.studiensemester_kurzbz);
 				this.resetModes();
+				this.$emit('betreuerSaved');
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -300,7 +339,6 @@ export default {
 		resetForm() {
 			const defaultFormData = this.getDefaultFormData();
 			this.formData = defaultFormData;
-			this.defaultStundensatz = defaultFormData.stundensatz;
 			if (this.beurteilungDownloadLink !== null) this.beurteilungDownloadLink = '';
 			this.autocompleteSelectedBetreuer = null;
 			this.initialFormData = null;
@@ -404,6 +442,7 @@ export default {
 				.then(response => {
 					// set the new person in Betreuer autocomplete field
 					this.autocompleteSelectedBetreuer = response.data;
+					this.getDefaultStundensaetze(this.autocompleteSelectedBetreuer.person_id);
 				})
 				.catch(this.$fhcAlert.handleSystemError)
 		},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 257b05c03..61fcc062a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51665,6 +51665,126 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'punkte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Punkte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'gesamtnote',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtnote',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'final grade',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'abgabeEndupload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abgabe Endupload',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'final submission upload',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'vertrag_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vertrag ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'contract ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'projektarbeit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'project work ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerart_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuerart Kurzbezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'project assessor short name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
 	array(

From 016d4a1927fa7e7a723c0e9bd833d431b6c51df8 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sat, 6 Dec 2025 01:28:38 +0100
Subject: [PATCH 1035/1357] Studierendenverwaltung Projektbetreuer: added
 phrases, added check for existing Projektbetreuer when saving

---
 .../api/frontend/v1/stv/Projektbetreuer.php   | 35 +++++++++-------
 .../Details/Projektarbeit/Projektarbeit.js    |  4 +-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 4eec773c5..777988b35 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -123,24 +123,31 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
 
-		if (isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) && !is_numeric($projektbetreuer['stunden']))
-		{
-			return $this->terminateWithError(
-				$this->p->t('ui', 'error_fieldNotNumeric', ['field'=> 'Stunden', 'Field'=> 'Stunden']), self::ERROR_TYPE_GENERAL
-			);
-		}
-
-		if (isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) && !is_numeric($projektbetreuer['stundensatz']))
-		{
-			return $this->terminateWithError(
-				$this->p->t('ui', 'error_fieldNotNumeric', ['field'=> 'Stundensatz', 'Field'=> 'Stundensatz']), self::ERROR_TYPE_GENERAL
-			);
-		}
-
 		$projektbetreuer = $this->input->post('projektbetreuer');
 
 		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
+		// check if assessor has already been assigned
+		if (
+			isset($projektbetreuer['person_id'])
+			&& isset($projektbetreuer['person_id_old'])
+			&& $projektbetreuer['person_id'] != $projektbetreuer['person_id_old']
+		) {
+			$this->ProjektbetreuerModel->addSelect('1');
+			$betreuerRes = $this->ProjektbetreuerModel->loadWhere(
+				[
+					'person_id' => $projektbetreuer['person_id'],
+					'projektarbeit_id' => $projektbetreuer['projektarbeit_id'],
+					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
+				]
+			);
+
+			if (hasData($betreuerRes))
+			{
+				return $this->terminateWithError($this->p->t('projektarbeit', 'betreuerZugewiesen'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
 		$result = null;
 
 		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null; 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 5c41d6ecc..3ff1ea97f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -52,7 +52,7 @@ export default {
 						let cm = this.$refs.table.tabulator.columnManager;
 
 						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'typKurzbezeichnung')
+							title: this.$p.t('projektarbeit', 'typ_kurzbz')
 						});
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'typ')
@@ -199,7 +199,7 @@ export default {
 					{title: "Anmerkung", field: "anmerkung", visible: false},
 					{title: "Lehreinheit ID", field: "lehreinheit_id", visible: false},
 					{title: "Student UID", field: "student_uid", visible: false},
-					{title: "Projektbetreuer", field: "projektbetreuer", visible: false},
+					{title: "Projektbetreuer", field: "projektbetreuer"},
 					{
 						title:"Final",
 						field:"final",
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 61fcc062a..278ad38e2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51785,6 +51785,46 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'typ_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Typ Kurzbezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'type short name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'betreuerZugewiesen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuer*In ist bereits zugewiesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This project assessor is already assigned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
 	array(

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 1036/1357] 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 597aa1aa4e4a1eb8ee4b758a1585d0f7657105c1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 9 Dec 2025 12:36:08 +0100
Subject: [PATCH 1037/1357] status vorruecken ueber config steuerbar
 statusgrund kann wieder entfernt werden

---
 .../api/frontend/v1/stv/Config.php            |  5 +++-
 .../api/frontend/v1/stv/Status.php            | 12 +++++++++-
 config/global.config-default.inc.php          |  4 ++++
 .../Details/MultiStatus.js                    |  6 ++++-
 .../Details/Prestudent/MultiStatus.js         | 24 +++++++++++--------
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 3bf48bf5b..9f40c5446 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -331,7 +331,10 @@ class Config extends FHCAPI_Controller
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js')
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
+			'config' => [
+				'showStatusVorruecken' => defined('STATUS_VORRUECKEN_ANZEIGEN') ? STATUS_VORRUECKEN_ANZEIGEN : true,
+			]
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index e490772db..36d445fc6 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1341,6 +1341,7 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
+		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1349,8 +1350,17 @@ class Status extends FHCAPI_Controller
 					'rt_stufe',
 					'statusgrund_id'
 				] as $key)
-			if ($this->input->post($key))
+		{
+			if (in_array($key, $nullableFields))
+			{
+				$updateData[$key] = ($this->input->post($key) === '') ? null : $this->input->post($key);
+			}
+			else if ($this->input->post($key))
+			{
 				$updateData[$key] = $this->input->post($key);
+			}
+		}
+
 
 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index f24a302cc..37bedbdcb 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -360,4 +360,8 @@ define('SANCHO_MAIL_HEADER_IMG', 'sancho_header_DEFAULT.jpg');
 
 // footer image for eigene Mails
 define('SANCHO_MAIL_FOOTER_IMG', 'sancho_footer_DEFAULT.jpg');
+
+// Gibt an, ob in der StudVW der Status vorgerueckt werden kann
+define('STATUS_VORRUECKEN_ANZEIGEN', true);
+
 ?>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
index 8ee9e93d8..91c9593a4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js
@@ -7,10 +7,14 @@ export default {
 	},
 	props: {
 		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		}
 	},
 	template: `
 	<div class="stv-details-multistatus h-100">
-		<tbl-multi-status :model-value="modelValue"></tbl-multi-status>		
+		<tbl-multi-status :model-value="modelValue" :config="config"></tbl-multi-status>
 	</div>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 2828faa59..4b92df109 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -51,7 +51,8 @@ export default{
 		}
 	},
 	props: {
-		modelValue: Object
+		modelValue: Object,
+		config: Object,
 	},
 	data() {
 		return {
@@ -175,15 +176,18 @@ export default{
 							const data = cell.getData();
 
 							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-forward"></i>';
-							button.title = this.$p.t('ui', 'btn_statusVorruecken');
-							button.addEventListener('click', () =>
-								this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
-							);
-							if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz))
-								button.disabled = true;
-							container.append(button);
+							if (this.config?.showStatusVorruecken !== false)
+							{
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-forward"></i>';
+								button.title = this.$p.t('ui', 'btn_statusVorruecken');
+								button.addEventListener('click', () =>
+									this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
+								);
+								if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz))
+									button.disabled = true;
+								container.append(button);
+							}
 
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';

From 033af68343368c2675dfddaf5bff0570f927c85b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 9 Dec 2025 17:01:30 +0100
Subject: [PATCH 1038/1357] teleport datepicker out of modal

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 018602d0c..6b7df3581 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -292,6 +292,7 @@ export default {
 								no-today
 								:enable-time-picker="false"
 								format="dd.MM.yyyy"
+								:teleport="true"
 								>
 							</form-input>
 						</div>

From 8bab5285e9a2f083231dfb04cd5af9a2901a3ba0 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 10 Dec 2025 08:08:46 +0100
Subject: [PATCH 1039/1357] testversuch ueber config abfrage gefixed menu wird
 nicht mehr angezeigt

---
 cis/testtool/externeueberwachung.js    | 3 ++-
 cis/testtool/menu.php                  | 8 ++++++--
 cis/testtool/resetconnection.php       | 6 ------
 config/cis.config-default.inc.php      | 1 +
 include/externe_ueberwachung.class.php | 3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cis/testtool/externeueberwachung.js b/cis/testtool/externeueberwachung.js
index a40a93e05..d15404dec 100644
--- a/cis/testtool/externeueberwachung.js
+++ b/cis/testtool/externeueberwachung.js
@@ -29,7 +29,8 @@
 		if (!proctoringOK)
 		{
 			console.warn("Constructor nicht aktiv!")
-			//window.location.href='resetconnection.php';
+			//TODO einkommentieren
+			//top.location.href='resetconnection.php';
 		}
 	}, 1000);
 })();
\ No newline at end of file
diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
index 2c027c886..82623c1fd 100644
--- a/cis/testtool/menu.php
+++ b/cis/testtool/menu.php
@@ -61,8 +61,12 @@ $p = new phrasen($sprache_user);
 <?php
 $gebiet_hasMathML = false; // true, wenn irgendein Gebiet eine/n Frage/Vorschlag im MathML-Format enthält
 $invalid_gebiete = false;
-
-if (isset($_SESSION['pruefling_id']))
+if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
+{
+	exit;
+}
+else if (isset($_SESSION['pruefling_id']))
 {
 	//content_id fuer Einfuehrung auslesen
 	$qry = "SELECT content_id FROM testtool.tbl_ablauf_vorgaben WHERE studiengang_kz=".$db->db_add_param($_SESSION['studiengang_kz'])." LIMIT 1";
diff --git a/cis/testtool/resetconnection.php b/cis/testtool/resetconnection.php
index 200b3d778..39f50dfc5 100644
--- a/cis/testtool/resetconnection.php
+++ b/cis/testtool/resetconnection.php
@@ -14,12 +14,6 @@ if (isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'
 	$ueberwachung = new externeUeberwachung();
 	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID']);
 	$urlSafe = htmlspecialchars($url, ENT_QUOTES);
-
-
-	//var_dump($urlSafe);
-
 	header("Location: $urlSafe");
-	//echo "<script>window.open('{$urlSafe}');</script>";
 	$_SESSION['externe_ueberwachung_verified'] = true;
-
 }
\ No newline at end of file
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 81f09f697..0bef3a523 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -307,5 +307,6 @@ define('EXTERNE_UEBERWACHUNG_PROTOCOL_URL', 'https://example.com');
 define('EXTERNE_UEBERWACHUNG_SECRET_KEY', null);
 define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
 define('EXTERNE_UEBERWACHUNG_SESSION_URL', 'https://example.com');
+define('EXTERNE_UEBERWACHUNG_TRIAL_TEST', false);
 
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index 8adbee8a2..db6f5ae6a 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -79,6 +79,7 @@ class externeUeberwachung extends basis_db
 
 		$qry = "SELECT session_id
 				FROM testtool.tbl_externe_ueberwachung
+				WHERE prestudent_id = ".$this->db_add_param($prestudent_id, FHC_INTEGER) . "
 				ORDER BY insertamum DESC
 				LIMIT 1";
 
@@ -157,7 +158,7 @@ class externeUeberwachung extends basis_db
 			"allowMakingRoomScanSecondCamera" => false,
 			"duration"=> 120,
 			"schedule"=> false,
-			"trial"=> true,
+			"trial"=> EXTERNE_UEBERWACHUNG_TRIAL_TEST,
 			"proctoring"=> "offline",
 			"identification"=> "skip",
 			"startDate"=> "2018-03-27T00:00:00Z", //TODO anpassen

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 1040/1357] - 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 48512f46ab5ea3adefe758396ca0ea1eafd1849a Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 10 Dec 2025 15:15:23 +0100
Subject: [PATCH 1041/1357] exam name geandert

---
 include/externe_ueberwachung.class.php | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index db6f5ae6a..32911b9c5 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -146,25 +146,25 @@ class externeUeberwachung extends basis_db
 		$today = $datetime->format('Y-m-d');
 
 		$payload = [
-			"userId"=> $prestudent_id,
-			"lastName"=> $person->nachname,
-			"firstName"=> $person->vorname,
-			"language"=> $person->sprache,
-			"accountName"=> "technikum_wien",
-			"accountId"=> "technikum_wien",
-			"examId" => !is_null(trim($reihungstest->anmerkung)) ? $reihungstest->anmerkung : ($today . " RT Test"),
-			"examName" => !is_null(trim($reihungstest->anmerkung)) ? $reihungstest->anmerkung : ($today . " RT Test"),
+			"userId" => $prestudent_id,
+			"lastName" => $person->nachname,
+			"firstName" => $person->vorname,
+			"language" => $person->sprache,
+			"accountName" => "technikum_wien",
+			"accountId" => "technikum_wien",
+			"examId" => $reihungstest_id . '_' . $today,
+			"examName" => !is_null(trim($reihungstest->anmerkung)) ? ($reihungstest->anmerkung . '_' . $today) : ($reihungstest_id . '_' . $today),
 			"allowMultipleDisplays" => true,
 			"allowMakingRoomScanSecondCamera" => false,
-			"duration"=> 120,
-			"schedule"=> false,
-			"trial"=> EXTERNE_UEBERWACHUNG_TRIAL_TEST,
-			"proctoring"=> "offline",
-			"identification"=> "skip",
-			"startDate"=> "2018-03-27T00:00:00Z", //TODO anpassen
-			"endDate"=> "2027-03-30T12:55:00Z", // TODO anpassen
-			"sessionId"=> $session_id,
-			"sessionUrl"=> EXTERNE_UEBERWACHUNG_SESSION_URL
+			"duration" => 600,
+			"schedule" => false,
+			"trial" => EXTERNE_UEBERWACHUNG_TRIAL_TEST,
+			"proctoring" => "offline",
+			"identification" => "skip",
+			"startDate" => "2018-03-27T00:00:00Z", //TODO anpassen
+			"endDate" => "2027-03-30T12:55:00Z", // TODO anpassen
+			"sessionId" => $session_id,
+			"sessionUrl" => EXTERNE_UEBERWACHUNG_SESSION_URL
 		];
 		return $payload;
 	}

From 53cf777970b95ac36d4d78e319185ffac84782a1 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 10 Dec 2025 15:18:15 +0100
Subject: [PATCH 1042/1357] check im menu entfernt

---
 cis/testtool/menu.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
index 7c8b12b9d..7cb6f138d 100644
--- a/cis/testtool/menu.php
+++ b/cis/testtool/menu.php
@@ -425,28 +425,6 @@ else
 			e.preventDefault();
 		});
 	});
-    // Get users Browser
-    var ua = navigator.userAgent;
-
-    // If Browser is any other than Mozilla Firefox and the test includes any MathML,
-    // show message to use Mozilla Firefox
-    if ((ua.indexOf("Firefox") > -1) == false)
-    {
-        let hasMathML = "<?php echo (isset($gebiet_hasMathML)?$gebiet_hasMathML:''); ?>";
-        let userLang = "<?php echo $sprache_user; ?>";
-        if (hasMathML == true)
-        {
-            if (userLang == 'German')
-            {
-                alert('BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!\n(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.)');
-            }
-            else if(userLang == 'English')
-            {
-                alert('PLEASE USE MOZILLA FIREFOX BROWSER!\n(Ohterwise some exam items will not be displayed correctly.)');
-            }
-        }
-    }
-
     // Error massage if check_gebiet function returns false
     $(function() {
         var invalid_gebiete = "<?php echo (isset($invalid_gebiete)?$invalid_gebiete:''); ?>";

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

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

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

From 98bcbda53e3fd55e2c9bdf59f42a6f17149aa74e Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 10 Dec 2025 16:09:44 +0100
Subject: [PATCH 1044/1357] added check for Projektarbeitsbeurteilung when
 deleting Projektarbeit

---
 .../api/frontend/v1/stv/Projektbetreuer.php   | 12 +++++++++++
 system/dbupdate_3.4.php                       |  1 +
 ...69065_Projektarbeiten_Firmen_verwalten.php | 20 +++++++++++++++++++
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 system/dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 777988b35..bfc76088c 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -208,6 +208,18 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
 
+		$beurteilungDeleteSuccess = true;
+
+		Events::trigger(
+			'projektarbeitsbeurteilung_delete',
+			$projektarbeit_id,
+			function ($value) use (&$beurteilungDeleteSuccess) {
+				$beurteilungDeleteSuccess = $value;
+			}
+		);
+
+		if (!$beurteilungDeleteSuccess) return $this->terminateWithError($this->p->t('projektarbeit', 'error_paarbeitHatBeurteilung'));
+
 		$result = $this->ProjektbetreuerModel->delete(
 			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
 		);
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f9c889110..72c4ae92a 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -85,6 +85,7 @@ require_once('dbupdate_3.4/66982_berufsschule.php');
 require_once('dbupdate_3.4/40314_electronic_onboarding_anbindung_ida.php');
 require_once('dbupdate_3.4/47972_pruefungsverwaltung_ects_angabe.php');
 require_once('dbupdate_3.4/67490_studstatus_suche_abort_controller_haengt.php');
+require_once('dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php b/system/dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php
new file mode 100644
index 000000000..52b546846
--- /dev/null
+++ b/system/dbupdate_3.4/69065_Projektarbeiten_Firmen_verwalten.php
@@ -0,0 +1,20 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: paarbeit/beurteilung_loeschen
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'paarbeit/beurteilung_loeschen';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('paarbeit/beurteilung_loeschen', 'Berechtigung zum Löschen von Projektarbeitsbeurteilung');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission for paarbeit/beurteilung_loeschen<br>';
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 278ad38e2..34f5c7b5e 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -51825,6 +51825,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'projektarbeit',
+		'phrase' => 'error_paarbeitHatBeurteilung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für diese Projektarbeit ist bereits eine Projektarbeitsbeurteilung eingetragen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This project work has already been assessed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Projektarbeiten & Vertraege ENDE
 	// ###  	DOKUMENTE ERSTELLEN PHRASEN 		START 		###
 	array(

From eade9b7bebf663a65f79d3e9a67269f2a175645d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 10 Dec 2025 17:41:01 +0100
Subject: [PATCH 1045/1357] fixed accordion header padding size; student sees
 public mail, lektor gets notifs to private; remove unused injections; rewrite
 viewData validation for old Cis to remove console.warnings; clear
 abgabetermin.kurzbz when changing to smth not quality gate to avoid leaky
 kurzbz; fixed accordion header style offset for both cis environments;
 tooltip fix; only show abgabedatum if termin has upload_allowed; lower
 max-width in old cis; activated custom persistence for assistenz page +
 stricter promise handling around tableBuilt; activeIndex Handling on Student
 Page in case of several Projektarbetien; Phrasen gendering;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  12 +-
 application/views/Cis/Abgabetool.php          |   2 +-
 public/css/components/abgabetool/abgabe.css   |   4 +
 public/js/apps/Abgabetool/Abgabetool.js       |   1 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  13 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  14 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 241 ++++++++++--------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   4 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   5 +-
 system/phrasesupdate.php                      |  34 ++-
 10 files changed, 193 insertions(+), 137 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index e1c35ba5b..5558beafb 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -190,12 +190,9 @@ class Abgabe extends FHCAPI_Controller
 					$pa->downloadLink1 = $downloadLink1;
 				}
 				
-				$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($pa->projektarbeit_id);
 				
-				$data = getData($result);
-				if(count($data) > 0) {
-					$pa->email = $data[0]->private_email;
-				}
+				$pa->email = $pa->mitarbeiter_uid.'@'.DOMAIN;
+				
 				if($pa->zweitbetreuer_person_id !== null) {
 
 					if($pa->zweitbetreuer_abgeschickt) {
@@ -240,7 +237,7 @@ class Abgabe extends FHCAPI_Controller
 			}
 		}
 		
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));
+		$this->terminateWithSuccess(array($projektarbeiten));
 	}
 
 
@@ -857,8 +854,7 @@ class Abgabe extends FHCAPI_Controller
 			
 			
 			if(file_exists($file_path)) {
-				$this->terminateWithFileOutput('application/octet-stream', filesize($file_path), basename($file_path));
-
+				$this->terminateWithFileOutput('application/octet-stream', file_get_contents($file_path), basename($file_path));
 			} else {
 				$this->terminateWithError('File not found');
 			}
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 1d53cfa77..416f626e6 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -37,7 +37,7 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
 	uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '""' ?>
 	stg_kz_prop=<?php echo $stg_kz_prop ?? '""' ?>
 	>
diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index ea980dc29..b1d8c2507 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -189,4 +189,8 @@
 
 .bordered-modal  .modal-body {
 	overflow-y: visible;
+}
+
+.p-accordion .p-accordion-header .p-accordion-header-link {
+	padding: 12px!important;
 }
\ No newline at end of file
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
index 9d9e34214..d1c3e134c 100644
--- a/public/js/apps/Abgabetool/Abgabetool.js
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -69,5 +69,6 @@ app.use(primevue.config.default, {
 		tooltip: 8000
 	}
 })
+app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.mount('#abgabetoolroot');
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 289102f87..2e617f02b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -22,8 +22,7 @@ export const AbgabeMitarbeiterDetail = {
 		'abgabetypenBetreuer',
 		'allowedNotenOptions',
 		'turnitin_link',
-		'old_abgabe_beurteilung_link',
-		'isMobile'
+		'old_abgabe_beurteilung_link'
 	],
 	props: {
 		projektarbeit: {
@@ -472,9 +471,11 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		handleChangeAbgabetyp(termin) {
 			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
-			// are possibly less confused, which is a pursuit in vain
+			// are possibly less confused
 			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2') {
 				termin.kurzbz = termin.bezeichnung.bezeichnung
+			} else {
+				termin.kurzbz = ''
 			}
 		}
 			
@@ -608,8 +609,6 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	watch: {
 		'newTermin.bezeichnung'(newVal) {
-			console.log('\'newTermin.bezeichnung\' watcher', newVal)
-
 			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
 				this.newTermin.kurzbz = newVal.bezeichnung
 			}
@@ -760,8 +759,8 @@ export const AbgabeMitarbeiterDetail = {
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 					<template #header>
-						<div class="d-flex row w-100">
-							<div class="col-auto" style="transform: translateX(-62px)">
+						<div class="d-flex row w-100 flex-nowrap align-items-center">
+							<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 								<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index dd6c86f78..8eee7e41e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -310,7 +310,13 @@ export const AbgabeStudentDetail = {
 					class: "custom-tooltip"
 				}
 			}
-		}
+		},
+		getTooltipBeurteilungerforderlich() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipBeurteilungerfolderlich'),
+				class: "custom-tooltip"
+			}
+		},
 	},
 	created() {
 		
@@ -333,8 +339,8 @@ export const AbgabeStudentDetail = {
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
-							<div class="d-flex row w-100 flex-nowrap">
-								<div class="col-auto" style="transform: translateX(-62px)">
+							<div class="d-flex row w-100 flex-nowrap align-items-center">
+								<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 									<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
@@ -440,7 +446,7 @@ export const AbgabeStudentDetail = {
 							</div>
 						</div>
 						
-						<div class="row mt-2">
+						<div class="row mt-2" v-if="termin.upload_allowed">
 							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabedatum') )}}</div>
 							<div class="col-12 col-md-9">
 							<template v-if="termin?.abgabedatum">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 0da8c2f5e..72e9e8728 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -38,7 +38,8 @@ export const AbgabetoolAssistenz = {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
 			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
 			turnitin_link: Vue.computed(() => this.turnitin_link),
-			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
+			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link),
+			abgabetypenBetreuer: Vue.computed(() => this.abgabeTypeOptions)
 		}
 	},
 	props: {
@@ -50,7 +51,7 @@ export const AbgabetoolAssistenz = {
 			required: true,
 			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
 			}
 		}
 	},
@@ -89,7 +90,6 @@ export const AbgabetoolAssistenz = {
 				kurzbz: '',
 				fixtermin: false,
 				upload_allowed: false
-				
 			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
@@ -125,7 +125,7 @@ export const AbgabetoolAssistenz = {
 						frozen: true,
 						width: 40
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, responsive: 1, minWidth: 150},
 					// {title: 'pa_id', field: 'projektarbeit_id', visible: true},
 					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
@@ -135,26 +135,21 @@ export const AbgabetoolAssistenz = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgform'))), field: 'orgform', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,
-						responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, visible: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, visible: false, formatter: this.centeredTextFormatter, widthGrow: 1},
+						responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetableV27"
-			},
-			abgabeTableEventHandlers: [{
-				event: "tableBuilt",
-				handler: async () => {
-					this.tableBuiltResolve()
-				}
+				persistenceID: "abgabetool_2025_12"
 			},
+			abgabeTableEventHandlers: [
 			{
 				event: "rowSelectionChanged",
 				handler: async(data) => {
@@ -164,6 +159,28 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		getItemBezeichnung(item){
+			if(!item.bezeichnung) return ''
+			
+			return item?.bezeichnung?.bezeichnung ?? item?.bezeichnung
+		},
+		getItemNote(item) {
+			if(!item?.note) return ''
+			
+			const notenOption = this.notenOptions.find(note => note.note == item.note)
+			if(!notenOption) return item.note
+			
+			return notenOption.bezeichnung
+		},
+		handleChangeAbgabetypSerientermin(termin) {
+			// if paabgabetype qualgate is selected, fill out kurzbz textfield with bezeichnung of quality gate so users
+			// are possibly less confused
+			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate1' || termin.bezeichnung?.paabgabetyp_kurzbz === 'qualgate2') {
+				termin.kurzbz = termin.bezeichnung.bezeichnung
+			} else {
+				termin.kurzbz = ''
+			}
+		},
 		semesterChanged(e) {
 			if(this.$refs.abgabeTable.tabulator) {
 				const table = this.$refs.abgabeTable.tabulator
@@ -230,91 +247,94 @@ export const AbgabetoolAssistenz = {
 		},
 		handleTableBuilt() {
 			const table = this.$refs.abgabeTable.tabulator
-			// table.on("columnMoved", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnResized", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnVisibilityChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("filterChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("headerFilterChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("dataSorted", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("columnSorted", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// table.on("sortersChanged", () => {
-			// 	this.saveState(table);
-			// });
-			//
-			// const saved = this.loadState();
+
+			this.tableBuiltResolve()
 			
-			// table.on("renderComplete", () => {
-			// 	if(!this.stateRestored) {
-			//		
-			// 		if (saved?.columns && !this.colLayoutRestored) {
-			// 			const layout = saved.columns.map(col => ({
-			// 				field: col.field,
-			// 				width: col.width,
-			// 				visible: col.visible,
-			// 				// add more if needed, but keep it simple
-			// 			}));
-			//
-			// 			const safeLayout = layout.filter(col =>
-			// 				col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
-			// 			);
-			//			
-			// 			table.setColumnLayout(safeLayout);
-			//
-			// 			this.colLayoutRestored = true;
-			// 		}
-			//
-			// 		if (saved?.filters && !this.filtersRestored) {
-			// 			this.filtersRestored = true // instantly avoid retriggers
-			// 			table.setFilter(saved.filters);
-			// 		}
-			// 		if (saved?.headerFilters && !this.headerFiltersRestored) {
-			// 			this.headerFiltersRestored = true // instantly avoid retriggers
-			// 			for (let hf of saved.headerFilters) {
-			// 				table.setHeaderFilterValue(hf.field, hf.value);
-			// 			}
-			// 		}
-			//
-			// 		if (saved?.sort?.length && !this.sortRestored) {
-			// 			this.sortRestored = true;
-			//
-			// 			setTimeout(() => {
-			// 				const sortList = saved.sort.map(s => {
-			// 					const col = table.columnManager.findColumn(s.field);
-			// 					if (!col) {
-			// 						return null;
-			// 					}
-			// 					return { column: col, dir: s.dir };
-			// 				}).filter(Boolean);
-			//
-			// 				table.setSort(sortList);
-			// 			}, 100);
-			// 		}
-			// 		this.stateRestored = true
-			//
-			// 	}
-			//
-			// });
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
+
+			const saved = this.loadState();
+			
+			table.on("renderComplete", () => {
+				if(!this.stateRestored) {
+
+					if (saved?.columns && !this.colLayoutRestored) {
+						const layout = saved.columns.map(col => ({
+							field: col.field,
+							width: col.width,
+							visible: col.visible,
+							// add more if needed, but keep it simple
+						}));
+
+						const safeLayout = layout.filter(col =>
+							col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
+						);
+
+						table.setColumnLayout(safeLayout);
+
+						this.colLayoutRestored = true;
+					}
+
+					if (saved?.filters && !this.filtersRestored) {
+						this.filtersRestored = true // instantly avoid retriggers
+						table.setFilter(saved.filters);
+					}
+					if (saved?.headerFilters && !this.headerFiltersRestored) {
+						this.headerFiltersRestored = true // instantly avoid retriggers
+						for (let hf of saved.headerFilters) {
+							table.setHeaderFilterValue(hf.field, hf.value);
+						}
+					}
+
+					if (saved?.sort?.length && !this.sortRestored) {
+						this.sortRestored = true;
+
+						setTimeout(() => {
+							const sortList = saved.sort.map(s => {
+								const col = table.columnManager.findColumn(s.field);
+								if (!col) {
+									return null;
+								}
+								return { column: col, dir: s.dir };
+							}).filter(Boolean);
+
+							table.setSort(sortList);
+						}, 100);
+					}
+					this.stateRestored = true
+
+				}
+
+			});
 		},
 		handleToggleFullscreenDetail() {
 			this.detailIsFullscreen = !this.detailIsFullscreen
@@ -608,7 +628,7 @@ export const AbgabetoolAssistenz = {
 			const val = cell.getValue()
 
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
 		},
 		abgabterminFormatter(cell) {
 			const val = cell.getValue()
@@ -668,14 +688,15 @@ export const AbgabetoolAssistenz = {
 		buildZweitbetreuer(projekt) {
 			return projekt.zweitbetreuer_full_name ?? ''
 		},
-		setupData(data){
+		async setupData(data){
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
 			const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+
+			await this.tableBuiltPromise
 			
 			// this.$refs.abgabeTable.tabulator.clearData()
-			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 			this.$refs.abgabeTable.tabulator.setData(mappedData);
 		},
 		loadProjektarbeiten(all = false, callback) {
@@ -725,6 +746,13 @@ export const AbgabetoolAssistenz = {
 		}
 	},
 	watch: {
+		'serienTermin.bezeichnung'(newVal) {
+			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
+				this.serienTermin.kurzbz = newVal.bezeichnung
+			}
+
+			this.serienTermin.upload_allowed = newVal.upload_allowed_default
+		},
 		selectedStudiengangOption(newVal, oldVal) {
 			// implicitely avoids juggling around promises for created api calls,
 			// since we need note & stg flags for loadProjektarbeiten
@@ -883,6 +911,7 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
+							@change="handleChangeAbgabetypSerientermin(termin)"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
@@ -992,7 +1021,7 @@ export const AbgabetoolAssistenz = {
 							{{ $capitalize($p.t('abgabetool/c4abgabetyp')) }}:
 						</div>
 						<div class="col-7">
-							{{ slotProps?.item?.bezeichnung?.bezeichnung ?? slotProps?.item?.bezeichnung }}
+							{{ getItemBezeichnung(slotProps.item) }}
 						</div>
 				
 						<div class="col-5 fw-semibold text-end">
@@ -1006,7 +1035,7 @@ export const AbgabetoolAssistenz = {
 							{{ $capitalize($p.t('abgabetool/c4note')) }}:
 						</div>
 						<div v-if="slotProps.item.benotbar" class="col-7">
-							{{ slotProps.item.note }}
+							{{ getItemNote(slotProps.item) }}
 						</div>
 				 	</div>
 				 	<hr/>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 387a6606e..0e24a496c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -32,7 +32,7 @@ export const AbgabetoolMitarbeiter = {
 			required: true,
 			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid // && value.name -> extensive viewData use only for cis4 onwards
 			}
 		}
 	},
@@ -268,7 +268,7 @@ export const AbgabetoolMitarbeiter = {
 			const val = cell.getValue()
 
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
 		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e8ed7eef4..5276d9a8c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -35,6 +35,7 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			activeTabIndex: [0],
 			phrasenPromise: null,
 			phrasenResolved: false,
 			loading: false,
@@ -265,7 +266,7 @@ export const AbgabetoolStudent = {
 		getAccTabHeaderForProjektarbeit(projektarbeit) {
 			let title = ''
 			
-			title += projektarbeit.titel
+			title += projektarbeit.titel ?? this.$p.t('abgabetool/keinTitel')
 			
 			return title
 		},
@@ -342,7 +343,7 @@ export const AbgabetoolStudent = {
 		{{$capitalize( $p.t('abgabetool/c4abgabeStudentNoProjectsFound') )}}
 	</div>
 	
-	<Accordion :multiple="true" :activeIndex="[0]">
+	<Accordion :multiple="true" :activeIndex="activeTabIndex">
 		<template v-for="projektarbeit in projektarbeiten">
 			<AccordionTab>
 				
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2158fa869..30b4b71ea 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41079,7 +41079,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Dokumentabgabe - Mitarbeiterbereich",
+				'text' => "Dokumentabgabe - MitarbeiterInbereich",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -42757,6 +42757,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'keinTitel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kein Titel",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Title",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43905,7 +43925,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Projektarbeit Detailansicht Mitarbeiter",
+				'text' => "Projektarbeit Detailansicht MitarbeiterIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44401,13 +44421,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Emailkontakt BetreuerIn",
+				'text' => "E-Mail BetreuerIn",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Emailcontact Assessor',
+				'text' => 'Email Assessor',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44441,7 +44461,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Erstbetreuer Beurteilung herunterladen",
+				'text' => "ErstbetreuerIn Beurteilung herunterladen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44461,7 +44481,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Zweitbetreuer Beurteilung herunterladen",
+				'text' => "ZweitbetreuerIn Beurteilung herunterladen",
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44956,7 +44976,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studenten Details anzeigen',
+				'text' => 'Studierende Details anzeigen',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 32b73b72871029edbfa1839ada4f6a7b81dffc3c Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 10 Dec 2025 18:03:04 +0100
Subject: [PATCH 1046/1357] Studierendenverwaltung Projektarbeiten: delete
 checks bugfixes, layout guidelines

---
 .../api/frontend/v1/stv/Projektbetreuer.php   | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index bfc76088c..6aa86e4d4 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -3,7 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
-use CI3_Events as Events;
+use \CI3_Events as Events;
 
 class Projektbetreuer extends FHCAPI_Controller
 {
@@ -128,11 +128,8 @@ class Projektbetreuer extends FHCAPI_Controller
 		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// check if assessor has already been assigned
-		if (
-			isset($projektbetreuer['person_id'])
-			&& isset($projektbetreuer['person_id_old'])
-			&& $projektbetreuer['person_id'] != $projektbetreuer['person_id_old']
-		) {
+		if (isset($projektbetreuer['person_id']))
+		{
 			$this->ProjektbetreuerModel->addSelect('1');
 			$betreuerRes = $this->ProjektbetreuerModel->loadWhere(
 				[
@@ -142,15 +139,15 @@ class Projektbetreuer extends FHCAPI_Controller
 				]
 			);
 
-			if (hasData($betreuerRes))
-			{
+			if (hasData($betreuerRes)
+				&& (!isset($projektbetreuer['person_id_old']) || $projektbetreuer['person_id'] != $projektbetreuer['person_id_old'])) {
 				return $this->terminateWithError($this->p->t('projektarbeit', 'betreuerZugewiesen'), self::ERROR_TYPE_GENERAL);
 			}
 		}
 
 		$result = null;
 
-		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null; 
+		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null;
 		$stundensatz =
 			isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) ? $projektbetreuer['stundensatz'] : null;
 
@@ -193,18 +190,26 @@ class Projektbetreuer extends FHCAPI_Controller
 		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
 
 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'projektarbeit').' ID'], self::ERROR_TYPE_GENERAL));
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'projektarbeit').' ID'], self::ERROR_TYPE_GENERAL)
+			);
+		}
 
 		if (!isset($person_id) || !is_numeric($person_id))
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
 
 		if (!isset($betreuerart_kurzbz))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'betreuerart')], self::ERROR_TYPE_GENERAL));
+		{
+			return $this->terminateWithError(
+				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'betreuerart')], self::ERROR_TYPE_GENERAL)
+			);
+		}
 
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
 
-		$validate = $this->_validateDelete($projektarbeit_id, $person_id);
+		$validate = $this->_validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz);
 
 		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
 
@@ -231,7 +236,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			$this->outputJson($result);
 		}
 
-		return $this->terminateWithSuccess(current(getData($result)) ? : null);
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function getBetreuerarten()
@@ -277,8 +282,7 @@ class Projektbetreuer extends FHCAPI_Controller
 		if (!hasData($result)) $this->terminateWithSuccess([]);
 
 		$persons = $this->_addFullNameToBetreuer(getData($result));
-		usort($persons, function($a, $b)
-		{
+		usort($persons, function ($a, $b) {
 			$statusRanks = ['Mitarbeiter' => 0, 'Person' => 1, 'Student' => 2];
 			return (isset($statusRanks[$a->status]) ? $statusRanks[$a->status] : count($statusRanks) + 1)
 				- (isset($statusRanks[$b->status]) ? $statusRanks[$b->status] : count($statusRanks) + 1);
@@ -367,10 +371,12 @@ class Projektbetreuer extends FHCAPI_Controller
 	 * @param
 	 * @return object success or error
 	 */
-	private function _validateDelete($projektarbeit_id, $person_id)
+	private function _validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz)
 	{
 		$this->ProjektbetreuerModel->addSelect('vertrag_id');
-		$result = $this->ProjektbetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id]);
+		$result = $this->ProjektbetreuerModel->loadWhere(
+			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
+		);
 
 		if (isError($result)) return $result;
 

From 80f80ab8e8106ab8d85bb96d40e36cf0c5518dee Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 10 Dec 2025 19:43:15 +0100
Subject: [PATCH 1047/1357] added comments to Projektbetreuer

---
 .../api/frontend/v1/stv/Projektbetreuer.php   | 57 ++++++++++++++-----
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
index 6aa86e4d4..904fa6167 100644
--- a/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
+++ b/application/controllers/api/frontend/v1/stv/Projektbetreuer.php
@@ -43,6 +43,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 	}
 
+	/**
+	 * Gets Projektbetreuer data for a Projektarbeit.
+	 */
 	public function getProjektbetreuer()
 	{
 		$projektarbeit_id = $this->input->get('projektarbeit_id');
@@ -95,6 +98,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			//~ }
 		//~ }
 
+		// add thesis download link (from external extension)
 		foreach ($projektbetreuer as $pb)
 		{
 			$downloadLink = null;
@@ -113,6 +117,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
 	}
 
+	/**
+	 * Saves (adds or updates) a single Projektbetreuer for a Projektarbeit.
+	 */
 	public function saveProjektbetreuer()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -183,6 +190,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Delete a Projektbetreuer assignment to a Projektarbeit.
+	 */
 	public function deleteProjektbetreuer()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -206,6 +216,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			);
 		}
 
+		// check permission
 		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
 			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
 
@@ -213,6 +224,7 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
 
+		// check if there is a Projektarbeitsbeurteilung - if yes, it is handled (possibly deleted) by external extension.
 		$beurteilungDeleteSuccess = true;
 
 		Events::trigger(
@@ -223,6 +235,7 @@ class Projektbetreuer extends FHCAPI_Controller
 			}
 		);
 
+		// if there is still a Beurteilung, Projektarbeit cannot be deleted - return with error
 		if (!$beurteilungDeleteSuccess) return $this->terminateWithError($this->p->t('projektarbeit', 'error_paarbeitHatBeurteilung'));
 
 		$result = $this->ProjektbetreuerModel->delete(
@@ -239,6 +252,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess(getData($result));
 	}
 
+	/**
+	 * Get all active Betreuerarten.
+	 */
 	public function getBetreuerarten()
 	{
 		$result = $this->BetreuerartModel->loadWhere(['aktiv' => true]);
@@ -248,6 +264,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Get all Noten.
+	 */
 	public function getNoten()
 	{
 		$result = $this->NoteModel->load();
@@ -257,6 +276,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Get default Stundensätze for an employee in a semester.
+	 */
 	public function getDefaultStundensaetze()
 	{
 		$person_id = $this->input->get('person_id');
@@ -267,6 +289,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * Get all Projektbetreuer by search string.
+	 */
 	public function getProjektbetreuerBySearchQuery()
 	{
 		$searchString = $this->input->get('searchString');
@@ -278,10 +303,11 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 
-		// sort persons
 		if (!hasData($result)) $this->terminateWithSuccess([]);
 
 		$persons = $this->_addFullNameToBetreuer(getData($result));
+
+		// sort persons by type (employees first)
 		usort($persons, function ($a, $b) {
 			$statusRanks = ['Mitarbeiter' => 0, 'Person' => 1, 'Student' => 2];
 			return (isset($statusRanks[$a->status]) ? $statusRanks[$a->status] : count($statusRanks) + 1)
@@ -291,6 +317,9 @@ class Projektbetreuer extends FHCAPI_Controller
 		return $this->terminateWithSuccess($persons);
 	}
 
+	/**
+	 * Get person info by Id.
+	 */
 	public function getPerson()
 	{
 		$person_id = $this->input->get('person_id');
@@ -316,9 +345,7 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Validate list of Projektbetreuer.
 	 */
 	public function validateProjektbetreuer()
 	{
@@ -338,9 +365,9 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Validation funciton for checking Projektbetreuer input.
+	 * @param $formData Betreuer data
+	 * @return bool true when data is valid
 	 */
 	private function _validate($formData)
 	{
@@ -367,12 +394,15 @@ class Projektbetreuer extends FHCAPI_Controller
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Check possibility of deletion of a Projektbetreuer.
+	 * @param projektarbeit_id
+	 * @param person_id
+	 * @param betreuerart_kurzbz
+	 * @return object success when delete possible, error otherwise
 	 */
 	private function _validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz)
 	{
+		// check if contract exists
 		$this->ProjektbetreuerModel->addSelect('vertrag_id');
 		$result = $this->ProjektbetreuerModel->loadWhere(
 			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
@@ -380,15 +410,16 @@ class Projektbetreuer extends FHCAPI_Controller
 
 		if (isError($result)) return $result;
 
+		// if contract exists, no deletion is possible
 		if (hasData($result) && getData($result)[0]->vertrag_id != null) return error($this->p->t('projektarbeit', 'error_betreuerHatVertrag'));
 
 		return success();
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Add full name to array with Betreuer.
+	 * @param $betreuerArr
+	 * @return array including Betreuer with their full names
 	 */
 	private function _addFullNameToBetreuer($betreuerArr)
 	{

From df639c8b0708640751026b2f5ca5f7cc63957089 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 11 Dec 2025 08:28:01 +0100
Subject: [PATCH 1048/1357] sprache mitschicken

---
 cis/testtool/resetconnection.php       | 2 +-
 include/externe_ueberwachung.class.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cis/testtool/resetconnection.php b/cis/testtool/resetconnection.php
index 39f50dfc5..e0141ae0b 100644
--- a/cis/testtool/resetconnection.php
+++ b/cis/testtool/resetconnection.php
@@ -12,7 +12,7 @@ if (!$db = new basis_db())
 if (isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true)
 {
 	$ueberwachung = new externeUeberwachung();
-	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID']);
+	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID'], $_SESSION['sprache']);
 	$urlSafe = htmlspecialchars($url, ENT_QUOTES);
 	header("Location: $urlSafe");
 	$_SESSION['externe_ueberwachung_verified'] = true;
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index 32911b9c5..5e5bafded 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -20,7 +20,7 @@ class externeUeberwachung extends basis_db
 		$session_id = $this->getSessionByPrestudent($prestudent_id);
 		return $this->getSessionStatus($session_id);
 	}
-	public function start($prestudent_id, $reihungstest_id)
+	public function start($prestudent_id, $reihungstest_id, $sprache)
 	{
 		$session_id = $this->getSessionByPrestudent($prestudent_id);
 
@@ -38,7 +38,7 @@ class externeUeberwachung extends basis_db
 			}
 		}
 
-		$payload = $this->getPayload($session_id, $prestudent_id, $reihungstest_id);
+		$payload = $this->getPayload($session_id, $prestudent_id, $reihungstest_id, $sprache);
 		return $this->getStartUrl($payload);
 	}
 
@@ -135,7 +135,7 @@ class externeUeberwachung extends basis_db
 		];
 	}
 
-	private function getPayload($session_id, $prestudent_id, $reihungstest_id)
+	private function getPayload($session_id, $prestudent_id, $reihungstest_id, $sprache)
 	{
 		$prestudent = new prestudent($prestudent_id);
 		$person = new Person($prestudent->person_id);
@@ -149,7 +149,7 @@ class externeUeberwachung extends basis_db
 			"userId" => $prestudent_id,
 			"lastName" => $person->nachname,
 			"firstName" => $person->vorname,
-			"language" => $person->sprache,
+			"language" => $sprache === 'German' ? 'de' : 'en',
 			"accountName" => "technikum_wien",
 			"accountId" => "technikum_wien",
 			"examId" => $reihungstest_id . '_' . $today,

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 1049/1357] 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 1050/1357] 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 1c511f9c66c6f2c0494a897ce7189b2251fbbbec Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 11 Dec 2025 11:42:31 +0100
Subject: [PATCH 1051/1357] Projektarbeit controller: added comments

---
 .../api/frontend/v1/stv/Projektarbeit.php     | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index 1752cee92..db7d99752 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -47,6 +47,9 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 	}
 
+	/**
+	 * Get projekt works for a uid.
+	 */
 	public function getProjektarbeit()
 	{
 		$student_uid = $this->input->get('uid');
@@ -78,6 +81,9 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($projektarbeiten);
 	}
 
+	/**
+	 * Load a single Projektarbeit by id.
+	 */
 	public function loadProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->get('projektarbeit_id');
@@ -100,6 +106,9 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
+	/**
+	 * Inwert a Projektarbeit.
+	 */
 	public function insertProjektarbeit()
 	{
 		$student_uid = $this->input->post('uid');
@@ -127,6 +136,9 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Update a Projektarbeit by ID.
+	 */
 	public function updateProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -156,6 +168,9 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	/**
+	 * Delete Projektarbeit by ID after validation.
+	 */
 	public function deleteProjektarbeit()
 	{
 		$projektarbeit_id = $this->input->post('projektarbeit_id');
@@ -184,6 +199,9 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current(getData($result)) ? : null);
 	}
 
+	/**
+	 * Get all active projekt work types.
+	 */
 	public function getTypenProjektarbeit()
 	{
 		$result = $this->ProjekttypModel->loadWhere(['aktiv' => true]);
@@ -193,6 +211,9 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Gets companies by search string.
+	 */
 	public function getFirmen()
 	{
 		$searchString = $this->input->get('searchString');
@@ -207,6 +228,9 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Get Lehrveranstaltungen by params, incling lehreinheiten for a specific Studiensemester..
+	 */
 	public function getLehrveranstaltungen()
 	{
 		$student_uid = $this->input->get('student_uid');
@@ -217,6 +241,7 @@ class Projektarbeit extends FHCAPI_Controller
 		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
 		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
 
+		// get Lvs
 		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
 
 		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
@@ -225,6 +250,7 @@ class Projektarbeit extends FHCAPI_Controller
 
 		foreach ($lvs as $lv)
 		{
+			// add Lehreinheiten for each Lv for the semester
 			$lehreinheiten = $this->LehreinheitModel->getLesForLv(
 				$lv->lehrveranstaltung_id, $studiensemester_kurzbz
 			);
@@ -249,6 +275,9 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess($lvs);
 	}
 
+	/**
+	 * Get all noten.
+	 */
 	public function getNoten()
 	{
 		$result = $this->NoteModel->load();
@@ -258,6 +287,9 @@ class Projektarbeit extends FHCAPI_Controller
 		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
 	}
 
+	/**
+	 * Get all Studiensemester, sorted.
+	 */
 	public function getStudiensemester()
 	{
 		$this->StudiensemesterModel->addOrder('start', 'DESC');
@@ -269,9 +301,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Validate Projektarbeit data.
+	 * @param formData
+	 * @return bool true if data valid
 	 */
 	private function _validate($formData)
 	{
@@ -302,9 +334,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 * 
-	 * @param
-	 * @return object success or error
+	 * Extract Projektarbeit data from passed form data.
+	 * @param formData
+	 * @return array
 	 */
 	private function _getProjektarbeitArr($formData)
 	{
@@ -326,9 +358,9 @@ class Projektarbeit extends FHCAPI_Controller
 	}
 
 	/**
-	 *
-	 * @param
-	 * @return object success or error
+	 * Check if deletion of a Projektarbeit is possible.
+	 * @param $projektarbeit_id
+	 * @return object success if deletion possible, error otherwise.
 	 */
 	private function _validateDelete($projektarbeit_id)
 	{
@@ -349,6 +381,11 @@ class Projektarbeit extends FHCAPI_Controller
 		return success();
 	}
 
+	/**
+	 * Checks permissions for a student.
+	 * @param $student_uid
+	 * @return bool true if authorized
+	 */
 	private function _hasBerechtigungForStudent($student_uid)
 	{
 		if (!$student_uid)

From 95027937bdbe47a52cd9e6ff4fd7b43fa04f1996 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 11 Dec 2025 12:52:05 +0100
Subject: [PATCH 1052/1357] remove debug code

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

diff --git a/application/config/stv.php b/application/config/stv.php
index df1646fa0..6af6deb90 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -87,7 +87,7 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 		$fieldsZgvDoktor
 	);
 }
-error_log(print_r(defined(FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR), true));
+
 $config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] =
 	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR')
 	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR

From a6907d1bc5027c067ee99f270f088960295652e0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Dec 2025 14:20:22 +0100
Subject: [PATCH 1053/1357] - bugfix delete Purpose - reload local data after
 pushing new entries in Purpose and Support

---
 public/js/api/factory/stv/mobility.js                       | 2 +-
 .../Studentenverwaltung/Details/Mobility/List/Purpose.js    | 6 +++++-
 .../Studentenverwaltung/Details/Mobility/List/Support.js    | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/js/api/factory/stv/mobility.js b/public/js/api/factory/stv/mobility.js
index fc4fd17b4..fcff30954 100644
--- a/public/js/api/factory/stv/mobility.js
+++ b/public/js/api/factory/stv/mobility.js
@@ -101,7 +101,7 @@ export default {
 	deleteMobilityPurpose(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/',
+			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/' + params.bisio_id,
 			params
 		};
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
index f877eea78..fa93fc256 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
@@ -169,6 +169,11 @@ export default {
 				{
 					this.localData.push(newEntry);
 
+					// reload tabulator mit tabulator method
+					if (this.$refs.table?.tabulator) {
+						this.$refs.table.tabulator.replaceData(this.localData);
+					}
+
 					this.$emit('setMobilityPurposeToNewMobility', {
 						zweck_code: this.formData.zweck_code,
 					});
@@ -198,7 +203,6 @@ export default {
 		<br>
 
 		<div class="override_filtercmpt_actions_style">
-
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
index d61c60007..7da5b73e8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
@@ -157,6 +157,11 @@ export default {
 				{
 					this.localData.push(newEntry);
 
+					// reload tabulator mit tabulator method
+					if (this.$refs.table?.tabulator) {
+						this.$refs.table.tabulator.replaceData(this.localData);
+					}
+
 					this.$emit('setMobilitySupportToNewMobility', {
 						aufenthaltfoerderung_code: this.formData.aufenthaltfoerderung_code,
 					});

From 91f141326abed549f7a1bcc40f912fadaa5880df Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 11 Dec 2025 15:38:53 +0100
Subject: [PATCH 1054/1357] Studierendenverwaltung Projektarbeiten
 PRojektbetreuer: replaced "formdata modified" check with edit mode check

---
 .../Details/Projektarbeit/Projektbetreuer.js  | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index b830caa66..bbbf3be71 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -209,10 +209,10 @@ export default {
 	},
 	methods: {
 		actionNewProjektbetreuer() {
-			this.resetForm();
-			this.defaultStundensatz = this.config.defaultProjektbetreuerStundensatz;
 			this.newMode = !this.newMode;
 			this.editMode = false;
+			this.resetForm();
+			this.defaultStundensatz = this.config.defaultProjektbetreuerStundensatz;
 			this.captureFormData();
 		},
 		actionEditProjektbetreuer(projektarbeit_id, person_id, betreuerart_kurzbz) {
@@ -397,12 +397,10 @@ export default {
 		},
 		setDefaultStunden(projekttyp_kurzbz) {
 			this.projekttyp_kurzbz = projekttyp_kurzbz;
-			// if form data has not already been modified by user, set the default stunden
-			if (!this.formDataModified()) {
+			// set default stunden if not in edit mode (so hours of editen person are not overwritten)
+			if (!this.editMode)
+			{
 				let defaultStunden = this.getDefaultStunden(projekttyp_kurzbz);
-				// adapt initial form data so it does not count as modified
-				if (this.initialFormData) this.initialFormData.stunden = defaultStunden;
-				// set default Stunden
 				this.formData.stunden = defaultStunden;
 			}
 		},
@@ -416,17 +414,6 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		// check if form data has been modified since initial data has been captured
-		formDataModified() {
-			if (this.autocompleteSelectedBetreuer != null) return true;
-
-			for (const prop in this.initialFormData) {
-				if (typeof this.formData[prop] == 'undefined') return true;
-				if (this.formData[prop] != this.initialFormData[prop]) return true;
-			}
-
-			return false;
-		},
 		actionNewPerson() {
 			this.$refs.newPersonModal.reset();
 			this.$refs.newPersonModal.open();

From 8280ec42b0900fbb8493fa3a38403c54a8fd8909 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 11 Dec 2025 16:07:07 +0100
Subject: [PATCH 1055/1357] Added method getEntitledStgs to
 Studiengang_model.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Get active Studiengänge with Kuerzel by given Studiengang-Kennzahlen. Helpful to easily get Studiengänge the user is entitled for.
---
 .../models/organisation/Studiengang_model.php | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 02f972690..98d650e0c 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -801,4 +801,38 @@ class Studiengang_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * Get active Studiengänge with Kuerzel by given Studiengang-Kennzahlen.
+	 * Helpful to easily get Studiengänge the user is entitled for.
+	 *
+	 * @param $studiengang_kz_arr
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null
+	 */
+	public function getEntitledStgs($studiengang_kz_arr, $studiensemester_kurzbz)
+	{
+		if (is_numeric($studiengang_kz_arr))
+		{
+			$studiengang_kz_arr = [$studiengang_kz_arr];
+		}
+
+		$qry = '
+			SELECT
+				DISTINCT stg.*, UPPER(typ::varchar(1) || kurzbz) AS kuerzel
+			FROM
+				public.tbl_studiengang stg
+				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
+				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
+			WHERE
+				stg.studiengang_kz IN ?
+				AND stg.aktiv = TRUE
+				AND stplsem.studiensemester_kurzbz = ?
+			ORDER BY
+				stg.kurzbzlang
+		';
+
+		return $this->execQuery($qry, [$studiengang_kz_arr, $studiensemester_kurzbz]);
+	}
 }

From d91789aee55e2ab8fcfce0c1f64cddd4517c60dc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 11 Dec 2025 16:20:09 +0100
Subject: [PATCH 1056/1357] Aufruf Ausbildungsvertrag mit Param prestudent-id

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

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 4f33405ae..8a69d28ab 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -590,8 +590,8 @@ class Dokumente extends FHCAPI_Controller
 
 		$documents = [
 			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uid, 20, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uid, 21, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&prestudent_id=$prestudent_id", null,20, null),
+			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&prestudent_id=$prestudent_id", null,21, null),
 
 			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null),
 			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null),

From 635da9f8d95fd588179c92ffff118261b7fe54bf Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 12 Dec 2025 12:51:07 +0100
Subject: [PATCH 1057/1357] checksystem paabgabetyp default values for
 upload_allowed, benotbar & aktiv only on first checksystem run by checking
 availability of qgate2 typ; english phrasen for betreuerart, paabgabetyp &
 projekttyp; disable new termin for zweitbetreuer (WIP disabling
 serientermin); QGate1/2 Status column -> text only for now;

---
 .../models/education/Projektarbeit_model.php  |   1 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  25 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  16 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 123 +++-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   9 +-
 .../61164_abgabetool_quality_gates.php        |  20 +-
 system/phrasesupdate.php                      | 606 +++++++++++++++++-
 7 files changed, 706 insertions(+), 94 deletions(-)

diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 35d38401a..351a0a930 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -122,6 +122,7 @@ class Projektarbeit_model extends DB_Model
 			person_id as bperson_id,
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
 			lehre.tbl_lehreinheit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 2e617f02b..b51661b2a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -48,7 +48,8 @@ export const AbgabeMitarbeiterDetail = {
 			speedDialItems: [{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
 				icon: "fa fa-plus",
-				command: this.openCreateNewAbgabeModal
+				command: this.openCreateNewAbgabeModal,
+				disabled: Vue.computed(() => this.projektarbeit?.betreuertyp_kurzbz == 'Zweitbegutachter')
 			},
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
@@ -98,7 +99,7 @@ export const AbgabeMitarbeiterDetail = {
 			return [closestIndex, ...additional]
 		},
 		getPlaceholderTermin(termin) {
-			return termin?.bezeichnung?.bezeichnung ?? this.$p.t('abgabetool/abgabetypPlaceholder')	
+			return termin?.bezeichnung ? this.$p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : this.$p.t('abgabetool/abgabetypPlaceholder')
 		},
 		saveTermin(termin) {
 			const paabgabe_id = termin.paabgabe_id
@@ -345,8 +346,8 @@ export const AbgabeMitarbeiterDetail = {
 		getOptionLabelSprache(option) {
 			return option.sprache
 		},
-		getOptionLabelAbgabetyp(option){
-			return option.bezeichnung
+		getOptionLabelAbgabetyp(option) {
+			return this.$p.t('abgabetool/c4paatyp' + option.paabgabetyp_kurzbz)
 		},
 		getOptionDisabled(option) {
 			return !option.aktiv
@@ -406,14 +407,6 @@ export const AbgabeMitarbeiterDetail = {
 			
 			return `${day}.${month}.${year}`
 		},
-		getAccTabHeaderForTermin(termin) {
-			let tabTitle = ''
-			
-			const datumFormatted = this.formatDate(termin.datum)
-			tabTitle += termin.bezeichnung?.bezeichnung + ' ' + datumFormatted
-
-			return tabTitle
-		},
 		openCreateNewAbgabeModal() {
 			if(!this.newTermin) {
 				const typ = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen')
@@ -433,7 +426,6 @@ export const AbgabeMitarbeiterDetail = {
 					'insertvon': this.viewData?.uid ?? ''
 				}
 			}
-			console.log(this.$refs.modalContainerCreateNewAbgabe)
 			this.$refs.modalContainerCreateNewAbgabe.show()
 		},
 		validateTermin(termin) {
@@ -646,7 +638,7 @@ export const AbgabeMitarbeiterDetail = {
 		class="bootstrap-prompt" 
 		dialogClass="bordered-modal modal-lg" 
 		:backdrop="true"
-		@hideBsModal="console.log('hideBsModal'); showAutomagicModalPhrase=false;"
+		@hideBsModal="showAutomagicModalPhrase=false;"
 	>
 		<template v-slot:title>
 			<div>
@@ -742,7 +734,8 @@ export const AbgabeMitarbeiterDetail = {
 		</div>
 		<div class="row" style="margin-bottom: 12px;">
 			<div class="col-auto">
-				<button type="button" class="btn btn-primary" @click="openCreateNewAbgabeModal">
+<!--				TODO : tooltip why this button is disabled as zweitbegutachter-->
+				<button type="button" :disabled="projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter'" class="btn btn-primary" @click="openCreateNewAbgabeModal">
 					<i class="fa-solid fa-plus"></i>
 					{{$capitalize( $p.t('abgabetool/c4newAbgabetermin') )}}
 				</button>
@@ -769,7 +762,7 @@ export const AbgabeMitarbeiterDetail = {
 								<i v-else-if="getDateStyleClass(termin) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 							</div>
 							<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
-								<span>{{ termin?.bezeichnung?.bezeichnung }}</span>
+								<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
 							</div>
 							<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
 								<span>{{ formatDate(termin.datum) }}</span>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8eee7e41e..e224ec0b9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -181,14 +181,6 @@ export const AbgabeStudentDetail = {
 			const noteOpt = this.notenOptions.find(opt => opt.note == termin.note)
 			return noteOpt ? noteOpt.bezeichnung : ''
 		},
-		getAccTabHeaderForTermin(termin) {
-			let tabTitle = ''
-
-			const datumFormatted = this.formatDate(termin.datum)
-			tabTitle += termin.bezeichnung + ' ' + datumFormatted
-			
-			return tabTitle
-		}
 	},
 	watch: {
 		projektarbeit(newVal) {
@@ -331,7 +323,7 @@ export const AbgabeStudentDetail = {
 		
 			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
 			<div class="row">
-				<p> {{projektarbeit?.betreuer}}</p>
+				<p> {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
 				<p> {{projektarbeit?.titel}}</p>
 			</div>
 			
@@ -348,8 +340,8 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 									<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 								</div>
-								<div class="col-auto text-start pl-2 pr-0 pt-0 pb-0" style="min-width: max(120px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
-									<span>{{ termin?.bezeichnung }}</span>
+								<div class="col-auto text-start pl-2 pr-0 pt-0 pb-0" style="min-width: min(300px, 30%); max-width: min(300px, 30%); transform: translateX(-30px)">
+									<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
 								</div>
 								<div class="col-auto text-start p-0" style="min-width: max(80px, 15%); transform: translateX(-30px)">
 									<span>{{ formatDate(termin.datum) }}</span>
@@ -419,7 +411,7 @@ export const AbgabeStudentDetail = {
 						<div class="row mt-2">
 							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 							<div class="col-12 col-md-9">
-								{{ termin.bezeichnung }}
+								{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}
 							</div>
 						</div>
 						
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 72e9e8728..7c6dec714 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -111,7 +111,6 @@ export const AbgabetoolAssistenz = {
 				selectableCheck: this.selectionCheck,
 				rowHeight: 40,
 				renderVerticalBuffer: 2000,
-				responsiveLayout: true,
 				columns: [
 					{
 						field: 'rowSelection',
@@ -125,26 +124,24 @@ export const AbgabetoolAssistenz = {
 						frozen: true,
 						width: 40
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, responsive: 1, minWidth: 150},
-					// {title: 'pa_id', field: 'projektarbeit_id', visible: true},
-					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1,responsive:0,  tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter,responsive:0, widthGrow: 1, tooltip: false},
-					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4termineTimeLine'))), headerFilter: true, field: 'abgabetermine',responsive:2, formatter: this.timelineFormatter, widthGrow: 1, tooltip: false},
-					// {title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, visible: false, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgform'))), field: 'orgform', headerFilter: true,responsive:2, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4studstatus'))), field: 'studienstatus', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4orgform'))), field: 'orgform', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4note'))), field: 'note_bez', headerFilter: true,
-						responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, responsive:2,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, responsive:3, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, responsive:3,formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', responsive:4, formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+						 formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true,  formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))), headerFilter: true, field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))), headerFilter: true, field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
 				persistenceID: "abgabetool_2025_12"
@@ -159,13 +156,79 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		checkQualityGateStatus(projekt) {
+			// TODO: might refine the representation of these states and maybe refactor code a little
+			const qgate1Termine = []
+			const qgate2Termine = []
+			
+			projekt.qgate1Status = this.$p.t('abgabetool/c4keinTerminVorhanden')// 'Kein Termin vorhanden'
+			projekt.qgate1StatusRank = 0
+			projekt.qgate2Status = this.$p.t('abgabetool/c4keinTerminVorhanden')
+			projekt.qgate2StatusRank = 0
+			
+			projekt.abgabetermine.forEach(termin => {
+				if(termin.paabgabetyp_kurzbz == 'qualgate1') qgate1Termine.push(termin)
+				if(termin.paabgabetyp_kurzbz == 'qualgate2') qgate2Termine.push(termin)
+			})
+			
+			// calculate qgateStatusRank and display the highest order status rank of all quality gate termine until one
+			// counts as passed, which is just a positive note no matter if anything has been uploaded
+			
+			// reuse luxon calculated diffMs (termin.datum in relation to today) from previous datestyle check 
+			qgate1Termine.forEach(qgate => {
+				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
+					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					if(noteOpt.positiv) {
+						projekt.qgate1Status = this.$p.t('abgabetool/c4positivBenotet')
+						projekt.qgate1StatusRank = 5
+					} else {
+						projekt.qgate1Status = this.$p.t('abgabetool/c4negativBenotet')
+						projekt.qgate1StatusRank = 4
+					}
+				} else if (qgate.note == null && projekt.qgate1StatusRank <= 3) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notYetGraded')
+					projekt.qgate1StatusRank = 3
+				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate1StatusRank <= 2) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notSubmitted')
+					projekt.qgate1StatusRank = 2
+				} else if (qgate.upload_allowed == false && diffMs <= 0 && projekt.qgate1StatusRank <= 1) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notHappenedYet')
+					projekt.qgate1StatusRank = 1
+				}
+			})
+
+			qgate2Termine.forEach(qgate => {
+				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
+					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					if(noteOpt.positiv) {
+						projekt.qgate2Status = this.$p.t('abgabetool/c4positivBenotet')
+						projekt.qgate2StatusRank = 5
+					} else {
+						projekt.qgate2Status = this.$p.t('abgabetool/c4negativBenotet')
+						projekt.qgate2StatusRank = 4
+					}
+				} else if (qgate.note == null && projekt.qgate2StatusRank <= 3) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notYetGraded')
+					projekt.qgate2StatusRank = 3
+				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate2StatusRank <= 2) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notSubmitted')
+					projekt.qgate2StatusRank = 2
+				} else if (qgate.upload_allowed == false && diffMs <= 0 && projekt.qgate2StatusRank <= 1) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notHappenedYet')
+					projekt.qgate2StatusRank = 1
+				}
+			})
+		},
 		getItemBezeichnung(item){
 			if(!item.bezeichnung) return ''
 			
 			return item?.bezeichnung?.bezeichnung ?? item?.bezeichnung
 		},
 		getItemNote(item) {
+			// note can be just a number if it is coming from backend
+			// if note was just set it is a note option
 			if(!item?.note) return ''
+			if(item.note?.bezeichnung) return item.note.bezeichnung
 			
 			const notenOption = this.notenOptions.find(note => note.note == item.note)
 			if(!notenOption) return item.note
@@ -188,8 +251,8 @@ export const AbgabetoolAssistenz = {
 				// TODO: maybe check if existing synergy really works with many filters
 				const existing = table.getFilters().filter(f => f.field != 'studiensemester_kurzbz');
 
-				const compVal = e.value.studiensemester_kurzbz == 'Alle' ? '' : e.value.studiensemester_kurzbz
-				const compType = e.value.studiensemester_kurzbz == 'Alle' ? '!=' : '='
+				const compVal = e.value.studiensemester_kurzbz == this.$p.t('abgabetool/c4all') ? '' : e.value.studiensemester_kurzbz
+				const compType = e.value.studiensemester_kurzbz == this.$p.t('abgabetool/c4all') ? '!=' : '='
 				const newFilter = { field: "studiensemester_kurzbz", type: compType, value: compVal };
 
 				// merge and reapply
@@ -221,6 +284,9 @@ export const AbgabetoolAssistenz = {
 					}
 				}
 			})
+
+			// seperate check for quality gates
+			this.checkQualityGateStatus(projekt)
 		},
 		loadState() {
 			return JSON.parse(localStorage.getItem(this.abgabeTableOptions.persistenceID) || "null");
@@ -283,7 +349,7 @@ export const AbgabetoolAssistenz = {
 			});
 
 			const saved = this.loadState();
-			
+
 			table.on("renderComplete", () => {
 				if(!this.stateRestored) {
 
@@ -294,12 +360,8 @@ export const AbgabetoolAssistenz = {
 							visible: col.visible,
 							// add more if needed, but keep it simple
 						}));
-
-						const safeLayout = layout.filter(col =>
-							col.field && !["rowSelection", "rowHandle", "rowNum", "zweitbetreuer"].includes(col.field)
-						);
-
-						table.setColumnLayout(safeLayout);
+						
+						table.setColumnLayout(layout);
 
 						this.colLayoutRestored = true;
 					}
@@ -476,7 +538,6 @@ export const AbgabetoolAssistenz = {
 				projekt.prevTermin = null;
 				projekt.nextTermin = null;
 
-
 				this.checkAbgabetermineProjektarbeit(projekt)
 
 				if(this.notenOptions && projekt.note) {
@@ -796,7 +857,7 @@ export const AbgabetoolAssistenz = {
 		
 		this.$api.call(ApiStudiensemester.getAllStudiensemesterAndAktOrNext()).then((res) => {
 			this.allSem = res.data[0]
-			const all = {studiensemester_kurzbz: 'Alle'}
+			const all = {studiensemester_kurzbz: this.$p.t('abgabetool/c4all')}
 			this.curSem = all // res.data[1]
 			
 			this.studiensemesterOptions = [all, ...this.allSem]
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 5276d9a8c..098e80e7d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -213,7 +213,7 @@ export const AbgabetoolStudent = {
 			}
 		},
 		buildBetreuer(abgabe) {
-			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
+			return (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		async setupData(data){
 			// this.projektarbeiten = data[0]
@@ -224,7 +224,6 @@ export const AbgabetoolStudent = {
 			this.projektarbeiten = projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
 				
-				
 				return {
 					...projekt,
 					details: {
@@ -395,7 +394,7 @@ export const AbgabetoolStudent = {
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuer') )}}</div>
 					<div class="col-8 col-md-9">
-						{{ projektarbeit.betreuer }}
+						{{ projektarbeit.betreuerart_kurzbz ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) : '' }}
 					</div>
 				</div>
 				<div class="row mt-2">
@@ -405,9 +404,9 @@ export const AbgabetoolStudent = {
 					</div>
 				</div>
 				<div v-if="projektarbeit.zweitbetreuer_person_id || projektarbeit.zweitbetreuer" class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit.zweitbetreuer_betreuerart_kurzbz}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit.zweitbetreuer_betreuerart_kurzbz ? $p.t('abgabetool/c4betrart' + projektarbeit.zweitbetreuer_betreuerart_kurzbz) : '' }}</div>
 					<div class="col-8 col-md-9">
-						{{ projektarbeit.zweitbetreuer_betreuerart_beschreibung}}: {{ projektarbeit.zweitbetreuer?.first }}
+						{{ projektarbeit.zweitbetreuer?.first }}
 					</div>
 				</div>
 				<div class="row mt-2">
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index 49e68d46e..e0927344a 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -63,9 +63,9 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 }
 
 // set new cols for zwischenabgabe
-if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='zwischen'"))
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
-	if($db->db_num_rows($result) === 1)
+	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "UPDATE campus.tbl_paabgabetyp 
 				SET benotbar = false,
@@ -81,9 +81,9 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 }
 
 // set new cols for note
-if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='note'"))
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
-	if($db->db_num_rows($result) === 1)
+	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "UPDATE campus.tbl_paabgabetyp 
 				SET benotbar = false,
@@ -99,9 +99,9 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 }
 
 // set new cols for abstract / entwurf
-if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='abstract'"))
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
-	if($db->db_num_rows($result) === 1)
+	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "UPDATE campus.tbl_paabgabetyp 
 				SET benotbar = false,
@@ -117,9 +117,9 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 }
 
 // set new cols for endabgabe / end
-if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='end'"))
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
-	if($db->db_num_rows($result) === 1)
+	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "UPDATE campus.tbl_paabgabetyp 
 				SET benotbar = false,
@@ -135,9 +135,9 @@ if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabet
 }
 
 // set new cols for endabgabe im sekretariat / enda
-if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='enda'"))
+if($result = $db->db_query("SELECT 1 FROM campus.tbl_paabgabetyp WHERE paabgabetyp_kurzbz='qualgate2'"))
 {
-	if($db->db_num_rows($result) === 1)
+	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "UPDATE campus.tbl_paabgabetyp 
 				SET benotbar = false,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 30b4b71ea..b22f01a96 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41091,6 +41091,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4all',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Alle",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -43857,26 +43877,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'abgabetool',
-		'phrase' => 'c4plagiatcheck_link',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => "zur Plagiatsprüfung",
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Plagiarism check',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -45028,6 +45028,572 @@ array(
 			)
 		)
 	),
+	// PAABGABETYP PHRASEN BEGIN
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypqualgate1',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Quality Gate 1',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Quality Gate 1",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypqualgate2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Quality Gate 2',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Quality Gate 2",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypzwischen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zwischenabgabe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Interim submission",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypnote',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Benotung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Grading",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypabstract',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entwurf',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Design",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Endupload',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Final submission",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4paatypenda',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Endabgabe im Sekretariat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Final submission in the administrative office",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// PAABGABETYP PHRASEN END
+	// PROJEKTTYP PHRASEN BEGIN
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projtypBachelor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bachelorarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Bachelor's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projtypProjekt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Project work",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projtypPraktikum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Praktikum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Internship",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projtypPraxis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Praxissemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Practical semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projtypDiplom',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Masterarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Master's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// PROJEKTTYP PHRASEN END
+	// BETREUERART PHRASEN BEGIN
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartBegutachter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BegutachterIn Bachelorarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Reviewer bachelor's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartErstbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstbetreuer einer Diplomarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "First reviewer of a master's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartErstbegutachter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '1. BegutachterIn Masterarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "1. reviewer master's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartZweitbegutachter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '2. BegutachterIn Masterarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "2. reviewer master's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartzweitbetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zweitbetreuer einer Diplomarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Second reviewer of a master's thesis",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartBetreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'BetreuerIn Berufspraktikum oder Projektarbeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Reviewer of an internship or project work",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartSenatsvorsitz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorsitz Prüfungssenat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Chair of examination board",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betrartSenatsmitglied',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitglied Prüfungssenat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Member of examination board",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// BETREUERART PHRASEN END
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4qgate1Status',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status QG1',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Status QG1",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4qgate2Status',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status QG2',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Status QG2",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4keinTerminVorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Termin vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Deadline found",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4positivBenotet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Positiv Benotet!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Graded positive!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4negativBenotet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Negativ Benotet!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Graded negative!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notYetGraded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch nicht beurteilt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Not graded yet",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notSubmitted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch nicht abgegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Not submitted yet",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4notHappenedYet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Noch nicht stattgefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Not happened yet",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

From 431ae8ddac5bf53b34bc1098ee1c3d9f5ff843b1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 12 Dec 2025 13:04:58 +0100
Subject: [PATCH 1058/1357] - make button edit editable - set field anmerkung
 editable (like statusgrund and statusgrund) - refactor function updateStatus
 to skip validation - change phrases

---
 .../api/frontend/v1/stv/Status.php            | 15 ++++-
 public/js/api/factory/stv/status.js           |  7 +-
 .../Details/Prestudent/MultiStatus.js         |  4 +-
 .../Details/Status/Modal.js                   | 67 ++++++++++++++-----
 system/phrasesupdate.php                      |  8 +--
 5 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 36d445fc6..0f7960f40 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -206,6 +206,7 @@ class Status extends FHCAPI_Controller
 		$datum_string = date('c');
 		$datum = new DateTime($datum_string);
 
+
 		//Form Validation
 		$this->load->library('form_validation');
 
@@ -1088,7 +1089,7 @@ class Status extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
+	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester, $hasCriticalChangesBis=false)
 	{
 		$result = $this->PrestudentstatusModel->load([
 			$key_ausbildungssemester,
@@ -1130,14 +1131,22 @@ class Status extends FHCAPI_Controller
 				]
 			);
 
+		$hasCriticalChangesBis = filter_var($hasCriticalChangesBis, FILTER_VALIDATE_BOOLEAN);
+
 		$this->form_validation->set_rules(
 			'datum',
 			$this->p->t('global', 'datum'),
 			[
 				'is_valid_date',
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck, $hasCriticalChangesBis){
 					if ($isBerechtigtNoStudstatusCheck)
-						return true; // Skip if access right says so
+					{
+						return true; // Skip if access right says so*/
+					}
+					if (!$hasCriticalChangesBis) {
+						return true; // Skip if no critical changes were made
+					}
+
 					if (!$value)
 						return true; // Error will be handled by the required statement above
 
diff --git a/public/js/api/factory/stv/status.js b/public/js/api/factory/stv/status.js
index 11e7f4fde..7910cb8c7 100644
--- a/public/js/api/factory/stv/status.js
+++ b/public/js/api/factory/stv/status.js
@@ -39,14 +39,17 @@ export default {
 		status_kurzbz,
 		studiensemester_kurzbz,
 		ausbildungssemester
-	}, params) {
+	}, params, hasCriticalChangesBis) {
+		console.log("hasCriticalChangesBis " + hasCriticalChangesBis);
 		return {
+
 			method: 'post',
 			url: 'api/frontend/v1/stv/status/updateStatus/'
 				+ prestudent_id + '/'
 				+ status_kurzbz + '/'
 				+ studiensemester_kurzbz + '/'
-				+ ausbildungssemester,
+				+ ausbildungssemester + '/'
+				+ hasCriticalChangesBis,
 			params
 		};
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 4b92df109..e67f19ccf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -207,8 +207,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');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 8b0252be8..f913ab7c6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -64,7 +64,9 @@ export default{
 				'Unterbrecher',
 				'Diplomand',
 				'Incoming'
-			]
+			],
+			original: {},
+			hasCriticalChangesBis: false
 		};
 	},
 	computed: {
@@ -136,6 +138,7 @@ export default{
 						this.statusNew = false;
 						this.formData = result.data;
 						this.originalDatum = new Date(result.data.datum);
+						this.original = { ...this.formData};
 						return prestudent;
 					})
 					.then(this.loadStudienplaeneAndSetPrestudent)
@@ -157,7 +160,7 @@ export default{
 		},
 		editStatus() {
 			this.$refs.form
-				.call(ApiStvStatus.updateStatus(this.statusId, this.formData))
+				.call(ApiStvStatus.updateStatus(this.statusId, this.formData, this.hasCriticalChangesBis))
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$reloadList();
@@ -179,30 +182,59 @@ export default{
 				.then(result => this.mischform = result.data.mischform);
 		}
 	},
+	watch: {
+		// watching all disabled fields
+		"formData.status_kurzbz"(newVal) {
+			if (newVal !== this.original.status_kurzbz) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+/*		"formData.studiensemester_kurzbz"(newVal) {
+			if (newVal !== this.original.studiensemester_kurzbz) {
+				this.hasCriticalChangesBis = true;
+			}
+		},*/
+		"formData.orgform_kurzbz"(newVal) {
+			if (newVal !== this.original.orgform_kurzbz) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+		"formData.datum"(newVal) {
+			if (newVal !== this.original.datum) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+		"formData.bestaetigtam"(newVal) {
+			if (newVal !== this.original.bestaetigtam) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+		"formData.bewerbung_abgeschicktamum"(newVal) {
+			if (newVal !== this.original.bestaetigtam) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+		"formData.studienplan_id"(newVal) {
+			if (newVal !== this.original.studienplan_id) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+		"formData.rt_stufe"(newVal) {
+			if (newVal !== this.original.rt_stufe) {
+				this.hasCriticalChangesBis = true;
+			}
+		},
+	},
 	created() {
 		this.$api
 			.call(ApiStvStatus.getStatusgruende())
 			.then(result => this.statusgruende = result.data)
 			.catch(this.$fhcAlert.handleSystemError);
 
-		//TODO(Manu) check why it is/was hard coded
 		this.$api
 			.call(ApiStvStatus.getStati())
 			.then(result => this.stati = result.data)
 			.catch(this.$fhcAlert.handleSystemError);
-/*		this.stati = [
-			{ status_kurzbz: 'Interessent', bezeichnung: 'Interessent'},
-			{ status_kurzbz: 'Bewerber', bezeichnung: 'Bewerber'},
-			{ status_kurzbz: 'Aufgenommener', bezeichnung: 'Aufgenommener'},
-			{ status_kurzbz: 'Student', bezeichnung: 'Student'},
-			{ status_kurzbz: 'Unterbrecher', bezeichnung: 'Unterbrecher'},
-			{ status_kurzbz: 'Diplomand', bezeichnung: 'Diplomand'},
-			{ status_kurzbz: 'Incoming', bezeichnung: 'Incoming'},
-			{ status_kurzbz: 'Absolvent', bezeichnung: 'Absolvent'},
-			{ status_kurzbz: 'Abbrecher', bezeichnung: 'Abbrecher'},
-			{ status_kurzbz: 'Abgewiesener', bezeichnung: 'Abgewiesener'},
-			{ status_kurzbz: 'Wartender', bezeichnung: 'Wartender'}
-		];*/
 	},
 	template: `
 	<bs-modal class="stv-status-modal" ref="modal" dialog-class="modal-dialog-scrollable">
@@ -220,7 +252,7 @@ export default{
 			<p v-if="bisLocked && isStatusBeforeStudent">
 				<b>{{$p.t('bismeldestichtag', 'info_MeldestichtagStatusgrundSemester')}}</b>
 			</p>
-			
+
 			<form-input
 				container-class="mb-3"
 				type="select"
@@ -353,7 +385,6 @@ export default{
 				v-model="formData.anmerkung"
 				name="anmerkung"
 				:label="$p.t('global/anmerkung')"
-				:disabled="bisLocked"
 				>
 			</form-input>
 			<form-input
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5fd4404ef..041a6fb83 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41300,13 +41300,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Meldestichtag erreicht - ausschließlich Bearbeiten Statusgrund möglich',
+				'text' => 'Meldestichtag erreicht - ausschließlich Bearbeiten Statusgrund und Anmerkung möglich',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reporting deadline reached - only editing status reason possible',
+				'text' => 'Reporting deadline reached - only editing status reason and note possible',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41320,13 +41320,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Meldestichtag erreicht - Bearbeiten Ausbildungssemester und Statusgrund möglich',
+				'text' => 'Meldestichtag erreicht - Bearbeiten Ausbildungssemester, Statusgrund und Anmerkung möglich',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Edit education semester and status reason possible',
+				'text' => 'Edit education semester, status reason and note possible',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 735a6654b953d5a888350e16d5539c43e4130e4b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 12 Dec 2025 13:45:01 +0100
Subject: [PATCH 1059/1357] projektbeurteilung_check_available event when
 loading studentprojektarbeiten handled in extension

---
 application/controllers/api/frontend/v1/Abgabe.php   | 9 +++++++++
 application/models/education/Projektarbeit_model.php | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 5558beafb..57a640e0b 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -159,12 +159,21 @@ class Abgabe extends FHCAPI_Controller
 		if(count($projektarbeiten)) {
 			foreach($projektarbeiten as $pa) {
 				
+				$downloadPaFunc = function ($babgeschickt, $zweitbetreuer_abgeschickt) use ($pa) {
+					$pa->babgeschickt = $babgeschickt;
+					$pa->zweitbetreuer_abgeschickt = $zweitbetreuer_abgeschickt;
+				};
+				
+				Events::trigger('projektbeurteilung_check_available', $pa->projektarbeit_id, $pa->bperson_id, $downloadPaFunc);
+					
 				if($pa->babgeschickt) {
 					$downloadLink1 = '';
 					$downloadLinkFunc1 = function ($link) use (&$downloadLink1) {
 						$downloadLink1 = $link;
 					};
 					
+					
+					
 					Events::trigger('projektbeurteilung_download_link', $pa->projektarbeit_id, $pa->betreuerart_kurzbz, $pa->bperson_id, $downloadLinkFunc1);
 					
 					// use config fallback in case the event fails
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 351a0a930..c5d66b103 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -138,8 +138,6 @@ class Projektarbeit_model extends DB_Model
 			lehre.tbl_projektarbeit.abstract as abstract,
 			lehre.tbl_projektarbeit.abstract_en as abstract_en,
 			lehre.tbl_projektarbeit.insertamum as insertamum,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
 			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
 		
 		FROM lehre.tbl_projektarbeit

From 34d6b2d97aa7ef2f22bfe7687d426b8815527073 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 12 Dec 2025 14:36:02 +0100
Subject: [PATCH 1060/1357] use only prestundent_id in Archive-functionality

---
 .../controllers/api/frontend/v1/Documents.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 2d2c410cf..2752bb1b3 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -452,6 +452,11 @@ class Documents extends FHCAPI_Controller
 				$params .= '&vertrag_id[]=' . urlencode($id);
 		}
 
+		//delete uid param for Ausbildungsvertrag
+		if($xsl == 'Ausbildungsver' || $xsl == "AusbVerEng") {
+			$params = $this->_cutUidParam($params);
+		}
+
 		if (!$vorlage->archivierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_archive"));
 
@@ -486,4 +491,20 @@ class Documents extends FHCAPI_Controller
 				]
 		];
 	}
+
+
+	/**
+	 * @param string				$string
+	 *
+	 * @return String paramString without paramUid
+	 */
+	private function _cutUidParam($string)
+	{
+		$string = preg_replace('/uid=[^&]*&?/', '', $string);
+
+		$params = trim($string, '&');
+		$params = preg_replace('/&&+/', '&', $params);
+
+		return $params;
+	}
 }

From ad184f5c162e0f1324b89537b8de0c47c450a42f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 12 Dec 2025 14:37:44 +0100
Subject: [PATCH 1061/1357] change projektbetreuer tabulator layout, use
 correct phrases for columns person_id and punkte

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 037aceb52..6c39ba9ae 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -116,7 +116,7 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitDataStretchFrozen',
+				layout: 'fitData',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '100',
@@ -126,7 +126,7 @@ export default {
 				persistence:{
 					columns: true, //persist column layout
 				},
-				persistenceID: 'stv-details-projektbetreuer-2025112401'
+				persistenceID: 'stv-details-projektbetreuer-2025121201'
 			},
 			tabulatorEvents: [
 				{
@@ -146,7 +146,7 @@ export default {
 							title: this.$p.t('projektarbeit', 'note')
 						});
 						cm.getColumnByField('punkte').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'titel')
+							title: this.$p.t('projektarbeit', 'punkte')
 						});
 						cm.getColumnByField('stunden').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'stunden')
@@ -158,7 +158,7 @@ export default {
 							title: this.$p.t('projektarbeit', 'betreuerart_kurzbz')
 						});
 						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('system', 'person_id')
+							title: this.$p.t('person', 'person_id')
 						});
 						cm.getColumnByField('vertrag_id').component.updateDefinition({
 							title: this.$p.t('projektarbeit', 'vertrag_id')

From b967f83dd4d9f862226872cbfda1c67b46d28d7e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 12 Dec 2025 15:05:37 +0100
Subject: [PATCH 1062/1357] skip adding uid to params for templates
 Ausbildungsver and AusbVerEng instead of deleting it afterwards

---
 .../controllers/api/frontend/v1/Documents.php | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 2752bb1b3..7b2fc4a15 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -442,6 +442,10 @@ class Documents extends FHCAPI_Controller
 			'betreuerart_kurzbz',
 			'studiensemester_kurzbz'
 		] as $key) {
+			if (in_array($xsl, array('Ausbildungsver', 'AusbVerEng')) && $key === 'uid')
+			{
+				continue;
+			}
 			$value = $this->input->post_get($key);
 			if ($value !== null)
 				$params .= '&' . $key . '=' . urlencode($value);
@@ -452,11 +456,6 @@ class Documents extends FHCAPI_Controller
 				$params .= '&vertrag_id[]=' . urlencode($id);
 		}
 
-		//delete uid param for Ausbildungsvertrag
-		if($xsl == 'Ausbildungsver' || $xsl == "AusbVerEng") {
-			$params = $this->_cutUidParam($params);
-		}
-
 		if (!$vorlage->archivierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_archive"));
 
@@ -491,20 +490,4 @@ class Documents extends FHCAPI_Controller
 				]
 		];
 	}
-
-
-	/**
-	 * @param string				$string
-	 *
-	 * @return String paramString without paramUid
-	 */
-	private function _cutUidParam($string)
-	{
-		$string = preg_replace('/uid=[^&]*&?/', '', $string);
-
-		$params = trim($string, '&');
-		$params = preg_replace('/&&+/', '&', $params);
-
-		return $params;
-	}
 }

From 293a8625e4789c767e89940af6872a30911fdc8d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 12:03:41 +0100
Subject: [PATCH 1063/1357] change sort order in grades list api endpoint

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

diff --git a/application/controllers/api/frontend/v1/stv/Grades.php b/application/controllers/api/frontend/v1/stv/Grades.php
index dd8f53a27..128316d2b 100644
--- a/application/controllers/api/frontend/v1/stv/Grades.php
+++ b/application/controllers/api/frontend/v1/stv/Grades.php
@@ -60,7 +60,8 @@ class Grades extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Note_model', 'NoteModel');
 
-		$this->NoteModel->addOrder('note');
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
 		
 		$result = $this->NoteModel->load();
 

From 5a77478071c7503ce32b885e0303f753343b4db2 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 15 Dec 2025 12:27:17 +0100
Subject: [PATCH 1064/1357] insertvon entfernt

---
 cis/testtool/externeueberwachung.js                          | 4 +---
 include/externe_ueberwachung.class.php                       | 5 ++---
 .../62889_reihungstest_ueberwachung_mit_constructor.php      | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/cis/testtool/externeueberwachung.js b/cis/testtool/externeueberwachung.js
index d15404dec..65143290d 100644
--- a/cis/testtool/externeueberwachung.js
+++ b/cis/testtool/externeueberwachung.js
@@ -28,9 +28,7 @@
 	setTimeout(function () {
 		if (!proctoringOK)
 		{
-			console.warn("Constructor nicht aktiv!")
-			//TODO einkommentieren
-			//top.location.href='resetconnection.php';
+			top.location.href='resetconnection.php';
 		}
 	}, 1000);
 })();
\ No newline at end of file
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index 5e5bafded..b28a8439a 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -53,11 +53,10 @@ class externeUeberwachung extends basis_db
 
 		$uuid = $this->genereateUUID();
 
-		$qry = "INSERT INTO testtool.tbl_externe_ueberwachung (prestudent_id, session_id, insertvon)
+		$qry = "INSERT INTO testtool.tbl_externe_ueberwachung (prestudent_id, session_id)
 				VALUES (".
 			$this->db_add_param($prestudent_id).",".
-			$this->db_add_param($uuid).",".
-			$this->db_add_param(get_uid()).")";
+			$this->db_add_param($uuid).")";
 
 		if($this->db_query($qry))
 		{
diff --git a/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php b/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php
index 7f306e3d9..1b469a635 100644
--- a/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php
+++ b/system/dbupdate_3.4/62889_reihungstest_ueberwachung_mit_constructor.php
@@ -19,7 +19,6 @@ if(!$result = @$db->db_query("SELECT 1 FROM testtool.tbl_externe_ueberwachung LI
 			prestudent_id				INTEGER NOT NULL,
 			session_id					UUID NOT NULL,
 			insertamum					TIMESTAMP DEFAULT NOW(),
-			insertvon					VARCHAR(32) NOT NULL,
 			CONSTRAINT tbl_externe_ueberwachung_pk PRIMARY KEY(externe_ueberwachung_id)
 		);
 		CREATE SEQUENCE testtool.tbl_externe_ueberwachungg_id_seq

From 756a51defadb978fa0ae022c1f9b1837180da5f8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 15 Dec 2025 13:16:12 +0100
Subject: [PATCH 1065/1357] selectable check during selectAll to block it for
 Zweitbetreuer -> custom formatted/handled selection column for mitarbeiter &
 assistenz; custom sticky-col css;

---
 public/css/components/abgabetool/abgabe.css   |  24 ++++
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 123 +++++++++++++++---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 107 +++++++++++++--
 3 files changed, 227 insertions(+), 27 deletions(-)

diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index b1d8c2507..7c806ce2f 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -193,4 +193,28 @@
 
 .p-accordion .p-accordion-header .p-accordion-header-link {
 	padding: 12px!important;
+}
+
+/* 1. Stick the Header */
+#abgabetable .tabulator-header .tabulator-col.sticky-col {
+	position: sticky;
+	left: 0;
+	z-index: 10; /* Must be higher than other headers */
+	background-color: #fff; /* Opaque background is required */
+	border-right: 2px solid #ddd; /* Optional: Separator line */
+}
+
+/* 2. Stick the Data Cells */
+#abgabetable .tabulator-tableholder .tabulator-row .tabulator-cell.sticky-col {
+	position: sticky;
+	left: 0;
+	z-index: 10; /* Ensure it floats above other cells */
+	background-color: #fff; /* Match your row background color */
+	border-right: 2px solid #ddd; /* Optional: Separator line */
+}
+
+/* 3. Fix for Hover Effects (Optional) */
+/* If you use hover rows, you need to ensure the sticky cell matches the hover color */
+#abgabetable .tabulator-row:hover .tabulator-cell.sticky-col {
+	background-color: #ccc; /* Match your existing hover color */
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 7c6dec714..67a5b1727 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -57,6 +57,7 @@ export const AbgabetoolAssistenz = {
 	},
 	data() {
 		return {
+			tableData: null,
 			studiensemesterOptions: null,
 			allSem: null,
 			curSem: null,
@@ -113,18 +114,71 @@ export const AbgabetoolAssistenz = {
 				renderVerticalBuffer: 2000,
 				columns: [
 					{
-						field: 'rowSelection',
-						formatter: 'rowSelection',
-						titleFormatter: 'rowSelection',
-						titleFormatterParams: {
-							rowRange: "active" // Only toggle the values of the active filtered rows
+						formatter: function (cell, formatterParams, onRendered) {
+							// create the built-in checkbox
+							let checkbox = document.createElement("input");
+							checkbox.type = "checkbox";
+
+							// Handle select manually
+							checkbox.addEventListener("click", (e) => {
+								e.stopPropagation();
+
+								// call our function
+								if (formatterParams && formatterParams.handleClick) {
+									formatterParams.handleClick(e, cell);
+								}
+							});
+
+							cell.getRow().getData().checkbox = checkbox
+
+							let wrapper = document.createElement("div");
+							wrapper.style.cssText = "display: flex; justify-content: center; align-items: center; height: 100%; width: 100%;";
+
+							wrapper.appendChild(checkbox);
+
+							return wrapper;
 						},
-						hozAlign:"center",
+						titleFormatter: function (cell, formatterParams, onRendered) {
+							// create the built-in checkbox
+							let checkbox = document.createElement("input");
+							checkbox.type = "checkbox";
+
+							// Handle "select all" manually
+							checkbox.addEventListener("click", (e) => {
+								e.stopPropagation();
+
+								// call our function
+								if (formatterParams && formatterParams.handleClick) {
+									formatterParams.handleClick(e, cell);
+								}
+							});
+
+							return checkbox;
+						},
+						hozAlign: "center",
 						headerSort: false,
-						frozen: true,
-						width: 40
+						formatterParams: {
+							handleClick: this.selectHandler
+						},
+						titleFormatterParams: {
+							handleClick: this.selectAllHandler
+						},
+						width: 50,
+						cssClass: 'sticky-col'
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150},
+				// {
+					// 	field: 'rowSelection',
+					// 	formatter: 'rowSelection',
+					// 	titleFormatter: 'rowSelection',
+					// 	titleFormatterParams: {
+					// 		rowRange: "active" // Only toggle the values of the active filtered rows
+					// 	},
+					// 	hozAlign:"center",
+					// 	headerSort: false,
+					// 	frozen: true,
+					// 	width: 40
+					// },
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -150,12 +204,51 @@ export const AbgabetoolAssistenz = {
 			{
 				event: "rowSelectionChanged",
 				handler: async(data) => {
+					this.selectedData.filter(sd => !data.includes(sd)).forEach(fsd => {
+						if(fsd.checkbox) fsd.checkbox.checked = false
+					})
+
+					data.forEach(d => {
+						if(d.checkbox) d.checkbox.checked = true
+					})
+
 					this.selectedData = data
 				}
 			}
 			]};
 	},
 	methods: {
+		selectHandler(e, cell) {
+			const row = cell.getRow();
+
+			if(row.isSelected()){
+				row.deselect();
+			} else {
+				row.select();
+			}
+
+			// stop built-in handler
+			e.stopPropagation();
+			return false;
+		},
+		selectAllHandler(e, cell) {
+			const table = cell.getTable();
+			const rows = table.getRows();
+
+			// custom select all logic
+			const allowed = rows.filter(r => r.getData().selectable);
+			const selected = allowed.every(r => r.isSelected());
+
+			if(selected){
+				allowed.forEach(r => r.deselect());
+			} else {
+				allowed.forEach(r => r.select());
+			}
+
+			// stop built-in handler
+			e.stopPropagation();
+			return false;
+		},
 		checkQualityGateStatus(projekt) {
 			// TODO: might refine the representation of these states and maybe refactor code a little
 			const qgate1Termine = []
@@ -534,7 +627,7 @@ export const AbgabetoolAssistenz = {
 		mapProjekteToTableData(projekte) {
 			// const now = luxon.DateTime.now();
 			return projekte.map(projekt => {
-
+				
 				projekt.prevTermin = null;
 				projekt.nextTermin = null;
 
@@ -753,12 +846,11 @@ export const AbgabetoolAssistenz = {
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
-			const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+			this.tableData = this.mapProjekteToTableData(this.projektarbeiten)
 
 			await this.tableBuiltPromise
 			
-			// this.$refs.abgabeTable.tabulator.clearData()
-			this.$refs.abgabeTable.tabulator.setData(mappedData);
+			this.$refs.abgabeTable.tabulator.setData(this.tableData);
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.loading = true
@@ -865,8 +957,7 @@ export const AbgabetoolAssistenz = {
 		}).catch(e => {
 			this.loading = false
 		})
-
-
+		
 		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		this.$api.call(ApiAbgabe.getNoten()).then(res => {
@@ -1109,7 +1200,7 @@ export const AbgabetoolAssistenz = {
 			</template>
 		</BsOffcanvas>
 		
-		<div style="max-height:40vw;">
+		<div id="abgabetable" style="max-height:40vw;">
 			<div class="row">
 				<div class="col-auto">
 					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 0e24a496c..a934230ca 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -38,6 +38,7 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			tableData: null,
 			abgabetypenBetreuer: null,
 			detailIsFullscreen: false,
 			phrasenPromise: null,
@@ -79,17 +80,60 @@ export const AbgabetoolMitarbeiter = {
 				rowHeight: 80,
 				columns: [
 					{
-						formatter: 'rowSelection',
-						titleFormatter: 'rowSelection',
-						titleFormatterParams: {
-							rowRange: "active" // Only toggle the values of the active filtered rows
+						formatter: function (cell, formatterParams, onRendered) {
+							// create the built-in checkbox
+							if(!cell.getRow().getData().selectable) return 
+							let checkbox = document.createElement("input");
+							checkbox.type = "checkbox";
+							
+							// Handle select manually
+							checkbox.addEventListener("click", (e) => {
+								e.stopPropagation();
+
+								// call our function
+								if (formatterParams && formatterParams.handleClick) {
+									formatterParams.handleClick(e, cell);
+								}
+							});
+
+							cell.getRow().getData().checkbox = checkbox
+
+							let wrapper = document.createElement("div");
+							wrapper.style.cssText = "display: flex; justify-content: center; align-items: center; height: 100%; width: 100%;";
+
+							wrapper.appendChild(checkbox);
+
+							return wrapper;
 						},
-						hozAlign:"center",
+						titleFormatter: function (cell, formatterParams, onRendered) {
+							// create the built-in checkbox
+							let checkbox = document.createElement("input");
+							checkbox.type = "checkbox";
+
+							// Handle "select all" manually
+							checkbox.addEventListener("click", (e) => {
+								e.stopPropagation();
+
+								// call our function
+								if (formatterParams && formatterParams.handleClick) {
+									formatterParams.handleClick(e, cell);
+								}
+							});
+
+							return checkbox;
+						},
+						hozAlign: "center",
 						headerSort: false,
-						frozen: true,
-						width: 70
+						formatterParams: {
+							handleClick: this.selectHandler
+						},
+						titleFormatterParams: {
+							handleClick: this.selectAllHandler
+						},
+						width: 50,
+						cssClass: 'sticky-col'
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
@@ -122,12 +166,51 @@ export const AbgabetoolMitarbeiter = {
 			{
 				event: "rowSelectionChanged",
 				handler: async(data) => {
+					this.selectedData.filter(sd => !data.includes(sd)).forEach(fsd => {
+						if(fsd.checkbox) fsd.checkbox.checked = false
+					})
+					
+					data.forEach(d => {
+						if(d.checkbox) d.checkbox.checked = true
+					})
+					
 					this.selectedData = data
 				}
 			}
 			]};
 	},
 	methods: {
+		selectHandler(e, cell) {
+			const row = cell.getRow();
+
+			if(row.isSelected()) {
+				row.deselect();
+			} else {
+				row.select();
+			}
+
+			// stop built-in handler
+			e.stopPropagation();
+			return false;
+		},
+		selectAllHandler(e, cell) {
+			const table = cell.getTable();
+			const rows = table.getRows();
+
+			// custom select all logic
+			const allowed = rows.filter(r => r.getData().selectable);
+			const selected = allowed.every(r => r.isSelected());
+
+			if(selected) {
+				allowed.forEach(r => r.deselect());
+			} else {
+				allowed.forEach(r => r.select());
+			}
+
+			// stop built-in handler
+			e.stopPropagation();
+			return false;
+		},
 		handleToggleFullscreenDetail() {
 			this.detailIsFullscreen = !this.detailIsFullscreen
 		},
@@ -286,7 +369,9 @@ export const AbgabetoolMitarbeiter = {
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
-			const d = data[0]?.retval?.map(projekt => {
+			this.tableData = data[0]?.retval?.map(projekt => {
+
+				projekt.selectable = projekt.betreuerart_kurzbz !== 'Zweitbegutachter'
 
 				return {
 					...projekt,
@@ -305,7 +390,7 @@ export const AbgabetoolMitarbeiter = {
 			})
 			
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-			this.$refs.abgabeTable.tabulator.setData(d);
+			this.$refs.abgabeTable.tabulator.setData(this.tableData);
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.$api.call(ApiAbgabe.getMitarbeiterProjektarbeiten(all))
@@ -477,7 +562,7 @@ export const AbgabetoolMitarbeiter = {
 		</bs-modal>	
 		
 		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
-		<div style="max-height:40vw;">
+		<div id="abgabetable" style="max-height:40vw;">
 		
 			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 			<hr>

From 5536408065ce8c36771e0ab17efead1ea59c1efd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 13:35:50 +0100
Subject: [PATCH 1066/1357] add property stg_kz to json of org_forms to prevent
 clearing tabulator when changing form a node with stg_kz property set to an
 orgform_node

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

diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index eb25a548b..32ef30a45 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -215,6 +215,7 @@ class Verband extends FHCAPI_Controller
 					$this->StudienordnungModel->addDistinct();
 					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
+					$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
 
 					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
 

From 3f891179aa477e83ceb47a57fe0857c894c20954 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 15:12:49 +0100
Subject: [PATCH 1067/1357] move check for critical changes bis from frontend
 to backend

---
 .../api/frontend/v1/stv/Status.php            | 23 +++++++--
 public/js/api/factory/stv/status.js           |  6 +--
 .../Details/Status/Modal.js                   | 49 +------------------
 3 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 0f7960f40..a99db9ac8 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1079,6 +1079,24 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess(true);
 	}
 
+	protected function checkForCriticalChangesBis($oldstatus)
+	{
+		$changedFields = array();
+		$allowedFields = array('anmerkung', 'statusgrund_id');
+		$oldstatus_array = get_object_vars($oldstatus);
+		foreach($oldstatus_array as $key => $oldValue)
+		{
+			$newValue = $this->input->post($key);
+			if( $newValue !== $oldValue )
+			{
+				$changedFields[] = $key;
+			}
+		}
+		$criticalFieldsChanged = array_diff($changedFields, $allowedFields);
+		$hasCriticalChangesBis = count($criticalFieldsChanged) > 0 ? true : false;
+		return $hasCriticalChangesBis;
+	}
+
 	/**
 	 * Updates a status entry
 	 *
@@ -1089,7 +1107,7 @@ class Status extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester, $hasCriticalChangesBis=false)
+	public function updateStatus($prestudent_id, $status_kurzbz, $key_studiensemester_kurzbz, $key_ausbildungssemester)
 	{
 		$result = $this->PrestudentstatusModel->load([
 			$key_ausbildungssemester,
@@ -1103,6 +1121,7 @@ class Status extends FHCAPI_Controller
 
 		$oldstatus = current($oldstatus);
 
+		$hasCriticalChangesBis = $this->checkForCriticalChangesBis($oldstatus);
 
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
@@ -1131,8 +1150,6 @@ class Status extends FHCAPI_Controller
 				]
 			);
 
-		$hasCriticalChangesBis = filter_var($hasCriticalChangesBis, FILTER_VALIDATE_BOOLEAN);
-
 		$this->form_validation->set_rules(
 			'datum',
 			$this->p->t('global', 'datum'),
diff --git a/public/js/api/factory/stv/status.js b/public/js/api/factory/stv/status.js
index 7910cb8c7..7c289dc22 100644
--- a/public/js/api/factory/stv/status.js
+++ b/public/js/api/factory/stv/status.js
@@ -39,8 +39,7 @@ export default {
 		status_kurzbz,
 		studiensemester_kurzbz,
 		ausbildungssemester
-	}, params, hasCriticalChangesBis) {
-		console.log("hasCriticalChangesBis " + hasCriticalChangesBis);
+	}, params) {
 		return {
 
 			method: 'post',
@@ -48,8 +47,7 @@ export default {
 				+ prestudent_id + '/'
 				+ status_kurzbz + '/'
 				+ studiensemester_kurzbz + '/'
-				+ ausbildungssemester + '/'
-				+ hasCriticalChangesBis,
+				+ ausbildungssemester,
 			params
 		};
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index f913ab7c6..3b282d230 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -64,9 +64,7 @@ export default{
 				'Unterbrecher',
 				'Diplomand',
 				'Incoming'
-			],
-			original: {},
-			hasCriticalChangesBis: false
+			]
 		};
 	},
 	computed: {
@@ -160,7 +158,7 @@ export default{
 		},
 		editStatus() {
 			this.$refs.form
-				.call(ApiStvStatus.updateStatus(this.statusId, this.formData, this.hasCriticalChangesBis))
+				.call(ApiStvStatus.updateStatus(this.statusId, this.formData))
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$reloadList();
@@ -182,49 +180,6 @@ export default{
 				.then(result => this.mischform = result.data.mischform);
 		}
 	},
-	watch: {
-		// watching all disabled fields
-		"formData.status_kurzbz"(newVal) {
-			if (newVal !== this.original.status_kurzbz) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-/*		"formData.studiensemester_kurzbz"(newVal) {
-			if (newVal !== this.original.studiensemester_kurzbz) {
-				this.hasCriticalChangesBis = true;
-			}
-		},*/
-		"formData.orgform_kurzbz"(newVal) {
-			if (newVal !== this.original.orgform_kurzbz) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-		"formData.datum"(newVal) {
-			if (newVal !== this.original.datum) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-		"formData.bestaetigtam"(newVal) {
-			if (newVal !== this.original.bestaetigtam) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-		"formData.bewerbung_abgeschicktamum"(newVal) {
-			if (newVal !== this.original.bestaetigtam) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-		"formData.studienplan_id"(newVal) {
-			if (newVal !== this.original.studienplan_id) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-		"formData.rt_stufe"(newVal) {
-			if (newVal !== this.original.rt_stufe) {
-				this.hasCriticalChangesBis = true;
-			}
-		},
-	},
 	created() {
 		this.$api
 			.call(ApiStvStatus.getStatusgruende())

From 718272e8a152a897eebeef33a58e340590bb09ac Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 15:13:53 +0100
Subject: [PATCH 1068/1357] remove empty line

---
 application/controllers/api/frontend/v1/stv/Status.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index a99db9ac8..dbd9e69b4 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -1132,7 +1132,6 @@ class Status extends FHCAPI_Controller
 		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester;
 		$datum = $this->input->post('datum') ?: $oldstatus->datum;
 
-
 		//Form Validation
 		$this->load->library('form_validation');
 

From 11ff26d8e7f9cf7ccee6625613370754bfaac5b6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 15:20:19 +0100
Subject: [PATCH 1069/1357] remove empty lines

---
 application/controllers/api/frontend/v1/stv/Status.php | 1 -
 public/js/api/factory/stv/status.js                    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index dbd9e69b4..09a9f18b1 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -206,7 +206,6 @@ class Status extends FHCAPI_Controller
 		$datum_string = date('c');
 		$datum = new DateTime($datum_string);
 
-
 		//Form Validation
 		$this->load->library('form_validation');
 
diff --git a/public/js/api/factory/stv/status.js b/public/js/api/factory/stv/status.js
index 7c289dc22..11e7f4fde 100644
--- a/public/js/api/factory/stv/status.js
+++ b/public/js/api/factory/stv/status.js
@@ -41,7 +41,6 @@ export default {
 		ausbildungssemester
 	}, params) {
 		return {
-
 			method: 'post',
 			url: 'api/frontend/v1/stv/status/updateStatus/'
 				+ prestudent_id + '/'

From 7de3c4a24e423fcdef9e6bdc787e28b1a32ae32f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 15:22:32 +0100
Subject: [PATCH 1070/1357] remove unnecessary line

---
 .../components/Stv/Studentenverwaltung/Details/Status/Modal.js   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 3b282d230..7507b0ebd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -136,7 +136,6 @@ export default{
 						this.statusNew = false;
 						this.formData = result.data;
 						this.originalDatum = new Date(result.data.datum);
-						this.original = { ...this.formData};
 						return prestudent;
 					})
 					.then(this.loadStudienplaeneAndSetPrestudent)

From cf7e9921b541a7dd0d9798bb4cd3e77f15c0c42f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 15 Dec 2025 16:11:46 +0100
Subject: [PATCH 1071/1357] change grades sort order

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

diff --git a/application/controllers/api/frontend/v1/stv/Projektarbeit.php b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
index db7d99752..8740ef3d6 100644
--- a/application/controllers/api/frontend/v1/stv/Projektarbeit.php
+++ b/application/controllers/api/frontend/v1/stv/Projektarbeit.php
@@ -280,6 +280,9 @@ class Projektarbeit extends FHCAPI_Controller
 	 */
 	public function getNoten()
 	{
+		$this->NoteModel->addOrder('notenwert', 'ASC');
+		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+
 		$result = $this->NoteModel->load();
 
 		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);

From e6ef234c8b0aa52c43c7dd257593a1391eaef4d0 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Mon, 15 Dec 2025 16:27:47 +0100
Subject: [PATCH 1072/1357] Added method getOrgformsByStg to
 Studiengang_model.php

Get OrgForms of given Studiengang and Studiensemester
---
 .../models/organisation/Studiengang_model.php | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 98d650e0c..893c7b2bd 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -835,4 +835,40 @@ class Studiengang_model extends DB_Model
 
 		return $this->execQuery($qry, [$studiengang_kz_arr, $studiensemester_kurzbz]);
 	}
+
+	/**
+	 * Get OrgForms of given Studiengang and Studiensemester.
+	 *
+	 * @param $studiengang_kz
+	 * @param $studiensemester_kurzbz
+	 * @return array|stdClass|null
+	 */
+	public function getOrgformsByStg($studiengang_kz, $studiensemester_kurzbz)
+	{
+		$qry = '
+			SELECT
+				stpl.orgform_kurzbz
+			FROM
+				public.tbl_studiengang stg
+				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
+				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
+			WHERE
+				stg.studiengang_kz = ?
+				AND stg.aktiv = TRUE
+				AND stplsem.studiensemester_kurzbz = ?
+			GROUP BY
+				stpl.orgform_kurzbz
+			ORDER BY
+				CASE stpl.orgform_kurzbz
+					WHEN \'VZ\' THEN 1
+					WHEN \'BB\' THEN 2
+					WHEN \'DUA\' THEN 3
+					ELSE 4
+				END,
+				stpl.orgform_kurzbz; 
+		';
+
+		return $this->execQuery($qry, [$studiengang_kz, $studiensemester_kurzbz]);
+	}
 }

From db048e876c901f23a8e770899066fdb7bcd3329c Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Mon, 15 Dec 2025 16:48:07 +0100
Subject: [PATCH 1073/1357] Renamed getEntitledStgs to getByStgs

Permissions check happens in application controller.
---
 application/models/organisation/Studiengang_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 893c7b2bd..942b8c47e 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -808,9 +808,9 @@ class Studiengang_model extends DB_Model
 	 *
 	 * @param $studiengang_kz_arr
 	 * @param $studiensemester_kurzbz
-	 * @return array|stdClass|null
+	 * @return array|stdClass|null	Returns one row per Studiengang. Not considering the Orgforms.
 	 */
-	public function getEntitledStgs($studiengang_kz_arr, $studiensemester_kurzbz)
+	public function getByStgs($studiengang_kz_arr, $studiensemester_kurzbz)
 	{
 		if (is_numeric($studiengang_kz_arr))
 		{

From 4f5e49a93c99cea92dd3b3bb7449d49e732a8091 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Dec 2025 15:27:31 +0100
Subject: [PATCH 1074/1357] send to all private email addresses marked as
 zustellung

---
 application/config/studierendenantrag.php  |  2 +-
 application/controllers/jobs/AntragJob.php | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index e0ef5486b..4e25aef28 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -57,7 +57,7 @@ $config['wiederholung_note_nicht_zugelassen'] = 20;
  * @var string	        A string formated as PHP DateTime modifier
  * @see https://www.php.net/manual/de/datetime.modify.php
  */
-$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+166 days';
+$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
 
 /**
  * The Job will sent a request to everyone who faild the 3rd committee exam
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 9441a349b..430b07cb6 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -265,22 +265,26 @@ class AntragJob extends JOB_Controller
 			$person_id = $dataPrestudent->person_id;
 
 			$this->KontaktModel->addSelect('kontakt');
-			$this->KontaktModel->addLimit(1);
 
 			$result = $this->KontaktModel->loadWhere([
 				'person_id'=> $person_id,
 				'zustellung' => true,
 				'kontakttyp' => 'email'
 			]);
-			if (hasData($result)) {
-				$dataKontakt = current(getData($result));
-				$email_student_privat = $dataKontakt->kontakt;
+
+			$email_student_privat = null;
+			$dataKontakt = getData($result);
+			if ($dataKontakt) {
+				$stud_private_zustell_emails = array_map(function($kontakt) {
+					return $kontakt->kontakt;
+				}, $dataKontakt);
+				$email_student_privat = implode(', ', $stud_private_zustell_emails);
 			}
 
 			$email_student_FH = $this->StudentModel->getEmailFH($this->StudentModel->getUID($antrag->prestudent_id));
 
 			//studiensemester
-			$result = $this->StudiensemesterModel->getByDate($datum->format('d.m.Y'));
+			$result = $this->StudiensemesterModel->getByDate($datum->format('Y-m-d'));
 			if (hasData($result)) {
 				$dataSem = current(getData($result));
 			}

From ddfcef9ad724e7a2929ae5610d247d5b50f1d2dd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 16 Dec 2025 15:52:44 +0100
Subject: [PATCH 1075/1357] log Error if mail can not be sent, only change
 status if both reminder emails were successfully sent

---
 application/controllers/jobs/AntragJob.php | 33 ++++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 430b07cb6..8dc4870ea 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -314,18 +314,17 @@ class AntragJob extends JOB_Controller
 			$data['studSemShort'] = $studsemShort;
 
 			// NOTE(chris): Sancho mail Assistant
-			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
+			$sancho_assistant_sent = sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg');
+			if($sancho_assistant_sent)
 			{
 				$count++;
-				$this->StudierendenantragstatusModel->insert([
-					'studierendenantrag_id' => $antrag->studierendenantrag_id,
-					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
-					'insertvon' => 'AntragJob'
-				]);
 			}
-
+			else
+			{
+				$this->logError('Error: failed to send Assistant Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
+			}
 			//Mail to Student
-			if(sendSanchoMail(
+			$sancho_student_sent = sendSanchoMail(
 				'Sancho_Mail_Antrag_U_Remind_Stud',
 				$data,
 				$email_student_FH,
@@ -333,9 +332,25 @@ class AntragJob extends JOB_Controller
 				'',
 				'',
 				'',
-				$email_student_privat)) {
+				$email_student_privat);
+
+			if($sancho_student_sent)
+			{
 				$countReminderStudent++;
 			}
+			else
+			{
+				$this->logError('Error: failed to send Student Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
+			}
+
+			if($sancho_assistant_sent && $sancho_student_sent)
+			{
+				$this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
+					'insertvon' => 'AntragJob'
+				]);
+			}
 		}
 		$this->logInfo($count . ' Reminder an Assistenz und ' . $countReminderStudent . ' Reminder an Student gesendet  - Ende Job sendReminderWiedereinstieg');
 	}

From 6b0526fb953e0db165e972a73046c78a2643796e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 17 Dec 2025 13:22:39 +0100
Subject: [PATCH 1076/1357] add tabulator persistence config

---
 public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index 222290e98..9798ba7a4 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -59,6 +59,10 @@ export default {
 		},
 		profilUpdateOptions: function () {
 			return {
+				persistence: {
+					columns: ["width", "visible", "frozen"],
+				},
+				persistenceID: 'cis-profilupdate-2025121702',
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: (url, config, params) => {
 					return this.$api.call(ApiProfilUpdate.getProfilUpdateWithPermission(params.filter));

From f9ac824cc0e29bdd23df0e1449f368bf96111eb1 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 17 Dec 2025 14:33:04 +0100
Subject: [PATCH 1077/1357] Added LV-Evaluierung NEU link button to CIS LV Menu

---
 config/global.config-default.inc.php |   6 +++++-
 include/tw/cis_menu_lv.inc.php       |  21 +++++++++++++++++++++
 skin/images/button_lvevaluierung.png | Bin 0 -> 3021 bytes
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 skin/images/button_lvevaluierung.png

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index f24a302cc..1e20ce506 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -27,12 +27,16 @@ define('CIS_LEHRVERANSTALTUNG_SEMESTERINFO_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN',false);
 define('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN', true);
 define('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN', true);
-define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN', true);
+define('CIS_EVALUIERUNG_ANZEIGEN_STG', true);
+define('CIS_LEHRVERANSTALTUNG_EVALUIERUNG_ANZEIGEN', true);
 
 // Wenn gesetzt, werden die Digitale Anwesenheit-Icons nur fuer diese Studiengaenge angezeigt, sonst für alle
 // define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG', serialize(array('257')));
 // define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA', serialize(array('39455','39481','39480','41906','41905','41904','39459','39512','39454','39482','42230','42231','39458','41921','41922','39457','42896')));
 
+// Wenn gesetzt, werden die LV-Evaluierung-Icons nur für diese Studiengaenge angezeigt, sonst alle
+define('CIS_EVALUIERUNG_ANZEIGEN_STG', serialize((array('335', '585', '914', '298'))));	// BIW, MAI, BUB, MIO
+
 // Im CIS Menue Links bei Modulen anzeigen wenn Lehrauftrag
 define('CIS_LEHRVERANSTALTUNG_MODULE_LINK',true);
 
diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 29ba54724..c6dad40e3 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -500,6 +500,27 @@ if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTU
 	);
 }
 
+// LV-Evaluierung NEU
+if(defined('CIS_EVALUIERUNG_ANZEIGEN_STG')
+	&& CIS_EVALUIERUNG_ANZEIGEN_STG
+	&& $angemeldet
+	&& (!defined('CIS_EVALUIERUNG_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_EVALUIERUNG_ANZEIGEN_STG)))
+	&& ($rechte->isBerechtigt('extension/lvevaluierung_init')))
+{
+	$text='(Pilotphase)';
+
+	$link= APP_ROOT. 'index.ci.php/extensions/FHC-Core-Evaluierung/Initiierung?lehrveranstaltung_id='. urlencode($lv->lehrveranstaltung_id).'&studiensemester_kurzbz='.urlencode($angezeigtes_stsem);
+
+	$menu[]=array
+	(
+		'id'=>'extension_lvevaluierung_menu_initiierung',
+		'position'=>'140',
+		'name'=>$p->t('lvevaluierung/lvevaluierung'). ' - '. strtoupper($p->t('global/neu')),
+		'icon'=>'../../../skin/images/button_lvevaluierung.png',
+		'link'=> $link,
+		'text'=>$text
+	);
+}
 
 //************* Menuepunkte anzeigen ****************
 
diff --git a/skin/images/button_lvevaluierung.png b/skin/images/button_lvevaluierung.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4175601acc735a81c267fc263cbde80e44a5542
GIT binary patch
literal 3021
zcmV;;3o`VHP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700006VoOIv0FeNe
z0GVZIT73Wj010qNS#tmYnaThFnaTm<k)$F3000McNliru-~km1BrDMLq7MK704`}%
zSad^gZEa<4bN~PV002XBWnpw>WFTUBAWdOzW^!d@AWLa(WNaXJX>@2HM@dakVIipd
z000XhNkl<ZSi{Yjd2n3SmBxSfb*o#ldQnT=0&B4?OER`&$k?(?Y%n+wzza)?VmxT<
zxR{X1P!O?IQZtpQN>!*yRsJEwK*ck`m=G$9<B&MmfNj7FgM(K|UP3H+k!|fuOKP=R
zy}f(y{PDV<)Rsu_Ox1)_^}1ibckj91J?Gx<e78kBk#GawMbjXJ2xv5)14{rubGcj%
zA~rVmyw>_zK8GfR*d`()(LvAw5Ts2LQ<{K4AOMXJBHJ1P*3-;=#));G{Sf25v-fs?
zp|PJ#^nu8{2c;CIDaj7&R7wVv)<~%s9vQ{qFvbTF*$ad)EPy%BGWQ6CVSO70XbcPk
z(3UU5$o4fd?J|800|P)97y|3J5R61eGl2r9R0^duDbvI-#Q2N=tu=jpeYAIUFfb4%
zl}h1qxd;V=%$zxc>DOO}!{M+aG1)X)Lq|s^=PzEQr?;16GKJga;`-~a<Aymk%&4fa
zf|408y91<D8GurultO17WG$6SvH!q93zXZ<+&MM)y*{F&QO>rWr=znIr_;&mRd?el
zm^LN6WHQN)ox3bh`T3K4v|YMPp3}+0>mI`ADYW}3rI1ou!Rqem)k<qjDM_0WAq44k
zn)g50hs)*S{xz#84F$*7VrHiO17UXU-b*YN<GwYkDfATDDF%adI?0<mcH(m7asQgt
zgn}iLd<=vK+4b%oVzC$->eu1*dNG7xI1(YANCIHU3|g(U-ErUk1Gro+9^JT};y_@^
z=md)V{L_YdJcWh4y?c)}V=+GX@85bGS6&{EZrng1P&B2FBEO$UHq_(sc=*M(-`Y`A
zN+YF2N{Jz*BAaG_{{DW_=`;_lUB!iqZEW7Ml|Aq8%W-_*zdvI0me=@mODp%UU5%8I
zuC8wTeOGrksZ@#w?p@8rwo7b&Wh?LPJDB6+!$W^$^OmigZ9UKZYgZwq<kICU6H;tl
zhEx)%BuZNVJ32aXyWNC>K~A3e697%8PTLdET64Vdr1kvdX-bL%_`Du2Tx_!kzu0yO
zcYZ#>k`kIvp8?=RQ!`qRXX)69=8TV16bAzMeO^8}+hPIK8mT0vk{HsIn5IN#QXC!(
zb3<(nLI{@BEh13lXT|a_VOWa`Aq2OtSWX~N#LY_<12Avy4fOT*+W>p}`j|JT*7C7v
zA;p0rZo74vy#{lA)B!Mm-dwu6dq4<cV{r?UDJ`0jQsT&TPNmZLeLetYR#xz}`hS?T
zc9zyHVrku?@wMdhlTN2|cCXLt1z<*H1sfh-H_6A6MGIN7XrcYv@AVOn$2s428EKk!
z#tbPX78hC%^78T+8I1y9nkK#d{g|ei<6KHfU;ls&Y9t!P>2%ufT`m{V*yuHtwIjz*
z(0u9)DuYETg());G)-xzu(-IG)^iuQZTT{isT6Pg>Nk9K?P_YOXWPy?I=k4u<1N1V
z$k%W>oqW>LN@*x$zb_4iXlXsqtzWvCk!X~r=2M?iY@uq_O!@|fXg+<~9z!aPY07LR
z$!-!W0+kiz^z`&FFc2mb3bJ6{T;6(j4`01^4YOy>q`jk)KkRyk+S#-5`Fw;2hloTX
z%%3;c9=E!xiuR5U!r?)bR$S@qoQTP`zP<qrXC7{si;j*i*4MAdY!Zc38Gy=EC}~{)
zp->2i!@<todwFC-J@<U&4k|0kIrz~bcI<oyzu(7~Z(qTJ`SZ|P^Uj{V2qCB_FS7?O
zE1Qnf>9l;Tf0&I|t>e~n7Z^(<$uG!92*H27@~Snl*;UpqSL1lZ(WaByG))Tf^YLXi
zM>3h<{SWrzDJ<l^HTMuKDVda=!NDQk-o2NhNQAYkSK;${5kg><bAv=8&YL^l!t3#H
z-<o?UDK4g`x0f@2Zed1cB^nqW9%kG2H|gx^=9#CyMWDzc^w`)K$)r_D#K*@QwP{MG
z6%<fZ<hN-c9*?vCz(J&x_<UaG-Y|zEpO2A|C}&&GF&v2?gkaU(cjffU0yGRkEH=iD
zox6y~<6LR)WXa+>0)ZkTkr7UuXr!~d8v#81<hOFFO>}gWL?UU)y^oF@)21mYESzSS
zwJcw0t?B9Q<;vwN41~j&ris((Bv?{RRaF(`Wo6{$IdeEN3s4A)a3hfsJ~?}qrsh+$
zw6u~oO`Hw~b82f?xbW|&o?Vs0005DZ5#sTL<@4ajM|C=##_RDAEGf<bI7tsq)QJ;x
zT`oXDJf0w)OxTj?T5V`JLTqd-vq_}1<d#zZ8%d4;q$w>mlunaOr$Or+<#Mf-<wCU1
z(2SHwJsIFc!P?W)LnIPKX^qe4Wx*HbQ&~}A6Z}LPd1dSCbai*5q=e4`G&3Qe-^a60
zHCQwwvpi^8M6D($8U!Tb34XNcWn!@yUayCxix*Q<6Jj_r!toQ09Qxy7+%6YSH9Uc5
zg4oQenVW7}K-J8dwm|r6nds{3=J3&DRs`h)qE<?xvSh6kT5A%C1kb<lA_WBnG(7$o
zp-?c#;q5DKB^(a(%U^Hj`5(W?vrjkR^?1fpBqg(F&EktU-T0Z)S~zXmI6!S-(&K_v
z*@9Im#gAY52?YfO7B_v0*!27TG(7PbCB?<Ou<2zxB@>s&U$gf1cE0!h{~(!6q9(N0
z(mKQ`sVuQz%5nA3-rm93*ccl()N`@z63_kMhrGLcZ;s>r2S4PwAN-KBEv>AtUx#U$
zv|YM<O&cMVO7Y6p*U8Jv!|itGiV>|arF8^0l+tLW?HQjs^C!Gs55ZuNqsNW|@bQtO
zxd0D*2*9C39}@@!C@l@q)O_-q0JgNW0`S;BKRV^+)Jmh2&d9Bd<N`Q%{ya<SED^cl
zmgQ8GmvQ%3?#yv;@7mQ=l$UYG9V;z;xVVm%*4EGdzeXa-_TTLw6bcdyPA;QLTDw?T
za?1jjjo?UR#9nt573F;M8(*I+SQpo^baCB;15^>IRQfXm-22}90Q}20zCI;iT586^
z<h0Q$g#bKW50OYDr^E1Ygu_RU5)KbiTwKJ`rAsI&F3u@USC^}-?c0BV%U9ajxZxjh
zI2=TyQI0n@aqBJ1aJgKcO4L$Hw4RV+r4$ILsjlXDW0T$Z@|7$6XwyqXM@Olyp3PW1
z!KRmf!nyMo>^8?vG%}~QX3D{;s%Fu4=`y?C*^N?)%|G1&z{=ZJ{Dn%QZA|u=#M<V9
zFW$I-#-?V%;V@pGk5^y&IS)Pf05{z@&S_tmKaV$l@hiUjuiqw-NYLHg!yPMcpBmt-
zS=@8io$Pt<16o>I8I8r*xW4{Vqi3gBW_VC#BABhkGiFrccDeZFw(SUD-9ryDr?&R0
zL1(h=?;phJbh2&xn>k{0D!XO*GL|p9nbBCxj_O~md}@4?*hH-|MD1`mc&g!X1_y`u
z>6X_hFDoNIKR?HT+wG>Zyqv8+`?)PPuU>;!FaA|`-^E>bewk;Ud;*8VF=e^SO|gZ`
zX;F+sPY??pkB4WUZs3JYFZ05SFLV8Mr7T%oM^TZVNF<sgHlKNNTnSGcth1|&X$1v2
z6{57Xl)nA}`uYbZwQq0lm;g{_&LkSA%IN=W1heM#c=-2!`wkb|F45TB%<et!<%rFd
zD{q@pYyy-7OE`Sw7>AD>yC(9^9yyfKD5=nvSg=k|Ly=(&!^n|O4u^x<nrdoms;_CF
zhQ}ZKzx?gXSUf&{s!ONMZY9<9@W3GZ4tzLiz5Rb%GMQp<Xb2$$N-LaBr(^S2+<Xop
z7#JG*eEfT^t&cz;@V3xei_NdT{>I?Y@cOIQ;or)fPJ<%9|3Ay8PjC1ie)8{MzPH=I
P00000NkvXXu0mjfB`(wT

literal 0
HcmV?d00001


From 4dd4d8aaa50c81f946486d1d606964b606891467 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 17 Dec 2025 14:35:24 +0100
Subject: [PATCH 1078/1357] Removed filtering aktiv studienganege from method
 to get Studiengaenge by Stgs

otherwise when switching to former semester (which will have inactive studiengaenge) it will not appear
---
 application/models/organisation/Studiengang_model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 942b8c47e..2b235aeb8 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -827,7 +827,6 @@ class Studiengang_model extends DB_Model
 				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
 			WHERE
 				stg.studiengang_kz IN ?
-				AND stg.aktiv = TRUE
 				AND stplsem.studiensemester_kurzbz = ?
 			ORDER BY
 				stg.kurzbzlang

From 0616236e00d0f788756e62519834f23154c124ee Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 18 Dec 2025 12:48:08 +0100
Subject: [PATCH 1079/1357] =?UTF-8?q?bugfix:=20ZGV=20=C3=9Cbernahme=20bei?=
 =?UTF-8?q?=20Interessentenanlage,=20bestehende=20ZGVs=20die=20null=20sind?=
 =?UTF-8?q?=20ausfiltern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/PrestudentLib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 28879fb47..561b19fd4 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -68,7 +68,8 @@ class PrestudentLib
 		$this->_ci->PrestudentModel->addOrder('zgv_code', 'DESC');
 		$this->_ci->PrestudentModel->addLimit(1);
 		$result = $this->_ci->PrestudentModel->loadWhere([
-			'person_id' => $person_id
+			'person_id' => $person_id,
+			'zgv_code IS NOT NULL' => null
 		]);
 
 		if (isError($result)) return $result;

From 67b03dd29f781b5ddc4c7e7cb0358fd78cffe96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 18 Dec 2025 12:55:08 +0100
Subject: [PATCH 1080/1357] ReAdded Lost Phrases

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 676bb4b94..d08a72046 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1834,6 +1834,66 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'logout',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Logout',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Logout',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'settings',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einstellungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Settings',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'settings_saved',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einstellungen gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Settings saved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -2581,6 +2641,46 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'email_private',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EMail (Privat)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'email (private)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'email_intern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EMail (Intern)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'email (intern)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -3163,6 +3263,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'orgform',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'OrgForm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'orgform',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3203,6 +3323,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'grp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Grp.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'grp.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3543,6 +3683,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sem.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sem.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -3825,6 +3985,66 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'studiengang_kz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiengang KZ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study program no',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'verb',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verb.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'assoc.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'dual_short',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dual',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'dual',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//**********************	INFOCENTER/infocenter
 	array(
 		'app' => 'infocenter',
@@ -6460,6 +6680,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'status_bestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status Bestätigung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -51953,6 +52193,26 @@ and represent the current state of research on the topic. The prescribed citatio
 	// FHC-4 Finetuning END
 
 	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'submit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'suchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'search',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From 47d4b2e2d4de240dd641498e2625b0424857aea8 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 18 Dec 2025 13:20:08 +0100
Subject: [PATCH 1081/1357] Change var_dump_to_error_log to show the referring
 script -> tail -f /var/log/apache2/error.log | grep <user> can catch it

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

diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index b13d9d44d..55bc29b23 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -91,7 +91,7 @@ function var_dump_to_error_log($parameter)
 	var_dump($parameter); // KEEP IT!!!
 	$ob_get_contents = ob_get_contents();
 	ob_end_clean();
-	error_log(str_replace("\n", '', $ob_get_contents)); // KEEP IT!!!
+	error_log(str_replace("\n", '', $ob_get_contents) . ', referer: ' . "http".(!empty($_SERVER['HTTPS'])?"s":"")."://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']); // KEEP IT!!!
 }
 
 /**

From 02153e469f9239696520ec0079a9d1085d0ed7c5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 Dec 2025 11:39:31 +0100
Subject: [PATCH 1082/1357] Dashboard Admin Cleanup - refactoring Api: FHC-API
 controller for Edit/Update, widgets and presets - delete dashboard with
 Prompt - phrases

---
 .../frontend/v1/dashboard/DashboardAdmin.php  | 294 ++++++++++++++++++
 .../views/dashboard/dashboard_demo_admin.php  |   6 +-
 .../api/factory/dashboard/dashboardAdmin.js   |  85 +++++
 ...shboardAdmin.js => DashboardAdmin_DEPR.js} |   0
 public/js/components/Dashboard/Admin.js       |  83 +++--
 public/js/components/Dashboard/Admin/Edit.js  |   4 +-
 .../js/components/Dashboard/Admin/Presets.js  | 157 +++++-----
 .../js/components/Dashboard/Admin/Widgets.js  |  34 +-
 public/js/components/Dashboard/Section.js     |   2 +-
 system/phrasesupdate.php                      | 121 +++++++
 10 files changed, 664 insertions(+), 122 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
 create mode 100644 public/js/api/factory/dashboard/dashboardAdmin.js
 rename public/js/apps/{DashboardAdmin.js => DashboardAdmin_DEPR.js} (100%)

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
new file mode 100644
index 000000000..5e5ba4d40
--- /dev/null
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -0,0 +1,294 @@
+<?php
+/**
+ * Copyright (C) 2024 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class DashboardAdmin extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllDashboards'				=> 'dashboard/admin:r',
+			'createDashboard'				=> 'dashboard/admin:rw',
+			'updateDashboard'				=> 'dashboard/admin:rw',
+			'deleteDashboard'				=> 'dashboard/admin:rw',
+			'loadWidget'					=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+			'getAllWidgets'					=> 'dashboard/admin:r',
+			'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+			'setWidgetAllowed'				=> 'dashboard/admin:rw',
+
+			'index'							=> 'dashboard/benutzer:r',
+			'dummy'							=> 'dashboard/benutzer:r',
+			'genWidgetId'					=> 'dashboard/benutzer:rw',
+			'addWidgetsToPreset'			=> 'dashboard/admin:rw',
+			'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
+			'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
+			'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
+			'funktionen'					=> 'dashboard/admin:r',
+			'preset'						=> 'dashboard/admin:r',
+			'presetBatch'					=> 'dashboard/admin:r'
+		]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+
+		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
+
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+
+	public function getAllDashboards()
+	{
+		$result = $this->DashboardModel->load();
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result);
+	}
+
+	public function createDashboard()
+	{
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		$result = $this->DashboardModel->insert(
+			[
+				'dashboard_kurzbz' => $dashboard_kurzbz
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function updateDashboard()
+	{
+		$dashboard_id = $this->input->post('dashboard_id');
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		$beschreibung = $this->input->post('beschreibung');
+		if(!$dashboard_id)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->DashboardModel->update(
+			[
+			'dashboard_id' => $dashboard_id,
+			],
+			[
+				'dashboard_kurzbz' => $dashboard_kurzbz,
+				'beschreibung' => $beschreibung,
+			]
+		);
+
+		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deleteDashboard()
+	{
+		$dashboard_id = $this->input->post('dashboard_id');
+		if(!$dashboard_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//delete all presets
+		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+		$resultPresets = $this->DashboardPresetModel->delete(
+			array('dashboard_id' => $dashboard_id)
+		);
+		if ($resultPresets === false)
+		{
+			return $this->terminateWithError($resultPresets, self::ERROR_TYPE_GENERAL);
+		}
+
+		//delete all widgets
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+
+		$resultWidgets = $this->DashboardWidgetModel->delete(
+			array('dashboard_id' => $dashboard_id)
+		);
+		if ($resultWidgets === false)
+		{
+			return $this->terminateWithError($resultWidgets, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->DashboardModel->delete(
+			array('dashboard_id' => $dashboard_id)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getAllWidgets()
+	{
+		$dashboard_id = $this->input->get('dashboard_id');
+		if(!$dashboard_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
+		}
+		//$this->terminateWithError($dashboard_id);
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
+
+		if (isError($result))
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function setWidgetAllowed()
+	{
+		$dashboard_id = $this->input->post('dashboard_id');
+		$widget_id = $this->input->post('widget_id');
+		$action = $this->input->post('action');
+
+		if ($action == 'add')
+		{
+			$result = $this->DashboardWidgetModel->insert([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		}
+		elseif ($action == 'delete')
+		{
+			$result = $this->DashboardWidgetModel->delete([
+				'dashboard_id' => $dashboard_id,
+				'widget_id' => $widget_id
+			]);
+		}
+		else
+		{
+			$this->terminateWithError("action value invalid", self::ERROR_TYPE_GENERAL);
+		}
+		if (isError($result))
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	//Presets
+	public function funktionen()
+	{
+		$result = $this->FunktionModel->load();
+
+		if (isError($result))
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function addWidgetsToPreset()
+	{
+		$raw = $this->input->raw_input_stream;
+		$json = json_decode($raw);
+
+		$dashboard_kurzbz = $json->db;
+		$funktion_kurzbz = $json->funktion_kurzbz;
+		$widgets = $json->widgets;
+
+		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+
+		$preset_decoded = json_decode($preset->preset, true);
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $widgets);
+
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+
+		if (isError($result))
+			$this->terminateWithError($this->p->t('dashboard', 'error_savePreset'), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($preset_decoded);
+	}
+
+	public function removeWidgetFromPreset()
+	{
+		$raw = $this->input->raw_input_stream;
+		$json = json_decode($raw);
+
+		$dashboard_kurzbz = $json->db;
+		$funktion_kurzbz = $json->funktion_kurzbz;
+		$widgetid = $json->widgetid;
+
+		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if ($preset === null)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_presetAndFunctionNotFound', ['dashboard'=> $dashboard_kurzbz, 'funktion'=> $funktion_kurzbz]), self::ERROR_TYPE_GENERAL);
+		}
+
+		$preset_decoded = json_decode($preset->preset, true);
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Widget ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$preset->preset = json_encode($preset_decoded);
+		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
+		if (isError($result))
+		{
+			$this->terminateWithError($this->p->t('dashboard', 'error_deleteWidget'), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
+	}
+
+	public function presetBatch()
+	{
+		$db = $this->input->get('db');
+		$funktionen = $this->input->get('funktionen');
+		$result = [];
+
+		if($funktionen)
+		{
+			foreach ($funktionen as $funktion) {
+				$conf = $this->DashboardLib->getPreset($db, $funktion);
+				if ($conf) {
+					$preset = json_decode($conf->preset, true);
+					if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+						$result[$funktion] = [];
+					else {
+						$result[$funktion] = $preset[$funktion]['widgets'];
+					}
+				} else
+					$result[$funktion] = [];
+			}
+		}
+		else
+			$result = [];
+
+		return $this->terminateWithSuccess($result);
+	}
+}
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_demo_admin.php
index 0d92146a8..b57a2bfa0 100644
--- a/application/views/dashboard/dashboard_demo_admin.php
+++ b/application/views/dashboard/dashboard_demo_admin.php
@@ -8,9 +8,11 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'primevue3' => true,
+		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
 		'customCSSs' => [
-			'public/css/components/dashboard.css'
+			'public/css/components/dashboard.css',
+			'public/css/components/primevue.css',
 		],
 		'navigationcomponent' => true
 	)
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
new file mode 100644
index 000000000..a672460e4
--- /dev/null
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -0,0 +1,85 @@
+/*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+export default {
+	addDashboard(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/createDashboard',
+			params
+		};
+	},
+	updateDashboard(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/updateDashboard',
+			params
+		};
+	},
+	deleteDashboard(dashboard_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/deleteDashboard',
+			params: { dashboard_id }
+		};
+	},
+	getAllDashboards(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllDashboards'
+		};
+	},
+	getAllWidgets(dashboard_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllWidgets',
+			params: {dashboard_id}
+		};
+	},
+	setWidgetAllowed(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/setWidgetAllowed',
+			params
+		};
+	},
+	loadFunktionen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/funktionen'
+		};
+	},
+	addWidgetsToPreset(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/addWidgetsToPreset',
+			params
+		};
+	},
+	removeWidgetFromPreset(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/removeWidgetFromPreset',
+			params
+		};
+	},
+	presetBatch(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/presetBatch',
+			params
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin_DEPR.js
similarity index 100%
rename from public/js/apps/DashboardAdmin.js
rename to public/js/apps/DashboardAdmin_DEPR.js
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index f1a837880..b35346fb5 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -3,11 +3,14 @@ import DashboardAdminEdit from "./Admin/Edit.js";
 import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
+import ApiDashboardAdmin from "../../api/factory/dashboard/dashboardAdmin.js";
+
 export default {
+	name: 'DashboardAdmin',
 	components: {
 		DashboardAdminEdit,
 		DashboardAdminWidgets,
-		DashboardAdminPresets
+		DashboardAdminPresets,
 	},
 	provide() {
 		return {
@@ -22,9 +25,6 @@ export default {
 		};
 	},
 	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		},
 		dashboard() {
 			return this.dashboards.find(el => el.dashboard_id == this.current);
 		}
@@ -35,33 +35,49 @@ export default {
 			BsPrompt.popup('New Dashboard name').then(
 				name => {
 					_name = name;
-					return axios.post(this.apiurl + '/Dashboard/create', {
+					const params = {
 						dashboard_kurzbz: name
-					})
-				}
-			).then(res => {
-				let newDashboard = {
-					dashboard_id: res.data.retval,
-					dashboard_kurzbz: _name,
-					beschreibung: ''
-				};
-				this.dashboards.push(newDashboard);
-				this.current = newDashboard.dashboard_id;
-			}).catch(err => err !== undefined ? console.error('ERROR:', err) : 0);
+					};
+					return this.$api
+						.call(ApiDashboardAdmin.addDashboard(params))
+						.then(response =>{
+							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); //TODO(Manu) phrase here working
+
+							let newDashboard = {
+								dashboard_id: response.data,
+								dashboard_kurzbz: _name,
+								beschreibung: ''
+							};
+							this.dashboards.push(newDashboard);
+							this.current = newDashboard.dashboard_id;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+					});
 		},
 		dashboardUpdate(dashboard) {
-			// TODO(chris): Loading or message
-			axios.post(this.apiurl + '/Dashboard/update', dashboard).then(() => {
-				let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
-				old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
-				old.beschreibung = dashboard.beschreibung;
-			}).catch(err => console.error('ERROR:', err));
+			return this.$api
+				.call(ApiDashboardAdmin.updateDashboard(dashboard))
+				.then(response =>{
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); //TODO(Manu) phrase here working
+
+					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
+					old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
+					old.beschreibung = dashboard.beschreibung;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			axios.post(this.apiurl + '/Dashboard/delete', {dashboard_id}).then(() => {
-				this.current = -1;
-				this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-			}).catch(err => console.error('ERROR:', err));
+			return this.$api
+				.call(ApiDashboardAdmin.deleteDashboard(dashboard_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); //TODO(Manu) phrase here NOT always working
+
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.current = -1;
+					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
+				});
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
@@ -72,18 +88,23 @@ export default {
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Dashboard').then(res => {
-			this.dashboards = res.data.retval;
-		}).catch(err => console.error('ERROR:', err));
+		this.$api
+			.call(ApiDashboardAdmin.getAllDashboards())
+			.then(result => {
+				this.dashboards = result.data.retval;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `<div class="dashboard-admin">
+
 		<div class="input-group">
-			<label for="dashbaord-select" class="input-group-text">Dashboard:</label>
-			<select id="dashbaord-select" class="form-select" v-model="current">
+			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
+			<select id="dashboard-select" class="form-select" v-model="current">
 				<option v-for="dashboard in dashboards" :key="dashboard.dashboard_id" :value="dashboard.dashboard_id">{{dashboard.dashboard_kurzbz}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" @click="dashboardAdd"><i class="fa-solid fa-plus"></i></button>
 		</div>
+
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
index ec841a9ad..6b097d86c 100644
--- a/public/js/components/Dashboard/Admin/Edit.js
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -18,7 +18,9 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm.popup('Sure?').then(() => this.$emit('delete', this.dashboard_id)).catch();
+			//TODO(Manu) phrases here NOT always working
+			BsConfirm.popup(this.$p.t('alert', 'confirm_delete') + " " + this.$p.t('dashboard', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
 	template: `<div class="dashboard-admin-edit px-3">
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 8d6a07803..a63c28680 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -1,6 +1,7 @@
 import DashboardSection from "../Section.js";
 import DashboardWidgetPicker from "../Widget/Picker.js";
 import ObjectUtils from "../../../helpers/ObjectUtils.js";
+import ApiDashboardAdmin from "../../../api/factory/dashboard/dashboardAdmin.js";
 
 export default {
 	components: {
@@ -17,9 +18,6 @@ export default {
 		tmpLoading: ''
 	}),
 	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		},
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
@@ -36,26 +34,29 @@ export default {
 					if (section.name == section_name)
 						section.widgets.push(loading);
 				});
-				
-				axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+
+				const params = {
 					db: this.dashboard,
 					funktion_kurzbz: section_name,
 					widgets: [widget]
-				}).then(result => {
-					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
-					widget.id = newId;
-					widget.custom = 1;
-					this.sections.forEach(section => {
-						if (section.name == section_name) {
-							section.widgets.splice(section.widgets.indexOf(loading),1);
-							section.widgets.push(widget);
-						}
-					});
-				}).catch(error => {
-					console.error('ERROR: ', error);
-					alert('ERROR: ' + error.response.data.retval);
-				});
-			}).catch(() => {});
+				};
+
+				return this.$api
+					.call(ApiDashboardAdmin.addWidgetsToPreset(params))
+					.then(result => {
+						let newId = Object.keys(result.data[section_name].widgets).pop();
+						widget.id = newId;
+						widget.custom = 1;
+						this.sections.forEach(section => {
+							if (section.name == section_name) {
+								section.widgets.splice(section.widgets.indexOf(loading),1);
+								section.widgets.push(widget);
+							}
+						});
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			})
+			.catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
@@ -78,76 +79,90 @@ export default {
 				payload[k].widgetid = k;
 				delete payload[k].custom;
 			}
-			axios.post(this.apiurl + '/Config/addWidgetsToPreset', {
+
+			//TODO(manu) test
+			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgets: payload
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name) {
-						section.widgets.forEach((widget, i) => {
-							if (payload[widget.id]) {
-								payload[widget.id].id = widget.id;
-								payload[widget.id].index = widget.index;
-								section.widgets[i] = payload[widget.id];
-								section.widgets[i].custom = 1;
-							}
-						});
-					}
-				});
-			}).catch(error => {
-				// TODO(chris): revert placement on failure
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			};
+
+			return this.$api
+				.call(ApiDashboardAdmin.addWidgetsToPreset(params))
+				.then(result => {
+					this.sections.forEach(section => {
+						if (section.name == section_name) {
+							section.widgets.forEach((widget, i) => {
+								if (payload[widget.id]) {
+									payload[widget.id].id = widget.id;
+									payload[widget.id].index = widget.index;
+									section.widgets[i] = payload[widget.id];
+									section.widgets[i].custom = 1;
+								}
+							});
+						}
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		widgetRemove(section_name, id) {
-			axios.post(this.apiurl + '/Config/removeWidgetFromPreset', {
+			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
 				widgetid: id
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets = section.widgets.filter(widget => widget.id != id);
-				});
-			}).catch(error => {
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			};
+			return this.$api
+				.call(ApiDashboardAdmin.removeWidgetFromPreset(params))
+				.then(result => {
+					this.sections.forEach(section => {
+						if (section.name == section_name)
+							section.widgets = section.widgets.filter(widget => widget.id != id);
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		loadSections(evt) {
 			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
 			this.sections = [];
 			this.tmpLoading = funktionen.join('###');
-			axios.get(this.apiurl + '/Config/presetBatch', {params: {
+
+			const params = {
 				db: this.dashboard,
 				funktionen
-			}}).then(res => {
-				if (this.tmpLoading !== funktionen.join('###'))
-					return; // NOTE(chris): prevent race condition
-				for (var section in res.data.retval) {
-					let widgets = [];
-					for (var wid in res.data.retval[section]) {
-						res.data.retval[section][wid].id = wid;
-						res.data.retval[section][wid].custom = 1;
-						widgets.push(res.data.retval[section][wid]);
+			};
+
+			return this.$api
+				.call(ApiDashboardAdmin.presetBatch(params))
+				.then(result => {
+					if (this.tmpLoading !== funktionen.join('###'))
+						return; // NOTE(chris): prevent race condition
+					for (var section in result.data) {
+						let widgets = [];
+						for (var wid in result.data[section]) {
+							result.data[section][wid].id = wid;
+							result.data[section][wid].custom = 1;
+							widgets.push(result.data[section][wid]);
+						}
+						this.sections.push({
+							name: section,
+							widgets
+						});
 					}
-					this.sections.push({
-						name: section,
-						widgets
-					});
-				}
-			}).catch(err => console.error('ERROR:', err));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Config/funktionen').then(res => {
-			this.funktionen = {general: 'GENERAL'};
-			res.data.retval.forEach(funktion => {
-				this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
-			});
-		}).catch(err => console.error('ERROR:', err));
+		this.$api
+			.call(ApiDashboardAdmin.loadFunktionen())
+			.then(result => {
+				//console.log(result);
+				result.data.forEach(funktion => {
+					this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
+				});
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	watch: {
 		dashboard() {
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index 645d3f8cc..60ad6e1b8 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -1,3 +1,5 @@
+import ApiDashboardAdmin from "../../../api/factory/dashboard/dashboardAdmin.js";
+
 export default {
 	emits: [
 		"change",
@@ -7,34 +9,34 @@ export default {
 		dashboard_id: Number,
 		widgets: Array
 	},
-	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		}
-	},
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
-			axios.post(this.apiurl + '/Widget/setAllowed', {
+			const params = {
 				dashboard_id: this.dashboard_id,
 				widget_id,
 				action: allow ? 'add' : 'delete'
-			}).catch(err => console.error('ERROR: ' + err));
+			};
+
+			this.$api
+				.call(ApiDashboardAdmin.setWidgetAllowed(params))
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
-		axios.get(this.apiurl + '/Widget/getAll', {
-			params:{
-				dashboard_id: this.dashboard_id
-			}
-		}).then(
-			result => {
-				this.$emit('assignWidgets', result.data.retval.map(el => ({
+		this.$api
+			.call(ApiDashboardAdmin.getAllWidgets(this.dashboard_id))
+			.then(result => {
+/*				console.log(result.data.map(el => ({
+						...el,
+						...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
+				})));*/
+				this.$emit('assignWidgets', result.data.map(el => ({
 					...el,
 					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
 				})));
-			}
-		).catch(err => console.error('ERROR:', err));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="dashboard-admin-widgets">
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index a238de289..75cfe8e85 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -151,7 +151,7 @@ export default {
 		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup('Are you sure you want to delete this widget?').then(() => this.$emit('widgetRemove', this.name, item.id));
+				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b08d89b21..f79d1aee0 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -52612,6 +52612,127 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Refactor Messages END
+	// ### Phrases Dashboard Admin START
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'deleteInfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mit dieser Aktion werden auch alle Voreinstellungen der verbundenen Widgets gelöscht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This action will also delete all presets of the connected widgets.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'error_savePreset',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Voreinstellung konnten nicht gespeichert werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Preset could not be saved.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'error_presetAndFunctionNotFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Voreinstellung für Dashboard {dashboard} und Funktion {funktion} nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Preset for dashboard {dashboard} and function {funktion} not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'error_deleteWidget',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Widget konnte nicht entfernt werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'failed to remove widget',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'success_savePreset',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Voreinstellung erfolgreich aktualisiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Preset successfully updated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'alert_deleteWidget',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sind Sie sicher, dass Sie dieses Widget löschen möchten?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Are you sure you want to delete this widget?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// ### Phrases Dashboard Admin END
 );
 
 

From c113c8086253f64556823171cd9935190d989cf2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 22 Dec 2025 21:11:05 +0100
Subject: [PATCH 1083/1357] fix calculation of next student matrikelnr aka
 personenkennzeichen and student uid

---
 application/libraries/PrestudentLib.php  | 8 +++-----
 application/models/crm/Student_model.php | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 561b19fd4..a57533da0 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -687,9 +687,6 @@ class PrestudentLib
 		$now = date('c');
 		$today = date('Y-m-d');
 
-		$jahr = mb_substr($studiensemester_kurzbz, 4, 2);
-
-
 		// Genererate Personenkennzeichen
 		$personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
 			$student_data->studiengang_kz,
@@ -699,8 +696,9 @@ class PrestudentLib
 		if (isError($personenkennzeichen))
 			return $personenkennzeichen;
 		$personenkennzeichen = getData($personenkennzeichen);
-		
-		
+
+		$jahr = mb_substr($personenkennzeichen, 0, 2);
+
 		// Generate UID
 		$uid = $this->_ci->StudentModel->generateUID(
 			$student_data->kurzbz,
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 6f2404cbd..ca9cfe4c3 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -169,7 +169,7 @@ class Student_model extends DB_Model
 
 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
-			$max = mb_substr(getData($matrikelnrres)[0]->matrikelnr, 7);
+			$max = mb_substr(trim(getData($matrikelnrres)[0]->matrikelnr), -3);
 			if (!is_numeric($max)) {
 				$max = (int)$max;
 			}

From 1ce362b66bf353abc18b66662c48dd3a778a8c6e Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Wed, 7 Jan 2026 15:54:59 +0100
Subject: [PATCH 1084/1357] Removed forgotten error_log

---
 application/libraries/DocsboxLib.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/libraries/DocsboxLib.php b/application/libraries/DocsboxLib.php
index 31169d579..184855ad8 100644
--- a/application/libraries/DocsboxLib.php
+++ b/application/libraries/DocsboxLib.php
@@ -157,8 +157,6 @@ class DocsboxLib
 					->expectsJson()
 					->send();
 
-				error_log(print_r($getStatusResponse, 1));
-
 				// Checks that:
 				// - the response is not empty
 				// - the reponse body has the property id

From f845809e6b38b70aea75571d6ee2eca55c7f2d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 7 Jan 2026 16:02:06 +0100
Subject: [PATCH 1085/1357] Fixed Variable Check in Abgabetool

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

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 57a640e0b..c3f1d3a45 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -166,7 +166,7 @@ class Abgabe extends FHCAPI_Controller
 				
 				Events::trigger('projektbeurteilung_check_available', $pa->projektarbeit_id, $pa->bperson_id, $downloadPaFunc);
 					
-				if($pa->babgeschickt) {
+				if(isset($pa->babgeschickt) && $pa->babgeschickt) {
 					$downloadLink1 = '';
 					$downloadLinkFunc1 = function ($link) use (&$downloadLink1) {
 						$downloadLink1 = $link;

From 40ae57fb0c597964d3832f2a11c75853ef170682 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 8 Jan 2026 12:01:20 +0100
Subject: [PATCH 1086/1357] proctoring check ueberarbeitet

---
 cis/testtool/externeueberwachung.js        | 37 ++++-----------
 cis/testtool/frage.css                     | 30 ++++++++++++
 cis/testtool/frage.php                     |  4 +-
 cis/testtool/frage_externe_ueberwachung.js | 53 ++++++++++++++++++++++
 cis/testtool/index.php                     |  1 +
 5 files changed, 96 insertions(+), 29 deletions(-)
 create mode 100644 cis/testtool/frage.css
 create mode 100644 cis/testtool/frage_externe_ueberwachung.js

diff --git a/cis/testtool/externeueberwachung.js b/cis/testtool/externeueberwachung.js
index 65143290d..71951779f 100644
--- a/cis/testtool/externeueberwachung.js
+++ b/cis/testtool/externeueberwachung.js
@@ -1,34 +1,15 @@
 (function () {
-	/*
-
-	const params = new URLSearchParams(location.search);
-	let expectedOrigin = params.get("examus-client-origin");
-
-	if (!expectedOrigin)
-	{
-		window.top.location.href = 'resetconnection.php';
-		return;
+	function sendMessage() {
+		let frame = window.frames['content'];
+		if (frame)
+			frame.postMessage({ type: "proctoringReady" });
 	}
-	*/
-	let proctoringOK = false;
 
-	window.addEventListener("message", function (e) {
-		/*if (e.origin !== expectedOrigin) {
-			return;
-		}*/
-
-		const data = e.data || {};
-
-		if (data.proctoringIsActive)
+	window.addEventListener("message", function (e)
+	{
+		if (e.data.indexOf("proctoringReady_") === 0)
 		{
-			proctoringOK = true;
+			sendMessage();
 		}
 	});
-
-	setTimeout(function () {
-		if (!proctoringOK)
-		{
-			top.location.href='resetconnection.php';
-		}
-	}, 1000);
-})();
\ No newline at end of file
+})();
diff --git a/cis/testtool/frage.css b/cis/testtool/frage.css
new file mode 100644
index 000000000..04024ae53
--- /dev/null
+++ b/cis/testtool/frage.css
@@ -0,0 +1,30 @@
+.proctoring-blocker
+{
+	position: fixed;
+	inset: 0;
+	z-index: 99999;
+	backdrop-filter: blur(6px);
+	pointer-events: all;
+	user-select: none;
+}
+
+.proctoring-blocker.hidden
+{
+	display: none !important;
+}
+
+.proctoring-text
+{
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	color: #fff;
+	font-size: 16px;
+	font-family: sans-serif;
+}
+
+.proctoring-blur-fallback
+{
+	filter: blur(6px);
+}
diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
index 4267d6a13..bf2ee24c5 100644
--- a/cis/testtool/frage.php
+++ b/cis/testtool/frage.php
@@ -183,7 +183,9 @@ if(!isset($_SESSION['pruefling_id']))
 	die($p->t('testtool/bitteZuerstAnmelden'));
 
 if (!empty($_SESSION['externe_ueberwachung']) && isset($_SESSION['externe_ueberwachung_verified'])): ?>
-	<script type="text/javascript" src="externeueberwachung.js"></script>
+	<link href="frage.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="frage_externe_ueberwachung.js"></script>
+	<div id="proctoringBlocker" class="proctoring-blocker hidden"></div>
 <?php endif;
 
 $pruefling = new pruefling();
diff --git a/cis/testtool/frage_externe_ueberwachung.js b/cis/testtool/frage_externe_ueberwachung.js
new file mode 100644
index 000000000..31a7b414f
--- /dev/null
+++ b/cis/testtool/frage_externe_ueberwachung.js
@@ -0,0 +1,53 @@
+(function () {
+	let ok = false;
+	let blocker;
+
+	function showBlocker() {
+		blocker = document.getElementById("proctoringBlocker");
+
+		if (!blocker)
+		{
+			blocker = document.createElement("div");
+			blocker.id = "proctoringBlocker";
+			blocker.className = "proctoring-blocker";
+			blocker.innerHTML = '<div class="proctoring-text">Loading...</div>';
+			document.body.appendChild(blocker);
+		}
+		document.documentElement.classList.add("proctoring-blur-fallback");
+	}
+
+	function block() {
+		showBlocker();
+		blocker.classList.remove("hidden");
+	}
+
+	function unblock() {
+		document.documentElement.classList.remove("proctoring-blur-fallback");
+		if (!blocker) return;
+		blocker.classList.add("hidden");
+	}
+
+	const blockTimer = setTimeout(function () {
+		if (!ok)
+			block();
+	}, 1500);
+
+	window.addEventListener("message", function (e) {
+		const data = e.data || {};
+
+		if (data.type === "proctoringReady")
+		{
+			ok = true;
+			clearTimeout(blockTimer);
+			unblock();
+		}
+	});
+
+	setTimeout(function () {
+		if (!ok) {
+			top.location.href = "resetconnection.php";
+		}
+	}, 3000);
+})();
+
+
diff --git a/cis/testtool/index.php b/cis/testtool/index.php
index 9aa6c3f84..6f2cfac26 100644
--- a/cis/testtool/index.php
+++ b/cis/testtool/index.php
@@ -22,6 +22,7 @@ if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
 	<?php
 	if (!empty($_SESSION['externe_ueberwachung'])) : ?>
+	<script type="text/javascript" src="externeueberwachung.js"></script>
 	<script>
 		function loadInContent(url)
 		{

From 3d82d69bfc01c07f3c09641030d01b02ee2126ca Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 8 Jan 2026 13:40:58 +0100
Subject: [PATCH 1087/1357] fixed student_uid variable aquisition inside
 StudentComponent; No allowedToSave check in client for Betreuer at all,
 everything done at backend level (WIP); added legacy phrasen to phrasesupdate
 to guarantee their existence;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  22 ++--
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |   5 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  18 +--
 system/phrasesupdate.php                      | 120 ++++++++++++++++++
 4 files changed, 140 insertions(+), 25 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c3f1d3a45..f35ea4761 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -111,7 +111,7 @@ class Abgabe extends FHCAPI_Controller
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
 		} else {
-			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
 		
 		$projektarbeitIsCurrent = false;
@@ -341,7 +341,7 @@ class Abgabe extends FHCAPI_Controller
 				if(count($projektarbeitArr) > 0) {
 					$projektarbeit = $projektarbeitArr[0];
 				} else {
-					$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+					$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 				}
 
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
@@ -351,7 +351,7 @@ class Abgabe extends FHCAPI_Controller
 				if(count($paabgabeArr) > 0) {
 					$paabgabe = $paabgabeArr[0];
 				} else {
-					$this->terminateWithError($this->p->t('global','projektabgabeNichtGefunden'), 'general');
+					$this->terminateWithError($this->p->t('abgabetool','c4projektabgabeNichtGefunden'), 'general');
 				}
 				
 				$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
@@ -743,7 +743,7 @@ class Abgabe extends FHCAPI_Controller
 		$student = $studentArr[0];
 
 		if(!$student) {
-			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4userNichtGefunden'), 'general');
 		}
 		
 		$subject = $this->p->t('abgabetool', 'c4qualgateNegativEmailSubject');
@@ -902,7 +902,7 @@ class Abgabe extends FHCAPI_Controller
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
 		} else {
-			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
 		
 		// update projektarbeit cols
@@ -967,7 +967,7 @@ class Abgabe extends FHCAPI_Controller
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
 		} else {
-			$this->terminateWithError($this->p->t('global','projektarbeitNichtGefunden'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
 		
 		$projektarbeitIsCurrent = false;
@@ -1016,7 +1016,7 @@ class Abgabe extends FHCAPI_Controller
 
 			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
 
-			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 			
 			$mailres = sendSanchoMail(
 				'ParbeitsbeurteilungEndupload',
@@ -1029,7 +1029,7 @@ class Abgabe extends FHCAPI_Controller
 
 			if(!$mailres)
 			{
-				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+				$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 			}
 
 			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
@@ -1049,14 +1049,14 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$tokenGenRes)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
 						}
 
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
 						
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
 						}
 
 						$begutachterMitToken = $begutachterMitTokenRetval[0];
@@ -1090,7 +1090,7 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$mailres)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 						}
 
 					}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index a934230ca..6752319e1 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -305,9 +305,8 @@ export const AbgabetoolMitarbeiter = {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
 					
-					// lektoren are only allowed to edit their own deadline entries
-					// TODO: cis old
-					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
+					// update 08-01-20206: everybody is allowed to do everything in client, critical checks happen at backend level
+					termin.allowedToSave = true
 					
 					// lektoren are not allowed to delete deadlines with existing submissions
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 098e80e7d..730e670f0 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -40,8 +40,6 @@ export const AbgabetoolStudent = {
 			phrasenResolved: false,
 			loading: false,
 			notenOptions: null,
-			domain: '',
-			student_uid: null,
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null
@@ -155,7 +153,7 @@ export const AbgabetoolStudent = {
 
 						// development purposes
 						// termin.allowedToUpload = this.checkQualityGatesStrict(pa.abgabetermine)
-						// termin.allowedToUpload = true
+						termin.allowedToUpload = true
 
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
@@ -206,19 +204,14 @@ export const AbgabetoolStudent = {
 			} else return '-'
 		},
 		buildMailToLink(projekt) {
-			if(projekt.mitarbeiter_uid) { // standard
-				return 'mailto:' + projekt.mitarbeiter_uid +'@'+ this.domain
-			} else { // private
-				return 'mailto:' + projekt.email
-			}
+			// should always be "projekt.mitarbeiter_uid +'@'+ this.domain", built in backend
+			return 'mailto:' + projekt.email
 		},
 		buildBetreuer(abgabe) {
 			return (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		async setupData(data){
 			// this.projektarbeiten = data[0]
-			this.domain = data[1]
-			this.student_uid = data[2]
 			const projektarbeiten = data[0] ?? null
 			if(!projektarbeiten) return
 			this.projektarbeiten = projektarbeiten.map(projekt => {
@@ -246,7 +239,7 @@ export const AbgabetoolStudent = {
 
 		},
 		loadProjektarbeiten() {
-			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null))
+			this.$api.call(ApiAbgabe.getStudentProjektarbeiten(this.student_uid))
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})
@@ -295,6 +288,9 @@ export const AbgabetoolStudent = {
 	computed: {
 		isViewMode() {
 			return this.student_uid !== this.viewData.uid
+		},
+		student_uid() {
+			return this.student_uid_prop || this.viewData?.uid || null
 		}
 	},
 	async created() {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d08a72046..77a812960 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -45487,6 +45487,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fehlerMailBegutachter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Versenden des Mails an den Erstbegutachter!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error sending E-Mail to first Assessor!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fehlerMailZweitBegutachter',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Versenden des Mails an den Zweitbegutachter!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error sending E-Mail to second Assessor!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projektarbeitNichtGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Projektarbeit gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No projekt work has been found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projektarbeitNichtGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Projektarbeit gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No projekt work has been found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projektabgabeNichtGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Projektabgabe gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No projekt deadline has been found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4userNichtGefunden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'User nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'User not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 80175f46cb30a5cfe903d71b02720d1b0e1d746e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 8 Jan 2026 14:40:24 +0100
Subject: [PATCH 1088/1357] typo fix in getDateStyleClass; fix selectAll button
 in Assistenz view;

---
 .../js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 2 +-
 public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js  | 5 +++++
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js  | 6 +++++-
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js    | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index b51661b2a..01d39793e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -334,7 +334,7 @@ export const AbgabeMitarbeiterDetail = {
 			else if(abgabedatum > datum) {
 				return 'verspaetet' // needs upload, missed it and has submitted smth late
 			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
 				else if (today > datum) return 'abgegeben'
 			} else {
 				return 'abgegeben' // nothing else to do for that termin
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index e224ec0b9..b74e12317 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -514,6 +514,11 @@ export const AbgabeStudentDetail = {
 					</AccordionTab>
 				</template>
 			</Accordion>
+			
+			<div v-if="projektarbeit?.abgabetermine.length == 0" style="display:flex; justify-content: center; align-content: center;">
+				<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
+			</div>
+			
 		 </div>
 	 	
 	 	<bs-modal 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 67a5b1727..8053ea3f1 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -116,6 +116,7 @@ export const AbgabetoolAssistenz = {
 					{
 						formatter: function (cell, formatterParams, onRendered) {
 							// create the built-in checkbox
+							if(!cell.getRow().getData().selectable) return
 							let checkbox = document.createElement("input");
 							checkbox.type = "checkbox";
 
@@ -628,6 +629,9 @@ export const AbgabetoolAssistenz = {
 			// const now = luxon.DateTime.now();
 			return projekte.map(projekt => {
 				
+				// in assistenz context every projektarbeit should be allowed to be selected i guess
+				projekt.selectable = true;
+				
 				projekt.prevTermin = null;
 				projekt.nextTermin = null;
 
@@ -729,7 +733,7 @@ export const AbgabetoolAssistenz = {
 			else if(abgabedatum > datum) {
 				return 'verspaetet' // needs upload, missed it and has submitted smth late
 			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
 				else if (today > datum) return 'abgegeben'
 			} else {
 				return 'abgegeben' // nothing else to do for that termin
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 730e670f0..b16041b84 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -74,7 +74,7 @@ export const AbgabetoolStudent = {
 			else if(abgabedatum > datum) {
 				return 'verspaetet' // needs upload, missed it and has submitted smth late
 			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffinday <= 12 ? 'abzugeben' : 'standard'
+				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
 				else if (today > datum) return 'abgegeben'
 			} else {
 				return 'abgegeben' // nothing else to do for that termin

From 4f104523ff4a03b4751eacbecea8bccefeff500f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 Jan 2026 16:02:29 +0100
Subject: [PATCH 1089/1357] - include directive primevue.tooltip - refactor
 phrases to avoid timing problem with loading phrases of alert

---
 public/js/apps/Dashboard/Admin.js            |  1 +
 public/js/components/Bootstrap/Confirm.js    |  2 +-
 public/js/components/Dashboard/Admin.js      | 11 +++++-----
 public/js/components/Dashboard/Admin/Edit.js |  7 +++----
 system/phrasesupdate.php                     | 22 +++++++++++++++++++-
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 4a5fcee2f..7c57abbda 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -13,4 +13,5 @@ const app = Vue.createApp({
   }
 });
 app.use(PluginsPhrasen);
+app.directive('tooltip', primevue.tooltip);
 app.mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
index a56885473..f6ac52abc 100644
--- a/public/js/components/Bootstrap/Confirm.js
+++ b/public/js/components/Bootstrap/Confirm.js
@@ -17,7 +17,7 @@ export default {
 		</template>
 		<template v-slot:footer>
 			<button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
-			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{this.$p.t('ui', 'cancel')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index b35346fb5..3ea7a3260 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -41,7 +41,7 @@ export default {
 					return this.$api
 						.call(ApiDashboardAdmin.addDashboard(params))
 						.then(response =>{
-							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); //TODO(Manu) phrase here working
+							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 							let newDashboard = {
 								dashboard_id: response.data,
@@ -58,7 +58,8 @@ export default {
 			return this.$api
 				.call(ApiDashboardAdmin.updateDashboard(dashboard))
 				.then(response =>{
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave')); //TODO(Manu) phrase here working
+
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
 					old.dashboard_kurzbz = dashboard.dashboard_kurzbz;
@@ -70,7 +71,7 @@ export default {
 			return this.$api
 				.call(ApiDashboardAdmin.deleteDashboard(dashboard_id))
 				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete')); //TODO(Manu) phrase here NOT always working
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -108,7 +109,7 @@ export default {
 		<div v-if="dashboard">
 			<ul class="nav nav-tabs mt-3" role="tablist">
 				<li class="nav-item" role="presentation">
-					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">Edit</button>
+					<button class="nav-link" id="edit-tab" data-bs-toggle="tab" data-bs-target="#edit" type="button" role="tab" aria-controls="edit" aria-selected="false">{{this.$p.t('ui', 'bearbeiten')}}</button>
 				</li>
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="widgets-tab" data-bs-toggle="tab" data-bs-target="#widgets" type="button" role="tab" aria-controls="widgets" aria-selected="true">Widgets</button>
@@ -122,7 +123,7 @@ export default {
 					<dashboard-admin-edit v-bind="dashboard" :key="dashboard.dashboard_id" @change="dashboardUpdate($event)" @delete="dashboardDelete($event)"></dashboard-admin-edit>
 				</div>
 				<div class="tab-pane fade show active" id="widgets" role="tabpanel" aria-labelledby="widgets-tab">
-					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @change="test" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
+					<dashboard-admin-widgets :key="dashboard.dashboard_id" :dashboard_id="dashboard.dashboard_id" :widgets="widgets" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
 				</div>
 				<div class="tab-pane fade" id="presets" role="tabpanel" aria-labelledby="presets-tab">
 					<dashboard-admin-presets :dashboard="dashboard.dashboard_kurzbz" :widgets="widgets"></dashboard-admin-presets>
diff --git a/public/js/components/Dashboard/Admin/Edit.js b/public/js/components/Dashboard/Admin/Edit.js
index 6b097d86c..c40d91183 100644
--- a/public/js/components/Dashboard/Admin/Edit.js
+++ b/public/js/components/Dashboard/Admin/Edit.js
@@ -18,8 +18,7 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			//TODO(Manu) phrases here NOT always working
-			BsConfirm.popup(this.$p.t('alert', 'confirm_delete') + " " + this.$p.t('dashboard', 'deleteInfo'))
+			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
 				.then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
@@ -33,8 +32,8 @@ export default {
 			<textarea id="dashboard-admin-edit-beschreibung" class="form-control" v-model="desc"></textarea>
 		</div>
 		<div>
-			<button class="btn btn-danger" @click="sendDelete">Delete</button>
-			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">Update</button>
+			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
 		</div>
 	</div>`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f79d1aee0..b352922e2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -52615,7 +52615,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 	// ### Phrases Dashboard Admin START
 	array(
 		'app' => 'core',
-		'category' => 'dashboard',
+		'category' => 'ui',
 		'phrase' => 'deleteInfo',
 		'insertvon' => 'system',
 		'phrases' => array(
@@ -52732,6 +52732,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'confirm_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Möchten Sie wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you really want to delete?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### Phrases Dashboard Admin END
 );
 

From 7eb147085f66ff8fbc2c990612e57eb1de84c493 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 8 Jan 2026 16:05:24 +0100
Subject: [PATCH 1090/1357] typo fix in getDateStyleClass; fix selectAll button
 in Assistenz view; change the upload_allowed checkbox on change as expected;
 give fhcAlert primevue btn classes instead of bootstrap so they actually get
 applied; save convert js date to iso string to avoid timezone shenanigans;
 created zusatzdaten edit phrase;

---
 public/js/api/factory/abgabe.js               | 12 ++++++++++-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 10 +++++-----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  4 ++--
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  1 -
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  8 +++++++-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 6 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 891fe02da..be03c9728 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -43,13 +43,23 @@ export default {
 		};
 	},
 	postProjektarbeitAbgabe(termin) {
+		
+		let dateString = termin.datum
+		if(termin.datum instanceof Date) {
+			const year = termin.datum.getFullYear();
+			const month = String(termin.datum.getMonth() + 1).padStart(2, '0');
+			const day = String(termin.datum.getDate()).padStart(2, '0');
+
+			dateString = `${year}-${month}-${day}`
+		}
+		
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/postProjektarbeitAbgabe',
 			params: { 
 				paabgabe_id: termin.paabgabe_id,
 				paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
-				datum: termin.datum,
+				datum: dateString,
 				note: termin.note_pk,
 				upload_allowed: !!termin.upload_allowed,
 				beurteilungsnotiz: termin.beurteilungsnotiz ?? '',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 01d39793e..ba8522510 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -230,11 +230,11 @@ export const AbgabeMitarbeiterDetail = {
 		async validateZusatzdaten() {
 			// just ask once
 			if(await this.$fhcAlert.confirm({
-				message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
+				message: this.$p.t('abgabetool/confirmZusatzdatenSpeichern'),
 				acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-				acceptClass: 'btn btn-danger',
+				acceptClass: 'p-button-primary',
 				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-				rejectClass: 'btn btn-outline-secondary'
+				rejectClass: 'p-button-secondary'
 			}) === false) {
 				return false
 			}
@@ -245,9 +245,9 @@ export const AbgabeMitarbeiterDetail = {
 			if(await this.$fhcAlert.confirm({
 				message: this.$p.t('abgabetool/c4confirm_delete'),
 				acceptLabel: 'Löschen',
-				acceptClass: 'btn btn-danger',
+				acceptClass: 'p-button-danger',
 				rejectLabel: 'Zurück',
-				rejectClass: 'btn btn-outline-secondary'
+				rejectClass: 'p-button-secondary'
 			}) === false) {
 				return false
 			} else {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index b74e12317..2af3c4c9c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -59,9 +59,9 @@ export const AbgabeStudentDetail = {
 				if(await this.$fhcAlert.confirm({
 					message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
 					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
-					acceptClass: 'btn btn-danger',
+					acceptClass: 'p-button-primary',
 					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
-					rejectClass: 'btn btn-outline-secondary'
+					rejectClass: 'p-button-secondary'
 				}) === false) {
 					return false
 				}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 8053ea3f1..8ca1b931e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1067,7 +1067,6 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
-							@change="handleChangeAbgabetypSerientermin(termin)"
 							:optionLabel="getOptionLabelAbgabetyp">
 						</Dropdown>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 6752319e1..0cecb10e2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -432,7 +432,13 @@ export const AbgabetoolMitarbeiter = {
 		}
 	},
 	watch: {
+		'serienTermin.bezeichnung'(newVal) {
+			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
+				this.serienTermin.kurzbz = newVal.bezeichnung
+			}
 
+			this.serienTermin.upload_allowed = newVal.upload_allowed_default
+		},
 	},
 	computed: {
 		getAllowedAbgabeTypeOptions() {
@@ -524,7 +530,7 @@ export const AbgabetoolMitarbeiter = {
 					<div class="col-12 col-md-9"
 						v-if="abgabetypenBetreuer && abgabeTypeOptions"
 					>
-						<Dropdown 
+						<Dropdown
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="getAllowedAbgabeTypeOptions"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 77a812960..324273a75 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -45072,6 +45072,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'confirmZusatzdatenSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Möchten Sie die Zusatzdaten speichern?",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you want to save the additional data?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From db861e81b2af16143946afe0a445a45165521b09 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 8 Jan 2026 17:45:02 +0100
Subject: [PATCH 1091/1357] rewrote post param acces from $id = $_POST['id'] to
 $id = $this->input->post('id') and subsequently rewrote safety checks from
 !isset($id) || isEmptyString($id) to $id === NULL || trim((string)$id) === ''
 to avoid ASCII conversion of low integers when passing them to isEmptyString
 function

---
 .../controllers/api/frontend/v1/Abgabe.php    | 183 ++++++++++--------
 1 file changed, 99 insertions(+), 84 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index f35ea4761..f99254251 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -102,8 +102,9 @@ class Abgabe extends FHCAPI_Controller
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
 		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
@@ -139,7 +140,8 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		if (!isset($uid) || isEmptyString($uid)) {
+		// if uid is missing or empty, fall back to getAuthUID()
+		if ($uid === NULL || trim((string)$uid) === '') {
 			$uid = getAuthUID();
 		}
 
@@ -257,26 +259,29 @@ class Abgabe extends FHCAPI_Controller
 	public function postStudentProjektarbeitZwischenabgabe()
 	{
 		$this->checkUploadSize();
-		
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
 
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$paabgabe_id = $this->input->post('paabgabe_id');
+		$student_uid = $this->input->post('student_uid');
+		$bperson_id = $this->input->post('bperson_id');
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
+
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $student_uid === NULL || trim((string)$student_uid) === ''
+			|| $paabgabetyp_kurzbz === NULL || trim((string)$paabgabetyp_kurzbz) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
+		$path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+		
 		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+			move_uploaded_file($_FILES['file']['tmp_name'], $path);
 
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
-
-				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
+			if(file_exists($path)) {
 
+				chmod($path, 0640);
+				
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 				$res = $this->PaabgabeModel->update($paabgabe_id, array(
 					'abgabedatum' => date('Y-m-d'),
@@ -307,26 +312,27 @@ class Abgabe extends FHCAPI_Controller
 	{
 		$this->checkUploadSize();
 
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$student_uid = $_POST['student_uid'];
-		$sprache = $_POST['sprache'];
-		$abstract = $_POST['abstract'];
-		$abstract_en = $_POST['abstract_en'];
-		$schlagwoerter = $_POST['schlagwoerter'];
-		$schlagwoerter_en = $_POST['schlagwoerter_en'];
-		$seitenanzahl = $_POST['seitenanzahl'];
-		$bperson_id = $_POST['bperson_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$paabgabe_id = $this->input->post('paabgabe_id');
+		$student_uid = $this->input->post('student_uid');
+		$sprache = $this->input->post('sprache');
+		$abstract = $this->input->post('abstract');
+		$abstract_en = $this->input->post('abstract_en');
+		$schlagwoerter = $this->input->post('schlagwoerter');
+		$schlagwoerter_en = $this->input->post('schlagwoerter_en');
+		$seitenanzahl = $this->input->post('seitenanzahl');
+		$bperson_id = $this->input->post('bperson_id');
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
 
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($student_uid) || isEmptyString($student_uid)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz)
-			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
-			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
-			|| !isset($seitenanzahl) || !isset($sprache))
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $student_uid === NULL || trim((string)$student_uid) === ''
+			|| $paabgabetyp_kurzbz === NULL || trim((string)$paabgabetyp_kurzbz) === ''
+			|| $abstract === NULL || $abstract_en === NULL
+			|| $schlagwoerter === NULL || $schlagwoerter_en === NULL
+			|| $seitenanzahl === NULL || $sprache === NULL) {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
 			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
@@ -411,6 +417,7 @@ class Abgabe extends FHCAPI_Controller
 		}
 		$boolParamStrLower = strtolower($boolParamStr);
 
+		$showAllBool = false; // fallback if input strings are anything else for whatever reason
 		if (in_array($boolParamStrLower, $trueStrings, true)) {
 			$showAllBool = true;
 		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
@@ -443,23 +450,24 @@ class Abgabe extends FHCAPI_Controller
 	 * initially fetches all
 	 */
 	public function postProjektarbeitAbgabe() {
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		$paabgabe_id = $_POST['paabgabe_id'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$datum = $_POST['datum'];
-		$fixtermin = $_POST['fixtermin'];
-		$kurzbz = $_POST['kurzbz'];
-		$note = $_POST['note'];
-		$beurteilungsnotiz = $_POST['beurteilungsnotiz'];
-		$upload_allowed = $_POST['upload_allowed'];
-		$betreuer_person_id = $_POST['betreuer_person_id'];
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$paabgabe_id = $this->input->post('paabgabe_id');
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
+		$datum = $this->input->post('datum');
+		$fixtermin = $this->input->post('fixtermin');
+		$kurzbz = $this->input->post('kurzbz');
+		$note = $this->input->post('note');
+		$beurteilungsnotiz = $this->input->post('beurteilungsnotiz');
+		$upload_allowed = $this->input->post('upload_allowed');
+		$betreuer_person_id = $this->input->post('betreuer_person_id');
 
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($kurzbz)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $datum === NULL || trim((string)$datum) === ''
+			|| $kurzbz === NULL
+			|| $paabgabetyp_kurzbz === NULL || trim((string)$paabgabetyp_kurzbz) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
@@ -557,10 +565,11 @@ class Abgabe extends FHCAPI_Controller
 	 * none of these roles are allowed to delete if students uploaded something for that termin
 	 */
 	public function deleteProjektarbeitAbgabe() {
-		$paabgabe_id = $_POST['paabgabe_id'];
+		$paabgabe_id = $this->input->post('paabgabe_id');
 
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
+		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
@@ -588,20 +597,21 @@ class Abgabe extends FHCAPI_Controller
 	 * can be slow for large n since it queries twice per projektarbeit_id
 	 */
 	public function postSerientermin() {
-		$projektarbeit_ids = $_POST['projektarbeit_ids'];
-		$datum = $_POST['datum'];
-		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
-		$bezeichnung = $_POST['bezeichnung'];
-		$kurzbz = $_POST['kurzbz'];
-		$fixtermin = $_POST['fixtermin'];
-		$upload_allowed = $_POST['upload_allowed'];
+		$projektarbeit_ids = $this->input->post('projektarbeit_ids');
+		$datum = $this->input->post('datum');
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
+		$bezeichnung = $this->input->post('bezeichnung');
+		$kurzbz = $this->input->post('kurzbz');
+		$fixtermin = $this->input->post('fixtermin');
+		$upload_allowed = $this->input->post('upload_allowed');
 
-		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
-			|| !isset($datum) || isEmptyString($datum)
-			|| !isset($kurzbz)
-			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
-			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+		if ($projektarbeit_ids === NULL || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
+			|| $datum === NULL || trim((string)$datum) === ''
+			|| $kurzbz === NULL
+			|| $bezeichnung === NULL || trim((string)$bezeichnung) === ''
+			|| $paabgabetyp_kurzbz === NULL || trim((string)$paabgabetyp_kurzbz) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
 		// for each termin - good to check that in principle but should not matter in this place. if necessary
@@ -653,12 +663,12 @@ class Abgabe extends FHCAPI_Controller
 	 * resembles the legacy abgabetool functionality of "show deadlines"
 	 */
 	public function fetchDeadlines() {
-		$person_id = $_POST['person_id'];
+		$person_id = $this->input->post('person_id');
 
-		if (!isset($person_id) || isEmptyString($person_id))
+		if ($person_id === NULL || trim((string)$person_id) === '') {
 			$person_id = getAuthPersonId();
-
-
+		}
+		
 		if($person_id !== getAuthPersonId()) {
 			$this->load->library('PermissionLib');
 			$isAdmin = $this->permissionlib->isBerechtigt('admin');
@@ -779,10 +789,10 @@ class Abgabe extends FHCAPI_Controller
 		
 		$studiengang_kz = $this->input->get("studiengang_kz", TRUE);
 		$benotet = $this->input->get("benotet", TRUE);
-		
-		if (!isset($studiengang_kz) || isEmptyString($studiengang_kz))
+
+		if ($studiengang_kz === NULL || trim((string)$studiengang_kz) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
+		}
 		
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
@@ -850,8 +860,10 @@ class Abgabe extends FHCAPI_Controller
 		$paabgabe_id = $this->input->get('paabgabe_id');
 		$student_uid = $this->input->get('student_uid');
 
-		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
+		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $student_uid === NULL || trim((string)$student_uid) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
 
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -878,19 +890,22 @@ class Abgabe extends FHCAPI_Controller
 	 * can't do it themself
 	 */
 	public function postStudentProjektarbeitZusatzdaten(){
-		$projektarbeit_id = $_POST['projektarbeit_id'];
-		
-		$sprache = $_POST['sprache'];
-		$abstract = $_POST['abstract'];
-		$abstract_en = $_POST['abstract_en'];
-		$schlagwoerter = $_POST['schlagwoerter'];
-		$schlagwoerter_en = $_POST['schlagwoerter_en'];
-		$seitenanzahl = $_POST['seitenanzahl'];
-		
-		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
-			|| !isset($abstract) || !isset($abstract_en) // endupload zusatzdaten can be empty but should never be null
-			|| !isset($schlagwoerter) || !isset($schlagwoerter_en)
-			|| !isset($seitenanzahl) || !isset($sprache)) {
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$sprache = $this->input->post('sprache');
+		$abstract = $this->input->post('abstract');
+		$abstract_en = $this->input->post('abstract_en');
+		$schlagwoerter = $this->input->post('schlagwoerter');
+		$schlagwoerter_en = $this->input->post('schlagwoerter_en');
+		$seitenanzahl = $this->input->post('seitenanzahl');
+
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $sprache === NULL || trim((string)$sprache) === ''
+			|| $seitenanzahl === NULL || trim((string)$seitenanzahl) === ''
+			|| $abstract === NULL || trim((string)$abstract) === ''
+			|| $abstract_en === NULL || trim((string)$abstract_en) === ''
+			|| $schlagwoerter === NULL || trim((string)$schlagwoerter) === ''
+			|| $schlagwoerter_en === NULL || trim((string)$schlagwoerter_en) === '') {
+
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 			

From 13232015c3b6cb5e35738492fd9b507da2866c7b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 9 Jan 2026 14:13:26 +0100
Subject: [PATCH 1092/1357] more sophisticate zuordnung check & place it in
 every sensitive API endpoint; WIP: check STGentitlement when querying
 projektarbeiten for certein stg, since only dropdown info is pulled with this
 berechtigungslogic in mind but not the fetch itself;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 308 ++++++++++++------
 public/js/api/factory/abgabe.js               |   4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |   4 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   2 +-
 system/phrasesupdate.php                      |  40 +++
 5 files changed, 246 insertions(+), 112 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index f99254251..c5a327e77 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -115,19 +115,34 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
 		
-		$projektarbeitIsCurrent = false;
-		$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
-			$projektarbeitIsCurrent = $result;
-		};
-		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
-		
-		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
-
-		foreach($ret->retval as $termin) {
-			$this->checkAbgabeSignatur($termin, $projektarbeit);
+		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if(isError($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'));
+		}
+
+		if(!hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
+		}
+		$data = getData($res)[0];
+		$student_uid = $data->student_uid;
+
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(getAuthUID() == $student_uid || $zugeordnet) {
+
+			$projektarbeitIsCurrent = false;
+			$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
+				$projektarbeitIsCurrent = $result;
+			};
+			Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
+
+			$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
+
+			foreach ($ret->retval as $termin) {
+				$this->checkAbgabeSignatur($termin, $projektarbeit);
+			}
+
+			$this->terminateWithSuccess(array($ret, $projektarbeitIsCurrent));
 		}
-		
-		$this->terminateWithSuccess(array($ret, $projektarbeitIsCurrent));
 	}
 
 	/**
@@ -145,11 +160,7 @@ class Abgabe extends FHCAPI_Controller
 			$uid = getAuthUID();
 		}
 
-		// TODO: check if this zugriffsberechtigung is alright
-//		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-//		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
-
 		if ($isMitarbeiter) {
 			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
 		} else {
@@ -174,8 +185,6 @@ class Abgabe extends FHCAPI_Controller
 						$downloadLink1 = $link;
 					};
 					
-					
-					
 					Events::trigger('projektbeurteilung_download_link', $pa->projektarbeit_id, $pa->betreuerart_kurzbz, $pa->bperson_id, $downloadLinkFunc1);
 					
 					// use config fallback in case the event fails
@@ -201,7 +210,6 @@ class Abgabe extends FHCAPI_Controller
 					$pa->downloadLink1 = $downloadLink1;
 				}
 				
-				
 				$pa->email = $pa->mitarbeiter_uid.'@'.DOMAIN;
 				
 				if($pa->zweitbetreuer_person_id !== null) {
@@ -273,37 +281,45 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
-		$path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(getAuthUID() == $student_uid || $zugeordnet) {
+			
 		
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], $path);
-
-			if(file_exists($path)) {
-
-				chmod($path, 0640);
-				
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-
-				$this->logLib->logInfoDB(array('zwischenupload',$res, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				), getAuthUID(), getAuthPersonId(), $student_uid));
-				
-				$this->terminateWithSuccess($res);
+			$path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			
+			if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+				move_uploaded_file($_FILES['file']['tmp_name'], $path);
+	
+				if(file_exists($path)) {
+	
+					chmod($path, 0640);
+					
+					$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+					$res = $this->PaabgabeModel->update($paabgabe_id, array(
+						'abgabedatum' => date('Y-m-d'),
+						'updatevon' => getAuthUID(),
+						'updateamum' => date('Y-m-d H:i:s')
+					));
+	
+					$this->logLib->logInfoDB(array('zwischenupload',$res, array(
+						'abgabedatum' => date('Y-m-d'),
+						'updatevon' => getAuthUID(),
+						'updateamum' => date('Y-m-d H:i:s')
+					), getAuthUID(), getAuthPersonId(), $student_uid));
+					
+					$this->terminateWithSuccess($res);
+				} else {
+					$this->terminateWithError('Error moving File');
+				}
+	
 			} else {
-				$this->terminateWithError('Error moving File');
+				$this->terminateWithError('File missing');
 			}
-
 		} else {
-			$this->terminateWithError('File missing');
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
 		}
-	}
+
+}
 
 	/**
 	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
@@ -334,67 +350,72 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
-		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
-			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(getAuthUID() == $student_uid || $zugeordnet) {
+			if ((isset($_FILES) and isset($_FILES['file']) and !$_FILES['file']['error'])) {
+				move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH . $paabgabe_id . '_' . $student_uid . '.pdf');
 
-			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+				if (file_exists(PAABGABE_PATH . $paabgabe_id . '_' . $student_uid . '.pdf')) {
 
-				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+					$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-				$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-				$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+					$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+					$projektarbeitArr = $this->getDataOrTerminateWithError($result);
 
-				if(count($projektarbeitArr) > 0) {
-					$projektarbeit = $projektarbeitArr[0];
+					if (count($projektarbeitArr) > 0) {
+						$projektarbeit = $projektarbeitArr[0];
+					} else {
+						$this->terminateWithError($this->p->t('abgabetool', 'c4projektarbeitNichtGefunden'), 'general');
+					}
+
+					$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+					$result = $this->PaabgabeModel->load($paabgabe_id);
+					$paabgabeArr = $this->getDataOrTerminateWithError($result);
+
+					if (count($paabgabeArr) > 0) {
+						$paabgabe = $paabgabeArr[0];
+					} else {
+						$this->terminateWithError($this->p->t('abgabetool', 'c4projektabgabeNichtGefunden'), 'general');
+					}
+
+					$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
+					$signaturstatus = $paabgabe->signatur;
+
+					// update projektarbeit cols
+					$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id, $sprache, $abstract, $abstract_en
+						, $schlagwoerter, $schlagwoerter_en, $seitenanzahl);
+
+
+					// update paabgabe datum
+					$res = $this->PaabgabeModel->update($paabgabe_id, array(
+						'abgabedatum' => date('Y-m-d'),
+						'updatevon' => getAuthUID(),
+						'updateamum' => date('Y-m-d H:i:s')
+					));
+
+					$res = $this->PaabgabeModel->load($res->retval);
+					$abgabe = getData($res)[0];
+					$abgabe->signatur = $signaturstatus;
+
+					$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+
+					$this->logLib->logInfoDB(array('endupload', $res, array(
+						'abgabedatum' => date('Y-m-d'),
+						'updatevon' => getAuthUID(),
+						'updateamum' => date('Y-m-d H:i:s')
+					), getAuthUID(), getAuthPersonId(), array($projektarbeit_id, $sprache, $abstract, $abstract_en
+					, $schlagwoerter, $schlagwoerter_en, $seitenanzahl)));
+
+					$this->terminateWithSuccess($abgabe);
 				} else {
-					$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
+					$this->terminateWithError('Error moving File');
 				}
 
-				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$result = $this->PaabgabeModel->load($paabgabe_id);
-				$paabgabeArr = $this->getDataOrTerminateWithError($result);
-
-				if(count($paabgabeArr) > 0) {
-					$paabgabe = $paabgabeArr[0];
-				} else {
-					$this->terminateWithError($this->p->t('abgabetool','c4projektabgabeNichtGefunden'), 'general');
-				}
-				
-				$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
-				$signaturstatus = $paabgabe->signatur;
-				
-				// update projektarbeit cols
-				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
-					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
-
-
-				// update paabgabe datum
-				$res = $this->PaabgabeModel->update($paabgabe_id, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				));
-
-				$res = $this->PaabgabeModel->load($res->retval);
-				$abgabe = getData($res)[0];
-				$abgabe->signatur = $signaturstatus;
-
-				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
-
-				$this->logLib->logInfoDB(array('endupload',$res, array(
-					'abgabedatum' => date('Y-m-d'),
-					'updatevon' => getAuthUID(),
-					'updateamum' => date('Y-m-d H:i:s')
-				), getAuthUID(), getAuthPersonId(), array($projektarbeit_id,$sprache,$abstract,$abstract_en
-				,$schlagwoerter, $schlagwoerter_en, $seitenanzahl)));
-				
-				$this->terminateWithSuccess($abgabe);
 			} else {
-				$this->terminateWithError('Error moving File');
+				$this->terminateWithError('File missing');
 			}
-
 		} else {
-			$this->terminateWithError('File missing');
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
 		}
 
 	}
@@ -469,6 +490,11 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(!$zugeordnet) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+		}
+		
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
 		$existingPaabgabe = null; 
@@ -566,11 +592,18 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function deleteProjektarbeitAbgabe() {
 		$paabgabe_id = $this->input->post('paabgabe_id');
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
 
-		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === '') {
+		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $projektarbeit_id === NULL || trim((string)$projektarbeit_id) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(!$zugeordnet) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+		}
+		
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
 		$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
@@ -623,16 +656,19 @@ class Abgabe extends FHCAPI_Controller
 
 		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
 		// and should never unintentionally happen
-
-		// TODO: maybe check for betreuer zuordnung?
-
+		
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 		$res = [];
 		$abgaben = [];
 		foreach ($projektarbeit_ids as $projektarbeit_id) {
-
+			
+			$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+			if(!$zugeordnet) {
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+			}
+			
 			$result = $this->PaabgabeModel->insert(
 				array(
 					'projektarbeit_id' => $projektarbeit_id,
@@ -654,7 +690,6 @@ class Abgabe extends FHCAPI_Controller
 		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
 
 		$this->terminateWithSuccess($abgaben);
-
 	}
 
 	/**
@@ -794,6 +829,8 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 		
+		// TODO: recheck getSTGEntitlement here!
+		
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);
 
@@ -857,20 +894,22 @@ class Abgabe extends FHCAPI_Controller
 	{
 		$this->load->helper('download');
 
+		$projektarbeit_id = $this->input->get('projektarbeit_id');
 		$paabgabe_id = $this->input->get('paabgabe_id');
 		$student_uid = $this->input->get('student_uid');
 
 		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
+			|| $projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
 			|| $student_uid === NULL || trim((string)$student_uid) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
-		$isAssistenz = $this->permissionlib->isBerechtigt('extension/abgabe_assistenz');
-		
-		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer || $isAssistenz) {
+		// zuordnung function is supposed for mitarbeiter_uids, students should be allowed to download their own files
+		// without adapting zuordnung logic
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(getAuthUID() == $student_uid || $zugeordnet) {
 			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
 			
 			
@@ -880,7 +919,7 @@ class Abgabe extends FHCAPI_Controller
 				$this->terminateWithError('File not found');
 			}
 		} else {
-			$this->terminateWithError('Keine Zuordnung!');
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
 		}
 	}
 
@@ -919,6 +958,11 @@ class Abgabe extends FHCAPI_Controller
 		} else {
 			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
+
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if(!$zugeordnet) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+		}
 		
 		// update projektarbeit cols
 		$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
@@ -1114,4 +1158,54 @@ class Abgabe extends FHCAPI_Controller
 		}
 	}
 	
+	private function checkZuordnung($projektarbeit_id, $betreuer_uid) {
+		// check if authenticated user is zugewiesen as betreuer to projektarbeit or has admin/assistenz berechtigung
+		// over the studiengang of the student working on that projektarbeit_id
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if(isError($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'));
+		}
+		
+		if(!hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
+		}
+		$data = getData($res)[0];
+		$student_uid = $data->student_uid;
+		$studiengang_kz = $data->studiengang_kz;
+		
+		$res = $this->ProjektarbeitModel->checkZuordnung($student_uid, $betreuer_uid);
+		if(isError($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingBetreuerStudentZuordnung'));
+		}
+
+		// if this is true betreuer has zuordnung to the given $projektarbeit_id and conversely the $student_uid
+		// assigned to that project
+		if(hasData($res)) {
+			return true;
+		} else {
+			$berechtigt = $this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id);
+			if($berechtigt) {
+				return true;
+			}
+			
+			// otherwhise if there is no zuordnung via global admin or assistenz berechtigung,
+			// check if the given uid has permissions over the studiengang of the student
+			// via the abgabetool specific berechtigungen
+			// 'basis/abgabe_assistenz:rw' OR 'basis/abgabe_lektor:rw'
+
+			if ($this->permissionlib->isBerechtigt('basis/abgabe_assistenz', 'suid', $studiengang_kz)) {
+				return true;
+			}
+				
+			if ($this->permissionlib->isBerechtigt('basis/abgabe_lektor', 'suid', $studiengang_kz)){
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index be03c9728..950f23ea9 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -71,11 +71,11 @@ export default {
 			}
 		};
 	},
-	deleteProjektarbeitAbgabe(paabgabe_id) {
+	deleteProjektarbeitAbgabe(paabgabe_id, projektarbeit_id) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabe',
-			params: { paabgabe_id }
+			params: { paabgabe_id, projektarbeit_id }
 		};
 	},
 	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index ba8522510..edea46535 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -255,7 +255,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		deleteTermin(termin) {
-			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id)).then( (res) => {
+			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id, this.projektarbeit.projektarbeit_id)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
 					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
@@ -275,7 +275,7 @@ export const AbgabeMitarbeiterDetail = {
 			return true;
 		},
 		downloadAbgabe(termin) {
-			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}`;
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}&projektarbeit_id=${this.projektarbeit.projektarbeit_id}`;
 
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 2af3c4c9c..c1573d05d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -105,7 +105,7 @@ export const AbgabeStudentDetail = {
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
-			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}`;
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}&projektarbeit_id=${this.projektarbeit.projektarbeit_id}`;
 
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 324273a75..cc8e86de5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -45092,6 +45092,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4errorLoadingStudentForProjektarbeitID',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fehler beim Laden der Projektarbeit - StudentIn Zuordnung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error loading student for project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4noAssignedStudentForProjektarbeitID',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kein zugeteilter StudentIn gefunden für Projektarbeit",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No assigned student found for project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 8f98d0c5a1a86729df6c6ac5bd99d3c2825e0dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 12 Jan 2026 10:31:50 +0100
Subject: [PATCH 1093/1357] Fixed UID

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

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c5a327e77..17c364493 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -1173,7 +1173,7 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
 		}
 		$data = getData($res)[0];
-		$student_uid = $data->student_uid;
+		$student_uid = $data->uid;
 		$studiengang_kz = $data->studiengang_kz;
 		
 		$res = $this->ProjektarbeitModel->checkZuordnung($student_uid, $betreuer_uid);

From 3095f7ea8b685e0c148fbdfbdaa475c1a2661c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 12 Jan 2026 10:44:57 +0100
Subject: [PATCH 1094/1357] =?UTF-8?q?Notice=20f=C3=BCr=20UID=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 17c364493..c6d715809 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -124,7 +124,7 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
 		}
 		$data = getData($res)[0];
-		$student_uid = $data->student_uid;
+		$student_uid = $data->uid;
 
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(getAuthUID() == $student_uid || $zugeordnet) {

From 6c8318ead2115ac9679b37dae7eb660e074e00f0 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 12 Jan 2026 12:51:34 +0100
Subject: [PATCH 1095/1357] wip

---
 .../controllers/api/frontend/v1/Abgabe.php       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c5a327e77..b0c0eb1c6 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -600,10 +600,13 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		
 		if(!$zugeordnet) {
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
 		}
 		
+		// TODO: check zuordnung paabgabe_id / projektarbeit_id
+		
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
 		$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
@@ -612,6 +615,7 @@ class Abgabe extends FHCAPI_Controller
 		if(count($paabgabeArr) == 0)
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		
+		// TODO: diese prüfung entfernen
 		if($paabgabeArr[0]->insertvon === getAuthUID()) {
 			$result = $this->PaabgabeModel->delete($paabgabe_id);
 			$result = $this->getDataOrTerminateWithError($result);
@@ -739,6 +743,9 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
 		$email = $this->getDataOrTerminateWithError($result);
+		
+		//TODO: check if private mail exists, if not take uid@domain
+		
 		return $email[0]->private_email;
 	}
 
@@ -830,6 +837,15 @@ class Abgabe extends FHCAPI_Controller
 		}
 		
 		// TODO: recheck getSTGEntitlement here!
+		$stg_allowed = $this->permissionlib->getSTG_isEntitledFor('basis/abgabe_assistenz:rw');
+		if($stg_allowed == false) {
+			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+		
+		// check if provided studiengang_kz is included in stg_allowed to proceed
+		if(!in_array($studiengang_kz, $stg_allowed)) {
+			$this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
 		
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
 		$projektarbeiten = $this->getDataOrTerminateWithError($result);

From 954c55ba3ea899a11f3ddd6d19a22f8fcb7682e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 12 Jan 2026 17:06:35 +0100
Subject: [PATCH 1096/1357] finetuning

---
 .../controllers/api/frontend/v1/Abgabe.php    | 53 +++++++++++--------
 .../models/education/Projektarbeit_model.php  | 15 +++++-
 application/views/Cis/Abgabetool.php          |  6 +--
 public/js/api/factory/abgabe.js               |  4 +-
 public/js/apps/Abgabetool/Abgabetool.js       |  2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 31 ++---------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 20 +------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  2 +-
 system/phrasesupdate.php                      | 22 +++++++-
 9 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index dc859f605..847df2c12 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -592,41 +592,32 @@ class Abgabe extends FHCAPI_Controller
 	 */
 	public function deleteProjektarbeitAbgabe() {
 		$paabgabe_id = $this->input->post('paabgabe_id');
-		$projektarbeit_id = $this->input->post('projektarbeit_id');
 
-		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === ''
-			|| $projektarbeit_id === NULL || trim((string)$projektarbeit_id) === '') {
+		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
-		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		$zugeordnet = $this->checkZuordnungByPaabgabe($paabgabe_id, getAuthUID());
 		
 		if(!$zugeordnet) {
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
 		}
-		
-		// TODO: check zuordnung paabgabe_id / projektarbeit_id
-		
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
 		$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
 		$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult);
 
-		if(count($paabgabeArr) == 0)
+		if(count($paabgabeArr) == 0) {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-		
-		// TODO: diese prüfung entfernen
-		if($paabgabeArr[0]->insertvon === getAuthUID()) {
-			$result = $this->PaabgabeModel->delete($paabgabe_id);
-			$result = $this->getDataOrTerminateWithError($result);
-
-			// TODO: consider this in nightly email job
-			
-			$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
-			$this->terminateWithSuccess($result);
 		}
+		
+		$result = $this->PaabgabeModel->delete($paabgabe_id);
+		$result = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		// TODO: consider this in nightly email job
+		$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
+		$this->terminateWithSuccess($result);
 	}
 
 	/**
@@ -660,7 +651,6 @@ class Abgabe extends FHCAPI_Controller
 
 		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
 		// and should never unintentionally happen
-		
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -746,7 +736,8 @@ class Abgabe extends FHCAPI_Controller
 		
 		//TODO: check if private mail exists, if not take uid@domain
 		
-		return $email[0]->private_email;
+		return $email[0]->private_email ?? $email[0]->uid.'@'.DOMAIN;
+
 	}
 
 	//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
@@ -1002,7 +993,7 @@ class Abgabe extends FHCAPI_Controller
 		if($abgabe->paabgabetyp_kurzbz != 'end') {
 			return;
 		}
-		
+
 		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$projektarbeit->student_uid.'.pdf';
 		
 		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
@@ -1223,5 +1214,21 @@ class Abgabe extends FHCAPI_Controller
 		
 		return false;
 	}
+	
+	private function checkZuordnungByPaabgabe($paabgabe_id, $betreuer_uid) {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$res = $this->ProjektarbeitModel->getProjektarbeitByPaabgabeID($paabgabe_id);
+		if(isError($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingProjektarbeitForPaabgabeID'));
+		}
+
+		if(!hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedProjektarbeitForPaabgabeID'));
+		}
+		$data = getData($res)[0];
+		$projektarbeit_id = $data->projektarbeit_id;
+	
+		return $this->checkZuordnung($projektarbeit_id, $betreuer_uid);
+	}
 
 }
\ No newline at end of file
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index ea16b5587..e9208e51d 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -233,7 +233,7 @@ class Projektarbeit_model extends DB_Model
 					   CASE WHEN zustellung THEN 0 ELSE 1 END,
 					   insertamum DESC NULLS LAST
 				   LIMIT 1
-			   ) AS private_email
+			   ) AS private_email, mitarbeiter_uid as uid
 		FROM lehre.tbl_projektarbeit pa
 				 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
 				 JOIN public.tbl_person pers USING (person_id)
@@ -463,4 +463,17 @@ class Projektarbeit_model extends DB_Model
 
 		return false;
 	}
+
+	public function getProjektarbeitByPaabgabeID($paabgabe_id) {
+		$qry = "SELECT
+					projektarbeit_id
+				FROM
+					campus.tbl_paabgabe
+					JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+				WHERE
+					campus.tbl_paabgabe.paabgabe_id = ?;
+		";
+
+		return $this->execReadOnlyQuery($qry, [$paabgabe_id]);
+	}
 }
diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 416f626e6..480116290 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -38,9 +38,9 @@ $includesArray = array(
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
 <div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
-	uid=<?php echo $uid ?> student_uid_prop=<?php echo $student_uid_prop ?? '""' ?>
-	stg_kz_prop=<?php echo $stg_kz_prop ?? '""' ?>
+	uid=<?php echo $uid ?> 
+	 student_uid_prop="<?php echo $student_uid_prop ?? '' ?>"
+	stg_kz_prop="<?php echo $stg_kz_prop ?? '' ?>"
 	>
-
 </div>
 <?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index 950f23ea9..be03c9728 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -71,11 +71,11 @@ export default {
 			}
 		};
 	},
-	deleteProjektarbeitAbgabe(paabgabe_id, projektarbeit_id) {
+	deleteProjektarbeitAbgabe(paabgabe_id) {
 		return {
 			method: 'post',
 			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabe',
-			params: { paabgabe_id, projektarbeit_id }
+			params: { paabgabe_id }
 		};
 	},
 	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
diff --git a/public/js/apps/Abgabetool/Abgabetool.js b/public/js/apps/Abgabetool/Abgabetool.js
index d1c3e134c..83233ba22 100644
--- a/public/js/apps/Abgabetool/Abgabetool.js
+++ b/public/js/apps/Abgabetool/Abgabetool.js
@@ -29,7 +29,7 @@ const app = Vue.createApp({
 			return { uid: this.uid}
 		},
 		student_uid_computed() {
-			return this.student_uid ?? null
+			return this.student_uid ?? this.uid
 		},
 		stg_kz_computed() {
 			return this.stg_kz ?? null
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index edea46535..32e763eb1 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -40,7 +40,6 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
-			activeIndexArray: null,
 			showAutomagicModalPhrase: false,
 			eidAkzeptiert: false,
 			enduploadTermin: null,
@@ -79,25 +78,6 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
-		getActiveIndexTabArray(additional = []) {
-			// here we try to assume which abgabetermine are the most relevant to the current user
-
-			// lets try to take the termin with nearest date
-			let closestIndex = -1;
-			let minDiff = Infinity;
-			const today = new Date();
-
-
-			this.projektarbeit.abgabetermine.forEach((obj, i) => {
-				const diff = Math.abs(new Date(obj.datum) - today);
-				if (diff < minDiff) {
-					minDiff = diff;
-					closestIndex = i;
-				}
-			});
-
-			return [closestIndex, ...additional]
-		},
 		getPlaceholderTermin(termin) {
 			return termin?.bezeichnung ? this.$p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : this.$p.t('abgabetool/abgabetypPlaceholder')
 		},
@@ -143,7 +123,6 @@ export const AbgabeMitarbeiterDetail = {
 					this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
 					
 					const index = this.projektarbeit.abgabetermine.findIndex(t => termin.paabgabe_id == t.paabgabe_id)
-					this.activeIndexArray = this.getActiveIndexTabArray([index])
 					
 					// negative abgabe -> automagically open new termin modal
 					// really bad feature imo that will be annoying to deal with
@@ -255,7 +234,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		deleteTermin(termin) {
-			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id, this.projektarbeit.projektarbeit_id)).then( (res) => {
+			this.$api.call(ApiAbgabe.deleteProjektarbeitAbgabe(termin.paabgabe_id)).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
 					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
@@ -372,7 +351,7 @@ export const AbgabeMitarbeiterDetail = {
 				window.open(link, '_blank')
 			} else if(this.projektarbeit?.abgabetermine.find(termin => termin.paabgabetyp_kurzbz == 'end' && termin.abgabedatum !== null) && this.projektarbeit?.beurteilungLinkOld) {
 				if(await this.$fhcAlert.confirm({
-					message: this.$p.t('abgabetool/c4aeltereParbeitBenoten'),
+					message: this.$p.t('abgabetool/c4aeltereParbeitBenotenv2'),
 					acceptLabel: this.$capitalize(this.$p.t('abgabetool/c4AcceptAndProceed')),
 					acceptClass: 'btn btn-danger',
 					rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
@@ -610,8 +589,6 @@ export const AbgabeMitarbeiterDetail = {
 		'projektarbeit'(newVal) {
 			// set invertedFixtermin field for UI/UX purposes -> avoid double negation in text
 			
-			this.activeIndexArray = this.getActiveIndexTabArray()
-			
 			newVal?.abgabetermine?.forEach(termin => termin.invertedFixtermin = !termin.fixtermin)
 			
 			// default select german if projektarbeit sprache was null
@@ -748,7 +725,7 @@ export const AbgabeMitarbeiterDetail = {
 				</button>
 			</div>
 		</div>
-		<Accordion :multiple="true" :activeIndex="activeIndexArray">
+		<Accordion :multiple="true">
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 					<template #header>
@@ -880,7 +857,7 @@ export const AbgabeMitarbeiterDetail = {
 										<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4signaturServerError')) }} </Message>
 									</div>
 									<div v-else class="col-auto">
-										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>
+										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noSignatureCheckPossible') }} </Message>
 									</div>
 									
 								</div>						
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index c1573d05d..b8748c193 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -211,24 +211,6 @@ export const AbgabeStudentDetail = {
 				}
 			}
 		},
-		getActiveIndexTabArray() {
-			// here we try to do mind reading logic by assuming which abgabetermine are the most relevant to the current user
-
-			// lets try to take the termin with nearest date and watch who complains and why
-			let closestIndex = -1;
-			let minDiff = Infinity;
-			const today = new Date();
-
-			this.projektarbeit.abgabetermine.forEach((obj, i) => {
-				const diff = Math.abs(new Date(obj.datum) - today);
-				if (diff < minDiff) {
-					minDiff = diff;
-					closestIndex = i;
-				}
-			});
-
-			return [closestIndex]
-		},
 		getEid() {
 			return this.$capitalize(this.$p.t('abgabetool/c4eidesstattlicheErklaerung'))
 		},
@@ -327,7 +309,7 @@ export const AbgabeStudentDetail = {
 				<p> {{projektarbeit?.titel}}</p>
 			</div>
 			
-			<Accordion :multiple="true" :activeIndex="getActiveIndexTabArray">
+			<Accordion :multiple="true">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index b16041b84..e9316c2b3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -153,7 +153,7 @@ export const AbgabetoolStudent = {
 
 						// development purposes
 						// termin.allowedToUpload = this.checkQualityGatesStrict(pa.abgabetermine)
-						termin.allowedToUpload = true
+						// termin.allowedToUpload = true
 
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cc8e86de5..eda605e40 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43719,7 +43719,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4aeltereParbeitBenoten',
+		'phrase' => 'c4aeltereParbeitBenotenv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43736,6 +43736,26 @@ array(
 			)
 		)
 	),
+	array(
+			'app' => 'core',
+			'category' => 'abgabetool',
+			'phrase' => 'c4noSignatureCheckPossible',
+			'insertvon' => 'system',
+			'phrases' => array(
+		array(
+			'sprache' => 'German',
+			'text' => 'Signatur konnte nicht überprüft werden',
+			'description' => '',
+			'insertvon' => 'system'
+		),
+		array(
+			'sprache' => 'English',
+			'text' => 'Unable to check signature',
+			'description' => '',
+			'insertvon' => 'system'
+		)
+	)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From a56335f4f9165b7ec626e85f8f4a86bf3dbd522d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 12 Jan 2026 17:11:48 +0100
Subject: [PATCH 1097/1357] "fix" the signatur check

---
 application/controllers/api/frontend/v1/Abgabe.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 847df2c12..aa588a36f 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -990,9 +990,10 @@ class Abgabe extends FHCAPI_Controller
 	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
 	 */
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
-		if($abgabe->paabgabetyp_kurzbz != 'end') {
-			return;
-		}
+		// TODO: recomment this whenever we decide every upload needs signature check
+//		if($abgabe->paabgabetyp_kurzbz != 'end') {
+//			return;
+//		}
 
 		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$projektarbeit->student_uid.'.pdf';
 		

From cc0f38b276c3e70988de1e2b86e7288e3b5f90d6 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 12 Jan 2026 17:14:03 +0100
Subject: [PATCH 1098/1357] fix the comment describing the "fix"

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

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index aa588a36f..bea40adea 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -990,7 +990,7 @@ class Abgabe extends FHCAPI_Controller
 	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
 	 */
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
-		// TODO: recomment this whenever we decide every upload needs signature check
+		// TODO: recomment this whenever we decide not every upload needs signature check
 //		if($abgabe->paabgabetyp_kurzbz != 'end') {
 //			return;
 //		}

From 7c1f239dcb34b550bc8e7465dc13a4c86a814ae4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 13 Jan 2026 12:32:41 +0100
Subject: [PATCH 1099/1357] configurable paabgabe types for signature check;
 finetuned signature response message; phrasen & code cleanup;

---
 application/config/abgabe.php                 |  4 +++-
 .../controllers/api/frontend/v1/Abgabe.php    | 17 +++++++++-------
 application/core/FHCAPI_Controller.php        |  9 ---------
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  6 +++---
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 12 +++++------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  5 ++---
 system/phrasesupdate.php                      | 20 -------------------
 7 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 8ebcf2777..4fbedd78d 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -22,4 +22,6 @@ $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
-$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
\ No newline at end of file
+$config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
+
+$config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index bea40adea..c0311426b 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -734,8 +734,6 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
 		$email = $this->getDataOrTerminateWithError($result);
 		
-		//TODO: check if private mail exists, if not take uid@domain
-		
 		return $email[0]->private_email ?? $email[0]->uid.'@'.DOMAIN;
 
 	}
@@ -990,10 +988,16 @@ class Abgabe extends FHCAPI_Controller
 	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
 	 */
 	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
-		// TODO: recomment this whenever we decide not every upload needs signature check
-//		if($abgabe->paabgabetyp_kurzbz != 'end') {
-//			return;
-//		}
+		$paabgabetypenToCheck = $this->config->item('SIGNATUR_CHECK_PAABGABETYPEN');
+
+		if(!in_array($abgabe->paabgabetyp_kurzbz, $paabgabetypenToCheck)) {
+			return;
+		}
+
+		if (!defined('SIGNATUR_URL')) {
+			$abgabe->signatur = 'error';
+			return;
+		}
 
 		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$projektarbeit->student_uid.'.pdf';
 		
@@ -1022,7 +1026,6 @@ class Abgabe extends FHCAPI_Controller
 	}
 
 	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
-
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 1ef321d14..e81506d4b 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -309,15 +309,6 @@ class FHCAPI_Controller extends Auth_Controller
 		$max_post = (int)(ini_get('post_max_size'));
 		$memory_limit = (int)(ini_get('memory_limit'));
 		$max_upload_mb = min($max_upload, $max_post, $memory_limit);    // smallest of 3 config values
-
-		$this->addMeta('stats', array(
-			'$content_length_bytes' => $content_length_bytes,
-			'$content_length' => $content_length,
-			'$max_upload' => $max_upload,
-			'$max_post' => $max_post,
-			'$memory_limit' => $memory_limit,
-			'$max_upload_mb' => $max_upload_mb,
-		));
 		
 		if($content_length >= $max_upload_mb) {
 			$this->terminateWithError($this->p->t('global', 'filesizeExceeded'), 'general');
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 32e763eb1..38e9f9dd4 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -856,9 +856,9 @@ export const AbgabeMitarbeiterDetail = {
 										<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4keineSignatur')) }} </Message>
 										<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $capitalize($p.t('abgabetool/c4signaturServerError')) }} </Message>
 									</div>
-									<div v-else class="col-auto">
-										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noSignatureCheckPossible') }} </Message>
-									</div>
+<!--									<div v-else class="col-auto">-->
+<!--										<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>-->
+<!--									</div>-->
 									
 								</div>						
 							</template>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index b8748c193..4fdad305c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -299,7 +299,7 @@ export const AbgabeStudentDetail = {
 
 	},
 	template: `
-		<FhcOverlay :active="loading || saving"></FhcOverlay>
+		<FhcOverlay :active="loading"></FhcOverlay>
 
 		<div v-if="projektarbeit">
 		
@@ -435,14 +435,14 @@ export const AbgabeStudentDetail = {
 										</button>
 									</div>	
 									<template v-if="termin.paabgabetyp_kurzbz == 'end'">	
-										<div v-if="termin?.signatur !== undefined" class="col-auto">
+										<div v-if="termin?.signatur !== undefined && termin?.signatur !== null" class="col-auto">
 											<Message v-if="termin?.signatur == true" severity="success" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturGefunden') }} </Message>
 											<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4keineSignatur') }} </Message>
-											<Message v-else-if="termin?.signatur == null" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
-										</div>
-										<div v-else class="col-auto">
-											<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>
+											<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
 										</div>
+<!--										<div v-else class="col-auto">-->
+<!--											<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>-->
+<!--										</div>-->
 									</template>
 								</div>					
 							</template>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index e9316c2b3..05e20a966 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -13,7 +13,6 @@ export const AbgabetoolStudent = {
 		AbgabeDetail,
 		FhcOverlay
 	},
-	inject: ['isMobile'],
 	provide() {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions),
@@ -317,7 +316,7 @@ export const AbgabetoolStudent = {
 	},
 	template: `
 <template v-if="phrasenResolved">
-	<FhcOverlay :active="loading || saving"></FhcOverlay>
+	<FhcOverlay :active="loading"></FhcOverlay>
 	
 	<bs-modal ref="modalContainerAbgabeDetail" class="bootstrap-prompt"
 		dialogClass="modal-xl" :allowFullscreenExpand="true">
@@ -390,7 +389,7 @@ export const AbgabetoolStudent = {
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuer') )}}</div>
 					<div class="col-8 col-md-9">
-						{{ projektarbeit.betreuerart_kurzbz ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) : '' }}
+						{{ projektarbeit.betreuerart_kurzbz ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : '' }}
 					</div>
 				</div>
 				<div class="row mt-2">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index eda605e40..9501bebf2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43736,26 +43736,6 @@ array(
 			)
 		)
 	),
-	array(
-			'app' => 'core',
-			'category' => 'abgabetool',
-			'phrase' => 'c4noSignatureCheckPossible',
-			'insertvon' => 'system',
-			'phrases' => array(
-		array(
-			'sprache' => 'German',
-			'text' => 'Signatur konnte nicht überprüft werden',
-			'description' => '',
-			'insertvon' => 'system'
-		),
-		array(
-			'sprache' => 'English',
-			'text' => 'Unable to check signature',
-			'description' => '',
-			'insertvon' => 'system'
-		)
-	)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From e89fcbab3179acda91641ca55700af86f800b270 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 13 Jan 2026 13:05:58 +0100
Subject: [PATCH 1100/1357] phrase typo fix

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

diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 4fdad305c..a787f7138 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -287,7 +287,7 @@ export const AbgabeStudentDetail = {
 		},
 		getTooltipBeurteilungerforderlich() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipBeurteilungerfolderlich'),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')),
 				class: "custom-tooltip"
 			}
 		},

From 2d9e9df8a087251cde3dcf6bd22c137cfd2fa32b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 13 Jan 2026 14:10:33 +0100
Subject: [PATCH 1101/1357] fix notiz component showing no data when setting
 sort an switching tabs in stv

---
 public/js/components/Notiz/Notiz.js              | 16 ++++++++++++++--
 .../Stv/Studentenverwaltung/Details/Notizen.js   |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 58168fbc7..39f0e507e 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -42,7 +42,11 @@ export default {
 		showErweitert: Boolean,
 		showDocument: Boolean,
 		showTinyMce: Boolean,
-		visibleColumns: Array
+		visibleColumns: Array,
+		tabulatorPersistenceId: {
+			type: String,
+			default: 'core-notiz'
+		}
 	},
 	data() {
 		return {
@@ -179,7 +183,15 @@ export default {
 				//responsiveLayout: "collapse",
 				maxHeight: '200px',
 				index: 'notiz_id',
-				persistenceID: 'core-notiz'
+				persistenceID: this.tabulatorPersistenceId,
+				persistence: {
+					sort: false,
+					columns: ["width", "visible", "frozen"],
+					filter: false,
+					headerFilter: false,
+					group: false,
+					page: false,
+				}
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index de6470d7e..a28f21e62 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -31,6 +31,7 @@ export default {
 		show-tiny-mce
 		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 		@reload="$emit('update:suffix')"
+		tabulator-persistence-id="stv-notiz-2026011301"
 		>
 </core-notiz>
 

From bbb90f6dc43981e36d5b2f55c373b059f734f9b8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 13 Jan 2026 18:20:05 +0100
Subject: [PATCH 1102/1357] =?UTF-8?q?added=20fixtermin=20variable=20to=20P?=
 =?UTF-8?q?aabgabe->update()=20statement;=20email=20logic=20for=20sancho?=
 =?UTF-8?q?=20emails=20towards=20betreuer:=20=09=09return=20$email[0]->uid?=
 =?UTF-8?q?=20=3F=20$email[0]->uid.'@'.DOMAIN=20:=20$email[0]->private=5Fe?=
 =?UTF-8?q?mail;=20phrasen=20wordings;=20reworked=20assistenz=20config=20a?=
 =?UTF-8?q?pi=20promises=20as=20allSettled=20to=20avoid=20race=20condition?=
 =?UTF-8?q?s;=20nachreichen=20m=C3=B6glich=20is=20always=20the=20default?=
 =?UTF-8?q?=20everywhere;=20WIP=20enabling=20the=20same=20status=20logic?=
 =?UTF-8?q?=20workflow=20everywhere;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/api/frontend/v1/Abgabe.php    |   6 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  10 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 144 +++++++++---------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  20 ++-
 system/phrasesupdate.php                      |   4 +-
 5 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c0311426b..c962e4943 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -531,6 +531,7 @@ class Abgabe extends FHCAPI_Controller
 					'datum' => $datum,
 					'kurzbz' => $kurzbz,
 					'note' => $note,
+					'fixtermin' => $fixtermin,
 					'beurteilungsnotiz' => $beurteilungsnotiz,
 					'upload_allowed' => $upload_allowed,
 					'updatevon' => getAuthUID(),
@@ -543,6 +544,7 @@ class Abgabe extends FHCAPI_Controller
 				'datum' => $datum,
 				'kurzbz' => $kurzbz,
 				'note' => $note,
+				'fixtermin' => $fixtermin,
 				'beurteilungsnotiz' => $beurteilungsnotiz,
 				'upload_allowed' => $upload_allowed,
 				'updatevon' => getAuthUID(),
@@ -734,7 +736,7 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
 		$email = $this->getDataOrTerminateWithError($result);
 		
-		return $email[0]->private_email ?? $email[0]->uid.'@'.DOMAIN;
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
 	}
 
@@ -787,7 +789,7 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool','c4userNichtGefunden'), 'general');
 		}
 		
-		$subject = $this->p->t('abgabetool', 'c4qualgateNegativEmailSubject');
+		$subject = $this->p->t('abgabetool', 'c4qualgateNegativEmailSubjectv2');
 		$tomail = $student_uid.'@'.DOMAIN;
 		
 		$datetime = new DateTime($paabgabe->datum);
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 38e9f9dd4..f084d9d5c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -299,6 +299,14 @@ export const AbgabeMitarbeiterDetail = {
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
+
+			// TODO: load benotbar in every view or change status logic all together!
+			
+			// console.log('\n\n')
+			// console.log(termin)
+			// console.log(today)
+			// console.log(datum)
+			// console.log('\n\n')
 			
 			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
 			if (termin.abgabedatum === null && termin.upload_allowed) {
@@ -532,7 +540,7 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		getTooltipBeurteilungerforderlich() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipBeurteilungerfolderlich'),
+				value: this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich'),
 				class: "custom-tooltip"
 			}
 		},
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 8ca1b931e..739791ed4 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -72,6 +72,7 @@ export const AbgabetoolAssistenz = {
 			selectedStudiengangOption: null,
 			studiengaengeOptions: null,
 			detailIsFullscreen: false,
+			allConfigPromise: null,
 			phrasenPromise: null,
 			phrasenResolved: false,
 			turnitin_link: null,
@@ -90,6 +91,7 @@ export const AbgabetoolAssistenz = {
 				},
 				kurzbz: '',
 				fixtermin: false,
+				invertedFixtermin: true,
 				upload_allowed: false
 			}),
 			showAll: false,
@@ -285,7 +287,7 @@ export const AbgabetoolAssistenz = {
 				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate1StatusRank <= 2) {
 					projekt.qgate1Status = this.$p.t('abgabetool/c4notSubmitted')
 					projekt.qgate1StatusRank = 2
-				} else if (qgate.upload_allowed == false && diffMs <= 0 && projekt.qgate1StatusRank <= 1) {
+				} else if (qgate.upload_allowed == false && qgate.diffMs <= 0 && projekt.qgate1StatusRank <= 1) {
 					projekt.qgate1Status = this.$p.t('abgabetool/c4notHappenedYet')
 					projekt.qgate1StatusRank = 1
 				}
@@ -307,7 +309,7 @@ export const AbgabetoolAssistenz = {
 				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate2StatusRank <= 2) {
 					projekt.qgate2Status = this.$p.t('abgabetool/c4notSubmitted')
 					projekt.qgate2StatusRank = 2
-				} else if (qgate.upload_allowed == false && diffMs <= 0 && projekt.qgate2StatusRank <= 1) {
+				} else if (qgate.upload_allowed == false && qgate.diffMs <= 0 && projekt.qgate2StatusRank <= 1) {
 					projekt.qgate2Status = this.$p.t('abgabetool/c4notHappenedYet')
 					projekt.qgate2StatusRank = 1
 				}
@@ -582,6 +584,7 @@ export const AbgabetoolAssistenz = {
 		addSeries() {
 			const pids = this.selectedData?.map(projekt => projekt.projektarbeit_id)
 			this.saving = true
+			this.serienTermin.fixtermin = !this.serienTermin.invertedFixtermin
 			this.$api.call(ApiAbgabe.postSerientermin(
 				this.serienTermin.datum.toISOString(),
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
@@ -896,6 +899,8 @@ export const AbgabetoolAssistenz = {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
 			
+			await this.allConfigPromise
+			
 			// called through notenOptionFilter/selectedStudiengangOption watcher on startup
 			// this.loadProjektarbeiten()
 
@@ -929,79 +934,74 @@ export const AbgabetoolAssistenz = {
 		this.loading = true
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
-		// fetch config to avoid hard coded links
-		this.$api.call(ApiAbgabe.getConfig()).then(res => {
-			this.turnitin_link = res.data?.turnitin_link
-			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
-		}).catch(e => {
-			this.loading = false
-		})
-
-		// fetch studiengänge options
-		this.$api.call(ApiAbgabe.getStudiengaenge()).then(res => {
-			this.studiengaengeOptions = res.data
-			if(this.studiengaengeOptions?.length) {
-				
-				// use this.stg_kz_prop as default selected in case of url param usage
-				
-				this.selectedStudiengangOption = this.stg_kz_prop ? res.data.find(stgOpt => stgOpt.studiengang_kz == this.stg_kz_prop) : res.data[0]
-			}
-			
-		}).catch(e => {
-			this.loading = false
-		})
 		
-		this.$api.call(ApiStudiensemester.getAllStudiensemesterAndAktOrNext()).then((res) => {
-			this.allSem = res.data[0]
-			const all = {studiensemester_kurzbz: this.$p.t('abgabetool/c4all')}
-			this.curSem = all // res.data[1]
-			
-			this.studiensemesterOptions = [all, ...this.allSem]
-
-		}).catch(e => {
-			this.loading = false
-		})
-		
-		// fetch noten options
 		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
-		this.$api.call(ApiAbgabe.getNoten()).then(res => {
-			if(res.meta.status == 'success') {
-				this.notenOptions = res.data[0]
+		const requests = [
+			this.$api.call(ApiAbgabe.getConfig()),
+			this.$api.call(ApiAbgabe.getStudiengaenge()),
+			this.$api.call(ApiStudiensemester.getAllStudiensemesterAndAktOrNext()),
+			this.$api.call(ApiAbgabe.getNoten()),
+			this.$api.call(ApiAbgabe.getPaAbgabetypen())
+		];
 
-				this.allowedNotenOptions = this.notenOptions.filter(
-					opt => res.data[1].includes(opt.note)
-				)
-			}
-			
-			// allowedNotenOptions apply to quality gates abgabetermine
-			// this selection is about graded projektarbeiten, so take different options here
-			this.allowedNotenFilterOptions = [
-				{
-					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/keineNoteEingetragen')),
-					benotet: 0,
-				},
-				{
-					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/c4benotet')),
-					benotet: 1,
-				},
-				{
-					bezeichnung: Vue.computed(() => this.$p.t('abgabetool/showAll')),
-					benotet: -1,
-				},
-			]
-			
-			this.notenOptionFilter = this.allowedNotenFilterOptions[0]
-				
-		}).catch(e => {
-			this.loading = false
-		})
+		this.allConfigPromise = Promise.allSettled(requests)
+			.then((results) => {
+				// results is an array of { status: 'fulfilled'|'rejected', value?: any, reason?: any }
 
-		// fetch abgabetypen options
-		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
-			this.abgabeTypeOptions = res.data
-		}).catch(e => {
-			this.loading = false
-		})
+				// 1. Config
+				if (results[0].status === 'fulfilled') {
+					const res = results[0].value;
+					this.turnitin_link = res.data?.turnitin_link;
+					this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link;
+				}
+
+				// 2. Studiengänge
+				if (results[1].status === 'fulfilled') {
+					const res = results[1].value;
+					this.studiengaengeOptions = res.data;
+					if (this.studiengaengeOptions?.length) {
+						this.selectedStudiengangOption = this.stg_kz_prop
+							? res.data.find(stgOpt => stgOpt.studiengang_kz == this.stg_kz_prop)
+							: res.data[0];
+					}
+				}
+
+				// 3. Studiensemester
+				if (results[2].status === 'fulfilled') {
+					const res = results[2].value;
+					this.allSem = res.data[0];
+					const all = { studiensemester_kurzbz: this.$p.t('abgabetool/c4all') };
+					this.curSem = all;
+					this.studiensemesterOptions = [all, ...this.allSem];
+				}
+
+				// 4. Noten
+				if (results[3].status === 'fulfilled') {
+					const res = results[3].value;
+					if (res.meta?.status === 'success') {
+						this.notenOptions = res.data[0];
+						this.allowedNotenOptions = this.notenOptions.filter(
+							opt => res.data[1].includes(opt.note)
+						);
+					}
+
+					this.allowedNotenFilterOptions = [
+						{ bezeichnung: Vue.computed(() => this.$p.t('abgabetool/keineNoteEingetragen')), benotet: 0 },
+						{ bezeichnung: Vue.computed(() => this.$p.t('abgabetool/c4benotet')), benotet: 1 },
+						{ bezeichnung: Vue.computed(() => this.$p.t('abgabetool/showAll')), benotet: -1 }
+					];
+					this.notenOptionFilter = this.allowedNotenFilterOptions[0];
+				}
+
+				// 5. Abgabetypen
+				if (results[4].status === 'fulfilled') {
+					const res = results[4].value;
+					this.abgabeTypeOptions = res.data;
+				}
+			})
+			.finally(() => {
+				this.loading = false;
+			});
 	},
 	mounted() {
 		this.setupMounted()
@@ -1023,7 +1023,7 @@ export const AbgabetoolAssistenz = {
 					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
 					<div class="col-12 col-md-9">
 						<Checkbox
-							v-model="serienTermin.fixtermin"
+							v-model="serienTermin.invertedFixtermin"
 							:binary="true"
 							:pt="{ root: { class: 'ml-auto' }}"
 						>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 05e20a966..2069e1275 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -45,11 +45,19 @@ export const AbgabetoolStudent = {
 		};
 	},
 	methods: {
-		dateDiffInDays(datum){
+		dateDiffInDays(datumParam){
+			let datum = datumParam
+			if(datumParam instanceof Date && !isNaN(datum.getTime()))
+			{
+				const year = datumParam.getFullYear();
+				const month = datumParam.getMonth() + 1;	// getMonth() is 0-indexed
+				const day = datumParam.getDate();
+				const pad = (num) => String(num).padStart(2, '0');
+				datum = `${year}-${pad(month)}-${pad(day)}`
+			}
+
 			const dateToday = luxon.DateTime.now().startOf('day');
-
 			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
-
 			const duration = dateDatum.diff(dateToday, 'days');
 
 			return duration.values.days;
@@ -60,6 +68,12 @@ export const AbgabetoolStudent = {
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
+			// console.log('\n\n')
+			// console.log(termin)
+			// console.log(today)
+			// console.log(datum)
+			// console.log('\n\n')
+			
 			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
 			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9501bebf2..8d7d7e624 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44855,12 +44855,12 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4qualgateNegativEmailSubject',
+		'phrase' => 'c4qualgateNegativEmailSubjectv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Quality Gate Negativ beurteilt",
+				'text' => "Quality Gate negativ beurteilt",
 				'description' => '',
 				'insertvon' => 'system'
 			),

From d67cad925d2f914c3fbf265d0a608ff709711903 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 14 Jan 2026 13:59:42 +0100
Subject: [PATCH 1103/1357] externe ueberwachung deaktivieren ueber config
 params in die config verlagert

---
 cis/testtool/login.php                        |  2 +-
 cis/testtool/resetconnection.php              |  3 +-
 composer.json                                 |  4 +-
 composer.lock                                 | 59 ++++++++++++++++++-
 config/cis.config-default.inc.php             |  2 +
 config/global.config-default.inc.php          |  3 +
 include/externe_ueberwachung.class.php        | 14 +++--
 vilesci/stammdaten/reihungstestverwaltung.php |  2 +
 8 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 2b4e678fa..88e8827ff 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -173,7 +173,7 @@ if (isset($_REQUEST['prestudent']))
 							$reload_menu = true;
 					}
 
-					if ($rt->externe_ueberwachung)
+					if ($rt->externe_ueberwachung && defined('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED') && TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED)
 					{
 						$_SESSION['externe_ueberwachung'] = true;
 						$_SESSION['externe_ueberwachung_verified'] = false;
diff --git a/cis/testtool/resetconnection.php b/cis/testtool/resetconnection.php
index e0141ae0b..ab2806a1f 100644
--- a/cis/testtool/resetconnection.php
+++ b/cis/testtool/resetconnection.php
@@ -8,8 +8,7 @@ require_once('../../config/global.config.inc.php');
 require_once '../../include/externe_ueberwachung.class.php';
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
-
-if (isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true)
+if ((defined('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED') && TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED) && isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true)
 {
 	$ueberwachung = new externeUeberwachung();
 	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID'], $_SESSION['sprache']);
diff --git a/composer.json b/composer.json
index 35499ec61..c1f4506c6 100644
--- a/composer.json
+++ b/composer.json
@@ -456,6 +456,7 @@
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",
 		"fzaninotto/faker": "1.*",
+		"firebase/php-jwt": "^6.0",
 
 		"highcharts/highcharts-dist": "^7.1.2",
 
@@ -517,7 +518,6 @@
 		"phpmd/phpmd": "2.*",
 		"phpmetrics/phpmetrics": "2.*",
 		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6",
-		"firebase/php-jwt": "^6.0"
+		"phpunit/phpunit": "^6"
 	}
 }
diff --git a/composer.lock b/composer.lock
index f2ce3923c..7525b7f5b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1de37a74ba51a66057eb2712b21340c8",
+    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -882,6 +882,63 @@
             },
             "type": "library"
         },
+        {
+            "name": "firebase/php-jwt",
+            "version": "v6.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "0541cba75ab108ef901985e68055a92646c73534"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
+                "reference": "0541cba75ab108ef901985e68055a92646c73534",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8 <=9"
+            },
+            "suggest": {
+                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.0.0"
+            },
+            "time": "2022-01-24T15:18:34+00:00"
+        },
         {
             "name": "fortawesome/font-awesome4",
             "version": "4.7.0",
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 0bef3a523..cac05ec7a 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -308,5 +308,7 @@ define('EXTERNE_UEBERWACHUNG_SECRET_KEY', null);
 define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
 define('EXTERNE_UEBERWACHUNG_SESSION_URL', 'https://example.com');
 define('EXTERNE_UEBERWACHUNG_TRIAL_TEST', false);
+define('EXTERNE_UEBERWACHUNG_EXAM_PARAMS', []);
+
 
 ?>
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index f24a302cc..c074b7559 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -360,4 +360,7 @@ define('SANCHO_MAIL_HEADER_IMG', 'sancho_header_DEFAULT.jpg');
 
 // footer image for eigene Mails
 define('SANCHO_MAIL_FOOTER_IMG', 'sancho_footer_DEFAULT.jpg');
+
+//externe Ueberwachung im Testtool erlauben
+define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index b28a8439a..a047dfd9a 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -153,18 +153,20 @@ class externeUeberwachung extends basis_db
 			"accountId" => "technikum_wien",
 			"examId" => $reihungstest_id . '_' . $today,
 			"examName" => !is_null(trim($reihungstest->anmerkung)) ? ($reihungstest->anmerkung . '_' . $today) : ($reihungstest_id . '_' . $today),
-			"allowMultipleDisplays" => true,
-			"allowMakingRoomScanSecondCamera" => false,
-			"duration" => 600,
+			"duration" => 1440,
 			"schedule" => false,
 			"trial" => EXTERNE_UEBERWACHUNG_TRIAL_TEST,
 			"proctoring" => "offline",
-			"identification" => "skip",
-			"startDate" => "2018-03-27T00:00:00Z", //TODO anpassen
-			"endDate" => "2027-03-30T12:55:00Z", // TODO anpassen
+			"startDate" => $reihungstest->datum . 'T00:00:00Z',
+			"endDate" => $reihungstest->datum . 'T23:59:59Z',
 			"sessionId" => $session_id,
 			"sessionUrl" => EXTERNE_UEBERWACHUNG_SESSION_URL
 		];
+
+		if (defined('EXTERNE_UEBERWACHUNG_EXAM_PARAMS'))
+		{
+			$payload = array_merge($payload, EXTERNE_UEBERWACHUNG_EXAM_PARAMS);
+		}
 		return $payload;
 	}
 
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index babbc3ce4..990b3e129 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -2573,12 +2573,14 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 				<input type="number" class="input" id="zugangcode" name="zugangcode" value="<?php echo $db->convert_html_chars($reihungstest->zugangscode) ?>"> (Verpflichtend, wenn die Zugangsüberprüfung aktiviert ist)
 			</td>
 		</tr>
+		<?php if(defined('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED') && TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED) : ?>
 			<tr>
 				<td class="feldtitel">Externe Überwachnung</td>
 				<td>
 					<input type="checkbox" id="externe_ueberwachung" name="externe_ueberwachung"<?php echo $reihungstest->externe_ueberwachung ? 'checked="checked"' : '' ?>>
 				</td>
 			</tr>
+		<?php endif; ?>
 		<tr>
 			<td>&nbsp;</td>
 		</tr>

From eb15d6b841172bda03704daa493fa40c305a9159 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 14 Jan 2026 16:57:57 +0100
Subject: [PATCH 1104/1357] getStudentConfig Api Method; moodle link config
 entry; write abgabetool termin noten into header; uniform getDateStyleClass
 logic in all 3 views; WIP refining AbgabetoolJob;

---
 application/config/abgabe.php                 |  5 ++-
 .../controllers/api/frontend/v1/Abgabe.php    | 14 ++++++
 .../controllers/jobs/AbgabetoolJob.php        | 24 ++++++----
 public/js/api/factory/abgabe.js               |  6 +++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 45 +++++++++++--------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 44 +++++++++++++-----
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  5 ++-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  1 -
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 31 ++++++++-----
 system/phrasesupdate.php                      | 40 +++++++++++++++++
 10 files changed, 165 insertions(+), 50 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 4fbedd78d..282421ac0 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -24,4 +24,7 @@ $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/p
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
 
-$config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
\ No newline at end of file
+$config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
+
+// to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
+$config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c962e4943..d5fe43a72 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -30,6 +30,7 @@ class Abgabe extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getConfig' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_lektor:rw'),
+			'getConfigStudent' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
 			'getStudentProjektarbeiten' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
 			'getStudentProjektabgaben' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw', 'basis/abgabe_lektor:rw'),
 			'postStudentProjektarbeitZwischenabgabe' => array('basis/abgabe_assistenz:rw', 'basis/abgabe_student:rw'),
@@ -94,6 +95,19 @@ class Abgabe extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($ret);
 	}
+
+	/**
+	 * loads config related to abgabetool for students to avoid handing out links reserved for employees
+	 */
+	public function getConfigStudent() {
+		$moodle_link =$this->config->item('STG_MOODLE_LINK');
+
+		$ret = array(
+			'moodle_link' => $moodle_link,
+		);
+
+		$this->terminateWithSuccess($ret);
+	}
 	
 	/**
 	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool & lektor abgabetool
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index fcdb33f48..a4c576093 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -96,14 +96,14 @@ class AbgabetoolJob extends JOB_Controller
 
 				// filter for abgaben which where not inserted by the current betreuer iteration if there is no updateamum
 				// or not changed by the betreuer if there is updateamum
-				$relevantAbgaben = array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
+				$relevantAbgaben = array_values(array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
 					// new termin not created by that betreuer
 					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
 						return $abgabetermin;
 					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
 						return $abgabetermin;
 					}
-				});
+				}));
 
 				if(count($relevantAbgaben) == 0) {
 					break; // skip that projektarbeit if only changes originate from the betreuer in question
@@ -143,15 +143,17 @@ class AbgabetoolJob extends JOB_Controller
 				'abgabenString' => $abgabenString,
 				'linkAbgabetool' => $url
 			);
-
+			
+			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
+			
 			// send email with bundled info
 			sendSanchoMail(
 				'PAAChangesBetSM',
 				$body_fields,
-				$betreuerRow->private_email,
+				$email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
 			);
-
+			
 			$count++;
 		}
 
@@ -170,6 +172,8 @@ class AbgabetoolJob extends JOB_Controller
 
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
 		$retval = getData($result);
+		
+		var_dump($retval);
 
 		// retval are paabgaben joined with projektarbeit and betreuer
 		if(count($retval) == 0) {
@@ -186,14 +190,14 @@ class AbgabetoolJob extends JOB_Controller
 
 			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
 		}
-
+		
 		$count = 0;
 		forEach ($betreuer_uids as $person_id => $abgaben) {
 			// $person_id is from betreuer
 
 			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
 			$data = getData($result)[0];
-
+			
 			$anrede = $data->anrede;
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
@@ -233,11 +237,15 @@ class AbgabetoolJob extends JOB_Controller
 				'linkAbgabetool' => $url
 			);
 
+			// TODO: get this guys uid safely
+//			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
+
+
 			// send email with bundled info
 			sendSanchoMail(
 				'PaabgabeUpdatesBetSM',
 				$body_fields,
-				$data->private_email,
+				$email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
 			);
 			
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index be03c9728..f5659f3a0 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -5,6 +5,12 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getConfig'
 		};
 	},
+	getConfigStudent() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Abgabe/getConfigStudent'
+		};
+	},
 	getStudentProjektarbeiten(uid) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index f084d9d5c..91d8e5a4e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -78,6 +78,15 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
+		getNoteBezeichnung(termin){
+			if(termin.note?.bezeichnung) {
+				return termin.note?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
+			} else if(termin.bezeichnung?.benotbar === true && !termin.note) {
+				return this.$capitalize(this.$p.t('abgabetool/c4notYetGraded'));
+			} else {
+				return ''
+			}
+		},
 		getPlaceholderTermin(termin) {
 			return termin?.bezeichnung ? this.$p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : this.$p.t('abgabetool/abgabetypPlaceholder')
 		},
@@ -299,16 +308,8 @@ export const AbgabeMitarbeiterDetail = {
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
-
-			// TODO: load benotbar in every view or change status logic all together!
 			
-			// console.log('\n\n')
-			// console.log(termin)
-			// console.log(today)
-			// console.log(datum)
-			// console.log('\n\n')
-			
-			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			if(termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
 			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
 					return 'verpasst' // needs upload, missed it and has not submitted anything 
@@ -737,8 +738,9 @@ export const AbgabeMitarbeiterDetail = {
 			<template v-for="termin in this.projektarbeit?.abgabetermine">
 				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
 					<template #header>
-						<div class="d-flex row w-100 flex-nowrap align-items-center">
-							<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<div class="d-flex flex-nowrap align-items-center w-100">
+			
+							<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -66px;">
 								<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
@@ -746,19 +748,26 @@ export const AbgabeMitarbeiterDetail = {
 								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 							</div>
-							<div class="col-auto text-start" style="min-width: max(150px, 20%); max-width: min(300px, 30%); transform: translateX(-30px)">
-								<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
+					
+							<div class="text-start px-2" style="min-width: 150px; max-width: 300px; margin-left: 40px">
+								<span class="text-truncate d-block">{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
 							</div>
-							<div class="col-auto text-start" style="min-width: 100px; transform: translateX(-30px)">
+					
+							<div class="text-start px-2" style="min-width: 100px;">
 								<span>{{ formatDate(termin.datum) }}</span>
 							</div>
-							<div v-if="termin?.fixtermin" class="col-auto" style="transform: translateX(-30px)">
-								<i  v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
+					
+							<div v-if="termin?.fixtermin" class="px-1">
+								<i v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
 							</div>
-							<div v-if="termin?.abgabedatum" class="col-auto" style="transform: translateX(-30px)">
+							<div v-if="termin?.abgabedatum" class="px-1">
 								<i v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
 							</div>
-						</div>				
+					
+							<div class="flex-grow-1 text-end pe-2">
+								<span class="fw-bold">{{getNoteBezeichnung(termin)}}</span>
+							</div>
+						</div>
 					</template>
 					<div class="row mt-2" v-if="assistenzMode">
 						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4fixterminv4') )}}</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index a787f7138..8f9b77312 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -20,7 +20,7 @@ export const AbgabeStudentDetail = {
 		VueDatePicker,
 		FhcOverlay
 	},
-	inject: ['notenOptions', 'isMobile', 'isViewMode'],
+	inject: ['notenOptions', 'isMobile', 'isViewMode', 'moodle_link'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -49,6 +49,17 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	methods: {
+		getNoteBezeichnung(termin){
+			const noteOpt = this.notenOptions.find(opt => opt.note == termin.note)
+			
+			if(noteOpt?.bezeichnung) {
+				return noteOpt?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
+			} else if(noteOpt?.benotbar === true && !termin.note) {
+				return this.$capitalize(this.$p.t('abgabetool/c4notYetGraded'));
+			} else {
+				return ''
+			}
+		},
 		async validate(termin, endupload = false) {
 			if(!termin.file.length) {
 				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningChooseFile')));
@@ -196,6 +207,9 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	computed: {
+		getMoodleLink() {
+			return this.moodle_link + this.projektarbeit.studiengang_kz	
+		},
 		getMessagePtStyle() {
 			// adjust outer spacing and internal padding to appear similar to doenload button in size
 			return {
@@ -305,16 +319,23 @@ export const AbgabeStudentDetail = {
 		
 			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
 			<div class="row">
-				<p> {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
-				<p> {{projektarbeit?.titel}}</p>
+				<div class="col-8">
+					<p> {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
+					<p> {{projektarbeit?.titel}}</p>
+				</div>
+				<div class="col-4">
+					<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 
+						<a :href="getMoodleLink">Moodle</a>
+					</p>
+				</div>
 			</div>
 			
 			<Accordion :multiple="true">
 				<template v-for="termin in this.projektarbeit?.abgabetermine">
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
-							<div class="d-flex row w-100 flex-nowrap align-items-center">
-								<div class="col-auto" style="transform: translateX(-58px); height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+							<div class="d-flex flex-nowrap align-items-center w-100">
+								<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -66px;">
 									<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
@@ -322,18 +343,21 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
 									<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 								</div>
-								<div class="col-auto text-start pl-2 pr-0 pt-0 pb-0" style="min-width: min(300px, 30%); max-width: min(300px, 30%); transform: translateX(-30px)">
+								<div class="text-start px-2" style="min-width: 150px; max-width: 300px; margin-left: 40px">
 									<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
 								</div>
-								<div class="col-auto text-start p-0" style="min-width: max(80px, 15%); transform: translateX(-30px)">
+								<div class="text-start px-2" style="min-width: 100px;">
 									<span>{{ formatDate(termin.datum) }}</span>
 								</div>
-								<div class="col-auto" style="transform: translateX(-30px); min-width: 42px;">
+								<div class="px-1">
 									<i v-if="termin?.fixtermin" v-tooltip.right="getTooltipFixtermin" class="fa-solid fa-lock"></i>
 									<i v-if="termin?.abgabedatum && isMobile" v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
 								</div>
-								<div v-if="termin?.abgabedatum && !isMobile" class="col-auto" style="transform: translateX(-30px); min-width: 42px;">
-									<i  v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
+								<div v-if="termin?.abgabedatum && !isMobile" class="px-1">
+									<i v-tooltip.right="getTooltipAbgabeDetected" class="fa-solid fa-file"></i>
+								</div>
+								<div class="flex-grow-1 text-end pe-2">
+									<span class="fw-bold">{{getNoteBezeichnung(termin)}}</span>
 								</div>
 							</div>				
 						</template>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 739791ed4..74db4c9c7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -359,7 +359,8 @@ export const AbgabetoolAssistenz = {
 		checkAbgabetermineProjektarbeit(projekt) {
 			// calculate Abgabetermin time diff to now and assign last and next to projekt
 			projekt.abgabetermine.forEach(termin => {
-
+				
+				
 				// while already looping through each termin, calculate datestyle beforehand
 				termin.dateStyle = this.getDateStyleClass(termin)
 
@@ -723,7 +724,7 @@ export const AbgabetoolAssistenz = {
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
 			// seperate status if termin is in the past, it needs a note but doesnt have one yet			
-			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			if(termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
 			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
 					return 'verpasst' // needs upload, missed it and has not submitted anything 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 0cecb10e2..adb165a0a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -454,7 +454,6 @@ export const AbgabetoolMitarbeiter = {
 			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
 			this.abgabetypenBetreuer = res.data?.abgabetypenBetreuer
 		}).catch(e => {
-			console.log(e)
 			this.loading = false
 		})
 		
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 2069e1275..493c78918 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -16,7 +16,8 @@ export const AbgabetoolStudent = {
 	provide() {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions),
-			isViewMode: Vue.computed(() => this.isViewMode)
+			isViewMode: Vue.computed(() => this.isViewMode),
+			moodle_link: Vue.computed(() => this.moodle_link)
 		}
 	},
 	props: {
@@ -35,17 +36,19 @@ export const AbgabetoolStudent = {
 	data() {
 		return {
 			activeTabIndex: [0],
+			abgabeTypeOptions: null,
 			phrasenPromise: null,
 			phrasenResolved: false,
 			loading: false,
 			notenOptions: null,
 			detail: null,
 			projektarbeiten: null,
-			selectedProjektarbeit: null
+			selectedProjektarbeit: null,
+			moodle_link: null
 		};
 	},
 	methods: {
-		dateDiffInDays(datumParam){
+		dateDiffInDays(datumParam) {
 			let datum = datumParam
 			if(datumParam instanceof Date && !isNaN(datum.getTime()))
 			{
@@ -67,14 +70,8 @@ export const AbgabetoolStudent = {
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
-
-			// console.log('\n\n')
-			// console.log(termin)
-			// console.log(today)
-			// console.log(datum)
-			// console.log('\n\n')
 			
-			if(today > datum && termin.benotbar && !termin.note) return 'beurteilungerforderlich'
+			if (termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
 			if (termin.abgabedatum === null && termin.upload_allowed) {
 				if(datum < today) {
 					return 'verpasst' // needs upload, missed it and has not submitted anything 
@@ -175,6 +172,7 @@ export const AbgabetoolStudent = {
 						termin.allowedToUpload = termin.upload_allowed 
 					}
 
+					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 					termin.dateStyle = this.getDateStyleClass(termin)
 				})
 				
@@ -324,6 +322,19 @@ export const AbgabetoolStudent = {
 			this.loading = false
 		})
 
+		// fetch abgabetypen options
+		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
+			this.abgabeTypeOptions = res.data
+		}).catch(e => {
+			this.loading = false
+		})
+
+		// fetch config to avoid hard coded links
+		this.$api.call(ApiAbgabe.getConfigStudent()).then(res => {
+			this.moodle_link = res.data?.moodle_link
+		}).catch(e => {
+			this.loading = false
+		})
 	},
 	mounted() {
 		this.setupMounted()
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8d7d7e624..df654c1cd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44872,6 +44872,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4noGradeAssignedYet',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Keine Note eingetragen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'no grade assigned yet',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -46153,6 +46173,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4checkoutStgMoodleInfos',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für weitere Information zu den Abgabemodalitäten Ihres Studienganges lesen Sie bitte die Unterlagen in Moodle: ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "For further information on the submission procedures for your degree program, please refer to the documents in Moodle: ",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 597d4dbfec5e4cc887d3604dd0b21a084faced86 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 15 Jan 2026 11:37:51 +0100
Subject: [PATCH 1105/1357] Abschusspruefung Modal add model-type to datepicker
 to prevent sending full utc timestamp to backend

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 2f15a57ef..d46e1f299 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -757,6 +757,7 @@ export default {
 						:label="$p.t('global', 'datum')"
 						type="DatePicker"
 						v-model="formData.datum"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -781,6 +782,7 @@ export default {
 						:label="$p.t('abschlusspruefung', 'sponsion')"
 						type="DatePicker"
 						v-model="formData.sponsion"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

From c720c4612515660466c36cbfb642359e5d0f43d2 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 15 Jan 2026 16:28:38 +0100
Subject: [PATCH 1106/1357] education/Projektarbeit_model: fix missing
 from-clause entry for table tbl_projektarbeit error - ticket#6059687

---
 application/models/education/Projektarbeit_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 414d1d1be..193446402 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -64,16 +64,16 @@ class Projektarbeit_model extends DB_Model
 		if (isset($projekttyp))
 		{
 			if (is_array($projekttyp))
-				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz IN ?';
+				$qry .= ' AND pa.projekttyp_kurzbz IN ?';
 			else
-				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz=?';
+				$qry .= ' AND pa.projekttyp_kurzbz=?';
 
 			$params[] = $projekttyp;
 		}
 
 		if (isset($final))
 		{
-			$qry .= ' AND tbl_projektarbeit.final=?';
+			$qry .= ' AND pa.final=?';
 			$params[] = $final;
 		}
 

From ef08e39449de7d3f155db86bd0e04543030ce49f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 15 Jan 2026 17:09:30 +0100
Subject: [PATCH 1107/1357] api endpoint student: prevent storing an empty
 string as alias e.g. from StudVw Details Tab

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index ad6883f94..943577bb3 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -321,6 +321,10 @@ class Student extends FHCAPI_Controller
 		foreach ($array_allowed_props_benutzer as $prop) {
 			$val = $this->input->post($prop);
 			if ($val !== null) {
+				if($prop === 'alias' && $val === '')
+				{
+					$val = null;
+				}
 				$update_benutzer[$prop] = $val;
 			}
 		}

From 62f5b663242ee7f6cdc7cdb6d0ebaad3efe1625b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 15 Jan 2026 17:24:38 +0100
Subject: [PATCH 1108/1357] add missing parameters studiensemester and
 studiengang_kz for document Studienbestaetigung and
 StudienbestaetigungEnglish

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

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 8a69d28ab..9f54d0aa4 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -596,8 +596,8 @@ class Dokumente extends FHCAPI_Controller
 			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null),
 			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null),
 
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uid, 50, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uid, 51, null),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 51, null),
 			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,200, "zutrittskarte.php"),
 			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
 			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
@@ -686,8 +686,8 @@ class Dokumente extends FHCAPI_Controller
 			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
 			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf", $uidString, 50, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf", $uidString, 51, null),
+			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 50, null),
+			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 51, null),
 			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,200, "zutrittskarte.php"),
 			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
 			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),

From fbd0a4685e83c3e979ff68c1f3362dc7bf203f55 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 15 Jan 2026 18:40:51 +0100
Subject: [PATCH 1109/1357] fix jobs & fancy formatting; check paabgabetyp
 instead of bezeichnung to enable enduploads for users in english lmao

---
 .../controllers/jobs/AbgabetoolJob.php        | 154 +++++++++++++-----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   2 +-
 2 files changed, 111 insertions(+), 45 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index a4c576093..420379f72 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -28,6 +28,7 @@ class AbgabetoolJob extends JOB_Controller
 	}
 
 	public function notifyBetreuerAboutChangedAbgaben() {
+		
 		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
@@ -40,6 +41,8 @@ class AbgabetoolJob extends JOB_Controller
 			return;
 		}
 
+		// TODO: student name in abgabenstring hinzufügen
+		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
 		foreach($retval as $newOrChangedAbgabe) {
@@ -79,8 +82,9 @@ class AbgabetoolJob extends JOB_Controller
 		// $tupel = [$projektarbeit_id, $betreuerRow], each betreuer has 0..n [projektarbeit_id, changedAbgaben] tupel
 		forEach($betreuerMap as $betreuer_person_id => $tupelArr) {
 
-			$abgabenString = '<br /><br />';
-			
+			// start the container
+			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
+
 			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
 			$data = getData($result)[0];
 
@@ -94,10 +98,7 @@ class AbgabetoolJob extends JOB_Controller
 
 				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
 
-				// filter for abgaben which where not inserted by the current betreuer iteration if there is no updateamum
-				// or not changed by the betreuer if there is updateamum
 				$relevantAbgaben = array_values(array_filter($changedAbgaben, function($abgabetermin) use ($betreuerRow) {
-					// new termin not created by that betreuer
 					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $betreuerRow->uid) {
 						return $abgabetermin;
 					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $betreuerRow->uid) {
@@ -106,35 +107,59 @@ class AbgabetoolJob extends JOB_Controller
 				}));
 
 				if(count($relevantAbgaben) == 0) {
-					break; // skip that projektarbeit if only changes originate from the betreuer in question
+					continue; // Changed break to continue to allow checking other projects in the tuple
 				}
 
 				$projektarbeit_titel = $relevantAbgaben[0]->titel ?? 'Kein Titel vergeben';
-				$abgabenString .= 'Projektarbeit: '.$projektarbeit_titel.' ('.$betreuerRow->betreuerart_kurzbz.') ID:'.$projektarbeit_id.'<br/>';
-				$abgabenString .= 'Stg: '.$relevantAbgaben[0]->stgtyp.$relevantAbgaben[0]->stgkz.' Semester: '.$relevantAbgaben[0]->studiensemester_kurzbz.'<br/>';
+
+				// --- Start Project Header Section ---
+				$abgabenString .= "
+				<div style='margin-top: 25px; padding: 10px; background-color: #f8f9fa; border-left: 4px solid #007bff;'>
+					<strong style='font-size: 16px;'>Projekt: {$projektarbeit_titel}</strong><br/>
+					<span style='color: #666; font-size: 13px;'>
+						ID: {$projektarbeit_id} | Rolle: {$betreuerRow->betreuerart_kurzbz} | 
+						Studiengang: {$relevantAbgaben[0]->stgtyp}{$relevantAbgaben[0]->stgkz} ({$relevantAbgaben[0]->studiensemester_kurzbz})
+					</span>
+				</div>";
+			
+					// --- Start Table ---
+					$abgabenString .= '
+				<table style="width: 100%; border-collapse: collapse; margin-top: 10px; margin-bottom: 20px;">
+					<thead>
+						<tr style="background-color: #eee; text-align: left;">
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Zieldatum</th>
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Abgabe bis</th>
+						</tr>
+					</thead>
+					<tbody>';
+
 				foreach ($relevantAbgaben as $abgabe) {
-					$datetime = new DateTime($abgabe->datum);
-					$dateEmailFormatted = $datetime->format('d.m.Y');
+					$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
 
-					$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
-					$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777;'>{$abgabe->kurzbz}</small>" : "";
 
-					$abgabenString .= ' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ';
-					if($abgabe->kurzbz != '') {
-						$abgabenString .= $abgabe->kurzbz . '<br />';
-					}
+					$abgabenString .= "
+					<tr>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$dateEmailFormatted}</td>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+							<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+						</td>
+					   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$abgabedatumFormatted}</td>
+					</tr>";
 				}
 
-				$abgabenString .= '<br/><br/>';
-
-
+				$abgabenString .= '</tbody></table>';
 			}
 
+			$abgabenString .= '</div>'; // Close container
+
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
-			$url = APP_ROOT.$path;
+			$url = CIS_ROOT.$path;
 
 			$body_fields = array(
 				'anrede' => $anrede,
@@ -173,8 +198,6 @@ class AbgabetoolJob extends JOB_Controller
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
 		$retval = getData($result);
 		
-		var_dump($retval);
-
 		// retval are paabgaben joined with projektarbeit and betreuer
 		if(count($retval) == 0) {
 			$this->logInfo("Keine Emails über neue Paabgaben an Betreuer versandt");
@@ -202,9 +225,6 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerEmail($paabgabe->projektarbeit_id);
-			$data = getData($result)[0];
-
 			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
 			// php has spaceships 🚀🚀🚀🚀🚀
 			
@@ -214,19 +234,41 @@ class AbgabetoolJob extends JOB_Controller
 			});
 
 			$projektarbeit_titel = $abgaben[0]->titel;
-			$abgabenString = '<br /><br />';
+
+			// initialize the table and headers
+			$abgabenString = '
+			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
+				<thead>
+					<tr style="background-color: #f2f2f2; text-align: left;">
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
+					</tr>
+				</thead>
+				<tbody>';
+
 			foreach ($abgaben as $abgabe) {
-				$datetime = new DateTime($abgabe->datum);
-				$dateEmailFormatted = $datetime->format('d.m.Y');
+				// format dates inline for cleaner code
+				$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+				$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
 
-				$datetimeAbgabe = new DateTime($abgabe->abgabedatum);
-				$abgabedatumFormatted = $datetimeAbgabe->format('d.m.Y');
+				// handle the optional Kurzbezeichnung
+				$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #666; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
 
-				$abgabenString .= 'Abgabedatum: '.$abgabedatumFormatted.' Zieldatum: '.$dateEmailFormatted . ' ' . $abgabe->bezeichnung . ' <br /> ' . $abgabe->kurzbz . '<br />';
+				$abgabenString .= "
+				<tr>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$dateEmailFormatted}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+						<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+					</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$abgabedatumFormatted}</td>
+				</tr>";
 			}
+
+			$abgabenString .= '</tbody></table>';
 			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
-			$url = APP_ROOT.$path;
+			$url = CIS_ROOT.$path;
 			
 			$body_fields = array(
 				'anrede' => $anrede,
@@ -237,13 +279,14 @@ class AbgabetoolJob extends JOB_Controller
 				'linkAbgabetool' => $url
 			);
 
-			// TODO: get this guys uid safely
-//			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
-
+			$result = $this->_ci->ProjektbetreuerModel->getBetreuerOfProjektarbeit($paabgabe->projektarbeit_id, $paabgabe->betreuerart_kurzbz);
+			$data = getData($result)[0];
+			
+			$email = $data->uid ? $data->uid."@".DOMAIN : $data->private_email;
 
 			// send email with bundled info
 			sendSanchoMail(
-				'PaabgabeUpdatesBetSM',
+				'paabgabeUpdatesBetSM',
 				$body_fields,
 				$email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
@@ -262,7 +305,7 @@ class AbgabetoolJob extends JOB_Controller
 
 		$this->_ci->logInfo('Start job FHC-Core->notifyStudentMail');
 
-		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$interval = '10 days';//$this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
 		$retval = getData($result);
@@ -299,16 +342,39 @@ class AbgabetoolJob extends JOB_Controller
 			});
 
 			$projektarbeit_titel = $abgaben[0]->titel;
-			$abgabenString = '<br /><br />';
-			forEach($abgaben as $abgabe) {
-				$datetime = new DateTime($abgabe->datum);
-				$dateEmailFormatted = $datetime->format('d.m.Y');
+			
+			// initialize the table and headers
+			$abgabenString = '
+			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
+				<thead>
+					<tr style="background-color: #f2f2f2; text-align: left;">
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Datum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung / Hinweis</th>
+					</tr>
+				</thead>
+				<tbody>';
 
-				$abgabenString .= $dateEmailFormatted.' '.$abgabe->bezeichnung.' '.$abgabe->kurzbz.'<br />';
+			foreach ($abgaben as $abgabe) {
+				$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+
+				// handle the optional Kurzbezeichnung
+				$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #666; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+				$abgabenString .= "
+				<tr>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>
+						{$dateEmailFormatted}
+					</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+						<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+					</td>
+				</tr>";
 			}
+
+			$abgabenString .= '</tbody></table>';
 			
 			$route =  $this->_ci->config->item('URL_STUDENTS');
-			$url = APP_ROOT.$route;
+			$url = CIS_ROOT.$route;
 
 			$body_fields = array(
 				'anrede' => $data->anrede,
@@ -321,7 +387,7 @@ class AbgabetoolJob extends JOB_Controller
 
 			// send email with bundled info
 			sendSanchoMail(
-				'PaabgabeUpdatesSammelmail',
+				'paabgabeUpdatesSammelmail',
 				$body_fields,
 				$uid.'@'.DOMAIN,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8f9b77312..8deb689c6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -140,7 +140,7 @@ export const AbgabeStudentDetail = {
 				return false;
 			}
 			
-			if(termin.bezeichnung === 'Endupload') {
+			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'end') {
 				// open endupload form modal for further inputs
 				this.enduploadTermin = termin
 				this.$refs.modalContainerEnduploadZusatzdaten.show()

From c3f7f7223af1478b2ddb2526eef642fbb49089a7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 16 Jan 2026 11:59:46 +0100
Subject: [PATCH 1110/1357] add student name info to betreuer sammelemail jobs
 table; WIP adapting same logic for assistenz;

---
 .../controllers/jobs/AbgabetoolJob.php        | 123 ++++++++++--------
 .../models/education/Paabgabe_model.php       |  18 ++-
 2 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 420379f72..0a46cbd81 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -40,8 +40,6 @@ class AbgabetoolJob extends JOB_Controller
 			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
 			return;
 		}
-
-		// TODO: student name in abgabenstring hinzufügen
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -107,53 +105,65 @@ class AbgabetoolJob extends JOB_Controller
 				}));
 
 				if(count($relevantAbgaben) == 0) {
-					continue; // Changed break to continue to allow checking other projects in the tuple
+					continue;
 				}
 
-				$projektarbeit_titel = $relevantAbgaben[0]->titel ?? 'Kein Titel vergeben';
+				// format the Student Name
+				$s = $relevantAbgaben[0];
+				$nameParts = [];
+				if (!empty($s->titelpre)) $nameParts[] = $s->titelpre;
+				$nameParts[] = $s->vorname;
+				$nameParts[] = $s->nachname;
+				if (!empty($s->titelpost)) $nameParts[] = $s->titelpost;
+				$studentFullName = implode(' ', $nameParts);
 
-				// --- Start Project Header Section ---
+				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
+
+				// project header section
 				$abgabenString .= "
-				<div style='margin-top: 25px; padding: 10px; background-color: #f8f9fa; border-left: 4px solid #007bff;'>
-					<strong style='font-size: 16px;'>Projekt: {$projektarbeit_titel}</strong><br/>
-					<span style='color: #666; font-size: 13px;'>
-						ID: {$projektarbeit_id} | Rolle: {$betreuerRow->betreuerart_kurzbz} | 
-						Studiengang: {$relevantAbgaben[0]->stgtyp}{$relevantAbgaben[0]->stgkz} ({$relevantAbgaben[0]->studiensemester_kurzbz})
-					</span>
-				</div>";
-			
-					// --- Start Table ---
-					$abgabenString .= '
-				<table style="width: 100%; border-collapse: collapse; margin-top: 10px; margin-bottom: 20px;">
-					<thead>
-						<tr style="background-color: #eee; text-align: left;">
-							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Zieldatum</th>
-							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
-							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Abgabe bis</th>
-						</tr>
-					</thead>
-					<tbody>';
+					<div style='margin-top: 25px; padding: 12px; background-color: #f8f9fa; border-left: 4px solid #007bff; border-bottom: 1px solid #eee;'>
+						<strong style='font-size: 16px; color: #0056b3;'>Projekt: {$projektarbeit_titel}</strong><br/>
+						<div style='margin-top: 5px; font-size: 14px;'>
+							<strong>Studierende/r:</strong> {$studentFullName}
+						</div>
+						<span style='color: #666; font-size: 12px;'>
+							ID: {$projektarbeit_id} | Rolle: {$betreuerRow->betreuerart_kurzbz} | 
+							Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
+						</span>
+					</div>";
+
+				// start table
+				$abgabenString .= '
+					<table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
+						<thead>
+							<tr style="background-color: #eee; text-align: left;">
+								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
+							</tr>
+						</thead>
+						<tbody>';
 
 				foreach ($relevantAbgaben as $abgabe) {
 					$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
 					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
-
-					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777;'>{$abgabe->kurzbz}</small>" : "";
+					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
 
 					$abgabenString .= "
-					<tr>
-						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$dateEmailFormatted}</td>
-						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
-							<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
-						</td>
-					   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$abgabedatumFormatted}</td>
-					</tr>";
+						<tr>
+							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+								<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+							</td>
+							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
+						</tr>";
 				}
 
 				$abgabenString .= '</tbody></table>';
 			}
-
-			$abgabenString .= '</div>'; // Close container
+			
+			// close container
+			$abgabenString .= '</div>'; 
 
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
@@ -197,7 +207,7 @@ class AbgabetoolJob extends JOB_Controller
 
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
 		$retval = getData($result);
-		
+
 		// retval are paabgaben joined with projektarbeit and betreuer
 		if(count($retval) == 0) {
 			$this->logInfo("Keine Emails über neue Paabgaben an Betreuer versandt");
@@ -213,21 +223,18 @@ class AbgabetoolJob extends JOB_Controller
 
 			$betreuer_uids[$paabgabe->person_id][] = $paabgabe;
 		}
-		
+
 		$count = 0;
 		forEach ($betreuer_uids as $person_id => $abgaben) {
 			// $person_id is from betreuer
 
 			$result = $this->_ci->ProjektarbeitModel->getProjektbetreuerAnrede($person_id);
 			$data = getData($result)[0];
-			
+
 			$anrede = $data->anrede;
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			// https://www.php.net/manual/en/migration70.new-features.php#migration70.new-features.spaceship-op
-			// php has spaceships 🚀🚀🚀🚀🚀
-			
 			// sorting $abgaben array by datum
 			usort($abgaben, function ($a, $b) {
 				return strtotime($a->datum) <=> strtotime($b->datum);
@@ -240,15 +247,26 @@ class AbgabetoolJob extends JOB_Controller
 			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
 				<thead>
 					<tr style="background-color: #f2f2f2; text-align: left;">
-						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Zieldatum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Studierende/r</th>
 						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
-						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Abgabe bis</th>
 					</tr>
 				</thead>
 				<tbody>';
 
+			var_dump($abgaben);
+			
 			foreach ($abgaben as $abgabe) {
-				// format dates inline for cleaner code
+				// format the student name
+				$nameParts = [];
+				if (!empty($abgabe->titelpre)) $nameParts[] = $abgabe->titelpre;
+				$nameParts[] = $abgabe->vorname;
+				$nameParts[] = $abgabe->nachname;
+				if (!empty($abgabe->titelpost)) $nameParts[] = $abgabe->titelpost;
+				$studentFullName = implode(' ', $nameParts);
+
+				// format dates inline
 				$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
 				$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
 
@@ -257,19 +275,20 @@ class AbgabetoolJob extends JOB_Controller
 
 				$abgabenString .= "
 				<tr>
-					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$dateEmailFormatted}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$studentFullName}</td>
 					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
 						<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
 					</td>
-					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>{$abgabedatumFormatted}</td>
+					<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
 				</tr>";
 			}
 
 			$abgabenString .= '</tbody></table>';
-			
+
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
-			
+
 			$body_fields = array(
 				'anrede' => $anrede,
 				'anredeFillString' => $anredeFillString,
@@ -279,9 +298,9 @@ class AbgabetoolJob extends JOB_Controller
 				'linkAbgabetool' => $url
 			);
 
-			$result = $this->_ci->ProjektbetreuerModel->getBetreuerOfProjektarbeit($paabgabe->projektarbeit_id, $paabgabe->betreuerart_kurzbz);
+			$result = $this->_ci->ProjektbetreuerModel->getBetreuerOfProjektarbeit($abgaben[0]->projektarbeit_id, $abgaben[0]->betreuerart_kurzbz);
 			$data = getData($result)[0];
-			
+
 			$email = $data->uid ? $data->uid."@".DOMAIN : $data->private_email;
 
 			// send email with bundled info
@@ -291,10 +310,10 @@ class AbgabetoolJob extends JOB_Controller
 				$email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
 			);
-			
+
 			$count++;
 		}
-		
+
 		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
 		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerMail');
 	}
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index cc4c06924..7661663f7 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -66,15 +66,17 @@ class Paabgabe_model extends DB_Model
 
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
 			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
-			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel, 
-			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, tbl_lehreinheit.studiensemester_kurzbz
+			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, tbl_lehreinheit.studiensemester_kurzbz,
+			   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 		FROM campus.tbl_paabgabe
 				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
 				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
 				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
-		
+				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+				 JOIN public.tbl_person USING (person_id)
 		
 		WHERE campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
 		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?";
@@ -85,13 +87,17 @@ class Paabgabe_model extends DB_Model
 	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
 
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
-					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
-					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
-					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id
+						campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+						campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+						lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
+						public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
+				
 				FROM campus.tbl_paabgabe 
 					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 					JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+					JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+				 	JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
 				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?

From 6c82741341b0977ac01421ccd687f7bca8efc252 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 16 Jan 2026 12:00:30 +0100
Subject: [PATCH 1111/1357] remove var_dump() statement

---
 application/controllers/jobs/AbgabetoolJob.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 0a46cbd81..332116844 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -254,8 +254,6 @@ class AbgabetoolJob extends JOB_Controller
 					</tr>
 				</thead>
 				<tbody>';
-
-			var_dump($abgaben);
 			
 			foreach ($abgaben as $abgabe) {
 				// format the student name

From e0f99a8e8817fe2e6a2ae5f3b999f90931775ff2 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 19 Jan 2026 08:28:25 +0100
Subject: [PATCH 1112/1357] gewichtung und regeln in die config verschoben

---
 config/cis.config-default.inc.php      |  2 ++
 include/externe_ueberwachung.class.php | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index cac05ec7a..1b38a2be6 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -309,6 +309,8 @@ define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
 define('EXTERNE_UEBERWACHUNG_SESSION_URL', 'https://example.com');
 define('EXTERNE_UEBERWACHUNG_TRIAL_TEST', false);
 define('EXTERNE_UEBERWACHUNG_EXAM_PARAMS', []);
+define('EXTERNE_UEBERWACHUNG_EXAM_RULES', []);
+define('EXTERNE_UEBERWACHUNG_EXAM_SCORE', []);
 
 
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index a047dfd9a..ecdaac2fc 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -167,6 +167,17 @@ class externeUeberwachung extends basis_db
 		{
 			$payload = array_merge($payload, EXTERNE_UEBERWACHUNG_EXAM_PARAMS);
 		}
+
+		if (defined('EXTERNE_UEBERWACHUNG_EXAM_RULES'))
+		{
+			$payload['rules'] = EXTERNE_UEBERWACHUNG_EXAM_RULES;
+		}
+
+		if (defined('EXTERNE_UEBERWACHUNG_EXAM_SCORE'))
+		{
+			$payload['scoreConfig'] = EXTERNE_UEBERWACHUNG_EXAM_SCORE;
+		}
+
 		return $payload;
 	}
 

From 50e93fc9bac630890232aa5e375802d4030768a5 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Mon, 19 Jan 2026 13:33:12 +0100
Subject: [PATCH 1113/1357] Fixed wrong configs (restored
 CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN + removed double
 CIS_EVALUIERUNG_ANZEIGEN_STG)

---
 config/global.config-default.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index 3853806e0..b2bca7de6 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -27,7 +27,7 @@ define('CIS_LEHRVERANSTALTUNG_SEMESTERINFO_ANZEIGEN',true);
 define('CIS_LEHRVERANSTALTUNG_LEHRFACH_ANZEIGEN',false);
 define('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN', true);
 define('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN', true);
-define('CIS_EVALUIERUNG_ANZEIGEN_STG', true);
+define('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN', true);
 define('CIS_LEHRVERANSTALTUNG_EVALUIERUNG_ANZEIGEN', true);
 
 // Wenn gesetzt, werden die Digitale Anwesenheit-Icons nur fuer diese Studiengaenge angezeigt, sonst für alle

From 9a07e7c804858d533273a1ab1dd37b8d232af4f9 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 19 Jan 2026 16:12:54 +0100
Subject: [PATCH 1114/1357] wrote Studiengang_model.php ->
 getAssistenzForStudiengangKZ() that does just that but is not used currently
 since we retrieve assistenz in AbgabetoolJob.php via oe_kurzbz; added new
 getAssistenzForOE() method in Organisationseinheit_model; added new job
 "notifyAssistenzAboutChangedAbgaben" that does just that to
 AbgabetoolJob.php; removed console.log/debugger statements in cis4 code;

---
 .../controllers/jobs/AbgabetoolJob.php        | 196 ++++++++++++++++++
 .../models/education/Paabgabe_model.php       |   5 +-
 .../Organisationseinheit_model.php            |  16 ++
 .../models/organisation/Studiengang_model.php | 101 +++++----
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |   2 +-
 public/js/components/Dashboard/Item.js        |   2 -
 6 files changed, 277 insertions(+), 45 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 332116844..3316e17dc 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -20,6 +20,8 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
 		$this->_ci->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 
 		$this->_ci->load->config('abgabe');
 		$this->loadPhrases([
@@ -27,6 +29,200 @@ class AbgabetoolJob extends JOB_Controller
 		]);
 	}
 
+	public function notifyAssistenzAboutChangedAbgaben() {
+
+		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		// get all new or changed termine in interval
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$retval = getData($result);
+
+		if(count($retval) == 0) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
+
+		// group changed/new abgaben for projektarbeiten
+		$projektarbeiten = [];
+		foreach($retval as $newOrChangedAbgabe) {
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
+				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
+			}
+		}
+
+		// for each projektarbeit fetch their assistenz and same them in their own dictionary to avoid too many mails
+		$assistenzMap = [];
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$projektarbeitBetreuerMap = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+			
+			$assistenzResult = $this->_ci->OrganisationseinheitModel->getAssistenzForOE($abgaben[0]->stg_oe_kurzbz);
+
+			forEach($assistenzResult->retval as $assistenzRow) {
+				if (!isset($assistenzMap[$assistenzRow->person_id])) {
+					$assistenzMap[$assistenzRow->person_id] = [];
+				}
+
+				// Add the current $assistenzRow to the $assistenzMap as an array associated with its projektarbeit_id.
+				$assistenzMap[$assistenzRow->person_id][] = [$projektarbeit_id, $assistenzRow];
+			}
+
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+
+			forEach($betreuerResult->retval as $betreuerRow) {
+				if (!isset($projektarbeitBetreuerMap[$projektarbeit_id])) {
+					$projektarbeitBetreuerMap[$projektarbeit_id] = [];
+				}
+
+				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
+				$projektarbeitBetreuerMap[$projektarbeit_id][] = $betreuerRow;
+			}
+		}
+
+		$count = 0;
+		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
+
+			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
+
+			foreach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$assistenzRow = $tupel[1];
+
+				$betreuerArray = $projektarbeitBetreuerMap[$projektarbeit_id] ?? [];
+				$changedAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				$relevantAbgaben = array_values(array_filter($changedAbgaben, function($abgabetermin) use ($assistenzRow) {
+					if($abgabetermin->updatevon == null && $abgabetermin->insertvon != $assistenzRow->uid) {
+						return $abgabetermin;
+					} else if($abgabetermin->updatevon != null && $abgabetermin->updatevon != $assistenzRow->uid) {
+						return $abgabetermin;
+					}
+				}));
+
+				if(count($relevantAbgaben) == 0) {
+					continue;
+				}
+
+				// Format the Student Name
+				$s = $relevantAbgaben[0];
+				$nameParts = [];
+				if (!empty($s->titelpre)) $nameParts[] = $s->titelpre;
+				$nameParts[] = $s->vorname;
+				$nameParts[] = $s->nachname;
+				if (!empty($s->titelpost)) $nameParts[] = $s->titelpost;
+				$studentFullName = implode(' ', $nameParts);
+
+				// Format the Supervisors string
+				$betreuerStrings = [];
+				foreach($betreuerArray as $b) {
+					$bNameParts = [];
+					if (!empty($b->titelpre)) $bNameParts[] = $b->titelpre;
+					$bNameParts[] = $b->vorname;
+					$bNameParts[] = $b->nachname;
+					if (!empty($b->titelpost)) $bNameParts[] = $b->titelpost;
+
+					$bFullName = implode(' ', $bNameParts);
+					$betreuerStrings[] = "{$bFullName} ({$b->betreuerart_kurzbz})";
+				}
+				$allBetreuerFormatted = implode(', ', $betreuerStrings);
+
+				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
+
+				// Project Header Section
+				$abgabenString .= "
+				<div style='margin-top: 25px; padding: 12px; background-color: #f8f9fa; border-left: 4px solid #007bff; border-bottom: 1px solid #eee;'>
+					<strong style='font-size: 16px; color: #0056b3;'>Projekt: {$projektarbeit_titel}</strong><br/>
+					<div style='margin-top: 5px; font-size: 14px;'>
+						<strong>Studierende/r:</strong> {$studentFullName}
+					</div>
+					<div style='margin-top: 3px; font-size: 14px;'>
+						<strong>Betreuer:</strong> {$allBetreuerFormatted}
+					</div>
+					<span style='color: #666; font-size: 12px;'>
+						ID: {$projektarbeit_id} | Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
+					</span>
+				</div>";
+
+				// Start Table
+				$abgabenString .= '
+				<table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
+					<thead>
+						<tr style="background-color: #eee; text-align: left;">
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
+							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
+						</tr>
+					</thead>
+					<tbody>';
+
+				foreach ($relevantAbgaben as $abgabe) {
+					$dateEmailFormatted = (new DateTime($abgabe->datum))->format('d.m.Y');
+					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
+					$kurzbzLine = !empty($abgabe->kurzbz) ? "<br/><small style='color: #777; font-style: italic;'>{$abgabe->kurzbz}</small>" : "";
+
+					$abgabenString .= "
+					<tr>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$dateEmailFormatted}</td>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+							<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
+						</td>
+						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
+					</tr>";
+				}
+
+				$abgabenString .= '</tbody></table>';
+			}
+
+			$abgabenString .= '</div>';
+
+			// done with building the change list, now send it
+			$assistenzRow = $tupelArr[0][1];
+			$anrede = $assistenzRow->anrede;
+			$anredeFillString = $assistenzRow->anrede == "Herr" ? "r" : "";
+			$fullFormattedNameString = $assistenzRow->first;
+			
+			
+
+			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$url = CIS_ROOT.$path;
+
+			$body_fields = array(
+				'anrede' => $anrede,
+				'anredeFillString' => $anredeFillString,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'abgabenString' => $abgabenString,
+				'linkAbgabetool' => $url
+			);
+
+			$email = $assistenzRow->uid."@".DOMAIN;
+
+			// send email with bundled info
+			sendSanchoMail(
+				'PAAChangesAssSM',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'changedAbgabeterminev2')
+			);
+
+			$count++;
+		}
+
+		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+	}
+
 	public function notifyBetreuerAboutChangedAbgaben() {
 		
 		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 7661663f7..a50c3ea95 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -67,14 +67,15 @@ class Paabgabe_model extends DB_Model
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
 			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
-			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, tbl_lehreinheit.studiensemester_kurzbz,
+			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
 			   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 		FROM campus.tbl_paabgabe
 				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
 				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index db56c1930..9f64580a9 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -243,4 +243,20 @@ class Organisationseinheit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
 	}
+	
+	public function getAssistenzForOE($oe_kurzbz) {
+		$qry = "
+			SELECT person_id, uid, benutzerfunktion_id, funktion_kurzbz, oe_kurzbz, alias, 
+       			anrede, trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first
+			FROM tbl_benutzerfunktion
+					 JOIN public.tbl_benutzer USING(uid)
+					 JOIN public.tbl_person USING(person_id)
+			WHERE funktion_kurzbz = 'ass'
+				AND oe_kurzbz = ?
+				AND (datum_bis IS NULL OR NOW() <= datum_bis)
+				AND public.tbl_benutzer.aktiv = true
+		";
+
+		return $this->execReadOnlyQuery($qry, array($oe_kurzbz));
+	}
 }
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 660657f28..02c1d2a36 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -657,37 +657,7 @@ class Studiengang_model extends DB_Model
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
-
-		$addEmailProperty= function(&$benutzerfunktionen){
-			if(count($benutzerfunktionen) && defined('DOMAIN'))
-			{
-				$benutzerfunktionen = array_map(function($benutzer)
-				{
-					$benutzer->email = $benutzer->alias."@".DOMAIN;
-					return $benutzer;
-				},$benutzerfunktionen) ;
-			}
-
-		};
-		$addFotoProperty= function(&$collection){
-			$collection = array_map(function($item){
-				$person_id = $this->PersonModel->getByUid($item->uid);
-				if(isError($person_id))
-					return error($person_id);
-				$person_id = current(getData($person_id))->person_id;
-				$this->PersonModel->addSelect('foto');
-				$foto = $this->PersonModel->loadWhere(array('person_id'=>$person_id));
-				if(isError($foto))
-					return error($foto);	
-				$foto = current(getData($foto))->foto;
-				$item->foto = $foto;
-				return $item;
-			},$collection);
-		};
 		
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-
 		$student = $this->StudentModel->loadWhere(['student_uid' => getAuthUID()]);
 		if (isError($student))
 			return error($student);
@@ -712,7 +682,7 @@ class Studiengang_model extends DB_Model
 		$stg_ltg = array_values(array_filter($stg_ltg, function($stg_leitung){
 			return $stg_leitung->aktiv;
 		}));
-		$addFotoProperty($stg_ltg);
+		$this->addFotoProperty($stg_ltg);
 
 		$gf_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
 		if (isError($gf_ltg))
@@ -721,8 +691,8 @@ class Studiengang_model extends DB_Model
 		$gf_ltg = array_values(array_filter($gf_ltg, function($gf_leitung){
 			return $gf_leitung->aktiv;
 		}));
-		$addEmailProperty($gf_ltg);
-		$addFotoProperty($gf_ltg);
+		$this->addEmailProperty($gf_ltg);
+		$this->addFotoProperty($gf_ltg);
 
 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
@@ -731,8 +701,8 @@ class Studiengang_model extends DB_Model
 		$stv_ltg = array_values(array_filter($stv_ltg, function($stv_leitung){
 			return $stv_leitung->aktiv;
 		}));
-		$addEmailProperty($stv_ltg);
-		$addFotoProperty($stv_ltg);
+		$this->addEmailProperty($stv_ltg);
+		$this->addFotoProperty($stv_ltg);
 
 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))
@@ -741,8 +711,8 @@ class Studiengang_model extends DB_Model
 		$ass = array_values(array_filter($ass, function($assistenz){
 			return $assistenz->aktiv;
 		}));
-		$addEmailProperty($ass);
-		$addFotoProperty($ass);
+		$this->addEmailProperty($ass);
+		$this->addFotoProperty($ass);
 
 		$hochschulvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('hsv');
 		if (isError($hochschulvertr))
@@ -751,7 +721,7 @@ class Studiengang_model extends DB_Model
 		$hochschulvertr = array_values(array_filter($hochschulvertr, function($hochschul_vertreter){
 			return $hochschul_vertreter->aktiv;
 		}));
-		$addEmailProperty($hochschulvertr);
+		$this->addEmailProperty($hochschulvertr);
 
 
 		$stdv = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stdv', $stg_obj->oe_kurzbz);
@@ -761,7 +731,7 @@ class Studiengang_model extends DB_Model
 		$stdv = array_values(array_filter($stdv, function($std_vertreter){
 			return $std_vertreter->aktiv;
 		}));
-		$addEmailProperty($stdv);
+		$this->addEmailProperty($stdv);
 
 
 		$jahrgangsvertr = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('jgv', $stg_obj->oe_kurzbz, $semester);
@@ -771,7 +741,7 @@ class Studiengang_model extends DB_Model
 		$jahrgangsvertr = array_values(array_filter($jahrgangsvertr, function($jahrgang_vertreter){
 			return $jahrgang_vertreter->aktiv;
 		}));
-		$addEmailProperty($jahrgangsvertr);
+		$this->addEmailProperty($jahrgangsvertr);
 
 
 		$result_object = new stdClass();
@@ -818,4 +788,55 @@ class Studiengang_model extends DB_Model
 
 		return $this->execReadOnlyQuery($query, [$allowed_stg]);
 	}
+	
+	public function getAssistenzForStudiengangKZ($stg_kz) {
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		
+		$stg_obj = $this->load($stg_kz);
+		if(isError($stg_obj))
+			return error($stg_obj);
+		if(getData($stg_obj))
+		{
+			$stg_obj = current(getData($stg_obj));
+		}
+
+		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
+		if (isError($ass))
+			return $ass;
+		$ass = getData($ass) ?: [];
+		$ass = array_values(array_filter($ass, function($assistenz){
+			return $assistenz->aktiv;
+		}));
+		
+		$this->addEmailProperty($ass);
+		
+		return success($ass);
+	}
+	
+	private function addEmailProperty(&$benutzerfunktionen) {
+		if(count($benutzerfunktionen) && defined('DOMAIN'))
+		{
+			$benutzerfunktionen = array_map(function($benutzer)
+			{
+				$benutzer->email = $benutzer->alias."@".DOMAIN;
+				return $benutzer;
+			},$benutzerfunktionen) ;
+		}
+	}
+	
+	private function addFotoProperty (&$collection) {
+		$collection = array_map(function($item){
+			$person_id = $this->PersonModel->getByUid($item->uid);
+			if(isError($person_id))
+				return error($person_id);
+			$person_id = current(getData($person_id))->person_id;
+			$this->PersonModel->addSelect('foto');
+			$foto = $this->PersonModel->loadWhere(array('person_id'=>$person_id));
+			if(isError($foto))
+				return error($foto);
+			$foto = current(getData($foto))->foto;
+			$item->foto = $foto;
+			return $item;
+		},$collection);
+	}
 }
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index badbf537f..387f083f7 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -31,7 +31,7 @@ export default {
 						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
 						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
 					].join(": "));
-				} else {console.log(this.event.lektor);
+				} else {;
 					tooltipArray.push([
 						this.$p.t('lehre/lektor'),
 						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 42aeca0b6..d2ad4ae75 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -143,8 +143,6 @@ export default {
 		},
 	},
 	async created() {
-		debugger
-		
 		this.widget = await CachedWidgetLoader.loadWidget(this.id);
 		let component = (await import("../" + this.widget.setup.file)).default;
 		this.$options.components["widget" + this.widget.widget_id] = component;

From ad7808eb21ba758080819276ad86e019f0398f1a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 19 Jan 2026 16:49:03 +0100
Subject: [PATCH 1115/1357] fix typo in speed dial disabled computed (based on
 being a zweitbegutachter

---
 .../components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 91d8e5a4e..320f3b566 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -48,7 +48,7 @@ export const AbgabeMitarbeiterDetail = {
 				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
 				icon: "fa fa-plus",
 				command: this.openCreateNewAbgabeModal,
-				disabled: Vue.computed(() => this.projektarbeit?.betreuertyp_kurzbz == 'Zweitbegutachter')
+				disabled: Vue.computed(() => this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter')
 			},
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
@@ -396,6 +396,13 @@ export const AbgabeMitarbeiterDetail = {
 			return `${day}.${month}.${year}`
 		},
 		openCreateNewAbgabeModal() {
+			if(this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter') {
+				// maybe alert that this is not allowed or smth
+
+				this.$fhcAlert.alertWarning('Terminanlage disabled')
+				return
+			}
+			
 			if(!this.newTermin) {
 				const typ = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen')
 				this.newTermin = {

From 2471d37dd31f044a6c5560c51e990d05745a742a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 19 Jan 2026 16:54:10 +0100
Subject: [PATCH 1116/1357] fix loginfo statements betreuer->assistenz

---
 application/controllers/jobs/AbgabetoolJob.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 3316e17dc..99958720a 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -31,7 +31,7 @@ class AbgabetoolJob extends JOB_Controller
 
 	public function notifyAssistenzAboutChangedAbgaben() {
 
-		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutChangedAbgaben');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 		// get all new or changed termine in interval
@@ -39,7 +39,7 @@ class AbgabetoolJob extends JOB_Controller
 		$retval = getData($result);
 
 		if(count($retval) == 0) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			$this->_ci->logInfo("Keine Emails an Assistenzen über neue oder veränderte Termine versandt");
 			return;
 		}
 
@@ -220,7 +220,7 @@ class AbgabetoolJob extends JOB_Controller
 		}
 
 		$this->_ci->logInfo($count . " Emails erfolgreich versandt");
-		$this->_ci->logInfo('End job FHC-Core->notifyBetreuerAboutChangedAbgaben');
+		$this->_ci->logInfo('End job FHC-Core->notifyAssistenzAboutChangedAbgaben');
 	}
 
 	public function notifyBetreuerAboutChangedAbgaben() {

From c5c712335883b1754b02595dc566b0700455acd2 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 20 Jan 2026 10:51:49 +0100
Subject: [PATCH 1117/1357] Added lvevaluierung phrase

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a35a9b2fe..4e8e844dd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -53215,6 +53215,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'fragebogen',
+		'phrase' => 'pflichtantwortFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Pflichtantwort fehlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mandatory answer missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 	// ### Personen zusammenlegen Phrasen BEGIN
 	array(

From 2f5b90b9d5430c5624e13b3231b986f23c8cd104 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 21 Jan 2026 09:04:11 +0100
Subject: [PATCH 1118/1357] dsgvo confirm und proctoring confirm beim RT Login

---
 cis/testtool/login.php    | 8 +++++++-
 locale/de-AT/testtool.php | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 5aa46de7e..d028a41ff 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -731,7 +731,7 @@ else // LOGIN Site (vor Login)
 			echo '<script>
 				function changeconfirmation()
 				{
-					document.getElementById("confirmationSubmit").disabled = !document.getElementById("confirmationCheckbox").checked;
+					document.getElementById("confirmationSubmit").disabled = !document.getElementById("confirmationCheckbox").checked || !document.getElementById("dsgvoconfirm").checked || !document.getElementById("procotoringconfirm").checked;
 				}
 				</script>';
 			echo '<div class="row text-center">
@@ -741,6 +741,12 @@ else // LOGIN Site (vor Login)
 			<input id="confirmationCheckbox" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
 			'.$p->t('testtool/confirmationText').'
 			<br><br>
+			<input id="dsgvoconfirm" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
+			'.$p->t('testtool/dsgvoConfirmText').'
+			<br><br>
+			<input id="procotoringconfirm" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
+			'.$p->t('testtool/procotoringConfirmText').'
+			<br><br>
 			<button id="confirmationSubmit" type="submit" class="btn btn-primary" disabled/>
 				'.$p->t('testtool/start').'
 			</button>
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
index 6977704cc..b2a1dc38a 100644
--- a/locale/de-AT/testtool.php
+++ b/locale/de-AT/testtool.php
@@ -53,6 +53,8 @@ $this->phrasen['testtool/fuerFolgendeStgAngemeldet']='Für folgende Studiengäng
 $this->phrasen['testtool/invalideGebiete']='Ein oder mehrere Fragengebiet/e inkorrekt!<br>Bitte melden Sie dies der Betreuungsperson.';
 $this->phrasen['testtool/confirmationText']='<b>Ich bestätige, den Online-Reihungstest persönlich, selbständig, ohne Hilfe einer zusätzlichen Person und ohne Hilfsmittel zu absolvieren.<br>
 											I confirm that I will complete the online placement test personally, independently, without the help of an additional person and without any aids.</b>';
+$this->phrasen['testtool/dsgvoConfirmText']='<b>Ich habe die <a href ="'. APP_ROOT. 'cms/dms.php?id=373121" target="_blank">Datenschutzerklärung</a> gelesen.</b>';
+$this->phrasen['testtool/procotoringConfirmText']='<b>Ich stimme der digitalen Beaufsichtigung beim Online-Reihungstest (Proctoring) zu.</b>';
 $this->phrasen['testtool/loginNoetig']='Bitte beachten Sie, dass der Reihungstest erst <b>unmittelbar</b> vor Ihrem <b>Reihungstesttermin</b> von uns aktiviert wird.<br>
 										Please note that the test will be activated by us <b>immediately</b> before your <b>placement test date</b>.';
 $this->phrasen['testtool/start']='Reihungstest jetzt starten';

From c9bcf9b9b040a160a73965063239f1ff557c2558 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 Jan 2026 10:34:17 +0100
Subject: [PATCH 1119/1357] fixed note init by object/object key on 2nd time
 opening the details modal in the assistenz view;

---
 application/controllers/api/frontend/v1/Abgabe.php         | 2 +-
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index d5fe43a72..a507eb712 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -142,7 +142,6 @@ class Abgabe extends FHCAPI_Controller
 
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(getAuthUID() == $student_uid || $zugeordnet) {
-
 			$projektarbeitIsCurrent = false;
 			$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
 				$projektarbeitIsCurrent = $result;
@@ -825,6 +824,7 @@ class Abgabe extends FHCAPI_Controller
 			$tomail,
 			$subject
 		);
+		
 	}
 
 	/**
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 74db4c9c7..5d8c3846a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -687,7 +687,10 @@ export const AbgabetoolAssistenz = {
 			// pa.isCurrent = res.data[1]
 
 			pa.abgabetermine.forEach(termin => {
-				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				if(typeof termin.note !== 'object') {
+					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				}
+				
 				termin.file = []
 
 				// assistenz should be able to edit every abgabe

From 4d9712753908ad6847b1eeca1509d3e83c7eeaef Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 Jan 2026 14:05:31 +0100
Subject: [PATCH 1120/1357] remove Abgabedatum column from Assistenz/Betreuer
 update sammelmail. Keep it for UPLOADS sammelmail since it is relevant there;
 defined relevant_types in abgabetool config to filter for in the sammelmail
 for each role student/assistenz/betreuer; block saving/deleting/uploading ui
 components when projektarbeit has a note, since this indicates that the
 project is over;

---
 application/config/abgabe.php                 |  6 +++++
 .../controllers/jobs/AbgabetoolJob.php        | 27 +++++++++++--------
 .../models/education/Paabgabe_model.php       |  9 ++++---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  8 +++---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 11 +++++---
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  7 +++++
 6 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 282421ac0..8b14deffc 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -16,6 +16,12 @@ $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
 // lehre.tbl_paabgabetyp bezeichnung
 //$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
 $config['ALLOWED_ABGABETYPEN_BETREUER'] = ['zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
+// paabgabetypen for which betreuer is benachrichtigt via sammelmail
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER'] = ['qualgate1', 'qualgate2', 'end'];
+// paabgabetypen for which assistenz is benachrichtigt via sammelmail
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ'] = ['end'];
+// paabgabetypen for which student is benachrichtigt via sammelmail -> basically all of them but still defined for consistency
+$config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT'] = ['qualgate1', 'qualgate2', 'zwischen', 'note', 'abstract', 'end', 'enda'];
 //$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
 $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 99958720a..5c1bd687a 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -34,8 +34,10 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutChangedAbgaben');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ');
 		// get all new or changed termine in interval
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
+		
 		$retval = getData($result);
 
 		if(count($retval) == 0) {
@@ -162,7 +164,6 @@ class AbgabetoolJob extends JOB_Controller
 						<tr style="background-color: #eee; text-align: left;">
 							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
 							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
-							<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
 						</tr>
 					</thead>
 					<tbody>';
@@ -178,7 +179,6 @@ class AbgabetoolJob extends JOB_Controller
 						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
 							<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
 						</td>
-						<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
 					</tr>";
 				}
 
@@ -207,7 +207,7 @@ class AbgabetoolJob extends JOB_Controller
 			);
 
 			$email = $assistenzRow->uid."@".DOMAIN;
-
+			
 			// send email with bundled info
 			sendSanchoMail(
 				'PAAChangesAssSM',
@@ -228,8 +228,11 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerAboutChangedAbgaben');
 
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER');
+
 		// get all new or changed termine in interval
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
 
 		if(count($retval) == 0) {
@@ -335,7 +338,6 @@ class AbgabetoolJob extends JOB_Controller
 							<tr style="background-color: #eee; text-align: left;">
 								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Zieldatum</th>
 								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
-								<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Abgabe bis</th>
 							</tr>
 						</thead>
 						<tbody>';
@@ -351,7 +353,6 @@ class AbgabetoolJob extends JOB_Controller
 							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
 								<strong>{$abgabe->bezeichnung}</strong>{$kurzbzLine}
 							</td>
-							<td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
 						</tr>";
 				}
 
@@ -399,6 +400,8 @@ class AbgabetoolJob extends JOB_Controller
 
 		$this->_ci->logInfo('Start job FHC-Core->notifyBetreuerMail');
 
+		// dont filter for relevant types since this mail should gather all UPLOAD info
+		
 		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval);
@@ -446,7 +449,7 @@ class AbgabetoolJob extends JOB_Controller
 						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Zieldatum</th>
 						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Studierende/r</th>
 						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung</th>
-						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Abgabe bis</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 15%;">Abgabedatum</th>
 					</tr>
 				</thead>
 				<tbody>';
@@ -518,9 +521,11 @@ class AbgabetoolJob extends JOB_Controller
 
 		$this->_ci->logInfo('Start job FHC-Core->notifyStudentMail');
 
-		$interval = '10 days';//$this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$interval = '20 days';$this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
-		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval);
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
 
 		if(count($retval) == 0) {
@@ -561,7 +566,7 @@ class AbgabetoolJob extends JOB_Controller
 			<table style="width: 100%; border-collapse: collapse; font-family: Arial, sans-serif; color: #333; margin-top: 15px; margin-bottom: 15px;">
 				<thead>
 					<tr style="background-color: #f2f2f2; text-align: left;">
-						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Datum</th>
+						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 25%;">Zieldatum</th>
 						<th style="padding: 10px; border: 1px solid #ddd; font-size: 13px;">Bezeichnung / Hinweis</th>
 					</tr>
 				</thead>
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index a50c3ea95..aa61bbaae 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -61,7 +61,7 @@ class Paabgabe_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($person_id));
 	}
 
-	public function findAbgabenNewOrUpdatedSince($interval)
+	public function findAbgabenNewOrUpdatedSince($interval, $relevantTypes)
 	{
 
 		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
@@ -79,10 +79,11 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?";
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
+		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
 
-		return $this->execQuery($query, [$interval, $interval]);
+		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
 	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 5d8c3846a..4c3714372 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -685,7 +685,8 @@ export const AbgabetoolAssistenz = {
 			const pa = this.projektarbeiten.find(projektarbeit => projektarbeit.projektarbeit_id == details.projektarbeit_id)
 
 			// pa.isCurrent = res.data[1]
-
+			const paIsBenotet = pa.note !== null
+			
 			pa.abgabetermine.forEach(termin => {
 				if(typeof termin.note !== 'object') {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
@@ -694,10 +695,11 @@ export const AbgabetoolAssistenz = {
 				termin.file = []
 
 				// assistenz should be able to edit every abgabe
-				termin.allowedToSave = true
+				// update 21-01-2026: actually blocking operations on finished projektarbeiten seems like a decent idea
+				termin.allowedToSave = paIsBenotet ? false : true
 
 				// assistenz are not allowed to delete deadlines with existing submissions
-				termin.allowedToDelete = !termin.abgabedatum
+				termin.allowedToDelete = paIsBenotet ? false : !termin.abgabedatum
 
 				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index adb165a0a..df521d52d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -300,13 +300,18 @@ export const AbgabetoolMitarbeiter = {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
 				pa.isCurrent = res.data[1]
-				
+
+				const paIsBenotet = pa.note !== null
+
 				pa.abgabetermine.forEach(termin => {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 					termin.file = []
 					
-					// update 08-01-20206: everybody is allowed to do everything in client, critical checks happen at backend level
-					termin.allowedToSave = true
+					// update 08-01-2026: everybody is allowed to do everything in client, critical checks happen at backend level
+					// termin.allowedToSave = true
+					
+					// update 21-01-2026: actually blocking operations on finished projektarbeiten seems like a decent idea
+					termin.allowedToSave = paIsBenotet ? false : true
 					
 					// lektoren are not allowed to delete deadlines with existing submissions
 					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 493c78918..85afdfcaa 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -149,6 +149,9 @@ export const AbgabetoolStudent = {
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
+				
+				const paIsBenotet = pa.note !== null
+				
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
 					termin.allowedToUpload = false
@@ -172,6 +175,10 @@ export const AbgabetoolStudent = {
 						termin.allowedToUpload = termin.upload_allowed 
 					}
 
+					// blocks client upload button if projektarbeitet is already beurteilt und thus further abgaben on any termin should be blocked
+					if(paIsBenotet) termin.allowedToUpload = false
+					
+					
 					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 					termin.dateStyle = this.getDateStyleClass(termin)
 				})

From 48cd37058e5927b5e923a1435b1b5be2a34c4269 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 Jan 2026 14:53:44 +0100
Subject: [PATCH 1121/1357] also block uploads and termin changes for
 projektarbeiten with a note on backend

---
 .../controllers/api/frontend/v1/Abgabe.php    | 116 +++++++++++-------
 1 file changed, 75 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index a507eb712..cd0fbb212 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -121,7 +121,7 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result, 'general');
 
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
@@ -131,11 +131,11 @@ class Abgabe extends FHCAPI_Controller
 		
 		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
 		if(isError($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'), 'general');
 		}
 
 		if(!hasData($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'), 'general');
 		}
 		$data = getData($res)[0];
 		$student_uid = $data->uid;
@@ -294,6 +294,8 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+		
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(getAuthUID() == $student_uid || $zugeordnet) {
 			
@@ -322,11 +324,11 @@ class Abgabe extends FHCAPI_Controller
 					
 					$this->terminateWithSuccess($res);
 				} else {
-					$this->terminateWithError('Error moving File');
+					$this->terminateWithError('Error moving File', 'general');
 				}
 	
 			} else {
-				$this->terminateWithError('File missing');
+				$this->terminateWithError('File missing', 'general');
 			}
 		} else {
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
@@ -363,6 +365,8 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+		
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(getAuthUID() == $student_uid || $zugeordnet) {
 			if ((isset($_FILES) and isset($_FILES['file']) and !$_FILES['file']['error'])) {
@@ -373,7 +377,7 @@ class Abgabe extends FHCAPI_Controller
 					$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
 					$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-					$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+					$projektarbeitArr = $this->getDataOrTerminateWithError($result, 'general');
 
 					if (count($projektarbeitArr) > 0) {
 						$projektarbeit = $projektarbeitArr[0];
@@ -383,7 +387,7 @@ class Abgabe extends FHCAPI_Controller
 
 					$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 					$result = $this->PaabgabeModel->load($paabgabe_id);
-					$paabgabeArr = $this->getDataOrTerminateWithError($result);
+					$paabgabeArr = $this->getDataOrTerminateWithError($result, 'general');
 
 					if (count($paabgabeArr) > 0) {
 						$paabgabe = $paabgabeArr[0];
@@ -421,11 +425,11 @@ class Abgabe extends FHCAPI_Controller
 
 					$this->terminateWithSuccess($abgabe);
 				} else {
-					$this->terminateWithError('Error moving File');
+					$this->terminateWithError('Error moving File', 'general');
 				}
 
 			} else {
-				$this->terminateWithError('File missing');
+				$this->terminateWithError('File missing', 'general');
 			}
 		} else {
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
@@ -503,6 +507,8 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(!$zugeordnet) {
 			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
@@ -567,23 +573,23 @@ class Abgabe extends FHCAPI_Controller
 		
 		// check if $paaabgabe is a qual gate and its note is deemed negative
 		// -> send email to student with that info
-		$paabgabe_id = $this->getDataOrTerminateWithError($result);
+		$paabgabe_id = $this->getDataOrTerminateWithError($result, 'general');
 		
 		$result = $this->PaabgabeModel->load($paabgabe_id);
-		$paabgabeArr = $this->getDataOrTerminateWithError($result);
+		$paabgabeArr = $this->getDataOrTerminateWithError($result, 'general');
 		$paabgabe = $paabgabeArr[0];
 
 		// check if abgabe even has note
 		if($paabgabe->note) {
 			$this->load->model('education/Note_model', 'NoteModel');
 			$result = $this->NoteModel->load($paabgabe->note);
-			$noteArr = $this->getDataOrTerminateWithError($result);
+			$noteArr = $this->getDataOrTerminateWithError($result, 'general');
 			$note = $noteArr[0];
 			if($note->positiv === false) {
 				
 				if($existingPaabgabe && $existingPaabgabe->note) {
 					$result = $this->NoteModel->load($paabgabe->note);
-					$noteArr = $this->getDataOrTerminateWithError($result);
+					$noteArr = $this->getDataOrTerminateWithError($result, 'general');
 					$note = $noteArr[0];
 					if($note->positiv === false) {
 						// do nothing since this means $beurteilungsnotiz change or smth else
@@ -611,24 +617,26 @@ class Abgabe extends FHCAPI_Controller
 		if ($paabgabe_id === NULL || trim((string)$paabgabe_id) === '') {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
+		
+		$this->checkProjektarbeitForFinishedStatus($this->getProjektarbeitIDForPaabgabeID($paabgabe_id));
 
 		$zugeordnet = $this->checkZuordnungByPaabgabe($paabgabe_id, getAuthUID());
 		
 		if(!$zugeordnet) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
 		}
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		
 		$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
-		$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult);
+		$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult, 'general');
 
 		if(count($paabgabeArr) == 0) {
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 		
 		$result = $this->PaabgabeModel->delete($paabgabe_id);
-		$result = $this->getDataOrTerminateWithError($result);
+		$result = $this->getDataOrTerminateWithError($result, 'general');
 
 		// TODO: consider this in nightly email job
 		$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
@@ -672,10 +680,12 @@ class Abgabe extends FHCAPI_Controller
 		$res = [];
 		$abgaben = [];
 		foreach ($projektarbeit_ids as $projektarbeit_id) {
+
+			$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
 			
 			$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 			if(!$zugeordnet) {
-				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
 			}
 			
 			$result = $this->PaabgabeModel->insert(
@@ -691,7 +701,7 @@ class Abgabe extends FHCAPI_Controller
 				)
 			);
 
-			$dataAbgabe  = $this->getDataOrTerminateWithError($result);
+			$dataAbgabe  = $this->getDataOrTerminateWithError($result, 'general');
 			
 			$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
 		}
@@ -721,7 +731,7 @@ class Abgabe extends FHCAPI_Controller
 
 		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
 		$result = $this->PaabgabeModel->getDeadlines($person_id);
-		$data = $this->getDataOrTerminateWithError($result);
+		$data = $this->getDataOrTerminateWithError($result, 'general');
 		
 		$this->terminateWithSuccess($data);
 	}
@@ -735,7 +745,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
 
 		$result = $this->PaabgabetypModel->getAll();
-		$paabgabetypen = $this->getDataOrTerminateWithError($result);
+		$paabgabetypen = $this->getDataOrTerminateWithError($result, 'general');
 		
 		
 		$this->terminateWithSuccess($paabgabetypen);
@@ -747,7 +757,7 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmail($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		$email = $this->getDataOrTerminateWithError($result);
+		$email = $this->getDataOrTerminateWithError($result, 'general');
 		
 		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
@@ -763,7 +773,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Note_model', 'NoteModel');
 
 		$result = $this->NoteModel->getAllActive();
-		$noten = $this->getDataOrTerminateWithError($result);
+		$noten = $this->getDataOrTerminateWithError($result, 'general');
 
 		$allowed_noten_abgabetool = $this->config->item('ALLOWED_NOTEN_ABGABETOOL');
 
@@ -778,24 +788,24 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		
 		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result, 'general');
 		$projektarbeit = $projektarbeitArr[0];
 		
 		$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer_person_id);
-		$anredeArr = $this->getDataOrTerminateWithError($result);
+		$anredeArr = $this->getDataOrTerminateWithError($result, 'general');
 		$anrede = $anredeArr[0];
 		
 		$student_uid = $projektarbeit->student_uid;
 
 		$this->load->model('education/Paabgabetyp_model', 'PaabgabetypModel');
 		$result = $this->PaabgabetypModel->load($paabgabe->paabgabetyp_kurzbz);
-		$paabgabetyp_kurzbzArr = $this->getDataOrTerminateWithError($result);
+		$paabgabetyp_kurzbzArr = $this->getDataOrTerminateWithError($result, 'general');
 		$paabgabetyp_kurzbz = $paabgabetyp_kurzbzArr[0];
 		
 		// Mail an Student wenn Qualgate negativ beurteilt wurde
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->load([$student_uid]);
-		$studentArr = $this->getDataOrTerminateWithError($result);
+		$studentArr = $this->getDataOrTerminateWithError($result, 'general');
 		$student = $studentArr[0];
 
 		if(!$student) {
@@ -853,7 +863,7 @@ class Abgabe extends FHCAPI_Controller
 		}
 		
 		$result = $this->ProjektarbeitModel->getProjektarbeitenForStudiengang($studiengang_kz, $benotet);
-		$projektarbeiten = $this->getDataOrTerminateWithError($result);
+		$projektarbeiten = $this->getDataOrTerminateWithError($result, 'general');
 
 		if(count($projektarbeiten) == 0) { // avoid further abgabetermin queries if the are no projektarbeiten
 			$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
@@ -865,7 +875,7 @@ class Abgabe extends FHCAPI_Controller
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten);
 		
 		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-		$projektabgaben = $this->getDataOrTerminateWithError($ret);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
 		// map the abgaben into projektarbeiten
 		foreach($projektarbeiten as $projektarbeit) {
@@ -902,7 +912,7 @@ class Abgabe extends FHCAPI_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		
 		$result = $this->StudiengangModel->getStudiengaengeFiltered($stg_allowed);
-		$data = $this->getDataOrTerminateWithError($result);
+		$data = $this->getDataOrTerminateWithError($result, 'general');
 		
 		$this->terminateWithSuccess($data);
 	}
@@ -937,10 +947,10 @@ class Abgabe extends FHCAPI_Controller
 			if(file_exists($file_path)) {
 				$this->terminateWithFileOutput('application/octet-stream', file_get_contents($file_path), basename($file_path));
 			} else {
-				$this->terminateWithError('File not found');
+				$this->terminateWithError('File not found', 'general');
 			}
 		} else {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
 		}
 	}
 
@@ -971,18 +981,22 @@ class Abgabe extends FHCAPI_Controller
 			
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
+		
+		
 		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result, 'general');
 
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
 		} else {
 			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
 		}
+		
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
 
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
 		if(!$zugeordnet) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
 		}
 		
 		// update projektarbeit cols
@@ -1048,7 +1062,7 @@ class Abgabe extends FHCAPI_Controller
 
 
 		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		$projektarbeitArr = $this->getDataOrTerminateWithError($result);
+		$projektarbeitArr = $this->getDataOrTerminateWithError($result, 'general');
 
 		if(count($projektarbeitArr) > 0) {
 			$projektarbeit = $projektarbeitArr[0];
@@ -1193,11 +1207,11 @@ class Abgabe extends FHCAPI_Controller
 		
 		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
 		if(isError($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingStudentForProjektarbeitID'), 'general');
 		}
 		
 		if(!hasData($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedStudentForProjektarbeitID'), 'general');
 		}
 		$data = getData($res)[0];
 		$student_uid = $data->uid;
@@ -1205,7 +1219,7 @@ class Abgabe extends FHCAPI_Controller
 		
 		$res = $this->ProjektarbeitModel->checkZuordnung($student_uid, $betreuer_uid);
 		if(isError($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingBetreuerStudentZuordnung'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingBetreuerStudentZuordnung'), 'general');
 		}
 
 		// if this is true betreuer has zuordnung to the given $projektarbeit_id and conversely the $student_uid
@@ -1235,20 +1249,40 @@ class Abgabe extends FHCAPI_Controller
 		return false;
 	}
 	
-	private function checkZuordnungByPaabgabe($paabgabe_id, $betreuer_uid) {
+	private function getProjektarbeitIDForPaabgabeID($paabgabe_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
 		$res = $this->ProjektarbeitModel->getProjektarbeitByPaabgabeID($paabgabe_id);
 		if(isError($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingProjektarbeitForPaabgabeID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4errorLoadingProjektarbeitForPaabgabeID'), 'general');
 		}
 
 		if(!hasData($res)) {
-			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedProjektarbeitForPaabgabeID'));
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noAssignedProjektarbeitForPaabgabeID'), 'general');
 		}
 		$data = getData($res)[0];
-		$projektarbeit_id = $data->projektarbeit_id;
+		return $data->projektarbeit_id;
+	}
 	
+	private function checkZuordnungByPaabgabe($paabgabe_id, $betreuer_uid) {
+		$projektarbeit_id = $this->getProjektarbeitIDForPaabgabeID($paabgabe_id);
 		return $this->checkZuordnung($projektarbeit_id, $betreuer_uid);
 	}
 
+	// loads a projektarbeit table row by id and looks if a note has been set. A non null note field
+	// currently indicates that a projektarbeit has been finished and should not accept further crud manipulation
+	private function checkProjektarbeitForFinishedStatus($projektarbeit_id) {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$res = $this->ProjektarbeitModel->load($projektarbeit_id);
+
+		if(isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool','c4projektarbeitNichtGefunden'), 'general');
+		}
+
+		$data = getData($res)[0];
+		if($data->note !== NULL) {
+			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+		}
+	}
+
 }
\ No newline at end of file

From ef8314c33a2f431241e266e6b4f0292c12694f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 21 Jan 2026 15:32:52 +0100
Subject: [PATCH 1122/1357] Config to check Extension LVEvaluierung is enabled

---
 include/tw/cis_menu_lv.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index c6dad40e3..03ce016ca 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -501,8 +501,8 @@ if((!defined('CIS_LEHRVERANSTALTUNG_ANRECHNUNG_ANZEIGEN') || CIS_LEHRVERANSTALTU
 }
 
 // LV-Evaluierung NEU
-if(defined('CIS_EVALUIERUNG_ANZEIGEN_STG')
-	&& CIS_EVALUIERUNG_ANZEIGEN_STG
+if(defined('CIS_LEHRVERANSTALTUNG_EVALUIERUNG_ANZEIGEN')
+	&& CIS_LEHRVERANSTALTUNG_EVALUIERUNG_ANZEIGEN
 	&& $angemeldet
 	&& (!defined('CIS_EVALUIERUNG_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_EVALUIERUNG_ANZEIGEN_STG)))
 	&& ($rechte->isBerechtigt('extension/lvevaluierung_init')))

From 668f0a6618b8f51d51284b9ae84409f7f3dec1f8 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 Jan 2026 16:26:26 +0100
Subject: [PATCH 1123/1357] fixed betreuerart bezeichnung formatting
 discrepancy between first and second assesor

---
 .../js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js   | 3 ++-
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 320f3b566..92f546e32 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -727,7 +727,8 @@ export const AbgabeMitarbeiterDetail = {
 		</div>
 		<div class="row" style="margin-bottom: 12px;">
 			<div class="col-auto">
-<!--				TODO : tooltip why this button is disabled as zweitbegutachter-->
+<!--				TODO: tooltip why this button is disabled as zweitbegutachter-->
+<!--				TODO: fix bug where this button is sometimes correctly disabled, sometimes just wrong when betreuer is both first and second assesor-->
 				<button type="button" :disabled="projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter'" class="btn btn-primary" @click="openCreateNewAbgabeModal">
 					<i class="fa-solid fa-plus"></i>
 					{{$capitalize( $p.t('abgabetool/c4newAbgabetermin') )}}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 85afdfcaa..b9286abf9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -419,9 +419,9 @@ export const AbgabetoolStudent = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuer') )}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit?.betreuerart_kurzbz ? $capitalize( $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) ) : $capitalize( $p.t('abgabetool/c4betreuer') ) }}</div>
 					<div class="col-8 col-md-9">
-						{{ projektarbeit.betreuerart_kurzbz ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : '' }}
+						{{ projektarbeit.betreuerart_kurzbz ? projektarbeit.betreuer : '' }}
 					</div>
 				</div>
 				<div class="row mt-2">

From f867e60702a5c6e567dc113c078ab782665639f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 21 Jan 2026 17:37:23 +0100
Subject: [PATCH 1124/1357] fix use of config FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE
 to override studiengang_kz in public.tbl_konto

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

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index 384452f3e..ecd58671a 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -239,7 +239,7 @@ class Konto extends FHCAPI_Controller
 				$data[$field] = $this->input->post($field);
 
 		if (defined('FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE') && isset(unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']])) {
-			$data['kostenstelle'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
+			$data['studiengang_kz'] = unserialize(FAS_BUCHUNGSTYP_FIXE_KOSTENSTELLE)[$data['buchungstyp_kurzbz']];
 		}
 
 		$result = [];

From 9ebc847e8eae17e8482e07426a58c6ebb13657de Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 22 Jan 2026 14:59:00 +0100
Subject: [PATCH 1125/1357] =?UTF-8?q?Added=20lvevaluierung=20phrasen=20for?=
 =?UTF-8?q?=20Lektoren=20=C3=9Cbersichtsseite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4e8e844dd..561fff729 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -53235,6 +53235,606 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lektorseiteTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluation | Übersicht LV-Leitung und Lehrende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'LV-Evaluation | Overview Course Leader and Lecturers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluierungebeneGesamt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierung der LV erfolgt auf Gesamt-Ebene',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This course is evaluated at the overall level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluierungGruppen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierung der LV erfolgt auf Gruppen-Ebene',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This course is evaluated at group level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipVerbindlichGewaehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung ist verbindlich vorgesehen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course evaluation is mandatory',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipVerbindlichAbgewaehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV wird nicht evaluiert (Abwahl durch STGL)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course evaluation is disabled (cancelled by STGL)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipAlleStudierendeAngemailt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle Studierenden wurden zur LV-Evaluierung eingeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'All students were invited to the course evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipNichtAlleStudierendenAngemailt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierende müssen noch zur LV-Evaluierung eingeladen werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students still have to be invited to the course evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipRuecklauf',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abgeschlossene LV-Evaluierungen / zur LV-Evaluierung eingeladene Studierende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Completed course evaluations / students invited to course evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluationNotAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ergebnisse LV-Evaluierung noch nicht verfügbar, LV-Reflexion noch nicht möglich.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Results of course evaluation not yet available, course reflection not yet possible.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluationAvailable',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ergebnisse LV- Evaluierung verfügbar, LV-Reflexion durchzuführen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Results of course evaluation available, course reflection required.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluationReady',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ergebnisse LV- Evaluierung und LV-Reflexion.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Results of course evaluation and course reflection.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'verbindlich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'verbindlich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'mandatory',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'abgewaehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'abgewählt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'disabled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'enddatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Enddatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Enddate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'startdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Startdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Startdate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'startdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Startdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Startdate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'gespeichertAmVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gespeichert am {date} von {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saved on {date} von {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'xEingeladeneStudierende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{x} eingeladene Studierende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{x} invited students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'studierendeEinladen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierende zur LV-Evaluierung einladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invite students to course evaluation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'xEmailsVersandt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{x} E-Mail-Einladungen versandt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{x} invitation emails sent',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'email',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'E-Mail',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'email',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'emailVersandBereit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bereit zum Versand der E-Mail-Einladungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Ready to send inivitation mails',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'bearbeitungNurLehrende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeitung nur durch Lehrende*n möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only lecturer of course can edit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'bearbeitungNurLvLeitung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeitung nur durch LV-Leitung möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only course leader can edit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'notAvailableEvaluierungGruppenebene',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluierung auf Gruppen-Ebene ist nicht verfügbar, da die Zuordnung Studierendenverband zu einer*m Lehrenden nicht eindeutig möglich ist',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course evaluation at group level is not available, as it is not possible to link a specific student group to one lecturer',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'noChangeGruppenebene',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entscheidung für Gesamt- oder Gruppen-Ebene kann nicht mehr verändert werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Decision for overall or group level can no longer be changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'evalPeriodAlreadyStarted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluierungszeitfenster kann nicht mehr verändert werden, da Studierende bereits eingeladen wurden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation response window can no longer be changed, as students have already been invited',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluierungByLv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Die Evaluierung der LV erfolgt auf Gesamt-Ebene.<br><br>Das Start-und enddatum der LV-Evaluierung kann geändert bzw. angepasst werden, solange die Studierenden noch nicht eingelanden wurden.<br><br>Der Zugriff für Studierende ist auf dieses Evaluierungsfenster beschränkt.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "This course is evaluated at the overall level.<br><br>The start and end dates of the course evaluation can be changed or adjusted as long as the students have not yet been invited.<br><br>Student access is limited to this evaluation response window.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipEvaluierungByLe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Die Evaluierung der LV erfolgt auf Gruppen-Ebene.<br><br>Das Start-und enddatum der LV-Evaluierung kann geändert bzw. angepasst werden, solange die Studierenden noch nicht eingelanden wurden.<br><br>Der Zugriff für Studierende ist auf dieses Evaluierungsfenster beschränkt.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "This course is evaluated at the group level.<br><br>The start and end dates of the course evaluation can be changed or adjusted as long as the students have not yet been invited.<br><br>Student access is limited to this evaluation response window.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'infoStudierendenlink',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Der Versand der E-Mail-Einladung zur LV-Evaluierung ist nur einmalig möglich. Jede*r Studierende*r erhält einen anonymen Zugangslink.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "The email invitation to the course evaluation can only be sent once. Each student receives an anonymous access link.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 	// ### Personen zusammenlegen Phrasen BEGIN
 	array(

From 7ccc26c8783d7c5cbf929f1d89f5adf68fb96e23 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 22 Jan 2026 15:41:25 +0100
Subject: [PATCH 1126/1357] =?UTF-8?q?Added=20lvevaluierung=20phrasen=20for?=
 =?UTF-8?q?=20STGL=20=C3=9Cbersichtsseite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 561fff729..67ad69732 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -53400,6 +53400,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 		'category' => 'global',
 		'phrase' => 'tooltipEvaluationNotAvailable',
 		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ergebnisse LV-Evaluierung und LV-Reflexion noch nicht verfügbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Results of course evaluation and course reflection not yet available.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipReflexionNotAvailable',
+		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
@@ -53835,6 +53855,266 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'stglseiteTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluation | Übersicht Studiengangsleitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'LV-Evaluation | Overview Program Director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'kfseiteTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Evaluation | Übersicht Kompetenzfeldleitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'LV-Evaluation | Overview Head of Competence Center',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'confirmHeader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte bestätigen Sie:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please confirm:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'malveSubmitBtn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MALVE-STGL abschließen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Close MALVE-STGL',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'malveSubmitConfirmMessage',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich habe alle LV-Evaluierungen des Studiengangs {studiengang} im {studiensemester} geprüft. Notwendige Maßnahmen für die STG-Weiterentwicklung wurden abgeleitet.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I have reviewed all the course evaluations for the {studiengang} degree programme in {studiensemester}. The necessary measures for further developing the STG have been identified.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'evaluationsebene',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Evaluationsebene',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Evaluation level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'confirmHeader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte bestätigen Sie:',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please confirm:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'geprueft',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geprüft',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Checked',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipGeprueft',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Optional zur besseren persönlichen Übersicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Optional for better personal overview.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'lvKeinQuellkurs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV mit keinem Quellkurs verknüpft',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course not linked to any (Moodle) source template',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'stgWeiterentwicklungBtn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'STG-Weiterentwicklung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'STG-Continued Improvement',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipStgWeiterentwicklungBtn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MALVE-STGL: Schnittstelle zur Maßnahmenableitung für den STG in OP.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'MALVE-STGL: An interface for deriving measures for the degree programme in OP.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'tooltipLvWeiterentwicklungBtn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Schnittstelle zur Maßnahmenableitung für die einzelnen LVs in OP.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Interface for deriving measures for individual courses in OP.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 	// ### Personen zusammenlegen Phrasen BEGIN
 	array(

From 27a91de5f6934d373e4d50c8b03fdc2b1d163e8b Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 22 Jan 2026 15:51:05 +0100
Subject: [PATCH 1127/1357] Added app lvevaluierung to system.tbl_app

---
 system/dbupdate_3.4/62063_lv_evaluierung.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/62063_lv_evaluierung.php b/system/dbupdate_3.4/62063_lv_evaluierung.php
index 5a0714772..0aa8d9105 100644
--- a/system/dbupdate_3.4/62063_lv_evaluierung.php
+++ b/system/dbupdate_3.4/62063_lv_evaluierung.php
@@ -1,6 +1,19 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
+if ($result = @$db->db_query("SELECT 1 FROM system.tbl_app WHERE app='lvevaluierung' LIMIT 1"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_app (app) VALUES ('lvevaluierung');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_app: '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_app: lvevaluierung hinzugefügt<br>';
+	}
+}
+
 //Add column evaluierung to lehre.tbl_lehrveranstaltung
 if(!@$db->db_query("SELECT evaluierung FROM lehre.tbl_lehrveranstaltung LIMIT 1"))
 {
@@ -12,4 +25,4 @@ if(!@$db->db_query("SELECT evaluierung FROM lehre.tbl_lehrveranstaltung LIMIT 1"
 		echo '<strong>lehre.tbl_lehrveranstaltung '.$db->db_last_error().'</strong><br>';
 	else
 		echo '<br>Spalte evaluierung zu Tabelle lehre.tbl_lehrveranstaltung hinzugefügt';
-}
+}
\ No newline at end of file

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 1128/1357] 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 1129/1357] 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 1130/1357] 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 709f64e292e0f56c46c92883281b35e254101b70 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 09:31:14 +0100
Subject: [PATCH 1131/1357] 2 new dateStyle status regarding QG benotung

---
 public/css/components/abgabetool/abgabe.css   | 88 +++++++++++++++++++
 public/css/theme/default.css                  | 34 +++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 60 +++++++++----
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 42 +++++----
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 43 +++++----
 .../Cis/Abgabetool/StatusLegende.js           | 20 ++++-
 system/phrasesupdate.php                      | 40 +++++++++
 7 files changed, 273 insertions(+), 54 deletions(-)

diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index 7c806ce2f..cd6c6cdb2 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -139,6 +139,94 @@
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
+
+/* Base Header */
+.bestanden-header {
+	background-color: var(--fhc-purple-70);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 34px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.bestanden-header:hover {
+	background-color: var(--fhc-purple-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .bestanden-header {
+	background-color: var(--fhc-purple-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .bestanden-header:hover {
+	background-color: var(--fhc-purple-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+
+/* Base Header */
+.nichtbestanden-header {
+	background-color: var(--fhc-red-70);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 34px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.nichtbestanden-header:hover {
+	background-color: var(--fhc-red-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .nichtbestanden-header {
+	background-color: var(--fhc-red-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .nichtbestanden-header:hover {
+	background-color: var(--fhc-red-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+
+/* Base Header */
+.erledigt-header {
+	background-color: var(--fhc-red-70);
+	font-weight: 600;
+	border-radius: 6px;
+	padding: 0px 0px 0px 34px;
+	transition: background-color 0.3s ease, box-shadow 0.3s ease, color 0.3s ease;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.08);
+}
+
+/* Hover State */
+.erledigt-header:hover {
+	background-color: var(--fhc-red-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+/* Active / Expanded State */
+.p-accordion-tab-active > .erledigt-header {
+	background-color: var(--fhc-red-50);
+	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
+}
+
+/* Hover State Active*/
+.p-accordion-tab-active > .erledigt-header:hover {
+	background-color: var(--fhc-red-60);
+	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
+}
+
+
 /* Base Header */
 .standard-header {
 	background-color: var(--fhc-white-70);
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 699a60f93..a4d197f07 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -101,7 +101,41 @@
 	--fhc-beige-10: rgba(245, 233, 215, 0.5);
 	--fhc-beige-20: rgba(172, 153, 125, 0.5);
 
+	/* --- Purple --- */
+	--fhc-purple-5:  rgb(250, 245, 255);
+	--fhc-purple-10: rgb(240, 230, 255);
+	--fhc-purple-20: rgb(220, 200, 250);
+	--fhc-purple-30: rgb(190, 160, 245);
+	--fhc-purple-40: rgb(160, 120, 235);
+	--fhc-purple-50: rgb(130, 80, 220);
+	--fhc-purple-60: rgb(110, 60, 190);
+	--fhc-purple-70: rgb(90, 40, 160);
+	--fhc-purple-80: rgb(70, 25, 130);
+	--fhc-purple-90: rgb(50, 15, 100);
 
+	/* --- Teal --- */
+	--fhc-teal-5:  rgb(240, 252, 252);
+	--fhc-teal-10: rgb(220, 245, 245);
+	--fhc-teal-20: rgb(180, 235, 235);
+	--fhc-teal-30: rgb(130, 220, 220);
+	--fhc-teal-40: rgb(80, 200, 200);
+	--fhc-teal-50: rgb(30, 170, 170);
+	--fhc-teal-60: rgb(20, 140, 140);
+	--fhc-teal-70: rgb(15, 115, 115);
+	--fhc-teal-80: rgb(10, 90, 90);
+	--fhc-teal-90: rgb(5, 65, 65);
+
+	/* --- Indigo --- */
+	--fhc-indigo-5:  rgb(245, 247, 255);
+	--fhc-indigo-10: rgb(230, 235, 255);
+	--fhc-indigo-20: rgb(200, 210, 250);
+	--fhc-indigo-30: rgb(160, 175, 245);
+	--fhc-indigo-40: rgb(120, 140, 235);
+	--fhc-indigo-50: rgb(80, 100, 220);
+	--fhc-indigo-60: rgb(60, 80, 190);
+	--fhc-indigo-70: rgb(45, 60, 160);
+	--fhc-indigo-80: rgb(30, 40, 130);
+	--fhc-indigo-90: rgb(20, 25, 100);
 
 }
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 92f546e32..3fda6510c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -308,25 +308,34 @@ export const AbgabeMitarbeiterDetail = {
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
-			
-			if(termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
-			if (termin.abgabedatum === null && termin.upload_allowed) {
-				if(datum < today) {
-					return 'verpasst' // needs upload, missed it and has not submitted anything 
-				} else if (datum > today && termin.diffindays <= 12) {
-					return 'abzugeben' // needs to upload soon
-				} else {
-					return 'standard' // upload in distant future
+
+			const isLate = abgabedatum && abgabedatum > datum;
+
+			// GRADE STATUS
+			if (termin.note) {
+				if (termin.note.positiv) return 'bestanden';
+				return 'nichtbestanden';
+			}
+
+			// ACTION REQUIRED FOR GRADE
+			if (termin.bezeichnung?.benotbar && datum < today) {
+				return 'beurteilungerforderlich';
+			}
+
+			// SUBMISSION STATUS
+			if (termin.upload_allowed) {
+				if (abgabedatum) {
+					return isLate ? 'verspaetet' : 'abgegeben';
 				}
+
+				// no submission yet
+				if (datum < today) return 'verpasst';
+				if (termin.diffindays <= 12) return 'abzugeben';
+				return 'standard';
 			}
-			else if(abgabedatum > datum) {
-				return 'verspaetet' // needs upload, missed it and has submitted smth late
-			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
-				else if (today > datum) return 'abgegeben'
-			} else {
-				return 'abgegeben' // nothing else to do for that termin
-			}
+
+			// GENERIC STATUS
+			return datum < today ? 'verpasst' : 'standard';
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -582,6 +591,18 @@ export const AbgabeMitarbeiterDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipBestanden() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipBestanden'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipNichtBestanden() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipNichtBestanden'),
+				class: "custom-tooltip"
+			}
+		},
 		getProjektarbeitTitel() {
 			if(this.projektarbeit?.titel) return this.projektarbeit.titel
 			
@@ -753,8 +774,11 @@ export const AbgabeMitarbeiterDetail = {
 								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>
 								<i v-else-if="getDateStyleClass(termin) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>
+								<i v-else-if="getDateStyleClass(termin) == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>
+							
 							</div>
 					
 							<div class="text-start px-2" style="min-width: 150px; max-width: 300px; margin-left: 40px">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 4c3714372..f1e33a0cf 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -728,25 +728,33 @@ export const AbgabetoolAssistenz = {
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
-			// seperate status if termin is in the past, it needs a note but doesnt have one yet			
-			if(termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
-			if (termin.abgabedatum === null && termin.upload_allowed) {
-				if(datum < today) {
-					return 'verpasst' // needs upload, missed it and has not submitted anything 
-				} else if (datum > today && termin.diffindays <= 12) {
-					return 'abzugeben' // needs to upload soon
-				} else {
-					return 'standard' // upload in distant future
+			const isLate = abgabedatum && abgabedatum > datum;
+
+			// GRADE STATUS
+			if (termin.note) {
+				if (termin.note.positiv) return 'bestanden';
+				return 'nichtbestanden';
+			}
+
+			// ACTION REQUIRED FOR GRADE
+			if (termin.bezeichnung?.benotbar && datum < today) {
+				return 'beurteilungerforderlich';
+			}
+
+			// SUBMISSION STATUS
+			if (termin.upload_allowed) {
+				if (abgabedatum) {
+					return isLate ? 'verspaetet' : 'abgegeben';
 				}
+
+				// no submission yet
+				if (datum < today) return 'verpasst';
+				if (termin.diffindays <= 12) return 'abzugeben';
+				return 'standard';
 			}
-			else if(abgabedatum > datum) {
-				return 'verspaetet' // needs upload, missed it and has submitted smth late
-			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
-				else if (today > datum) return 'abgegeben'
-			} else {
-				return 'abgegeben' // nothing else to do for that termin
-			}
+
+			// GENERIC STATUS
+			return datum < today ? 'verpasst' : 'standard';
 		},
 		openTimeline(val) {
 			const projekt = this.projektarbeiten.find(p => p.projektarbeit_id == val.projektarbeit_id)
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index b9286abf9..a60eee5da 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -70,25 +70,34 @@ export const AbgabetoolStudent = {
 			const abgabedatum = new Date(termin.abgabedatum)
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
-			
-			if (termin.bezeichnung?.benotbar && !termin.note) return 'beurteilungerforderlich'
-			if (termin.abgabedatum === null && termin.upload_allowed) {
-				if(datum < today) {
-					return 'verpasst' // needs upload, missed it and has not submitted anything 
-				} else if (datum > today && termin.diffindays <= 12) {
-					return 'abzugeben' // needs to upload soon
-				} else {
-					return 'standard' // upload in distant future
+
+			const isLate = abgabedatum && abgabedatum > datum;
+
+			// GRADE STATUS
+			if (termin.note) {
+				if (termin.note.positiv) return 'bestanden';
+				return 'nichtbestanden';
+			}
+
+			// ACTION REQUIRED FOR GRADE
+			if (termin.bezeichnung?.benotbar && datum < today) {
+				return 'beurteilungerforderlich';
+			}
+
+			// SUBMISSION STATUS
+			if (termin.upload_allowed) {
+				if (abgabedatum) {
+					return isLate ? 'verspaetet' : 'abgegeben';
 				}
+
+				// no submission yet
+				if (datum < today) return 'verpasst';
+				if (termin.diffindays <= 12) return 'abzugeben';
+				return 'standard';
 			}
-			else if(abgabedatum > datum) {
-				return 'verspaetet' // needs upload, missed it and has submitted smth late
-			} else if(!termin.upload_allowed) {
-				if(datum > today) return termin.diffindays <= 12 ? 'abzugeben' : 'standard'
-				else if (today > datum) return 'abgegeben'
-			} else {
-				return 'abgegeben' // nothing else to do for that termin
-			}
+
+			// GENERIC STATUS
+			return datum < today ? 'verpasst' : 'standard';
 		},
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index 25761e238..ccf46a69b 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -47,7 +47,6 @@ export const AbgabeterminStatusLegende = {
 					<div class="col-auto" style="display: flex; align-items: center;">
 						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipAbgegeben')) }}</h5>
 					</div>
-					
 				</div>
 				
 				<div class="row" style="margin-bottom: 2px">
@@ -57,7 +56,24 @@ export const AbgabeterminStatusLegende = {
 					<div class="col-auto" style="display: flex; align-items: center;">
 						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipBeurteilungerforderlich')) }}</h5>
 					</div>
-					
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto bestanden-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-list-check"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipBestanden')) }}</h5>
+					</div>
+				</div>
+				
+				<div class="row" style="margin-bottom: 2px">
+					<div class="col-auto nichtbestanden-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
+						<i class="fa-solid fa-list-check"></i>
+					</div>
+					<div class="col-auto" style="display: flex; align-items: center;">
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipNichtBestanden')) }}</h5>
+					</div>	
 				</div>
 
 			</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1c1d8047f..94179b4df 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44476,6 +44476,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipBestanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bestanden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'passed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4tooltipNichtBestanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nicht Bestanden",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'not passed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 3c82cd128200b63726aefb4093295db6ca10514f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 09:58:48 +0100
Subject: [PATCH 1132/1357] icon template statusses

---
 application/controllers/jobs/AbgabetoolJob.php  |  2 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js       | 17 ++++++++++++++++-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js       | 10 +++++++---
 .../components/Cis/Abgabetool/StatusLegende.js  |  6 +++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 5c1bd687a..fdd8d2fc5 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -521,7 +521,7 @@ class AbgabetoolJob extends JOB_Controller
 
 		$this->_ci->logInfo('Start job FHC-Core->notifyStudentMail');
 
-		$interval = '20 days';$this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
 
 		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT');
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8deb689c6..2bff45d76 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -305,6 +305,18 @@ export const AbgabeStudentDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipBestanden() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipBestanden'),
+				class: "custom-tooltip"
+			}
+		},
+		getTooltipNichtBestanden() {
+			return {
+				value: this.$p.t('abgabetool/c4tooltipNichtBestanden'),
+				class: "custom-tooltip"
+			}
+		},
 	},
 	created() {
 		
@@ -340,8 +352,11 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
 									<i v-else-if="termin.dateStyle == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
-									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-check"></i>
+									<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>
 									<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
+									<i v-else-if="termin.dateStyle == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>
+									<i v-else-if="termin.dateStyle == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>
+							
 								</div>
 								<div class="text-start px-2" style="min-width: 150px; max-width: 300px; margin-left: 40px">
 									<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index f1e33a0cf..c162b9068 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1167,9 +1167,13 @@ export const AbgabetoolAssistenz = {
 					<div :class="slotProps.item.dateStyle + '-header'" style="height: 48px; width:48px; padding: 0px; display: flex; align-items: center; justify-content: center;">
 						<i v-if="slotProps.item.dateStyle == 'verspaetet'" class="fa-solid fa-triangle-exclamation"></i>
 						<i v-else-if="slotProps.item.dateStyle == 'verpasst'" class="fa-solid fa-calendar-xmark"></i>
-						<i v-else-if="slotProps.item.dateStyle == 'abzugeben'"  class="fa-solid fa-hourglass-half"></i>
-						<i v-else-if="slotProps.item.dateStyle == 'standard'"  class="fa-solid fa-clock"></i>
-						<i v-else-if="slotProps.item.dateStyle == 'abgegeben'"  class="fa-solid fa-check"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'abzugeben'" class="fa-solid fa-hourglass-half"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'standard'" class="fa-solid fa-clock"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'abgegeben'" class="fa-solid fa-paperclip"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'beurteilungerforderlich'" class="fa-solid fa-list-check"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'bestanden'" class="fa-solid fa-check"></i>
+						<i v-else-if="slotProps.item.dateStyle == 'nichtbestanden'" class="fa-solid fa-circle-exclamation"></i>
+					
 					</div>
 				</template>
 			
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index ccf46a69b..d415c508d 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -42,7 +42,7 @@ export const AbgabeterminStatusLegende = {
 				
 				<div class="row" style="margin-bottom: 2px">
 					<div class="col-auto abgegeben-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
-						<i class="fa-solid fa-check"></i>
+						<i class="fa-solid fa-paperclip"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
 						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipAbgegeben')) }}</h5>
@@ -60,7 +60,7 @@ export const AbgabeterminStatusLegende = {
 				
 				<div class="row" style="margin-bottom: 2px">
 					<div class="col-auto bestanden-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
-						<i class="fa-solid fa-list-check"></i>
+						<i class="fa-solid fa-check"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
 						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipBestanden')) }}</h5>
@@ -69,7 +69,7 @@ export const AbgabeterminStatusLegende = {
 				
 				<div class="row" style="margin-bottom: 2px">
 					<div class="col-auto nichtbestanden-header" style="height: 36px; width:36px; padding: 0px; display: flex; align-items: center; justify-content: center;">
-						<i class="fa-solid fa-list-check"></i>
+						<i class="fa-solid fa-circle-exclamation"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
 						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipNichtBestanden')) }}</h5>

From 84db668566ffe8dcc58940b052099d1d619e3721 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 10:30:00 +0100
Subject: [PATCH 1133/1357] compare notenOpt in student view if necessary for
 datestyle

---
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index a60eee5da..0848cc1ca 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -75,6 +75,10 @@ export const AbgabetoolStudent = {
 
 			// GRADE STATUS
 			if (termin.note) {
+				if(Number.isInteger(termin.note)) {
+					const opt = this.notenOptions.find(opt => opt.note == termin.note)
+					if(opt.positiv) return 'bestanden'
+				}
 				if (termin.note.positiv) return 'bestanden';
 				return 'nichtbestanden';
 			}

From fc468ca34a940083c4594c34aa1d8a9741e044d9 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 10:52:15 +0100
Subject: [PATCH 1134/1357] URL_ASSISTENZ for links in email jobs

---
 application/config/abgabe.php                  | 2 ++
 application/controllers/jobs/AbgabetoolJob.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 8b14deffc..3ff56a957 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -12,6 +12,8 @@ $config['PAABGABE_EMAIL_JOB_INTERVAL'] = '1 day';
 $config['URL_STUDENTS'] = 'cis.php/Cis/Abgabetool/Student';
 // used as APP_ROOT.URL_MITARBEITER -> old cis 
 $config['URL_MITARBEITER'] = 'index.ci.php/Cis/Abgabetool/Mitarbeiter';
+// used as APP_ROOT.URL_MITARBEITER -> old cis 
+$config['URL_ASSISTENZ'] = 'index.ci.php/Cis/Abgabetool/Assistenz';
 
 // lehre.tbl_paabgabetyp bezeichnung
 //$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index fdd8d2fc5..6d52d6c20 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -195,7 +195,7 @@ class AbgabetoolJob extends JOB_Controller
 			
 			
 
-			$path = $this->_ci->config->item('URL_MITARBEITER');
+			$path = $this->_ci->config->item('URL_ASSISTENZ');
 			$url = CIS_ROOT.$path;
 
 			$body_fields = array(

From 3e46e947360c3b23d6d64a5c188d2ddc0d598a30 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 Jan 2026 11:07:46 +0100
Subject: [PATCH 1135/1357] quick fix to prevent pruefunglist from being empty
 due to js error in combination with tabulator sort persistence

---
 .../Details/Pruefung/Pruefunglist.js                   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 62cd47547..58d42666f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -91,7 +91,15 @@ export default{
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				index: 'pruefung_id',
-				persistenceID: 'stv-details-pruefung-list-2025112402'
+				persistenceID: 'stv-details-pruefung-list-2026012701',
+				persistence: {
+					sort: false,
+					columns: ["width", "visible", "frozen"],
+					filter: false,
+					headerFilter: false,
+					group: false,
+					page: false
+				}
 			},
 			tabulatorEvents: [
 				{

From 06139b14d6c76764128bdc9c20607b0797251939 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 11:25:41 +0100
Subject: [PATCH 1136/1357] bestanden style from purple to green

---
 public/css/components/abgabetool/abgabe.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/components/abgabetool/abgabe.css b/public/css/components/abgabetool/abgabe.css
index cd6c6cdb2..d70481805 100644
--- a/public/css/components/abgabetool/abgabe.css
+++ b/public/css/components/abgabetool/abgabe.css
@@ -142,7 +142,7 @@
 
 /* Base Header */
 .bestanden-header {
-	background-color: var(--fhc-purple-70);
+	background-color: var(--fhc-green-70);
 	font-weight: 600;
 	border-radius: 6px;
 	padding: 0px 0px 0px 34px;
@@ -152,19 +152,19 @@
 
 /* Hover State */
 .bestanden-header:hover {
-	background-color: var(--fhc-purple-60);
+	background-color: var(--fhc-green-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 
 /* Active / Expanded State */
 .p-accordion-tab-active > .bestanden-header {
-	background-color: var(--fhc-purple-50);
+	background-color: var(--fhc-green-50);
 	box-shadow: 0 2px 8px rgba(0,0,0,0.2);
 }
 
 /* Hover State Active*/
 .p-accordion-tab-active > .bestanden-header:hover {
-	background-color: var(--fhc-purple-60);
+	background-color: var(--fhc-green-60);
 	box-shadow: 0 2px 6px rgba(0,0,0,0.12);
 }
 

From 07dd9e3a772194ed292415ed6d59106b237e6332 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 11:31:56 +0100
Subject: [PATCH 1137/1357] abgabedatum logic fix in dateStyles

---
 .../js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js   | 4 ++--
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js    | 4 ++--
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 3fda6510c..cd867db25 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -309,7 +309,7 @@ export const AbgabeMitarbeiterDetail = {
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
-			const isLate = abgabedatum && abgabedatum > datum;
+			const isLate = termin.abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {
@@ -324,7 +324,7 @@ export const AbgabeMitarbeiterDetail = {
 
 			// SUBMISSION STATUS
 			if (termin.upload_allowed) {
-				if (abgabedatum) {
+				if (termin.abgabedatum) {
 					return isLate ? 'verspaetet' : 'abgegeben';
 				}
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index c162b9068..d41336b53 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -728,7 +728,7 @@ export const AbgabetoolAssistenz = {
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
-			const isLate = abgabedatum && abgabedatum > datum;
+			const isLate = termin.abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {
@@ -743,7 +743,7 @@ export const AbgabetoolAssistenz = {
 
 			// SUBMISSION STATUS
 			if (termin.upload_allowed) {
-				if (abgabedatum) {
+				if (termin.abgabedatum) {
 					return isLate ? 'verspaetet' : 'abgegeben';
 				}
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 0848cc1ca..ff68b680f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -71,7 +71,7 @@ export const AbgabetoolStudent = {
 
 			termin.diffindays = this.dateDiffInDays(termin.datum)
 
-			const isLate = abgabedatum && abgabedatum > datum;
+			const isLate = termin.abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {
@@ -90,7 +90,7 @@ export const AbgabetoolStudent = {
 
 			// SUBMISSION STATUS
 			if (termin.upload_allowed) {
-				if (abgabedatum) {
+				if (termin.abgabedatum) {
 					return isLate ? 'verspaetet' : 'abgegeben';
 				}
 

From edd0c46186eb47f7f52450eb83f02d13ea934b60 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 11:50:29 +0100
Subject: [PATCH 1138/1357] target blank on students stg moodle link; added new
 classes to assistenz table cell formatters

---
 .../js/components/Cis/Abgabetool/AbgabeStudentDetail.js  | 2 +-
 .../js/components/Cis/Abgabetool/AbgabetoolAssistenz.js  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 2bff45d76..8feca34f9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -337,7 +337,7 @@ export const AbgabeStudentDetail = {
 				</div>
 				<div class="col-4">
 					<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 
-						<a :href="getMoodleLink">Moodle</a>
+						<a :href="getMoodleLink" target="_blank">Moodle</a>
 					</p>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index d41336b53..7345b14e0 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -824,8 +824,17 @@ export const AbgabetoolAssistenz = {
 						icon = '<i class="fa-solid fa-clock"></i>'
 						break
 					case 'abgegeben':
+						icon = '<i class="fa-solid fa-paperclip"></i>'
+						break
+					case 'beurteilungerfolderlich':
+						icon = '<i class="fa-solid fa-list-check"></i>'
+						break
+					case 'bestanden':
 						icon = '<i class="fa-solid fa-check"></i>'
 						break
+					case 'nichtbestanden':
+						icon = '<i class="fa-solid fa-circle-exclamation"></i>'
+						break
 				}
 				
 				const bezeichnung = val.bezeichnung?.bezeichnung ?? val.bezeichnung

From 101613ecdd4822ec5636e83c48cbdcaf3fdc8188 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 27 Jan 2026 14:47:51 +0100
Subject: [PATCH 1139/1357] detail view infos - student: {student} titel:
 {titel} betreuer: {betreuer}

---
 application/controllers/api/frontend/v1/Abgabe.php   | 11 +++++++++--
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js        | 12 +++++++++---
 .../components/Cis/Abgabetool/AbgabeStudentDetail.js |  5 +++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index cd0fbb212..5a6331584 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -164,7 +164,8 @@ class Abgabe extends FHCAPI_Controller
 	public function getStudentProjektarbeiten()
 	{
 		$uid = $this->input->get("uid",TRUE);
-		
+
+		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -185,6 +186,8 @@ class Abgabe extends FHCAPI_Controller
 		if(count($projektarbeiten)) {
 			foreach($projektarbeiten as $pa) {
 				
+				$pa->student = getData($this->PersonModel->getFullName($uid));
+				
 				$downloadPaFunc = function ($babgeschickt, $zweitbetreuer_abgeschickt) use ($pa) {
 					$pa->babgeschickt = $babgeschickt;
 					$pa->zweitbetreuer_abgeschickt = $zweitbetreuer_abgeschickt;
@@ -466,7 +469,11 @@ class Abgabe extends FHCAPI_Controller
 
 
 		forEach($projektarbeiten->retval as $pa) {
-
+			
+			$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($pa->betreuer_person_id);
+			$anredeArr = $this->getDataOrTerminateWithError($result, 'general');
+			$pa->betreuer = $anredeArr[0];
+			
 			$oldLink = ''; // show this when paIsCurrent == false -> moodle course template
 			$newLink = ''; // get curated path for betreuer type
 			$returnFunc = function ( $resultOld, $resultNew) use (&$oldLink, &$newLink) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index cd867db25..eb182eb7b 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -604,13 +604,13 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		getProjektarbeitTitel() {
-			if(this.projektarbeit?.titel) return this.projektarbeit.titel
+			if(this.projektarbeit?.titel) return this.$capitalize(this.$p.t('abgabetool/c4titel')) + ': ' + this.projektarbeit.titel
 			
 			return ''
 		},
 		getProjektarbeitStudent(){
 
-			if(this.projektarbeit?.student) return this.projektarbeit.student
+			if(this.projektarbeit?.student) return this.$capitalize(this.$p.t('person/student')) + ': ' + this.projektarbeit.student
 
 			return ''
 		}
@@ -729,7 +729,13 @@ export const AbgabeMitarbeiterDetail = {
 			<div class="col-6">
 				<p> {{getProjektarbeitStudent}}</p>
 				<p> {{getProjektarbeitTitel}}</p>
-				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+				<template v-if="assistenzMode">
+					<p v-if="projektarbeit?.erstbetreuer_full_name"> {{$capitalize( $p.t('abgabetool/c4betreuer') )}}: {{projektarbeit?.erstbetreuer_full_name}}</p>
+					<p v-if="projektarbeit?.zweitbetreuer_full_name"> {{$capitalize( $p.t('abgabetool/c4zweitbetreuer') )}}: {{projektarbeit?.zweitbetreuer_full_name}}</p>
+				</template>
+				<template v-else>
+					<p v-if="projektarbeit?.betreuer"> {{$p.t('abgabetool/c4betreuer')}}: {{projektarbeit?.betreuer?.first}}</p>
+				</template>		
 			</div>
 			<div class="col-6 d-flex justify-content-end align-items-start">
 				<SpeedDial
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8feca34f9..8e6ce20c3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -332,8 +332,9 @@ export const AbgabeStudentDetail = {
 			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
 			<div class="row">
 				<div class="col-8">
-					<p> {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
-					<p> {{projektarbeit?.titel}}</p>
+					<p> {{$capitalize( $p.t('person/student') ) }}: {{projektarbeit?.student}}</p>
+					<p> {{$capitalize( $p.t('abgabetool/c4titel') ) }}: {{projektarbeit?.titel}}</p>
+					<p> {{$capitalize( $p.t('abgabetool/c4betreuer') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
 				</div>
 				<div class="col-4">
 					<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 

From c724c6a20f1dabaf4f0cb2c5c5924b4bb9fecc01 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Tue, 27 Jan 2026 16:53:33 +0100
Subject: [PATCH 1140/1357] =?UTF-8?q?MathML=20auf=20Darstellungs-Testseite?=
 =?UTF-8?q?=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/public/testtool_test/MathML_Beispiel.png | Bin 0 -> 4923 bytes
 cis/public/testtool_test/testseite.php       | 129 +++++++++++--------
 2 files changed, 75 insertions(+), 54 deletions(-)
 create mode 100644 cis/public/testtool_test/MathML_Beispiel.png

diff --git a/cis/public/testtool_test/MathML_Beispiel.png b/cis/public/testtool_test/MathML_Beispiel.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6ef2403f2a84eccaa333fdbfe306fdf6b08ba2a
GIT binary patch
literal 4923
zcmb_gXH-*Lw+%KFRK%cIX%dQ*XrxNJO6U+kq(ivUJJM^wLYHC^I-xfK2}o}N>4eaG
zN9hn+=%K#cckdYQdq3}Z@5d=W_Bm^=J@%Sw&K05tle<ClfCc~n+)$8*z5xKJq$%%3
zS1(ZR4_Fd4D35FJ<#n9_fSb*KT~yILHy;83x7QV*uikoK)~6gSA6g_+ZyAA=BJ{V4
zg9vrE?xi>BWP^*TUyKE;KC=NPAR{%wy-Hw|R&P|1F0;-{XBbTk?t4Z+wqz};s*)Q=
zxUEk!VP9o%!$y_G72B#I0&z%iYB2E;V`X!G|F&q*Ak92{qh++%lyD@L;JMg$u+tH<
zw-g&vx6>)U)45Zt#>H?IV6dTz;RgVCKd@ii0w`ShMTNTl^CJ8G57hDy0Nqzp022!y
zApQr6%Hv-wF!%_$(>;&jzmQ5l<5Uf3<G%KsgW0#2v3?E8XLHSQO`Z=5eWRyxw2oc8
z^#n+h%~j_jJS%$C*545{uv!XisdgmlYQI2r-kQsWlj)kM<m!WEIT)1f5~4jKTSs-S
zQZETuX{p@2wE+3O^W2db_p_o*k<ng)$A;gfdhgn+xWmDfr!)bt)3#1vTrNwVWD_Fr
zwIwP3#U2AqKx0WuFPw@9{KTS+W%g|S-8RB`xgkVlwY9+FU6&>L{%nYO$wDNT#&b`R
zq&3HECbslsd9Cob-i_m-%Jam%yUbfD(U!U~%v^XX{fXDY_7b!<vXP8UPVr<jRQF3n
zsCM-B9~^9(xu_;thx*9ia+jvu1ZDeCub?uu7vrXEY^Pc}j|TRASDb%6Dr8$YjT&Z5
zx&OX8V%+C+dR(<Q-n)GIqn5R7;@bM=6O{Sef$z}7+|)QV48M)TflojPqJwlDL0Gx{
z)TwQlXGE_{zL?WVyG!<<V)_q=gfevd<Wo~y;Npg-{~kxn+&YNOZZ3{rC#TYs7;W{#
zoSppaTsI`Rluxccv8wX~Le69r7UT}v)vAP>0fp^xF*dR&-OSpQe)$I>)xYwW*Z1g=
zXQlJEWM_Iiyi4pB(+ji*y}FW;O-)#N10h**{pJ?m(THS9IG5%-IBasmhe&y}_Lm7Y
zPZl8g!snZp@tXP$k#_{$y-*>+LK<@|C9`Ev+xYfA4PM#AC=6C3%SK58iF}vdHF%Oh
zE~Oyq+mdfi%dh00@PeAEcYzsRB0#&S1{WxF{-I%qP`ygD|2?#Rbwn0>bKKfs?*h$D
z2j+paf=uO*9}69R)@x0Q)V@MZ;rcxZ2}o0$vgG-QVJDOrV+8g;PH(HBbE9~Z?XSz%
zU1^`Q#9m8L6)Yy}#Nkq}k5dkNs>-52XM$!1jPW;I(4om3E@u>QTjs|R@U5oAzC#RC
zWZ7GViNWuA*-y=4;h(T_dxXL3_CL$*aT)JjZv6ZlVUL~wJdxJ>gk)7|@`P~qx=-ES
zHM|I*?d5R3fEeL(^qUd<E6o4Y6cCBJrS$xn3_m>*c`YQJizxvU4C2*pce0a-xjQ!K
zBz)rG%gKJVv0+?11$Oll%T=IUtW+_&s<a<@=kvWrrvTm&EmKdVypw!orB1PE3K;HU
z{;@cHPhrU&H1xxOl~8u4ETbJ(Pvbg28{RgdRJt;{&DHu^q+Ge5S3l#X;y+7r<uRPG
z&K}nCX1*|IH}f7n9qiYI@z8Ni)0_%?Rwq?tT_0#DS5&L(j&c^O-qkP1(qR2W;(+zv
zNbPuT+d=4&5Kw6P=xF7FTNH^>0(Sf&FmImjtRRI%+Q1}uW?t|DjV`v}8$yN+4~3qs
z;IbaX$|A-Mdef8`y@^bUCDc6K<eY&wWE#2%<Eqy&HaylQl)Ub%3M4Y|8$~zT2fduA
zJw-qhl?wve|2yx&7&hd5QzwXk`MFG!4f+SNj%f}jd6~xHC`J}Kt#Q)@9Y<RiQ{XLs
z)XLHK{sWTm^dHQ;{r&j^8ycQr+G9HO`UKrtuB#N17@OWCqRr|dAN~ewC}X^z(xlNO
z>N}NQ%e1(d%~H-|T2-Fz#t=f`%hZ7$G}Yn1AjbbYwf?(5EbAz~W{^?84!#G|Hl|{~
zFJi&#-;&OqH4i?^Oo(Y`ytg|@mfW*|#}|83e`LSd6UF_!QZPNi9HbWk8df~R47hH4
zdGnsO8*uQ3{xDOTDY+>R+3J)k$QwAr8C|(>8+o>ynk&GBwM3l4iIUwqSHFx{%Bm<0
z<1CWCnl2k0#Vn!&#Y;!NhNkNb8w+;>yYk$hxIX@_zpfAS;rehfEWoo0T*tt7MMYPa
zW7C$T&0WB88f~<CLEdQza<{QTG(6ZRLuu^WlN%w3uz>e!H+iFl;zSKOjegdga|(Kz
z0`JAEJuA~al2^k_oc{pV&8zL`>wcsnqSIO|V2pk7l1aBNy_?nWmRuvx%Dk$qJe*8c
z<=I<l?(0ENifS$2f>yj9NHdjNvQOz6-;VLaMd#w4n{06IW3i*3rs6{(J~s}?^N@GX
zF?hi((fF@ip$&r^>V+d4Znk`^)2lNMQqj$40bB^BjJiWqHN)l;^2aypk0${V@W(1M
z{olaPOxMlgq@Ci6L}0>i%OoVKJEF!OvG12yZV2wX3sfn4g!Q*H{VKcTdG5+Xn5S&j
z{C$*9X>Iyf<TcRbLraTpbe685=&yE8X>REmYriLBKztrj2v-3CVKJIRg!nD;;7Mb!
zlwy3Z$duX;4uM8i#q<Xor~7Or{08)$DQu?(1&e>CnlX6Fu}bnD)AFu$qI?r&ekRVy
zuoN6PKpopKevJZ_x1zdOK@u-sF1bAAs7@W{r?&^Bzj68KO)j5de5jp)I+{A@UUK`C
z$v#`wF(d7P;QFMUW>5z4X10SRrN+!HC6GL~=@m-y^o<P~DQ!nDqJ?X!&O}00fUq6o
zn5{DG5YX}iXL4)NYey`Q(jHM47PX~fuSKqqysa|}mOAa`q<H#@nd;Z3i46tCQuygJ
z$^NYSd)T00OFq_!tWUFniToX#_wp+=&X4-=!m%jn8Mo?tY-}BV4BqSRh7NG1s;%NB
zQydtw%a>l~>p;@WPmr+p)2rP!P!t1aEBd<b#u+Gt;i08zz$$0e!D>c|I%ooS_&s`9
zhg};!zhHC%->*!<K|rlBhR*ge^(j|X@Dn-w2FK*YkFnLn2$jV3dFE5|myQ}^l6T@g
z!5ioH5{2rwjlYl55038lm^ChGUuZi|(K>Dx+68cHygS{#Zb+N$Ww#19R?}F*PZh#&
zuIA@Uv=!$X1@k4x75rq_pzn*nn=vk4(YEaL(EM=H|HOEA|CA0}XRR7`o|*~wtJ*(x
z<gDp|4jgRO14p}?1Hop=!=!E-9thIGML{!m7Lke1=f^3G=v?hN=!SZAYAoEzYM7v_
z>NAbhJ|N={m7vh5^Y=dcj#)XFwYzeQp&#9)<~E|0>W8a?1}e_ZTw-seRMeb$u)1v+
z@b1ir?bXfKNTZoEv#@QsDI8Jj4|)XK{4ZURFomm48R**mnMn=od>Gkg)heE_WfXBN
z9}z9yub!|`vk%Rd^Z6?l%k%ThZFKc#`rKMwp}UR7TpHC)Z<*Sm>`7+Fsmp#+b;-lu
zjvG6BPKBC1I4h1|%ad86pqZcC*Xik9$vGUE*jkK-cbQkr9$)yrL)RW=`?eJi-3>Mn
zYq^~Z6gCoKsZ^0ywF@oD)9W9Yrc{IV*psBpfPA$aeiht1d&r#Ib~&6R=HAFG;y&Nd
zHRwV5Wx+?U&$0R?@|lF1sT_G}FvIXAg4{LWiUF6Jx*wAYl%%}Y1J9al#scy!9-LRA
zFG`Uon8xc;^u)~%6rqb(IUn3yTbHDkrR;UrWf@1%pNNqR(Pc%3E>>V-E{mM=#<R>U
z^$EX|lU5#YlV0fxKO+*i(b>eES6sMPvlQA%i|V@Al}K8sH=@7vn|dzg#OPRxn6H}c
z=QW46n4t*L*>Y<aAc8z0eCgFKEMi+l>?tn;P0wBF3-(^`lr#_{AUDaHv$?*=9jHqq
z<N3F~Ze{oOnd7l4BgyoJd5ae)T+)#D9QMJ+sBqi$<gfiHpwo59V1Q8R%U0q%fn>8(
z9USadHV6$QT+Hqnl7r48@NFG}ISF1czxpqh+Uj-ht8W)65i<m90;dzAI^n6Dxx|BQ
zzIs-h(r|Eauul#zW;1sRzPo#?Z+}U(a<c68Wv#H9jR)2H!(YjB85IugWmvz;uGqj=
zP{SFra}KT5hc@rfVEKWudPTb7BJ)!7kt!SXfmUHYv?f2qYE0_Mm}AQjQ(*j+$ef84
z#e}W!fy;w(3^F-Ne<Jhp_N2!0ywj?Ul7ctGm%S?Cj+w#wf?hHQUr!Yt()k~*sQ@f=
z-Kk}I0+98|k$meebks2Y{p{<1%s3ni4j%p?GYlf*>nC-_)9kIRCnMC=_DLQ%=mRS+
zZ0@lwre+TlysY~8*t95KMsCE2XXN~M`Ku{Ldv<cib9&q|=@va=4&@AEV}tDGK%tU_
zUydfyKr!r|`kvlLbK+!K2g6gscn?3easfs1ny%lXr<d?`I=o^SxKb@kN!~9PD97T?
zL5r$IoO{`ds)Ae4zpM2Cssj1liZ0JK!z99#zg10Vqb=Z)($H4Mhvh~*=lzGwZ0Si;
zS0bsCts~t-U>N%2arHYz-xk=HAllhlE6wqEzfce2#v^N|gawYWmt#&9ep>?cxg8mW
ze1+>CMoY}6M^n*u6k8#@>3i5biap+Ft*yoa`%-tcZI!Jq2wC#sYrM?avew;{UToGL
z;jX|f+5`w3N*wxU(=)ZAlQN}8zl$FiY)_B1{j5rv@+lSW;HW=>35Xmz;RU*fESXK2
zfv!e}HLN4o!3Ej)&)mbX*|313(K<2N+%oSpUq3O5IORbTjWj*`{iaTSu!Iq^Di*|z
zC~68#Ebwue8|L)CE4e#nyiEORt0TPU+|o+jZfj_@Ir7r0!?tMab8dTeyB~>rA;sRS
z98XV1AQf7$E^rz-GH=%*H;XLfxl}^bwjZt|!@ap4LOIXBXL>%%(cR#KmGDB!Hot%8
zgaCKc&zeX^gP8Cp^@)z~iiLH1Zi$7ncWxA?sf?{{Z_s-!kaLNL-x21tCjVvRM8Uv>
zurTO%w5XbAWhLr%qCGV+V>=>SqA;zM?MHGv^9P?z51BaB%}n77acB`em(K&djCAO{
zqIck5*QUG<TpfHx-4+&2WSdTchKPl2^Xmho1Ch$R-`HDCXO{a(JK9PspF!Pnvj`}A
zVN{`S=e(Zi+5Gp+u5j%M6@fAlZ|5h{<=Qi_c2BncH-*tE(OzN2r^Xoryx!@$g5z)F
z?-F0WNH*M7sV5PXmWD@@^j{z<x~l}^&3QWs^Izzg1{!a$6XXIsYjM!TpycLNJ<*F#
zNOga%B0$C~0;yf4_|_>N?M>k+-e{E)UU<g+A(<T@X7>{MfcZ>_EG_ZkDBo4ArZ~Uj
z-2P~_37c|ay&@&~i?tQnnm4KDocEn~;MLBb#s}=(1{(HtZ%Wok`$AO*R+Jtt{NV8u
zQWEwvft8}9>9al=hf>7Zi;aghTXvhhqczeduvqo<W1pkno;hENP<1~P1PnGA$93Xj
zLo&y<@3-&X2$z2<8lv>reb`Q{hZ~HvT^B#@VjufUOm_MHIujs_ahbhth^n=Q+VFxj
z9I5=JCm|$>K~N6ytu4$(SLxDHX$HNSSHUBStu{T)eRVMgVYLod$u><edw}xEt%@Ep
z$UNFNTNJ-PiYEB;RFvNM9xctw7dyAUNB$Pis^P||JJTPWiL#1Whz^ov&*L12NZEvZ
z#>bpm)`%hr{yjOh(R6VS#X`g;^#rO6BG9&Q*P(8!7?n8Ncx}bm(R(!>1(@s+x3Vgg
zeNIh5&n+T}R#U$<FcOfzM<JQ*7?{i2Dl%S8nc1)-rkOIOU>reO&9ZlEnc*CVe=08j
zWO48_8gjK5Uerij?3?`f3!_zA6G19-ieUE1W{3W$`aLEOdG@U}-FZ>ZxXr|;;E{>u
zu%$=yxQV~kNGiZG(v7d&AhvwpqX5+W9M=&#+w}_dQB!jx_5E`YYwNC%L2qN9V39RT
zZnxrgT%1n+sX^?hSg&Q9t5qrf=SwriFuRu6jp2K=?II?uk1#vg6GE03{+jpvFL(U^
gF#P!shjPX&a}T4$KiJtunT7!rWMEM2>pwsJ7YZ=8c>n+a

literal 0
HcmV?d00001

diff --git a/cis/public/testtool_test/testseite.php b/cis/public/testtool_test/testseite.php
index a200b95b2..34ea12818 100644
--- a/cis/public/testtool_test/testseite.php
+++ b/cis/public/testtool_test/testseite.php
@@ -86,67 +86,88 @@ echo '<?xml version="1.0" encoding="ISO-8859-1" ?>';
 					<h3>Formel / Formula</h3>
 					<div style="font-size: large; padding-top: 15px">
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
-							<mfrac>
-								<mn> 5 </mn>
-								<mn> 3 </mn>
-							</mfrac>
-
-							<mo> + </mo>
-							<mfrac>
-								<mn> 7 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> = </mo>
-
-							<mfrac>
-								<mn> 10 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> + </mo>
-							<mfrac>
-
-								<mn> 7 </mn>
-								<mn> 6 </mn>
-							</mfrac>
-							<mo> = </mo>
-							<mfrac>
-								<mn> 17 </mn>
-
-								<mn> 6 </mn>
-							</mfrac>
+						  <mrow>
+						    <mfrac>
+						      <mn>5</mn>
+						      <mn>3</mn>
+						    </mfrac>
+						    <mo>+</mo>
+						    <mfrac>
+						      <mn>7</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>=</mo>
+						    <mfrac>
+						      <mn>10</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>+</mo>
+						    <mfrac>
+						      <mn>7</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						    <mo>=</mo>
+						    <mfrac>
+						      <mn>17</mn>
+						      <mn>6</mn>
+						    </mfrac>
+						  </mrow>
 						</math><br/><br/>
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
-							<mrow>
-								<munderover>
-									<mo movablelimits="false">&sum;</mo>
-									<mn><mi>k</mi>=1</mn>
-									<mn>5</mn>
-								</munderover>
-								<mrow>
-									<msup>
-										<mo>(-1)</mo>
-										<mn><mi>k</mi>+1</mn>
-									</msup>
-								</mrow>
-								<mfrac>
-									<mrow>
-										<msup>
-											<mi>x</mi>
-											<mn>2<mi>k</mi> + 1</mn>
-										</msup>
-									</mrow>
-									<mrow>
-										<mo>(2<mi>k</mi>+1)!</mo>
-									</mrow>
-								</mfrac>
-							</mrow>
-
+						  <mrow>
+						    <munderover>
+						      <mo>&sum;</mo>
+						      <mrow>
+						        <mi>k</mi>
+						        <mo>=</mo>
+						        <mn>1</mn>
+						      </mrow>
+						      <mn>5</mn>
+						    </munderover>
+						    <mrow>
+						      <msup>
+						        <mrow>
+						          <mo>(</mo>
+						          <mo>-</mo>
+						          <mn>1</mn>
+						          <mo>)</mo>
+						        </mrow>
+						        <mrow>
+						          <mi>k</mi>
+						          <mo>+</mo>
+						          <mn>1</mn>
+						        </mrow>
+						      </msup>
+						      <mfrac>
+						        <mrow>
+						          <msup>
+						            <mi>x</mi>
+						            <mrow>
+						              <mn>2</mn>
+						              <mi>k</mi>
+						              <mo>+</mo>
+						              <mn>1</mn>
+						            </mrow>
+						          </msup>
+						        </mrow>
+						        <mrow>
+						          <mo>(</mo>
+						          <mn>2</mn>
+						          <mi>k</mi>
+						          <mo>+</mo>
+						          <mn>1</mn>
+						          <mo>)</mo>
+						          <mo>!</mo>
+						        </mrow>
+						      </mfrac>
+						    </mrow>
+						  </mrow>
 						</math>
 					</div>
 				</div>
 				<div class="col-sm-6">
 					<h3>Bild / Picture</h3>
-					<img alt="Beispielbild" src="MathML_Beispiel.jpg" border="1" height="154" width="233"></img>
+					<img alt="Beispielbild" src="MathML_Beispiel.png" height="140" style="border: 1px solid black">
 				</div>
 			</div>
 		</div>

From 7fe36d59e398e1398957f5c5d49fa565edcae286 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 Jan 2026 11:32:03 +0100
Subject: [PATCH 1141/1357] apply edit Zgv permissions only to ZGV dropdowns

---
 .../Stv/Studentenverwaltung/Details/Prestudent.js    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 7a3f7f44e..73fd00b25 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -308,7 +308,6 @@ export default {
 						type="text"
 						v-model="data.zgvort"
 						name="zgvort"
-						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>	
 					<form-input
@@ -325,7 +324,6 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
-						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>
 					<form-input
@@ -335,7 +333,6 @@ export default {
 						type="select"
 						v-model="data.zgvnation"
 						name="zgvnation"
-						:disabled="!hasZGVBakkPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -375,7 +372,6 @@ export default {
 						type="text"
 						v-model="data.zgvmaort"
 						name="zgvmaort"
-						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -392,7 +388,6 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
-						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -402,7 +397,6 @@ export default {
 						type="select"
 						v-model="data.zgvmanation"
 						name="zgvmanation"
-						:disabled="!hasZGVMasterPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -443,7 +437,6 @@ export default {
 						type="text"
 						v-model="data.zgvdoktorort"
 						name="zgvdoktorort"
-						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -460,7 +453,6 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
-						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -470,7 +462,6 @@ export default {
 						type="select"
 						v-model="data.zgvdoktornation"
 						name="zgvdoktornation"
-						:disabled="!hasZGVDoctorPermission"
 						>
 						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
 						<option value="">&nbsp;</option>
@@ -487,7 +478,6 @@ export default {
 							type="checkbox"
 							v-model="data.zgv_erfuellt"
 							name="zgv_erfuellt"
-							:disabled="!hasZGVBakkPermission"
 							>
 						</form-input>
 					</div>
@@ -499,7 +489,6 @@ export default {
 							type="checkbox"
 							v-model="data.zgvmas_erfuellt"
 							name="zgvmas_erfuellt"
-							:disabled="!hasZGVMasterPermission"
 							>
 						</form-input>
 					</div>
@@ -511,7 +500,6 @@ export default {
 							type="checkbox"
 							v-model="data.zgvdoktor_erfuellt"
 							name="zgvdoktor_erfuellt"
-							:disabled="!hasZGVDoctorPermission"
 							>
 						</form-input>
 					</div>

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 1142/1357] - 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 1143/1357] 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 f1aa5382cf3765c4d3b35db8aeace38b2cb77f8f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 Jan 2026 17:04:11 +0100
Subject: [PATCH 1144/1357] check editZgv Permission for Stg and also check it
 in api function

---
 .../controllers/Studentenverwaltung.php       |  6 +-
 .../api/frontend/v1/stv/Prestudent.php        | 56 +++++++++++++++++--
 .../Studentenverwaltung/Details/Prestudent.js | 21 +++++--
 3 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Studentenverwaltung.php b/application/controllers/Studentenverwaltung.php
index 3fba97e91..36c91d5f6 100644
--- a/application/controllers/Studentenverwaltung.php
+++ b/application/controllers/Studentenverwaltung.php
@@ -32,9 +32,9 @@ class Studentenverwaltung extends Auth_Controller
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
-				'student/editBakkZgv' => $this->permissionlib->isBerechtigt('student/editBakkZgv'),
-				'student/editMakkZgv' => $this->permissionlib->isBerechtigt('student/editMakkZgv'),
-				'student/editDokZgv' => $this->permissionlib->isBerechtigt('student/editDokZgv'),
+				'student/editBakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editBakkZgv') ?: array(),
+				'student/editMakkZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editMakkZgv') ?: array(),
+				'student/editDokZgv' => $this->permissionlib->getSTG_isEntitledFor('student/editDokZgv') ?: array(),
 				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 7dc607d1a..d8c8d1ff2 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -43,7 +43,7 @@ class Prestudent extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'studierendenantrag', 'lehre'
+			'ui', 'studierendenantrag', 'lehre', 'global'
 		]);
 	}
 
@@ -98,11 +98,9 @@ class Prestudent extends FHCAPI_Controller
 			'person_id',
 			'berufstaetigkeit_code',
 			'ausbildungcode',
-			'zgv_code',
 			'zgvort',
 			'zgvdatum',
 			'zgvnation',
-			'zgvmas_code',
 			'zgvmaort',
 			'zgvmadatum',
 			'zgvmanation',
@@ -110,7 +108,6 @@ class Prestudent extends FHCAPI_Controller
 			'bismelden',
 			'anmerkung',
 			'dual',
-			'zgvdoktor_code',
 			'zgvdoktorort',
 			'zgvdoktordatum',
 			'zgvdoktornation',
@@ -125,6 +122,57 @@ class Prestudent extends FHCAPI_Controller
 			'standort_code'
 		];
 
+		// add zgv code fields only if user has permission
+		$this->load->library('PermissionLib');
+		$prestudentres = $this->PrestudentModel->load($prestudent_id);
+		if(!hasData($prestudentres))
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_fieldNotFound', ['field' => 'Prestudent ' . $prestudent_id]));
+		}
+		$prestudent = (getData($prestudentres))[0];
+		$bakkZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editBakkZgv') ?: array();
+		$makkZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editMakkZgv') ?: array();
+		$dokZgvStg = $this->permissionlib->getSTG_isEntitledFor('student/editDokZgv') ?: array();
+
+		if(in_array($prestudent->studiengang_kz, $bakkZgvStg)) 
+		{
+			$array_allowed_props_prestudent[] = 'zgv_code';
+		}
+		else if(!is_null($this->input->post('zgv_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('global', 'zgv')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
+		if(in_array($prestudent->studiengang_kz, $makkZgvStg))
+		{
+			$array_allowed_props_prestudent[] = 'zgvmas_code';
+		}
+		else if(!is_null($this->input->post('zgvmas_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('lehre', 'zgvMaster')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
+		if(in_array($prestudent->studiengang_kz, $dokZgvStg))
+		{
+			$array_allowed_props_prestudent[] = 'zgvdoktor_code';
+		}
+		else if(!is_null($this->input->post('zgvdoktor_code')))
+		{
+			$this->terminateWithError(
+				$this->p->t('lehre', 'zgvDoktor')
+				. ' - ' .
+				$this->p->t('ui', 'error_keineBerechtigungStg')
+			);
+		}
+
 		// add UDFs
 		$result = $this->udflib->getDefinitionForModel($this->PrestudentModel);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 73fd00b25..47724e4d7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -32,15 +32,15 @@ export default {
 		},
 		hasZGVBakkPermission: {
 			from: 'hasZGVBakkPermission',
-			default: false
+			default: []
 		},
 		hasZGVMasterPermission: {
 			from: 'hasZGVMasterPermission',
-			default: false
+			default: []
 		},
 		hasZGVDoctorPermission: {
 			from: 'hasZGVDoctorPermission',
-			default: false
+			default: []
 		},
 		hasBismeldenPermission: {
 			from: 'hasBismeldenPermission',
@@ -89,6 +89,15 @@ export default {
 	computed: {
 		deltaLength() {
 			return Object.keys(this.deltaArray).length;
+		},
+		disableZgvBakk: function() {
+			return !this.hasZGVBakkPermission.includes(this.modelValue.studiengang_kz.toString());
+		},
+		disableZgvMaster: function() {
+			return !this.hasZGVMasterPermission.includes(this.modelValue.studiengang_kz.toString());
+		},
+		disableZgvDoctor: function() {
+			return !this.hasZGVDoctorPermission.includes(this.modelValue.studiengang_kz.toString());
 		}
 	},
 	watch: {
@@ -289,7 +298,7 @@ export default {
 						dropdown
 						name="zgv_code"
 						@complete="filterZgvs"
-						:disabled="!hasZGVBakkPermission"
+						:disabled="disableZgvBakk"
 						>
 							<template #option="slotProps">
 								<div
@@ -353,7 +362,7 @@ export default {
 						dropdown
 						name="zgvmas_code"
 						@complete="filterMasterZgvs"
-						:disabled="!hasZGVMasterPermission"
+						:disabled="disableZgvMaster"
 						>
 							<template #option="slotProps">
 								<div
@@ -418,7 +427,7 @@ export default {
 						dropdown
 						name="zgvdoktor_code"
 						@complete="filterDoktorZgvs"
-						:disabled="!hasZGVDoctorPermission"
+						:disabled="disableZgvDoctor"
 						>
 							<template #option="slotProps">
 								<div

From 783c4fc5f8294123a9788552bc62052d77397a46 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 29 Jan 2026 08:15:35 +0100
Subject: [PATCH 1145/1357] constructor warning config hinzugefuegt testtool
 englisch uebersetzung datenschutz hinzugefuegt

---
 config/cis.config-default.inc.php      | 1 +
 include/externe_ueberwachung.class.php | 5 +++++
 locale/de-AT/testtool.php              | 6 ++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 1b38a2be6..5dba1cea8 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -311,6 +311,7 @@ define('EXTERNE_UEBERWACHUNG_TRIAL_TEST', false);
 define('EXTERNE_UEBERWACHUNG_EXAM_PARAMS', []);
 define('EXTERNE_UEBERWACHUNG_EXAM_RULES', []);
 define('EXTERNE_UEBERWACHUNG_EXAM_SCORE', []);
+define('EXTERNE_UEBERWACHUNG_EXAM_WARNINGS', []);
 
 
 ?>
diff --git a/include/externe_ueberwachung.class.php b/include/externe_ueberwachung.class.php
index ecdaac2fc..17343669b 100644
--- a/include/externe_ueberwachung.class.php
+++ b/include/externe_ueberwachung.class.php
@@ -168,6 +168,11 @@ class externeUeberwachung extends basis_db
 			$payload = array_merge($payload, EXTERNE_UEBERWACHUNG_EXAM_PARAMS);
 		}
 
+		if (defined('EXTERNE_UEBERWACHUNG_EXAM_WARNINGS'))
+		{
+			$payload['visibleWarnings'] = EXTERNE_UEBERWACHUNG_EXAM_WARNINGS;
+		}
+
 		if (defined('EXTERNE_UEBERWACHUNG_EXAM_RULES'))
 		{
 			$payload['rules'] = EXTERNE_UEBERWACHUNG_EXAM_RULES;
diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
index b2a1dc38a..33c46b0a7 100644
--- a/locale/de-AT/testtool.php
+++ b/locale/de-AT/testtool.php
@@ -53,8 +53,10 @@ $this->phrasen['testtool/fuerFolgendeStgAngemeldet']='Für folgende Studiengäng
 $this->phrasen['testtool/invalideGebiete']='Ein oder mehrere Fragengebiet/e inkorrekt!<br>Bitte melden Sie dies der Betreuungsperson.';
 $this->phrasen['testtool/confirmationText']='<b>Ich bestätige, den Online-Reihungstest persönlich, selbständig, ohne Hilfe einer zusätzlichen Person und ohne Hilfsmittel zu absolvieren.<br>
 											I confirm that I will complete the online placement test personally, independently, without the help of an additional person and without any aids.</b>';
-$this->phrasen['testtool/dsgvoConfirmText']='<b>Ich habe die <a href ="'. APP_ROOT. 'cms/dms.php?id=373121" target="_blank">Datenschutzerklärung</a> gelesen.</b>';
-$this->phrasen['testtool/procotoringConfirmText']='<b>Ich stimme der digitalen Beaufsichtigung beim Online-Reihungstest (Proctoring) zu.</b>';
+$this->phrasen['testtool/dsgvoConfirmText']='<b>Ich habe die <a href ="'. APP_ROOT. 'cms/dms.php?id=373121" target="_blank">Datenschutzerklärung</a> gelesen. <br />
+I have read the <a href ="'. APP_ROOT. 'cms/dms.php?id=374814" target="_blank">privacy policy</a>.</b>';
+$this->phrasen['testtool/procotoringConfirmText']='<b>Ich stimme der digitalen Beaufsichtigung beim Online-Reihungstest (Proctoring) zu. <br /> 
+I agree to the digital supervision of the online placement test (proctoring).</b>';
 $this->phrasen['testtool/loginNoetig']='Bitte beachten Sie, dass der Reihungstest erst <b>unmittelbar</b> vor Ihrem <b>Reihungstesttermin</b> von uns aktiviert wird.<br>
 										Please note that the test will be activated by us <b>immediately</b> before your <b>placement test date</b>.';
 $this->phrasen['testtool/start']='Reihungstest jetzt starten';

From fbe10cc2a1301626b9d553bd9096e7b6a28fd7f7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 29 Jan 2026 15:08:24 +0100
Subject: [PATCH 1146/1357] PersonModel loadAllStudentUIDSForPersonID used in
 anw extension AdministrationApi aka Entschuldigungsmanagement

---
 application/models/person/Person_model.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 233cfc751..e72b24de4 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -420,4 +420,17 @@ class Person_model extends DB_Model
 			return success($result);
 		}
 	}
+
+	public function loadAllStudentUIDSForPersonID($person_id) {
+		$qry = "SELECT
+			CONCAT(tp.vorname, ' ', tp.nachname) AS name,
+			ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids
+		FROM public.tbl_student s
+				 JOIN public.tbl_benutzer b ON s.student_uid = b.uid
+				 JOIN public.tbl_person tp ON b.person_id = tp.person_id
+		GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id
+		HAVING b.person_id = ? AND b.aktiv IS TRUE;";
+		
+		return $this->execReadOnlyQuery($qry, [$person_id]);
+	}
 }

From f2107a377f5b5db4fc2d8e3b666a283248e28466 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 30 Jan 2026 10:29:19 +0100
Subject: [PATCH 1147/1357] refactor in computed section: Tabs Betriebsmittel,
 Abschlusspruefung, Anrechnungen, Aufnahmetermine, Kontakt, Prestudent,
 Status, bugfix Lehrveranstaltungstermine: sorter for Lektor as string

---
 .../Betriebsmittel/Betriebsmittel.js          |  43 +-
 .../Abschlusspruefung/Abschlusspruefung.js    | 159 ++---
 .../Details/Anrechnungen/Anrechnungen.js      |  42 +-
 .../Aufnahmetermine/Aufnahmetermine.js        | 304 ++++-----
 .../Details/Kontakt/Address.js                |  73 +-
 .../Details/Kontakt/AddressOld.js             | 622 ++++++++++++++++++
 .../Details/Kontakt/Contact.js                |  76 ++-
 .../ListLehrveranstaltungstermine.js          | 126 +++-
 .../Details/Prestudent/History.js             |  28 +-
 .../Details/Prestudent/MultiStatus.js         |  84 +--
 10 files changed, 1167 insertions(+), 390 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 148d7a83c..2c88448d3 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: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index d46e1f299..da938b063 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: {
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/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 7bb8080e1..e4174e378 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -23,7 +23,36 @@ export default{
 	},
 	data() {
 		return {
-			tabulatorOptions: {
+			addressData: {
+				zustelladresse: true,
+				heimatadresse: true,
+				rechnungsadresse: false,
+				typ: 'h',
+				nation: 'A',
+				address: {plz: null},
+				plz: null,
+			},
+			statusNew: true,
+			places: [],
+			suggestions: {},
+			nations: [],
+			adressentypen: [],
+			firmen: [],
+			listFirmen: [],
+			filteredFirmen: [],
+			selectedFirma: null,
+			abortController: {
+				suggestions: null,
+				places: null
+			},
+			height:	'auto',
+			index: 'adresse_id',
+			persistenceID: 'stv-details-kontakt-address'
+		}
+	},
+	computed:{
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvAddress.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -122,11 +151,11 @@ export default{
 						frozen: true
 					},
 				],
-				height:	'auto',
-				index: 'adresse_id',
-				persistenceID: 'stv-details-kontakt-address'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -184,37 +213,11 @@ export default{
 						cm.getColumnByField('person_id').component.updateDefinition({
 							title: this.$p.t('person', 'person_id')
 						});
-/*						cm.getColumnByField('actions').component.updateDefinition({
-													title: this.$p.t('global', 'aktionen')
-												});*/
 					}
 				}
-			],
-			addressData: {
-				zustelladresse: true,
-				heimatadresse: true,
-				rechnungsadresse: false,
-				typ: 'h',
-				nation: 'A',
-				address: {plz: null},
-				plz: null,
-			},
-			statusNew: true,
-			places: [],
-			suggestions: {},
-			nations: [],
-			adressentypen: [],
-			firmen: [],
-			listFirmen: [],
-			filteredFirmen: [],
-			selectedFirma: null,
-			abortController: {
-				suggestions: null,
-				places: null
-			},
-		}
-	},
-	computed:{
+			];
+			return events;
+		},
 		orte() {
 			return this.places.filter(ort => ort.name == this.addressData.gemeinde);
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js
new file mode 100644
index 000000000..7ed448cfd
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js
@@ -0,0 +1,622 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
+import FhcFormValidation from '../../../../Form/Validation.js';
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+
+import ApiStvAddress from '../../../../../api/factory/stv/kontakt/address.js';
+import ApiStvCompany from '../../../../../api/factory/stv/kontakt/company.js';
+
+export default{
+	name: 'AddressComponent',
+	components: {
+		CoreFilterCmpt,
+		PvAutoComplete,
+		FhcFormValidation,
+		BsModal,
+		FormForm,
+		FormInput
+	},
+	props: {
+		uid: Number
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(ApiStvAddress.get(this.uid)),
+				ajaxResponse: (url, params, response) => response.data,
+				//autoColumns: true,
+				columns:[
+					{title:"Typ", field:"bezeichnung"},
+					{title:"Strasse", field:"strasse"},
+					{title:"Plz", field:"plz"},
+					{title:"Ort", field:"ort"},
+					{title:"Gemeinde", field:"gemeinde"},
+					{title:"Nation", field:"nation"},
+					{
+						title:"Heimatadresse",
+						field:"heimatadresse",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{
+						title:"Zustelladresse",
+						field:"zustelladresse",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title:"Abweich.Empf", field:"co_name"},
+					{title:"Firma", field:"firmenname"},
+					{title:"Firma_id", field:"firma_id", visible:false},
+					{title:"Adresse_id", field:"adresse_id", visible:false},
+					{title:"Person_id", field:"person_id", visible:false},
+					{title:"Name", field:"name", visible:false},
+					{
+						title:"letzte Änderung",
+						field:"lastupdate",
+						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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}
+					},
+					{title:"Rechnungsadresse", field:"rechnungsadresse", visible:false,
+						formatter: (cell, formatterParams, onRendered) => {
+							let output = cell.getValue() ? this.$p.t('ui','ja') : this.$p.t('ui','nein');
+							return output;
+						}
+					},
+					{title:"Anmerkung", field:"anmerkung", visible:false},
+					{title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('person', 'adresse_edit');
+							button.addEventListener('click', (event) =>
+								this.actionEditAdress(cell.getData().adresse_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('person', 'adresse_delete');
+
+							button.addEventListener('click', () => {
+								if (cell.getData().heimatadresse)
+									this.$fhcAlert.alertError(this.$p.t('person', 'error_deleteHomeAdress'));
+								else
+									this.actionDeleteAdress(cell.getData().adresse_id)
+							});
+
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				height:	'auto',
+				index: 'adresse_id',
+				persistenceID: 'stv-details-kontakt-address'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					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')
+						});
+						/*						cm.getColumnByField('actions').component.updateDefinition({
+																			title: this.$p.t('global', 'aktionen')
+																		});*/
+					}
+				}
+			],
+			addressData: {
+				zustelladresse: true,
+				heimatadresse: true,
+				rechnungsadresse: false,
+				typ: 'h',
+				nation: 'A',
+				address: {plz: null},
+				plz: null,
+			},
+			statusNew: true,
+			places: [],
+			suggestions: {},
+			nations: [],
+			adressentypen: [],
+			firmen: [],
+			listFirmen: [],
+			filteredFirmen: [],
+			selectedFirma: null,
+			abortController: {
+				suggestions: null,
+				places: null
+			},
+		}
+	},
+	computed:{
+		orte() {
+			return this.places.filter(ort => ort.name == this.addressData.gemeinde);
+		},
+		gemeinden() {
+			return Object.values(this.places.reduce((res,place) => {
+				res[place.name] = place;
+				return res;
+			}, {}));
+		}
+	},
+	watch: {
+		uid() {
+			this.reload();
+		},
+		selectedFirma(newVal) {
+			this.addressData.firma_id = newVal?.firma_id || null;
+		}
+	},
+	methods:{
+		actionNewAdress() {
+			this.resetModal();
+			this.$refs.adressModal.show();
+		},
+		actionEditAdress(adresse_id) {
+			this.statusNew = false;
+			this.loadAdress(adresse_id).then(() => {
+				if(this.addressData.adresse_id)
+				{
+					this.selectedFirma = this.listFirmen.find(
+						item => item.firma_id === this.addressData.firma_id
+					);
+
+					this.addressData.address.plz = this.addressData.plz;
+					//	delete this.addressData.plz;
+					this.loadPlaces(this.addressData.address.plz);
+					this.$refs.adressModal.show();
+
+				}
+			});
+		},
+		actionDeleteAdress(adresse_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? adresse_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteAddress)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewAddress(addressData) {
+			this.addressData.plz = this.addressData.address.plz;
+			return this.$refs.addressData
+				.call(ApiStvAddress.add(this.uid, this.addressData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('adressModal');
+					this.resetModal();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(this.reload);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		loadAdress(adresse_id) {
+			this.statusNew = false;
+			return this.$api
+				.call(ApiStvAddress.load(adresse_id))
+				.then(result => {
+					this.addressData = result.data;
+					this.addressData.address = {};
+					this.addressData.address.plz = this.addressData.plz || null;
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateAddress(adresse_id) {
+			this.addressData.plz = this.addressData.address.plz;
+			return this.$refs.addressData
+				.call(ApiStvAddress.update(adresse_id, this.addressData))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('adressModal');
+					this.resetModal();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(this.reload);
+		},
+		deleteAddress(adresse_id) {
+			return this.$api
+				.call(ApiStvAddress.delete(adresse_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		loadPlaces() {
+			if (this.abortController.places)
+				this.abortController.places.abort();
+			if (this.addressData.nation != 'A' || !this.addressData.address.plz)
+				return;
+
+			this.abortController.places = new AbortController();
+
+			return this.$api
+				.call(ApiStvAddress.getPlaces(this.addressData.address.plz))
+				.then(result => {
+					this.places = result.data;
+				});
+		},
+		filterFirmen(event) {
+			const query = event?.query?.toLowerCase()?.trim() || "";
+
+			this.filteredFirmen = this.listFirmen.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
+		},
+		hideModal(modalRef) {
+			this.$refs[modalRef].hide();
+		},
+		resetModal() {
+			this.addressData = {};
+
+			this.addressData.strasse = null;
+			this.addressData.zustelladresse = true;
+			this.addressData.heimatadresse = true;
+			this.addressData.rechnungsadresse = false;
+			this.addressData.co_name = null;
+			this.addressData.firma_id = null;
+			this.addressData.name = null;
+			this.addressData.anmerkung = null;
+			this.addressData.typ = 'h';
+			this.addressData.nation = 'A';
+			this.addressData.address = {plz: null};
+			this.selectedFirma = null;
+
+			this.statusNew = true;
+		},
+	},
+	created() {
+		this.$api
+			.call(ApiStvAddress.getNations())
+			.then(result => {
+				this.nations = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAddress.getTypes())
+			.then(result => {
+				this.adressentypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAddress.getAllFirmen())
+			.then(result => {
+				this.listFirmen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+	<div class="stv-details-kontakt-address h-100 pt-3">
+
+		<!--Modal: AddressModal-->
+		<bs-modal ref="adressModal" dialog-class="modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'adresse_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('person', 'adresse_edit')}}</p>
+			</template>
+			<form-form class="row g-3 mt-2" ref="addressData">
+
+				<div class="row mb-3">
+					<form-input
+						type="select"
+						name="adressentyp"
+						:label="$p.t('global/typ')"
+						v-model="addressData.typ"
+						>
+						<option
+							v-for="typ in adressentypen"
+							:key="typ.adressentyp_kurzbz"
+							:value="typ.adressentyp_kurzbz"
+							>
+							{{typ.bezeichnung}}
+						</option>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="strasse"
+							:label="$p.t('person/strasse')"
+							v-model="addressData.strasse"
+						>
+						</form-input>					
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						type="select"
+						name="nation"
+						:label="$p.t('person/nation')"
+						v-model="addressData.nation"
+						>
+						<option 
+							v-for="nation in nations" 
+							:key="nation.nation_code" 
+							:value="nation.nation_code" 
+							:disabled="nation.sperre"
+							>
+							{{nation.kurztext}}
+						</option>
+						</form-input>
+				</div>
+							
+				<div class="row mb-3">
+					<form-input
+						type="text"
+						name="address[plz]"
+						:label="$p.t('person/plz') + ' *'"
+						v-model="addressData.address.plz"
+						required
+						@input="loadPlaces"
+					>
+					</form-input>					
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						v-if="addressData.nation == 'A'"
+						type="select"
+						name="gemeinde"
+						:label="$p.t('person/gemeinde')"
+						v-model="addressData.gemeinde"
+						>
+						<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
+						<option 
+							v-for="gemeinde in gemeinden" 
+							:key="gemeinde.name" 
+							:value="gemeinde.name"
+							>
+							{{gemeinde.name}}
+						</option>
+					</form-input>
+					<form-input
+							v-else
+							type="text"
+							:label="$p.t('person/gemeinde')"
+							name="addressData.gemeinde"
+							v-model="addressData.gemeinde"
+						>	
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						v-if="addressData.nation == 'A'" 
+						type="select"
+						name="ort"
+						:label="$p.t('person/ort')"
+						v-model="addressData.ort"
+						>
+						<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
+						<option 
+							v-for="ort in orte" 
+							:key="ort.ortschaftsname" 
+							:value="ort.ortschaftsname"
+							>
+							{{ort.ortschaftsname}}
+						</option>
+					</form-input>
+					<form-input
+							v-else
+							type="text"
+							:label="$p.t('person/ort')"
+							name="ort"
+							v-model="addressData.ort"
+						>	
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="heimatadresse"
+							:label="$p.t('person/heimatadresse')"
+							v-model="addressData.heimatadresse"
+						>
+						</form-input>
+					</div>
+				</div>
+
+				<div class="row mb-3">
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="zustelladresse"
+							:label="$p.t('person/zustelladresse')"
+							v-model="addressData.zustelladresse"
+						>
+						</form-input>
+					</div>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						type="text"
+						name="co_name"
+						:label="$p.t('person/co_name')"
+						v-model="addressData.co_name"
+					>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<div class="col-sm-4">
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="rechnungsadresse"
+							:label="$p.t('person/rechnungsadresse')"
+							v-model="addressData.rechnungsadresse"
+						>
+						</form-input>
+					</div>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						type="autocomplete"
+						:label="$p.t('person/firma')"
+						name="firma_name"
+						v-model="selectedFirma"
+						optionLabel="label"
+						optionValue="firma_id"
+						dropdown
+						forceSelection
+						:suggestions="filteredFirmen" 
+						@complete="filterFirmen"
+						:min-length="3"
+					>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						type="text"
+						name="firma_zusatz"
+						:label="$p.t('global/name')"
+						v-model="addressData.name"
+					>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+							type="text"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="addressData.anmerkung"
+						>
+					</form-input>
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
+				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
+            </template>
+		</bs-modal>
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
+			new-btn-show
+			:new-btn-label="this.$p.t('person', 'adresse')"
+			@click:new="actionNewAdress"
+			>
+		</core-filter-cmpt>
+	</div>`
+};
+
+
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 1ff34dc79..f7fad0dfb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -7,7 +7,7 @@ import FormInput from '../../../../Form/Input.js';
 import ApiStvContact from '../../../../../api/factory/stv/kontakt/contact.js';
 import ApiStvCompany from '../../../../../api/factory/stv/kontakt/company.js';
 
-export default{
+export default {
 	name: 'ContactComponent',
 	components: {
 		CoreFilterCmpt,
@@ -20,8 +20,42 @@ export default{
 		uid: Number
 	},
 	data() {
-		return{
-			tabulatorOptions: {
+		return {
+			lastSelected: null,
+			contactData: {
+				zustellung: true,
+				kontakttyp: 'email',
+				firma_id: null
+			},
+			statusNew: true,
+			kontakttypen: [],
+			firmen: [],
+			filteredFirmen: [],
+			filteredOrte: null,
+			abortController: {
+				firmen: null,
+				standorte: null
+			},
+			lastSelected: null,
+			contactData: {
+				zustellung: true,
+				kontakttyp: 'email',
+				firma_id: null
+			},
+			statusNew: true,
+			kontakttypen: [],
+			firmen: [],
+			filteredFirmen: [],
+			filteredOrte: null,
+			abortController: {
+				firmen: null,
+				standorte: null
+			},
+		}
+	},
+	computed: {
+		tabulatorOptions(){
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvContact.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -94,11 +128,11 @@ export default{
 						frozen: true
 					},
 				],
-				height:	'auto',
-				index: 'kontakt_id',
-				persistenceID: 'stv-details-kontakt-contact'
-			},
-			tabulatorEvents: [
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -139,27 +173,11 @@ export default{
 						cm.getColumnByField('standort_id').component.updateDefinition({
 							title: this.$p.t('ui', 'standort_id')
 						});
-/*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
-				}}
-			],
-			lastSelected: null,
-			contactData: {
-				zustellung: true,
-				kontakttyp: 'email',
-				firma_id: null
-			},
-			statusNew: true,
-			kontakttypen: [],
-			firmen: [],
-			filteredFirmen: [],
-			filteredOrte: null,
-			abortController: {
-				firmen: null,
-				standorte: null
-			},
-		}
+					}
+				}
+			];
+			return events;
+		},
 	},
 	watch: {
 		uid() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 20cb95fbd..cd5f8f1f3 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,114 @@ 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';
+		},
+	/*	tabulatorOptions() {
+			const options = {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvCoursedates.getCourselist({
+						student_uid: this.student.uid,
+						start_date: this.dataSem.start,
+						end_date: this.dataSem.ende,
+						group_consecutiveHours: true,
+						dbStundenplanTable: this.dbStundenplanTable})
+				),
+				ajaxResponse: (url, params, response) => {
+					return response.data;
+				},
+				columns: [
+					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_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",
+								hour12: false
+							});
+						}},
+					{title: "beginn", field: "beginn"},
+					{title: "ende", field: "ende"},
+					{title: "farbe", field: "farbe", visible: false},
+					{title: "Gruppen", field: "gruppen_kuerzel"},
+					{title: "ort", field: "ort_kurzbz"},
+					{title: "lektorIn", field: "lektorname", sorter:"string"},
+					{title: "Lehrfach", field: "lehrfach_bez"}
+				],
+				rowFormatter: function(row){
+					var data = row.getData();
+					//highlight background of row if color red in table
+					if(data.farbe == "A4A7FC"){
+						let el = row.getElement();
+						row.getElement().classList.add("highlight-row");
+						row.getElement().classList.remove("tabulator-row-odd");
+						row.getElement().classList.remove("tabulator-row-even");
+					}
+				}
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'ui', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						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')
+						});
+					}
+
+				}];
+			return events;
+		},*/
+	},
 	methods: {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
@@ -80,7 +172,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){
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 326d4b392319a8e2615d11bd5973fd24bed85471 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 30 Jan 2026 10:31:38 +0100
Subject: [PATCH 1148/1357] Revert "refactor in computed section: Tabs
 Betriebsmittel, Abschlusspruefung, Anrechnungen, Aufnahmetermine, Kontakt,
 Prestudent, Status, bugfix Lehrveranstaltungstermine: sorter for Lektor as
 string"

This reverts commit f2107a377f5b5db4fc2d8e3b666a283248e28466.
---
 .../Betriebsmittel/Betriebsmittel.js          |  43 +-
 .../Abschlusspruefung/Abschlusspruefung.js    | 159 +++--
 .../Details/Anrechnungen/Anrechnungen.js      |  42 +-
 .../Aufnahmetermine/Aufnahmetermine.js        | 304 +++++----
 .../Details/Kontakt/Address.js                |  73 +-
 .../Details/Kontakt/AddressOld.js             | 622 ------------------
 .../Details/Kontakt/Contact.js                |  76 +--
 .../ListLehrveranstaltungstermine.js          | 126 +---
 .../Details/Prestudent/History.js             |  28 +-
 .../Details/Prestudent/MultiStatus.js         |  84 ++-
 10 files changed, 390 insertions(+), 1167 deletions(-)
 delete mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 2c88448d3..148d7a83c 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -43,22 +43,7 @@ export default {
 	},
 	data() {
 		return {
-			listBetriebsmitteltyp: [],
-			formData: {
-				ausgegebenam : new Date(),
-				betriebsmitteltyp: 'Zutrittskarte'
-			},
-			statusNew: true,
-			filteredInventar: [],
-			layout: 'fitColumns',
-			layoutColumnsOnNewData: false,
-			height: '550',
-			persistenceID: 'core-betriebsmittel'
-		}
-	},
-	computed: {
-		tabulatorOptions() {
-			const options = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
@@ -130,7 +115,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');
@@ -158,13 +143,13 @@ export default {
 							return container;
 						},
 						frozen: true
-					}
-				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '550',
+				persistenceID: 'core-betriebsmittel'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -208,8 +193,14 @@ export default {
 						});
 					}
 				}
-			];
-			return events;
+			],
+			listBetriebsmitteltyp: [],
+			formData: {
+				ausgegebenam : new Date(),
+				betriebsmitteltyp: 'Zutrittskarte'
+			},
+			statusNew: true,
+			filteredInventar: []
 		}
 	},
 	watch: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index da938b063..d46e1f299 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -34,58 +34,40 @@ 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 {
-			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 = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -181,11 +163,14 @@ export default {
 						frozen: true
 					},
 				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+				layout: 'fitDataStretchFrozen',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: '200',
+				index: 'abschlusspruefung_id',
+				persistenceID: 'stv-details-finalexam-2025112401'
+			},
+			tabulatorEvents: [
 				{
 					event: 'dataLoaded',
 					handler: data => this.tabulatorData = data.map(item => {
@@ -240,36 +225,50 @@ 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')
+												});
+						*/
 					}
 				}
-			];
-			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;
+			],
+			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
+			},
 		}
 	},
 	watch: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 32224062d..a2029b0b9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -31,24 +31,7 @@ export default {
 	},
 	data() {
 		return {
-			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 = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					ApiStvExemptions.getAnrechnungen(this.student.prestudent_id)
@@ -124,11 +107,12 @@ export default {
 						frozen: true
 					},
 				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+				layout: 'fitDataStretchFrozen',
+				height: '500',
+				index: 'anrechnung_id',
+				persistenceID: 'stv-details-anrechnungen-2025112401'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -170,8 +154,16 @@ export default {
 
 					}
 				}
-			];
-			return events;
+			],
+			formData: {},
+			listBegruendungen: [],
+			listNewLehrveranstaltungen: [],
+			listLektoren: [],
+			listKompatibleLehrveranstaltungen: [],
+			statusNew: true,
+			showNotizen: false,
+			currentAnrechnung_id: null,
+			endpoint: ApiNotizPerson
 		}
 	},
 	watch: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index b2ba26a55..d03569df4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -36,19 +36,158 @@ 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: [],
-			//data after tabulator data
-			layout: 'fitDataStretchFrozen',
-			layoutColumnsOnNewData: false,
-			height: 'auto',
-			minHeight: 200,
-			index: 'aufnahmetermin_id',
-			persistenceID: 'stv-details-table_admission-dates-2025112401'
+			filteredPlacementTests: []
 		}
 	},
 	methods: {
@@ -193,155 +332,6 @@ 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/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index e4174e378..7bb8080e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -23,36 +23,7 @@ export default{
 	},
 	data() {
 		return {
-			addressData: {
-				zustelladresse: true,
-				heimatadresse: true,
-				rechnungsadresse: false,
-				typ: 'h',
-				nation: 'A',
-				address: {plz: null},
-				plz: null,
-			},
-			statusNew: true,
-			places: [],
-			suggestions: {},
-			nations: [],
-			adressentypen: [],
-			firmen: [],
-			listFirmen: [],
-			filteredFirmen: [],
-			selectedFirma: null,
-			abortController: {
-				suggestions: null,
-				places: null
-			},
-			height:	'auto',
-			index: 'adresse_id',
-			persistenceID: 'stv-details-kontakt-address'
-		}
-	},
-	computed:{
-		tabulatorOptions() {
-			const options = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvAddress.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -151,11 +122,11 @@ export default{
 						frozen: true
 					},
 				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+				height:	'auto',
+				index: 'adresse_id',
+				persistenceID: 'stv-details-kontakt-address'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -213,11 +184,37 @@ export default{
 						cm.getColumnByField('person_id').component.updateDefinition({
 							title: this.$p.t('person', 'person_id')
 						});
+/*						cm.getColumnByField('actions').component.updateDefinition({
+													title: this.$p.t('global', 'aktionen')
+												});*/
 					}
 				}
-			];
-			return events;
-		},
+			],
+			addressData: {
+				zustelladresse: true,
+				heimatadresse: true,
+				rechnungsadresse: false,
+				typ: 'h',
+				nation: 'A',
+				address: {plz: null},
+				plz: null,
+			},
+			statusNew: true,
+			places: [],
+			suggestions: {},
+			nations: [],
+			adressentypen: [],
+			firmen: [],
+			listFirmen: [],
+			filteredFirmen: [],
+			selectedFirma: null,
+			abortController: {
+				suggestions: null,
+				places: null
+			},
+		}
+	},
+	computed:{
 		orte() {
 			return this.places.filter(ort => ort.name == this.addressData.gemeinde);
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js
deleted file mode 100644
index 7ed448cfd..000000000
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/AddressOld.js
+++ /dev/null
@@ -1,622 +0,0 @@
-import {CoreFilterCmpt} from "../../../../filter/Filter.js";
-import PvAutoComplete from "../../../../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
-import FhcFormValidation from '../../../../Form/Validation.js';
-import BsModal from "../../../../Bootstrap/Modal.js";
-import FormForm from '../../../../Form/Form.js';
-import FormInput from '../../../../Form/Input.js';
-
-import ApiStvAddress from '../../../../../api/factory/stv/kontakt/address.js';
-import ApiStvCompany from '../../../../../api/factory/stv/kontakt/company.js';
-
-export default{
-	name: 'AddressComponent',
-	components: {
-		CoreFilterCmpt,
-		PvAutoComplete,
-		FhcFormValidation,
-		BsModal,
-		FormForm,
-		FormInput
-	},
-	props: {
-		uid: Number
-	},
-	data() {
-		return {
-			tabulatorOptions: {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(ApiStvAddress.get(this.uid)),
-				ajaxResponse: (url, params, response) => response.data,
-				//autoColumns: true,
-				columns:[
-					{title:"Typ", field:"bezeichnung"},
-					{title:"Strasse", field:"strasse"},
-					{title:"Plz", field:"plz"},
-					{title:"Ort", field:"ort"},
-					{title:"Gemeinde", field:"gemeinde"},
-					{title:"Nation", field:"nation"},
-					{
-						title:"Heimatadresse",
-						field:"heimatadresse",
-						formatter:"tickCross",
-						hozAlign:"center",
-						formatterParams: {
-							tickElement: '<i class="fa fa-check text-success"></i>',
-							crossElement: '<i class="fa fa-xmark text-danger"></i>'
-						}
-					},
-					{
-						title:"Zustelladresse",
-						field:"zustelladresse",
-						formatter:"tickCross",
-						hozAlign:"center",
-						formatterParams: {
-							tickElement: '<i class="fa fa-check text-success"></i>',
-							crossElement: '<i class="fa fa-xmark text-danger"></i>'
-						}
-					},
-					{title:"Abweich.Empf", field:"co_name"},
-					{title:"Firma", field:"firmenname"},
-					{title:"Firma_id", field:"firma_id", visible:false},
-					{title:"Adresse_id", field:"adresse_id", visible:false},
-					{title:"Person_id", field:"person_id", visible:false},
-					{title:"Name", field:"name", visible:false},
-					{
-						title:"letzte Änderung",
-						field:"lastupdate",
-						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",
-								hour: "2-digit",
-								minute: "2-digit",
-								second: "2-digit",
-								hour12: false
-							});
-						}
-					},
-					{title:"Rechnungsadresse", field:"rechnungsadresse", visible:false,
-						formatter: (cell, formatterParams, onRendered) => {
-							let output = cell.getValue() ? this.$p.t('ui','ja') : this.$p.t('ui','nein');
-							return output;
-						}
-					},
-					{title:"Anmerkung", field:"anmerkung", visible:false},
-					{title: 'Aktionen', field: 'actions',
-						minWidth: 150, // Ensures Action-buttons will be always fully displayed
-						formatter: (cell, formatterParams, onRendered) => {
-							let container = document.createElement('div');
-							container.className = "d-flex gap-2";
-
-							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-edit"></i>';
-							button.title = this.$p.t('person', 'adresse_edit');
-							button.addEventListener('click', (event) =>
-								this.actionEditAdress(cell.getData().adresse_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('person', 'adresse_delete');
-
-							button.addEventListener('click', () => {
-								if (cell.getData().heimatadresse)
-									this.$fhcAlert.alertError(this.$p.t('person', 'error_deleteHomeAdress'));
-								else
-									this.actionDeleteAdress(cell.getData().adresse_id)
-							});
-
-							container.append(button);
-
-							return container;
-						},
-						frozen: true
-					},
-				],
-				height:	'auto',
-				index: 'adresse_id',
-				persistenceID: 'stv-details-kontakt-address'
-			},
-			tabulatorEvents: [
-				{
-					event: 'tableBuilt',
-					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')
-						});
-						/*						cm.getColumnByField('actions').component.updateDefinition({
-																			title: this.$p.t('global', 'aktionen')
-																		});*/
-					}
-				}
-			],
-			addressData: {
-				zustelladresse: true,
-				heimatadresse: true,
-				rechnungsadresse: false,
-				typ: 'h',
-				nation: 'A',
-				address: {plz: null},
-				plz: null,
-			},
-			statusNew: true,
-			places: [],
-			suggestions: {},
-			nations: [],
-			adressentypen: [],
-			firmen: [],
-			listFirmen: [],
-			filteredFirmen: [],
-			selectedFirma: null,
-			abortController: {
-				suggestions: null,
-				places: null
-			},
-		}
-	},
-	computed:{
-		orte() {
-			return this.places.filter(ort => ort.name == this.addressData.gemeinde);
-		},
-		gemeinden() {
-			return Object.values(this.places.reduce((res,place) => {
-				res[place.name] = place;
-				return res;
-			}, {}));
-		}
-	},
-	watch: {
-		uid() {
-			this.reload();
-		},
-		selectedFirma(newVal) {
-			this.addressData.firma_id = newVal?.firma_id || null;
-		}
-	},
-	methods:{
-		actionNewAdress() {
-			this.resetModal();
-			this.$refs.adressModal.show();
-		},
-		actionEditAdress(adresse_id) {
-			this.statusNew = false;
-			this.loadAdress(adresse_id).then(() => {
-				if(this.addressData.adresse_id)
-				{
-					this.selectedFirma = this.listFirmen.find(
-						item => item.firma_id === this.addressData.firma_id
-					);
-
-					this.addressData.address.plz = this.addressData.plz;
-					//	delete this.addressData.plz;
-					this.loadPlaces(this.addressData.address.plz);
-					this.$refs.adressModal.show();
-
-				}
-			});
-		},
-		actionDeleteAdress(adresse_id) {
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? adresse_id
-					: Promise.reject({handled: true}))
-				.then(this.deleteAddress)
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		addNewAddress(addressData) {
-			this.addressData.plz = this.addressData.address.plz;
-			return this.$refs.addressData
-				.call(ApiStvAddress.add(this.uid, this.addressData))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('adressModal');
-					this.resetModal();
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(this.reload);
-		},
-		reload() {
-			this.$refs.table.reloadTable();
-		},
-		loadAdress(adresse_id) {
-			this.statusNew = false;
-			return this.$api
-				.call(ApiStvAddress.load(adresse_id))
-				.then(result => {
-					this.addressData = result.data;
-					this.addressData.address = {};
-					this.addressData.address.plz = this.addressData.plz || null;
-					return result;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		updateAddress(adresse_id) {
-			this.addressData.plz = this.addressData.address.plz;
-			return this.$refs.addressData
-				.call(ApiStvAddress.update(adresse_id, this.addressData))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					this.hideModal('adressModal');
-					this.resetModal();
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(this.reload);
-		},
-		deleteAddress(adresse_id) {
-			return this.$api
-				.call(ApiStvAddress.delete(adresse_id))
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					window.scrollTo(0, 0);
-					this.reload();
-				});
-		},
-		loadPlaces() {
-			if (this.abortController.places)
-				this.abortController.places.abort();
-			if (this.addressData.nation != 'A' || !this.addressData.address.plz)
-				return;
-
-			this.abortController.places = new AbortController();
-
-			return this.$api
-				.call(ApiStvAddress.getPlaces(this.addressData.address.plz))
-				.then(result => {
-					this.places = result.data;
-				});
-		},
-		filterFirmen(event) {
-			const query = event?.query?.toLowerCase()?.trim() || "";
-
-			this.filteredFirmen = this.listFirmen.filter(item => {
-				const label = (item.label || "").toLowerCase();
-				return label.includes(query);
-			});
-		},
-		hideModal(modalRef) {
-			this.$refs[modalRef].hide();
-		},
-		resetModal() {
-			this.addressData = {};
-
-			this.addressData.strasse = null;
-			this.addressData.zustelladresse = true;
-			this.addressData.heimatadresse = true;
-			this.addressData.rechnungsadresse = false;
-			this.addressData.co_name = null;
-			this.addressData.firma_id = null;
-			this.addressData.name = null;
-			this.addressData.anmerkung = null;
-			this.addressData.typ = 'h';
-			this.addressData.nation = 'A';
-			this.addressData.address = {plz: null};
-			this.selectedFirma = null;
-
-			this.statusNew = true;
-		},
-	},
-	created() {
-		this.$api
-			.call(ApiStvAddress.getNations())
-			.then(result => {
-				this.nations = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAddress.getTypes())
-			.then(result => {
-				this.adressentypen = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$api
-			.call(ApiStvAddress.getAllFirmen())
-			.then(result => {
-				this.listFirmen = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	template: `
-	<div class="stv-details-kontakt-address h-100 pt-3">
-
-		<!--Modal: AddressModal-->
-		<bs-modal ref="adressModal" dialog-class="modal-dialog-scrollable">
-			<template #title>
-				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'adresse_new')}}</p>
-				<p v-else class="fw-bold mt-3">{{$p.t('person', 'adresse_edit')}}</p>
-			</template>
-			<form-form class="row g-3 mt-2" ref="addressData">
-
-				<div class="row mb-3">
-					<form-input
-						type="select"
-						name="adressentyp"
-						:label="$p.t('global/typ')"
-						v-model="addressData.typ"
-						>
-						<option
-							v-for="typ in adressentypen"
-							:key="typ.adressentyp_kurzbz"
-							:value="typ.adressentyp_kurzbz"
-							>
-							{{typ.bezeichnung}}
-						</option>
-						</form-input>
-					</div>
-
-					<div class="row mb-3">
-						<form-input
-							type="text"
-							name="strasse"
-							:label="$p.t('person/strasse')"
-							v-model="addressData.strasse"
-						>
-						</form-input>					
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						type="select"
-						name="nation"
-						:label="$p.t('person/nation')"
-						v-model="addressData.nation"
-						>
-						<option 
-							v-for="nation in nations" 
-							:key="nation.nation_code" 
-							:value="nation.nation_code" 
-							:disabled="nation.sperre"
-							>
-							{{nation.kurztext}}
-						</option>
-						</form-input>
-				</div>
-							
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="address[plz]"
-						:label="$p.t('person/plz') + ' *'"
-						v-model="addressData.address.plz"
-						required
-						@input="loadPlaces"
-					>
-					</form-input>					
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						v-if="addressData.nation == 'A'"
-						type="select"
-						name="gemeinde"
-						:label="$p.t('person/gemeinde')"
-						v-model="addressData.gemeinde"
-						>
-						<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
-						<option 
-							v-for="gemeinde in gemeinden" 
-							:key="gemeinde.name" 
-							:value="gemeinde.name"
-							>
-							{{gemeinde.name}}
-						</option>
-					</form-input>
-					<form-input
-							v-else
-							type="text"
-							:label="$p.t('person/gemeinde')"
-							name="addressData.gemeinde"
-							v-model="addressData.gemeinde"
-						>	
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						v-if="addressData.nation == 'A'" 
-						type="select"
-						name="ort"
-						:label="$p.t('person/ort')"
-						v-model="addressData.ort"
-						>
-						<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
-						<option 
-							v-for="ort in orte" 
-							:key="ort.ortschaftsname" 
-							:value="ort.ortschaftsname"
-							>
-							{{ort.ortschaftsname}}
-						</option>
-					</form-input>
-					<form-input
-							v-else
-							type="text"
-							:label="$p.t('person/ort')"
-							name="ort"
-							v-model="addressData.ort"
-						>	
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="heimatadresse"
-							:label="$p.t('person/heimatadresse')"
-							v-model="addressData.heimatadresse"
-						>
-						</form-input>
-					</div>
-				</div>
-
-				<div class="row mb-3">
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="zustelladresse"
-							:label="$p.t('person/zustelladresse')"
-							v-model="addressData.zustelladresse"
-						>
-						</form-input>
-					</div>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="co_name"
-						:label="$p.t('person/co_name')"
-						v-model="addressData.co_name"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="rechnungsadresse"
-							:label="$p.t('person/rechnungsadresse')"
-							v-model="addressData.rechnungsadresse"
-						>
-						</form-input>
-					</div>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						type="autocomplete"
-						:label="$p.t('person/firma')"
-						name="firma_name"
-						v-model="selectedFirma"
-						optionLabel="label"
-						optionValue="firma_id"
-						dropdown
-						forceSelection
-						:suggestions="filteredFirmen" 
-						@complete="filterFirmen"
-						:min-length="3"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="firma_zusatz"
-						:label="$p.t('global/name')"
-						v-model="addressData.name"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-							type="text"
-							name="anmerkung"
-							:label="$p.t('global/anmerkung')"
-							v-model="addressData.anmerkung"
-						>
-					</form-input>
-				</div>
-
-			</form-form>
-
-			<template #footer>
-				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
-				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
-				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
-            </template>
-		</bs-modal>
-
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			:tabulator-events="tabulatorEvents"
-			table-only
-			:side-menu="false"
-			reload
-			:reload-btn-infotext="this.$p.t('table', 'reload')"
-			new-btn-show
-			:new-btn-label="this.$p.t('person', 'adresse')"
-			@click:new="actionNewAdress"
-			>
-		</core-filter-cmpt>
-	</div>`
-};
-
-
-
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index f7fad0dfb..1ff34dc79 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -7,7 +7,7 @@ import FormInput from '../../../../Form/Input.js';
 import ApiStvContact from '../../../../../api/factory/stv/kontakt/contact.js';
 import ApiStvCompany from '../../../../../api/factory/stv/kontakt/company.js';
 
-export default {
+export default{
 	name: 'ContactComponent',
 	components: {
 		CoreFilterCmpt,
@@ -20,42 +20,8 @@ export default {
 		uid: Number
 	},
 	data() {
-		return {
-			lastSelected: null,
-			contactData: {
-				zustellung: true,
-				kontakttyp: 'email',
-				firma_id: null
-			},
-			statusNew: true,
-			kontakttypen: [],
-			firmen: [],
-			filteredFirmen: [],
-			filteredOrte: null,
-			abortController: {
-				firmen: null,
-				standorte: null
-			},
-			lastSelected: null,
-			contactData: {
-				zustellung: true,
-				kontakttyp: 'email',
-				firma_id: null
-			},
-			statusNew: true,
-			kontakttypen: [],
-			firmen: [],
-			filteredFirmen: [],
-			filteredOrte: null,
-			abortController: {
-				firmen: null,
-				standorte: null
-			},
-		}
-	},
-	computed: {
-		tabulatorOptions(){
-			const options = {
+		return{
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvContact.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -128,11 +94,11 @@ export default {
 						frozen: true
 					},
 				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+				height:	'auto',
+				index: 'kontakt_id',
+				persistenceID: 'stv-details-kontakt-contact'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -173,11 +139,27 @@ export default {
 						cm.getColumnByField('standort_id').component.updateDefinition({
 							title: this.$p.t('ui', 'standort_id')
 						});
-					}
-				}
-			];
-			return events;
-		},
+/*						cm.getColumnByField('actions').component.updateDefinition({
+							title: this.$p.t('global', 'aktionen')
+						});*/
+				}}
+			],
+			lastSelected: null,
+			contactData: {
+				zustellung: true,
+				kontakttyp: 'email',
+				firma_id: null
+			},
+			statusNew: true,
+			kontakttypen: [],
+			firmen: [],
+			filteredFirmen: [],
+			filteredOrte: null,
+			abortController: {
+				firmen: null,
+				standorte: null
+			},
+		}
 	},
 	watch: {
 		uid() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index cd5f8f1f3..20cb95fbd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -11,6 +11,22 @@ 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',
@@ -28,114 +44,6 @@ 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';
-		},
-	/*	tabulatorOptions() {
-			const options = {
-				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(
-					ApiStvCoursedates.getCourselist({
-						student_uid: this.student.uid,
-						start_date: this.dataSem.start,
-						end_date: this.dataSem.ende,
-						group_consecutiveHours: true,
-						dbStundenplanTable: this.dbStundenplanTable})
-				),
-				ajaxResponse: (url, params, response) => {
-					return response.data;
-				},
-				columns: [
-					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
-					{title: "lehreinheit_id", field: "lehreinheit_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",
-								hour12: false
-							});
-						}},
-					{title: "beginn", field: "beginn"},
-					{title: "ende", field: "ende"},
-					{title: "farbe", field: "farbe", visible: false},
-					{title: "Gruppen", field: "gruppen_kuerzel"},
-					{title: "ort", field: "ort_kurzbz"},
-					{title: "lektorIn", field: "lektorname", sorter:"string"},
-					{title: "Lehrfach", field: "lehrfach_bez"}
-				],
-				rowFormatter: function(row){
-					var data = row.getData();
-					//highlight background of row if color red in table
-					if(data.farbe == "A4A7FC"){
-						let el = row.getElement();
-						row.getElement().classList.add("highlight-row");
-						row.getElement().classList.remove("tabulator-row-odd");
-						row.getElement().classList.remove("tabulator-row-even");
-					}
-				}
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
-				{
-					event: 'tableBuilt',
-					handler: async() => {
-						await this.$p.loadCategory(['global', 'ui', 'lehre']);
-
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						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')
-						});
-					}
-
-				}];
-			return events;
-		},*/
-	},
 	methods: {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
@@ -172,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"},
 					{title: "Lehrfach", field: "lehrfach_bez"}
 				],
 				rowFormatter: function(row){
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 1fe96188f..44b318f5b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -12,16 +12,7 @@ export default{
 	},
 	data() {
 		return {
-			layout: 'fitDataFill',
-			layoutColumnsOnNewData:	false,
-			height:	'auto',
-			selectable:	false,
-			persistenceID: 'stv-details-prestudent-history',
-		}
-	},
-	computed: {
-		tabulatorOptions() {
-			const options = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvPrestudent.getHistoryPrestudents(this.personId)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -46,11 +37,13 @@ export default{
 						element.classList.add('fw-bold');
 					}
 				},
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+				height:	'auto',
+				selectable:	false,
+				persistenceID: 'stv-details-prestudent-history'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -71,9 +64,8 @@ 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 8f381c330..e67f19ccf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -26,8 +26,37 @@ export default{
 		}
 	},
 	computed: {
-		tabulatorOptions() {
-			const options = {
+		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: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvPrestudent.getHistoryPrestudent(this.modelValue.prestudent_id)),
 				ajaxResponse: (url, params, response) => response.data,
@@ -135,7 +164,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
@@ -178,8 +207,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');
@@ -211,11 +240,8 @@ export default{
 				selectable: false,
 				index: 'statusId',
 				persistenceID: 'stv-multistatus-2025112401'
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async () => {
@@ -224,8 +250,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')
@@ -272,39 +298,7 @@ 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 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 1149/1357] 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 366cb16b618308af2cc2199d59f5008956f8871c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 30 Jan 2026 14:10:28 +0100
Subject: [PATCH 1150/1357] anw phrasen "studentByLVATitle" &
 "kontrolliertVon", slight adjustment of fullscreen modal button so it looks
 similar

---
 public/js/components/Bootstrap/Modal.js | 14 ++++++---
 system/phrasesupdate.php                | 40 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index a84d9d8d7..f1df2a6b1 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -135,10 +135,16 @@ export default {
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<div class="d-flex align-items-center ms-auto">
-						<button type="button" class="btn ms-auto" style="filter: invert(1)" v-if="allowFullscreenExpand" @click="toggleFullscreen">
-						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
-						  <i v-else class="fa-solid fa-compress"></i>
+					<div class="d-flex align-items-center ms-auto gap-2">
+						<button 
+							type="button" 
+							class="btn mb-1" 
+							v-if="allowFullscreenExpand" 
+							@click="toggleFullscreen"
+							:aria-label="fullscreen ? 'Exit Fullscreen' : 'Enter Fullscreen'"
+						>
+							<i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+							<i v-else class="fa-solid fa-compress"></i>
 						</button>
 						<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 					</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4e8e844dd..4f61f3862 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -34989,6 +34989,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentByLVATitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Anwesenheiten der gesamten Lehrveranstaltung - alle LV-Teile',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendances of the full course - all teaching units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolliertVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' =>  'Kontrolliert von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Checked by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

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 1151/1357] - 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 1152/1357] 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 1153/1357] 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 1154/1357] 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 1155/1357] 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 1156/1357] 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 1157/1357] 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 85a10e27cc1b84cfe9f4792988e8db61a411365a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 2 Feb 2026 17:59:15 +0100
Subject: [PATCH 1158/1357] fix setFirstStudent if GENERATE_ALIAS_STUDENT is
 false

---
 application/controllers/api/frontend/v1/stv/Status.php | 7 +++----
 application/libraries/PrestudentLib.php                | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 09a9f18b1..3c0a639cd 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -636,7 +636,7 @@ class Status extends FHCAPI_Controller
 
 		$this->load->library('PrestudentLib');
 
-		$this->prestudentlib->setFirstStudent(
+		$resFirstStudent = $this->prestudentlib->setFirstStudent(
 			$prestudent_id,
 			$lastAufgenommener->studiensemester_kurzbz,
 			$lastAufgenommener->ausbildungssemester,
@@ -645,9 +645,8 @@ class Status extends FHCAPI_Controller
 			$this->input->post('statusgrund_id')
 		);
 
-		$this->getDataOrTerminateWithError($result);
-
-		$this->db->trans_commit();
+		$this->db->trans_complete();
+		$this->getDataOrTerminateWithError($resFirstStudent);
 
 		return $this->outputJsonSuccess(true);
 	}
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index a57533da0..b1f2dc900 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -723,7 +723,7 @@ class PrestudentLib
 
 
 		// Generate Alias
-		$alias = '';
+		$alias = null;
 		if (!defined('GENERATE_ALIAS_STUDENT')
 			|| GENERATE_ALIAS_STUDENT === true
 		) {

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 1159/1357] 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 b4f28d54268b82ed5c6a9aa78261055e462699d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 3 Feb 2026 11:12:50 +0100
Subject: [PATCH 1160/1357] =?UTF-8?q?Abstract=20zum=20Default=20Config=20f?=
 =?UTF-8?q?=C3=BCr=20Betreuer=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 3ff56a957..f9b043a34 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -17,7 +17,7 @@ $config['URL_ASSISTENZ'] = 'index.ci.php/Cis/Abgabetool/Assistenz';
 
 // lehre.tbl_paabgabetyp bezeichnung
 //$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['Zwischenabgabe', 'Quality Gate 1', 'Quality Gate 2'];
-$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
+$config['ALLOWED_ABGABETYPEN_BETREUER'] = ['abstract','zwischen', 'qualgate1', 'qualgate2']; // tbl_paabgabetyp pk
 // paabgabetypen for which betreuer is benachrichtigt via sammelmail
 $config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_BETREUER'] = ['qualgate1', 'qualgate2', 'end'];
 // paabgabetypen for which assistenz is benachrichtigt via sammelmail
@@ -35,4 +35,4 @@ $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ZWEITBEGUTACHTER'] = 'index.ci.
 $config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
 
 // to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
-$config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
\ No newline at end of file
+$config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';

From d774335bcfa7950e7639c268040b84c50b21b6ca Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 3 Feb 2026 12:35:06 +0100
Subject: [PATCH 1161/1357] assistenz view query now also checks for
 betreuerart_kurzbz ("Erstbegutachter", "Begutachter", "Betreuer",
 "Erstbetreuer", "Senatsvorsitz") instead of only ("Erstbegutachter",
 "Begutachter")

---
 .../models/education/Projektarbeit_model.php       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index c0e5e3546..d80878f6d 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -360,7 +360,7 @@ class Projektarbeit_model extends DB_Model
 					   SELECT person_id
 					   FROM lehre.tbl_projektbetreuer
 					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
 					   LIMIT 1
 				   )
 					   AS zweitbetreuer_person_id,
@@ -368,7 +368,7 @@ class Projektarbeit_model extends DB_Model
 					   SELECT betreuerart_kurzbz
 					   FROM lehre.tbl_projektbetreuer
 					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
 					   LIMIT 1
 				   )
 					   AS zweitbetreuer_betreuerart_kurzbz,
@@ -389,7 +389,7 @@ class Projektarbeit_model extends DB_Model
 								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
 					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter')
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
 					   LIMIT 1
 				   )
 					   as zweitbetreuer_full_name,
@@ -423,7 +423,13 @@ class Projektarbeit_model extends DB_Model
 						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
 						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
 			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-				 AND student_benutzer.aktiv AND (lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter')
+				 AND student_benutzer.aktiv AND (
+				     lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' 
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Betreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbetreuer'
+				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
+				     )
 				 AND public.tbl_studiengang.studiengang_kz = ?";
 		
 			     if($benotet == 0) {

From 6391bf5a450d0b6729a100d51c3aa6a8cbb11c24 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 3 Feb 2026 12:52:25 +0100
Subject: [PATCH 1162/1357] tippfehler in phrase "c4tooltipStandard"
 ausgebessert: 'Termin mehr als 12 Tag entfernt' => 'Termin mehr als 12 Tage
 entfernt'

---
 .../js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js   | 2 +-
 public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js    | 2 +-
 public/js/components/Cis/Abgabetool/StatusLegende.js          | 2 +-
 system/phrasesupdate.php                                      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index eb182eb7b..b82310c7c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -551,7 +551,7 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		getTooltipStandard() {
 			return {
-				value: this.$p.t('abgabetool/c4tooltipStandard'),
+				value: this.$p.t('abgabetool/c4tooltipStandardv2'),
 				class: "custom-tooltip"
 			}
 		},
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 8e6ce20c3..55120e223 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -264,7 +264,7 @@ export const AbgabeStudentDetail = {
 		},
 		getTooltipStandard() {
 			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandard')),
+				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandardv2')),
 				class: "custom-tooltip"
 			}
 		},
diff --git a/public/js/components/Cis/Abgabetool/StatusLegende.js b/public/js/components/Cis/Abgabetool/StatusLegende.js
index d415c508d..8a719875d 100644
--- a/public/js/components/Cis/Abgabetool/StatusLegende.js
+++ b/public/js/components/Cis/Abgabetool/StatusLegende.js
@@ -36,7 +36,7 @@ export const AbgabeterminStatusLegende = {
 						<i class="fa-solid fa-clock"></i>
 					</div>
 					<div class="col-auto" style="display: flex; align-items: center;">
-						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipStandard')) }}</h5>
+						<h5>{{ $capitalize($p.t('abgabetool/c4tooltipStandardv2')) }}</h5>
 					</div>
 				</div>
 				
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 94179b4df..d8eac236d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44559,12 +44559,12 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4tooltipStandard',
+		'phrase' => 'c4tooltipStandardv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Termin mehr als 12 Tag entfernt",
+				'text' => "Termin mehr als 12 Tage entfernt",
 				'description' => '',
 				'insertvon' => 'system'
 			),

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 1163/1357] 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 1164/1357] 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 1165/1357] 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 1166/1357] 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 1167/1357] 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 a4dcf9e9355f4a8276993ae865814623be2852d1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 4 Feb 2026 11:04:55 +0100
Subject: [PATCH 1168/1357] use phrase c4betrart + pa.betrart_kurzbz for
 betreuer/zweitbetreuer: text

---
 .../components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index b82310c7c..35633321d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -53,7 +53,8 @@ export const AbgabeMitarbeiterDetail = {
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
 				icon: "fa fa-user-check",
-				command: this.openBenotung
+				command: this.openBenotung,
+				disabled: Vue.computed(()=> this.assistenzMode == true)
 			},
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4plagiatcheck_link')),
@@ -730,11 +731,11 @@ export const AbgabeMitarbeiterDetail = {
 				<p> {{getProjektarbeitStudent}}</p>
 				<p> {{getProjektarbeitTitel}}</p>
 				<template v-if="assistenzMode">
-					<p v-if="projektarbeit?.erstbetreuer_full_name"> {{$capitalize( $p.t('abgabetool/c4betreuer') )}}: {{projektarbeit?.erstbetreuer_full_name}}</p>
-					<p v-if="projektarbeit?.zweitbetreuer_full_name"> {{$capitalize( $p.t('abgabetool/c4zweitbetreuer') )}}: {{projektarbeit?.zweitbetreuer_full_name}}</p>
+					<p v-if="projektarbeit?.erstbetreuer_full_name"> {{ projektarbeit.betreuerart ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.betreuerart)) : $capitalize( $p.t('abgabetool/c4betreuer') )}}: {{projektarbeit?.erstbetreuer_full_name}}</p>
+					<p v-if="projektarbeit?.zweitbetreuer_full_name"> {{ projektarbeit?.zweitbetreuer_betreuerart_kurzbz ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.zweitbetreuer_betreuerart_kurzbz)) : $capitalize( $p.t('abgabetool/c4zweitbetreuer') )}}: {{projektarbeit?.zweitbetreuer_full_name}}</p>
 				</template>
 				<template v-else>
-					<p v-if="projektarbeit?.betreuer"> {{$p.t('abgabetool/c4betreuer')}}: {{projektarbeit?.betreuer?.first}}</p>
+					<p v-if="projektarbeit?.betreuer"> {{$capitalize($p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz))}}: {{projektarbeit?.betreuer?.first}}</p>
 				</template>		
 			</div>
 			<div class="col-6 d-flex justify-content-end align-items-start">

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 1169/1357] 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 c8cb4842995bbf33cb7fc463bd958c0ac1e5903c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 4 Feb 2026 11:34:36 +0100
Subject: [PATCH 1170/1357] add missing email template public.tbl_vorlage
 inserts to checksystem script; checked template naming convention for higher
 case

---
 .../controllers/jobs/AbgabetoolJob.php        |  4 +-
 .../61164_abgabetool_quality_gates.php        | 42 ++++++++++++++++---
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 6d52d6c20..51b2b4920 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -502,7 +502,7 @@ class AbgabetoolJob extends JOB_Controller
 
 			// send email with bundled info
 			sendSanchoMail(
-				'paabgabeUpdatesBetSM',
+				'PaabgabeUpdatesBetSM',
 				$body_fields,
 				$email,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
@@ -605,7 +605,7 @@ class AbgabetoolJob extends JOB_Controller
 
 			// send email with bundled info
 			sendSanchoMail(
-				'paabgabeUpdatesSammelmail',
+				'PaabgabeUpdatesSammelmail',
 				$body_fields,
 				$uid.'@'.DOMAIN,
 				$this->p->t('abgabetool', 'changedAbgabeterminev2')
diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index e0927344a..aa955ab07 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -303,33 +303,33 @@ if($result = $db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechti
 	}
 }
 
-if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'paabgabeUpdatesBetSM'"))
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PaabgabeUpdatesBetSM'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
-				VALUES ('paabgabeUpdatesBetSM', 'paabgabeUpdatesBetSM', null, 'text/html')
+				VALUES ('PaabgabeUpdatesBetSM', 'PaabgabeUpdatesBetSM', null, 'text/html')
 				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
 
 		if(!$db->db_query($qry))
 			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
 		else
-			echo "<br>system.tbl_vorlage paabgabeUpdatesBetSM hinzugefuegt";
+			echo "<br>system.tbl_vorlage PaabgabeUpdatesBetSM hinzugefuegt";
 	}
 }
 
-if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'paabgabeUpdatesSammelmail'"))
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PaabgabeUpdatesSammelmail'"))
 {
 	if($db->db_num_rows($result) === 0)
 	{
 		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
-				VALUES ('paabgabeUpdatesSammelmail', 'paabgabeUpdatesSammelmail', null, 'text/html')
+				VALUES ('PaabgabeUpdatesSammelmail', 'PaabgabeUpdatesSammelmail', null, 'text/html')
 				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
 
 		if(!$db->db_query($qry))
 			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
 		else
-			echo "<br>system.tbl_vorlage paabgabeUpdatesSammelmail hinzugefuegt";
+			echo "<br>system.tbl_vorlage PaabgabeUpdatesSammelmail hinzugefuegt";
 	}
 }
 
@@ -347,3 +347,33 @@ if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzb
 			echo "<br>system.tbl_vorlage PAAChangesBetSM hinzugefuegt";
 	}
 }
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PAAChangesAssSM'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('PAAChangesAssSM', 'PAAChangesAssSM', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage PAAChangesAssSM hinzugefuegt";
+	}
+}
+
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'QualGateNegativ'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('QualGateNegativ', 'QualGateNegativ', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage QualGateNegativ hinzugefuegt";
+	}
+}

From cc302ed5a1d4749976961b881c9f8277fa6bfc0f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 4 Feb 2026 17:32:17 +0100
Subject: [PATCH 1171/1357] lazyload signatur status for assistenz view to
 avoid worst case loading times due to 50 x 30mb signatur server payload

---
 .../controllers/api/frontend/v1/Abgabe.php    | 44 ++++++++++++++-----
 .../models/education/Paabgabe_model.php       |  6 +++
 public/js/api/factory/abgabe.js               |  8 ++++
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 13 +++++-
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 5a6331584..1ff4fd13d 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -45,8 +45,9 @@ class Abgabe extends FHCAPI_Controller
 			'getProjektarbeitenForStudiengang' =>array('basis/abgabe_assistenz:rw'),
 			'getStudiengaenge' => array('basis/abgabe_assistenz:rw'),
 			'getStudentProjektarbeitAbgabeFile' => array('basis/abgabe_student:rw', 'basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
-			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
-			]);
+			'postStudentProjektarbeitZusatzdaten' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw'),
+			'getSignaturStatusForProjektarbeitAbgaben' => array('basis/abgabe_lektor:rw', 'basis/abgabe_assistenz:rw')
+		]);
 
 		$this->load->library('PhrasesLib');
 		$this->load->library('SignatureLib');
@@ -151,7 +152,7 @@ class Abgabe extends FHCAPI_Controller
 			$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 
 			foreach ($ret->retval as $termin) {
-				$this->checkAbgabeSignatur($termin, $projektarbeit);
+				$this->checkAbgabeSignatur($termin, $projektarbeit->student_uid);
 			}
 
 			$this->terminateWithSuccess(array($ret, $projektarbeitIsCurrent));
@@ -398,7 +399,7 @@ class Abgabe extends FHCAPI_Controller
 						$this->terminateWithError($this->p->t('abgabetool', 'c4projektabgabeNichtGefunden'), 'general');
 					}
 
-					$this->checkAbgabeSignatur($paabgabe, $projektarbeit);
+					$this->checkAbgabeSignatur($paabgabe, $projektarbeit->student_uid);
 					$signaturstatus = $paabgabe->signatur;
 
 					// update projektarbeit cols
@@ -892,10 +893,10 @@ class Abgabe extends FHCAPI_Controller
 			
 			$projektarbeit->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
 
-			// check the signature status for enduploads
-			foreach($projektarbeit->abgabetermine as $abgabe) {
-				$this->checkAbgabeSignatur($abgabe, $projektarbeit);
-			}
+//			// check the signature status for enduploads
+//			foreach($projektarbeit->abgabetermine as $abgabe) {
+//				$this->checkAbgabeSignatur($abgabe, $projektarbeit);
+//			}
 		}
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
@@ -1021,10 +1022,33 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	// used to lazy load signatur status for assistenzen, since they could run into very long fetch times
+	// since they fetch the projektarbeiten with paabgaben included and could have a lot of huge endupload files
+	// in their stg resulting in huge loading times -> use this api call on opening detail component instead
+	public function getSignaturStatusForProjektarbeitAbgaben() {
+		$paabgabe_ids = $this->input->post('paabgabe_ids');
+		$student_uid = $this->input->post('student_uid');
+
+		if ($paabgabe_ids === NULL || $student_uid === NULL || trim((string)$student_uid) === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
+		$result = $this->PaabgabeModel->loadByIDs($paabgabe_ids);
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		foreach($data as $paabgabetermin) {
+			$this->checkAbgabeSignatur($paabgabetermin, $student_uid);
+		}
+		
+		$this->terminateWithSuccess($data);
+	}
+
 	/**
 	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
 	 */
-	private function checkAbgabeSignatur($abgabe, $projektarbeit) {
+	private function checkAbgabeSignatur($abgabe, $student_uid) {
 		$paabgabetypenToCheck = $this->config->item('SIGNATUR_CHECK_PAABGABETYPEN');
 
 		if(!in_array($abgabe->paabgabetyp_kurzbz, $paabgabetypenToCheck)) {
@@ -1036,7 +1060,7 @@ class Abgabe extends FHCAPI_Controller
 			return;
 		}
 
-		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$projektarbeit->student_uid.'.pdf';
+		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$student_uid.'.pdf';
 		
 		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
 		if(file_exists($path)) {
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index aa61bbaae..a883043d3 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -108,4 +108,10 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($query, [$interval]);
 	}
+	
+	public function loadByIDs($paabgabe_ids) {
+		$qry = "SELECT * FROM campus.tbl_paabgabe WHERE paabgabe_id IN ?";
+		
+		return $this->execReadOnlyQuery($qry, [$paabgabe_ids]);
+	}
 }
diff --git a/public/js/api/factory/abgabe.js b/public/js/api/factory/abgabe.js
index f5659f3a0..c6f229973 100644
--- a/public/js/api/factory/abgabe.js
+++ b/public/js/api/factory/abgabe.js
@@ -132,5 +132,13 @@ export default {
 			params: formData,
 			config: {Headers: { "Content-Type": "multipart/form-data" }}
 		};
+	},
+	getSignaturStatusForProjektarbeitAbgaben(paabgabe_ids, student_uid) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/getSignaturStatusForProjektarbeitAbgaben',
+			params: {paabgabe_ids, student_uid},
+
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 7345b14e0..4c4485fb4 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -684,7 +684,18 @@ export const AbgabetoolAssistenz = {
 			
 			const pa = this.projektarbeiten.find(projektarbeit => projektarbeit.projektarbeit_id == details.projektarbeit_id)
 
-			// pa.isCurrent = res.data[1]
+			if(pa?.abgabetermine?.length) {
+				this.$api.call(ApiAbgabe.getSignaturStatusForProjektarbeitAbgaben(pa.abgabetermine.map(termin => termin.paabgabe_id), pa.student_uid))
+					.then(res => {
+						if(res.meta.status === 'success') {
+							res.data.forEach(paabgabe => {
+								const termin = pa.abgabetermine.find(abgabe => abgabe.paabgabe_id == paabgabe.paabgabe_id)
+								if(termin && paabgabe.signatur !== undefined) termin.signatur = paabgabe.signatur
+							})
+						}
+					})
+			}
+			
 			const paIsBenotet = pa.note !== null
 			
 			pa.abgabetermine.forEach(termin => {

From 1eda652fba9ce7cab8912f648319334e4072c4f7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 4 Feb 2026 17:34:21 +0100
Subject: [PATCH 1172/1357] remove old code

---
 application/controllers/api/frontend/v1/Abgabe.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 1ff4fd13d..39c7ebae6 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -892,11 +892,6 @@ class Abgabe extends FHCAPI_Controller
 			};
 			
 			$projektarbeit->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
-
-//			// check the signature status for enduploads
-//			foreach($projektarbeit->abgabetermine as $abgabe) {
-//				$this->checkAbgabeSignatur($abgabe, $projektarbeit);
-//			}
 		}
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));

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 1173/1357] 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 1174/1357] 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"
 				>

From 2a63b998161a274720637116159d95aacb33ee91 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 5 Feb 2026 11:50:43 +0100
Subject: [PATCH 1175/1357] handle emit redirectToLeitung in parent

---
 public/js/components/DetailHeader/DetailHeader.js    | 2 +-
 public/js/components/Vertraege/Vertragsverwaltung.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index e225c5d98..90c5084ed 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -335,7 +335,7 @@ export default {
 						{{departmentData.bezeichnung}}
 					<span v-if="leitungData.uid"> | </span>
 					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
-					<a href="#" @click.prevent="goToLeitung" >
+					<a href="#" @click.prevent="goToLeitung">
 						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
 					</a>
 					<p>
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index ff64874c6..d1f209527 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -62,12 +62,14 @@ export default {
 							typeHeader="mitarbeiter"
 							:domain="config.domain"
 							fotoEditable
+							@redirectToLeitung="handleSelection"
 						>
 							<template #uid>{{mitarbeiter_uid}}</template>
 							<template #titleAlphaTile>pID</template>
 							<template #valueAlphaTile>{{person_id}}</template>
 						</fhc-header>
 						<vertraege-mitarbeiter
+							ref="CoreTableVertraege"
 							:endpoint="endpoint"
 							:person_id="this.person_id"
 							:mitarbeiter_uid="this.mitarbeiter_uid"

From 0bf9d8fa8a4b8aeaf7a1c8f53641b9f8b77b1117 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 5 Feb 2026 14:50:20 +0100
Subject: [PATCH 1176/1357] Adaptions Detailheader: center Title and Values for
 Tiles, change size for mitarbeiterDetailHeader

---
 .../components/DetailHeader/DetailHeader.js   | 34 +++++++++----------
 .../Stv/Studentenverwaltung/Details.js        |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 90c5084ed..434e9372b 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -275,20 +275,20 @@ export default {
 							<slot name="issues"></slot>
 						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleGammaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueGammaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleBetaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueBetaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueBetaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleAlphaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueAlphaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1">UID</h4>
-							<h6 class="text-muted"><slot name="uid"></slot></h6>
+							<h4 class="mb-1 text-center">UID</h4>
+							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
 						</div>
 					</div>
 				</div>
@@ -299,7 +299,7 @@ export default {
 
 				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
-					  class="d-block rounded"
+					  class="d-block w-100 h-100 rounded"
 					  style="height: 84px; object-fit: contain;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
@@ -359,20 +359,20 @@ export default {
 							<slot name="issues"></slot>
 						</div>
 						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleGammaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueGammaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleBetaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1"><slot name="titleAlphaTile"></slot></h4>
-							<h6 class="text-muted"><slot name="valueAlphaTile"></slot></h6>
+							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
+							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
 						</div>
 						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1">UID</h4>
-							<h6 class="text-muted"><slot name="uid"></slot></h6>
+							<h4 class="mb-1 text-center">UID</h4>
+							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
 						</div>
 					</div>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 197c6739f..198f403ac 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -85,7 +85,7 @@ export default {
 				@reload="reloadList"
 				fotoEditable
 			>
-				<template #titleAlphaTile>P_ID</template>
+				<template #titleAlphaTile>PersID</template>
 				<template #valueAlphaTile>{{students[0].person_id}}</template>
 				<template #titleBetaTile>MatrNr</template>
 				<template #valueBetaTile>{{students[0].matr_nr}}</template>

From 1cd332115bcb8316b45f25dff75dca85ab8937d4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 6 Feb 2026 10:38:29 +0100
Subject: [PATCH 1177/1357] Changes Vertragsverwaltung - refactor from
 Tabulator 5 to Tabulator 6 - not reloading contract list after changes of
 Status or Detail to keep row selection - Start reselection of current row

---
 .../api/frontend/v1/vertraege/Vertraege.php   |   4 +-
 application/views/Vertragsverwaltung.php      |   2 +-
 .../js/components/Vertraege/List/Details.js   |   4 +-
 public/js/components/Vertraege/List/Status.js |   6 +-
 .../components/Vertraege/List/Unassigned.js   |   4 +-
 .../components/Vertraege/MitarbeiterHeader.js |   4 +-
 public/js/components/Vertraege/Vertraege.js   | 101 +++++++++++-------
 .../Vertraege/Vertragsverwaltung.js           |   2 +-
 8 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
index c426d5637..c0683e999 100644
--- a/application/controllers/api/frontend/v1/vertraege/Vertraege.php
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -238,7 +238,7 @@ class Vertraege extends FHCAPI_Controller
 			}
 		}
 		$this->db->trans_complete();
-		$this->terminateWithSuccess(true);
+		$this->terminateWithSuccess($vertrag_id);
 	}
 
 	public function updateContract()
@@ -355,7 +355,7 @@ class Vertraege extends FHCAPI_Controller
 		}
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess(true);
+		$this->terminateWithSuccess($vertrag_id);
 	}
 
 	public function loadContract($vertrag_id)
diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php
index 7738a8d4a..8fa6dff27 100644
--- a/application/views/Vertragsverwaltung.php
+++ b/application/views/Vertragsverwaltung.php
@@ -8,7 +8,7 @@ $includesArray = array(
 	'primevue3' => true,
 	'filtercomponent' => true,
 	'navigationcomponent' => true,
-	'tabulator5' => true,
+	'tabulator6' => true,
 	'tinymce5' => true,
 	'phrases' => array(
 		'global',
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index a8f50743a..c33407109 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -111,8 +111,8 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '200',
-				selectableRangeMode: 'click',
-				selectable: true,
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
 				persistenceID: 'core-contracts-details'
 			},
 			tabulatorEvents: [
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 7427ac7af..ff729cfe7 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -47,6 +47,7 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
+				persistenceID: 'core-contracts-status',
 				columns: [
 					{title: "Status", field: "bezeichnung"},
 					{
@@ -148,9 +149,8 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '200',
-				selectableRangeMode: 'click',
-				selectable: true,
-				persistenceID: 'core-contracts-status'
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 4b0d20bb8..1ea7d9b3b 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -58,8 +58,8 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '200',
-				selectableRangeMode: 'click',
-				selectable: true,
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
 				persistenceID: 'core-contracts-unassigned'
 			},
 			tabulatorEvents: [
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 31f9fe96d..9417942c8 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -65,8 +65,8 @@ export default {
 				layout: 'fitColumns',
 				persistenceID: 'core-mitarbeiter_20250901-2',
 				footerElement: '<div>&sum; <span id="search_count"></span> / <span id="total_count"></span></div>',
-				selectableRangeMode: 'click',
-				selectable: true,
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 2b9531a07..5868cc540 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -132,8 +132,9 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '250',
-				selectableRangeMode: 'click',
-				selectable: true,
+				selectableRowsRangeMode: 'click',
+				selectableRows: true,
+				index: "vertrag_id",
 				persistence: {
 					sort: true,
 					page: true,
@@ -149,38 +150,30 @@ export default {
 
 						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
 
-						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('ui', 'bezeichnung')
-						});
-						cm.getColumnByField('betrag').component.updateDefinition({
-							title: this.$p.t('ui', 'betrag')
-						});
-						cm.getColumnByField('status').component.updateDefinition({
-							title: this.$p.t('global', 'status')
-						});
-						cm.getColumnByField('vertragstyp_bezeichnung').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragstyp')
-						});
-						cm.getColumnByField('vertragsdatum').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsdatum')
-						});
-						cm.getColumnByField('vertragsstunden').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsstunden')
-						});
-						cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
-						});
-						cm.getColumnByField('vertrag_id').component.updateDefinition({
-							title: this.$p.t('ui', 'vertrag_id')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('isabgerechnet').component.updateDefinition({
-							title: this.$p.t('vertrag', 'abgerechnet')
-						});
+							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('ui', 'bezeichnung'));
+						setHeader('betrag', this.$p.t('ui', 'betrag'));
+						setHeader('status', this.$p.t('global', 'status'));
+						setHeader('vertragstyp_bezeichnung', this.$p.t('vertrag', 'vertragstyp'));
+						setHeader('vertragsdatum', this.$p.t('vertrag', 'vertragsdatum'));
+						setHeader('vertragsstunden', this.$p.t('vertrag', 'vertragsstunden'));
+						setHeader('vertragsstunden_studiensemester_kurzbz', this.$p.t('vertrag', 'vertragsstunden_studiensemester'));
+						setHeader('vertrag_id', this.$p.t('ui', 'vertrag_id'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('isabgerechnet', this.$p.t('vertrag', 'abgerechnet'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
 /*						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
 						});*/
@@ -265,15 +258,42 @@ export default {
 			return this.$refs.contractData
 				.call(this.endpoint.addNewContract(dataToSend))
 				.then(response => {
+					//get new ID of request to focus the new entry
+					let vertrag_id = response.data;
+
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					//this.$refs.contractdetails.reload();
+					this.$refs.contractdetails.reload();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
+
 					this.reload();
+					//TODO(Manu) Finish Selection of current dataset
+/*					this.reload().then(() => {
+						this.selectRow(vertrag_id);
+					})*/
+
+
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+/*		async selectRow(vertrag_id){
+			console.log("in selectRow " + vertrag_id);
+			//if (!this.table) return;
+
+			if (!this.$refs.table) return;
+
+			//this.table.selectRow(this.$refs.table.tabulator.getRows()[0]);
+
+			this.$refs.table.tabulator.selectRow(vertrag_id);
+		//	this.$refs.table.tabulator.selectRow("visible");
+			console.log("Vertrag_id" + vertrag_id);
+
+			//console.log(this.$refs.table.tabulator.getRow(vertrag_id));
+			//this.table.selectRow(vertrag_id);
+
+		//	this.$refs.table.selectRow(vertrag_id);
+		},*/
 		updateContract(vertrag_id) {
 			this.$refs.unassignedLehrauftraege.emitSaveEvent();
 
@@ -287,11 +307,20 @@ export default {
 				.call(this.endpoint.updateContract(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					//TODO(Manu) get Id from dataToSend
+					let vertrag_id = response.data;
+					console.log(vertrag_id);
 					this.$refs.contractModal.hide();
 					this.resetModal();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.$refs.contractdetails.reload();
 					this.reload();
+					//TODO(Manu) Finish Selection of current dataset
+					/*					this.reload().then(() => {
+											this.selectRow(vertrag_id);
+										})*/
+
+					//this.selectRow(vertrag_id);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -331,7 +360,7 @@ export default {
 
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
-					this.reload();
+					//this.reload(); //focus get lost with reload
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -372,7 +401,7 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
-					this.reload();
+					//this.reload(); //focus gets lost with reload
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index d1f209527..754161d02 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -65,7 +65,7 @@ export default {
 							@redirectToLeitung="handleSelection"
 						>
 							<template #uid>{{mitarbeiter_uid}}</template>
-							<template #titleAlphaTile>pID</template>
+							<template #titleAlphaTile>persID</template>
 							<template #valueAlphaTile>{{person_id}}</template>
 						</fhc-header>
 						<vertraege-mitarbeiter

From f4ae8dd8e1366ae4939015898ff73437e61dcc7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 6 Feb 2026 13:10:31 +0100
Subject: [PATCH 1178/1357] =?UTF-8?q?Korrektur=20zur=20Ermittlung=20der=20?=
 =?UTF-8?q?(legacy)=20Anwesenheit=20von=20BFI=20=C3=BCbernommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/anwesenheit.class.php | 241 ++++++++++++++++++++++++----------
 1 file changed, 169 insertions(+), 72 deletions(-)

diff --git a/include/anwesenheit.class.php b/include/anwesenheit.class.php
index 2b8389c79..f601d6b95 100644
--- a/include/anwesenheit.class.php
+++ b/include/anwesenheit.class.php
@@ -479,91 +479,181 @@ class anwesenheit extends basis_db
 	 */
 	public function loadAnwesenheitStudiensemester($studiensemester_kurzbz, $student_uid=null, $lehrveranstaltung_id=null)
 	{
-		$qry = "SELECT
-					lehrveranstaltung_id, vorname, nachname, wahlname, student_uid as uid, bezeichnung,
-					gesamt as gesamtstunden, anwesend, nichtanwesend, trunc(100-(nichtanwesend/gesamt)*100,2) as prozent
-				FROM
-				(
-					SELECT
-						vorname, nachname, wahlname, lehrveranstaltung_id, bezeichnung, gruppe, student_uid,
-						count(stundenplan_id) as gesamt,
-						case when anwesend.summe is null then 0 else anwesend.summe end as anwesend,
-						case when nichtanwesend.summe is null then 0 else nichtanwesend.summe end as nichtanwesend
+		$qry = "SELECT 
+					lehrveranstaltung_id, 
+					vorname, 
+					nachname, 
+					wahlname, 
+					student_uid AS uid, 
+					bezeichnung, 
+					gesamt AS gesamtstunden, 
+					anwesend, 
+					nichtanwesend, 
+					trunc(100-(nichtanwesend/gesamt)*100,2) AS prozent
+
+				FROM(
+					SELECT 
+					vorname, 
+					nachname, 
+					wahlname, 
+					lehrveranstaltung_id, 
+					bezeichnung, 
+					student_uid, 
+					COUNT(stundenplan_id) AS gesamt, 
+					CASE WHEN anwesend.summe IS NULL THEN 0 ELSE anwesend.summe END AS anwesend, 
+					CASE WHEN nichtanwesend.summe IS NULL THEN 0 ELSE nichtanwesend.summe END AS nichtanwesend
+					
 					FROM
 					(
-						SELECT
-							sum(stundenplan_id) as stundenplan_id, datum, stunde, lehrveranstaltung_id,
-							bezeichnung, studiensemester_kurzbz, studiengang_kz,
-							TRIM(
-								CASE WHEN stp.gruppe_kurzbz is not null then stp.gruppe_kurzbz
-								else stp.semester||(case when verband is null then '' else stp.verband end)||(case when stp.gruppe is null then '' else stp.gruppe end) end) as gruppe
+						SELECT 
+							SUM(stundenplan_id) AS stundenplan_id, 
+							datum, 
+							stunde, 
+							lehrveranstaltung_id, 
+							bezeichnung, 
+							studiensemester_kurzbz, 
+							studiengang_kz
+
 						FROM
 							lehre.tbl_lehrveranstaltung lv
-							JOIN lehre.tbl_lehreinheit le using (lehrveranstaltung_id)
-							JOIN lehre.tbl_stundenplan stp using (lehreinheit_id,studiengang_kz)
+						JOIN 
+							lehre.tbl_lehreinheit le USING (lehrveranstaltung_id)
+						JOIN
+							lehre.tbl_stundenplan stp USING (lehreinheit_id,studiengang_kz)
+
 						WHERE
 							studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
-							AND (titel not like '%Nebenprüfung%' OR titel is null)
-
-						group by datum, stunde, lehrveranstaltung_id, bezeichnung, studiensemester_kurzbz, studiengang_kz, stp.gruppe_kurzbz, stp.semester, stp.verband, stp.gruppe
+							AND (titel NOT LIKE '%Nebenprüfung%' OR titel IS NULL)
+						
+						GROUP BY 
+							datum, 
+							stunde, 
+							lehrveranstaltung_id, 
+							bezeichnung, 
+							studiensemester_kurzbz, 
+							studiengang_kz, 
+							stp.gruppe_kurzbz, 
+							stp.semester, 
+							stp.verband, 
+							stp.gruppe
 					)x
 					JOIN (
-						SELECT semester::text  as gruppe, public.tbl_studentlehrverband.studiensemester_kurzbz, student_uid, studiengang_kz
-						FROM
-							public.tbl_studentlehrverband
-						WHERE studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
-
-						UNION
-
-						SELECT  semester||verband  as gruppe, public.tbl_studentlehrverband.studiensemester_kurzbz, student_uid, studiengang_kz
-						FROM
-							public.tbl_studentlehrverband
-						WHERE
-							studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
-
-						UNION
-
-						SELECT  semester||verband||gruppe as gruppe, public.tbl_studentlehrverband.studiensemester_kurzbz, student_uid, studiengang_kz
-						FROM
-							public.tbl_studentlehrverband
-						WHERE
-							studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
-
-						UNION
-
-						SELECT gruppe_kurzbz as gruppe, public.tbl_benutzergruppe.studiensemester_kurzbz, uid as student_uid, studiengang_kz
-						FROM
-							public.tbl_benutzergruppe
-						JOIN
-							public.tbl_gruppe using (gruppe_kurzbz)
-						WHERE studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
-
-					)a using (gruppe, studiensemester_kurzbz, studiengang_kz)
-					JOIN public.tbl_benutzer b on b.uid = student_uid
-					JOIN public.tbl_person p using(person_id)
-					LEFT JOIN(
 						SELECT
-							lehrveranstaltung_id, studiensemester_kurzbz, uid as student_uid, sum(einheiten) as summe
-						FROM
-							campus.tbl_anwesenheit a
-							JOIN lehre.tbl_lehreinheit le using (lehreinheit_id)
-							JOIN lehre.tbl_lehrveranstaltung lv using (lehrveranstaltung_id)
-						WHERE
-							anwesend = true AND studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+							le.lehrveranstaltung_id,
+							slv.student_uid,
+							le.studiensemester_kurzbz,
+							st.prestudent_id
+
+						FROM 
+							public.tbl_studentlehrverband slv
+						JOIN 
+							lehre.tbl_lehreinheitgruppe leg 
+							  ON slv.studiengang_kz = leg.studiengang_kz 
+							  AND slv.semester = leg.semester
+							  AND (
+									NULLIF(btrim(leg.verband::text), '') IS NULL
+									OR NULLIF(btrim(slv.verband::text), '') = NULLIF(btrim(leg.verband::text), '')
+								   )
+							  AND (
+									NULLIF(btrim(leg.gruppe::text), '') IS NULL
+									OR NULLIF(btrim(slv.gruppe::text), '') = NULLIF(btrim(leg.gruppe::text), '')
+								   )
+						JOIN 
+							lehre.tbl_lehreinheit le USING (lehreinheit_id, studiensemester_kurzbz)
+						JOIN 
+							public.tbl_student st USING(student_uid)
+
+						WHERE 
+							leg.gruppe_kurzbz IS NULL
+							AND le.studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+
 						GROUP BY
-							lehrveranstaltung_id, bezeichnung, uid, studiensemester_kurzbz
-					)anwesend using(lehrveranstaltung_id, student_uid, studiensemester_kurzbz)
+							le.lehrveranstaltung_id,
+							slv.student_uid,
+							le.studiensemester_kurzbz,
+							st.prestudent_id
+
+						UNION
+
+						SELECT
+							le.lehrveranstaltung_id,
+							bg.uid AS student_uid,
+							bg.studiensemester_kurzbz,
+							st.prestudent_id
+
+						FROM 
+							public.tbl_benutzergruppe bg
+						JOIN 
+							lehre.tbl_lehreinheitgruppe leg USING (gruppe_kurzbz)
+						JOIN 
+							lehre.tbl_lehreinheit le USING(lehreinheit_id, studiensemester_kurzbz)
+						JOIN
+							public.tbl_student st ON bg.uid = st.student_uid
+					
+						WHERE 
+							bg.studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+
+						GROUP BY
+							le.lehrveranstaltung_id,
+							bg.uid,
+							bg.studiensemester_kurzbz,
+							st.prestudent_id
+						
+					)a USING (lehrveranstaltung_id, studiensemester_kurzbz)
+					JOIN
+						public.tbl_benutzer b on b.uid = student_uid
+					JOIN 
+						public.tbl_person p using(person_id)
 					LEFT JOIN(
-						SELECT lehrveranstaltung_id, studiensemester_kurzbz, uid as student_uid, sum(einheiten) as summe
+						SELECT 
+							lehrveranstaltung_id, 
+							studiensemester_kurzbz, 
+							uid AS student_uid, 
+							SUM(einheiten) AS summe
+
 						FROM
 							campus.tbl_anwesenheit a
-							JOIN lehre.tbl_lehreinheit le using (lehreinheit_id)
-							JOIN lehre.tbl_lehrveranstaltung lv using (lehrveranstaltung_id)
+						JOIN
+							lehre.tbl_lehreinheit le USING(lehreinheit_id)
+						JOIN
+							lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+							
 						WHERE
-							anwesend = false AND studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+							anwesend = true 
+							AND studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+
 						GROUP BY
-							lehrveranstaltung_id, bezeichnung, uid, studiensemester_kurzbz
-					)nichtanwesend using(lehrveranstaltung_id, student_uid, studiensemester_kurzbz)
+							lehrveranstaltung_id, 
+							bezeichnung, 
+							uid, 
+							studiensemester_kurzbz
+							
+					)anwesend USING(lehrveranstaltung_id, student_uid, studiensemester_kurzbz)
+					LEFT JOIN(
+						SELECT 
+							lehrveranstaltung_id, 
+							studiensemester_kurzbz, 
+							uid AS student_uid, 
+							SUM(einheiten) AS summe
+
+						FROM
+							campus.tbl_anwesenheit a
+						JOIN
+							lehre.tbl_lehreinheit le USING (lehreinheit_id)
+						JOIN
+							lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
+							
+						WHERE
+							anwesend = false 
+							AND studiensemester_kurzbz = ".$this->db_add_param($studiensemester_kurzbz)."
+
+						GROUP BY
+							lehrveranstaltung_id, 
+							bezeichnung, 
+							uid, 
+							studiensemester_kurzbz
+					)nichtanwesend USING(lehrveranstaltung_id, student_uid, studiensemester_kurzbz)
+
 					WHERE
 						lehrveranstaltung_id > 0
 			";
@@ -573,8 +663,15 @@ class anwesenheit extends basis_db
 			if(!is_null($lehrveranstaltung_id))
 				$qry.="	AND lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id);
 
-			$qry.="group by
-					vorname, nachname, wahlname, lehrveranstaltung_id, bezeichnung, gruppe, student_uid, anwesend.summe, nichtanwesend.summe
+			$qry.="	GROUP BY
+						vorname, 
+						nachname, 
+						wahlname, 
+						lehrveranstaltung_id, 
+						bezeichnung, 
+						student_uid, 
+						anwesend.summe, 
+						nichtanwesend.summe
 				)m";
 
 			if($lehrveranstaltung_id != '')

From e13a7069dc87d001d91cf17f63e62622e232c2ee Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 6 Feb 2026 13:18:09 +0100
Subject: [PATCH 1179/1357] Studverwaltung: refactor from Tabulator5 to 6,
 reformat some date entries

---
 application/views/Studentenverwaltung.php     |  2 +-
 .../Betriebsmittel/Betriebsmittel.js          |  1 +
 .../Messages/Details/TableMessages.js         |  4 +-
 .../Details/Anrechnungen/Anrechnungen.js      |  1 +
 .../Stv/Studentenverwaltung/Details/Archiv.js | 31 +++++++++++++-
 .../Details/Dokumente/List/Accepted.js        |  4 +-
 .../Details/Dokumente/List/Unaccepted.js      |  6 +--
 .../Details/Kontakt/Contact.js                | 42 -------------------
 .../Stv/Studentenverwaltung/Details/Konto.js  |  4 +-
 .../Details/Noten/Repeater.js                 | 38 +++++++++++++++--
 .../Details/Noten/Teacher.js                  | 38 +++++++++++++++--
 .../Details/Noten/Zeugnis.js                  | 38 +++++++++++++++--
 .../Details/Prestudent/History.js             | 28 +++++++------
 .../Details/Prestudent/MultiStatus.js         |  2 +-
 .../Details/Projektarbeit/Projektarbeit.js    |  2 +-
 .../Details/Projektarbeit/Projektbetreuer.js  |  4 +-
 .../Details/Pruefung/Pruefunglist.js          | 17 +++++++-
 .../Stv/Studentenverwaltung/List.js           |  4 +-
 18 files changed, 180 insertions(+), 86 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 09d02bfbd..4d7181c65 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -7,7 +7,7 @@
 		'vue3' => true,
 		'primevue3' => true,
 		#'filtercomponent' => true,
-		'tabulator5' => true,
+		'tabulator6' => true,
 		'tinymce5' => true,
 		'phrases' => array(
 			'global',
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 686caa1ac..dacee70c5 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -64,6 +64,7 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				persistenceID: 'core-betriebsmittel',
+				selectableRows: true,
 				columns: [
 					{title: "Nummer", field: "nummer", width: 150},
 					{title: "PersonId", field: "person_id", visible: false},
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index afcdf0d5c..6e7ea7af0 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -30,8 +30,6 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
-			selectable: 1,
-			selectableRangeMode: 'click',
 		}
 	},
 	methods: {
@@ -131,6 +129,8 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				index: 'message_id',
 				persistenceID: 'core-message-2025112401',
+				selectableRows: 1,
+				selectableRowsRangeMode: 'click',
 				columns: [
 					{title: "subject", field: "subject", headerFilter: true},
 					{title: "body", field: "body", formatter: "html", visible: false, headerFilter: true},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 88392337b..96c905f2b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -54,6 +54,7 @@ export default {
 				height: '500',
 				index: 'anrechnung_id',
 				persistenceID: 'stv-details-anrechnungen-2025112401',
+				selectableRows: true,
 				columns: [
 					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
 					{title: "lehrveranstaltung_id", field: "lehrveranstaltung_id", visible: false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 9f28a51a1..c63921c20 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -96,7 +96,19 @@ export default {
 					{title: "Akte Id", field: "akte_id", visible: false},
 					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
 					{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
-					{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
+					{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
 					{
 						title: this.$p.t('stv', 'archiv_signiert'),
 						field: "signiert",
@@ -117,7 +129,22 @@ export default {
 							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						},
 					},
-					{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
+					{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum",
+						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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}},
 					{
 						title: this.$p.t('stv', 'archiv_gedruckt'),
 						field: "gedruckt",
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 f70e44392..572a8cd27 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -20,7 +20,6 @@ export default {
 			listDocuments: [],
 			layoutColumnsOnNewData: false,
 			height: 300,
-			selectable: true,
 		}
 	},
 	computed: {
@@ -37,7 +36,8 @@ export default {
 				},
 				layout: 'fitDataStretchFrozen',
 				index: 'akte_id',
-				selectableRangeMode: 'click',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				persistenceID: 'stv-details-accepted-2026020401',
 				columns: [
 					{title: "akte_id", field: "akte_id", visible: false},
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 c92d52d39..5ae9cef8d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -19,8 +19,6 @@ export default {
 		return {
 			layoutColumnsOnNewData: false,
 			height: 300,
-			selectable: true,
-			selectableRangeMode: 'click',
 			listDocuments: [],
 			prestudentDocumentData: [],
 		}
@@ -35,8 +33,10 @@ export default {
 						studiengang_kz: this.studiengang_kz})
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'stv-details-unaccepted-2026020401',
 				layout: 'fitDataStretchFrozen',
+				persistenceID: 'stv-details-unaccepted-2026020401',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				columns: [
 					{title: "Dokument", field: "bezeichnung"},
 					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index c9603b1e3..a17adb06f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -135,48 +135,6 @@ export default {
 		},
 		tabulatorEvents() {
 			const events = [
-/*				{
-					event: 'tableBuilt',
-					handler: async() => {
-						await this.$p.loadCategory(['notiz','global','person']);
-
-						let cm = this.$refs.table.tabulator.columnManager;
-
-						cm.getColumnByField('kontakttypbeschreibung').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('kontakt').component.updateDefinition({
-							title: this.$p.t('global', 'kontakt')
-						});
-						cm.getColumnByField('zustellung').component.updateDefinition({
-							title: this.$p.t('person', 'zustellung')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-						cm.getColumnByField('lastupdate').component.updateDefinition({
-							title: this.$p.t('notiz', 'letzte_aenderung')
-						});
-						cm.getColumnByField('name').component.updateDefinition({
-							title: this.$p.t('person', 'firma')
-						});
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('person', 'standort')
-						});
-						cm.getColumnByField('firma_id').component.updateDefinition({
-							title: this.$p.t('ui', 'firma_id')
-						});
-						cm.getColumnByField('kontakt_id').component.updateDefinition({
-							title: this.$p.t('ui', 'kontakt_id')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('standort_id').component.updateDefinition({
-							title: this.$p.t('ui', 'standort_id')
-						});
-					}
-				},	*/
 				{
 					event: 'tableBuilt',
 					handler: async() => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 54c1db6c4..333de2119 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -127,8 +127,8 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				dataTree: true,
 				columns: this.tabulatorColumns,
-				selectable: true,
-				selectableRangeMode: 'click',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				index: 'buchungsnr',
 				persistenceID: 'stv-details-konto'
 			};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
index a4cfeaafb..13fab4f47 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
@@ -39,8 +39,38 @@ export default {
 					{ field: 'lv_bezeichnung', title: this.$p.t('lehre/lehrveranstaltung') },
 					{ field: 'note_bezeichnung', title: this.$p.t('lehre/note') },
 					{ field: 'insertvon', title: this.$p.t('profil/mitarbeiterIn'), visible: false },
-					{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), visible: false },
-					{ field: 'freigabedatum', title: this.$p.t('stv/grades_approvaldate'), visible: false },
+					{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), 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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}},
+					{ field: 'freigabedatum', title: this.$p.t('stv/grades_approvaldate'), 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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}},
 					{ field: 'studiensemester_kurzbz', title: this.$p.t('lehre/studiensemester'), visible: false },
 					{ field: 'stg_bezeichnung', title: this.$p.t('lehre/studiengang'), visible: false },
 					{ field: 'note', title: this.$p.t('stv/grades_numericgrade'), visible: false },
@@ -49,8 +79,8 @@ export default {
 				],
 				layout: 'fitDataStretch',
 				height: '100%',
-				selectable: true,
-				selectableRangeMode: 'click',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				persistenceID: 'stv-details-noten-repeater'
 			};
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index e566d3a09..43961237e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -39,8 +39,38 @@ export default {
 					{ field: 'lehrveranstaltung_bezeichnung', title: this.$p.t('lehre/lehrveranstaltung') },
 					{ field: 'note_bezeichnung', title: this.$p.t('lehre/note') },
 					{ field: 'mitarbeiter_uid', title: this.$p.t('profil/mitarbeiterIn'), visible: false },
-					{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), visible: false },
-					{ field: 'freigabedatum', title: this.$p.t('stv/grades_approvaldate'), visible: false },
+					{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), 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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}},
+					{ field: 'freigabedatum', title: this.$p.t('stv/grades_approvaldate'), 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",
+								hour: "2-digit",
+								minute: "2-digit",
+								second: "2-digit",
+								hour12: false
+							});
+						}},
 					{ field: 'studiensemester_kurzbz', title: this.$p.t('lehre/studiensemester'), visible: false },
 					{ field: 'note', title: this.$p.t('stv/grades_numericgrade'), visible: false },
 					{ field: 'student_uid', title: this.$p.t('profil/studentIn'), visible: false },
@@ -49,8 +79,8 @@ export default {
 				],
 				layout: 'fitDataStretch',
 				height: '100%',
-				selectable: true,
-				selectableRangeMode: 'click',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				persistenceID: 'stv-details-noten-teacher'
 			};
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 4d0996b6b..81c2099f7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -148,8 +148,38 @@ export default {
 				{ field: 'zeugnis', title: this.$p.t('stv/grades_zeugnis'), formatter: 'tickCross' },
 				{ field: 'lehrveranstaltung_bezeichnung', title: this.$p.t('lehre/lehrveranstaltung') },
 				gradeField,
-				{ field: 'uebernahmedatum', title: this.$p.t('stv/grades_takeoverdate'), visible: false },
-				{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), visible: false },
+				{ field: 'uebernahmedatum', title: this.$p.t('stv/grades_takeoverdate'), 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",
+							hour: "2-digit",
+							minute: "2-digit",
+							second: "2-digit",
+							hour12: false
+						});
+					}},
+				{ field: 'benotungsdatum', title: this.$p.t('stv/grades_gradingdate'), 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",
+							hour: "2-digit",
+							minute: "2-digit",
+							second: "2-digit",
+							hour12: false
+						});
+					}},
 				{ field: 'studiensemester_kurzbz', title: this.$p.t('lehre/studiensemester'), visible: false },
 				{ field: 'note_number', title: this.$p.t('stv/grades_numericgrade'), visible: false, formatter: cell => cell.getData().note, tooltip: (evt, cell) => cell.getData().note },
 				{ field: 'lehrveranstaltung_id', title: this.$p.t('lehre/lehrveranstaltung_id'), visible: false },
@@ -218,8 +248,8 @@ export default {
 				columns,
 				height: '100%',
 				layout: 'fitDataStretchFrozen',
-				selectable: 1,
-				selectableRangeMode: 'click',
+				selectableRows: 1,
+				selectableRowsRangeMode: 'click',
 				persistenceID: 'stv-details-noten-zeugnis-2025112401',
 				persistence:{
 					columns: ["width", "visible", "frozen"]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index ffca391dc..d884c9125 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -15,7 +15,7 @@ export default{
 			layout: 'fitDataFill',
 			layoutColumnsOnNewData:	false,
 			height:	'auto',
-			selectable:	false
+			selectableRows:	false
 		}
 	},
 	computed: {
@@ -25,7 +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',
+				persistenceID: 'stv-details-prestudent-history-20260204',
 				columns:[
 					{title:"StSem", field:"studiensemester_kurzbz"},
 					{title:"Prio", field:"priorisierung"},
@@ -56,19 +56,23 @@ export default{
 					handler: async () => {
 						await this.$p.loadCategory(['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('orgform_kurzbz').component.updateDefinition({
-							title: this.$p.t('lehre', 'organisationsform')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('lehre', 'studienplan')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('orgform_kurzbz', this.$p.t('lehre', 'organisationsform'));
+						setHeader('bezeichnung', this.$p.t('lehre', 'studienplan'));
+						setHeader('prestudent_id', this.$p.t('ui', 'prestudent_id'));
 
-						cm.getColumnByField('prestudent_id').component.updateDefinition({
-							title: this.$p.t('ui', 'prestudent_id')
-						});
 					}
 				}
 			];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 5a2bda80a..f001ee6b6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -208,7 +208,7 @@ export default{
 				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
-				selectable: false,
+				selectableRows: false,
 				index: 'statusId',
 				persistenceID: 'stv-multistatus-2025112401'
 			};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 57a18bf15..b95efcc5f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -260,7 +260,7 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				height: 'auto',
 				minHeight: '200',
-				selectable: 1,
+				selectableRows: 1,
 				index: 'projektarbeit_id',
 				persistence:{
 					columns: true, //persist column layout
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 6c39ba9ae..b22f1a368 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -120,8 +120,8 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '100',
-				selectable: true,
-				selectable: 1,
+				selectableRows: true,
+				selectableRows: 1,
 				index: 'betreuer_id',
 				persistence:{
 					columns: true, //persist column layout
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index c58027338..47ebe495c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -64,8 +64,21 @@ export default{
 					group: false,
 					page: false
 				},
+				selectableRows: true,
 				columns: [
-					{title: "Datum", field: "format_datum"},
+					{title: "Datum", field: "datum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
 					{title: "Lehrveranstaltung", field: "lehrveranstaltung_bezeichnung"},
 					{title: "Note", field: "note_bezeichnung"},
 					{title: "Anmerkung", field: "anmerkung"},
@@ -141,7 +154,7 @@ export default{
 							}
 						};
 
-						setHeader('format_datum', this.$p.t('global', 'datum'));
+						setHeader('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'));
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 2dd1f24f4..26bfbcb2c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -173,8 +173,8 @@ export default {
 				layout: 'fitDataStretch',
 				layoutColumnsOnNewData: false,
 				height: '100%',
-				selectable: true,
-				selectableRangeMode: 'click',
+				selectableRows: true,
+				selectableRowsRangeMode: 'click',
 				index: 'prestudent_id',
 				persistenceID: 'stv-list',
 			},

From 6da19585ff836b304e994b34e6e691986c505776 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 9 Feb 2026 13:45:01 +0100
Subject: [PATCH 1180/1357] optional sammelmail buttons assistenz abgabetool

---
 application/config/abgabe.php                 |  3 +
 .../controllers/api/frontend/v1/Abgabe.php    | 28 +++++++-
 .../models/education/Projektarbeit_model.php  | 22 ++++++
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 70 +++++++++++++++++--
 system/phrasesupdate.php                      | 52 ++++++++++++--
 5 files changed, 162 insertions(+), 13 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index f9b043a34..5cf3042ed 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -36,3 +36,6 @@ $config['SIGNATUR_CHECK_PAABGABETYPEN'] = ['end'];
 
 // to be used as "https://moodle.technikum-wien.at/course/view.php?idnumber=dl{$stg_kz}" for stg specific moodle routing
 $config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?idnumber=dl';
+
+$config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
+$config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 39c7ebae6..c8f48b9df 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -87,11 +87,15 @@ class Abgabe extends FHCAPI_Controller
 		$old_abgabe_beurteilung_link =$this->config->item('old_abgabe_beurteilung_link');
 		$turnitin_link = $this->config->item('turnitin_link');
 		$abgabetypenBetreuer = $this->config->item('ALLOWED_ABGABETYPEN_BETREUER');
+		$ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT');
+		$ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER');
 		
 		$ret = array(
 			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
 			'turnitin_link' => $turnitin_link,
-			'abgabetypenBetreuer' => $abgabetypenBetreuer
+			'abgabetypenBetreuer' => $abgabetypenBetreuer,
+			'ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT' => $ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT,
+			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER
 		);
 		
 		$this->terminateWithSuccess($ret);
@@ -762,7 +766,7 @@ class Abgabe extends FHCAPI_Controller
 	/**
 	 * helper function to fetch the correct email for a projektarbeits erstbetreuer
 	 */
-	private function getProjektbetreuerEmail($projektarbeit_id) {
+	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
 		$email = $this->getDataOrTerminateWithError($result, 'general');
@@ -771,6 +775,18 @@ class Abgabe extends FHCAPI_Controller
 
 	}
 
+	/**
+	 * helper function to fetch the correct email for a projektarbeits zweitbetreuer by their person id
+	 * can be used for erstbetreuer aswell if necessary
+	 */
+	private function getProjektbetreuerEmailByPersonID($person_id) {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$result = $this->ProjektarbeitModel->getProjektbetreuerEmailByPersonID($person_id);
+		$email = $this->getDataOrTerminateWithError($result, 'general');
+
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+	}
+ 
 	//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 
 	/**
@@ -887,6 +903,12 @@ class Abgabe extends FHCAPI_Controller
 		
 		// map the abgaben into projektarbeiten
 		foreach($projektarbeiten as $projektarbeit) {
+			$projektarbeit->betreuer_mail = $this->getProjektbetreuerEmailByProjektarbeitID($projektarbeit->projektarbeit_id);
+			
+			if($projektarbeit->zweitbetreuer_person_id !== null) {
+				$projektarbeit->zweitbetreuer_mail = $this->getProjektbetreuerEmailByPersonID($projektarbeit->zweitbetreuer_person_id);
+			}
+			
 			$filterFunc = function($projektabgabe) use ($projektarbeit) {
 				return $projektabgabe->projektarbeit_id == $projektarbeit->projektarbeit_id;
 			};
@@ -1140,7 +1162,7 @@ class Abgabe extends FHCAPI_Controller
 			$maildata['bewertunglink'] = $projektarbeitIsCurrent && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
 			$maildata['token'] = "";
 
-			$email = $this->getProjektbetreuerEmail($projektarbeit_id);
+			$email = $this->getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id);
 
 			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
 			
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index d80878f6d..e2d4d1b70 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -244,6 +244,28 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, [$projektarbeit_id]);
 	}
+	
+	public function getProjektbetreuerEmailByPersonID($person_id) {
+		$qry = "SELECT (
+				   SELECT kontakt
+				   FROM public.tbl_kontakt
+				   WHERE kontakttyp = 'email'
+					 AND person_id = pers.person_id
+				   ORDER BY
+					   CASE WHEN zustellung THEN 0 ELSE 1 END,
+					   insertamum DESC NULLS LAST
+				   LIMIT 1
+			   ) AS private_email, mitarbeiter_uid as uid
+		FROM lehre.tbl_projektarbeit pa
+				 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+				 JOIN public.tbl_person pers USING (person_id)
+				 LEFT JOIN public.tbl_benutzer ben USING (person_id)
+				 LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
+		WHERE (ben.aktiv OR ben.aktiv IS NULL)
+		  AND person_id = ?";
+
+		return $this->execReadOnlyQuery($qry, [$person_id]);
+	}
 
 	public function getProjektarbeitBenutzer($uid) {
 		$qry="SELECT * FROM campus.vw_benutzer where uid=?";
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 4c4485fb4..20333ba41 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -77,6 +77,8 @@ export const AbgabetoolAssistenz = {
 			phrasenResolved: false,
 			turnitin_link: null,
 			old_abgabe_beurteilung_link: null,
+			ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT: null,
+			ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER: null,
 			saving: false,
 			loading: false,
 			abgabeTypeOptions: null,
@@ -221,6 +223,32 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		sammelMailStudent() {
+			const emails = this.selectedData
+				.map(row => `${row.student_uid}@${this.domain}`)
+				.join(',');
+			
+			const subject = this.$p.t('abgabetool/c4sammelmailStudentBetreff', [this.selectedStudiengangOption?.bezeichnung]);
+			
+			const href = `mailto:${emails}?subject=${subject}`;
+			
+			window.location.href = href
+		},
+		sammelMailBetreuer() {
+			const recipientList = [];
+			this.selectedData.forEach(row => {
+				if (row.betreuer_mail) recipientList.push(row.betreuer_mail);
+				if (row.zweitbetreuer_mail) recipientList.push(row.zweitbetreuer_mail);
+			});
+
+			// actually not necessary for email clients but looks better for assistenz if we avoid duplicates here
+			const uniqueRecipients = [...new Set(recipientList)];
+
+			const subject = this.$p.t('abgabetool/c4sammelmailBetreuerBetreff', [this.selectedStudiengangOption?.bezeichnung]);
+			const href = `mailto:${uniqueRecipients.join(',')}?subject=${encodeURIComponent(subject)}`;
+
+			window.location.href = href;
+		},
 		selectHandler(e, cell) {
 			const row = cell.getRow();
 
@@ -620,9 +648,8 @@ export const AbgabetoolAssistenz = {
 
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
 				
-				this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
 				this.$refs.abgabeTable.tabulator.setData(mappedData)
-				
+				this.$refs.abgabeTable.tabulator.redraw(true)
 			}).finally(()=>{
 				this.saving = false
 			})
@@ -867,8 +894,8 @@ export const AbgabetoolAssistenz = {
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
 		},
-		buildMailToLink(abgabe) {
-			return 'mailto:' + abgabe.student_uid +'@'+ this.domain
+		buildMailToLink(projekt) {
+			return 'mailto:' + projekt.student_uid +'@'+ this.domain
 		},
 		buildPKZ(projekt) {
 			return `${projekt.student_uid} / ${projekt.matrikelnr}`
@@ -941,6 +968,29 @@ export const AbgabetoolAssistenz = {
 			this.calcMaxTableHeight()
 		}
 	},
+	computed: {
+		uniqueBetreuerEmailCount() {
+			const emails = new Set();
+			
+			this.selectedData.forEach(row => {
+				if (row.betreuer_mail) emails.add(row.betreuer_mail);
+				if (row.zweitbetreuer_mail) emails.add(row.zweitbetreuer_mail);
+			});
+
+			return emails.size;
+		},
+		uniqueStudentEmailCount() {
+			const emails = new Set();
+
+			this.selectedData.forEach(row => {
+				if (row.student_uid) {
+					emails.add(row.student_uid); // actually dont need domain for this
+				}
+			});
+
+			return emails.size;
+		}
+	},
 	watch: {
 		'serienTermin.bezeichnung'(newVal) {
 			if(newVal?.paabgabetyp_kurzbz === 'qualgate1' || newVal?.paabgabetyp_kurzbz === 'qualgate2') {
@@ -987,6 +1037,8 @@ export const AbgabetoolAssistenz = {
 					const res = results[0].value;
 					this.turnitin_link = res.data?.turnitin_link;
 					this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link;
+					this.ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT = res.data?.ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT;
+					this.ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER = res.data?.ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER;
 				}
 
 				// 2. Studiengänge
@@ -1292,6 +1344,16 @@ export const AbgabetoolAssistenz = {
 				:useSelectionSpan="false"
 			>
 				<template #actions>
+					<button v-if="ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT"
+						role="button" class="btn btn-secondary ml-2"
+						@click="sammelMailStudent">
+						{{ $p.t('abgabetool/c4sendEmailStudierendev2', [uniqueStudentEmailCount]) }} 
+					</button>
+					<button v-if="ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER" 
+						role="button" class="btn btn-secondary ml-2"
+						@click="sammelMailBetreuer">
+						{{ $p.t('abgabetool/c4sendEmailBetreuerv2', [uniqueBetreuerEmailCount]) }}
+					</button>
 					<Dropdown
 						@change="semesterChanged" 
 						:placeholder="$capitalize($p.t('lehre/studiensemester'))" 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d8eac236d..45e977987 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -45510,18 +45510,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4sendEmailStudierende',
+		'phrase' => 'c4sendEmailStudierendev2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Email an Studierende schicken',
+				'text' => 'Email an {0} Studierende schicken',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Send Email to students',
+				'text' => 'Send Email to {0} students',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45530,18 +45530,58 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4sendEmailBetreuer',
+		'phrase' => 'c4sammelmailStudentBetreff',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Email an Betreuende schicken',
+				'text' => 'Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Send Email to assessors',
+				'text' => "Supervision of Bachelor's thesis or Master's thesis for degree program {0}",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sendEmailBetreuerv2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email an {0} Betreuende schicken',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Send Email to {0} assessors',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sammelmailBetreuerBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Supervision of Bachelor's thesis or Master's thesis for degree program {0}",
 				'description' => '',
 				'insertvon' => 'system'
 			)

From d17206fe40db3074ac38ef9eeea3c647ca66aa9d Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Tue, 10 Feb 2026 11:51:02 +0100
Subject: [PATCH 1181/1357] Admin-Seite: Padding bei Vorschau; Login Bugfix
 Fallback STG-Name

---
 cis/testtool/admin/index.php | 8 ++++----
 cis/testtool/login.php       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
index 4f010784f..f8e8d36ed 100644
--- a/cis/testtool/admin/index.php
+++ b/cis/testtool/admin/index.php
@@ -1172,8 +1172,8 @@ if ($frage_id != '')
 	echo "</td></tr>";
 	//Vorschau fuer das Text-Feld
 	echo "<tr><td style='width: 50%'>Vorschau:<br />
-			<div id='vorschau_frage' style='border: 1px solid black' align='center'>$frage->text</div></td>
-			<td style='width: 50%'>Derzeit:<br /><div id='aktuell' style='border: 1px solid black' align='center'>$frage->text</div>
+			<div id='vorschau_frage' style='border: 1px solid black; padding: 5px' align='center'>$frage->text</div></td>
+			<td style='width: 50%'>Derzeit:<br /><div id='aktuell' style='border: 1px solid black; padding: 5px' align='center'>$frage->text</div>
 			</td></tr>";
 	echo "</table>";
 	echo '</td><td style="border-left: 1px solid black" valign="top">';
@@ -1280,8 +1280,8 @@ if ($frage_id != '')
 	echo "/></td></tr>";
 	echo "<tr><td colspan='2' align='right'><input type='submit' name='submitvorschlag' value='Speichern' />".($vorschlag_id != ''?"<input type='button' value='Abbrechen' onclick=\"document.location.href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;nummer=$nummer&amp;frage_id=$frage->frage_id'\" />":'')."</td></tr>";
 	//Vorschau fuer das Text-Feld
-	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau_vorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div>
-			Derzeit:<br /><div id='aktuellvorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div></td></tr>";
+	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau_vorschlag' style='border: 1px solid black; padding: 5px' align='center'>$vorschlag->text</div>
+			Derzeit:<br /><div id='aktuellvorschlag' style='border: 1px solid black; padding: 5px' align='center'>$vorschlag->text</div></td></tr>";
 	echo "</table>";
 	echo "</form>";
 	echo '</td></tr></table>';
diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index d028a41ff..182506ac3 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -665,10 +665,11 @@ elseif (isset($prestudent_id))
 	else
 	{
 		// Letzten Status für des Prestudenten einholen
-		$ps_master = new Prestudent();
+		$ps_master = new Prestudent($prestudent_id);
 		$ps_master->getLastStatus($prestudent_id);
 		$sto = new Studienordnung();
 		$sto->getStudienordnungFromStudienplan($ps_master->studienplan_id);
+		$stg = new Studiengang($ps_master->studiengang_kz);
 		// Name des Studiengangs aus Studienordnung laden, ansonsten Fallback auf Studiengang
 		$stg_name = $sto->studiengangbezeichnung;
 		$stg_name_eng = $sto->studiengangbezeichnung_englisch;

From 609e2260571772c5283fd4a6c4c839ec943241fc Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 10 Feb 2026 14:25:45 +0100
Subject: [PATCH 1182/1357] place email buttons inside a tiered menu (dropdown
 for some) to save space in the ui;

---
 application/views/Cis/Abgabetool.php          |  1 +
 .../views/CisRouterView/CisRouterView.php     |  1 +
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 41 ++++++++++++++-----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/application/views/Cis/Abgabetool.php b/application/views/Cis/Abgabetool.php
index 480116290..86e8721f2 100644
--- a/application/views/Cis/Abgabetool.php
+++ b/application/views/Cis/Abgabetool.php
@@ -27,6 +27,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 1b3e767b2..6ff428362 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -35,6 +35,7 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/timeline/timeline.min.js',
 		'vendor/npm-asset/primevue/inplace/inplace.min.js',
 		'vendor/npm-asset/primevue/message/message.min.js',
+		'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 20333ba41..0a4028a27 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -30,6 +30,7 @@ export const AbgabetoolAssistenz = {
 		Inplace: primevue.inplace,
 		Textarea: primevue.textarea,
 		Timeline: primevue.timeline,
+		TieredMenu: primevue.tieredmenu,
 		VueDatePicker,
 		FhcOverlay
 	},
@@ -969,6 +970,25 @@ export const AbgabetoolAssistenz = {
 		}
 	},
 	computed: {
+		emailItems() {
+			const menu = []
+			
+			if(this.ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT){
+				menu.push({
+					label: this.$p.t('abgabetool/c4sendEmailStudierendev2', [this.uniqueStudentEmailCount]),
+					command: this.sammelMailStudent
+				})
+			}
+			
+			if(this.ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER) {
+				menu.push({
+					label: this.$p.t('abgabetool/c4sendEmailBetreuerv2', [this.uniqueBetreuerEmailCount]),
+					command: this.sammelMailBetreuer
+				})
+			}
+
+			return menu
+		},
 		uniqueBetreuerEmailCount() {
 			const emails = new Set();
 			
@@ -1344,16 +1364,6 @@ export const AbgabetoolAssistenz = {
 				:useSelectionSpan="false"
 			>
 				<template #actions>
-					<button v-if="ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT"
-						role="button" class="btn btn-secondary ml-2"
-						@click="sammelMailStudent">
-						{{ $p.t('abgabetool/c4sendEmailStudierendev2', [uniqueStudentEmailCount]) }} 
-					</button>
-					<button v-if="ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER" 
-						role="button" class="btn btn-secondary ml-2"
-						@click="sammelMailBetreuer">
-						{{ $p.t('abgabetool/c4sendEmailBetreuerv2', [uniqueBetreuerEmailCount]) }}
-					</button>
 					<Dropdown
 						@change="semesterChanged" 
 						:placeholder="$capitalize($p.t('lehre/studiensemester'))" 
@@ -1366,6 +1376,17 @@ export const AbgabetoolAssistenz = {
 							<div>{{ option.studiensemester_kurzbz }}</div>
 						</template>
 					</Dropdown>
+					
+					<button 
+						v-if="emailItems.length"
+						role="button"
+						@click="evt => $refs.menu.toggle(evt)"
+						class="btn btn-outline-secondary dropdown-toggle"
+						aria-haspopup="true"
+					>
+						<i class="fa fa-envelope"></i>
+					</button>
+					<tiered-menu ref="menu" :model="emailItems" popup/>
 				</template>
 			</core-filter-cmpt>
 		</div>

From 67838eb630cc10968c3e3bedb3695574af3dd2ad Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 11 Feb 2026 13:39:23 +0100
Subject: [PATCH 1183/1357] load projektarbeit.note correctly for mitarbeiter;
 evaluate projektarbeit termin editability correctly and define a notenarray
 which does NOT count (currently "Nicht beurteilt" & "Noch nicht
 eingetragen"). such rules apply for betreuer, assistenz is allowed to do
 whatever they want since we never defined an actual business process anywhere
 and people do whatever they want anyways

---
 application/config/abgabe.php                 |  4 +++-
 .../controllers/api/frontend/v1/Abgabe.php    |  5 +++-
 .../models/education/Projektarbeit_model.php  |  2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 23 +++++++++++++++----
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  6 +++++
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 16 ++++++++++++-
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 5cf3042ed..f806e1ef8 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -26,7 +26,9 @@ $config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ'] = ['end'];
 $config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT'] = ['qualgate1', 'qualgate2', 'zwischen', 'note', 'abstract', 'end', 'enda'];
 //$config['ALLOWED_NOTEN_ABGABETOOL'] = ['Bestanden', 'Nicht bestanden'];
 $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
-
+// benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
+// wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
+$config['NONFINAL_NOTEN_ABGABETOOL'] = [7, 9];
 $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';
diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index c8f48b9df..b37c64713 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -801,7 +801,10 @@ class Abgabe extends FHCAPI_Controller
 
 		$allowed_noten_abgabetool = $this->config->item('ALLOWED_NOTEN_ABGABETOOL');
 
-		$this->terminateWithSuccess(array($noten, $allowed_noten_abgabetool));
+		$nonfinal_noten_abgabetool = $this->config->item('NONFINAL_NOTEN_ABGABETOOL');
+
+
+		$this->terminateWithSuccess(array($noten, $allowed_noten_abgabetool, $nonfinal_noten_abgabetool));
 	}
 
 	/**
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index e2d4d1b70..5e453056d 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -299,7 +299,7 @@ class Projektarbeit_model extends DB_Model
 					*
 				FROM
 					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
-							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
 							tbl_projektbetreuer.person_id as betreuer_person_id, tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
 							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid
 					 FROM lehre.tbl_projektarbeit
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 35633321d..42952d0df 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -21,6 +21,7 @@ export const AbgabeMitarbeiterDetail = {
 		'abgabeTypeOptions',
 		'abgabetypenBetreuer',
 		'allowedNotenOptions',
+		'notenOptionsNonFinal',
 		'turnitin_link',
 		'old_abgabe_beurteilung_link'
 	],
@@ -48,7 +49,7 @@ export const AbgabeMitarbeiterDetail = {
 				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
 				icon: "fa fa-plus",
 				command: this.openCreateNewAbgabeModal,
-				disabled: Vue.computed(() => this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter')
+				disabled: Vue.computed(() => !this.getAllowedToCreateNewTermin)
 			},
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
@@ -478,6 +479,21 @@ export const AbgabeMitarbeiterDetail = {
 			
 	},
 	computed: {
+		getAllowedToCreateNewTermin() {
+			if(this.assistenzMode) return true
+			if(this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter') return false
+			if(this.projektarbeit?.note !== undefined && this.projektarbeit.note !== null) {
+				// check if the note is not defined as a non final projektarbeit note
+				const opt = this.notenOptionsNonFinal.find(opt => opt.note)
+				// if thats the case allow further work
+				if(opt) return true
+				// else the PA is to be considered finished
+				return false
+			}
+			
+			// normally should be allowed if no rules apply
+			return true
+		},
 		allowedToSaveZusatzdaten() {
 				return this.form.schlagwoerter.length > 0 && this.form.schlagwoerter_en.length > 0 && this.form.abstract.length > 0 && this.form.abstract_en.length > 0 && this.form.seitenanzahl > 0
 		},
@@ -755,9 +771,8 @@ export const AbgabeMitarbeiterDetail = {
 		</div>
 		<div class="row" style="margin-bottom: 12px;">
 			<div class="col-auto">
-<!--				TODO: tooltip why this button is disabled as zweitbegutachter-->
-<!--				TODO: fix bug where this button is sometimes correctly disabled, sometimes just wrong when betreuer is both first and second assesor-->
-				<button type="button" :disabled="projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter'" class="btn btn-primary" @click="openCreateNewAbgabeModal">
+<!--				TODO: tooltip why this button is disabled-->
+				<button type="button" :disabled="!getAllowedToCreateNewTermin" class="btn btn-primary" @click="openCreateNewAbgabeModal">
 					<i class="fa-solid fa-plus"></i>
 					{{$capitalize( $p.t('abgabetool/c4newAbgabetermin') )}}
 				</button>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 0a4028a27..7fa78f7d1 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -38,6 +38,7 @@ export const AbgabetoolAssistenz = {
 		return {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
 			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
+			notenOptionsNonFinal: Vue.computed(() => this.notenOptionsNonFinal),
 			turnitin_link: Vue.computed(() => this.turnitin_link),
 			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link),
 			abgabetypenBetreuer: Vue.computed(() => this.abgabeTypeOptions)
@@ -86,6 +87,7 @@ export const AbgabetoolAssistenz = {
 			notenOptions: null,
 			allowedNotenFilterOptions: null,
 			allowedNotenOptions: null,
+			notenOptionsNonFinal: null,
 			serienTermin: Vue.reactive({
 				datum: new Date(),
 				bezeichnung: {
@@ -1089,6 +1091,10 @@ export const AbgabetoolAssistenz = {
 						this.allowedNotenOptions = this.notenOptions.filter(
 							opt => res.data[1].includes(opt.note)
 						);
+
+						this.notenOptionsNonFinal = this.notenOptions.filter(
+							opt => res.data[2].includes(opt.note)
+						)
 					}
 
 					this.allowedNotenFilterOptions = [
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index df521d52d..67e1d09af 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -22,6 +22,7 @@ export const AbgabetoolMitarbeiter = {
 			abgabeTypeOptions: Vue.computed(() => this.abgabeTypeOptions),
 			abgabetypenBetreuer: Vue.computed(() => this.abgabetypenBetreuer),
 			allowedNotenOptions: Vue.computed(() => this.allowedNotenOptions),
+			notenOptionsNonFinal: Vue.computed(() => this.notenOptionsNonFinal),
 			turnitin_link: Vue.computed(() => this.turnitin_link),
 			old_abgabe_beurteilung_link: Vue.computed(() => this.old_abgabe_beurteilung_link)
 		}
@@ -50,6 +51,7 @@ export const AbgabetoolMitarbeiter = {
 			abgabeTypeOptions: null,
 			notenOptions: null,
 			allowedNotenOptions: null,
+			notenOptionsNonFinal: null,
 			serienTermin: Vue.reactive({
 				datum: new Date(),
 				bezeichnung: {
@@ -301,7 +303,15 @@ export const AbgabetoolMitarbeiter = {
 				pa.abgabetermine = res.data[0].retval
 				pa.isCurrent = res.data[1]
 
-				const paIsBenotet = pa.note !== null
+				let paIsBenotet = false
+				if(pa.note !== undefined && pa !== null) {
+					// check if the note is not defined as a non final projektarbeit note
+					const opt = this.notenOptionsNonFinal.find(opt => opt.note)
+					// if thats the case allow further work
+					if(opt) paIsBenotet = false
+					// else the PA is to be considered finished
+					paIsBenotet = true
+				}
 
 				pa.abgabetermine.forEach(termin => {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
@@ -471,6 +481,10 @@ export const AbgabetoolMitarbeiter = {
 				this.allowedNotenOptions = this.notenOptions.filter(
 					opt => res.data[1].includes(opt.note)
 				)
+				
+				this.notenOptionsNonFinal = this.notenOptions.filter(
+					opt => res.data[2].includes(opt.note)
+				)
 			}
 			
 		}).catch(e => {

From 136d6f9f286c3d231560e9005c724cb528087544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 11 Feb 2026 16:08:15 +0100
Subject: [PATCH 1184/1357] =?UTF-8?q?Fix=20von=20BFI=20=C3=BCbernommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/anwesenheit.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/anwesenheit.class.php b/include/anwesenheit.class.php
index f601d6b95..9493a3d4b 100644
--- a/include/anwesenheit.class.php
+++ b/include/anwesenheit.class.php
@@ -489,7 +489,7 @@ class anwesenheit extends basis_db
 					gesamt AS gesamtstunden, 
 					anwesend, 
 					nichtanwesend, 
-					trunc(100-(nichtanwesend/gesamt)*100,2) AS prozent
+					CASE WHEN gesamt = 0 THEN 100.00 ELSE trunc(100-(nichtanwesend/(gesamt))*100,2) END AS prozent
 
 				FROM(
 					SELECT 
@@ -499,9 +499,10 @@ class anwesenheit extends basis_db
 					lehrveranstaltung_id, 
 					bezeichnung, 
 					student_uid, 
-					COUNT(stundenplan_id) AS gesamt, 
-					CASE WHEN anwesend.summe IS NULL THEN 0 ELSE anwesend.summe END AS anwesend, 
-					CASE WHEN nichtanwesend.summe IS NULL THEN 0 ELSE nichtanwesend.summe END AS nichtanwesend
+					--COUNT(stundenplan_id) AS gesamts, 
+					COALESCE(anwesend.summe, 0) + COALESCE(nichtanwesend.summe, 0) AS gesamt,
+					COALESCE(anwesend.summe, 0) AS anwesend, 
+					COALESCE(nichtanwesend.summe, 0) AS nichtanwesend
 					
 					FROM
 					(

From 3465e299f7ec81bd373d9806d14c31e1a437d19f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 12 Feb 2026 08:16:31 +0100
Subject: [PATCH 1185/1357] tag - helper and formatter

---
 public/js/helpers/TagHelper.js                | 124 ++++++++++++++++++
 .../tabulator/filters/extendedHeaderFilter.js |   2 +-
 public/js/tabulator/formatter/tags.js         |  67 ++++++++++
 3 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 public/js/helpers/TagHelper.js
 create mode 100644 public/js/tabulator/formatter/tags.js

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/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
index 7bf86c119..35b66dc1c 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(' ');
 	}
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 0a97e5781ec21c60241cca768b46d06bd8a0e2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 12 Feb 2026 11:02:16 +0100
Subject: [PATCH 1186/1357] Nicht beurteilt aus Default Config entfernt

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

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index f806e1ef8..82782b043 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -28,7 +28,7 @@ $config['RELEVANT_PAABGABETYPEN_SAMMELMAIL_STUDENT'] = ['qualgate1', 'qualgate2'
 $config['ALLOWED_NOTEN_ABGABETOOL'] = [10, 14]; // tbl_note pk
 // benotete projektarbeiten sperren weitere terminanlage & bearbeitung, diese noten sind ausnahmen dieser Regel
 // wie zB "Nicht beurteilt" & "Noch nicht eingetragen"
-$config['NONFINAL_NOTEN_ABGABETOOL'] = [7, 9];
+$config['NONFINAL_NOTEN_ABGABETOOL'] = [9];
 $config['beurteilung_link_fallback'] = 'addons/fhtw/content/projektbeurteilung/projektbeurteilungDocumentExport.php?projektarbeit_id=?&betreuerart_kurzbz=?&person_id=?';
 
 $config['PROJEKTARBEITSBEURTEILUNG_MAIL_BASELINK_ERSTBEGUTACHTER'] = 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter';

From ed170645df97af47d341db6f132f220f5240c829 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Feb 2026 11:27:50 +0100
Subject: [PATCH 1187/1357] use plsql function public.get_rolle_prestudent
 instead of local sql

---
 .../api/frontend/v1/stv/Student.php           | 11 +++-------
 .../api/frontend/v1/stv/Students.php          | 22 +++++--------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 943577bb3..2721bbd6f 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -136,14 +136,9 @@ class Student extends FHCAPI_Controller
 			);
 		}
 		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
 		);
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 9dbea65f2..acacca052 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -801,14 +801,9 @@ class Students extends FHCAPI_Controller
 
 		//add status per semester
 		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
 		);
 
 		$this->addSelectPrioRel();
@@ -897,14 +892,9 @@ class Students extends FHCAPI_Controller
 
 		//add status per semester
 		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
+			"public.get_rolle_prestudent(public.tbl_prestudent.prestudent_id, "
+				. $this->PrestudentModel->escape($studiensemester_kurzbz)
+				. ")  AS statusofsemester"
 		);
 
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');

From e016deb04276b598f4319774feb549debcd70eb4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Feb 2026 13:14:23 +0100
Subject: [PATCH 1188/1357] add more space between download and delete button

---
 public/js/components/Form/Upload/Dms/Item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Form/Upload/Dms/Item.js b/public/js/components/Form/Upload/Dms/Item.js
index 45c60419e..cc8db7827 100644
--- a/public/js/components/Form/Upload/Dms/Item.js
+++ b/public/js/components/Form/Upload/Dms/Item.js
@@ -27,7 +27,7 @@ export default {
 	<li class="form-upload-dms-item">
 		<span class="col-auto"><i class="fa fa-file me-1"></i></span>
 		<span class="col">{{ modelValue.name }}</span>
-		<a v-if="preview" :href="preview" target="_blank" class="col-auto btn btn-outline-secondary btn-p-0 me-1">
+		<a v-if="preview" :href="preview" target="_blank" class="col-auto btn btn-outline-secondary btn-p-0 me-2">
 			<i class="fa fa-download"></i>
 		</a>
 		<button class="col-auto btn btn-outline-secondary btn-p-0" @click="$emit('delete')">

From 8f62d0d3519171c9abaebafd2a7f832aaa90a587 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Feb 2026 13:20:54 +0100
Subject: [PATCH 1189/1357] use correct category for phrase notiz_edit

---
 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 39f0e507e..5d88805c9 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -154,7 +154,7 @@ export default {
 
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
-							button.title = this.$p.t('ui', 'notiz_edit');
+							button.title = this.$p.t('notiz', 'notiz_edit');
 							button.innerHTML = '<i class="fa fa-edit"></i>';
 							button.addEventListener(
 								'click',

From fa807f37ae6ced7b082ddf68e92f2e7035d3e205 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Feb 2026 14:47:07 +0100
Subject: [PATCH 1190/1357] gehaltsbestandteil chart data: spezialfall neuer
 Gehaltsbestandteil und sofort valorisiert

---
 .../vertragsbestandteil/Gehaltsbestandteil_model.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php b/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
index c50627697..2669105a1 100644
--- a/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Gehaltsbestandteil_model.php
@@ -286,7 +286,13 @@ EOSQL;
 			foreach( $rows as $row ) {
 				$tmpgb = new Gehaltsbestandteil();
 				$tmpgb->hydrateByStdClass($row, true);
-				
+
+				if ($row->betrag_valorisiert != null && $row->valorisierungsdatum != null 
+					&& $row->valorisierungsdatum == $row->von) {
+					// neuer Gehaltsbestandteil mit Valorisierungsdatum aber auch valorisiert
+					$tmpgb->setGrundbetrag($row->betrag_valorisiert);
+				}
+
 				// prevent duplication (caused by the join with historic values)
 				if (!isset($lastRecords[(string)$row->gehaltsbestandteil_id])) {
 					$gehaltsbestandteile[] = $tmpgb;

From aec0e5227f88bb02561e1616324a533f611bbdd7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Feb 2026 15:09:51 +0100
Subject: [PATCH 1191/1357] get selection after reload of added or updated
 contract, remove selection, stati and details after delete

---
 public/js/components/Vertraege/Vertraege.js | 90 ++++++++++-----------
 1 file changed, 42 insertions(+), 48 deletions(-)

diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 5868cc540..f980d8117 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -45,11 +45,9 @@ export default {
 	computed: {
 		appRoot() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
-		}
-	},
-	data() {
-		return {
-			tabulatorOptions: {
+		},
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					this.endpoint.getAllVertraege(this.person_id)
@@ -141,15 +139,17 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-20250905'
-			},
-			tabulatorEvents: [
+				persistenceID: 'core-contracts-20260212',
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
 
 						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
-
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -174,9 +174,9 @@ export default {
 						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
 						setHeader('isabgerechnet', this.$p.t('vertrag', 'abgerechnet'));
 						setHeader('actions', this.$p.t('global', 'aktionen'));
-/*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
+						/*						cm.getColumnByField('actions').component.updateDefinition({
+													title: this.$p.t('global', 'aktionen')
+												});*/
 					}
 				},
 				{
@@ -193,7 +193,24 @@ export default {
 						}
 					}
 				},
-			],
+				{
+					event: "dataProcessed",
+					handler: () => {
+						if (this.pendingSelectId) {
+							// delete old Selection
+							this.$refs.table.tabulator.deselectRow();
+							// select new Selection
+							this.$refs.table.tabulator.selectRow(this.pendingSelectId);
+							this.pendingSelectId = null;
+						}
+					}
+				},
+			];
+			return events;
+		},
+	},
+	data() {
+		return {
 			statusNew: true,
 			formData: {	},
 			listContractsUnassigned: [],
@@ -210,6 +227,7 @@ export default {
 			isFilterSet: false,
 			clickedRows: [],
 			arraySelectedContracts: [],
+			pendingSelectId: null
 		}
 	},
 	watch: {
@@ -244,6 +262,7 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					//window.scrollTo(0, 0);
 					this.reload();
+					this.contractSelected.vertrag_id = null;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -259,41 +278,24 @@ export default {
 				.call(this.endpoint.addNewContract(dataToSend))
 				.then(response => {
 					//get new ID of request to focus the new entry
-					let vertrag_id = response.data;
+					this.pendingSelectId = response.data;
 
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractModal.hide();
 					this.resetModal();
-					this.$refs.contractdetails.reload();
-					this.$refs.unassignedLehrauftraege.reloadUnassigned();
+
+					//for getting correct responding Details and Stati of Contract
+					this.contractSelected.vertrag_id = this.pendingSelectId;
+					if(this.$refs.contractdetails)
+						this.$refs.contractdetails.reload();
+
+					if(this.$refs.unassignedLehrauftraege)
+						this.$refs.unassignedLehrauftraege.reloadUnassigned();
 
 					this.reload();
-					//TODO(Manu) Finish Selection of current dataset
-/*					this.reload().then(() => {
-						this.selectRow(vertrag_id);
-					})*/
-
-
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-/*		async selectRow(vertrag_id){
-			console.log("in selectRow " + vertrag_id);
-			//if (!this.table) return;
-
-			if (!this.$refs.table) return;
-
-			//this.table.selectRow(this.$refs.table.tabulator.getRows()[0]);
-
-			this.$refs.table.tabulator.selectRow(vertrag_id);
-		//	this.$refs.table.tabulator.selectRow("visible");
-			console.log("Vertrag_id" + vertrag_id);
-
-			//console.log(this.$refs.table.tabulator.getRow(vertrag_id));
-			//this.table.selectRow(vertrag_id);
-
-		//	this.$refs.table.selectRow(vertrag_id);
-		},*/
 		updateContract(vertrag_id) {
 			this.$refs.unassignedLehrauftraege.emitSaveEvent();
 
@@ -307,20 +309,12 @@ export default {
 				.call(this.endpoint.updateContract(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-					//TODO(Manu) get Id from dataToSend
-					let vertrag_id = response.data;
-					console.log(vertrag_id);
+					this.pendingSelectId = response.data;
 					this.$refs.contractModal.hide();
 					this.resetModal();
 					this.$refs.unassignedLehrauftraege.reloadUnassigned();
 					this.$refs.contractdetails.reload();
 					this.reload();
-					//TODO(Manu) Finish Selection of current dataset
-					/*					this.reload().then(() => {
-											this.selectRow(vertrag_id);
-										})*/
-
-					//this.selectRow(vertrag_id);
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From 664b0a81bbd57550ba16fdff5308461323eda5fc Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Feb 2026 15:52:11 +0100
Subject: [PATCH 1192/1357] use vilesci base url in combinePeople component

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
index 81c1a6860..c17c7aebc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/CombinePeople.js
@@ -40,7 +40,7 @@ export default {
 				return this.$fhcAlert.alertError(this.$p.t('stv', 'error_combinePeople_samePerson'));
 			}
 
-			let linkCombinePeople = this.cisRoot + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
+			let linkCombinePeople = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'vilesci/stammdaten/personen_wartung.php?person_id_1=' + person1_id + '&person_id_2='+ person2_id;
 			this.openLink(linkCombinePeople);
 		},
 		openLink(url) {

From 5c1e967d5e680a43fd17343031d9d5c761b4fc13 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Feb 2026 16:05:02 +0100
Subject: [PATCH 1193/1357] dont reset z-index on opening tiered menu (email
 button) by setting its autoZIndex property to false

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

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 7fa78f7d1..c0c8d7ba8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1392,7 +1392,7 @@ export const AbgabetoolAssistenz = {
 					>
 						<i class="fa fa-envelope"></i>
 					</button>
-					<tiered-menu ref="menu" :model="emailItems" popup/>
+					<tiered-menu ref="menu" :model="emailItems" popup :autoZIndex="false" />
 				</template>
 			</core-filter-cmpt>
 		</div>

From 043b1bcf114047eb39ece39ad801a3fbe330b4d7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Feb 2026 17:38:00 +0100
Subject: [PATCH 1194/1357] extracted email split method from stv/kontakt
 component to helperfile; adjusted that method to take subject param & make
 phrasen/alert call via parameter reference;

---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 19 +++----
 .../Details/Kontaktieren.js                   | 49 ++-----------------
 public/js/helpers/EmailHelpers.js             | 45 +++++++++++++++++
 3 files changed, 56 insertions(+), 57 deletions(-)
 create mode 100644 public/js/helpers/EmailHelpers.js

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index c0c8d7ba8..a7da9da5a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -7,6 +7,7 @@ import ApiAbgabe from '../../../api/factory/abgabe.js'
 import ApiStudiensemester from '../../../api/factory/studiensemester.js';
 import AbgabeterminStatusLegende from "./StatusLegende.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
+import { splitMailsHelper } from "../../../helpers/EmailHelpers.js"
 
 // spoofed date testing
 // const todayISO = '2025-08-08'
@@ -226,18 +227,17 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
-		sammelMailStudent() {
+		sammelMailStudent(param) {
+			
 			const emails = this.selectedData
 				.map(row => `${row.student_uid}@${this.domain}`)
 				.join(',');
-			
+			const uniqueRecipients = [...new Set(emails)];
 			const subject = this.$p.t('abgabetool/c4sammelmailStudentBetreff', [this.selectedStudiengangOption?.bezeichnung]);
-			
-			const href = `mailto:${emails}?subject=${subject}`;
-			
-			window.location.href = href
+			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
 		},
-		sammelMailBetreuer() {
+		sammelMailBetreuer(param) {
+			
 			const recipientList = [];
 			this.selectedData.forEach(row => {
 				if (row.betreuer_mail) recipientList.push(row.betreuer_mail);
@@ -246,11 +246,8 @@ export const AbgabetoolAssistenz = {
 
 			// actually not necessary for email clients but looks better for assistenz if we avoid duplicates here
 			const uniqueRecipients = [...new Set(recipientList)];
-
 			const subject = this.$p.t('abgabetool/c4sammelmailBetreuerBetreff', [this.selectedStudiengangOption?.bezeichnung]);
-			const href = `mailto:${uniqueRecipients.join(',')}?subject=${encodeURIComponent(subject)}`;
-
-			window.location.href = href;
+			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
 		},
 		selectHandler(e, cell) {
 			const row = cell.getRow();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
index bd7554a47..43995b918 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
@@ -1,3 +1,4 @@
+import { splitMailsHelper } from "../../../../helpers/EmailHelpers.js"
 export default {
 	name: "Kontaktieren",
 	computed: {
@@ -22,60 +23,16 @@ export default {
 	},
 
 	methods: {
-		async splitMails(mails, event) {
-			let splititem = ",";
-			let maillist = mails.join(splititem);
-			let mailto = "";
-
-			if (maillist.length > 2024)
-			{
-				if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'zuvieleEMails') }) === false)
-					return;
-			}
-
-			let firstrun = true;
-			let useBcc = event?.ctrlKey || event?.metaKey;
-			while (maillist.length > 0)
-			{
-				if (maillist.length > 2024)
-				{
-					let splitposition = maillist.lastIndexOf(splititem, 1900);
-					mailto = maillist.substring(0, splitposition);
-					maillist = maillist.substring(splitposition + 1);
-				}
-				else
-				{
-					mailto = maillist;
-					maillist = "";
-				}
-
-				let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
-
-				if (firstrun)
-				{
-					window.location.href = mailLink;
-					firstrun = false;
-				}
-				else
-				{
-					if (await this.$fhcAlert.confirm({message: this.$p.t('stv', 'weitereEMail')}) === true)
-					{
-						window.location.href = mailLink;
-					}
-				}
-
-			}
-		},
 		internMail(event) {
 			if (this.internMails.length)
 			{
-				this.splitMails(this.internMails, event);
+				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
 			}
 		},
 		privateMail(event) {
 			if (this.privateMails.length)
 			{
-				this.splitMails(this.privateMails, event);
+				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
 			}
 		}
 	},
diff --git a/public/js/helpers/EmailHelpers.js b/public/js/helpers/EmailHelpers.js
new file mode 100644
index 000000000..87daa828a
--- /dev/null
+++ b/public/js/helpers/EmailHelpers.js
@@ -0,0 +1,45 @@
+export async function splitMailsHelper(mails, event, subject, alertPluginRef, phrasenPluginRef) {
+	let splititem = ",";
+	let maillist = mails.join(splititem);
+	let mailto = "";
+	// take subject line length + '?subject=' length into account
+	const subjectlength = subject && typeof subject === 'string' ? subject.length + 9 : 0 
+	if (maillist.length > 2024)
+	{
+		if (await alertPluginRef.confirm({message: phrasenPluginRef.t('stv', 'zuvieleEMails') }) === false)
+			return;
+	}
+
+	let firstrun = true;
+	let useBcc = event?.ctrlKey || event?.metaKey;
+	while (maillist.length > 0)
+	{
+		if (maillist.length + subjectlength > 2024)
+		{
+			let splitposition = maillist.lastIndexOf(splititem, 1900);
+			mailto = maillist.substring(0, splitposition);
+			maillist = maillist.substring(splitposition + 1);
+		}
+		else
+		{
+			mailto = maillist;
+			maillist = "";
+		}
+
+		let mailLink = useBcc ? `mailto:?bcc=${mailto}` : `mailto:${mailto}`;
+		if(subject && typeof subject === 'string') mailLink += `?subject=${subject}`
+		if (firstrun)
+		{
+			window.location.href = mailLink;
+			firstrun = false;
+		}
+		else
+		{
+			if (await alertPluginRef.confirm({message: phrasenPluginRef.t('stv', 'weitereEMail')}) === true)
+			{
+				window.location.href = mailLink;
+			}
+		}
+
+	}
+}
\ No newline at end of file

From 34b00f8dd6a7aed998a4959886ddddfa9c61ca78 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 12 Feb 2026 21:44:12 +0100
Subject: [PATCH 1195/1357] cis/public/coodle.php now produces the correct
 ORGANIZER:MAILTO:

---
 cis/public/coodle.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/public/coodle.php b/cis/public/coodle.php
index 2b8421db0..05eaa41df 100644
--- a/cis/public/coodle.php
+++ b/cis/public/coodle.php
@@ -1041,7 +1041,7 @@ function sendEmail($coodle_id)
 			."END:STANDARD\r\n"
 			."END:VTIMEZONE\r\n"
 			."BEGIN:VEVENT\r\n"
-			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN)."\r\n"
+			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN).">\r\n"
 			.rtrim($teilnehmer)."\r\n"
 			."DTSTART;TZID=Europe/Vienna:".$dtstart."\r\n"
 			."DTEND;TZID=Europe/Vienna:".$dtend."\r\n"

From fd35d20955e4ccbd66a335c2b49f60a09fe7f99c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 13 Feb 2026 09:24:36 +0100
Subject: [PATCH 1196/1357] refactor VV: change handling of selections, allow
 only strg for multiselect in vetraegen and for adding unassignedVertraege

---
 .../components/Vertraege/List/Unassigned.js   | 84 ++++++++++++----
 public/js/components/Vertraege/Vertraege.js   | 96 ++++++++++++++-----
 2 files changed, 136 insertions(+), 44 deletions(-)

diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 1ea7d9b3b..d0ed49f49 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -57,9 +57,11 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: 200,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
+				selectableRowsRollingSelection: false, //only allow multiselect with STRG
+				index: "lehreinheit_id",
 				persistenceID: 'core-contracts-unassigned'
 			},
 			tabulatorEvents: [
@@ -67,7 +69,9 @@ export default {
 					event: 'rowClick',
 					handler: (e, row) => {
 						const data = row.getData();
-						this.toggleRowClick(data);
+
+						//this.toggleRowClick(e, data);
+						this.toggleSelect(e, data);
 					}
 				},
 				{
@@ -125,18 +129,18 @@ export default {
 		}
 	},
 	watch: {
-		//TODO(Manu) check if still working
+		//TODO(Manu) check
 		person_id() {
 			this.$refs.table.reloadTable();
 			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
 		},
-		clickedRows() {
+/*		clickedRows() {
 			this.$refs.table.reloadTable();
 			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
-		},
+		},*/
 	},
 	methods: {
-		toggleRowClick(rowData){
+/*		toggleRowClick(rowData){
 			// check row
 			const exists = this.clickedRows.some(row => JSON.stringify(row) === JSON.stringify(rowData));
 
@@ -147,10 +151,48 @@ export default {
 			} else {
 				this.clickedRows.push(rowData);
 				this.sumBetragLehrauftraege += Number(rowData.betrag1);
-				//console.log(rowData.betrag1);
 				this.handleSumUp();
 			}
 
+		},*/
+		toggleSelect(event, rowData) {
+
+			const isCtrlPressed = event.ctrlKey;
+
+			if (!isCtrlPressed) {
+
+				const isSameSingleSelection =
+					this.clickedRows.length === 1 &&
+					this.clickedRows[0].lehreinheit_id === rowData.lehreinheit_id;
+
+				if (isSameSingleSelection) {
+					this.clickedRows = [];
+					this.sumBetragLehrauftraege = 0;
+				} else {
+					this.clickedRows = [rowData];
+					this.sumBetragLehrauftraege = Number(rowData.betrag1);
+				}
+			}
+
+			// Multiselect
+			else {
+
+				const exists = this.clickedRows.some(
+					row => row.lehreinheit_id === rowData.lehreinheit_id
+				);
+
+				if (exists) {
+					this.clickedRows = this.clickedRows.filter(
+						row => row.lehreinheit_id !== rowData.lehreinheit_id
+					);
+					this.sumBetragLehrauftraege -= Number(rowData.betrag1);
+				} else {
+					this.clickedRows.push(rowData);
+					this.sumBetragLehrauftraege += Number(rowData.betrag1);
+				}
+			}
+
+			this.handleSumUp();
 		},
 		emitSaveEvent() {
 			this.$emit('saveClickedRows', this.clickedRows);
@@ -164,6 +206,21 @@ export default {
 			this.$emit("sum-updated", this.sumBetragLehrauftraege);
 		},
 	},
+	/*
+			<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
+
+		<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
+			<div class="col-md-6">
+			  <input
+				class="form-control"
+				type="text"
+				:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
+				aria-label="readonly input example"
+				readonly
+			  >
+			</div>
+		</div>
+	 */
 	template: `
 	<div class="core-contracts-unassigned h-50 d-flex flex-column w-100">
 		<p v-if="totalRows > 0">{{$p.t('vertrag', 'text_explainLehrauftrag')}}</p>
@@ -176,18 +233,5 @@ export default {
 			>
 		</core-filter-cmpt>
 		
-		<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
-		  
-		<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
-			<div class="col-md-6">
-			  <input
-				class="form-control"
-				type="text"
-				:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
-				aria-label="readonly input example"
-				readonly
-			  >
-			</div>
-		</div>
 	</div>`
 }
\ No newline at end of file
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index f980d8117..1f891ae8a 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -132,6 +132,7 @@ export default {
 				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
+				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "vertrag_id",
 				persistence: {
 					sort: true,
@@ -179,7 +180,7 @@ export default {
 												});*/
 					}
 				},
-				{
+/*				{
 					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
 					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
 					event: 'rowClick',
@@ -192,6 +193,16 @@ export default {
 							this.toggleRowClick(selectedContract, status, bezeichnung);
 						}
 					}
+				},*/
+				{
+					event: 'rowClick',
+					handler: (e, row) => {
+						if (!this.dataPrintHonorar?.multiselect) return;
+
+						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
+
+						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+					}
 				},
 				{
 					event: "dataProcessed",
@@ -234,6 +245,8 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
+/*			if(this.dataPrintHonorar?.multiselect)
+				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -350,11 +363,12 @@ export default {
 			return this.$refs.contractstati.$refs.statusData
 				.call(this.endpoint.insertContractStatus(params))
 				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
-					//this.reload(); //focus get lost with reload
+					this.pendingSelectId = params.vertrag_id;
+					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -395,7 +409,8 @@ export default {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.contractstati.closeModal();
 					this.$refs.contractstati.reload();
-					//this.reload(); //focus gets lost with reload
+					this.pendingSelectId = params.vertrag_id;
+					this.reload();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
@@ -489,7 +504,7 @@ export default {
 			}
 
 			//check if status=="Genehmigt"
-			const statusNotGenehmigtExists = this.arraySelectedContracts.some(([_, status]) => status !== 'Genehmigt');
+			const statusNotGenehmigtExists = this.arraySelectedContracts.some(v => v.status !== 'Genehmigt');
 			if(statusNotGenehmigtExists) {
 				this.$fhcAlert.alertError(this.$p.t('vertrag', 'alertOnlyApprovedContracts'));
 				return;
@@ -499,14 +514,14 @@ export default {
 			let vertragString = '';
 
 			this.arraySelectedContracts.forEach(element => {
-				vertragString += '&vertrag_id[]=' + element[0].toString();
+				vertragString += '&vertrag_id[]=' + element.vertrag_id.toString();
 			});
 
 			let linkToPdf = this.dataPrintHonorar.link +
 					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
 			window.open(linkToPdf, '_blank');
 		},
-		toggleRowClick(contractId, status, bezeichnung) {
+/*		toggleRowClick(contractId, status, bezeichnung) {
 			const index = this.arraySelectedContracts.findIndex(
 				([id]) => id === contractId
 			);
@@ -515,10 +530,41 @@ export default {
 			} else {
 				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
 			}
+		},*/
+		toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
+			if (!this.dataPrintHonorar?.multiselect) return;
+
+			const isCtrl = event.ctrlKey || event.metaKey;
+
+			const entry = {
+				vertrag_id,
+				status,
+				bezeichnung,
+				vertragstyp_bezeichnung
+			};
+
+			// Single click
+			if (!isCtrl) {
+				this.arraySelectedContracts = [entry];
+				return;
+			}
+
+			// CTRL / CMD → toggle
+			const index = this.arraySelectedContracts.findIndex(
+				e => e.vertrag_id === vertrag_id
+			);
+
+			if (index === -1) {
+				this.arraySelectedContracts.push(entry);
+				//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
+			} else {
+				this.arraySelectedContracts.splice(index, 1);
+			}
 		},
-		clearSelection(){
+/*		clearSelection(){
 			this.arraySelectedContracts = [];
-		}
+			this.$refs.table.tabulator.deselectRow();
+		}*/
 	},
 	created() {
 		Promise.all([
@@ -544,33 +590,28 @@ export default {
 		});
 		this.getFormattedDate();
 	},
-	template: `
-	<div class="core-contracts h-100 d-flex flex-column">
+	/*
+		   <template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
 
-		<!--	injected print functionality for KU Linz (printHonorarvertrag)  -->
-	   <template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
-
-		   <div v-for="item in arraySelectedContracts" :key="item[0]">
+			<div v-for="item in arraySelectedContracts" :key="item.vertrag_id">
 			  <input
 				class="form-control"
 				type="text"
-				:value="item[2] + ' | ' + item[1] + ' (ID: ' + item[0] + ')'"
+				:value="item.vertragstyp_bezeichnung + ' | ' + item.bezeichnung + ' | ' + item.status + ' (ID: ' + item.vertrag_id + ')'"
 				aria-label="readonly input example"
 				readonly
 			  >
 			</div>
 		</template>
 
-		<template v-if="arraySelectedContracts.length >= 2" class="d-flex">
-			<div class="ms-auto mt-2">
-				<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
-				<button :disabled="!this.hasSchreibrechte" type="button" class="btn btn-primary" @click="printContract()">{{$p.t('vertrag', 'printHonorarvertrag')}}</button>
-			</div>
-		</template>
+		{{arraySelectedContracts}} || {{dataPrintHonorar}}
 
-	<hr>
+							<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
+	 */
+	template: `
+	<div class="core-contracts h-100 d-flex flex-column">
 
-<!--	filter: open means no status abgerechnet yet-->
+		<!--	filter: open means no status abgerechnet yet-->
 		<div class="justify-content-end pb-3">
 			<form-input
 				container-class="form-switch"
@@ -593,6 +634,13 @@ export default {
 			:new-btn-label="this.$p.t('ui', 'vertrag')"
 			@click:new="actionNewContract"
 			>
+
+			<!-- injected print functionality for KU Linz (printHonorarvertrag)  -->
+			<template #actions v-if="arraySelectedContracts.length >= 2">
+				<div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
+					<button :disabled="!this.hasSchreibrechte" type="button" class="btn btn-secondary" @click="printContract()">{{$p.t('vertrag', 'printHonorarvertrag')}}</button>
+				</div>
+			</template>
 		</core-filter-cmpt>
 
 		<div class="row">

From d9d15c1ed3d5b61bd06e296485885f4d97c24b32 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 13 Feb 2026 11:10:16 +0100
Subject: [PATCH 1197/1357] neue tag farben

---
 public/css/tags.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/css/tags.css b/public/css/tags.css
index 9e0d7ee4b..e92f415b2 100644
--- a/public/css/tags.css
+++ b/public/css/tags.css
@@ -51,6 +51,14 @@
 	background-color: #6d4c41;
 }
 
+.tag_dark_grey {
+	background-color: #595959;
+}
+
+.tag_light_grey {
+	background-color: #9a9a9a;
+}
+
 .tag_blau {
 	background-color: #508498;
 }

From 632866c8c420b9adab3305e73fe6f64410b32932 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 13 Feb 2026 13:45:12 +0100
Subject: [PATCH 1198/1357] reset newTermin object when switching projektarbeit
 so they are assigned to the correct student

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js  | 18 ++++++++++++++++++
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js    |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 42952d0df..b303a831e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -643,6 +643,24 @@ export const AbgabeMitarbeiterDetail = {
 		'projektarbeit'(newVal) {
 			// set invertedFixtermin field for UI/UX purposes -> avoid double negation in text
 			
+			// reset newTermin object
+			const typ = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === 'zwischen')
+			this.newTermin = {
+				'paabgabe_id': -1,
+				'projektarbeit_id': newVal.projektarbeit_id,
+				'fixtermin': false,
+				'invertedFixtermin': true,
+				'kurzbz': '',
+				'datum': new Date().toISOString().split('T')[0],
+				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
+				'beurteilungsnotiz': '',
+				'upload_allowed': typ.upload_allowed_default,
+				'paabgabetyp_kurzbz': '',
+				'bezeichnung': typ,
+				'abgabedatum': null,
+				'insertvon': this.viewData?.uid ?? ''
+			}
+			
 			newVal?.abgabetermine?.forEach(termin => termin.invertedFixtermin = !termin.fixtermin)
 			
 			// default select german if projektarbeit sprache was null
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 67e1d09af..ff414ee10 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -333,7 +333,6 @@ export const AbgabetoolMitarbeiter = {
 				pa.student = `${pa.vorname} ${pa.nachname}`
 				
 				this.selectedProjektarbeit = pa
-				
 				this.$refs.modalContainerAbgabeDetail.show()
 			
 			}).finally(()=>{this.loading = false})

From 60294dd8f2591031fe5b90b67a9e43a89d977ab0 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 16 Feb 2026 03:22:39 +0100
Subject: [PATCH 1199/1357] paBenotet evaluation fix

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

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index ff414ee10..f33333ea3 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -304,7 +304,7 @@ export const AbgabetoolMitarbeiter = {
 				pa.isCurrent = res.data[1]
 
 				let paIsBenotet = false
-				if(pa.note !== undefined && pa !== null) {
+				if(pa.note !== undefined && pa.note !== null) {
 					// check if the note is not defined as a non final projektarbeit note
 					const opt = this.notenOptionsNonFinal.find(opt => opt.note)
 					// if thats the case allow further work

From 3831f3c1d781ae1d9477e215d52a0006bba7b014 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 16 Feb 2026 03:41:30 +0100
Subject: [PATCH 1200/1357] consistent use of
 :optionDisabled="getOptionDisabled" for paabgabetyp dropdowns in assistenz
 view

---
 .../components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js  | 1 +
 .../js/components/Cis/Abgabetool/AbgabetoolAssistenz.js   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index b303a831e..971783746 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -729,6 +729,7 @@ export const AbgabeMitarbeiterDetail = {
 							v-model="newTermin.bezeichnung"
 							:options="getAllowedAbgabeTypeOptions"
 							:optionLabel="getOptionLabelAbgabetyp"
+							:optionDisabled="getOptionDisabled"
 							scrollHeight="300px">
 						</Dropdown>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index a7da9da5a..34ddd3fc2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -966,7 +966,10 @@ export const AbgabetoolAssistenz = {
 			// this.loadProjektarbeiten()
 
 			this.calcMaxTableHeight()
-		}
+		},
+		getOptionDisabled(option) {
+			return !option.aktiv
+		},
 	},
 	computed: {
 		emailItems() {
@@ -1176,7 +1179,8 @@ export const AbgabetoolAssistenz = {
 							:style="{'width': '100%'}"
 							v-model="serienTermin.bezeichnung"
 							:options="abgabeTypeOptions"
-							:optionLabel="getOptionLabelAbgabetyp">
+							:optionLabel="getOptionLabelAbgabetyp"
+							:optionDisabled="getOptionDisabled">
 						</Dropdown>
 					</div>
 				</div>

From 9d789d9a9708599a33bbce4e6f499df0080e147c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Feb 2026 10:37:15 +0100
Subject: [PATCH 1201/1357] Tab Messages: remove unused computed statusText

---
 .../js/components/Messages/Details/TableMessages.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 6e7ea7af0..861965900 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -128,7 +128,7 @@ export default {
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				layout: 'fitDataStretchFrozen',
 				index: 'message_id',
-				persistenceID: 'core-message-2025112401',
+				persistenceID: 'core-message-20260216',
 				selectableRows: 1,
 				selectableRowsRangeMode: 'click',
 				columns: [
@@ -178,9 +178,6 @@ export default {
 							"archived",
 							"deleted"
 						],
-/*						formatter: (cell, formatterParams) => {
-							return formatterParams[cell.getValue()];
-						},*/
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
 							return this.$p.t('messages', key);
@@ -332,14 +329,6 @@ export default {
 			];
 			return events;
 		},
-		statusText(){
-			return {
-				0: this.$p.t('messsages', 'unread'),
-				1: this.$p.t('messsages', 'read'),
-				2: this.$p.t('messsages', 'archived'),
-				3: this.$p.t('messsages', 'deleted')
-			}
-		},
 	},
 	mounted() {
 		// change to target="_blank"

From 5415180b2ce2b77d15918cefe436c1aa08f0c77d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Feb 2026 14:18:59 +0100
Subject: [PATCH 1202/1357] fetch count and paginated data in one query

---
 application/models/system/Message_model.php | 105 ++++++++++----------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index e0a185f9b..741c96ade 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -242,74 +242,71 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$sql_base = "
-			SELECT
+		$sql = <<<EOSQL
+			with filtered_messages as (
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					m.person_id = ? or mr.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+			), lastmsgstatus as (
+				select
+					ms.*
+				from (
+						select
+							s.message_id, s.person_id, MAX(s.insertamum) as lastinserted
+						from
+							public.tbl_msg_status s
+						group by
+							s.message_id, s.person_id
+					) ls
+				join
+					public.tbl_msg_status ms on ms.message_id = ls.message_id and ms.person_id = ls.person_id and ms.insertamum = ls.lastinserted
+			)
+
+			select
+				(select count(*) from filtered_messages) as total_msgs,
 				m.message_id AS message_id,
 				m.subject AS subject,
 				m.body AS body,
 				m.insertamum AS insertamum,
 				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_message m
-				 JOIN public.tbl_msg_recipient r USING(message_id)
-				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
-			WHERE m.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			UNION ALL
-			SELECT
-				m.message_id AS message_id,
-				m.subject AS subject,
-				m.body AS body,
-				m.insertamum AS insertamum,
-				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
-				m.person_id as sender_id,
-				r.person_id as recipient_id,
-				MAX(ss.status) as status,
-				MAX(ss.insertamum) as statusdatum
-			FROM public.tbl_msg_recipient r
-				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
-				 JOIN public.tbl_msg_message m USING(message_id)
-			WHERE r.person_id = ?
-			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-				 ";
-		$sql = "
-			SELECT COUNT(*) AS count FROM (
-				" . $sql_base . "
-			) a
-				 ";
-
-		$parametersArray = array($person_id, $person_id);
-
-		$count = $this->execQuery($sql, $parametersArray);
-
-		if (isError($count))
-			return $count;
-
-		$count = ceil(current(getData($count))->count/$limit);
-		$sql = "
-			SELECT * FROM (
-				" . $sql_base . "
-			) a
-			ORDER BY insertamum DESC
-			LIMIT ?
-			OFFSET ?
-				 ";
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = fm.sender_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = fm.recipient_id) as recipient,
+				fm.sender_id,
+				fm.recipient_id,
+				ms.status,
+				ms.insertamum as statusdatum
+			from
+				filtered_messages fm
+			join
+				public.tbl_msg_message m on fm.message_id = m.message_id
+			join
+				lastmsgstatus ms on fm.message_id = ms.message_id and fm.recipient_id = ms.person_id
+			order by
+				m.insertamum DESC
+			limit ?
+			offset ?;
+EOSQL;
 
 		$parametersArray = array($person_id, $person_id, $limit, $offset);
 
+		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
 
 		if (isError($data))
 			return $data;
 
 		$data = getData($data);
+		if($data)
+		{
+			$count = ceil($data[0]->total_msgs / $limit);
+		}
 
 		return success(['data' => $data, 'count' => $count]);
 	}

From 962cbf4e783958bf75822dbe988aba3097166f5f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Feb 2026 15:16:49 +0100
Subject: [PATCH 1203/1357] join person table for sender and recipient instead
 of using subselect

---
 application/models/system/Message_model.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 741c96ade..33e3d9649 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -276,8 +276,8 @@ class Message_model extends DB_Model
 				m.body AS body,
 				m.insertamum AS insertamum,
 				m.relationmessage_id AS relationmessage_id,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = fm.sender_id) as sender,
-				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = fm.recipient_id) as recipient,
+				(COALESCE(ps.titelpre,'') || ' ' || COALESCE(ps.vorname,'') || ' ' || COALESCE(ps.nachname,'') || ' ' || COALESCE(ps.titelpost,'')) as sender,
+				(COALESCE(pr.titelpre,'') || ' ' || COALESCE(pr.vorname,'') || ' ' || COALESCE(pr.nachname,'') || ' ' || COALESCE(pr.titelpost,'')) as recipient,
 				fm.sender_id,
 				fm.recipient_id,
 				ms.status,
@@ -288,6 +288,10 @@ class Message_model extends DB_Model
 				public.tbl_msg_message m on fm.message_id = m.message_id
 			join
 				lastmsgstatus ms on fm.message_id = ms.message_id and fm.recipient_id = ms.person_id
+			left join
+				public.tbl_person ps on ps.person_id = fm.sender_id
+			left join
+				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
 			limit ?

From 556683574c9d4d8a5d2c86f0cc92b9429e47479d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Feb 2026 15:44:01 +0100
Subject: [PATCH 1204/1357] Ignore typing inside editable elements for handling
 of keyboards event in function onKeydown

---
 public/js/components/Stv/Studentenverwaltung/List.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 26bfbcb2c..3a67df76c 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -4,7 +4,7 @@ import CoreTag from '../../Tag/Tag.js';
 import { tagHeaderFilter } from "../../../tabulator/filters/extendedHeaderFilter.js";
 import { addTagInTable, deleteTagInTable, updateTagInTable } from "../../../../js/helpers/TagHelper.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';
 
@@ -458,6 +458,14 @@ export default {
 			if (!this.focusObj)
 				return;
 
+			// Ignore typing inside editable elements
+			if (
+				e.target instanceof HTMLInputElement ||
+				e.target instanceof HTMLTextAreaElement ||
+				e.target.isContentEditable
+			)
+				return;
+
 			var next;
 			switch (e.code) {
 				case 'Enter':

From 0496eb7cc947c874281dad9b28df1db758734b70 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Feb 2026 15:56:40 +0100
Subject: [PATCH 1205/1357] use union instead of or to avoid parallel seq scan

---
 application/models/system/Message_model.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 33e3d9649..3a5579cc7 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -251,9 +251,23 @@ class Message_model extends DB_Model
 				join
 					public.tbl_msg_recipient mr on mr.message_id = m.message_id
 				where
-					m.person_id = ? or mr.person_id = ?
+					m.person_id = ?
 				group by
 					m.message_id, m.person_id, mr.person_id
+
+				union
+
+				select
+					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
+				from
+					public.tbl_msg_message m
+				join
+					public.tbl_msg_recipient mr on mr.message_id = m.message_id
+				where
+					mr.person_id = ?
+				group by
+					m.message_id, m.person_id, mr.person_id
+
 			), lastmsgstatus as (
 				select
 					ms.*

From ce27964df968a9d5f9a26529721debef077e3867 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Feb 2026 16:46:46 +0100
Subject: [PATCH 1206/1357] Detailheader VV and StudV: show - if no value for
 Tile

---
 .../Stv/Studentenverwaltung/Details.js        | 20 +++++++++++++++----
 .../Vertraege/Vertragsverwaltung.js           | 14 +++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 198f403ac..493806d0e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -39,7 +39,19 @@ export default {
 					return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid));
 			}
 			return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid && !value.showOnlyWithUid));
-		}
+		},
+		tile_PersId(){
+			let tile = this.students[0].person_id != null ? this.students[0].person_id : '-';
+			return tile;
+		},
+		tile_MatrNr(){
+			let tile = this.students[0].matr_nr != null ? this.students[0].matr_nr : '-';
+			return tile;
+		},
+		tile_PersKz(){
+			let tile = this.students[0].matrikelnr != null ? this.students[0].matrikelnr : '-';
+			return tile;
+		},
 	},
 	watch: {
 		'$p.user_language.value'(n, o) {
@@ -86,11 +98,11 @@ export default {
 				fotoEditable
 			>
 				<template #titleAlphaTile>PersID</template>
-				<template #valueAlphaTile>{{students[0].person_id}}</template>
+				<template #valueAlphaTile>{{tile_PersId}}</template>
 				<template #titleBetaTile>MatrNr</template>
-				<template #valueBetaTile>{{students[0].matr_nr}}</template>
+				<template #valueBetaTile>{{tile_MatrNr}}</template>
 				<template #titleGammaTile>PersKz</template>
-				<template #valueGammaTile>{{students[0].matrikelnr}}</template>
+				<template #valueGammaTile>{{tile_PersKz}}</template>
 			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index 754161d02..a3e52261a 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -32,6 +32,16 @@ export default {
 			endpoint: ApiCoreVertraege
 		}
 	},
+	computed: {
+		tile_MaUid(){
+			let tile = this.mitarbeiter_uid != null ? this.mitarbeiter_uid : '-';
+			return tile;
+		},
+		tile_PersId(){
+			let tile = this.person_id != null ? this.person_id : '-';
+			return tile;
+		},
+	},
 	methods: {
 		handleSelection(selection) {
 			this.mitarbeiter_uid = selection.uid;
@@ -64,9 +74,9 @@ export default {
 							fotoEditable
 							@redirectToLeitung="handleSelection"
 						>
-							<template #uid>{{mitarbeiter_uid}}</template>
+							<template #uid>{{tile_MaUid}}</template>
 							<template #titleAlphaTile>persID</template>
-							<template #valueAlphaTile>{{person_id}}</template>
+							<template #valueAlphaTile>{{tile_PersId}}</template>
 						</fhc-header>
 						<vertraege-mitarbeiter
 							ref="CoreTableVertraege"

From d9d3b1a24522670a3d8d9f536bec5cc7f89e2573 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 17 Feb 2026 07:58:03 +0100
Subject: [PATCH 1207/1357] VV: show Details und Status only if one Vertrag is
 selected

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

diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 1f891ae8a..2a7aeaad5 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -646,7 +646,7 @@ export default {
 		<div class="row">
 			<div class="col-sm-6">
 				<!-- ContractDetails -->
-				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null && arraySelectedContracts.length == 1">
 					<contract-details
 						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"
@@ -659,7 +659,7 @@ export default {
 			</div>
 			<div class="col-sm-6">
 				<!-- ContractStati -->
-				 <div class="md-4" v-if="contractSelected.vertrag_id !=null">
+				 <div class="md-4" v-if="contractSelected.vertrag_id !=null && arraySelectedContracts.length == 1">
 					<contract-stati
 						:person_id="person_id"
 						:vertrag_id="contractSelected.vertrag_id"

From e12b7e1ed55baf978d9911301e2561dc2769f1e1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Feb 2026 08:06:30 +0100
Subject: [PATCH 1208/1357] add indexes for person_id to table msg_message and
 msg_recipient, ensure tabulator data request is made before requests of
 create msg components

---
 application/models/system/Message_model.php   |  2 +-
 .../Messages/Details/TableMessages.js         |  1 +
 public/js/components/Messages/Messages.js     | 10 +++++--
 system/dbupdate_3.4.php                       |  1 +
 .../71645_studvw_messagetab_ladezeit.php      | 28 +++++++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 3a5579cc7..19129b606 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -255,7 +255,7 @@ class Message_model extends DB_Model
 				group by
 					m.message_id, m.person_id, mr.person_id
 
-				union
+				union all
 
 				select
 					m.message_id, m.person_id as sender_id, mr.person_id as recipient_id
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index a55ddec63..6a4cf5ca0 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -243,6 +243,7 @@ export default {
 						title: this.$p.t('global', 'aktionen')
 												});
 						*/
+						this.$emit('tabulator_tablebuilt');
 					}
 				},
 				{
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 1f9afcb9e..5e247ddb5 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -56,6 +56,7 @@ export default {
 	},
 	data() {
 		return {
+			tablebuilt: false,
 			isVisibleDiv: false,
 			messageId: null
 		}
@@ -139,8 +140,10 @@ export default {
 		},
 		resetMessageId(){
 			this.messageId = null;
+		},
+		tableBuilt: function() {
+			this.tablebuilt = true;
 		}
-
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
@@ -155,6 +158,7 @@ export default {
 		</form>
 
 		<message-modal
+			v-if="tablebuilt"
 			ref="modalMsg"
 			:type-id="typeId"
 			:id="id"
@@ -166,8 +170,9 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-show="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
+		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
+				v-if="tablebuilt"
 				ref="templateNewDivMessage"
 				:type-id="typeId"
 				:id="id"
@@ -187,6 +192,7 @@ export default {
 				:openMode="openMode"
 				@newMessage="handleMessage"		
 				@replyToMessage="handleMessage"
+				@tabulator_tablebuilt="tableBuilt"
 			>		
 			</table-messages>
 		</div>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 793930243..4ddb38203 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -91,6 +91,7 @@ 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');
+require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php b/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php
new file mode 100644
index 000000000..4ad88fba9
--- /dev/null
+++ b/system/dbupdate_3.4/71645_studvw_messagetab_ladezeit.php
@@ -0,0 +1,28 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_message_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_message_person_id ON public.tbl_msg_message USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_message_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_message_person_id angelegt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_msg_recipient_person_id'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_msg_recipient_person_id ON public.tbl_msg_recipient USING btree (person_id)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_msg_recipient_person_id: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_msg_recipient_person_id angelegt<br>';
+	}
+}

From 3d1aef617f109e048ceb53f0f6993ad8f1b0fce1 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Feb 2026 08:13:07 +0100
Subject: [PATCH 1209/1357] add phrase error.opproject_does_not_exists in
 category kvp

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5dc9bc1c0..deb856663 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19087,6 +19087,27 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'kvp',
+		'phrase' => 'error.opproject_does_not_exists',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Es ist kein Openproject Projekt verknüpft.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No Openproject project is linked.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+    //*******************	KVP end
 	array(
 		'app' => 'international',
 		'category' => 'international',

From 1c69f3f6543ffef67a8ca6125aaa18268242d947 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 17 Feb 2026 10:31:45 +0100
Subject: [PATCH 1210/1357] VV: refactor Modal, change height of Table
 Unassigned Contracts

---
 .../components/Vertraege/List/Unassigned.js   |  17 +-
 public/js/components/Vertraege/Vertraege.js   | 225 ++++++++++++------
 2 files changed, 149 insertions(+), 93 deletions(-)

diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index d0ed49f49..167befbf0 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -57,7 +57,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 200,
+				height: 150,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
@@ -206,21 +206,6 @@ export default {
 			this.$emit("sum-updated", this.sumBetragLehrauftraege);
 		},
 	},
-	/*
-			<p v-if="clickedRows.length > 0" >{{$p.t('vertrag', 'text_addLehrauftrag')}}</p>
-
-		<div v-for="item in clickedRows" :key="item.lehreinheit_id" class="row">
-			<div class="col-md-6">
-			  <input
-				class="form-control"
-				type="text"
-				:value="item.type + ' | ' + item.studiensemester_kurzbz + ' | ' + item.bezeichnung + ' ( lehreinheit_id: ' + item.lehreinheit_id + ')'"
-				aria-label="readonly input example"
-				readonly
-			  >
-			</div>
-		</div>
-	 */
 	template: `
 	<div class="core-contracts-unassigned h-50 d-flex flex-column w-100">
 		<p v-if="totalRows > 0">{{$p.t('vertrag', 'text_explainLehrauftrag')}}</p>
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 2a7aeaad5..08ee7376b 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -591,22 +591,85 @@ export default {
 		this.getFormattedDate();
 	},
 	/*
-		   <template v-if="arraySelectedContracts.length >= 2" class="container mt-2">
 
-			<div v-for="item in arraySelectedContracts" :key="item.vertrag_id">
-			  <input
-				class="form-control"
-				type="text"
-				:value="item.vertragstyp_bezeichnung + ' | ' + item.bezeichnung + ' | ' + item.status + ' (ID: ' + item.vertrag_id + ')'"
-				aria-label="readonly input example"
-				readonly
-			  >
-			</div>
-		</template>
+						<div class="row mb-3">
+							<form-input
+								type="DatePicker"
+								:label="$p.t('vertrag/datum_vertrag')"
+								name="vertragsdatum"
+								v-model="formData.vertragsdatum"
+								auto-apply
+								:enable-time-picker="false"
+								format="dd.MM.yyyy"
+								preview-format="dd.MM.yyyy"
+								:teleport="true"
+								>
+							</form-input>
+						</div>
 
-		{{arraySelectedContracts}} || {{dataPrintHonorar}}
-
-							<button type="button" class="btn btn-secondary mx-1" @click="clearSelection()"><i class="fa fa-trash"></i></button>
+						<div class="row mb-3">
+							<form-input
+								type="text"
+								:label="$p.t('ui/bezeichnung')"
+								name="bezeichnung"
+								v-model="formData.bezeichnung"
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								type="select"
+								:label="$p.t('global/typ')"
+								v-model="formData.vertragstyp_kurzbz"
+								name="vertragstyp_kurzbz"
+								>
+								<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+								<option
+									v-for="entry in listContractTypes"
+									:key="entry.vertragstyp_kurzbz"
+									:value="entry.vertragstyp_kurzbz"
+									>
+									{{entry.bezeichnung}}
+								</option>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								:label="$p.t('ui/betrag')"
+								name="betrag"
+								v-model="formData.betrag"
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3" v-if="!statusNew">
+							<form-input
+								type="text"
+								:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+								name="vertragsstunden"
+								v-model="formData.vertragsstunden"
+								disabled
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3" v-if="!statusNew">
+							<form-input
+								type="text"
+								:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+								name="vertragsstunden_studiensemester_kurzbz"
+								v-model="formData.vertragsstunden_studiensemester_kurzbz"
+								disabled
+								>
+							</form-input>
+						</div>
+						<div class="row mb-3">
+							<form-input
+								type="textarea"
+								:label="$p.t('global/anmerkung')"
+								name="anmerkung"
+								v-model="formData.anmerkung"
+								>
+							</form-input>
+						</div>
 	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
@@ -692,75 +755,82 @@ export default {
 						></list-unassigned>
 					<hr>
 					<core-form ref="contractData">
+
 						<div class="row mb-3">
-							<form-input
-								type="DatePicker"
-								:label="$p.t('vertrag/datum_vertrag')"
-								name="vertragsdatum"
-								v-model="formData.vertragsdatum"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
+							<div :class="statusNew ? 'col-6' : 'col-4'">
+								<form-input
+									type="DatePicker"
+									:label="$p.t('vertrag/datum_vertrag')"
+									name="vertragsdatum"
+									v-model="formData.vertragsdatum"
+									auto-apply
+									:enable-time-picker="false"
+									format="dd.MM.yyyy"
+									preview-format="dd.MM.yyyy"
+									:teleport="true"
+									>
+								</form-input>
+							</div>
+
+							<div :class="statusNew ? 'col-6' : 'col-4'">
+								<form-input
+									type="text"
+									:label="$p.t('ui/bezeichnung')"
+									name="bezeichnung"
+									v-model="formData.bezeichnung"
+									>
+								</form-input>
+							</div>
+							<div class="col-4" v-if="!statusNew">
+								<form-input
+									type="text"
+									:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+									name="vertragsstunden"
+									v-model="formData.vertragsstunden"
+									disabled
+									>
+								</form-input>
+							</div>
 						</div>
 
 						<div class="row mb-3">
-							<form-input
-								type="text"
-								:label="$p.t('ui/bezeichnung')"
-								name="bezeichnung"
-								v-model="formData.bezeichnung"
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								type="select"
-								:label="$p.t('global/typ')"
-								v-model="formData.vertragstyp_kurzbz"
-								name="vertragstyp_kurzbz"
-								>
-								<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-								<option
-									v-for="entry in listContractTypes"
-									:key="entry.vertragstyp_kurzbz"
-									:value="entry.vertragstyp_kurzbz"
+							<div :class="statusNew ? 'col-6' : 'col-4'">
+								<form-input
+									type="select"
+									:label="$p.t('global/typ')"
+									v-model="formData.vertragstyp_kurzbz"
+									name="vertragstyp_kurzbz"
 									>
-									{{entry.bezeichnung}}
-								</option>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								:label="$p.t('ui/betrag')"
-								name="betrag"
-								v-model="formData.betrag"
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3" v-if="!statusNew">
-							<form-input
-								type="text"
-								:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-								name="vertragsstunden"
-								v-model="formData.vertragsstunden"
-								disabled
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3" v-if="!statusNew">
-							<form-input
-								type="text"
-								:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-								name="vertragsstunden_studiensemester_kurzbz"
-								v-model="formData.vertragsstunden_studiensemester_kurzbz"
-								disabled
-								>
-							</form-input>
+									<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+									<option
+										v-for="entry in listContractTypes"
+										:key="entry.vertragstyp_kurzbz"
+										:value="entry.vertragstyp_kurzbz"
+										>
+										{{entry.bezeichnung}}
+									</option>
+								</form-input>
+							</div>
+							<div :class="statusNew ? 'col-6' : 'col-4'">
+								<form-input
+									:label="$p.t('ui/betrag')"
+									name="betrag"
+									v-model="formData.betrag"
+									>
+								</form-input>
+							</div>
+							<div class="col-4" v-if="!statusNew">
+								<form-input
+									type="text"
+									:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+									name="vertragsstunden_studiensemester_kurzbz"
+									v-model="formData.vertragsstunden_studiensemester_kurzbz"
+									disabled
+									>
+								</form-input>
+							</div>
 						</div>
+
 						<div class="row mb-3">
 							<form-input
 								type="textarea"
@@ -770,6 +840,7 @@ export default {
 								>
 							</form-input>
 						</div>
+
 					</core-form>
 
 				<template #footer>

From 5b34a226bdb3b5f95e98b01d50106671b3e4bd51 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Feb 2026 11:09:54 +0100
Subject: [PATCH 1211/1357] verbandsbaum nur toggeln und nicht automatisch
 selektieren

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

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index ac1950334..97b918011 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -3578,6 +3578,12 @@
   transition: box-shadow 0.15s;
   margin-right: 0.5rem;
 }
+
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler > svg,
+.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler > svg * {
+  pointer-events: none;
+}
+
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #495057;
   border-color: transparent;

From 2f51f18447a0634ddea49419e842e7243821c287 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Feb 2026 11:16:44 +0100
Subject: [PATCH 1212/1357] studierende in die gruppe ziehen ohne vorheriges
 selektieren

---
 .../Stv/Studentenverwaltung/List.js           | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 045326ae6..4b69b6571 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -128,6 +128,7 @@ export default {
 					if (row.getData().bnaktiv === false) {
 						row.getElement().classList.add('text-black','text-opacity-50','fst-italic');
 					}
+					row.getElement().draggable = true
 				},
 
 				ajaxRequestFunc: (url, config, params) => {
@@ -179,6 +180,10 @@ export default {
 				{
 					event: 'rowClick',
 					handler: this.handleRowClick // TODO(chris): this should be in the filter component
+				},
+				{
+					event: 'rowMouseDown',
+					handler: this.handleMouseDown
 				}
 			],
 			focusObj: null, // TODO(chris): this should be in the filter component
@@ -187,7 +192,8 @@ export default {
 			count: 0,
 			filteredcount: 0,
 			selectedcount: 0,
-			currentEndpoint: null
+			currentEndpoint: null,
+			dragSource: []
 		}
 	},
 	computed: {
@@ -203,7 +209,9 @@ export default {
 				+ ': <strong>' + (this.count || 0) + '</strong>';
 		},
 		selectedDragObject() {
-			return this.selected.map(item => {
+			let items = this.dragSource?.length ? this.dragSource : this.selected;
+
+			return items.map(item => {
 				let type, id;
 				if (item.uid) {
 					type = 'student';
@@ -328,15 +336,6 @@ export default {
 			this.selectedcount = data.length;
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
-
-			// set selected elements draggable
-			const tableEl = this.$refs.table?.$refs?.table;
-			if (tableEl) {
-				const oldDragables = tableEl.querySelectorAll('[draggable]');
-				for (const draggable of oldDragables)
-					draggable.removeAttribute('draggable');
-			}
-			rows.forEach(row => row.getElement().draggable = true);
 		},
 		autoSelectRows(data) {
 			if (this.lastSelected) {
@@ -404,6 +403,7 @@ export default {
 				this.$refs.table.tabulator.setData(endpoint.url, params, method);
 		},
 		dragCleanup(evt) {
+			this.dragSource = [];
 			if (evt.dataTransfer.dropEffect == 'none')
 				return; // aborted or wrong target
 			
@@ -471,7 +471,16 @@ export default {
 				if (el != this.focusObj)
 					this.changeFocus(this.focusObj, el);
 			}
-		}
+		},
+		handleMouseDown(e, row)
+		{
+			let data = row.getData();
+			let id = data.uid ?? data.prestudent_id ?? data.person_id;
+
+			const isAlreadySelected = this.selected?.some(row => (row.uid ?? row.prestudent_id ?? row.person_id) === id);
+
+			this.dragSource = (isAlreadySelected && this.selected?.length) ? this.selected : [data];
+		},
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features

From 4825c75b5d9e00c2504252bf34cf618811d9e497 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Feb 2026 12:11:37 +0100
Subject: [PATCH 1213/1357] revert changes made in commit
 b1a1cdf23550fc42337a944d4661f72d582b809d

---
 public/js/api/factory/studiengang.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/public/js/api/factory/studiengang.js b/public/js/api/factory/studiengang.js
index 12322cb3a..6d5ae15aa 100644
--- a/public/js/api/factory/studiengang.js
+++ b/public/js/api/factory/studiengang.js
@@ -16,10 +16,17 @@
  */
 
 export default {
-	getAllStudiensemesterAndAktOrNext() {
+	studiengangInformation() {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Studiensemester/getStudiengangInfo'
+			url: '/api/frontend/v1/Studgang/getStudiengangInfo'
 		};
 	},
+	getStudiengangByKz(studiengang_kz) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/organisation/StudiengangEP/getStudiengangByKz',
+			params: { studiengang_kz }
+		};
+	}
 };
\ No newline at end of file

From c58674d1333baf2bf981356924e054f85c424568 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 17 Feb 2026 15:15:30 +0100
Subject: [PATCH 1214/1357] Projektarbeiten cancelVertrag permission check
 bugfix (added array_column to get oes)

---
 application/controllers/api/frontend/v1/stv/Vertrag.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Vertrag.php b/application/controllers/api/frontend/v1/stv/Vertrag.php
index f94fe795e..c2b0f713c 100644
--- a/application/controllers/api/frontend/v1/stv/Vertrag.php
+++ b/application/controllers/api/frontend/v1/stv/Vertrag.php
@@ -76,9 +76,7 @@ class Vertrag extends FHCAPI_Controller
 
 		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
 
-		$allOe = hasData($allOe) ? getData($allOe) : [];
-
-		$this->addMeta('oe', $allOe);
+		$allOe = hasData($allOe) ? array_column(getData($allOe), 'oe_kurzbz') : [];
 
 		// * then check if the user has permissions to cancel the corresponding lv-organisational units
 		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&

From 5ffd22c1f7f869f2f43086a2b55d013806aeef99 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 17 Feb 2026 16:11:43 +0100
Subject: [PATCH 1215/1357] refactor last tabs from updateDefinition to
 setHeader variante

---
 .../Details/Mobility/List/Purpose.js          | 25 ++++---
 .../Details/Mobility/List/Support.js          | 19 +++--
 .../Details/Prestudent/MultiStatus.js         | 69 ++++++-------------
 .../Details/Projektarbeit/Projektarbeit.js    | 69 +++++++------------
 .../Details/Projektarbeit/Projektbetreuer.js  | 58 +++++++---------
 .../js/components/Vertraege/List/Details.js   | 57 +++++++--------
 public/js/components/Vertraege/List/Status.js | 53 ++++++--------
 .../components/Vertraege/List/Unassigned.js   | 58 +++++++---------
 .../components/Vertraege/MitarbeiterHeader.js | 52 +++++---------
 public/js/components/Vertraege/Vertraege.js   |  3 -
 10 files changed, 186 insertions(+), 277 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
index fa93fc256..66c09aab6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
@@ -83,17 +83,22 @@ export default {
 
 						await this.$p.loadCategory(['ui', 'global', 'mobility']);
 
-						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('ui', 'bezeichnung')
-						});
-						cm.getColumnByField('kurzbz').component.updateDefinition({
-							title: this.$p.t('mobility', 'kurzbz')
-						});
-/*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
+							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('ui', 'bezeichnung'));
+						setHeader('kurzbz', this.$p.t('mobility', 'kurzbz'));
+						//setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				}
 			],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
index 7da5b73e8..fe56c90ab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
@@ -81,14 +81,19 @@ export default {
 
 						await this.$p.loadCategory(['ui', 'global', 'mobility']);
 
-												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('ui', 'bezeichnung')
-												});
-						/*						cm.getColumnByField('actions').component.updateDefinition({
-													title: this.$p.t('global', 'aktionen')
-												});*/
+							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('ui', 'bezeichnung'));
 					}
 				}
 			],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index f001ee6b6..2053cc1f6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -221,56 +221,31 @@ export default{
 					handler: async () => {
 						await this.$p.loadCategory(['lehre','global','person','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('lehrverband').component.updateDefinition({
-							title: this.$p.t('lehre', 'lehrverband')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('bestaetigtam').component.updateDefinition({
-							title: this.$p.t('lehre', 'bestaetigt_am')
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
 
-						cm.getColumnByField('bewerbung_abgeschicktamum').component.updateDefinition({
-							title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
-						});
-
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('lehre', 'studienplan')
-						});
-
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
-
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('global', 'anmerkung')
-						});
-
-						cm.getColumnByField('bestaetigtvon').component.updateDefinition({
-							title: this.$p.t('lehre', 'bestaetigt_von')
-						});
-
-						cm.getColumnByField('insertamum').component.updateDefinition({
-							title: this.$p.t('lehre', 'insert_am')
-						});
-
-						cm.getColumnByField('insertvon').component.updateDefinition({
-							title: this.$p.t('lehre', 'insert_von')
-						});
-
-						cm.getColumnByField('prestudent_id').component.updateDefinition({
-							title: this.$p.t('ui', 'prestudent_id')
-						});
-
-						cm.getColumnByField('studienplan_id').component.updateDefinition({
-							title: this.$p.t('ui', 'studienplan_id')
-						});
-					}
+						setHeader('lehrverband', this.$p.t('lehre', 'lehrverband'));
+						setHeader('bestaetigtam', this.$p.t('lehre', 'bestaetigt_am'));
+						setHeader('bewerbung_abgeschicktamum', this.$p.t('lehre', 'bewerbung_abgeschickt_am'));
+						setHeader('bezeichnung', this.$p.t('lehre', 'studienplan'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
+						setHeader('datum', this.$p.t('global', 'datum'));
+						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
+						setHeader('bestaetigtvon', this.$p.t('lehre', 'bestaetigt_von'));
+						setHeader('insertamum', this.$p.t('lehre', 'insert_am'));
+						setHeader('insertvon', this.$p.t('lehre', 'insert_von'));
+						setHeader('prestudent_id', this.$p.t('ui', 'prestudent_id'));
+						setHeader('studienplan_id', this.$p.t('ui', 'studienplan_id'));					}
 				}
 			];
 			return events;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index b95efcc5f..6792920dd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -49,50 +49,33 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'lehre', 'stv', 'ui', 'projektarbeit']);
 
-						let cm = this.$refs.table.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('projekttyp_kurzbz').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'typ_kurzbz')
-						});
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'typ')
-						});
-						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});
-						cm.getColumnByField('titel').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'titel')
-						});
-						cm.getColumnByField('note').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'gesamtnote')
-						});
-						cm.getColumnByField('beginn').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'beginn')
-						});
-						cm.getColumnByField('ende').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'ende')
-						});
-						cm.getColumnByField('freigegeben').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'freigegeben')
-						});
-						cm.getColumnByField('gesperrtbis').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'gesperrtBis')
-						});
-						cm.getColumnByField('themenbereich').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'themenbereich')
-						});
-						cm.getColumnByField('anmerkung').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'anmerkung')
-						});
-						cm.getColumnByField('firma_id').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'firmaId')
-						});
-						cm.getColumnByField('abgabedatum').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'abgabeEndupload')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('projekttyp_kurzbz', this.$p.t('projektarbeit', 'typ_kurzbz'));
+						setHeader('bezeichnung', this.$p.t('projektarbeit', 'typ'));
+						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
+						setHeader('titel', this.$p.t('projektarbeit', 'titel'));
+						setHeader('note', this.$p.t('projektarbeit', 'gesamtnote'));
+						setHeader('beginn', this.$p.t('projektarbeit', 'beginn'));
+						setHeader('ende', this.$p.t('projektarbeit', 'ende'));
+						setHeader('freigegeben', this.$p.t('projektarbeit', 'freigegeben'));
+						setHeader('gesperrtbis', this.$p.t('projektarbeit', 'gesperrtBis'));
+						setHeader('themenbereich', this.$p.t('projektarbeit', 'themenbereich'));
+						setHeader('anmerkung', this.$p.t('projektarbeit', 'anmerkung'));
+						setHeader('firma_id', this.$p.t('projektarbeit', 'firmaId'));
+						setHeader('abgabedatum', this.$p.t('projektarbeit', 'abgabeEndupload'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				},
 			],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index b22f1a368..824e66d94 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -134,45 +134,33 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'lehre', 'stv', 'projektarbeit', 'ui']);
 
-						let cm = this.$refs.projektbetreuerTable.tabulator.columnManager;
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('nachname').component.updateDefinition({
-							title: this.$p.t('person', 'nachname')
-						});
-						cm.getColumnByField('vorname').component.updateDefinition({
-							title: this.$p.t('person', 'vorname')
-						});
-						cm.getColumnByField('note').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'note')
-						});
-						cm.getColumnByField('punkte').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'punkte')
-						});
-						cm.getColumnByField('stunden').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'stunden')
-						});
-						cm.getColumnByField('stundensatz').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'stundensatz')
-						});
-						cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'betreuerart_kurzbz')
-						});
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
-						cm.getColumnByField('vertrag_id').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'vertrag_id')
-						});
-						cm.getColumnByField('projektarbeit_id').component.updateDefinition({
-							title: this.$p.t('projektarbeit', 'projektarbeit_id')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'actions')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('nachname', this.$p.t('person', 'nachname'));
+						setHeader('vorname', this.$p.t('person', 'vorname'));
+						setHeader('note', this.$p.t('projektarbeit', 'note'));
+						setHeader('punkte', this.$p.t('projektarbeit', 'punkte'));
+						setHeader('stunden', this.$p.t('projektarbeit', 'stunden'));
+						setHeader('stundensatz', this.$p.t('projektarbeit', 'stundensatz'));
+						setHeader('betreuerart_kurzbz', this.$p.t('projektarbeit', 'betreuerart_kurzbz'));
+						setHeader('person_id', this.$p.t('person', 'person_id'));
+						setHeader('vertrag_id', this.$p.t('projektarbeit', 'vertrag_id'));
+						setHeader('projektarbeit_id', this.$p.t('projektarbeit', 'projektarbeit_id'));
+						setHeader('actions', this.$p.t('global', 'actions'));
 
 						// Force layout recalculation for handling overflow text
 						this.$refs.projektbetreuerTable.tabulator.redraw(true);
-
 					}
 				},
 				{
diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index c33407109..b7204a2f0 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -122,41 +122,30 @@ export default {
 
 						await this.$p.loadCategory(['ui', 'global', 'vertrag', 'projektarbeitsbeurteilung', '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('type').component.updateDefinition({
-							title: this.$p.t('global', 'typ')
-						});
-						cm.getColumnByField('bezeichnung').component.updateDefinition({
-							title: this.$p.t('ui', 'bezeichnung')
-						});
-						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'lehreinheit_id')
-						});
-						cm.getColumnByField('betrag').component.updateDefinition({
-							title: this.$p.t('ui', 'betrag')
-						});
-						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
-							title: this.$p.t('lehre', 'studiensemester')
-						});
-						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
-							title: this.$p.t('ui', 'mitarbeiter_uid')
-						});
-						cm.getColumnByField('projektarbeit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'projektarbeit_id')
-						});
-						cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
-							title: this.$p.t('projektarbeitsbeurteilung', 'betreuerart')
-						});
-						cm.getColumnByField('pruefung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'pruefung_id')
-						});
-						cm.getColumnByField('vertrag_id').component.updateDefinition({
-							title: this.$p.t('ui', 'vertrag_id')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('type', this.$p.t('global', 'typ'));
+						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
+						setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+						setHeader('betrag', this.$p.t('ui', 'betrag'));
+						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
+						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));
+						setHeader('projektarbeit_id', this.$p.t('ui', 'projektarbeit_id'));
+						setHeader('betreuerart_kurzbz', this.$p.t('projektarbeitsbeurteilung', 'betreuerart'));
+						setHeader('pruefung_id', this.$p.t('ui', 'pruefung_id'));
+						setHeader('vertrag_id', this.$p.t('ui', 'vertrag_id'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				}
 			],
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index ff729cfe7..bf1eb30ff 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -159,38 +159,29 @@ export default {
 
 						await this.$p.loadCategory(['ui', 'global', 'vertrag']);
 
-						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', 'status')
-						});
-						cm.getColumnByField('datum').component.updateDefinition({
-							title: this.$p.t('global', 'datum')
-						});
-						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
-							title: this.$p.t('person', 'uid')
-						});
-						cm.getColumnByField('vertrag_id').component.updateDefinition({
-							title: this.$p.t('ui', 'vertrag_id')
-						});
-						cm.getColumnByField('vertragsstatus_kurzbz').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragStatus')
-						});
-						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});
-						cm.getColumnByField('updatevon').component.updateDefinition({
-							title: this.$p.t('global', 'updatevon')
-						});
-						cm.getColumnByField('updateamum').component.updateDefinition({
-							title: this.$p.t('global', 'updateamum')
-						});
-						cm.getColumnByField('insertvon').component.updateDefinition({
-							title: this.$p.t('global', 'insertvon')
-						});
-						cm.getColumnByField('insertamum').component.updateDefinition({
-							title: this.$p.t('global', 'insertamum')
-						});
+							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', 'status'));
+						setHeader('datum', this.$p.t('global', 'datum'));
+						setHeader('mitarbeiter_uid', this.$p.t('person', 'uid'));
+						setHeader('vertrag_id', this.$p.t('ui', 'vertrag_id'));
+						setHeader('vertragsstatus_kurzbz', this.$p.t('vertrag', 'vertragStatus'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
+						setHeader('updatevon', this.$p.t('global', 'updatevon'));
+						setHeader('updateamum', this.$p.t('global', 'updateamum'));
+						setHeader('insertvon', this.$p.t('global', 'insertvon'));
+						setHeader('insertamum', this.$p.t('global', 'insertamum'));
 					}
 				}
 			],
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 167befbf0..9519aad3a 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -84,41 +84,31 @@ export default {
 					event: 'tableBuilt',
 					handler: () => {
 						this.$p.loadCategory(['ui', 'global', 'vertrag', 'projektarbeitsbeurteilung', 'lehre']).then(() => {
-							let cm = this.$refs.table.tabulator.columnManager;
 
-							cm.getColumnByField('type').component.updateDefinition({
-								title: this.$p.t('global', 'typ')
-							});
-							cm.getColumnByField('bezeichnung').component.updateDefinition({
-								title: this.$p.t('ui', 'bezeichnung')
-							});
-							cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-								title: this.$p.t('ui', 'lehreinheit_id')
-							});
-							cm.getColumnByField('betrag1').component.updateDefinition({
-								title: this.$p.t('ui', 'betrag')
-							});
-							cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
-								title: this.$p.t('lehre', 'studiensemester')
-							});
-							cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
-								title: this.$p.t('ui', 'mitarbeiter_uid')
-							});
-							cm.getColumnByField('projektarbeit_id').component.updateDefinition({
-								title: this.$p.t('ui', 'projektarbeit_id')
-							});
-							cm.getColumnByField('betreuerart_kurzbz').component.updateDefinition({
-								title: this.$p.t('projektarbeitsbeurteilung', 'betreuerart')
-							});
-							cm.getColumnByField('vertragsstunden').component.updateDefinition({
-								title: this.$p.t('vertrag', 'vertragsstunden')
-							});
-							cm.getColumnByField('vertrag_id').component.updateDefinition({
-								title: this.$p.t('ui', 'vertrag_id')
-							});
-							cm.getColumnByField('vertragsstunden_studiensemester_kurzbz').component.updateDefinition({
-								title: this.$p.t('vertrag', 'vertragsstunden_studiensemester')
-							});
+							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('type', this.$p.t('global', 'typ'));
+							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
+							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+							setHeader('betrag1', this.$p.t('ui', 'betrag'));
+							setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
+							setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));
+							setHeader('projektarbeit_id', this.$p.t('ui', 'projektarbeit_id'));
+							setHeader('betreuerart_kurzbz', this.$p.t('projektarbeitsbeurteilung', 'betreuerart'));
+							setHeader('vertragsstunden', this.$p.t('vertrag', 'vertragsstunden'));
+							setHeader('vertrag_id', this.$p.t('ui', 'vertrag_id'));
+							setHeader('vertragsstunden_studiensemester_kurzbz', this.$p.t('vertrag', 'vertragsstunden_studiensemester'));
 						});
 					}
 				}
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 9417942c8..2b6a9eacf 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -77,42 +77,28 @@ export default {
 					event: 'tableBuilt',
 					handler: async() => {
 						await this.$p.loadCategory(['person', 'global', 'vertrag']);
-						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('uid').component.updateDefinition({
-							visible: true
-						});
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
 
-						cm.getColumnByField('person_id').component.updateDefinition({
-							title: this.$p.t('person', 'person_id')
-						});
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
 
-						cm.getColumnByField('nachname').component.updateDefinition({
-							title: this.$p.t('person', 'nachname'),
-							visible: true
-						});
-						cm.getColumnByField('vorname').component.updateDefinition({
-							title: this.$p.t('person', 'vorname'),
-							visible: true
-						});
-						cm.getColumnByField('gebdatum').component.updateDefinition({
-							title: this.$p.t('person', 'geburtsdatum')
-						});
-						cm.getColumnByField('unternehmen').component.updateDefinition({
-							title: this.$p.t('person', 'firma')
-						});
-						cm.getColumnByField('vertragsarten').component.updateDefinition({
-							title: this.$p.t('vertrag', 'vertragsarten'),
-							visible: true
-						});
-						cm.getColumnByField('ids').component.updateDefinition({
-							title: this.$p.t('vertrag', 'idsDienstverhaeltnisse'),
-							visible: true
-						});
-						cm.getColumnByField('aktiv').component.updateDefinition({
-							title: this.$p.t('global', 'aktiv'),
-							width: 45
-						});
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('person_id', this.$p.t('person', 'person_id'));
+						setHeader('nachname', this.$p.t('person', 'nachname'));
+						setHeader('vorname', this.$p.t('person', 'vorname'));
+						setHeader('gebdatum', this.$p.t('person', 'geburtsdatum'));
+						setHeader('unternehmen', this.$p.t('person', 'firma'));
+						setHeader('vertragsarten', this.$p.t('vertrag', 'vertragsarten'));
+						setHeader('ids', this.$p.t('vertrag', 'idsDienstverhaeltnisse'));
+						setHeader('aktiv', this.$p.t('global', 'aktiv'));
 					}
 				},
 				{
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 08ee7376b..da8bf6bbb 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -175,9 +175,6 @@ export default {
 						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
 						setHeader('isabgerechnet', this.$p.t('vertrag', 'abgerechnet'));
 						setHeader('actions', this.$p.t('global', 'aktionen'));
-						/*						cm.getColumnByField('actions').component.updateDefinition({
-													title: this.$p.t('global', 'aktionen')
-												});*/
 					}
 				},
 /*				{

From ee7254a9642ca405502be1f19ad52b6f63a42078 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 17 Feb 2026 16:22:26 +0100
Subject: [PATCH 1216/1357] assistenz preserve table state (selection, scroll)
 when adding serientermin; update isPastDate() function to luxon timezone safe
 logic;

---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 53 ++++++++++++++++---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  4 +-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  4 +-
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 34ddd3fc2..e09171c25 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -212,7 +212,8 @@ export const AbgabetoolAssistenz = {
 			abgabeTableEventHandlers: [
 			{
 				event: "rowSelectionChanged",
-				handler: async(data) => {
+				handler: async(data) => 
+				{
 					this.selectedData.filter(sd => !data.includes(sd)).forEach(fsd => {
 						if(fsd.checkbox) fsd.checkbox.checked = false
 					})
@@ -220,7 +221,7 @@ export const AbgabetoolAssistenz = {
 					data.forEach(d => {
 						if(d.checkbox) d.checkbox.checked = true
 					})
-
+					
 					this.selectedData = data
 				}
 			}
@@ -612,6 +613,9 @@ export const AbgabetoolAssistenz = {
 		},
 		addSeries() {
 			const pids = this.selectedData?.map(projekt => projekt.projektarbeit_id)
+			
+			const preserveSelected = [...this.selectedData]
+			
 			this.saving = true
 			this.serienTermin.fixtermin = !this.serienTermin.invertedFixtermin
 			this.$api.call(ApiAbgabe.postSerientermin(
@@ -644,14 +648,27 @@ export const AbgabetoolAssistenz = {
 				})
 				
 				// reset selection to empty
-				this.$refs.abgabeTable.tabulator.deselectRow()
-
-				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+				// this.$refs.abgabeTable.tabulator.deselectRow()
+				const table = this.$refs.abgabeTable.tabulator;
+				const scrollX = table.rowManager.element.scrollLeft;
+				const scrollY = table.rowManager.element.scrollTop;
+				
+				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
+
+				table.setData(mappedData)
+				table.redraw(true)
+
+				
+				requestAnimationFrame(() => {
+					table.rowManager.element.scrollLeft = scrollX;
+					table.rowManager.element.scrollTop = scrollY;
+				});
+				
+				
 				
-				this.$refs.abgabeTable.tabulator.setData(mappedData)
-				this.$refs.abgabeTable.tabulator.redraw(true)
 			}).finally(()=>{
 				this.saving = false
+				this.selectedData = preserveSelected
 			})
 
 			this.$refs.modalContainerAddSeries.hide()
@@ -705,7 +722,9 @@ export const AbgabetoolAssistenz = {
 			return str
 		},
 		isPastDate(date) {
-			return new Date(date) < new Date(Date.now())
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
+			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
+			return nowInBerlin > deadline;
 		},
 		setDetailComponent(details){
 			
@@ -1034,6 +1053,24 @@ export const AbgabetoolAssistenz = {
 			if(this.notenOptionFilter !== null && this.selectedStudiengangOption !== null) {
 				this.loadProjektarbeiten()
 			}
+		},
+		selectedData(newVal) {
+			const table = this.$refs.abgabeTable?.tabulator
+			if(!table) return
+
+			const allRows = table.getRows();
+
+			newVal.forEach(selected => {
+				const row = allRows.find(r => {
+					const data = r.getData()
+					if (data.projektarbeit_id == selected.projektarbeit_id) return r
+				}) 	
+				
+				row.select()
+				const cb = row.getElement().children[0]?.children[0]?.children[0]
+				if(cb) cb.checked = true
+			})
+
 		}
 	},
 	created() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index f33333ea3..1b8eff3e2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -294,7 +294,9 @@ export const AbgabetoolMitarbeiter = {
 			return str
 		},
 		isPastDate(date) {
-			return new Date(date) < new Date(Date.now())
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
+			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
+			return nowInBerlin > deadline;
 		},
 		setDetailComponent(details){
 			this.loading=true
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index ff68b680f..d03ef3ffc 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -155,7 +155,9 @@ export const AbgabetoolStudent = {
 			return qgate1positiv && qgate2positiv
 		},
 		isPastDate(date) {
-			return new Date(date) < new Date(Date.now())	
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
+			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
+			return nowInBerlin > deadline;
 		},
 		setDetailComponent(details){
 			this.loading = true

From f860fd3dc70733e8bee5e45ed74b6121a2e5ec1b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 17 Feb 2026 16:46:22 +0100
Subject: [PATCH 1217/1357] Studvw: update persistance_id for all tabs

---
 .../Betriebsmittel/Betriebsmittel.js          |   2 +-
 public/js/components/Funktionen/Funktionen.js |   2 +-
 .../Messages/Details/TableMessages.js         |   2 +-
 .../Abschlusspruefung/Abschlusspruefung.js    |   2 +-
 .../Details/Anrechnungen/Anrechnungen.js      |   2 +-
 .../Stv/Studentenverwaltung/Details/Archiv.js |   2 +-
 .../Aufnahmetermine/Aufnahmetermine.js        |   2 +-
 .../Details/Dokumente/List/Accepted.js        |   2 +-
 .../Details/Dokumente/List/Unaccepted.js      |   2 +-
 .../Details/Groups/List.js                    |   2 +-
 .../Details/JointStudies/JointStudies.js      |   2 +-
 .../Details/Kontakt/Address.js                |   3 +-
 .../Details/Kontakt/Bankaccount.js            |   2 +-
 .../Details/Kontakt/Contact.js                |   2 +-
 .../Stv/Studentenverwaltung/Details/Konto.js  |   2 +-
 .../ListLehrveranstaltungstermine.js          |   2 +-
 .../Details/Mobility/List/Purpose.js          |   2 +-
 .../Details/Mobility/List/Support.js          |   2 +-
 .../Details/Mobility/Mobility.js              |   2 +-
 .../Details/Noten/Repeater.js                 |   2 +-
 .../Details/Noten/Teacher.js                  |   2 +-
 .../Details/Noten/Zeugnis.js                  |   2 +-
 .../Studentenverwaltung/Details/Notizen.js    |   2 +-
 .../Details/Prestudent/History.js             |   2 +-
 .../Details/Prestudent/MultiStatus.js         |   2 +-
 .../Details/Projektarbeit/Projektarbeit.js    |   2 +-
 .../Details/Projektarbeit/Projektbetreuer.js  |   2 +-
 .../Details/Pruefung/Pruefunglist.js          |   2 +-
 .../components/Vertraege/List/Unassigned.js   |  21 +--
 public/js/components/Vertraege/Vertraege.js   | 155 +++++++++---------
 30 files changed, 107 insertions(+), 126 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index dacee70c5..08d6a8947 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -63,7 +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',
+				persistenceID: 'core-betriebsmittel-20260217',
 				selectableRows: true,
 				columns: [
 					{title: "Nummer", field: "nummer", width: 150},
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 170747e5f..2c1bce445 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -71,7 +71,7 @@ export default {
 					ApiCoreFunktion.getAllUserFunctions(this.personUID)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-functions',
+				persistenceID: 'core-functions-20260217',
 				columns: [
 					{
 						title: "dienstverhaeltnis_unternehmen",
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 78acc5803..ef5247f57 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -128,7 +128,7 @@ export default {
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				layout: 'fitDataStretchFrozen',
 				index: 'message_id',
-				persistenceID: 'core-message-20260216',
+				persistenceID: 'core-message-20260217',
 				selectableRows: 1,
 				selectableRowsRangeMode: 'click',
 				columns: [
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 7724c5fed..1c2c53dd7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -88,7 +88,7 @@ export default {
 				ajaxRequestFunc: () => this.$api.call(ApiStvAbschlusspruefung.getAbschlusspruefung(this.student.uid)),
 				ajaxResponse: (url, params, response) => response.data,
 				index: 'abschlusspruefung_id',
-				persistenceID: 'stv-details-finalexam-2025112401',
+				persistenceID: 'stv-details-finalexam-20260217',
 				columns: [
 					{title: "vorsitz", field: "vorsitz_nachname"},
 					{title: "abschlussbeurteilung", field: "beurteilung_bezeichnung"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 96c905f2b..1d28bf618 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -53,7 +53,7 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				height: '500',
 				index: 'anrechnung_id',
-				persistenceID: 'stv-details-anrechnungen-2025112401',
+				persistenceID: 'stv-details-anrechnungen-20260217',
 				selectableRows: true,
 				columns: [
 					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index c63921c20..9477b08f4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -91,7 +91,7 @@ export default {
 				ajaxResponse: (url, params, response) => response.data,
 				layout:"fitDataTable",
 				index: 'akte_id',
-				persistenceID: 'stv-details-archiv',
+				persistenceID: 'stv-details-archiv-20260217',
 				columns: [
 					{title: "Akte Id", field: "akte_id", visible: false},
 					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 48a7e3d4f..7f39496e9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -249,7 +249,7 @@ export default {
 					this.redraw(true);
 				},
 				index: 'aufnahmetermin_id',
-				persistenceID: 'stv-details-table_admission-dates-2025112401',
+				persistenceID: 'stv-details-table_admission-dates-20260217',
 				columns: [
 					{title: "rt_id", field: "rt_id", visible: false},
 					{title: "rt_person_id", field: "rt_person_id", visible: false},
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 572a8cd27..1de69c81d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -38,7 +38,7 @@ export default {
 				index: 'akte_id',
 				selectableRows: true,
 				selectableRowsRangeMode: 'click',
-				persistenceID: 'stv-details-accepted-2026020401',
+				persistenceID: 'stv-details-accepted-20260217',
 				columns: [
 					{title: "akte_id", field: "akte_id", visible: false},
 					{title: "Dokument", field: "bezeichnung"},
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 5ae9cef8d..ddee23bc7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -34,7 +34,7 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				layout: 'fitDataStretchFrozen',
-				persistenceID: 'stv-details-unaccepted-2026020401',
+				persistenceID: 'stv-details-unaccepted-20260217',
 				selectableRows: true,
 				selectableRowsRangeMode: 'click',
 				columns: [
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js b/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
index bc4b5a86a..0486c8e60 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Groups/List.js
@@ -111,7 +111,7 @@ export default {
 				],
 				height: 'auto',
 				index: 'group_id',
-				persistenceID: 'stv-details-group-list'
+				persistenceID: 'stv-details-group-list-20260217'
 			};
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index 4f25392aa..262b0b0fd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -47,7 +47,7 @@ export default {
 					ApiStvJointstudies.getStudies(this.student.prestudent_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'stv-details-jointstudies',
+				persistenceID: 'stv-details-jointstudies-20260217',
 				columns: [
 					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
 					{title: "StSem", field: "studiensemester_kurzbz"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 73c818317..7e73b13d2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -6,7 +6,6 @@ import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 
 import ApiStvAddress from '../../../../../api/factory/stv/kontakt/address.js';
-import ApiStvCompany from '../../../../../api/factory/stv/kontakt/company.js';
 
 export default{
 	name: 'AddressComponent',
@@ -55,7 +54,7 @@ export default{
 				ajaxResponse: (url, params, response) => response.data,
 				//autoColumns: true,
 				index: 'adresse_id',
-				persistenceID: 'stv-details-kontakt-address',
+				persistenceID: 'stv-details-kontakt-address-20260217',
 				columns:[
 					{title:"Typ", field:"bezeichnung"},
 					{title:"Strasse", field:"strasse"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 47bddb02f..af8e9f964 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -33,7 +33,7 @@ export default{
 				ajaxRequestFunc: () => this.$api.call(ApiStvBankaccount.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
 				index: 'bankverbindung_id',
-				persistenceID: 'stv-details-kontakt-bankaccount',
+				persistenceID: 'stv-details-kontakt-bankaccount-20260217',
 				columns:[
 					{title:"Name", field:"name"},
 					{title:"Anschrift", field:"anschrift", visible:false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index a17adb06f..4bdda4762 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -59,7 +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',
+				persistenceID: 'stv-details-kontakt-contact-20260217',
 				columns:[
 					{title:"Typ", field:"kontakttypbeschreibung"},
 					{title:"Kontakt", field:"kontakt"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index 333de2119..36e5bbbd3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -130,7 +130,7 @@ export default {
 				selectableRows: true,
 				selectableRowsRangeMode: 'click',
 				index: 'buchungsnr',
-				persistenceID: 'stv-details-konto'
+				persistenceID: 'stv-details-konto-20260217'
 			};
 		},
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 6d510a912..b664964f7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -59,7 +59,7 @@ export default {
 				ajaxResponse: (url, params, response) => {
 					return response.data;
 				},
-				persistenceID: 'stv-details-lvtermine',
+				persistenceID: 'stv-details-lvtermine-20260217',
 				columns: [
 					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
 					{title: "lehreinheit_id", field: "lehreinheit_id", visible: false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
index 66c09aab6..fb8ef8084 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Purpose.js
@@ -74,7 +74,7 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 200,
-				persistenceID: 'core-mobility-purpose-2025112401'
+				persistenceID: 'core-mobility-purpose-20260217'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
index fe56c90ab..a1336ba7a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/List/Support.js
@@ -72,7 +72,7 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 200,
-				persistenceID: 'core-mobility-support-2025112401'
+				persistenceID: 'core-mobility-support-20260217'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index af5ea4c4b..e71c0dfb8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -79,7 +79,7 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				index: 'bisio_id',
-				persistenceID: 'stv-details-table_mobility-2025112401',
+				persistenceID: 'stv-details-table_mobility-20260217',
 				columns: [
 					{title: "Kurzbz", field: "kurzbz"},
 					{title: "Nation", field: "nation_code"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
index 13fab4f47..eaa34c1c7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
@@ -81,7 +81,7 @@ export default {
 				height: '100%',
 				selectableRows: true,
 				selectableRowsRangeMode: 'click',
-				persistenceID: 'stv-details-noten-repeater'
+				persistenceID: 'stv-details-noten-repeater-20260217'
 			};
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index 43961237e..34a9b7adc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -81,7 +81,7 @@ export default {
 				height: '100%',
 				selectableRows: true,
 				selectableRowsRangeMode: 'click',
-				persistenceID: 'stv-details-noten-teacher'
+				persistenceID: 'stv-details-noten-teacher-20260217'
 			};
 		}
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 81c2099f7..755f3628d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -250,7 +250,7 @@ export default {
 				layout: 'fitDataStretchFrozen',
 				selectableRows: 1,
 				selectableRowsRangeMode: 'click',
-				persistenceID: 'stv-details-noten-zeugnis-2025112401',
+				persistenceID: 'stv-details-noten-zeugnis-20260217',
 				persistence:{
 					columns: ["width", "visible", "frozen"]
 				}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 77eb8adba..4acb09156 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -30,7 +30,7 @@ export default {
 		show-tiny-mce
 		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 		@reload="$emit('update:suffix')"
-		tabulator-persistence-id="stv-notiz-2026011301"
+		tabulator-persistence-id="stv-notiz-20260217"
 		>
 </core-notiz>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index d884c9125..98ac01ddf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -25,7 +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-20260204',
+				persistenceID: 'stv-details-prestudent-history-20260217',
 				columns:[
 					{title:"StSem", field:"studiensemester_kurzbz"},
 					{title:"Prio", field:"priorisierung"},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 2053cc1f6..97e35edbe 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -210,7 +210,7 @@ export default{
 				height: 'auto',
 				selectableRows: false,
 				index: 'statusId',
-				persistenceID: 'stv-multistatus-2025112401'
+				persistenceID: 'stv-multistatus-20260217'
 			};
 			return options;
 		},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
index 6792920dd..278ca7d16 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
@@ -248,7 +248,7 @@ export default {
 				persistence:{
 					columns: true, //persist column layout
 				},
-				persistenceID: 'stv-details-projektarbeit-2025112401'
+				persistenceID: 'stv-details-projektarbeit-20260217'
 			}
 			return options;
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 824e66d94..433d745b4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -126,7 +126,7 @@ export default {
 				persistence:{
 					columns: true, //persist column layout
 				},
-				persistenceID: 'stv-details-projektbetreuer-2025121201'
+				persistenceID: 'stv-details-projektbetreuer-20260217'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 47ebe495c..9f89a72ac 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -55,7 +55,7 @@ export default{
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				index: 'pruefung_id',
-				persistenceID: 'stv-details-pruefung-list-2026012701',
+				persistenceID: 'stv-details-pruefung-list-20260217',
 				persistence: {
 					sort: true,
 					columns: ["width", "visible", "frozen"],
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 9519aad3a..03244e114 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -123,28 +123,9 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
-		},
-/*		clickedRows() {
-			this.$refs.table.reloadTable();
-			//this.$refs.table.tabulator.setData('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + this.person_id);
-		},*/
+		}
 	},
 	methods: {
-/*		toggleRowClick(rowData){
-			// check row
-			const exists = this.clickedRows.some(row => JSON.stringify(row) === JSON.stringify(rowData));
-
-			if (exists) {
-				this.clickedRows = this.clickedRows.filter(row => JSON.stringify(row) !== JSON.stringify(rowData));
-				this.sumBetragLehrauftraege -= Number(rowData.betrag1);
-				this.handleSumUp();
-			} else {
-				this.clickedRows.push(rowData);
-				this.sumBetragLehrauftraege += Number(rowData.betrag1);
-				this.handleSumUp();
-			}
-
-		},*/
 		toggleSelect(event, rowData) {
 
 			const isCtrlPressed = event.ctrlKey;
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index da8bf6bbb..106cf61a6 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -588,85 +588,86 @@ export default {
 		this.getFormattedDate();
 	},
 	/*
+	TODO(Manu) delete after check
 
-						<div class="row mb-3">
-							<form-input
-								type="DatePicker"
-								:label="$p.t('vertrag/datum_vertrag')"
-								name="vertragsdatum"
-								v-model="formData.vertragsdatum"
-								auto-apply
-								:enable-time-picker="false"
-								format="dd.MM.yyyy"
-								preview-format="dd.MM.yyyy"
-								:teleport="true"
-								>
-							</form-input>
-						</div>
+		<div class="row mb-3">
+			<form-input
+				type="DatePicker"
+				:label="$p.t('vertrag/datum_vertrag')"
+				name="vertragsdatum"
+				v-model="formData.vertragsdatum"
+				auto-apply
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
+				preview-format="dd.MM.yyyy"
+				:teleport="true"
+				>
+			</form-input>
+		</div>
 
-						<div class="row mb-3">
-							<form-input
-								type="text"
-								:label="$p.t('ui/bezeichnung')"
-								name="bezeichnung"
-								v-model="formData.bezeichnung"
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								type="select"
-								:label="$p.t('global/typ')"
-								v-model="formData.vertragstyp_kurzbz"
-								name="vertragstyp_kurzbz"
-								>
-								<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-								<option
-									v-for="entry in listContractTypes"
-									:key="entry.vertragstyp_kurzbz"
-									:value="entry.vertragstyp_kurzbz"
-									>
-									{{entry.bezeichnung}}
-								</option>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								:label="$p.t('ui/betrag')"
-								name="betrag"
-								v-model="formData.betrag"
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3" v-if="!statusNew">
-							<form-input
-								type="text"
-								:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-								name="vertragsstunden"
-								v-model="formData.vertragsstunden"
-								disabled
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3" v-if="!statusNew">
-							<form-input
-								type="text"
-								:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-								name="vertragsstunden_studiensemester_kurzbz"
-								v-model="formData.vertragsstunden_studiensemester_kurzbz"
-								disabled
-								>
-							</form-input>
-						</div>
-						<div class="row mb-3">
-							<form-input
-								type="textarea"
-								:label="$p.t('global/anmerkung')"
-								name="anmerkung"
-								v-model="formData.anmerkung"
-								>
-							</form-input>
-						</div>
+		<div class="row mb-3">
+			<form-input
+				type="text"
+				:label="$p.t('ui/bezeichnung')"
+				name="bezeichnung"
+				v-model="formData.bezeichnung"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="select"
+				:label="$p.t('global/typ')"
+				v-model="formData.vertragstyp_kurzbz"
+				name="vertragstyp_kurzbz"
+				>
+				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
+				<option
+					v-for="entry in listContractTypes"
+					:key="entry.vertragstyp_kurzbz"
+					:value="entry.vertragstyp_kurzbz"
+					>
+					{{entry.bezeichnung}}
+				</option>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				:label="$p.t('ui/betrag')"
+				name="betrag"
+				v-model="formData.betrag"
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden"
+				v-model="formData.vertragsstunden"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3" v-if="!statusNew">
+			<form-input
+				type="text"
+				:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
+				name="vertragsstunden_studiensemester_kurzbz"
+				v-model="formData.vertragsstunden_studiensemester_kurzbz"
+				disabled
+				>
+			</form-input>
+		</div>
+		<div class="row mb-3">
+			<form-input
+				type="textarea"
+				:label="$p.t('global/anmerkung')"
+				name="anmerkung"
+				v-model="formData.anmerkung"
+				>
+			</form-input>
+		</div>
 	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">

From 1d8c4b7159bfb7206895ce5e22019e97dfa4a078 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 17 Feb 2026 16:49:09 +0100
Subject: [PATCH 1218/1357] bug behoben, login wieder nur mit zugangscode
 moeglich

---
 cis/testtool/login.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 182506ac3..cfc1ba63b 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -340,13 +340,26 @@ else
 	}
 }
 
-if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
-	!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code'])) ||
-	(isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
-	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
-	isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
-	isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])))
+if (
+	(
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
+		!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code']) &&
+		!isset($_SESSION['externe_ueberwachung']) && !isset($_SESSION['externe_ueberwachung_verified'])
+	)
+	||
+	(
+		isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
+		isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
+	)
+	||
+	(
+		isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
+		isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
+		isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])
+	)
+
+)
 {
 	$pruefling = new pruefling();
 

From f0597e99e59042722e96ec6a626fe2a2f8001568 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 17 Feb 2026 16:51:56 +0100
Subject: [PATCH 1219/1357] VV: update persistanceId

---
 public/js/components/Vertraege/List/Details.js      | 2 +-
 public/js/components/Vertraege/List/Status.js       | 2 +-
 public/js/components/Vertraege/List/Unassigned.js   | 2 +-
 public/js/components/Vertraege/MitarbeiterHeader.js | 2 +-
 public/js/components/Vertraege/Vertraege.js         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index b7204a2f0..8df6a6985 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -113,7 +113,7 @@ export default {
 				height: '200',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details'
+				persistenceID: 'core-contracts-details-2026021701'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index bf1eb30ff..531b2f553 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -47,7 +47,7 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status',
+				persistenceID: 'core-contracts-status-2026021701',
 				columns: [
 					{title: "Status", field: "bezeichnung"},
 					{
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 03244e114..655a2b078 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -62,7 +62,7 @@ export default {
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned'
+				persistenceID: 'core-contracts-unassigned-2026021701'
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index 2b6a9eacf..f1e8d979d 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -63,7 +63,7 @@ export default {
 					{title: "Ids Dienstverträge", field: "ids", visible: true, headerFilter: "input"},
 				],
 				layout: 'fitColumns',
-				persistenceID: 'core-mitarbeiter_20250901-2',
+				persistenceID: 'core-mitarbeiter-2026021701',
 				footerElement: '<div>&sum; <span id="search_count"></span> / <span id="total_count"></span></div>',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 106cf61a6..d4d65e428 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -140,7 +140,7 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-20260212',
+				persistenceID: 'core-contracts-2026021701',
 			};
 			return options;
 		},

From a6daa7bf0ca7444d1336ac6138a336d49cd6fa03 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 17 Feb 2026 17:32:11 +0100
Subject: [PATCH 1220/1357] all abgabetool datepickers use date format via
 format="dd.MM.yyyy" instead of :format="formatDate" to enable text-input +
 autoapply; backend deadline datetime check for endupload;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 29 +++++++++++++++++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 10 +++++--
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  3 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  3 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  3 +-
 system/phrasesupdate.php                      | 20 +++++++++++++
 6 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index b37c64713..23e11c202 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -373,6 +373,8 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 		}
 
+		$this->checkPaabgabeDeadline($paabgabe_id);
+		
 		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
 		
 		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
@@ -444,6 +446,33 @@ class Abgabe extends FHCAPI_Controller
 		}
 
 	}
+	
+	// validate paabgabe deadline against servertime just in case a student spoofs their local clock and thus
+	// unlocks the upload ui
+	private function checkPaabgabeDeadline($paabgabe_id) {
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$result = $this->PaabgabeModel->load($paabgabe_id);
+		$paabgabeArr = $this->getDataOrTerminateWithError($result, 'general');
+
+		if (count($paabgabeArr) > 0) {
+			$paabgabe = $paabgabeArr[0];
+		} else {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4projektabgabeNichtGefunden'), 'general');
+		}
+		
+		$tz = new DateTimeZone('Europe/Berlin');
+		$now = new DateTimeImmutable('now', $tz);
+		$deadline = DateTimeImmutable::createFromFormat(
+			'Y-m-d H:i:s',
+			$paabgabe->datum . ' 23:59:59',
+			$tz
+		);
+		
+		if($now >= $deadline) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4deadlineExceeded'));
+		}
+	}
 
 	/**
 	 * tabulator tabledata fetch for abgabetool/mitarbeiter
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 971783746..ad740e978 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -715,7 +715,8 @@ export const AbgabeMitarbeiterDetail = {
 							v-model="newTermin.datum"
 							:clearable="false"
 							:enable-time-picker="false"
-							:format="formatDate"
+							locale="de"
+							format="dd.MM.yyyy"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
@@ -864,7 +865,8 @@ export const AbgabeMitarbeiterDetail = {
 								:clearable="false"
 								:disabled="!termin.allowedToSave"
 								:enable-time-picker="false"
-								:format="formatDate"
+								locale="de"
+								format="dd.MM.yyyy"
 								:text-input="true"
 								auto-apply>
 							</VueDatePicker>
@@ -931,7 +933,9 @@ export const AbgabeMitarbeiterDetail = {
 											v-model="termin.abgabedatum"
 											:clearable="false"
 											:disabled="true"
-											:format="formatDate">
+											locale="de"
+											format="dd.MM.yyyy"
+											>
 										</VueDatePicker>
 									</div>
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 55120e223..9c14c2948 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -423,7 +423,8 @@ export const AbgabeStudentDetail = {
 									:clearable="false"
 									:disabled="true"
 									:enable-time-picker="false"
-									:format="formatDate"
+									locale="de"
+									format="dd.MM.yyyy"
 									:text-input="true"
 									auto-apply>
 								</VueDatePicker>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index e09171c25..db2eebaa8 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1189,8 +1189,9 @@ export const AbgabetoolAssistenz = {
 							style="width: 95%;"
 							v-model="serienTermin.datum"
 							:clearable="false"
+							locale="de"
+							format="dd.MM.yyyy"
 							:enable-time-picker="false"
-							:format="formatDate"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 1b8eff3e2..8ee12bf79 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -525,7 +525,8 @@ export const AbgabetoolMitarbeiter = {
 							v-model="serienTermin.datum"
 							:clearable="false"
 							:enable-time-picker="false"
-							:format="formatDate"
+							locale="de"
+							format="dd.MM.yyyy"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 45e977987..8860e2cf6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -46373,6 +46373,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4deadlineExceeded',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nicht rechtzeitig abgegeben!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deadline exceeded!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

From 90c845899f7645861c6daa4e933654643b4a853f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Feb 2026 11:15:59 +0100
Subject: [PATCH 1221/1357] =?UTF-8?q?explicitely=20set=20deadline=20to=20e?=
 =?UTF-8?q?nd=20of=20day=20to=20achieve=20the=20desired=20"valid=20until?=
 =?UTF-8?q?=2023:59"=20logic,=20instead=20of=20just=20moving=20the=20deadl?=
 =?UTF-8?q?ine=20by=20one=20day;=20endupload=20deadline=20is=20now=20optio?=
 =?UTF-8?q?nal=20by=20defining=20it=20as=20a=20"nachreichen=20m=C3=B6glich?=
 =?UTF-8?q?"=20aka=20non=20fixtermin;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/api/frontend/v1/Abgabe.php     | 18 ++++++++++++++++++
 .../Cis/Abgabetool/AbgabetoolStudent.js        |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 23e11c202..f0744fb99 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -461,6 +461,9 @@ class Abgabe extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('abgabetool', 'c4projektabgabeNichtGefunden'), 'general');
 		}
 		
+		// in that case any submission date is fine
+		if($paabgabe->fixtermin === false) return;
+		
 		$tz = new DateTimeZone('Europe/Berlin');
 		$now = new DateTimeImmutable('now', $tz);
 		$deadline = DateTimeImmutable::createFromFormat(
@@ -502,6 +505,15 @@ class Abgabe extends FHCAPI_Controller
 		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
 
 
+		$mapFunc = function($projektarbeit) {
+			return $projektarbeit->projektarbeit_id;
+		};
+		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
+
+		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
+		
+		
 		forEach($projektarbeiten->retval as $pa) {
 			
 			$result = $this->ProjektarbeitModel->getProjektbetreuerAnrede($pa->betreuer_person_id);
@@ -518,6 +530,12 @@ class Abgabe extends FHCAPI_Controller
 			Events::trigger('projektbeurteilung_formular_link', $pa->betreuerart_kurzbz, APP_ROOT, $pa->projektarbeit_id, $pa->student_uid, $returnFunc);
 			$pa->beurteilungLinkNew = $newLink;
 			$pa->beurteilungLinkOld = $oldLink;
+
+			$filterFunc = function($projektabgabe) use ($pa) {
+				return $projektabgabe->projektarbeit_id == $pa->projektarbeit_id;
+			};
+			
+			$pa->abgabetermine = array_values(array_filter($projektabgaben, $filterFunc));
 		}
 		
 		
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index d03ef3ffc..fd88cbe02 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -155,7 +155,7 @@ export const AbgabetoolStudent = {
 			return qgate1positiv && qgate2positiv
 		},
 		isPastDate(date) {
-			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' }).endOf('day');
 			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
 			return nowInBerlin > deadline;
 		},
@@ -175,8 +175,8 @@ export const AbgabetoolStudent = {
 						// old assumed production logic when qgates are required
 						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesStrict(pa.abgabetermine)
 						
-						// new larifari we want qgates but they are optional fhtw mode
-						termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesOptional(pa.abgabetermine)
+						const inTime = termin.fixtermin ? !this.isPastDate(termin.datum) : true
+						termin.allowedToUpload = inTime && this.checkQualityGatesOptional(pa.abgabetermine)
 
 
 						// development purposes

From 4b875bf019aebdce9e4da9d9e3fea699a9709351 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Feb 2026 11:27:14 +0100
Subject: [PATCH 1222/1357] also show filterActiveModule for HeaderFilters,
 change colour to red

---
 public/css/Studentenverwaltung.css              |  2 +-
 .../components/Stv/Studentenverwaltung/List.js  | 17 +++++++++++------
 public/js/components/filter/Filter.js           |  7 +++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 48d36e99a..583d5918d 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -183,7 +183,7 @@ html.fs_huge {
 }
 
 .has-filter .fa-filter {
-	color: var(--bs-success);
+	color: var(--bs-danger);
 }
 .override_filtercmpt_actions_style div.d-flex.align-items-baseline {
 	align-items: end !important;
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 3a67df76c..7b9f8a603 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -225,7 +225,8 @@ export default {
 			expanded: [],
 			selectedColumnValues: [],
 			tagEndpoint: ApiTag,
-			currentEndpoint: null
+			currentEndpoint: null,
+			headerFilterActive: false
 		}
 	},
 	computed: {
@@ -543,6 +544,10 @@ export default {
 		},
 		resetFilter(){
 			this.$refs.listfilter.resetFilter();
+			this.$refs.table.clearFilters();
+		},
+		handleHeaderFilter(filterActive){
+			this.headerFilterActive = filterActive;
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
@@ -558,7 +563,6 @@ export default {
 			v-draggable:copyLink.capture="selectedDragObject"
 			@dragend="dragCleanup"
 		>
-
 			<core-filter-cmpt
 				ref="table"
 				:description="countsToHTML"
@@ -573,6 +577,7 @@ export default {
 				@click:new="actionNewPrestudent"
 				@table-built="translateTabulator"
 				:useSelectionSpan="false"
+				@headerFilterOn="handleHeaderFilter"
 			>
 
 			<template #actions>
@@ -586,14 +591,14 @@ export default {
 				></core-tag>
 			</template>
 
-			<template #actions v-if="filter.length">
+			<template #actions v-if="filter.length || headerFilterActive">
 			  <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
-				<p class="text-success mb-0">
+				<p class="text-danger mb-0">
 				  <strong>{{$p.t('filter','filterActive')}}</strong>
 				</p>
 
 				<button
-				  class="btn btn-outline-success sm"
+				  class="btn btn-outline-danger sm"
 				  :title="$p.t('filter/filterDelete')"
 				  @click="resetFilter"
 				>
@@ -605,7 +610,7 @@ export default {
 			<template #filter>
 				<div class="card">
 					<div class="card-body">
-						<list-filter ref="listfilter" @change="updateFilter" :filterActive="filter.length" />
+						<list-filter ref="listfilter" @change="updateFilter" :filterActive="filter.length"/>
 					</div>
 				</div>
 			</template>
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 815b70009..7bfc1aebb 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -48,7 +48,8 @@ export const CoreFilterCmpt = {
 		'nwNewEntry',
 		'click:new',
 		'tableBuilt',
-		'uuidDefined'
+		'uuidDefined',
+		'headerFilterOn'
 	],
 	props: {
 		onNwNewEntry: Function, // NOTE(chris): Hack to get the nwNewEntry listener into $props
@@ -345,6 +346,7 @@ export const CoreFilterCmpt = {
 
 			this.tabulator.on("dataFiltered", filters => {
 				this.filterActive = filters.length > 0;
+				this.$emit("headerFilterOn", this.filterActive);
 			});
 		},
 		updateTabulator() {
@@ -377,9 +379,6 @@ export const CoreFilterCmpt = {
 				this.tabulator.setHeaderFilterValue(filter.field, filter.value);
 			});
 		},
-		/**
-		 *
-		 */
 		getFilter() {
 			if (this.selectedFilter === null)
 				this.startFetchCmpt(

From 328affa35caa1ad174dcf05b78e416a846f9ca8c Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Feb 2026 11:53:24 +0100
Subject: [PATCH 1223/1357] actually set deadline calculation to IANA timezone
 'Europe/Vienna', so the code still works once Berlin moves to another
 timezone away from Austria. You never know.

---
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js | 6 +++---
 public/js/components/Cis/Abgabetool/AbgabetoolStudent.js   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index db2eebaa8..e4609d050 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -722,9 +722,9 @@ export const AbgabetoolAssistenz = {
 			return str
 		},
 		isPastDate(date) {
-			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
-			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
-			return nowInBerlin > deadline;
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Vienna' }).endOf('day');
+			const nowInVienna = luxon.DateTime.now().setZone('Europe/Vienna');
+			return nowInVienna > deadline;
 		},
 		setDetailComponent(details){
 			
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index fd88cbe02..4baf5316f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -155,9 +155,9 @@ export const AbgabetoolStudent = {
 			return qgate1positiv && qgate2positiv
 		},
 		isPastDate(date) {
-			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' }).endOf('day');
-			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
-			return nowInBerlin > deadline;
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Vienna' }).endOf('day');
+			const nowInVienna = luxon.DateTime.now().setZone('Europe/Vienna');
+			return nowInVienna > deadline;
 		},
 		setDetailComponent(details){
 			this.loading = true

From 6f28696556881cf7eb9cc2c56683f6f6ba8c747e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Feb 2026 13:00:19 +0100
Subject: [PATCH 1224/1357] getDateStyleClass evaluation also with precise
 luxon calculation on all pages; qgate12 status col, next/prev termin col on
 betreuer page; table persistence on mitarbeiter page; same rowheight on
 betreuer table as in assistenz to achieve similar UX;

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  51 +--
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  34 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 304 +++++++++++++++++-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  29 +-
 4 files changed, 320 insertions(+), 98 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index ad740e978..f86fa44d9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -270,48 +270,13 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
-		convertDateToIsoString(date) {
-			// 1. Check if it is a Date object AND if the date value is valid (not 'Invalid Date')
-			if (param instanceof Date && !isNaN(param.getTime())) {
-				const year = param.getFullYear();
-				// getMonth() is 0-indexed, so we add 1.
-				const month = param.getMonth() + 1;
-				const day = param.getDate();
-		
-				// Helper to pad single-digit numbers with a leading zero
-				const pad = (num) => String(num).padStart(2, '0');
-		
-				// Return the formatted string: YYYY-MM-DD
-				return `${year}-${pad(month)}-${pad(day)}`;
-			}
-		
-			// If it's not a valid Date, return the original parameter
-			return param;
-		},
-		dateDiffInDays(datumParam){
-			let datum = datumParam
-			if(datumParam instanceof Date && !isNaN(datum.getTime()))
-			{
-				const year = datumParam.getFullYear();
-				const month = datumParam.getMonth() + 1;	// getMonth() is 0-indexed
-				const day = datumParam.getDate();
-				const pad = (num) => String(num).padStart(2, '0');
-				datum = `${year}-${pad(month)}-${pad(day)}`	
-			}
-			
-			const dateToday = luxon.DateTime.now().startOf('day');
-			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
-			const duration = dateDatum.diff(dateToday, 'days');
-			
-			return duration.values.days;
-		},
 		getDateStyleClass(termin) {
-			const datum = new Date(termin.datum)
-			const abgabedatum = new Date(termin.abgabedatum)
-
-			termin.diffindays = this.dateDiffInDays(termin.datum)
-
-			const isLate = termin.abgabedatum && abgabedatum > datum;
+			const zone = 'Europe/Vienna';
+			const today = luxon.DateTime.now().setZone(zone);
+			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
+			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
+			termin.diffindays = datum.diff(today, 'days').days;
+			const isLate = abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {
@@ -396,6 +361,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		formatDate(dateParam) {
+			// unsafe for datepickers, dont use there
 			const date = new Date(dateParam)
 			// handle missing leading 0
 			const padZero = (num) => String(num).padStart(2, '0');
@@ -476,7 +442,6 @@ export const AbgabeMitarbeiterDetail = {
 				termin.kurzbz = ''
 			}
 		}
-			
 	},
 	computed: {
 		getAllowedToCreateNewTermin() {
@@ -626,7 +591,6 @@ export const AbgabeMitarbeiterDetail = {
 			return ''
 		},
 		getProjektarbeitStudent(){
-
 			if(this.projektarbeit?.student) return this.$capitalize(this.$p.t('person/student')) + ': ' + this.projektarbeit.student
 
 			return ''
@@ -671,7 +635,6 @@ export const AbgabeMitarbeiterDetail = {
 			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
 			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
 			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
-			
 		},
 	},
 	created() {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index e4609d050..8b0fe7ddb 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -9,15 +9,6 @@ import AbgabeterminStatusLegende from "./StatusLegende.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { splitMailsHelper } from "../../../helpers/EmailHelpers.js"
 
-// spoofed date testing
-// const todayISO = '2025-08-08'
-// const today = new Date(todayISO)
-// const now = luxon.DateTime.fromISO(todayISO)
-
-// prod code
-const today = new Date()
-const now = luxon.DateTime.now()
-
 export const AbgabetoolAssistenz = {
 	name: "AbgabetoolAssistenz",
 	components: {
@@ -386,6 +377,8 @@ export const AbgabetoolAssistenz = {
 			
 		},
 		checkAbgabetermineProjektarbeit(projekt) {
+			const now = luxon.DateTime.now()
+			
 			// calculate Abgabetermin time diff to now and assign last and next to projekt
 			projekt.abgabetermine.forEach(termin => {
 				
@@ -393,7 +386,7 @@ export const AbgabetoolAssistenz = {
 				// while already looping through each termin, calculate datestyle beforehand
 				termin.dateStyle = this.getDateStyleClass(termin)
 
-				const date = luxon.DateTime.fromISO(termin.datum)
+				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
 
 				if (termin.diffMs < 0) {
@@ -770,22 +763,13 @@ export const AbgabetoolAssistenz = {
 
 			this.$refs.modalContainerAbgabeDetail.show()
 		},
-		dateDiffInDays(datum){
-			const dateToday = luxon.DateTime.now().startOf('day');
-
-			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
-
-			const duration = dateDatum.diff(dateToday, 'days');
-
-			return duration.values.days;
-		},
 		getDateStyleClass(termin) {
-			const datum = new Date(termin.datum)
-			const abgabedatum = new Date(termin.abgabedatum)
-
-			termin.diffindays = this.dateDiffInDays(termin.datum)
-
-			const isLate = termin.abgabedatum && abgabedatum > datum;
+			const zone = 'Europe/Vienna';
+			const today = luxon.DateTime.now().setZone(zone);
+			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
+			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
+			termin.diffindays = datum.diff(today, 'days').days;
+			const isLate = abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 8ee12bf79..2ad29d20c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -79,7 +79,7 @@ export const AbgabetoolMitarbeiter = {
 				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
-				rowHeight: 80,
+				rowHeight: 40,
 				columns: [
 					{
 						formatter: function (cell, formatterParams, onRendered) {
@@ -144,9 +144,14 @@ export const AbgabetoolMitarbeiter = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerart'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1}
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerart'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))), headerFilter: true, field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))), headerFilter: true, field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false}
 				],
 				persistence: false,
+				persistenceID: 'abgabeTableBetreuer2026-02-18'
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -182,6 +187,290 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		loadState() {
+			return JSON.parse(localStorage.getItem(this.abgabeTableOptions.persistenceID) || "null");
+		},
+		saveState(table) {
+			// avoid storing state after first restore part happened
+			if(!this.stateRestored) return
+			const rawLayout = table.getColumnLayout();
+			const state = {
+				columns: rawLayout.map(col => ({
+					field: col.field,
+					visible: col.visible,
+					width: col.width,
+				})),
+				sort: table.getSorters().map(s => ({
+					field: s.field,
+					dir: s.dir,
+				})),
+				filters: table.getFilters(),
+				headerFilters: table.getHeaderFilters()
+			};
+
+			localStorage.setItem(this.abgabeTableOptions.persistenceID, JSON.stringify(state));
+		},
+		handleTableBuilt() {
+			const table = this.$refs.abgabeTable.tabulator
+
+			this.tableBuiltResolve()
+
+			table.on("columnMoved", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnResized", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnVisibilityChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("filterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("headerFilterChanged", () => {
+				this.saveState(table);
+			});
+
+			table.on("dataSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("columnSorted", () => {
+				this.saveState(table);
+			});
+
+			table.on("sortersChanged", () => {
+				this.saveState(table);
+			});
+
+			const saved = this.loadState();
+
+			table.on("renderComplete", () => {
+				if(!this.stateRestored) {
+
+					if (saved?.columns && !this.colLayoutRestored) {
+						const layout = saved.columns.map(col => ({
+							field: col.field,
+							width: col.width,
+							visible: col.visible,
+							// add more if needed, but keep it simple
+						}));
+
+						table.setColumnLayout(layout);
+
+						this.colLayoutRestored = true;
+					}
+
+					if (saved?.filters && !this.filtersRestored) {
+						this.filtersRestored = true // instantly avoid retriggers
+						table.setFilter(saved.filters);
+					}
+					if (saved?.headerFilters && !this.headerFiltersRestored) {
+						this.headerFiltersRestored = true // instantly avoid retriggers
+						for (let hf of saved.headerFilters) {
+							table.setHeaderFilterValue(hf.field, hf.value);
+						}
+					}
+
+					if (saved?.sort?.length && !this.sortRestored) {
+						this.sortRestored = true;
+
+						setTimeout(() => {
+							const sortList = saved.sort.map(s => {
+								const col = table.columnManager.findColumn(s.field);
+								if (!col) {
+									return null;
+								}
+								return { column: col, dir: s.dir };
+							}).filter(Boolean);
+
+							table.setSort(sortList);
+						}, 100);
+					}
+					this.stateRestored = true
+
+				}
+
+			});
+		},
+		checkQualityGateStatus(projekt) {
+			// TODO: might refine the representation of these states and maybe refactor code a little
+			const qgate1Termine = []
+			const qgate2Termine = []
+
+			projekt.qgate1Status = this.$p.t('abgabetool/c4keinTerminVorhanden')// 'Kein Termin vorhanden'
+			projekt.qgate1StatusRank = 0
+			projekt.qgate2Status = this.$p.t('abgabetool/c4keinTerminVorhanden')
+			projekt.qgate2StatusRank = 0
+
+			projekt.abgabetermine.forEach(termin => {
+				if(termin.paabgabetyp_kurzbz == 'qualgate1') qgate1Termine.push(termin)
+				if(termin.paabgabetyp_kurzbz == 'qualgate2') qgate2Termine.push(termin)
+			})
+
+			// calculate qgateStatusRank and display the highest order status rank of all quality gate termine until one
+			// counts as passed, which is just a positive note no matter if anything has been uploaded
+
+			// reuse luxon calculated diffMs (termin.datum in relation to today) from previous datestyle check 
+			qgate1Termine.forEach(qgate => {
+				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
+					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					if(noteOpt.positiv) {
+						projekt.qgate1Status = this.$p.t('abgabetool/c4positivBenotet')
+						projekt.qgate1StatusRank = 5
+					} else {
+						projekt.qgate1Status = this.$p.t('abgabetool/c4negativBenotet')
+						projekt.qgate1StatusRank = 4
+					}
+				} else if (qgate.note == null && projekt.qgate1StatusRank <= 3) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notYetGraded')
+					projekt.qgate1StatusRank = 3
+				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate1StatusRank <= 2) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notSubmitted')
+					projekt.qgate1StatusRank = 2
+				} else if (qgate.upload_allowed == false && qgate.diffMs <= 0 && projekt.qgate1StatusRank <= 1) {
+					projekt.qgate1Status = this.$p.t('abgabetool/c4notHappenedYet')
+					projekt.qgate1StatusRank = 1
+				}
+			})
+
+			qgate2Termine.forEach(qgate => {
+				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
+					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					if(noteOpt.positiv) {
+						projekt.qgate2Status = this.$p.t('abgabetool/c4positivBenotet')
+						projekt.qgate2StatusRank = 5
+					} else {
+						projekt.qgate2Status = this.$p.t('abgabetool/c4negativBenotet')
+						projekt.qgate2StatusRank = 4
+					}
+				} else if (qgate.note == null && projekt.qgate2StatusRank <= 3) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notYetGraded')
+					projekt.qgate2StatusRank = 3
+				} else if(qgate.upload_allowed == true && qgate.abgabedatum == null && projekt.qgate2StatusRank <= 2) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notSubmitted')
+					projekt.qgate2StatusRank = 2
+				} else if (qgate.upload_allowed == false && qgate.diffMs <= 0 && projekt.qgate2StatusRank <= 1) {
+					projekt.qgate2Status = this.$p.t('abgabetool/c4notHappenedYet')
+					projekt.qgate2StatusRank = 1
+				}
+			})
+		},
+		checkAbgabetermineProjektarbeit(projekt) {
+			const now = luxon.DateTime.now()
+			// calculate Abgabetermin time diff to now and assign last and next to projekt
+			projekt.abgabetermine.forEach(termin => {
+				
+				// while already looping through each termin, calculate datestyle beforehand
+				termin.dateStyle = this.getDateStyleClass(termin)
+
+				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
+				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
+
+				if (termin.diffMs < 0) {
+					if (!projekt.prevTermin ||
+						termin.diffMs > projekt.prevTermin.diffMs // larger (less negative) = closer to now
+					) {
+						projekt.prevTermin = termin;
+					}
+				} else if (termin.diffMs > 0) {
+					if (!projekt.nextTermin ||
+						termin.diffMs < projekt.nextTermin.diffMs // smaller positive = closer to now
+					) {
+						projekt.nextTermin = termin;
+					}
+				}
+			})
+
+			// seperate check for quality gates
+			this.checkQualityGateStatus(projekt)
+		},
+		getDateStyleClass(termin) {
+			const zone = 'Europe/Vienna';
+			const today = luxon.DateTime.now().setZone(zone);
+			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
+			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
+			termin.diffindays = datum.diff(today, 'days').days;
+			const isLate = abgabedatum && abgabedatum > datum;
+
+			// GRADE STATUS
+			if (termin.note) {
+				if (termin.note.positiv) return 'bestanden';
+				return 'nichtbestanden';
+			}
+
+			// ACTION REQUIRED FOR GRADE
+			if (termin.bezeichnung?.benotbar && datum < today) {
+				return 'beurteilungerforderlich';
+			}
+
+			// SUBMISSION STATUS
+			if (termin.upload_allowed) {
+				if (termin.abgabedatum) {
+					return isLate ? 'verspaetet' : 'abgegeben';
+				}
+
+				// no submission yet
+				if (datum < today) return 'verpasst';
+				if (termin.diffindays <= 12) return 'abzugeben';
+				return 'standard';
+			}
+
+			// GENERIC STATUS
+			return datum < today ? 'verpasst' : 'standard';
+		},
+		abgabterminFormatter(cell) {
+			const val = cell.getValue()
+
+			if(val) {
+				let icon = ''
+				switch(val.dateStyle) {
+					case 'verspaetet':
+						icon = '<i class="fa-solid fa-triangle-exclamation"></i>'
+						break
+					case 'verpasst':
+						icon = '<i class="fa-solid fa-calendar-xmark"></i>'
+						break
+					case 'abzugeben':
+						icon = '<i class="fa-solid fa-hourglass-half"></i>'
+						break
+					case 'standard':
+						icon = '<i class="fa-solid fa-clock"></i>'
+						break
+					case 'abgegeben':
+						icon = '<i class="fa-solid fa-paperclip"></i>'
+						break
+					case 'beurteilungerfolderlich':
+						icon = '<i class="fa-solid fa-list-check"></i>'
+						break
+					case 'bestanden':
+						icon = '<i class="fa-solid fa-check"></i>'
+						break
+					case 'nichtbestanden':
+						icon = '<i class="fa-solid fa-circle-exclamation"></i>'
+						break
+				}
+
+				const bezeichnung = val.bezeichnung?.bezeichnung ?? val.bezeichnung
+
+				return '<div style="display: flex; height: 100%">' +
+					'<div class=' + val.dateStyle + "-header" + ' style="width:48px; height: 100%; padding: 0px; display: flex; align-items: center; justify-content: center;">' +
+					icon +
+					'</div>' +
+					'<div style="margin-left: 4px;">' +
+					'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
+					'</div>'+
+					'</div>'
+
+			} else {
+				return ''
+			}
+
+		},
 		selectHandler(e, cell) {
 			const row = cell.getRow();
 
@@ -294,9 +583,9 @@ export const AbgabetoolMitarbeiter = {
 			return str
 		},
 		isPastDate(date) {
-			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Berlin' });
-			const nowInBerlin = luxon.DateTime.now().setZone('Europe/Berlin');
-			return nowInBerlin > deadline;
+			const deadline = luxon.DateTime.fromISO(date, { zone: 'Europe/Vienna' }).endOf('day');
+			const nowInVienna = luxon.DateTime.now().setZone('Europe/Vienna');
+			return nowInVienna > deadline;
 		},
 		setDetailComponent(details){
 			this.loading=true
@@ -381,11 +670,13 @@ export const AbgabetoolMitarbeiter = {
 			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
 		},
 		setupData(data){
+			
+			
 			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
 			this.tableData = data[0]?.retval?.map(projekt => {
-
+				this.checkAbgabetermineProjektarbeit(projekt)
 				projekt.selectable = projekt.betreuerart_kurzbz !== 'Zweitbegutachter'
 
 				return {
@@ -601,6 +892,7 @@ export const AbgabetoolMitarbeiter = {
 				@click:new=openAddSeriesModal
 				:tabulator-options="abgabeTableOptions"  
 				:tabulator-events="abgabeTableEventHandlers"
+				@tableBuilt="handleTableBuilt"
 				tableOnly
 				:sideMenu="false"
 				:useSelectionSpan="false"
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 4baf5316f..a0df7a81d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -48,30 +48,13 @@ export const AbgabetoolStudent = {
 		};
 	},
 	methods: {
-		dateDiffInDays(datumParam) {
-			let datum = datumParam
-			if(datumParam instanceof Date && !isNaN(datum.getTime()))
-			{
-				const year = datumParam.getFullYear();
-				const month = datumParam.getMonth() + 1;	// getMonth() is 0-indexed
-				const day = datumParam.getDate();
-				const pad = (num) => String(num).padStart(2, '0');
-				datum = `${year}-${pad(month)}-${pad(day)}`
-			}
-
-			const dateToday = luxon.DateTime.now().startOf('day');
-			const dateDatum = luxon.DateTime.fromISO(datum).startOf('day');
-			const duration = dateDatum.diff(dateToday, 'days');
-
-			return duration.values.days;
-		},
 		getDateStyleClass(termin) {
-			const datum = new Date(termin.datum)
-			const abgabedatum = new Date(termin.abgabedatum)
-
-			termin.diffindays = this.dateDiffInDays(termin.datum)
-
-			const isLate = termin.abgabedatum && abgabedatum > datum;
+			const zone = 'Europe/Vienna';
+			const today = luxon.DateTime.now().setZone(zone);
+			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
+			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
+			termin.diffindays = datum.diff(today, 'days').days;
+			const isLate = abgabedatum && abgabedatum > datum;
 
 			// GRADE STATUS
 			if (termin.note) {

From 34cd5d1a80a576094b79ecb124e860e535486850 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Feb 2026 13:17:37 +0100
Subject: [PATCH 1225/1357] Filter List: only emit to updateURL if there is
 final dropdown result or change

---
 .../Stv/Studentenverwaltung/List/Filter.js           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index 6fef5d6c5..a2c348774 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -67,8 +67,15 @@ export default {
 		}
 	},
 	watch: {
-		cleanFilters(n) {
-			this.$emit('change', n);
+		cleanFilters: {
+			//only emit if filteredValue is not empty array
+			handler(newVal) {
+				console.log("emitting clean filters", newVal);
+				if (newVal.length)
+					this.$emit("change", newVal);
+			},
+			deep: true,
+			immediate: false
 		}
 	},
 	methods: {
@@ -77,6 +84,7 @@ export default {
 		},
 		remove(index) {
 			this.filters.splice(index, 1);
+			this.$emit("change", this.filters);
 		},
 		resetFilter(){
 			this.filters = [];

From 4724008c2df9231341e6ee3d64fcd9e060e5e0ac Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Feb 2026 14:32:57 +0100
Subject: [PATCH 1226/1357] betreuer page update table after adding
 serientermin qgate1/2 status prev/next; preserve scrollX/Y in
 betreuer/assistenz page

---
 .../Cis/Abgabetool/AbgabetoolAssistenz.js      | 18 +++++++++---------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js    | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 8b0fe7ddb..fb6a8cd64 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -643,21 +643,21 @@ export const AbgabetoolAssistenz = {
 				// reset selection to empty
 				// this.$refs.abgabeTable.tabulator.deselectRow()
 				const table = this.$refs.abgabeTable.tabulator;
-				const scrollX = table.rowManager.element.scrollLeft;
-				const scrollY = table.rowManager.element.scrollTop;
+				const scrollX = table.rowManager.scrollLeft;
+				const scrollY = table.rowManager.scrollTop;
 				
 				const mappedData = this.mapProjekteToTableData(this.projektarbeiten)
 
 				table.setData(mappedData)
 				table.redraw(true)
 
-				
-				requestAnimationFrame(() => {
-					table.rowManager.element.scrollLeft = scrollX;
-					table.rowManager.element.scrollTop = scrollY;
-				});
-				
-				
+				Vue.nextTick(()=> {
+					const table = this.$refs.abgabeTable?.tabulator.element.querySelector('.tabulator-tableholder')
+					if(table) {
+						table.scrollLeft = scrollX;
+						table.scrollTop = scrollY;
+					}
+				})
 				
 			}).finally(()=>{
 				this.saving = false
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2ad29d20c..2453f33bf 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -563,6 +563,24 @@ export const AbgabetoolMitarbeiter = {
 			)).then(res => {
 				if (res.meta.status === "success" && res.data) {
 					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
+
+					const oldScrollLeft = this.$refs.abgabeTable?.tabulator.rowManager.scrollLeft
+					const oldScrollTop = this.$refs.abgabeTable?.tabulator.rowManager.scrollTop
+					this.loading = true
+					this.loadProjektarbeiten(this.showAll, () => {
+						this.$refs.abgabeTable?.tabulator.redraw(true)
+						this.$refs.abgabeTable?.tabulator.setSort([]);
+						this.loading = false
+
+						Vue.nextTick(()=> {
+							const table = this.$refs.abgabeTable?.tabulator.element.querySelector('.tabulator-tableholder')
+							if(table) {
+								table.scrollLeft = oldScrollLeft;
+								table.scrollTop = oldScrollTop;
+							}
+						})
+						
+					})
 				} else {
 					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
 				}

From fa7a1257278e89f3d0d5ef49e6e80ff3c2c6ecdf Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 18 Feb 2026 21:18:57 +0100
Subject: [PATCH 1227/1357] Studierendenverwaltung archivieren: error message
 when no studentlehrverband found

---
 .../controllers/api/frontend/v1/Documents.php |  4 ++-
 .../controllers/jobs/PlausiIssueProducer.php  |  4 +++
 system/phrasesupdate.php                      | 30 ++++++++++++++++---
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 7b2fc4a15..dcc0bb9ac 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -208,7 +208,6 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
-		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -251,6 +250,9 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
+
+				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
+
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
diff --git a/application/controllers/jobs/PlausiIssueProducer.php b/application/controllers/jobs/PlausiIssueProducer.php
index b667e835d..0aaecf5f5 100644
--- a/application/controllers/jobs/PlausiIssueProducer.php
+++ b/application/controllers/jobs/PlausiIssueProducer.php
@@ -33,6 +33,10 @@ class PlausiIssueProducer extends PlausiIssueProducer_Controller
 	 */
 	public function run($studiensemester_kurzbz = null, $studiengang_kz = null)
 	{
+		//$a = $this->StudiensemesterModel->getByDate('2026-02-14', '2026-02-16');
+		$a = $this->StudiensemesterModel->getAktOrNextSemester();
+		var_dump(getData($a));
+		die();
 		// get Studiensemester
 		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5dc9bc1c0..efe300955 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44644,9 +44644,9 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Für den gesamten Studiengang verbindlicher Termin.  
-				
-				Liegt ein Termin in der Vergangenheit, kann nichts mehr hochgeladen werden. Ist es dennoch erforderlich, 
+				'text' => "Für den gesamten Studiengang verbindlicher Termin.
+
+				Liegt ein Termin in der Vergangenheit, kann nichts mehr hochgeladen werden. Ist es dennoch erforderlich,
 				haben Studierende bei der Studiengangsassistenz um eine Korrektur dieses Termins anzusuchen.",
 				'description' => '',
 				'insertvon' => 'system'
@@ -44837,7 +44837,7 @@ array(
 			array(
 				'sprache' => 'German',
 				'text' => "Verspätete Projektabgabe ist bei Terminen, welche von der Studiengangsassistenz für den gesamten Studiengang fixiert wurden nicht erlaubt!
-				
+
 				Um einen Endupload durchführen zu können, müssen Sie ein positiv benotetes Quality Gate 1 & Quality Gate 2 in der relevanten Projektarbeit absolviert haben.",
 				'description' => '',
 				'insertvon' => 'system'
@@ -55923,6 +55923,28 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Refactor Messages END
+	//
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'error_noLehrverbandAssigned',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'StudentIn ist in diesem Semester keinem Lehrverband zugeteilt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student has no assignment to any teaching association',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 

From f068b56083b81ef18195a636fb7ce21df8dedb65 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 18 Feb 2026 22:30:29 +0100
Subject: [PATCH 1228/1357] PlausiIssueProducer: removed debugging output and
 die

---
 application/controllers/jobs/PlausiIssueProducer.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/application/controllers/jobs/PlausiIssueProducer.php b/application/controllers/jobs/PlausiIssueProducer.php
index 0aaecf5f5..b667e835d 100644
--- a/application/controllers/jobs/PlausiIssueProducer.php
+++ b/application/controllers/jobs/PlausiIssueProducer.php
@@ -33,10 +33,6 @@ class PlausiIssueProducer extends PlausiIssueProducer_Controller
 	 */
 	public function run($studiensemester_kurzbz = null, $studiengang_kz = null)
 	{
-		//$a = $this->StudiensemesterModel->getByDate('2026-02-14', '2026-02-16');
-		$a = $this->StudiensemesterModel->getAktOrNextSemester();
-		var_dump(getData($a));
-		die();
 		// get Studiensemester
 		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
 

From 7169cb68a2bbbf9d284ee99fabc366d7214ad954 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 19 Feb 2026 09:20:10 +0100
Subject: [PATCH 1229/1357] fix bug when sending multi messages introduced by
 loading time optimisation

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

diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 5e247ddb5..e1fb69dc3 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -158,7 +158,7 @@ export default {
 		</form>
 
 		<message-modal
-			v-if="tablebuilt"
+			v-if="tablebuilt || id.length > 1"
 			ref="modalMsg"
 			:type-id="typeId"
 			:id="id"
@@ -172,7 +172,7 @@ export default {
 		<!--in same page-->
 		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
-				v-if="tablebuilt"
+				v-if="tablebuilt || id.length > 1"
 				ref="templateNewDivMessage"
 				:type-id="typeId"
 				:id="id"

From 1e8ec83965a29b4dfc4265840186e205268fa2f1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 19 Feb 2026 11:57:28 +0100
Subject: [PATCH 1230/1357] add tileUid to StudentHeader, show Tiles only for
 selection of 1 student, just allow single selection of Mitarbeiter in
 MitarbeiterHeader

---
 public/js/components/DetailHeader/DetailHeader.js       | 2 +-
 public/js/components/Stv/Studentenverwaltung/Details.js | 1 +
 public/js/components/Vertraege/MitarbeiterHeader.js     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 434e9372b..5e25708b7 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -269,7 +269,7 @@ export default {
 					  </h5>
 
 				</div>
-				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
+				<div v-if="headerData.length == 1" class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
 					<div class="d-flex py-1">
 						<div class="px-2" style="min-width: 100px;">
 							<slot name="issues"></slot>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 493806d0e..e59492cf5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -97,6 +97,7 @@ export default {
 				@reload="reloadList"
 				fotoEditable
 			>
+				<template #uid>{{students[0].uid}}</template>
 				<template #titleAlphaTile>PersID</template>
 				<template #valueAlphaTile>{{tile_PersId}}</template>
 				<template #titleBetaTile>MatrNr</template>
diff --git a/public/js/components/Vertraege/MitarbeiterHeader.js b/public/js/components/Vertraege/MitarbeiterHeader.js
index f1e8d979d..20777abef 100644
--- a/public/js/components/Vertraege/MitarbeiterHeader.js
+++ b/public/js/components/Vertraege/MitarbeiterHeader.js
@@ -66,7 +66,7 @@ export default {
 				persistenceID: 'core-mitarbeiter-2026021701',
 				footerElement: '<div>&sum; <span id="search_count"></span> / <span id="total_count"></span></div>',
 				selectableRowsRangeMode: 'click',
-				selectableRows: true,
+				selectableRows: 1,
 			},
 			tabulatorEvents: [
 				{

From d279f955a09233e52dc1923a6d28c06b24ed3539 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 19 Feb 2026 15:12:38 +0100
Subject: [PATCH 1231/1357] add emit-event for resetFilter

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index a2c348774..f6bb4d657 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -88,6 +88,7 @@ export default {
 		},
 		resetFilter(){
 			this.filters = [];
+			this.$emit("change", this.filters);
 		}
 	},
 	created() {

From 118dcbd252614ed997164f2555fe9a7605d00279 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 19 Feb 2026 15:45:34 +0100
Subject: [PATCH 1232/1357] remove testoutput

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index f6bb4d657..1584f1c7e 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -70,7 +70,6 @@ export default {
 		cleanFilters: {
 			//only emit if filteredValue is not empty array
 			handler(newVal) {
-				console.log("emitting clean filters", newVal);
 				if (newVal.length)
 					this.$emit("change", newVal);
 			},

From 4b1a9fe8928c7984bd3731217c9d1b4a25ade76e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 19 Feb 2026 17:33:41 +0100
Subject: [PATCH 1233/1357] avoid loading paabgaben a 2nd time for mitarbeiter;
 extracted getDateStyleClass from components;

---
 .../controllers/api/frontend/v1/Abgabe.php    |   8 ++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  67 ++++------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   2 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  48 +------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 118 ++++++++----------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  44 +------
 .../Cis/Abgabetool/getDateStyleClass.js       |  37 ++++++
 7 files changed, 126 insertions(+), 198 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/getDateStyleClass.js

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index f0744fb99..a6390e97d 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -531,6 +531,14 @@ class Abgabe extends FHCAPI_Controller
 			$pa->beurteilungLinkNew = $newLink;
 			$pa->beurteilungLinkOld = $oldLink;
 
+			// has previously been retrieved via getStudentProjektabgaben but is fetched in advance to avoid having to reload abgaben
+			$projektarbeitIsCurrent = false;
+			$returnFunc = function ($result) use (&$projektarbeitIsCurrent) {
+				$projektarbeitIsCurrent = $result;
+			};
+			Events::trigger('projektarbeit_is_current', $pa->projektarbeit_id, $returnFunc);
+			$pa->isCurrent = $projektarbeitIsCurrent;
+			
 			$filterFunc = function($projektabgabe) use ($pa) {
 				return $projektabgabe->projektarbeit_id == $pa->projektarbeit_id;
 			};
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index f86fa44d9..b760f567d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -1,8 +1,8 @@
 import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
+import { getDateStyleClass } from "./getDateStyleClass.js";
 
-const today = new Date()
 export const AbgabeMitarbeiterDetail = {
 	name: "AbgabeMitarbeiterDetail",
 	components: {
@@ -125,10 +125,12 @@ export const AbgabeMitarbeiterDetail = {
 					
 					// only insert new abgabe if we actually created a new one, not when saving/editing existing
 					if(!existingTerminRes){
+						newTerminRes.dateStyle = getDateStyleClass(newTerminRes, this.notenOptions)
 						this.projektarbeit.abgabetermine.push(newTerminRes)
 					} else {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
+						termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 					}
 					
 					this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
@@ -270,40 +272,6 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
 			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
-		getDateStyleClass(termin) {
-			const zone = 'Europe/Vienna';
-			const today = luxon.DateTime.now().setZone(zone);
-			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
-			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
-			termin.diffindays = datum.diff(today, 'days').days;
-			const isLate = abgabedatum && abgabedatum > datum;
-
-			// GRADE STATUS
-			if (termin.note) {
-				if (termin.note.positiv) return 'bestanden';
-				return 'nichtbestanden';
-			}
-
-			// ACTION REQUIRED FOR GRADE
-			if (termin.bezeichnung?.benotbar && datum < today) {
-				return 'beurteilungerforderlich';
-			}
-
-			// SUBMISSION STATUS
-			if (termin.upload_allowed) {
-				if (termin.abgabedatum) {
-					return isLate ? 'verspaetet' : 'abgegeben';
-				}
-
-				// no submission yet
-				if (datum < today) return 'verpasst';
-				if (termin.diffindays <= 12) return 'abzugeben';
-				return 'standard';
-			}
-
-			// GENERIC STATUS
-			return datum < today ? 'verpasst' : 'standard';
-		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
 		},
@@ -769,20 +737,29 @@ export const AbgabeMitarbeiterDetail = {
 			</div>
 		</div>
 		<Accordion :multiple="true">
-			<template v-for="termin in this.projektarbeit?.abgabetermine">
-				<AccordionTab :headerClass="getDateStyleClass(termin) + '-header'">
+			<template v-for="termin in this.projektarbeit?.abgabetermine" :key="termin.paabgabe_id">
+				<AccordionTab :headerClass="termin.dateStyle + '-header'">
 					<template #header>
 						<div class="d-flex flex-nowrap align-items-center w-100">
 			
 							<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -66px;">
-								<i v-if="getDateStyleClass(termin) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>
-								<i v-else-if="getDateStyleClass(termin) == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>
+<!--								<i v-if="getDateStyleClass(termin, notenOptions) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>-->
+<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>-->
+								
+								<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
+								<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
+								<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
+								<i v-else-if="termin.dateStyle == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>
+								<i v-else-if="termin.dateStyle == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>
+								<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
+								<i v-else-if="termin.dateStyle == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>
+								<i v-else-if="termin.dateStyle == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>
 							
 							</div>
 					
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 9c14c2948..da3f84047 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -344,7 +344,7 @@ export const AbgabeStudentDetail = {
 			</div>
 			
 			<Accordion :multiple="true">
-				<template v-for="termin in this.projektarbeit?.abgabetermine">
+				<template v-for="termin in this.projektarbeit?.abgabetermine" :key="termin.paabgabe_id">
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
 							<div class="d-flex flex-nowrap align-items-center w-100">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index fb6a8cd64..290a3d2ec 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -8,6 +8,7 @@ import ApiStudiensemester from '../../../api/factory/studiensemester.js';
 import AbgabeterminStatusLegende from "./StatusLegende.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { splitMailsHelper } from "../../../helpers/EmailHelpers.js"
+import { getDateStyleClass} from "./getDateStyleClass.js";
 
 export const AbgabetoolAssistenz = {
 	name: "AbgabetoolAssistenz",
@@ -381,10 +382,11 @@ export const AbgabetoolAssistenz = {
 			
 			// calculate Abgabetermin time diff to now and assign last and next to projekt
 			projekt.abgabetermine.forEach(termin => {
-				
+
+				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 				
 				// while already looping through each termin, calculate datestyle beforehand
-				termin.dateStyle = this.getDateStyleClass(termin)
+				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 
 				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
@@ -720,7 +722,6 @@ export const AbgabetoolAssistenz = {
 			return nowInVienna > deadline;
 		},
 		setDetailComponent(details){
-			
 			const pa = this.projektarbeiten.find(projektarbeit => projektarbeit.projektarbeit_id == details.projektarbeit_id)
 
 			if(pa?.abgabetermine?.length) {
@@ -750,9 +751,7 @@ export const AbgabetoolAssistenz = {
 
 				// assistenz are not allowed to delete deadlines with existing submissions
 				termin.allowedToDelete = paIsBenotet ? false : !termin.abgabedatum
-
-				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
-
+				
 			})
 			
 			const vorname = pa.vorname ?? pa.student_vorname
@@ -760,43 +759,8 @@ export const AbgabetoolAssistenz = {
 			pa.student = `${vorname} ${nachname}`
 
 			this.selectedProjektarbeit = pa
-
 			this.$refs.modalContainerAbgabeDetail.show()
 		},
-		getDateStyleClass(termin) {
-			const zone = 'Europe/Vienna';
-			const today = luxon.DateTime.now().setZone(zone);
-			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
-			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
-			termin.diffindays = datum.diff(today, 'days').days;
-			const isLate = abgabedatum && abgabedatum > datum;
-
-			// GRADE STATUS
-			if (termin.note) {
-				if (termin.note.positiv) return 'bestanden';
-				return 'nichtbestanden';
-			}
-
-			// ACTION REQUIRED FOR GRADE
-			if (termin.bezeichnung?.benotbar && datum < today) {
-				return 'beurteilungerforderlich';
-			}
-
-			// SUBMISSION STATUS
-			if (termin.upload_allowed) {
-				if (termin.abgabedatum) {
-					return isLate ? 'verspaetet' : 'abgegeben';
-				}
-
-				// no submission yet
-				if (datum < today) return 'verpasst';
-				if (termin.diffindays <= 12) return 'abzugeben';
-				return 'standard';
-			}
-
-			// GENERIC STATUS
-			return datum < today ? 'verpasst' : 'standard';
-		},
 		openTimeline(val) {
 			const projekt = this.projektarbeiten.find(p => p.projektarbeit_id == val.projektarbeit_id)
 			if(!projekt) {
@@ -867,7 +831,7 @@ export const AbgabetoolAssistenz = {
 					case 'abgegeben':
 						icon = '<i class="fa-solid fa-paperclip"></i>'
 						break
-					case 'beurteilungerfolderlich':
+					case 'beurteilungerforderlich':
 						icon = '<i class="fa-solid fa-list-check"></i>'
 						break
 					case 'bestanden':
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2453f33bf..cc1c40407 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -4,6 +4,7 @@ import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
+import { getDateStyleClass } from "./getDateStyleClass.js";
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -366,7 +367,7 @@ export const AbgabetoolMitarbeiter = {
 			projekt.abgabetermine.forEach(termin => {
 				
 				// while already looping through each termin, calculate datestyle beforehand
-				termin.dateStyle = this.getDateStyleClass(termin)
+				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 
 				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
@@ -389,40 +390,6 @@ export const AbgabetoolMitarbeiter = {
 			// seperate check for quality gates
 			this.checkQualityGateStatus(projekt)
 		},
-		getDateStyleClass(termin) {
-			const zone = 'Europe/Vienna';
-			const today = luxon.DateTime.now().setZone(zone);
-			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
-			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
-			termin.diffindays = datum.diff(today, 'days').days;
-			const isLate = abgabedatum && abgabedatum > datum;
-
-			// GRADE STATUS
-			if (termin.note) {
-				if (termin.note.positiv) return 'bestanden';
-				return 'nichtbestanden';
-			}
-
-			// ACTION REQUIRED FOR GRADE
-			if (termin.bezeichnung?.benotbar && datum < today) {
-				return 'beurteilungerforderlich';
-			}
-
-			// SUBMISSION STATUS
-			if (termin.upload_allowed) {
-				if (termin.abgabedatum) {
-					return isLate ? 'verspaetet' : 'abgegeben';
-				}
-
-				// no submission yet
-				if (datum < today) return 'verpasst';
-				if (termin.diffindays <= 12) return 'abzugeben';
-				return 'standard';
-			}
-
-			// GENERIC STATUS
-			return datum < today ? 'verpasst' : 'standard';
-		},
 		abgabterminFormatter(cell) {
 			const val = cell.getValue()
 
@@ -444,7 +411,7 @@ export const AbgabetoolMitarbeiter = {
 					case 'abgegeben':
 						icon = '<i class="fa-solid fa-paperclip"></i>'
 						break
-					case 'beurteilungerfolderlich':
+					case 'beurteilungerforderlich':
 						icon = '<i class="fa-solid fa-list-check"></i>'
 						break
 					case 'bestanden':
@@ -607,44 +574,57 @@ export const AbgabetoolMitarbeiter = {
 		},
 		setDetailComponent(details){
 			this.loading=true
-			this.loadAbgaben(details).then((res)=> {
-				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-				pa.abgabetermine = res.data[0].retval
-				pa.isCurrent = res.data[1]
 
-				let paIsBenotet = false
-				if(pa.note !== undefined && pa.note !== null) {
-					// check if the note is not defined as a non final projektarbeit note
-					const opt = this.notenOptionsNonFinal.find(opt => opt.note)
-					// if thats the case allow further work
-					if(opt) paIsBenotet = false
-					// else the PA is to be considered finished
-					paIsBenotet = true
-				}
+			const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 
-				pa.abgabetermine.forEach(termin => {
-					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
-					termin.file = []
-					
-					// update 08-01-2026: everybody is allowed to do everything in client, critical checks happen at backend level
-					// termin.allowedToSave = true
-					
-					// update 21-01-2026: actually blocking operations on finished projektarbeiten seems like a decent idea
-					termin.allowedToSave = paIsBenotet ? false : true
-					
-					// lektoren are not allowed to delete deadlines with existing submissions
-					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
-					
-					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
+			let paIsBenotet = false
+			if(pa.note !== undefined && pa.note !== null) {
+				// check if the note is not defined as a non final projektarbeit note
+				const opt = this.notenOptionsNonFinal.find(opt => opt.note)
+				// if thats the case allow further work
+				if(opt) paIsBenotet = false
+				// else the PA is to be considered finished
+				paIsBenotet = true
+			}
 
-				})
-				pa.student_uid = details.student_uid
-				pa.student = `${pa.vorname} ${pa.nachname}`
+			if(pa?.abgabetermine?.length) {
+				this.$api.call(ApiAbgabe.getSignaturStatusForProjektarbeitAbgaben(pa.abgabetermine.map(termin => termin.paabgabe_id), pa.student_uid))
+					.then(res => {
+						if(res.meta.status === 'success') {
+							res.data.forEach(paabgabe => {
+								const termin = pa.abgabetermine.find(abgabe => abgabe.paabgabe_id == paabgabe.paabgabe_id)
+								if(termin && paabgabe.signatur !== undefined) termin.signatur = paabgabe.signatur
+							})
+						}
+					})
+			}
+
+			pa.abgabetermine.forEach(termin => {
+				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				termin.file = []
 				
-				this.selectedProjektarbeit = pa
-				this.$refs.modalContainerAbgabeDetail.show()
+				// update 08-01-2026: everybody is allowed to do everything in client, critical checks happen at backend level
+				// termin.allowedToSave = true
+				
+				// update 21-01-2026: actually blocking operations on finished projektarbeiten seems like a decent idea
+				termin.allowedToSave = paIsBenotet ? false : true
+				
+				// lektoren are not allowed to delete deadlines with existing submissions
+				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+				
+				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
+
+			})
+			
+			pa.student_uid = details.student_uid
+			pa.student = `${pa.vorname} ${pa.nachname}`
+			
+			this.selectedProjektarbeit = pa
+			this.$refs.modalContainerAbgabeDetail.show()
+		
+		
+			this.loading = false
 			
-			}).finally(()=>{this.loading = false})
 		},
 		centeredTextFormatter(cell) {
 			const val = cell.getValue()
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index a0df7a81d..ccdfd6eb2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -2,8 +2,8 @@ import AbgabeDetail from "./AbgabeStudentDetail.js";
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import BsModal from "../../Bootstrap/Modal.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
+import { getDateStyleClass} from "./getDateStyleClass.js";
 
-const today = new Date()
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
@@ -48,44 +48,6 @@ export const AbgabetoolStudent = {
 		};
 	},
 	methods: {
-		getDateStyleClass(termin) {
-			const zone = 'Europe/Vienna';
-			const today = luxon.DateTime.now().setZone(zone);
-			const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
-			const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
-			termin.diffindays = datum.diff(today, 'days').days;
-			const isLate = abgabedatum && abgabedatum > datum;
-
-			// GRADE STATUS
-			if (termin.note) {
-				if(Number.isInteger(termin.note)) {
-					const opt = this.notenOptions.find(opt => opt.note == termin.note)
-					if(opt.positiv) return 'bestanden'
-				}
-				if (termin.note.positiv) return 'bestanden';
-				return 'nichtbestanden';
-			}
-
-			// ACTION REQUIRED FOR GRADE
-			if (termin.bezeichnung?.benotbar && datum < today) {
-				return 'beurteilungerforderlich';
-			}
-
-			// SUBMISSION STATUS
-			if (termin.upload_allowed) {
-				if (termin.abgabedatum) {
-					return isLate ? 'verspaetet' : 'abgegeben';
-				}
-
-				// no submission yet
-				if (datum < today) return 'verpasst';
-				if (termin.diffindays <= 12) return 'abzugeben';
-				return 'standard';
-			}
-
-			// GENERIC STATUS
-			return datum < today ? 'verpasst' : 'standard';
-		},
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
 			let qgate2Passed = false
@@ -178,7 +140,7 @@ export const AbgabetoolStudent = {
 					
 					
 					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
-					termin.dateStyle = this.getDateStyleClass(termin)
+					termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 				})
 				
 				pa.betreuer = this.buildBetreuer(pa)
@@ -368,7 +330,7 @@ export const AbgabetoolStudent = {
 	</div>
 	
 	<Accordion :multiple="true" :activeIndex="activeTabIndex">
-		<template v-for="projektarbeit in projektarbeiten">
+		<template v-for="projektarbeit in projektarbeiten" :key="projektarbeit.projektarbeit_id">
 			<AccordionTab>
 				
 				<template #header>
diff --git a/public/js/components/Cis/Abgabetool/getDateStyleClass.js b/public/js/components/Cis/Abgabetool/getDateStyleClass.js
new file mode 100644
index 000000000..0449ad40a
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/getDateStyleClass.js
@@ -0,0 +1,37 @@
+
+const zone = 'Europe/Vienna';
+const today = luxon.DateTime.now().setZone(zone);
+
+export function getDateStyleClass(termin, notenOptions) {
+	const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
+	const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
+	termin.diffindays = datum.diff(today, 'days').days;
+	const isLate = abgabedatum && abgabedatum > datum;
+
+	// GRADE STATUS
+	if (termin.note) {
+		const opt = typeof termin.note === 'object' ? termin.note : notenOptions.find(nopt => nopt.note == termin.note)
+		if (opt?.positiv === true) return 'bestanden';
+		else if (opt?.positiv === false) return 'nichtbestanden';
+	}
+	
+	// ACTION REQUIRED FOR GRADE
+	if (termin.bezeichnung?.benotbar && datum <= today) {
+		return 'beurteilungerforderlich';
+	}
+
+	// SUBMISSION STATUS
+	if (termin.upload_allowed) {
+		if (termin.abgabedatum) {
+			return isLate ? 'verspaetet' : 'abgegeben';
+		}
+
+		// no submission yet
+		if (datum < today) return 'verpasst';
+		if (termin.diffindays <= 12) return 'abzugeben';
+		return 'standard';
+	}
+
+	// GENERIC STATUS
+	return datum < today ? 'verpasst' : 'standard';
+}
\ No newline at end of file

From d98b7fd67a84e187708fce8323aa737863e8966c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 19 Feb 2026 18:34:27 +0100
Subject: [PATCH 1234/1357] fix duplicates in lvplan for special groups

---
 application/models/ressource/Stundenplan_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 067e2b790..d0a97ed9d 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -470,12 +470,12 @@ class Stundenplan_model extends DB_Model
 				}
 				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
 				{
-					$query .= "((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
+					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)
-						." AND ".$this->escape($sem_date_range->ende).")". $stringGroupLv. ")";
+						." AND ".$this->escape($sem_date_range->ende).")) AND gruppe_kurzbz is null)";
 
 					$query .="OR";
 				}

From f4e0516d893129359abc930781a4d9c5cf7fb7ce Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Fri, 20 Feb 2026 11:20:09 +0100
Subject: [PATCH 1235/1357] =?UTF-8?q?Pr=C3=BCfung=20ob=20jede=20Fragen=20m?=
 =?UTF-8?q?indestens=202=20Vorschl=C3=A4ge=20hat=20auf=20Warning=20ge?=
 =?UTF-8?q?=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Kleines Padding vor "Blättern"-Text
---
 cis/testtool/frage.php   |  4 ++--
 include/gebiet.class.php | 49 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
index bf2ee24c5..a5f4100c9 100644
--- a/cis/testtool/frage.php
+++ b/cis/testtool/frage.php
@@ -581,14 +581,14 @@ if($frage->frage_id!='')
 			else
 				$value=$p->t('testtool/blaettern').' &gt;&gt;';
 
-			echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item'>$value</a>";
+			echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$nextfrage' class='Item' style='padding-left: 5px'>$value</a>";
 		}
 		else
 		{
 			if(!$demo)
 			{
 				//Wenns der letzte Eintrag ist, wieder zum ersten springen
-				echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
+				echo "<a href='$PHP_SELF?gebiet_id=$gebiet_id' class='Item' style='padding-left: 5px'>".$p->t('testtool/blaettern')." &gt;&gt;</a>";
 			}
 		}
 	}
diff --git a/include/gebiet.class.php b/include/gebiet.class.php
index a4df72338..fd2bfd198 100644
--- a/include/gebiet.class.php
+++ b/include/gebiet.class.php
@@ -345,6 +345,7 @@ class gebiet extends basis_db
 		}
 
 		//Pruefen ob jede Fragen mindestens 2 Vorschlaege hat
+		//Angepasst am 28.01.2026 auf ein Warning.
 		$qry = "SELECT frage_id, nummer FROM testtool.tbl_frage
 				WHERE (SELECT count(*) as anzahl FROM testtool.tbl_vorschlag WHERE frage_id=tbl_frage.frage_id)<2
 				AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." AND NOT demo;";
@@ -352,7 +353,7 @@ class gebiet extends basis_db
 		{
 			while($row = $this->db_fetch_object())
 			{
-				$this->errormsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
+				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id) hat weniger als 2 Vorschlaege.\n";
 			}
 		}
 
@@ -448,6 +449,52 @@ class gebiet extends basis_db
 			}
 		}
 
+		//Pruefen ob es leere Fragen (ohne Text, Bild oder Audio) gibt
+		$qry = "SELECT
+					fr.frage_id,
+					fr.nummer,
+					fs.sprache
+				FROM
+					testtool.tbl_frage fr
+				JOIN testtool.tbl_frage_sprache fs
+						USING (frage_id)
+				WHERE
+					(fs.text IS NULL
+						OR fs.text = '')
+					AND fs.bild IS NULL
+					AND fs.audio IS NULL
+					AND demo = false
+					AND gebiet_id=".$this->db_add_param($gebiet_id, FHC_INTEGER)." 
+					AND EXISTS (
+					SELECT
+						1
+					FROM
+						testtool.tbl_frage fr2
+					JOIN testtool.tbl_frage_sprache fs2
+							USING (frage_id)
+					WHERE
+						fs2.sprache = fs.sprache
+						AND fr2.gebiet_id = fr.gebiet_id
+						AND fr2.frage_id != fr.frage_id
+						AND (
+							(fs2.text IS NOT NULL
+							AND fs2.text != '')
+						OR fs2.bild IS NOT NULL
+						OR fs2.audio IS NOT NULL
+							)
+						AND demo = false
+					)
+				ORDER BY
+					fs.sprache,
+					fr.nummer;";
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->warningmsg .= "Frage Nummer $row->nummer (ID: $row->frage_id), Sprache $row->sprache hat keinen Text, Bild oder Audio.\n";
+			}
+		}
+
 		if($this->errormsg=='')
 			return true;
 		else

From 5558f6fc1758ab2632e2c846668e889bea5fd428 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 20 Feb 2026 12:20:26 +0100
Subject: [PATCH 1236/1357] Signatur Sammelmail Job an Assistenz

---
 .../controllers/jobs/AbgabetoolJob.php        | 263 +++++++++++++++++-
 .../models/education/Paabgabe_model.php       |  45 +--
 system/phrasesupdate.php                      |  20 ++
 3 files changed, 310 insertions(+), 18 deletions(-)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 51b2b4920..3e0774538 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -22,11 +22,272 @@ class AbgabetoolJob extends JOB_Controller
 		$this->_ci->load->model('crm/Student_model', 'StudentModel');
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
-
+		
+		$this->_ci->load->library('SignatureLib');
+		
 		$this->_ci->load->config('abgabe');
 		$this->loadPhrases([
 			'abgabetool'
 		]);
+		
+		
+	}
+	
+	// basically the notifyBetreuerMail function but email goes to assistenz
+	// and new abgaben are further evaluated for missing signature status
+	public function notifyAssistenzAboutMissingSignatureUploads() {
+		$this->_ci->logInfo('Start job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
+		
+		$interval = $this->_ci->config->item('PAABGABE_EMAIL_JOB_INTERVAL');
+		$relevantTypes = $this->_ci->config->item('RELEVANT_PAABGABETYPEN_SAMMELMAIL_ASSISTENZ');
+
+		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSinceByAbgabedatum($interval, $relevantTypes);
+		$retval = getData($result);
+
+		// retval are paabgaben joined with projektarbeit and betreuer
+		if(count($retval) == 0) {
+			$this->logInfo("Keine Emails über neue Paabgaben an Assistenzen versandt");
+			return;
+		}
+
+		// group changed/new abgaben for projektarbeiten
+		$projektarbeiten = [];
+		foreach($retval as $abgabeWithNewUpload) {
+			// Check if the current item has a 'projektarbeit_id' field.
+			// Replace 'projektarbeit_id' with the actual key name if it's different.
+			if (isset($abgabeWithNewUpload->projektarbeit_id)) {
+				$projektarbeitId = $abgabeWithNewUpload->projektarbeit_id;
+
+				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
+				// initialize it as an empty array.
+				if (!isset($projektarbeiten[$projektarbeitId])) {
+					$projektarbeiten[$projektarbeitId] = [];
+				}
+				
+				// check signature for that abgabe, main point of this job
+				$this->checkAbgabeSignatur($abgabeWithNewUpload, $abgabeWithNewUpload->student_uid);
+				
+				// Add the current row to the array associated with its 'projektarbeit_id'.
+				$projektarbeiten[$projektarbeitId][] = $abgabeWithNewUpload;
+			}
+		}
+
+		// for each projektarbeit fetch their assistenz and same them in their own dictionary to avoid too many mails
+		$assistenzMap = [];
+		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
+		$projektarbeitBetreuerMap = [];
+		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {
+
+			$assistenzResult = $this->_ci->OrganisationseinheitModel->getAssistenzForOE($abgaben[0]->stg_oe_kurzbz);
+
+			forEach($assistenzResult->retval as $assistenzRow) {
+				if (!isset($assistenzMap[$assistenzRow->person_id])) {
+					$assistenzMap[$assistenzRow->person_id] = [];
+				}
+
+				// Add the current $assistenzRow to the $assistenzMap as an array associated with its projektarbeit_id.
+				$assistenzMap[$assistenzRow->person_id][] = [$projektarbeit_id, $assistenzRow];
+			}
+
+			$betreuerResult = $this->_ci->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+
+			forEach($betreuerResult->retval as $betreuerRow) {
+				if (!isset($projektarbeitBetreuerMap[$projektarbeit_id])) {
+					$projektarbeitBetreuerMap[$projektarbeit_id] = [];
+				}
+
+				// Add the current betreuerRow to the betreuerMap as an array associated with its projektarbeit_id.
+				$projektarbeitBetreuerMap[$projektarbeit_id][] = $betreuerRow;
+			}
+			
+		}
+
+		$count = 0;
+		foreach($assistenzMap as $assistenz_person_id => $tupelArr) {
+
+			$abgabenString = '<div style="font-family: Arial, sans-serif; color: #333;">';
+			$hasIssues = false; // Track if this assistant actually needs an email
+
+			foreach($tupelArr as $tupel) {
+				$projektarbeit_id = $tupel[0];
+				$assistenzRow = $tupel[1];
+
+				$betreuerArray = $projektarbeitBetreuerMap[$projektarbeit_id] ?? [];
+				$allAbgaben = $projektarbeiten[$projektarbeit_id];
+
+				// only keep abgaben that are not correctly signed
+				$issueAbgaben = array_filter($allAbgaben, function($abgabe) {
+					// We only care about cases where it's explicitly NOT true (false, error, or null)
+					return $abgabe->signatur !== true;
+				});
+
+				// if this specific project has no signature issues, skip to the next project
+				if(empty($issueAbgaben)) {
+					continue;
+				}
+
+				// If we reached here, we have at least one issue to report
+				$hasIssues = true;
+
+				// Format the Student Name (using the first available abgabe object)
+				$s = reset($issueAbgaben);
+				$nameParts = array_filter([$s->titelpre, $s->vorname, $s->nachname, $s->titelpost]);
+				$studentFullName = implode(' ', $nameParts);
+
+				// Format the Supervisors string
+				$betreuerStrings = [];
+				foreach($betreuerArray as $b) {
+					$bNameParts = array_filter([$b->titelpre, $b->vorname, $b->nachname, $b->titelpost]);
+					$bFullName = implode(' ', $bNameParts);
+					$betreuerStrings[] = "{$bFullName} ({$b->betreuerart_kurzbz})";
+				}
+				$allBetreuerFormatted = implode(', ', $betreuerStrings);
+
+				$projektarbeit_titel = $s->titel ?? 'Kein Titel vergeben';
+
+				// Project Header Section
+				$abgabenString .= "
+             <div style='margin-top: 25px; padding: 12px; background-color: #fff5f5; border-left: 4px solid #dc3545; border-bottom: 1px solid #fee;'>
+                <strong style='font-size: 16px; color: #b02a37;'>Projekt: {$projektarbeit_titel}</strong><br/>
+                <div style='margin-top: 5px; font-size: 14px;'>
+                   <strong>Studierende/r:</strong> {$studentFullName}
+                </div>
+                <div style='margin-top: 3px; font-size: 14px;'>
+                   <strong>Betreuer:</strong> {$allBetreuerFormatted}
+                </div>
+                <span style='color: #666; font-size: 12px;'>
+                   ID: {$projektarbeit_id} | Stg: {$s->stgtyp}{$s->stgkz} ({$s->studiensemester_kurzbz})
+                </span>
+             </div>";
+
+				// Start Table
+				$abgabenString .= '
+             <table style="width: 100%; border-collapse: collapse; margin-bottom: 25px;">
+                <thead>
+                   <tr style="background-color: #f8f9fa; text-align: left;">
+                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 20%;">Datum</th>
+                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 45%;">Abgabe/Bezeichnung</th>
+                      <th style="padding: 10px; border: 1px solid #ddd; font-size: 13px; width: 35%;">Status</th>
+                   </tr>
+                </thead>
+                <tbody>';
+
+				$printed = []; // lazy hack to avoid duplicate rows
+				foreach ($issueAbgaben as $abgabe) {
+					// if we had this paabgabe already (erstbetreuer/zweitbetreuer fetch achieves duplicates
+					if(in_array($abgabe->paabgabe_id, $printed)) {
+						continue; // skip this forEach iteration
+					}
+					
+					$printed[] = $abgabe->paabgabe_id;
+					
+					$abgabedatumFormatted = (new DateTime($abgabe->abgabedatum))->format('d.m.Y');
+
+					// label and color
+					if ($abgabe->signatur === false) {
+						$sigLabel = "FEHLENDE SIGNATUR";
+						$sigBg = "#dc3545";
+					} elseif ($abgabe->signatur === 'error') {
+						$sigLabel = "PRÜFUNG FEHLGESCHLAGEN";
+						$sigBg = "#fd7e14";
+					} else {
+						$sigLabel = "DATEI NICHT GEFUNDEN";
+						$sigBg = "#6c757d";
+					}
+
+					$abgabenString .= "
+                <tr>
+                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; vertical-align: top;'>{$abgabedatumFormatted}</td>
+                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px;'>
+                      <strong>{$abgabe->bezeichnung}</strong>
+                   </td>
+                   <td style='padding: 10px; border: 1px solid #ddd; font-size: 13px; text-align: center;'>
+                      <span style='color: #fff; background-color: {$sigBg}; padding: 3px 8px; border-radius: 3px; font-weight: bold; font-size: 11px;'>
+                        {$sigLabel}
+                      </span>
+                   </td>
+                </tr>";
+				}
+
+				$abgabenString .= '</tbody></table>';
+			}
+
+			$abgabenString .= '</div>';
+
+			// only send the email if at least one project had an issue
+			if ($hasIssues) {
+				$assistenzRow = $tupelArr[0][1];
+				$anrede = $assistenzRow->anrede;
+				$anredeFillString = $assistenzRow->anrede == "Herr" ? "r" : "";
+				$fullFormattedNameString = $assistenzRow->first;
+
+				$path = $this->_ci->config->item('URL_ASSISTENZ');
+				$url = CIS_ROOT . $path;
+
+				$body_fields = array(
+					'anrede' => $anrede,
+					'anredeFillString' => $anredeFillString,
+					'fullFormattedNameString' => $fullFormattedNameString,
+					'abgabenString' => $abgabenString,
+					'linkAbgabetool' => $url
+				);
+
+				$email = $assistenzRow->uid . "@" . DOMAIN;
+
+				sendSanchoMail(
+					'PAANoSigAssSM',
+					$body_fields,
+					$email,
+					$this->p->t('abgabetool', 'c4missingSignatureNotification')
+				);
+
+				$count++;
+			}
+		}
+
+		$this->_ci->logInfo($count . " Emails bezüglich fehlender Signaturen erfolgreich versandt");
+		$this->_ci->logInfo('End job FHC-Core->notifyAssistenzAboutMissingSignatureUploads');
+	}
+
+	/**
+	 * helper function to check the signature status of uploaded files for zwischenabgabe & endupload
+	 */
+	private function checkAbgabeSignatur($abgabe, $student_uid) {
+		$paabgabetypenToCheck = $this->config->item('SIGNATUR_CHECK_PAABGABETYPEN');
+
+		if(!in_array($abgabe->paabgabetyp_kurzbz, $paabgabetypenToCheck)) {
+			return;
+		}
+
+		if (!defined('SIGNATUR_URL')) {
+			$abgabe->signatur = 'error';
+			return;
+		}
+
+		$path = PAABGABE_PATH.$abgabe->paabgabe_id.'_'.$student_uid.'.pdf';
+
+		$signaturVorhanden = null; // if frontend receives null -> indicates no file found at path
+		if(file_exists($path)) {
+
+			// Check if the document is signed
+			$signList = SignatureLib::list($path);
+			if (is_array($signList) && count($signList) > 0)
+			{
+				// The document is signed
+				$signaturVorhanden = true;
+			}
+			elseif ($signList === null)
+			{
+				// frontend knows to handle it this way for signatures
+				$signaturVorhanden = 'error';
+			}
+			else
+			{
+				$signaturVorhanden = false;
+			}
+
+			$abgabe->signatur = $signaturVorhanden;
+		}
 	}
 
 	public function notifyAssistenzAboutChangedAbgaben() {
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index a883043d3..be42b7660 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -86,27 +86,38 @@ class Paabgabe_model extends DB_Model
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
-	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval) {
-
-		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
-						campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
-						campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
-						lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
-						public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
+	public function findAbgabenNewOrUpdatedSinceByAbgabedatum($interval, $relevantTypes = null) {
+		
+		$queryParams = [$interval];
+		$query = "SELECT projektarbeit_id, paabgabe_id, paabgabetyp_kurzbz, fixtermin, datum, campus.tbl_paabgabe.kurzbz, campus.tbl_paabgabetyp.bezeichnung, campus.tbl_paabgabe.abgabedatum,
+					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
+					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
+					   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
+					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
+					   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 				
-				FROM campus.tbl_paabgabe 
-					JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
-					JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-					JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-					JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
-				 	JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+				FROM campus.tbl_paabgabe
+						 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
+						 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
+						 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+						 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+						 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+						 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+						 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
+						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?
-				ORDER BY abgabedatum DESC
-	";
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+		
+		if($relevantTypes !== null) {
+			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+			$queryParams[]= $relevantTypes;
+		}
 
-		return $this->execQuery($query, [$interval]);
+		$query .= " ORDER BY abgabedatum DESC";
+
+		return $this->execQuery($query, $queryParams);
 	}
 	
 	public function loadByIDs($paabgabe_ids) {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8860e2cf6..e21a167a3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -46393,6 +46393,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4missingSignatureNotification',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abgabetool: Fehlende Signatur bei Endupload',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submission tool: Missing signature at final upload',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

From 2228b4d683de20961dc4fcb73ddde35a07221bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 20 Feb 2026 13:29:01 +0100
Subject: [PATCH 1237/1357] Sancho Header LV-Evaluierung

---
 .../sancho/sancho_footer_lvevaluierung.jpg      | Bin 0 -> 41865 bytes
 .../sancho/sancho_header_lvevaluierung.jpg      | Bin 0 -> 90057 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 skin/images/sancho/sancho_footer_lvevaluierung.jpg
 create mode 100644 skin/images/sancho/sancho_header_lvevaluierung.jpg

diff --git a/skin/images/sancho/sancho_footer_lvevaluierung.jpg b/skin/images/sancho/sancho_footer_lvevaluierung.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4c72b26c65dbc88171eb5e74295c0944864ab676
GIT binary patch
literal 41865
zcmeFa1#}%rk|=t`U@=(Ccx744%*@PevBi=tW@cuKnJfkiEoPQ1X12wQU)?j^+cWK%
z-Z#CoZ}&gfx#wn9L`6haWJF|UWo6~lm#0+#l7xu32ms{ypa!7^0G<{Af<K@A1o>Bw
zpP2lsw7=3leFh*y1CF7_z(9}zpvWL#$RJN$0DJ%l02J)!ivWK;U|=DjpdrD)L4U&I
zg8UW#3l;zXhX8|wh5`Y7ng_svJ!6r;kN^OXy;kC!9*wU5xa_|^2Pspm!!Scmv;Hja
z-*+&?or(Mq@t@G|pHkFWFdh21t95GpIRF55rGIBAqczpa68(o_|CG=OYrZepv5VAx
z!Kifh>S(=hqej#T%f|0)N~e39dVBuZt{@dYn07A;{9!4-djS&3(Ly5Ep>7u0j!CqZ
z3xl3m0Yy*|{~g_bi}W6YXpPqD`6mFz!EVf1TVD;m-$ZnXbe6o}rM`Meq+?`w7vXn{
z{Tm=$9@ltigWqo;|M@IP*^Kh!0elb)Eq4bhlqudJe~0Pk@|~}rt5xw22ylY<{)iQp
zgmVstE%YB<_FX)fmPf&?WJ#SIH_QcBe=<XF6bo`i<chy>Irj_?E0WiDiGBn8Ggb$6
z5=lWhZ%L4P`OJ`DrT5dQ`lCndugtB|-@R1i;`{adZ!%y&Stf%+qQ8Otr%#}fufC0b
zct@LKjPnsY?keE@&SXEHlEqnfM*nK~shNHDh#^bIx^$JPpc^*so}x+ySV!vDu|TP`
zAs0qVY$VjR!MGL}*tmZnZ$NPv^V1*K+IOiznYl5HLai-6;!#QIR|d&ZGYHMKL-@!D
zGe`UIf?&MK9$3bR0v?KqWBFagTfN2=iLMFPaW<frltK5URZ}pHR#1nH^l@XiOUxot
z@cOO@z@IS}fW>09MaR?~4<n&i)~6u%*I#VRFiA6zU||%=Y_@&tBuZY&vlQWz8pO^h
zH#D#hLl_0?aaCgG6+pvM%ZcpG2J}*WfH~e8(DCz^_<rdCZ-Coj+JEeE-=`)zm~|RK
zx?l$thF=uiGgJ5&FicIVLU|LD?<r*P(&?3zY;Zn|5!JG+y2|=w?_#<5{7yZwT+Ipc
zwo(#f;&714?g{v{-4?BYK;HKS0RD`@1F$6=%RFvFo&eXJUJIm#FW)h*!JBBIklSbV
zn5>hmel&yF?2Ss%xG!_2Cv%mAikgrC(e>#!$t4D#>&1?l5xJQL_edL&4Wv;xC#916
zehL4SX8?#K=da*}EAM~H8`OmTG4UOL@o!<j$^R*hfMrl0vhTbd_?aKbipM+oyDI(P
zF#k^W&-fPrdjA~fI`i^QosNVnCMOU+*Kj0}?PEeGw6Hhvrd0Z^EsPg+M*n<$-rYa%
zO8q%4lMId>5gRT%JFtpd{Wvs~BGQbSrMH4Mv?L3W^?FfPcKieLjnSjbbPMelukWbf
zKR|!VnL#jl603S-t431<_un$QWn`8TnF&BhQbrBgsneLeO-oT7n%#=M;Z!+qGx!gY
z-^=|erv-oI%Cpq-AvU!j)FGan8r007o-8j2oebauR@hI*WyT{+74D(V8(V8Fc}e&^
z>A%AMR4)W<Et1TR!`1GDWhJAMXA=U&z`Qyj*p8$tt+Owx#}T=`>j{9w<ZRb}pI+jk
zTluTd?`Hm#Q{cbk&Na9#`|=mg@lODn8HPp@ukQ-_1^B0G;1?$UJpCc!pX=vW?6aai
zAMt&~9C`wH{R;dyWQ>kIo&e87Q92|52pAYB1Skaf^RV;h0~`_x0u2KU8Uz%RiS?xo
z5;_Z;9z7$o95M<j(ev;W`g!mQ0s*Q~X+kx)m3KOEW9C-Vs-gRuHX(6P@(1AmVSNZm
zzO<*-UcNgHZ29g#nQAdvw!;3X>T8vpeO0V~@WV{+TU*ajd;+jP0k8y@%a7b+7GFe$
zxOjG2Or>ZWYei=uk?QLd%5qxH7PRlmO>GTt$Wgw&y{YT*RjGireNec<&S<<Iz`uCs
z`ZX>`Z9~KDo+W-ee7N)U)uEuhK#V;{WPJvc)d!%5SbS?z{sfG1!<VQl*8RkWsfW=X
zxvP>-D@H0sTSAeVsu{YfYc&;2Rt!#2hVM2;ZK@P6y?>%LHg@fvjwsJpKzDB-HH}TZ
zkX$tP*x8_TonAVsqQ%qUcuf#7(LCN<@e0TJOyue@hoySe%6gjCw&*S+EbB=1U29)6
zQ`^^x>&g9iDuI-EoicSfVvVY_{1WZ5S@tf30%joLZ;RvH=<LYOtVOpRP*Id+I5k$e
zZ>n~|MD3FDl3V%(e!hRCqCoFo5FMj%HXCtCkn)j3IRwcfybNI;Z!qr%=x^c-&nSDh
z|4+eP%A}4Co-02WxnDvlg2`mIqiW2aD}L21sC^P?*MM_Qm<l)URoqv2di2W+vogia
z&F!h3oQ{}jN6r)`k7{Sl@ONNMnd_FbDaxoZ44(G&s1!45*#+<eN*eEHjW~6h;w21j
zUke0dwk^ilWnu9aDS^ch#5w|B_ml*$$l27DlyO95(|P7u;~sy_Dv$sw6^C18Z-(i9
z11Esa>E-=v(X0@>dox7Wuq4p0^DAMkl&^^UQvEZQZ8clvlW|XH8MXUbGV1WF$>h&3
z%EW1ss(^3!!xBZ#7jFmCHS3%>)HOLzFOS@M6kA8JR#ab26&#$6L<iJp-F&$^Lw%RX
zGJ1I~*=DY3;`hGI0w*J#-9qDz^|a@(d4S__Y)`ClUztZ59JeT!ytU-@x9WV)kzDv8
zQkf0kM`Y0m&$hpqu%lc}+VB>zHiq*0t>&=n#Hm`3rCkflN>P=Ai;GP>GP8=o@}##l
zO+lxLhfadiv~-;I1BzU4s;YQ&J^8!og%oEcl6k+6!?`jiD*flRifrUZG;cG$?P`on
zc=CS=cA*S3eB^q6vQh0xZFMk|Q}GP}CC_bN&9&`4E9;9ENPpjAY}q`Nx82^OLpSp~
zpD9m9uXcYnSNj~*aI%i$`TCTryv^!|o0?1SGwfje#unVGB{a`6lB)N|8-rbQD~a`1
zmBwKmXV^iZ85xQuUyn-aTh4pN-e{tiH5^Hoyc%BCTHsw6r+lR-JAVK&wy@Z&OGy99
zb~3{>9=tE_VWXZ3+Q_IV?zQ4;^3{<Agz+L>`Xp9W9r*%Qv2#4E8H}Y1cgDAY)gghe
zC1~sv8w(Fn{-ca`I2OJ|1-*gzxYC~*3d7Yk9T6c1$FD_CjTo}A&MybW-5Jqe9U?52
ziLgpFij3!miwk7ch8Pl9%H*GMNG^6}wI0QGDTH|z)R8x(gIj6OiG6+70s*?^P+O`!
zD2kq6TB%$xvsw63Au^S&h)hEMLDwpJ@U{|%BcDQwh_Q+?J|)zuY9WJY?`^&0)_k*e
z1+UEfMANqdPIb%T#i<RUuW?SDEKE41+}&-_eGEDin>{52VV}!G<zmHtwb22d4N;oV
z3OpVuha39I&0g8qe@ixe>~&sc+h2?>&O?my3)h3-7(&)Al-xO3p$o_qH((#%%Mp=}
zBQO*1pCG{J?~7v}iGL2{z=m|*Gg0QtN$oYPXsdZGyHNEn3mRi~-SY7Ys`lb1kIhC0
z<!^f$1;en0%ie|NWK-xX&BbOXN*UKVF3TjAPv}TP_9O8*CVQkR3J*&ap;@mz0g!)o
zi?~Ieg6phQwGvY<qL67a;g@xNRbg11ofh{g5_6320%Cx|z1<5$V!UQZ)`|5|J9exI
z`(hK2t#KGz4<_)8Q=bAuZgN;#`&wh2+!f^80`G+pT|Tv3D%wi2*-o)&Y*jk*Zb*Kc
zIjj?y$rf9v&)RJwPB6jMtYzT86Z3UzVYcI6oIm3wUu0K5)=j*UJ1D9&GU;^jZBUDS
zv!^t<TRvJW!Fv1z2>Lky4#+ri?)1a6w~$ekn2@UyNsoA{O31VFl2+C|EKi?nMi&u2
z<np)bEMI2uWIvD7EshD>Xpekv%5nyt07T_-bGxaBq9)U1IM<$Ce`#henAw>e7L|2e
zw%%{;Y;SI_HQ#zdj`Fgy6fnW?k_Q1Nn?DuMvh|X0>`wQYd2Nmxw=lDoj?cW}>@b<y
zJ-JI1PP)i2*0B8C$kSS-?SgP&wpTdqzgWxBDDp^fg2ugncs0i=&5@;I<#4*k;p~vk
z)g<#ln?jZ*wjfb_axiyqYvK<OL5gRj!q*``wWUX&zxS^-PO5DjOgN0fpF--(Bo1jB
z12;~Jl`Y076!ioALnr^c41zR;G_>M*OeBc>JbeNQ4h9YZ1M@tO_tT&V6dVK$0$nK%
zEp}oO8Px%WS+SZ(S<hyQn1r4|UcozhoQ{!+k6%u|@>sx@)GqJmVbb#iATLOe5C*c#
z1hRP*Qpi-CA5~&EP(rm=Uqa#IS3}GmMqkWPK}>Ra?2CHYi{Lnsmba4+25*onG##D*
zYRN(tGfTWPKd?Wv@xwNL_`;9K@FNobh=l(r5+c!RIqn8I7LN$Nl2Sw)(8bILW*`R`
zN=(*<8>-DzmRe7Apd6t;m{)K;KI*ru`<6-WL<xQB_S7gD<!wu{exG@uaI=X_bD}#_
zd^UQtjk8S2G1ck}F4?SlQQUlXcN1_Gf>2BQf&UjKn-k;=1)B~d)U-1$PK=SS$2}Ss
z9<X-LF(M(Ez5(B#FoGc%Ggb-K<T?p_avFJkL(|uTmUmts`W`*(ytdi1Z@cC0+Y_J-
zdD!)8;R)bDl5%xa|9CITe6(Wya2;W>(z<eYf;-#h-gdRlUg2@)dDLaE^KkhDSPA+o
zB~tGwmx%x7tJ*>Bs8S;6GJaSQcL<;^p8qS}PRtRwOY^_Kg;>AFuN0h@l`Zu<TbvdW
zGj5Zukem`$TyUz9*q`gicNr6^L*1!Oz9wHJUwc;ma-YM3uH8@?iKB$U??N7HRX=#z
zy|L>BcUTLf9clu?&zYsDG~bR&jm!?Ln&h)5cZaR^92>%p3i29_mX3Bl1SP(&I8b)p
z`F&|(L<G20;um_H(wpTr18HAY*9dX}rAEjsut%sZ)VsqCJ$fPwE-i0|?s>obBHB3X
z?<%g5QWnm>m3pINKL4RLfz)G$_1GG+`u=e|Lp>w#?w8v9I>p*7=UC)+3jNp8T#>zC
zhi;sdSsuhzJ^Zo^Z$0Reeo$a}PG5E-i=c3Fi`5&d(L-PMki%2Wi+D+_z1~))ypu6k
z_;*%vD84Y+#98lW0sBrC^E}{de3|~hL~XeBOV*kmrcw)7E3#X60?I|_=xxu<)F(jy
z0~7=IW&V8@Z|1gW>(ojd#W`-@)qLuy-=l9b{+*(ST*jC^$%?u40O~D*k?S|<8v#%L
zp-A_lHcHuD_UNNp)-9NS%)<NQ^tOeR0a_2E#w1p;Vr`j)`)do0*+q?+`iYtPJ(Sv3
zWExbfV2u^%M3{P^GHX9czlCg-`p;ya-;Tf1Ttiu7*^Mtd4z@{kkeIm^YLIRsvv4EU
zB47HyM(7`*+u-uK&@el#%Wx&dFgw<FCh40A6g3cYB0Zl1lF?gD1$||he&r+5@(KS;
z-dW!-^|Y9Ze-^a&1VE`z+YDqiiF^}@t(*ReC*eLYjQ%}y*)31P6Tmpa<AGJ^XxQ^B
z_}|+G#S70Nu~~A~L5Y)mA`eNPHwUiLUn|q#tU3=DWQ<R~o{5ccvC(JD8D_Lek8_^s
z-hsd$q2Zb9a`})gzq*~)aenCUoLY;E>#>HC#p?Im-RKyfA0fXjU>#1%b!`v(Mo{@>
zqkS0O1kA}}^lRnlO8##8O~r%P-^Z6N<mN6Co0G6r1J4u02h5oUB3F3Y0Y=SvI}`W(
z`s%avRych&&o}@0K7i2fUljZ38#q-)B-KwpaV>Lc;Z*77E{>)GQ%0jy3#?Hp%d9We
zc8(?;WbS7l+kfZhr5;;r+ATY|6!eqT%@o{ooQQBD_Ap;KM;6!!LfLRaJt8GNqDN&n
z8k_7(?I*7ft<nx~&mTEc3pjeYc_X&>Mk@dRj_lI=%8+PjVzNnQH!=>VNWWti?xI+m
zXW@DBUWG9-FAu0OLT0A1a&-Ln7FukoNWi|`;$cEz5EwjifG~+Qm;N!F5pm)Dfp@EJ
zZZpo@xh<<juq4GhC0AoNvDi<=+|@j!;!D%`a~UY4hx?J1qroWe97XF)x`H{IauyiZ
zh0>Sgza^g#%N!P74qZq8Swe-q2qj*-o|++tn}dAjHc7Rw+pn-!PM7ife`h8ieX+`w
z5<^|VT{gRE&-Fi`AHZ2Z)F+6rJ^`d2#XV03U25@dA7XxI-+E7gPpVIVCDvQ{`<N%d
zM#6<T*Tx;$-#gR5=TFoEGsm>11Iu(hYo}ofjka^N1bL;eWSlB9#`9Sb^V<4pAK9%{
zaz=Qo<bJ1Ug`}VfPFBd%#k2R-kqEGGCR-+XVdoz!)H*#ya3UdVKV)nsJ^^s+OXPP5
z<|zL@z{?Nj@Vf2wYxH29edc&2-R-ac0n6V|x+B~g;r02kp=ReT6Bi?=w3)=`_%uv~
z_%K6Q6&F|)^fb&K^swjAJ$;xVZ;bA}-Ex^|ny1n48ZR-!sl6%tjM`jU;6c5pq3c_c
z!wyVCyg44*h!MeNBAh`+P7y=4)P&>B9>NRX&^H-y^g-Nu>vJZZa0ZBKY<23#otVBe
z2(J^|=>9KU01-&iZT^AN+H9d4F+$MBf>VgGlc{Xg3f|-;bNK2Eed%NC?~KKh?(ZsS
zW$5q2@7doQz<uXmJ0LFcuXZ8{xMUQ$T<p2tTNwm6Mc6a-vO@A0a+6zV?iylU(&@=f
zBr=N}w`b+in1`=<3rc8B<8*=s#5ESP20*|A?Uk(IV6hdp3zsp`nDU0@o9QUcBvW$U
z{~-IJk{?#`!*PBDg&%S9zo+TokcuDdwN5Vp>Ts~@aI(@1x>67&8Q}QpJ~y4l^sNcZ
z8LOVp^AOU=&x@SEVE_=2FfTwMAfBfoAix12pkR<MF_e_!;wPt&QJ5WTP*rSVCZ?g#
zh=}!!V-sf3N$BXASoq}R9jf%}NErkaY{`whvpRpCkpTT^MgkI!^w@i66oJNJ@AH^U
zI)@#2tnqLvGig%3bSeXoHpHkun)^g58FdBC+I9KrzD(6iPyf72^YxGPhaP^|!4E(9
z5eI(6fgf?;e@z^qw!st!fs>8G)k>Zau1F_$h=U=Mj%QI2AD2v}GGfq1Ym8a9&rW2(
zXrjd5;U2xgj&uU>>|m|t-a6-Ud)YVkUjv6lKLH5r!;Tf)xhC-2*%vqO(YAAzybv3E
z-UE3)m?7%n9@=@p+RGodLoIG_p=HQ21%5<$$Ic7EUU;Pkc4+$nRyK=`Fqy+e$?P_o
zS|?wFR3RsL<h0ntp%ufyp@}jxo(3yK$&te#AwlS72~XXY0TxRnDqAXfwfj}l2Q30j
zjY19J{!7_|ZU%$?GvoYS|NZ=4G<T%NvCmI{=rIn0lxdxC=jIoZc)jKoBF)PXc@Z16
zsyRB=pcB2e^CjaItlnmZ4d0Y^XH(m2Di@uK&n<>mHPj9{m0g&(k6%;2!z*sVK70Q%
zfivP)MsJu5!r2)z9=Ki<tnc&a_6vIEJOM6O?mvoGqd_3^IP{LBvKhcs8+ShenC4<p
z1|ry_Jxgu5Pk0}6&&{JQK}L2cRtuQ%zXIGx7(2wzDUK~)55kqwGM1ouP3Vgyj|~UV
z#268}Nf0n7W*$f+1zF^ELP?E|46t0aYSH*;***sAel_>3%Xp+U=l%k?OEd9_{XXCK
z@q2|y{U;ojsIX#528Q_^G%#bIMbC=JqyuE7TATgk3j{G#fEm=SHHzfIlMJ-uuO7l>
zFDIV>-QRwxR*!In-&Lz$!C(f9)SkHEsf6)B@@uY<QhI0hllE()-s$jhehdY}wa^k=
zdV$A?ptLKua4N}M@py9Gei|tnnWK9_M8URO`!<n^OJ?2$+2_TvwZG`$mRZaduwx&4
zteEnvnV}>iYTKA{=pyPwk0<GlU46>OECS4mzPRPxi@<1wPQT57leK>oZ99Kn`(~*4
zQ1b*hasAcQa+H2=YCxLglQm?CzzVe3b7v`;13^TgxB{pmc>*a}|CQ8eDx;B-jG54q
zY4357Ykkk%>BpXeJF_Ri`sFV+%_~y$JDV1e9}F<e7sSxbHfp25P%-Kwn7$dgiS(h=
zrQ-eY1Q?NYL*?DNSz$mZZDJNT8Hi@lQrb5vDz{5U=7>^w0;KJ(*)QRw-^dnhy&If%
zZI#_UOsrMTBhYC*RycD0_vLDo6k^-9yY}Bb0YW+?AGXKFeLwQU(Lv~fBe9Ql!clGu
z!qGJ@A$7vh1ZIsjj_lf}9R{)&&)wrjs90A`TRtL)zG9s-uk(Z=iBJ7ntI6vdJurN!
zQI^rsw`F|yT4i)~)2`Y*p~U3aj$OTVP`Ub=9k+Dl&Ho$*6M5WB63D$kt>9e~HwCx&
zaoKR8hRuPvT>><7a_I<Os`OKnCf1=4;0M(K*<EF{E6$q-qOV}-BeESbzdGKo?COPP
zoIH`8&P_#-Wl`3~=>xv<ad`0F#BkEJHXN<nc}(o+fgl`B@Feb)Afl}54gJdUt=Y<i
z=R$j{*LQsD5f0i-t&$&^{V+~O3PQ2_W_NL`Z>v4{o%V^tK-^8CCq*x@5~BYZ4`H!M
z>|TJ8ttT1h-HJ5lt?b=<j4@cjFHoFm89r%Kt{*|J*hV2J#!}wc_tNmmzsf*~4p~*F
z(##m&T5~`prII`yj-`EMhPx13Lfg%tl2TlgyVgZ3RA=xzKqXU4u_$={6NnqYyUmu#
z8gZk2cPq4WpD}y!1o#7a1s%aFv_$T>^4uq-C|6O^v!P`SraskEj{1?=N`?B@DRbr%
z13rk9*9r}uI!1~HkvG79su6#PmnB<)sk`^{z$M{|z<xoD&05+3jjL`36Tu}iYMM9&
zppEcMI-Nt3egNBTRNHe2N&mS<%8>FwmqbPS$ocyd3FA&Cvs7PYNnOiH2UEQnP5L0j
zkmE9SN=6-ix&+oV>Cz%baE7N@xJ?r~m0mU76k)K(Exz#j2jKhq=y`tmS<DP&(*n1a
zY9b<)+=w>mM$Q>z7il>5)d2evg13P9XfhnlZh)I&R%o_GzQEDW`R}8&1`D1em0Xit
z!`KZe(7*V)>w?iGgf!0O2|&Wk+pSO%0MtFEzc378)1^Q1RDqHVfQhx7iP8Z#R=H~|
z{U4Uea~2&;xG4|7s_;R41&8Rm>M&B$bm)Dw>$>KkP2+#`PIBq?G5Gg^z~2MzJ`Jj0
z5Duxy?&EQ*<>+m89J^(GzxUA-piaxkq#N<v?Mqw5vCJ*m@7qoEYvzQjbY<4Z4#l;L
z_^ik$K<_n$JIe1nZLs$*^ODw;{2dg@d8EVya}$9lZT*tT;2VquLp}%}N*T#Ju}zJI
zb{u-)l4XLA9FWdEL65S()3ECLblFG%YWx}*34<EDC$k-T1$MK;EOJ2|MpMzOPVI5Y
z**4Ex#(A`CgmLMFC&78!Kkdf<KAI|6S|`#N^-3l)AM@i{#RJD$Eqgm(EbrMZp~(r{
zM4vnAImmY+svqtJkKAZPhTVt3iIq3o>-gE3p&AcGuvb&a#u6=SSoTM^Qf`Z~7|BaT
zuzk4dMzi*m{l22m0^Ard;N`hVPk}u#Led)GRYro$mT_k$GQwnB6R49}r&X$bB6+gv
zS`ACYLY^!bMbR{GDhAFN;@n$a-iyq%y&4*jzdYAG!O^&{U<8UTj9YiTwK#1a$|JBA
zZbPp9pLwZ72-}uqh*5oi#B=DxP3(q~jmKHDUr)HsbdwXhCYXG&?tSF{fJfJI_&wwL
zFX;Qnx?#xI1aIcba^>dkkq*cb>-M7bZf^D^!Zq4BiwA8)@RTAoE}5=}P&RQGgiy5Q
zm41QWEjPn}_>un5!w)<7;RiqBz>hfaBM$uUi34%>81l7dJEZblxl{X_!?HZj4SvTK
z>1ZNa<40$4)658j8f5MzQ{n(h7Z?2yj8A!O&vTpx&)>=c2ZaI!heLveh5&_nUTXEc
z?g{_`iNYil7e9fFibm{E4TXeG^t{lDnI(37l9Z8OKu|%?z{bweDY~Y1`lX1XzM-wX
zk8c$Q8LPavUrZ&T(z}3c;S*(}teo7A&wu@51tc%1Dv(MMC@y{)m+Kr8mq#KDlu(GO
zlTZjXDCKX;{!)TuRai&Wg;V@Gq!M!f2k?hNei*|KNBDm>GWf-$<T1ugMFR&+lG$Yx
znHbUvfT2cPZ0ZAX_Sx6Yq64vKS^jB7q8zk=ac)Jt9GHKAK(%?N$x);klT!FCy;AJs
zi3F5}d(;^fipp}$Fda&U)l0VUt+C)zIsJvWL)c)_C>hrmq}d^K0BBg6EW35bO@uZb
z&ijj$^0Skbozm%d84*taZsU^X`*$}7%-TB}ZKLYNN4$8CF2kzM*GFeF=ATA;JwH?{
zFMIrj>R9yRY*cH#Zm>AC>E7ls1&Y>#_Uei$GM-{b@CCa<go7^V+c-V%uh=IS(r$TA
z0ID<rAdx597Uv`dtz{JIUTx-kYk}RMx3Y#PqTsouGV}>v2Gjzi$C%oBFV6TKoTATp
zt+CJKkk+y4#xBvpZ5$!f<lgtdv*I_|+Opa-_$?uBYWPMM0ogOWncQ%y1NhqIO1y4Y
z3+bUE(ePe`2n~)EInu!*mk{OwBcVXlI0B+<;HdS=k*@3>ce8|_zrIwBmX$Ts4N;pZ
z;Rglx0@VwY4knbQp&e1loos}r#w>Waodzw5NUO03HZLYxynhLt3X!yvlc4hCj-Y5J
z__6V`=R)lLn)kh}XY<1_$(H!d*yj<YoOF!#)SC(1010753t74=&V(a@5xom1Y#SNQ
z3R<JR8n>v23y{yMDX&CEoZiwz)Mul_OxL3Vfj~vCVVdmtH&|UDd9o7^4nWV`ICVh_
z34Rpx7jSCxrjjVW0C6p$L21S+T)M<PTRt9D#;;q^Lh<8}^qffZUslugHfuqp#|x+^
zCw!I7b2sqEz;zPwAz!c>-SyxmnMryoY8&N8m!znFNEgkTB1hQOoGQT7#m{Vsp}5_F
zc>-9;o&`XibU&W`Z5>L?AU234U65SoqLBzc0mkU`w`I)&F&QCgk1)H{bcZKRZ;0;p
z!Tg5Mv@PtMHZYMIpkY%{sTutW6&i9(S~yMjm1N+(z6lJ_izU|KPSltUan%e16;kO*
zxnL!VZOF8^qcXbzH(I0B3Bnkn!f5qTk|pLBRGYQUc|OTS(<t(e;3l?RNI9)=>L}Va
zTVi|kMG^MNQ~qdO(R2#&9g}2`2bExDx)D5FvKJ$$kBb>QaEKeB4?Blu1XQvk0Wa<H
zaCck5i^OBT4Mem^=r%9r@;*KRR{vURT_%mzrh|!0f>+6xc72%{#GLNVyyCrE*vc0Q
z*`DP#8JC++05&~OT-_sHd$Ah@4+pyHc*-5&V>0o93sKSKH?*@;7dT{(j0c|W=w*^K
zETzywfD*pk^AG{#fI=VCAS`1s5=83?6qV!cmT@^r7zKsR(u;z=%o!xf6(ClC(matR
z<Wibdw4~-VrNBpT6(R+}FqzC~<r1}=U`#l`eu%q`to0;#(&gdyp*{!_G)~HvWPrE<
zx;}VT5#4|n=ItHGL<;19(DkC9BBo#Xi{kSl3PyJp0~zsE+A3EH)GC)2(kDPY#Z4#J
z_4*UQ`7Y%*amE{%pvTA1O$4ro2}&475-$&KhgLx3rEnkxI*%8dp;^J5k78<S3QuWB
z*)Hw>ax9Fvm@f3TehTUNk#aFFDg#=EQ}4R5K<wd{d#OGJ_XUFBWLVixh9`_f;#Za)
z<VHZAZ;@R?{uE1<*U3@2cXfY561R1Y0~~OD!;_gCx5ZV*MQMF-nn90`TK@p+*7aUy
z<s5j1yvFG{Rxl*$_q?!A;D02J!p>SjqDG>f1hq&8I}aNRTMtS_`9%iODyFVIP$IwG
zi5+Yalt(Ee9gccSf_>Z#W&)HH3p`Kaw(tZ0A*+l+OpEuoix8$sn7Mk(di%W(KA{Zd
zZW_s4(;w17Tqj@1HiK}EOVryoGXWlUA4kpbk$CKQtLH`i5YznZ@*Lc|{bW!$OmkP|
zB-U{8^Pd3kdNT5kBo<EAaH^%D-F4<y#guZ?(%FP0VxSgN<VvoPA3jWQ5xQ;S4vT3j
zGc{4bkg%hCv>K(Rh(nb~@|`_zhbHmz`Z#2W<bwo2DW#Xv9`ZrD67YIul^N+HWoq%#
zJUhfH+WYYsqJ6UyV;pBdS{PqLY@ym8KT1$IoWv#ec?Aldc#iZde64y&;HqipGC>1*
z{`q|C7<%VpVX82xxyr~kii8}gh2&B?vCKjfOGPb1VVy(U3twSvf05iUD?IgRhE*<b
z^pc|G+4GM|FTW5G8+6(Ei=w5o6DEwO*nWl)Mnm+V4<dZ9DVv`0Z6mf45R0Q$veW5G
z^Li(etmLlen_HSf*}i&fj)Z33&Klp6VmE^1B^S2gSnmUP0*t@FPFG0t?`}RrDHX|9
zmXXTLQpOSqoWdlO{i>uqH=cwlPsEl-N+Ju)tvM;VgQ{}ymC!0IY2x5wK%sik*aZ$G
zPj@=-!O>~6$#GLT*f`I<qe8oW>7274s01&Cg4&O8<o;QNBtTo>%FTnP4^<h<RPB5n
z6i$iMRB}0$bPF25G++D43vSG_7;;o>e!99bL7oC0W#Y=DFQ-#0hw6?$uy*2}T3#4$
zAje)r((eN#pHZYYu&6;%r!6nJh1NuK_T2B11L5&yX4ZaEqK!-^`9m+v8uya>@<x?Y
z-P9h5nW>1YZ_JrbIyO^Bxl3%|Vw{|N^D0eTN(g6FJq*7YXqhbv2&0^-2t!Djj+?Dl
z*60<7gJN{qo&Mn8T57d|f#58;p{XW2q_#mXeX)?y4h_>KqJIK#MBBVu(z=KyX10k#
z(A-}#wQJro9h&PjH%&Aq|0AD3?qr3Q*BvS2xM&TNL%`N%Bc^Tm?hHz?fXHH&yrYO~
zNYuMGP}T+kGuT|=!2-gTz{O#lY+=!Kl3}$*HXo3fMmj1b83MxqTLqzEU{@cyxA;`e
zPPAsAjr--5N0GDz8;j-KekV7D1*~m_QKnJ37=#{HQJ0x^R|Ei3tqXy*P~Ud>mL!4p
zZU$|_#76;Qu8(puC}9GgGWgg4RxFJSg)uH!OAo*u<0_RVn@u4EBu6KK<)c+8(&y(a
zjA7ylG&7Ol`PMhE29gh|ML8|77~e$NK!+v}UY+$8B;9YP6|K>1^|HsCAy>Sw;)dPY
z$wLLVu)p-R^hiVutTMu`h-uKi>1P@wdFlQ4BH!ej<*dnbKM&Hh87w<)JkGl8$O%-W
zmb%SHL_GoaCL=lWDJw=;cxxtwl4qo%gNKPn`BPQLgZdX^YM3eZyoyURu@U=IUuePt
zntXN`aSKm_FSc0Dq&7&9if>(Qx;us*@K;yfL<A9#e|#_-;2^r+bJ$ta{bm+<nmQqV
zrs9288U?E>787~QA1!M@s{aLQR^WZR^wC%jp5jZT^G+(Vg}qORyKe>K`>0=U9|B>g
z44@_Kl#-NPV$#}eMHa*KzBnCJ0+~2l`{dmnb(zvz8>SHmi0B@av<W>Yn;7qh<rbH<
z3h2wVqA|%H))n5vAf9zFISlwfrwECHXH>Dqs8dR>Kgw2lwJnE8i@?Wikq5pJ?@N1d
zp?~2PG`dd86#aNklLrf18WCI<Vg$`Uk6+xRD)phTrO`~FVf0*>NFz*NPJ^hnnSzPi
zSqhjYPC5>C4TU$EofdArfS|LAe42Z|t8YRjKN7ksJsq_av(_&HDuwZ}7_w6VZ$547
zlN@LlRg1IFM|TJOXg+WSzg|rKt<Waw2_ZskWH)|4g}w0ziMvaNKEs>L$Zw)L@p#$U
z>Qk$&V}85j^^R?;cPnoek6<enuW%+-4IiU-IJ}VR905gdi?LVk4JaiQ`oT9la{1ZX
zBeWEo5>OMph!NYc`A&%a<?VV137Hb1YWd@K2n*%FU`1l;>sD9SK<^h0Gakw>MlyZP
z6pD57;wEv%iB^SKkV+Y1=)yo4T?{rizQ(sv5X@5z#S<*ki<>6D5L%ZcgRv9QSc^ju
z%GZutS`C370&ugQ#(on<zv=0{OflV6luWG)>S+@AiY~sz?X9t#h0RwkM8jGgt)W}9
zl={^sy(coL_EiH~5d^CGfuF~bSy|`dzD+y0*a+>HctBf!uaHtf0z)Jb7`rGMyE2w>
zOl2RW7ym^LwVT*(;91^ehQDWRKJS3FMDRG{Y{I-?2|5_aepm*!5bBgad0ZN|`F<QA
zi$V->APlLS-;~oJpyqH-#)51yW}ob>wG_Z#z#tB+>AiLfa{L|s=LY@-W6QT0I`$vt
zMyJ!LZgRg}^c33Mzy$7R?}0t0k7sO~hk*O&m%~gjQ4J>yw*=Q{%d<WKz@x{;qbBpg
zWtrZL7s**DgU4~xA}adPo|ORyAF1gSnYO+XJv2*)`qRuRrL<5ATy1ADJqLXt!uhls
zs}(|_7LZoAls;&^0Un<u{6<zV`O(ORG$7O?PZ%k8*f6Q#Gj<oK9f)$vgIx%LOo$zG
zn<cxe*Khkv0%o8F#aX#TFK_J<kr0Y}V1S8MPBF#;$(MCW%s6D#CNg1msw<TVf&|0h
zp5`3qK6G$=m@YU0`bgx2BZ^nq;F>e*k+Wzzu_KDemPeG+g>at?#hVL1612t{58mrX
zq{`DdstbZZy^ca2FiBbyT?{4Nkd{EQ9l_R*Q3(ISlH7z6QLn)wYgqvNnpW^SHttsU
z^3yDb4>}-TLL6%K4tF2T*$ZK5Zn*|5)MZirc6B_7KFna(X^S4tAgPC@ub>HOJ>-7F
z@J^aZ&N?xzH4~aMD|RA0SPPEX5sPjdQi04}<3JOP-g5*%EGNcG4R+~bsc@?@FDGf9
zZ)qB#qQ;g*bOYOAQ~ugx%Z$QXH}CcxbVQIRhc^4Q>Yaw+eg1jMEHPKtz=ZrrU@=M|
zsWLnnKSd>64uIB5t@DNHG-WhHE_5G|vtM{R#&3`hyU+~B+3*mcx7B<g>7@SYJk<#S
zmvV4T6G4KbKi-Qt<{h{|M%FAv#aCnBIz$7OM#T&i7$UyUAnfB;4&oNFZ{FYssDHZd
zBqM4QBF;4+b(eB85=rxCfUZ|iTWBQ{P>*~gy}c<uT6Dw6tA!LzL{6!cyWS_muU~Ff
zfKBE95^%c~W)PPLS;>w?SRyT4I0&KLG8u4D14c=J>R^5B#U@m&UkYg~8VEBwANB^M
zp{+vX0jnA`gl$gLC&})TjC95ky3MAWKL8>;D{8tSBAh2D39QBl*LE|<k&<W9H>$`6
z{vk}BCNMlZn$L!r-ItKt%s)Fa3RD5q<G5RZ1RfD?d!$|wNPKDxb8$&wD-tdGXowQz
zZiZVNT)EZ{-ubYItpEI->wAa70us&3&cp`r-#i#Vb9f7FK}}s${x(C`GLaNIKuxfE
zT2AMJ;wHTMn@Imf0nPJ^eXQc%`%w*16I02Y?Xp_=b(=+LGo>*;R9<xMQ5}A*v*iJS
zRMf}Odmw0Us2JmNl4AjA-rarUXjH4T;h&hY9<L<A<w6W4v0p^TX$2J2<wU57XWbWp
zG1EJ?^XyCvN8B)&#3hajCgUN%5zbSh;9SE5k17=wrH~p8Yb&aRb$0KT9a+KVFeP&&
z4iJNJLoo<pHCFm{IPv8!M+g@Qt7(ov>gQQC-1)NI74A>^q_6}#Kg0`-$hC%)V?Mll
zK?x?H-uXcB=Ao2ryqH0P*=k$TZN5Al$z^M^AqLr-z4*gSNM_85ADH5C&O84*j1oN6
z+>xT>1y86YMVoGWw2+lF1MYDxKCB*w%sMwUxigV;)Mgg==qxss+%krITS873U0jHW
zMn~WJvI%qqJm6b+@^mPzr77p5YgKr*Zgf-^X^D+e0;3SFGI4J*2GyQ;SOfwadGHDu
zv-}s!F9AWeLb383V$0Vq7>+w7uhE9n`bekr08)5%g9mVKvMMO-gj`*Na)o3X!Vsf+
z{c>sgOgUgTgP2a89Ji9<3z)h+ab%xZidOoB%U)ID>MKJp9iqW;o_aP^em$@Zu{@k8
z%o{Fe^6yX}Gn!eVB%HJWjHz7s`ZGD-#?{qvLl4N()fXn;?HzxN^mzv!hL`x|jzXLn
z^=;nk5+D-gH+Tv1=e-tSWBed%ZK@hJr^++ztgfnD`a2ydOmMeJd&FKukGT8yHyfNQ
zkURlQ5hWPw<g=*foU(uu`BG&}wb(rPeFl5@5;esLl;o5~HW=XNzP(?Dz9nd60@m9&
zT{k3x^X$#k6uKl{e3%cUK-arsjJNAu#M;MH^QQzu6snq^PYeS;o|!%ECeMinJ^!+^
zNU?D;u#BB7uai6Ut#=Ja(H|Min^Q`{84+@V6=g^D2_P%`IZcXmbmFDF@nZsNZ4H_W
zEa8}QAPJGM9F@Ilwc|9IH^O`>h^7z4vaBOfgz=^PMUh1dO)fNMm%Rq$_8|_VQwE7L
zyhO{)S4bCKDA~t`eA=>*L9O}9AtJuQ;)R?E5{Yyy@_5}yx%PsJ`3rqv%>1}uRHD+u
z0+@V@F3)V7#9LB6sw`vmX`6`pJ#PdA_*bB{!Ii`!0sas}nz8+)I9pV(6^cPF)3DsK
zlF$@r!w|3C#d_j<3-`w`tBj|Z&KKG8K;WNkZYf1dkpi2eg)^2jwtobAhODfS>6H%z
z`BXXR1NE6SZS8@J(s#Pvur0&!{v8$?{;_Ido8moYD4=8gazSvNz^|)4DNJ`1vk6D_
zY{&8k;3hF#Xf7RCn~@OsA4Qx=Iz&s6KZyOWM-WHUH{`OTO!dcupZ5l2<sIQBq-op8
zmSb-wscivo$0gj0{&uJWTj$+TYd2D4(-bS+1Rjh{kAw=#>OtrvGlFcHXs+GbIw#po
zi_eUa9&z0KeoDuQ^Yh7uyz`f%7ro)aJBI%zl;3`6ln(@H+<Q=(T_QFRItGl^IR7fo
zjK!GWJPv>zuWlpVY$)<fl92O1Kh}G|qurxNCo{9LzQ?DD7O(Lu0j)B-;%Dba@BMPs
z*U_^4*yRpX$h97}?1$GWg0)knP%|s&CzDIbBqmp8bzOt2n2~z|DDlV#VtGlbEy`N6
zeclA3Ic;hQ4pj6m71CsFd4$<eG0jwR+6-DLth-FV!8W%Omm!ucCXDSZ*AMi9=r|YG
ztYY;yLm^Sf6F?cJjOqE<a;!K+VSC_}9LN4R12WFFFEV8Z!pO{ZL07ZCS?%<d)Qhrg
z_Y;KOwc5Kj6wJb^H>5dox9jN*@uGf)q`qh&g;Gp}8$l>n(QCE%?G2rw$#MN&6ANRd
zTKalI8$?NH!9AJ$@YXu)pwG0*KhdsAI#WeL2Z)1l&cQ>otwVJMYKSRrD4wT?t(nxb
z=4n9~O2DU)ey-2lIJR@jpmVy?BM_e(uDq$ugntn%U?v%)WHXGMYZJ1z=veGB(oAcG
z`B`u5wNj8VSSc8I)JYT()G|W;oI^^hwBUt8OaE^l-Ifv1PU949oS1fDomK78WS5Ax
z><c8i@MKmxJ^@P7B~W5`?TV)%JYn(F5uqC-HDh`v1=$_9?Sx6BXzx4lV0K-K{fnJZ
zRP-U;_@&1+1w-e@-K=osf*$FJ7*B+!WhIg)3z2+Z$E5mNXQF#tu2Kfxok*M6u9dW~
zzd%uhc<mi+_L=OUVFh=JcQ-^=?3K#vjuXp?QL7bxa#kOr=lArX$zg871=(lBcAd|%
z>eE7?Ut(M($Q4W6F%y~Fsrg8N%a?u1!s(EqX+3QC)b<t<$&ocLAkGF{J`YPw8xrgV
zra4?CxJ1J$5`;po1J}*a%Kc|AxeH}ByGuqL#kjZX-sTL-Ht2ca#D_f}8o`*FV!w*I
z_J585mD&=~-L{BD+CPCVe_g!r%GE*iMWyFyjx5^34lF^nLCk&Y$z@1HtZILuN3m)n
z>2LZe=-I=k-x8pNa~?#7k;%>|ES~`Q@x(ch$?RzNLlFHP>?g*RX-@#nqkwpWNL2XJ
zQ(}9o-14_fg?q~D(pbXBiIK;2m)&}gOb)C9Uf+DOHi+X2sZm=fwd5oybvL6@@0sO>
zrH}^Qr-b{`_)N*_EhJ9>GNvW2(#NSo4}ILr?*1<O9Gi!D&HTgeq>R2S9ydmXf{zi=
zy!3@89Q}BRJPs^pQ5_GoLBV*9Hv9P3vUXpUV{PVJ#Mj@s5lrgwj_bva#5pRzoI|4$
z0ba0Ve?VX16?o^GG0`hHnl}6d7^2)&mBfZpw$NbJpDqQ0D0pB-Q6Z;(3zp;0p`3HP
zYao;43qd}JhS-jv!qYx*?GO&BV(eb>X}Bsoc=6RU{*qxM8^?S?B;5d3BAg+2TT-u|
zE7t_YOyFuOEDID!J9tE3TDZsTmJ+z1=Nj|d;fSI_pQG2<qCa?@Q!XPY1sHFSfTo;o
z8XgtqInhuRtcz5%UftJ35WB~6Ro&&664A+bQT;ODNJsOggPnvX`!hPV4eNn-e*WzQ
zJt0PisN@D_oVbgAIt8HSkL9we%Lw9E8Eqgr#ZW}W`y}zmY=R%=ycJE&SukmXL=}fZ
zNchKx2xEPw+LQSYJXOYP^Z;P0^ENpO@5}#2wb5g@nULJUK*;$lv`Z)B!t+>9UPH9M
z+Fl6Aspig16yGggGw{o}m`w7JA(KF1@L>fOovR)I4}dgSODp_RcgqB=@diSnQ*y{$
zqrq#?$Y<Nj9~cLGel#yO8MZRv)qh8-pqseNGcG@2e#4A7EpbKq+j%Horg1TdI1o&|
z?s)(RFvuWd8~P3V2;Nfff~~Dexx!^8(;9S?<WyWJO_5#V6;v*AfIYM?J2YdWl_H`&
zTkN~loC;Nr!1kuB&hcZbVjK8gxS~(XR_|3!iuO`DmKu<HIXW@(iDcXxgS7Nv3Fg!0
zR9Z+J)#6?FauoPcB{Cu4If@tdERmD|z)z7%NfwS`i+OpCMI~MoB8BS_tRBo1luFr^
zTrz`16i~-5e7kze*!Dy=ly^9+%5WM9W~|`?0wl7FUO4jsHvCo{M-O5-OnDN9FOj;w
z#`jJ6!4Wc@PKGpu0s_0BAGsu5`S9WA=9kMX@kc|o8XVtJd9lYB`kHSFr!z~t!eZC-
z#DGC4MXJ%yhA>Mg<<XnL$rLS0ONf02lLa9@{|M*C2m8E>Ng0~0p*_{MUKOcMT6>wC
zKyU_gKmijm<WA$#p}Vd%I8aJ2ST1d1lyH4V=?$)!4?`Gqi|HVy0J{v1BF{L5@F+M5
zX#slSYz~m2n+!6mID~RlmDW?$`O^g)=Gu54AerCBR-=Y2#8pU5xrmvMkH}R|b?)Z!
zyCFH}d5GK}Q)Vw>0IF2XG?u_8o2;ioZ(}gbp*#V1I`EYk-uCkOky@fB<xZI6T`}j4
zD3@WylKjd5`v#uJe#E2vDCWVH(!0}$_r1DJIc;(FJsc0yc=tIU=w}ZLkG616BHA29
z{|kxb!YTcbgBg_ey6C<|2@y-c*dx8+j*Swg`<5^#;mZBn=B9JtH+=!Fod1|Y{2n5`
z8O44L^4nv<+(CDp=bi8*Wt=uc@Q>t&3Vv9@zsV5<-lm~i-IvAgv#jXgJx^{e^FF^`
z_ZsPWvnH^gHhB7Fd#C4piizm?<@J$lY`voivno4|>G;Oi<n%I6e%afJmk8;IL+GbH
zL6MNZIGB#-h=gM^{kJBO5B>iQ5}6Usa{0WniAi7xj<0{Y#f7y~%RX`eF+e<+7jl_b
z9i~A4t6Oq7Ogg;|Ur11N&{W^+gW5tcJ^%<f0^!(3OW$~5pB%X}t0q3EdJ+fYw7UXd
z>q`x5R#KDnPgsmEr2JnNSHQ!yQvgE-lwcq!!^pWok?8PK$^dKCPG$`-+@B{`&fj%U
zIY#HC(~EV-@N0a&PU0AuN>t2%-720NmeGeUVJTz+7DzUt#t%64R<`l)gT-Wd+!>9$
zI=Q=Q!80=LZNxW56(RbxmSR1W-}G483Nu5W-gdr9x1v$aF9cu;e@6j-t8F2=CCFd-
z((c^31X3gSE}%`~-s9m&R2`dBy2&!-X7biPMq8xduPoOq>`dn8xK-=hhwe2*#V!Tj
z*6PadkT9apDK|O9eQVjWV(autQYKR`9-KMnQ&@-MOHmi~r$t~<&--wdQyPvBECwlQ
ze*^aBt@vHpr4C*{1Lm6tvRQ4%pMGu|ByP4MamvElLM8E5tw)E&(<Lfp8nxzso2)M#
z5?LmPV)VJ@hhx{Chfk;b#feFpl#O_^Z_;F?oqfoI<pl%0_`oPb0i6=ZC|#mXIVzAy
zUAxZv(fxR0s|qI5va}sT(-`)7iSiecY3T?b_xXZDY-~chlFuxKmf0e?sYjR_*{{)D
zxyPeXp9d_RbjC4aS!8o%=N@#$a}wRn4o!p(6!y?kTOpgp3JOKhJX3~!{+8r;mtSsF
zNJ$B2;*wMY#r&l&g^E+RL5Rsx{QPLs_a%(<7Cx1HlKd*y<D}d&aT{xt9Foqs)89AR
z81W%TwFKxrdxt&4`XvfbsxEz3Zida?<(=kj5sKaloN{)u!zD)A@mFtny{V?SkE)8z
z@S;I_>2rOd-R}4_<h_5i%L;Lqlx!CX#x8m1b?b;axQ)O?Q6cHuZNm~uV{~c|S@rO~
z73PElX%rq&Po{j`0GRyvTy4u2$%v_`Qe;b`Z1p2%PW@Q~X-gBS;}GXEi#DxU<XqFl
zb8PjfnTTwjFTk(}Z7(vC`czXtP_{xU1$d!Z(Hf-)_YbCKmlu9=#&GP&HT||iifk7Y
zz000iY;7=wCsN488W{?J?(n*<g1!xKu@7lmj3JT0LX4{qs5^T!wSRk<U_JX<G={yA
z&L}3#Ff$2@7JUEVqx7UlOro0z>{(@eslrF}{i?T;s*TiDdstOw=np3J&cqgHsZENe
zvs|I^yQ0)4(JJk?>-QXkuj8QOqp)~z;fzk1U{})L=Nai?AiSjws~~3rhG#a*shq4!
z;(4PtF6@DDEw3#3ij7yh>WR86C(y_fpaS5?2o-lxC#UB#o6m~Lh?kfp?;1~A)?lh)
zLDtmT5%2dBav0<wN9H9jbfVnSQxGH!88#3e$RKB#=?ZOqn!hYkik1UL=fBV~-wZDS
zYkSfA&ZwuRN0&<zn_?s(tr;F3XFtf3GTOpe;ev_KW+)fME}HPe=`f-qDM0vGeQe0w
znaFMNf7ha#=Wj1na;58H5dH3;g`1wQlI5U7B~X{`)ohu-6Ck#;B+JjE7jbs<LNMY=
z%M6>L9szp8r+gfQP99LmzdLutFsc-%7|yA5a8#9cYtkw1G$%^@wk92_suk?Rh86}u
zQ>DDiC(Cx@6lPK!t2G#2MARQw^J<>&A+shs(*6m6LnD?j#Mz^aODOTii_G{=>667|
zef78eGiEP^FAIkzkhK=O7f$AwR;gG8qz=m&AH%s4@*+!CG|b?{{bDNgsUn9QVQ!7t
zFO#KhzJ04Rw{jzn@U4@Y&1bS2)CdoQJOr!eF`dA9qgh&mWB8e-tPm;L^|eLGEoT2U
z9EcdWz3|%WP*A-1SIt2YGNh>#;bMm#h`iuC1G(22Z-=N$Bha&*`sz@1jnJ~K?cdr!
z_&P1go9CupIhcjaUJpBU`m%0wK06OfHnolxnUS5Hr=L(T3aMB$@jpuT)vUDq^(qBP
zxu-=Uxaf-QqSUb@UtOvUr#{cmS3iFM>*r*IhwN=JAz>CM9Nw--xJM!)!(*yWXk{(5
zTO?F8tyPL0jJY!(hRHBFUx*-t!LHzofO5sl<K8p$k96~dl#4mvJ~PLH>^4zXC99EP
zm7Iq}V^0Osc6;Dl<_9nzNo5v_gKbj@g%4)FCe`|6Zf9sa0(YFZO;$MM%xp;)gF$&F
z$a}vko(;Fy+Okg=j%m8X%7Lx7OoMN8G@v+BEOVo}B0+D_>D5Y+G72HE-O!1%-9mU>
zlj(S)l=#gF%hjs*jHC~f_#6I;6*E^r2g`9Ir%1xyVNc+vw>odr8P-jK=cNY?9i<~-
zvl}e$%Cf*sR|iOIsuz;*i9a7qOqZU19j9dsVH3`QdX(I>mPA}|aaRy&p2DeWXjg7;
zuGOVF5-KjPYO!X7k|lg>39Ecr5Lxh%{tn^8!bL$etOy(Q3NnS9lPn%2p#^a5<hagU
zd41t8V)hRyS#4_e5Mc$T5EIG+j5p<rpVydodtT4_8WmWXnyZTF$<4OxsSe{Wnp?16
zvnJoEhL>FDh9nuKImcEsTTZtKw)zG^moTH#r88k}n;t1)BZ)+qHOCjzzlB!A#D1QP
z0PKN4WrJ|21+Z)P8X1&gJR*`l5J`FxJwy+z%)}{2wvyQ_kfbzykkJmRX=<+*DuM|?
z2*qH7$%+1gzq#XLyIr5|NsFT-@FlkDP4L@=E{4gW)+a!Mq06c16e&p22w$K17W^CW
zDlAQXAIzK?c$77G(suvsYz)o4kbbFsRcr2D!f@P44dhX(H4xH=wC>QC)M}Lmza$|L
zLr5!r055OIm1C!0IvW-aN=A{$5N7~*z_+hE>?8JR|J{GjU#9p^$)qo3SmoCt7hwd!
z6RLRbD8fB&777aZX=@xLJ8{yOf7>tOS;D{X5c~JB1^_?^|DD{yz5botQT|2d<Iko*
z`G>UsqT0a$07BIEKjIET_(xZKACC(|h=TZi)Ni2RUcWi{Kgb@F0-(A6@cMsI?ce|}
zXu$Cwa{m|AP6^5f0Bipv?jZkPd)FP+#MbR6F_1zr^ddq4!O)}#N>dU91OyBvNG}?(
z0a8Q}DWPKkDFTWG0*EvzB29`EMG-GZM?gS8jPx!YU%cX5%X`Ipm*4mN>#fYnPR=f8
z@|&GK=j=T*2lY=9Kjz0$Jw}N5jYs?K!(S+b_?L!%`xOPifk^7Q#uyY518{Dk^^34m
zt-%3i&@MkX1b_iVn=P#WBJ9w2FccAvBEohd0SJI4{@6MQ_2c$`Y$c*1VW?;r%1;vo
z!2av72l!zjRLsGe5I-#HzYhC%=bNqk{uf~fn7&$f`YD1S)KA%4GcgcA3qsuLXm093
zh+7-@83&~12ZKaow>p}es=w^*%oytbXxCOpbJO~-!p@^fb#h3g&8C?j6A<dh?f=xe
zjp`&=00|=gR1orW_LjN~Up+=>OMyQbzYP1&&2Dmk750B+9EAE;V!tQ^A^xJ`zfwc?
zI28TgZHd$rE1C&J&9Q<Z)C}w99)XznrJVpN><q@nHt8YGncS=&HSlM4^~;iwNQMRN
zbWjylb_e5Dv(=x?WdCE{a^26T%Kvc(UuNMf{jTW}ykG$Vk)?xdqDC18soJrBwC5pM
zHDE=2I9LZ;og;w0>!|l(dh$Hu-`)zI-ax!`Cdv}$_4!oEqQ38M(ryD-u8?9Q(kb9;
z7%ukfub#|(=$lQ|4g$xCu?c|Qb@P<<dG@?D%CN@5T9x4N0;IOFTjgY>w{`h)aY=?j
zzSA}s5FlWvL1sqH9iTK+)N04J8CNAU%b;utF6&<#s?hkBKX~n?{q=Z>r4=+C8GExr
z=3qz^#up5sl1a>s(E+euD&Cqk5W$MZC8>T-0_tzd4j?#g7#8C)a3b8iQgT2kxK?KB
z)$vsIjzLQ&L3&vG#7YAxR*bJGX>czrP#T|#4*z(4YR&LLOj4yTDHgUHwoTUr<ty#m
zA6KhQ8OSsVXwlFT?k~N~CT1ZPYJimSqh+-|^cBucRR2cw73*9if{z__^A$JB<hgUC
zM2ox^NmuRhy%uKe14tAN!r_dhD`>O}&6A(+H=)Qb<gC3HHDahd7qCvf$YCKe!vKf?
z2*(ZJ8pIxN7dFulDU$zXwJ;<QSjmNm#kBj;_%fNqTn*f<?2w0)MFDP?hWHJVcpDVo
zoK|Pt?H?xZH1IT-k>?xnfN8|9XR6|0iN0N5Jc7FKMvLpm>x5zis!;ZODX$X`dM?lX
zR^mn3{Tq4>PF(O6h)HHfr%)q?Fw@tf%(s#Zb*@M)$~Z}5Y_ZM{^=*8~Qn;w;KjX!h
z2eu=P5J4l-RrK{vD!gA-cz+S`d&$(E-_WZrIH^>}X`2jR3T5-xaq_ZlSBG)kVFMUo
z+pZ7}N`tL~)2NTDzcA98awa*5RGKHO$QAD3O6OIrgoT#y!y4YYH<rUs@^aTxQpqDj
zFGvx@BYG_a=5*ITT3<x4PVzs{@@fNJOMWmQ>EID6u1it=A{0k(%(^FvCyemSrA6?H
znK8WOmooByZKju??4C`dzZ~`=`%a2*+wmG+`N)vSV=^sHozs7N^^%$;xLR80BSJ>7
z)XEA!2|xl&r4v2Hj=g0UzbE6vvu@dX@yWw#jmpP5TbzqoM(dJai@DE`$_jXs_g2_G
zYKxm0eCc@wS36F}^>#QMU6v3^5U9Gjx4utV&jxG72$g16prn?&myFV^cnN8Q)<@<X
zc|EJrzqirD`~~R|Ks%Ddfz(?UY~4ib#{_HdvH)iQ@yr&NyZ_M*n-H+mIWSIS_%0jT
zaPO{`2u%$Ug2}igKSMxfG+tw`?bOe2x~Ob-O<C(0&ysQH=)<wi?^Ysf1$bsrZQhsU
zarXuu_rUG7(NNAF;o4s4iRY(=YPpm_TADDjEYbLa_|+NxdV?~FuMDJG$dRrY)vmPf
zGiIS|K{s;_O{CAqSSNLEIt5d$TSbI@S&LKE_-_sqU&B(L>2C;5IZD}Uq7D<SqCV7E
zAwn(SQgdw}>iW~0;Q|CO+44&xvHDIZ=ZDndt#1^yc-#EH#akrv28C?1`wjqYY9YM5
zF02zT^IOT$_4?n?Wvt|+2QBz=o#tm?U~;p+BZh+7wIJ|BfNGYV@pJ(>yYe2$W%$*N
zJr<8I7J8D;T<*V?6LSy@=PyBFZ~%aocV8{lxdj!4o}PZyE@_dHupiGTwQP0_nL2df
z7$8gVt7*$AbsgYQdB)Go?UpWMdI{q7p{xArJ0*P|Ep_NeXzQuRrD@?73`m?O--_WB
zwDI0cpS0a#Jk|yR@k{1RlBSJX2owp;UYuw%T3?xa&dSP{hfXgGCx&>&AmCvtuwo?g
zN(DkTcUB2s_Uc=1ix-xwrSZVflA$4=<d#2mj~9-Pr9mLuEyGMNH+|fpsE&%EB%NR3
zM4K`u5J@HV_6^){lWEVo+<A%z_cSxjS@hgDOA-v6m)WFxSwjR4Y$W_KAUC+Ne|Yf<
z#ek4sb4&gH1NQ2J5H!N0CDCEZ>4KJ1u(rUEcl1KGQ!v5XQ>PiN_erzBNF<hy64SlP
zD&7{WI?CGLs2Fv8W6E<>CtBul0gaZCb7ttY+~OF>V=~f5XLCj#wYN0&S}@l0;2xQa
znX(zXQjNyWR`zb5=>I}cjcl({GuJ{t-8Uf2f%4cpq8+abj#)~%BCudhbVz8&%gBU4
z)6NoFVpc&?YZ8M)t=VWfp0$n8&A2zS+RlL>n-0-s=59HKi7q1MiWOuSb6mL9RPavY
zGqCRGRF{Q)-)l7doMK1UM^uzNz1zQMSk+vD)@@XHk<HeDqt3F*;6Pcck_~q?_$@OR
z!_$e<gMe<T5pm@iuT^M3UWRtu1P*T15{VW+0#`mmvW5W%pINo6Fw~5d`!hW`XmT;_
zF~6scJC46t^ka~{#g5R_Cz+9S{O=630>Gu651m$cX)@+8nu!JGx$099!DQWNalTU7
z72f76<4npni-;t9&#7prw^UxT|EHpO8Pj$xQv*1Sq&eI4>kcRI2;|W#9G?vW$ETvH
zoI=01cDJq6^X(_{$DFOuY^2dhGsVG!53SGKR&E2oJ^~LjM<i*Ns>Aq$pG9rpR^A%y
z;&}SnT0vfCIvuAC_c_XjZhgbH)HTjOqF!+dgE1a4uV&_WVHL!f4o)@m*~Y?Ip4h&=
zPAg^8-*85a{Wbv%6{oY6H#9R2UWylOP0lLT9k4vj_gFLBUi%3D?1Kh<#FJG|;aeNi
zd=}h^EES6<J#sT_(2j4c^H8oE_ZSnLy}dhIg>~N%=oQXH!rHL{eaw@&K7ptk!yK<V
zLESA)HQ5elNy)LFfdu5lQm}d6{RjcbBJp66-u}n~1}9FVhT2C0r`6Wj@nRpM%EV5}
zWbu13GSXhXeQuQ1M#(qA<k8sih6{lsjv^-Yi+)f1Lf=q$Q&bRnI%+5>Ru9hF_ZzuW
z@MbpsN0K6DkPz2HZ5*it(;Y&&@)9p93X7?gr|C5p{Qa?lD8$Z-W5vVxzWxoZJ1eLw
zN71piGyB|X`}B;A%O>g_KLZ*1ah;6sPgI4D@XjJ6GDq8o3NCoFOnAu<`jC=^E1DfV
zw>G3bZ;%bQs~anVQ>vWj&n6`$D72+qasbty#IT-#hZ`QLyS@YO-*EN4`sI6BDG}MX
zTM>~9^l1(>m?x$g9dJ_4loT~nR^@fnHi}ZLmKwsz%7Pc}Eup+<2@JS9FCF@F-MY`U
zX!%g=y+DReJ$4tDHinR$MY3q+wP%uwfbs|Dnp9xv%&GhEb3?>^_xfa7<U(Y`1p<1p
z&-aiL)cLDP)iv@AS%o&lVW}t<71xul<QXkXbJo?=nFk8q+hg~{oIjOyc;=y|r$3^H
z;NOJ?H7z<A?DqhtFti5^&YR&Y1*1kot%uf)mR7BG;zgkJEEctK-4c*p8YJ%fYx^(F
z8C&*~8}8G!vtB@H78+Z0<f&z3+)SzAjp;w!|CA%teh#VrVdzb8$3(M0q(ZnJ@?5Zb
zj=xCTE<;t_nwzpPJpJ4{WI@QxiwrtXx6qfWa46Z=m%{G8lRWnZTrj`5t0gO@US8C*
z>x7H#(!T2I*#+Z^oN|mHk;|Gq*Ppdb!C$<Ak#sG_1s@1t90wJhEc=2)bH%1CFbbXC
z@7<Cr9>5%xss26O6ac5)hFPV<L~7>E3BkBKxHR2)_K(gOb6=$&JTAhHRE=n>nT=;V
zesOpJdlvlaxiV|qYHG8Cr7|>I=#D32$<n?SF=ora;}Rmrv#av#cW!&c(gG4qu#4u#
z^U*g6($<8__*!On2vs>713f1A;Q#~Xf!ygktQDG%a-ls8GKAJb?yxwl0prmnRq81A
z$K$d;N4RzVdLr&|D(CPIg?0CNUcywmxcLw+ew{CU3!}+1jxERXAJ_u=i)!)vvuaNd
zPjnh(;8baJ%nN;-5cvi?nIy$gh?^*vVnHrVV_}IggHm>Pf%N1lSq<YD5o0FU1(Wvy
z`9KhYxm<zwI*TXvW+`j>VMo`(V@lW_!iTzt+zKFL;M4v<zx(-vZS)_rY@*WBf;1M(
zr!aym$%PwCB5wDS<YZE0Owvx0#X=|JqX};lJ6ggHzm-pOtk@&00OP>qLy4D*YVElO
zl@6r)e(-;<r%4-Ml6Q8>uRKLbpIz?B?FU)rr5XD0tSIsYHY1N|fGzhlnPz-&z`aM&
zhkq{S@?e<8O(}Sly5`j+m&1_!TQeV}@O6&^?y@l06ATxgB7B+5t?EziVc0NQ&3XG$
z#uDKo-;>di8KbYGKjOI?mt<(cc0sEpCX|zoHZtP2rFN-JV1fR$G@koiTFDE2tbT6Q
z>~x#qH33WCk5^x<Z#&QyzDT_daRtY*YB91F+z5KJFh5k*)V+^KjW{{r)qf=yy8RH8
zBBnh1G=EkL&wlvj4W08g$gq6<yK*0`n!8k^KYDdK65{2oqp#=MPupMh4li|l)I@z8
z&ZN~7@p$Ou7~9jVcgf9%m)4_Kkrk4GLcMzNee`KB_jRW^EZE`Gfe?UR85lV>(z?9;
z&a4)=Sg=;Pa(f%E`{66S?na5@%bymcHC1#nW6y;R6#<J{*+LGIaoiW5F6usxCS(`o
zshFPj<st1*qfe(^Zq5l2hc?G6olSC__Y*nUT20aFz(+Ved17w0)95@*u{SS~0ZB`?
zt2$L_icXLnp^c#24V7oIpSO5F@i@qiute+2NWCBVlQ{et-X6S1xZLPG`-EgA;_j!+
zof4NmftzBbfJ-6=s>2eF4VXnIbe{ZRb-9a7j9Dm?2@}M1`x^*w$jYC|IU{KbikZ1(
zf|ko8uilFn)-7*L+!G@q=wqj`FxHuCRpIfC45~#xQ%^FvPrbVjYOpzI#e~9V()JBM
cJzaXUA?(fnZ@(D<U^;DAcW@V8<#X5n07Ib&X8-^I

literal 0
HcmV?d00001

diff --git a/skin/images/sancho/sancho_header_lvevaluierung.jpg b/skin/images/sancho/sancho_header_lvevaluierung.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..51284645d9d3ed558c82bd2e5c67c018cf5965b3
GIT binary patch
literal 90057
zcmbq)1z1+ww)O&)5D<`*mXz);73mU?E(t-pI~5RV=?0M!Dd`5KyE~;Dq$U05r|y0B
zIp;q2zvt`;&x)C2%^2~H@%@<i@fE_97MBu-;NajPYVZgBn1)0l1bBGZKS(#g|4rnZ
zH*egyc?$^%5gF|k8XD>?R8;iacQDa!W8FqY#l*wJ!p6bH#YMxwC&0rYxPya>1M371
z0kpYs6XoVj6dZI^be#V<{b+))kl~Jy1`yz|Ab2b|1T458Ef6sT2f-u2!NEa)CPXAa
zBRm{3C?y2>p!Clo@PKdw4*n+Mk0}TZ<ilekU_uaFl#Bd}zt;KBp5bUV<gDC+ql+Rk
z?A@lTojPz85_0dXJQUnjFTObOflogu%g|oWxtivtb?YE@t5KUF9P9s3_3wiS>$l_*
z>m}hQ3yd2@9#NfEJOFjb(gbNa|Gn=2H3w;E`FOlyrPuy*fyKGI&n>kM#U<r1#i7LM
zV;%@TY`=`Jye!s{ru<6iv#`GO86l5CVeJ;*zxB>#FzzcOFQ&tlG0r^Mo;RkPI&u-Y
zQ$R|2WU#Fjl_C5Yf-cV%_}=|n!~b)JKxJliz2*A2F!N1<ZTaK3H&`NWx_>D!aT8Dq
zi~bCEV{!bYEyI*o>`YwxefakWBilb933E3~pMMzu0k105{{6!6u$N`68qdb$e1w|h
zJU?B4rd2^o8#){QYHLScj&$2lYILpLHiU4v=C}H<UHnUr|J!Ss5L0!Urb{I^shp0<
zRW}58h*1rejP>Fzq>^fud0K5)U}E#T0|L%=_J(-Q_WU&~*`s{R-;<0ajBY^u!EQVH
zD0_WkLgGU^(V7_RmfUD*6=W{)rk$TzM~7O7&)t~{!st)MPW<19`QOX#a`$fSSno)c
z+4(6pc&Lha4GagXkMq-oYr+V;C-{c?N~&}(;;Czp6U)2Op|sy*BQaM*ggNM*^eeSZ
zE_b67IIfP5+gWtgD4WcagLZH|MVUMi7<Su{ULmQa5$(B|GI40l1w5*KUm<8=IE<ku
zNMSIp(d_}!T0crJXz*Vql$&Q(A{q|%?}o|_M+^EDZ4Ab7+9R^;&$qyNgCIn7HU(E{
zHJ$>ncX8SyGi=WDsw+W0Ea~4_6%EjqakDoD6!VoI1=>?YA3fjFoB?I%_Z|KAzrNLr
zl<;~2`tX&tmiq*<mq&-lx?byyBo$lRhzS2J=Af>##f{<Aapq6Ae1GP;W>=?#oLKq?
z#1@QDZ3IE^RbN#$Cgx1XlV6AyXsmwJ)-7Cz(F{SDyHAOREh!uCLl9Dk0e1T<2`}C9
zg3k~nxP)oN35u9DWq($LcsVn`j!!wsw~&fBJ8ZIl@GJYjxWdmJI~&!bJSe!l(w*(3
zu9pf3F~~ePTA7u~Ceio|c{HK67d2;*6l_>|cBswJPnTM9ZuR{dhw{j9I9S6({uy``
zG{j`4b{#ivvpj$x<YVOToEa%6Ih{Yb87THYAn&etex(uc_jZIQi-`Hae9|+%0dwWE
zAZM2R+9-<<&BfBga@z%tExDO$8lBQ$Z5vaGn@eiz3iUDTjLXxMk4VfEnB-TEEA4jP
z{v;fO_kl~y+Ep!?9q~HXY#bkV2ZB74=b8Y!k)63|TW)4!E-M7LMBwvntFwmvWLNTM
zBM2G_Q0E~;nK$#ScKUm45A9<0?Boi=wF4fZrKo_k0vt<(KzUwodQv9deY4{@yX`3E
zve`U4xHW<g9_4)FW-UqS_YvBv27^iNp1_E){V0)(N0oviA&hRWAfzfa5Nkb=j6u+<
zv%0x0mBcYH1%I=(NN{@saHQKpauhQYfK8E>{`z>Z7PepK(o99f_5L1jS)Z6YIC1`r
z(1&Z1lrvpTwN?5IkOpYZ7u?a=sQ7eI@c^NX4Po(1*6q^1(J;RYP>LMKeD~%CkMV>(
zgQ=DcgJe-B|Mmp<vOK|A?E~ZfBUPV(gLEJTr{kVMSftv*2Qf#hpcyQ|eaRw246*N<
z4gY&&Z)-(vo#6XGF5|f2sd-00SXUSUrU6*8IR>9{y^{<=t;sqB*d#3;8lhpR5?`Z1
zOIijMM(~aHJRT*$;cke;pyg#TTOJ^h7N*=i>2G)dcF}3<(KH<4TI*n%RaVMp=s{J?
zvh(te_8(J@7|s91<r82FI2f<jetpk>a}{tlsu6Ph3PGaPPab@aS-H|!Ns+4IuskIf
z*6%3D6o|Uv<mbfV){~TRAF|!tKw29AR2%E!urwNuEnl{TR|SOWNukvJ^)3khUe{~D
zqYY#azmD%}9a=!pZ6@CHlhf1Ww(5Nclj&R_!Or}hzZ7t9D>T9c{m&$59<=AH>o}Df
zxUc=~ciw+~Lo!>AQz)tfOInmoLHxlWxyrGuZMnL?!SSdqQ+-{btT~S}BZH;B1R^Zn
z(*DMv(GWCVw?<k8m<fEt!dSF}@%Ho#M5+C~GJCqn+*7hV$etp}i5Bpng&Rw1sZJK2
zU3WWQsSG6<%laVoFchMj{yek4357enb?UGAd@MC|KlyKbgXY|+^`{0{pZg)M%?n4z
zadpcOgu8dEtiMS3avG?dZB+$TT>1SEUqGDcV;ucKCS%Eu`D~6YcBU%HA!Kma>kBTp
zPtW{NgLOTpKS2nqxZ{XrYo)^5pz+TnxUj{-t5!!pEMIqI61?W~JNrMs@vKc9o_NBP
zlwXOAwV(>uq6kn1K@WIiRy|ECsV5-vWX(hQy0g>%9tyz@yX^?QI75%iW^pEinTeW{
z%C~cGC0;zHQd@x_hFx4!6D6Qpeg4%QrZBaup1ftXy`D{;LT&5|J*?mI;aBm0c6~n2
zGhVrF)c4?bGc>nF)V5c!34$Ps%k>JLo>xacaOt;;b&WW}TEnYvTYB<xmW>aS+J<&I
zMa)N8>Aa5SZ{f4)yWkcE3u1G>eYmt@x%PK&_q1L3ot)>A*ls`N#&_ypn@9Z{>d7C%
z=y%@;q*bqM^ZGBG9zYQ9vBOY+o`&RJ7laTXFU%!JqhngXMh-y(0qV{)ciW9ULxGt5
zBf+!v1*<YzNTs;!vu^gDoi-gl_@n4QzQZpbR~qqT{n1WXzq24mckC<Jn)A0R>$2*l
zDxCXfz;pm@hp8_}VIZ!^+`AfL-FP!D%!KTiaGV498Q_M=&)oi4f~Aommfqkcl3+Xg
zybUea&3AwF{U6=eC*}*xZ9tP7^QD47oByLRZ}ift+L(lwT(uKeVC^b%ZxL0+;Y81=
zVi?;&6tV?OwY#9GK8a|p4=B@htD;`=^)QtP!V=aNbgOa5w;U;LRBF3W0;>%YVeukD
zbD`mw{ah`z)JpEpy#MrqP;Mu6^9<ICB+pLfy!4Ou@HbnEa95jY*1Kn_sbJrL&Rf1P
zJft`n4Qc>|;X8)K6%Zxh8+oFTXbMwMPWMAhn?rN$$?IvIwtZkF!uopOwsyJ`6r^<~
zEB>Aq0XJDqJ-W3A>lKy&YgFBxi)8ByYTlikm?y^|XrT<hQJc&C=jMmi!YmXdEMDqk
z<Jnd}E=|yqonFiPWvd|Ej_<9|_?zYi=}GVYjvLV(pyd8a%VWd2hMokDulDmU`rO8x
zIxAec%78Q?&7bX#{G$@M!(+7hmRfr~_vBn?87|@;`E_3R3%MxUj;5i%X-2?VyVaKH
z`n~&eyl2BeVw0d$Ohl3YnFnY<Z7rIwr!}72zx`Bu^IV2M%CW!-Rz4h{9?ndBv1&4&
z4E;^R0A<atH+;V2FQfkT5e{+bA!Q@2=GYI2HEb}5uRlD;&=miXuHUpL*jA&#>c<4%
z%Z_%m=M)Fy<|hBHZHQ26CzCfmN8r#djP5p8`By^z@r*&Z1V%Cw%ePJ=qbLN2FvrAl
zvZBAiE8ej!nRo4Bb_nl=`jpH-Tsk<de|Md>`0B2*t~M$T{j`!WC<-I5^JfK!eEvbq
zKRp5EEJ{t@($isa954PNd3my&W)|gSYiim|2Q>Mc>jd}WT+5E=0O&%Nov9>3G(sAc
zG(Bnw_-;oj<^n${B7CydT~LV5wi1%iw>|B!ZJFfpGat}69!^|yZYCB^xU_2@#WY#5
zp+3$1lbe7tkl_BFy$0PL?W9eqz0;6fJcYH}Td6y?w2I~Bpm8c$)CGD+>H$_+@ZtOZ
z+B_4_YWpp|=4`%i=D*;Nxy<Qdpy|PASkjibFF~}{+Fw+76<YaxTKMcD7M(2}u?Ew8
zth_EQgT-k(&F*Jaa6#fnw>1wdPx%4;J+l}t$z$$%JRLSuSh^NM<^sozyMUHlyif9s
zBmzXz=k^v-Zvl|9tO6|YfJ%E;6M5@jN=x`)*xe3aJDtocI(KKDZeUfKw}+ANF3xl`
ztnhC4j{xB0SAq-HR!gRzvRS;>>GM15zq#Sff2@V6$&hOkP$kX5!G{Pj%@G#I6OY$^
zfe5ZmBwfCmjPkXrLNIQJlx%?2?i;Ki)o$!H+X)-;%+Jp6$=qZ1zRZ%s<j=4i@Tqs#
zS_#&~8o39pECl)4e12yBR~Pu_<Eev3v7aG0td(Zk_3kt<r=!7|r~bO`(?2CA7z}eo
z)K^xn78?wMLAVIlQnd8+qS{dS=T?Nvxm~_?tI=%rP`B>uFA5%hKR(<`2vBl64bapd
zO$^_MNj0SU(ye<-YRQH)lNWE>^Hy1Z)%|@%n43I~6=M7L^HsQXptw>P-OKQws{Gpv
zf|*W{o~bv@Bm{w-I-4W}JK{wyTtAnV3RWFx=obN+fX9{FJ%9iJ0c_b<g6cZcq$fXx
zE5x<b3V_Y|daA~}U*y~{Ou;L2iFY&x7+l<MfZ<MI=2&HR<wkrCH(_4S)41d8G9i+p
z{ARu<s={VPZO|R7=%I$>@*mKxM*arhEpDFl(k=S=e$}%Ohx|Q}UG-4=#lVAfc*F73
zhi(sUdNvjH7rg_t;dy6PvTrFob}97A*Yp7y)Sgl$d-2{BC>W2lf=6d_FI#zYm@z>C
zgzYsNHd?=w{C!dI1Aj$js?+vk*C&Tx$2?~~L16>o30hJ`1}+Mux2f-6#2F=?(E8ba
zT^tI5wfv_9|MfV|$aw{VYtPNDNZjkKly3V92S5tzG@R4QXBhEj5`{1c-(JXOHW@{3
zDw>ZGcr$9<!Uuw9=?wz^T}RyZ)^C4y372)dyePHcnX`rC&QHk(Cb#VH*rNZT>Dxa*
zQ8=C*^->}9bi^gKg1Q}zQ>Wg*xe|tJ60_5nT3>HmR2#SMO=ew&l2YIQTzW-aoulg}
z)BXe~lkPLchR!?6b4t<9X_$BcS(O}H3P5#Rg44AzcWu^Wa!4Py(y3UT7Du<)2%DWf
z+)Jev;(9;Ue-yjw>ALQX-QV9}XR$ImY#>)@GW`fZrfruOjs=|=h;@k(J2K_XTg*E$
ziPoJ;t%bB#)2zDGUY3^JRMVBt9{h%ZG77xykJ`?h%q7Bl>(6i<27R9}6)8I@55;K;
zDv@#r09y?|uU6A_v(C(RCbi;}rZ9Pe3oF$@bAQX+%{)dTAqRU!lzFq??A+W@Bt8dc
zrRkqm0QT~GTHe7RI#L^88*%png%z0jE1rCAsyy&_J6_Rs2U$<0Dhx)0{oCI+IvAkE
zFsQlS{|OiDvAWtk9_hBv5LZU4{_5t0=LLz@FEIiRf#7-u@p^v0sQK;#*hqXTWnUG;
z066%k3?q}l7|={R*}k>*QWL4U;Q6_Ly;loR5%MpO)fEV<uy<FI@EeWe4me$+GvFV3
zX@!sJ6!PLe^WZ<FEv#?k9&rvyUn77YII39H(bym(6V(*N$XeUp`$i|BaK^71mtD!a
zsUYQYj;Hp%e7=@81Q_|iU+~Gj!uZ$1053s9ef@eG_M_($i2$P6Bx8`_J}dWRs@Gww
zrWqYatY}F9P~TCXAOBdYTS4U}vr2<i4ozX~>Bs6rwCS}_Woh3orSf{APU<s0$73K3
z`*7mI($f*&PaX3ZUELMdM_GP|x7up!R$HEvn%9;?(z#^~%-(@iK?F3HXor>ZdakaF
zo?&nt;~Y)OJ-KSqdX$6g7GRV0&j}z>`zLDG%MjKSmgw1&j`KTRHA*Yf<Q`2GV3!w(
zzJSwoovN#u>R{;vCme{7pp2fU*o89(Ksl6nA(lr<ox<k>iSl8ZO9ZZ2eTMAJHujiP
zQUH@}%gy$jWgzkqT*3`VF5ub*NFzCHY~*%+#*0<JA^voPU{v=OZR~WN+j}%+AL1+#
zPZZ3n*hvk<^|3v1)wG@Sc;q=#YH+$ebS)l!CmI-8RzDyUcX2coQiGI@9Tor*sU_bU
z5)SbVl##(7&;a(>cMRTEl!ddC@a)R_>)m25HTWi<>bncF<W@F;vCTy}ZY7sfUyBR&
zE!DaV$5y}S_f$_n!ST-C<L`;s%q?Ty?<=32X=<@s&ec<CC7~B@?Ap<9$h#7%i4@gV
zbB~w=rvrn=$}K6zIw_ZaqnEOg`tH(wDYrYo?J^4hMd=!QshT@Or2Kwy8BB5OmQNdW
zleH3%E9&JYNzU$FRvGJP<cSEW4jegcDF~^B$_qq|&5^;WpLNA^wiav@s*oBdE5xAH
z<_YC(6pUOOBrC@u|MRMWH>1xrSE1Lf1)mWR<Hy5^4!0o!hZc-r-KO11NR01ob2Vn)
zg%cIeGT>LWU&q$e#=4GFov9~odl0sq+4KuI!N3!}#9aN;e20812pk`{rlL~@vH=a4
ztiEBMf<qLHG?QN>W|CuQb3-`+gSn#gdc_Au238FgYor79KXmC0^||HaN@wHg1U+f{
zPNm5>9<u!UavE1$haABarWfV^blM>Glnai&*`PIF&CWf|%u9b#M^DBy(H9S^%GY#i
zv6=Ia$>Oq#NRe*EMlu{|lNRncHx(E-TZ{@DCtIhGv~F4L%A^oD?r24RJXE3L$xJw2
zOTSbQ9zQy{z*~MVs32@Ik=l2p`VkzsVk;SpT0>uX;gwE4T!(Byf1-@>xtSz0mR9@a
zE4qSyWxIkyN1Cg^)3vFf{iiUun$Yv9JzuR_Cn?;G`wH0o07(7E(ZL(ftp)2$x%5HD
ztLZw^?U>Q}Pwsd`7Jfq}1_B<RMmHJ5;hB$@qmltMC;^)83PaPmb@jYO>_5dDZ1(<4
za0aJ4U^fEQ7faZJeK&a$_+ijr?B7~`D7-TPp}8#qaSz;NjP8982=^CpJ6^d1K!>>N
z{DF((4w;1ITbN}{vergjuVJiX`WaG7CY<5dL<!e4byj_bn5;SG<y2m<QSb|r060r~
zo&kXNeoJ};E1g0SEoY$a@|I^`#xS}qf(5L>-bqI+n~%x@V*B@!arFnQ3L<;cAkXtN
zmly2z>wD|T+J7C3-9PeTg<w9tI8_%B(gvnSWSzbVT3WS}x-)SWZi^xN4pjKdmGvqU
zdK4JdvggC2US>I7M^U<U$4D_*JlhjdN7NrLXQcvEO<5jk26PRTc%m0nJLL<m$S4m@
z1IZY7fMaE?<6dCy=G!$i6=iNeGLz>q3qXuDoh00Vl-&7Rs^&Z)ffYIh0kFq2(>)Y~
z)rJ#CkH$8=+2rZE{j_wmx5F-@MFQ7)FO(;)E*=4An9ImgwUFid4sw;l5piOTt!cZH
zJL)CBZBx}ZpzxjSS_6JASX1-o`uzEDyS$o_bSFGJ-=(_(@LneXeZvLF0y(xVd>j$3
z4d61$b!kvrZ~+(xH0xblhGTa-Uc*)ktI$I`C=t*I!Q;b(-5WV~?5-L+AIR7CS;*mg
z?1q^GdB1mXs;(bn@!k5xJ$+zfK61r$8Nb7DaGbw)dhfU0gJ^kZeO_C?RiZzPa~hr1
zQ&0d7!U>ag0V!QStxSXx>y73j!TDldc$C&6AeWEIJ;nM$E*_m>it>JgZv24ijRD{S
zr*(E-cMGf6of{x)@9QSsY12<u_7-gHI_~TdueFYs*C7SyEf_j)x1J4(okeIggpJo_
z2!5|UH7f8p*3C-UCf!N(AT*Z<Cr}aAO<pQDaGoyi_to5cso8OaXMT<Aa*Uks{m@Kq
zFb*-^cR#P0_nZ24(74%53{rH~y+-PQxl$b)1_{@FRI-7ooten=gXo48OShyXqE$e3
zcR@kg`VK@{Mp;;QrQxgz++v=S6@vllEO^Lq^sssPm&9(FG(4pTG$2c$r~&n1xL>7I
z2si!bL-Ezk<XT{201uHc2@}m#LOVra@-4Prpx57!h`~svAu;tq&=h>gTYhMn&~N4e
z>LO-pe&PLODFt4=T{|E(?OQ`((e=~6U<cr8Q6P{klDgMOE8n*C+ZB!?ArE%1A^^9D
z*Tk4M`^oFc-`KtTI{5GE=)X|@KfdCf=G9XF+(u9lFIRR-;OXjw*x4XJ5&8>wA&6}&
z2xv0EPO0T?BIyjsGPJtdfZ&0}H^{u%^GAos7`Gdpwj+rSer5oD#z<`?>`9RKbZIG#
z#NTrw0;tD*rWEWAAJ8{t8O7R{{O$tYGe3-Ay&`j09`Pp-0cQ(ppsuKw6v>%HsIBJN
z`Iy4H(kKg`8!~aX(b<6i6EWXqIN+CS7UqpJ9Za(fWQSP^_Zq1HJ`JOpb8*~Gr+UB~
zd1<^o&(2~z)$0>1`@cwVdwj4~&P7tTZr$&|6VM1O*S6G!rUjIYT-)x=d~kTy5|vIX
z-8Sjmm&v=R93~{r7ocjjGYJLSEgVM|<*-7?JILR041rPy1Ab9kU-ch3H7vt=J@eOE
z-Bc%;2KM($jkBpz-IgnNEgx73gb}Yljzbpkr@sop&ayIl!lgM)PnOU?e=JpIFt*@O
zh0*$<i4x-j7Zo1}L!*DD&O8j9t~4>Ts>4xNE{C5T{krhu@oa0&OOv>iWqiM#Rd8P6
zygEJ{rL5os;x&q`Jtd33WRN94GoBaP8ggy+6&G~-`j^JP9uao!E!>h)VS55$gQ}4>
zANC2rFv?U&K=+?5-r_@0Vlq53Tpk_2T{ST;6ztwn)EQ^-vNJD}Ckj1u9#nwfex35+
zql)WgVSRPiu2SK;*<VM4a>NkmnBd?QRRga>?jaYGh>Z0wa~TZd<?$_f;1?MX1Z16s
z?p0d6XSb%{Q!h>6v5hQD9{B-9Wx2Y`Tuz-2dx^h6l!dc%+nOHU5&vH3ZM+<tmQ|_d
zT9YiT=<`P}5EOTuQ|3vX?^bFZ?@V*6vG-}JGvh@47O!KQWvSjigIe9KVbZ#jfQ)iq
z@ty>*m>=s}g*HyAt}J(|IpQq#=_TaO=ykb1|D(gdKA{#(%y0jUcz}QlxSGo$)hXv!
zc+slr5Jvl}&%5d{KP%9kOcHaS0o`fa3h7p~O@knw-uv>Oa2C3Hd4b@u>9`pT)A%|R
z227mJBkl*k2KmEc{P_m|ORXL8(oGAswLZ@)X4V!As*&QqGoq^*v#?!sXuc(PMkv%>
z0yHKe1|r){Q^3H7<ozmG-1_7qy4b$B!~m9@_yY>i@_i(LJ)jZg@O(5FcOJ3K%g?F*
zLv;>bZK)+`22NT!qg#mM4+yb5V7`2|mRfX$PV@TxDmoWfZgck*KGyL|!r8nM4bs<R
z%hd}?;Tgimz$NFNh6(0ucV~9J2>+4uR55uYwb+X3tZvhZ?1%Zgk9v-rYOpPzxJo;-
z6xBxYWnKCcC5`KBY0UZU6JG!$F8<g!OVIx=nYivs{Z=2km#61nr};0>nhmMTwIFx^
zB;;}7`)k5{01kpVz7hI>_*6W{>KCxz=>~iN#5o}fDTnoZMb@LZtz&7yyc04F_A+6F
zxz0E9Q>#7pEqSQW1vir?GxF&9?*aY^n@2gd>kXbS1;({!7toSHcts}&uaNqnhudFU
zAG&MlX+}mTy?^3-OwsDzRA7A0pvk(Wc2-l-m{VC!GwPj`d&=-jxBIDw<Zk|e_*Biu
z(?H~vNc)poPyd|+?qGZU*9Ykp^;}gs-1K=p$`zh+og(6zsLl3!BIe#E9;0)1`CH{8
z#$!in!RhvHTl3Q6{VGW(CK2<o9}aOAJ*vdQ*DVzUQ~~^mx7v)d^rbs5t7wy1hTq;U
z&lK2u$V+O2zIyqg8;4HrM3-g}!*kLxqubWIy=nZF)KkD=ntgC|Y3}p;>;L73hvd{7
zF!xKM+2?JcE<a53=&<e_D{t^T5L_Z;UGkR}#=U>xOcm>}@^jDs)*=(uEq3KTk+Fg>
zgYdy1!?Cn_XK#%Tpi+h&F1@i!k2=bVJEpmKORQ=8rD{NvG;ADrp+Q1eIQnPY7EX9q
zquBk#);z?mYLqh1V^j;f(O7RJ(SKk2qIP0#b$qPiaMUVX#|?O80Jv44r(mZwocJ1)
zI*)44r<pOd9Ikju6@)9;0o9+jzWRL3XedDYV$DEy_*yk4Z^LqHBS^GOv7h4mNj>ua
zH2?C%N)5vPQR|iffu!rFlU_P@*4KW+K*pm4I5XgGo8fHowB3Ggea~k#vOJ|S>rvQV
zWO_KFyX>=V_0w;3Q`9s2@ec{}zh+{q7X}W8yxJs-;Z*rJ;f6TplE%R_v*2!Ju$VCp
z**SGt_xFU!|78Jwzhd7mJ4wr``1uCcQ;>rg?NKvzCbSZ)I#azfJzwu83)5XdsM+NQ
zSI06C6XLZDt&9y(b_K-g>1KsitW21S7SUIvFc9^)4a58`&Djhr0;(oIVK>kY7&~tc
z(!VN&<5f*Y3A3IBXpS8eMwc)goOk~<itji3877quzY`l`xL|s29(kQP!V<JLJJ)u~
z-%zfWkn8Hs@a<X~*Eu22_I#_}U2Bk(HVp{WdLkl4VH&@@Tqa-{t9Y4Zb{Fs%%pI*o
z<;>PM8qd7FjcZ;sKDVMelzi~CbT4UX+JW*Y<AX<vK+^c^_VnDVZ!;JDQ}b)%V+jYG
z7HOhpj#I_3h)SOP+K#*|(G}AP&n*tCmSc%{05Uc2@l^_`^xiMe_n6fp8<<RXVtjgS
zoV-?S7$DET);|V2ViMw-B5ecTwXQ#|x^jRZr{t+A(}xA+n^uz6-Qq4?*w-t8^Jc9)
z%NsWLAOD>8f4jho4a6=SJ3shG0o>tj9Z&uWX9&ay*{^LmSxK=1O$$L!*6!m*4j$W9
zXadK0c>@SMKuQKspGB=POyLJA%stpHcKv3~xz!Iaf_m=HE^S~z0_^k`N5We6G;=&+
zF#j0jmqbj|>lj>A3PDvE)&}P&T~L7^W{aIT=L)v+k(|+71ruU!HFBF<i)doB7FoCj
zM>Zr6c40lL`ldyix}vuF(Nq+MADNqmR&(I3iK(0g#Z{I!b`@mtE$4a~uN<Gc$1bml
z=43k?_ugEnK20lc>@O<dSbi}n{CZ@o+#qznjM|gWLU<=FhrXdcSnD_3@X3A5f^;RB
zx6NWLP>J8YbEu>qH#bewgV2zBGQ@uIqerVi?Zo`L!Y2@J^4KMjWO_(zE_;cwy2mgL
zS8gTutnH6){Fl4qPA9OsKK~`RwU9!)!*%pH&1qYIn8<D$vCO4V@X8eZjCxk;m%4?}
z$97}!OU~^I7Oy@zz*=B2LjWtOKyqqn&lAb_f#CXlrE7af!|fOU=ofK&+N!^jxiH@0
zGYJvVc6X|f5cf*I?%buBn^|j-?o0|Q5df-s3*Jpc30({=juV@?Iaurf$4<T`a1U8+
zC)#Ya<YW+R%|ww_t&9#B&$FW*y!aBrzhof0pDQt5O&e<4m6v^aVc81?iDh|L?kg*L
z#wvG#-6z0Jmqsn&FU|^LCN`($H3e<f+m{H=0W3RIToKK`Z@TeqdwTXQsm-!-_(CoB
zY;B2YYY|>-s;$o-wEy!RA<M+QeNyi)nY^Q%0|7eK_QA4}Mcu8rq#?Xf4phg<q3Zj(
z-^{IK%GSz-Jz?73&v>jm81A&QwRd45o;S?XaG$TyPwQr{8Nh-YAeS}~k?*=Tu&V!K
zLM0lQ0+B&*w^tqlG1&P3cfD9ElyB|u!}`MD#nAZKCqjaroMiD_Ee#1<lE+J5SrE4i
zd_*8b0d-llDT_EShcPOh8AdL;WO<1F`_RLT7>5;ryMQP>Sa_Lf5w$pozZOu1DXsqi
zoPKuwZx`$ShNH7VUmawwe=GXe45GswH+Oj-2;w?wzZLBfl=y7?F8jG*vzhG4uGCa@
zBP=cnf&-=<{e~<Eh{=^0NCPfh$ev*XYelR*mrQf)D%gEbuEO%5SqlIn<Dm+2$Xp;g
zR%;~AN(Xcc0iTBOY$t6!@G^k(H$AIBmKK=1S5C~se2~B>v^CuTPIs%-3nk0bdxs#P
zVo^CfR9Oo5%>6VIj7G}U;uUQtaNq+G9Jj;&dKwMZrIzC>FCPrhCN$hArEy-H&NKJw
ztv~n~-igHA5d8y+&T_sWI&<nEmbM)uwadS#HqaQ32Z6u2b*+37(x#_YpZ{L)1t9IW
z#|O6Bz;&~&IS1nDfUg`vWU{@p(!BH($Pt+GfTp<=pdf|50X$hCo<2}nis#W2*gXDB
zH@%w+d}Y<IE*{*f>>UZPBj1^gTt6Q7d1Y%pcI{T^%HiRz`&zE_Z+eV@FA7)@ahVmc
z7y>dp6g_zm=?fbltHDD%u|{5i<Gk+y1Xn=H4d5V*cv06Umfe+hs~3^mzo-P)n<6Ww
zK$inCrw?!|)ADXEszo|Hue?$jxK|fXzsIHQ=2;|SGI0Ed_wCPi|M7$R+^Z3oUketZ
zo5_>4HwO+6IPVH^7?C<7@qlD`Bi?ey9m~l|a_C{z=(#En2p2t0_W5HVI0=_2eEj^{
zM()q(>c;?^ig(Q3n3w?$P?R>`MmPDZ$v<$zKU)0fcWvR4?V!td5`6n0UYKut;%5)Q
zH2`z;v={J*w|#|fs3qMNQX(3%>IKRsh=M8l8T<5mC>)cJbVqm8X@Q@d;7`}Ve@@8n
z79eJ>v3%WRo^lnpA3lGn)X>Y*=Sw#EjOG=CKzB_P+#0e3X;sn*qg%&qYToY-OW+aM
z8c((=nGK^U_h0uU9KJ?po2qO8p*H_W8FiMZ!DBig*ct}Zik%hPzZ*C4=yYR0E$sOF
zBulxmPtSc^C$5=#eD-#Nq?;UsjHh3I@QPJS2c~D(b5C+X{zcE};^ERNQd<~Y1dN>C
zUy*6T{|HO~)ZPRtmOO9{01qi}4lJmK*y|^qSUBxk=ipJm0!v#n)_1l$|7MIl80XiI
zK5Qs1Cp;GDH+mqT0b#ZIGEV}uH_f$UI2b^OS_=lJ`M|n>$7(AguV>Mn`}&XB{P~28
zai@WV&A>U|hhdk*iiC+NT)~=o5_;@v(^QSAE&OpUf9<bI?Z34CKfR&{a=2c|zivAN
zAgynKx!3U|h^Gj966|GJQ&9<+zqml95rkaCPCUITH2`z)|1|;KLld~_fC0Iu(XsXr
zrgg#m13d{4oZ4AeN^PW^+u`+JVUWKz{y#p${qnOuLlz-y1kp5kcE8#o_w%z5wB%&5
z{%bc+NmZklN)3Qp6~rf;adDN_le~ive5LvKd^H!3oxOjwKx~*0+zmLmn@BfczX^kN
z0DkR-a1%nr#JYn`j)RNG%E|TM9viz2#}f+5XH?YSXJE*n9^6g%E0IU|W^7)8>;?YO
zikXT#BVze&#_>!_@=1#$zV@<sby}7IJLDUSeB5M{F_`_GgrWA@`HDNZRqdIfS8B3k
zhPS$OCHb95Ed#`ARVp-cH1nPh8;t5tW=|D<nreI+BY>Ns7T7r6BWpu7_Oa@KD$3yT
zsX_LNxymM$3>v}XnKua**Z1XvtVfQToJvcd)V{8iuDq;a`KYZ*ZeKkTV}|C*bIhF3
zi)T_3S^7zI@Wb8ilAAO7KOiltg22ql>hB*5)gQ)M1m%Xdq2suie&{h*mAG-|b`nh>
zO_*8d-JqaR;<I}lDEcVpQL>@k_*}FVrh3ge&JneF%ID`r*5CV6A}DtPtej^E;+`-|
z7zxIQNqF1|dC{Bb+_%u;iVCrPDO>t(TcB1&{?=h5-bvnHt%lfej0fde<aLH2UpO8P
zvBwDdV!=?+56G&SR`GRCt?kg6(|9=A2dXvEQl;9UrgGkg-~H7eb4xvw3JXhhEiSXA
zapwJA*1Q}o6^8cdlY0)AK|)kzFKZb|p<Vr#aoZ)$P`Oy;n)`{P?ypdg6v(@dqHuA;
zpk0xXr#AN6PU`KwND4At#ghzt5#>4>`Z$4%Ua~`(SdYgwHOhIFpGRHDWiqa`e(Nuv
zOCPDx4x@QA_uhPwn(DP%HT)-i)0JpxbmDLgT}X)I(d0B_8`hwhPPP6a-v-e>>D*UF
zv|QOub`-vi_Rw%Lm*I3ZrS#mDKd3*{VaJ<-DFAEIKRcjY!$UyeX2j@d?k!hlGoc*#
zuW7n=_+*i5l$wgS9+xlL>wL?9yd*hSEQ}KA@&i)X_+G6t?Z}(VZaU1jXyJZGd}^$r
z!p*%Ra;~UCTQ}oQVph9kU{ewoUqZI;3dXmB&}9iFjQG`zX$~@VBlgU}Gdw@5hYK1j
zhIhCxIog(GG$okzhQGFVVVEwazj`IJ*%!J&$t{Cz{5%HD_rB&UeH-@$+BVrvY&XMI
zqZcaQGtw)KNMaH_4;ct1raui$VJ@{&7w@-4NPN?-V+zG<Ig-bjr2F>hL~@d7kk1z5
zZPZ<qk`AjOp?hSyl>#qIrFtVvZX;jcdwaNW`BcMoz$?YS&aQO5FH}sUHPLH4Zs_@g
zReeHT)uoSe{;Jqfch!wHh2vu;NF)~=_&VBVG?-rEIL^ND3aF=iF@}l1IxW+6Cz6za
zn~aBCMQ2NfKXY2Qjww|o@rj8#$~3(b1Lt{;N^%{hC>ghE4yqTEpZ0tD=QDf5<vWW4
zS&GDQT(^ietOhq$`8q~ws&`~W6^=K+geK%vOEbTVmw4krQ`uGTgxCk?q~21B5?##j
zX6j_0U44uW!QX_^a!aH`;t+AO%p2!eabIS?AY+~&d?n)CDQCtlwI!lr#OkiOBSL!z
zN=U3Lbqca<adqsMkt3nUahMSiA84t2K78U}gnMTFKKIF#wB#r5na$Ii&ry1}>aHal
zgDpm%$gb-fp{-LP2YvAkc{=TqcD5yip(wvZk(>1HdmBfHkxn<^zQnm*(u_wilW>#0
ztBO5J?w}niR%d_Xqrz>P34NPh+0$i;7*i%o;)jkJ>Lm^LnrII6U-^maY6x;GD<4#J
zVjG(tg=3B4BbzzuUJ>)}KMcU0Bu7gf$9U@*ZfLI-Snbxho_{1He_n;NK(r*X*?NB8
zyv}+!`g&=(_l6N?0UP##+oSdtszKYz)k;BeUE#}d6W(D~Pr;{~G%2KLhD3x8k)mQg
z_m=Cp3dDIxh;-|DRDuLH!$sRR>cTy6mFy9k($~Hyicok}3iuN>w6*V)>|ZK{^l6hY
zoH)-YDD21WupFqJ>kY@q)HL^~a@j}sESK`hwwUpBj!^O2!Q-ZfE(--xK2pi8+F&Pj
z87Z}qDw*Ii%nN^%Fly}0W{$93Y*4ry{sZ!iQ@TnyL#%E4o;1kKGNq93<EA(4Q|s6N
zHm{m~xKhVeGnEwgj;_lrZCg4KTCSjaZarGQ0}J8OT|qk<>)EIzG-R>pY$i{GhZQpo
zPoFLxyx&TwV;`$^X~fK_mW0=RaVYSbk)#gOD>-zAonx~<oOXZ1_)4%qe2#t!-*(I)
zo*ftYChy${=N)onsZKi5(QR4|0hE$uPFJWnBng%7eG3&vF&(y@V~l1=2O~);OW?CU
zcr&u2VsB`WC+x9Y=eYy^A;R|qZ_-%j7@<tjxDPtbS~=6r8l#4~{+vYkw^pl3Qy+@6
zigT4rMciO|C6Z#*e~|Buf;Y71Y2;x<zk4MlO3PlkR5T8s{|5hzKPI_^3q|lt+gD_)
zpf?qcM7m9bMKlFVnxeuKdmE9)kNsw89_q0by~g|8Pp2K)VkfYu$??X8YDJDSdGcn;
zs|ODwF&i@x;FV_=hV7fP*8=4FZzrXa@Cfo-xj4*x+o=9acC>*k<`0NssFT5vOevJ+
zu{OsUVJtH%W)5TVE6eVtTdew9?nD&WlH(@#2lkl)!v&7NSC$y0>fa?%ym9~7CVX|O
zUe&l`)yPSyl(O7l=~j@!D;eIe6K@I?^Kj=g%^6cPe?T~$sdQ0-$}}$7viq_LiwPX9
z>?T1*{eQ{+Sf|`^Mwsh8#;DlxIMJLQk<qH8{ZTvoD>(d~ud*wZe3mVb6@>dopDjAY
zb`Te@O;ggVf5RSgKI=Y~iZAZsWl1B)^3B=U46NoRqkMWTu2S-u)nYX_^6t{Tl-qV}
zj9l>hZ%TN*(+oGK5z=s!@>xioB8a|*$wq$UdG?Oe*>%@HTyF%;8MQqs1*x6Cf^rnw
z9~F^OgPJd<KU^^azEnAE+bIi|T}Sqe4WYRF2|YQS$UBiy6`Jqz7;hIkZ1#v>zn$mn
z7w4v=NSOa{ba}bC7e|HF9sGoF@hM^g!G25HAkn6o_sd?1vd^kFgVY`^SP=0fK9nUv
zVOlQmVD|U{eK;z+$ov7l<O&*MP|qh5{;p$n`Be4($sN(RDL8YoneDd}UaT2>tZy32
zk8h*0ypm89F%dBu%47?FjzTuiK)9RWALfu+zQ6ds+>l1HIJQXEvJ_vSk9d#QcC0vC
zcyjVysZ^Sy4+_nfrZ9|=jyigr*>~Dc#YD~9WnXnEYTw;v6Zx9yAGusE>m*$Gv>l1V
zK7z){6(5r?j!1)j*^w?HlvwYhLnpBTj)MWMU@a1R6m1ZXEOeg|CD1q^{<#y1;axp=
z<$D1n&hQ5F5-FEGG84A3&5d^%sJ`z}@D`sUl;WK*?yZ`5bKE&04x4agD`oou6@Bb=
zu?tWyWzY<f(V$U*5a09$B@Il~PwE)<9pXCct6?=q5=&VHy$iIBrb}r@bY>*jydOvP
z-p#O;T#Rs2@|&RnoiOU$#6VI72Te(;g?Nq1b5o4AA^ECkb`zV<u*?*8=^@JggV1Lc
zsl<efbjA2?9=^RVFp*5)a?fAkA7uG&FzPtHv{`ZW{D?vIN}T~k*if6AzLw$@uX5g=
z-)NIKCeG(7qR{Wbjs4t{Z;e)@WnSmShrCK8D2`y~+<fb@BDF#3g?Xd-Sxy&yfc{<6
z{gu#2_O4IrPnkqn!J0bk6MyBONtR?kL1iH?nV>Q&)p(2Re#1KYLzv91RN}%?#Zg@1
zRITI?8B~=xB)mt-)Y^u$vAK<CIYw3Am+_=8tVBW$T`@JjJh#ftx%Y|_7lY*(F_AV_
zFT$x0zv<dY=keRY_x4#ORIF1}UX}$`Psu*-(d|i2>l<a=$L(X%_kYXLN2Q9>)a+uN
zU-nfmz}jY)zlNqc&7%BKzC48dIiO3N&p!5Yr4g6M;`fvA{BQ>G_KL^?wJm+C-28!|
z^d~H$A#ul99+#NzI^jI_k=!l#?PAw?k1~vsUR6C)-;RstSphE`ZEk5zw1hUoyAVD$
ze*Jaj!>8|R6+$6y^bL=_9GNN&++DPjN;cEc4BnT&*s0}+vdiAC%h^G{a2QrCX`Le=
zV?=r=JH?$!@P>ByNeNj+*S@={7XcZw`MpBpDKnRRq;H?k7G54UBdonfYX16A=HRF?
zbJp)XoK;7J?ulIX>TAaLfh7~G8G#XLYfpzB+oXcFbWe~E%2eY`UL$oUuBvrwv*YQ#
zM(Rhy0A+%#!rCJedbpBuf@x?Nu?w8=2k&T7)j-W>i70v#0}=g2n~}}2&!;O<wdXL;
zEm5|Yl!N<{tga^fn+i8QLPIHO_-fEdP<-x2vtI`LR$HQ};d3f-6I^2%a(>7RZSL08
zGxP1gFru5s*MkpQimYWZJ<E+&BdVAiKHAXhXRaT%N??fR*2I_$>tz-`V?Qb!@|tB?
zFFyAX7iiI6d(+%BUYRy4w!F~8ZUo;Y@2u#`i9ym4v=S8E88PKCmf0-LzZ!QGukazL
zE^wmUpNk!CnR<3aR|fT~*8{ZWwSdrBAt}-9$Be^SG9(0u<=SM<xUcN1H%tsadkaZ+
zyo+?Sge#IVmG#H{INITp>cpfW`4)waSx(R_9Zr^3Jn5u|1~Cdnv`S;$bC^rvL&m8f
zcONGHPr|ypC2t4Fxm}JltR$Mua45NlpYT5mLpd+Rj+M)=J0pGk@DUpmy>M`Dwcq%c
z$<}E*gZ&jYa|SnD=X<SHx$(!LpRuO`rfre#e>|&Rbi`uEK%LuIDMG&yu&5o-69WHK
z3ClSr#gvB}oec@O5iw}VYkJD-W*0-4oyj~4-5F}7^tG$wZj$M(?e^6VWDW`9A|^$G
zVO^AQfleFVj~fldVkEbtOr9s*OcA5u$&8qP*k9PofyBtAi}UH89Cvm$>tdwpqY23{
z2dWocA%oG692zs5JjIYIa5v)ivg(b^FznvviDnuS5xE-?_cxf)kF_M4xh#?tO1v++
zC22%V=st6(e7^Z{<x{e)A#M~t@)>bxOoa+t3UM+2UCzCVdfucv7;0#C+^W3@$RP{0
z_p~_YEBI#64Tr=xAMh@vpURF3zYhm}JUXKWbQ&d*5oPFbZ5=9I#G0nr^h)iDOpNzW
zhKS9j@YwF76Gz%heDvrG<8GPFJ2AP=yB#c|6WvhyF8u4H*v83hYYP`z+QO)d_^C2#
zZ&J3qB)Q_YKD9?+L4bd=`Xi+yKHj&37i_pU4%-gP33v0~%Z)bP#J3xmsOzv*cGDf_
zq)S{e8&c<8*zc97*hYLM-^*~eGG1dTwxD?+@Wk2oBxwKMT4dWdo~O9gq1Hrog1Rm)
zJya%v%yCCrI^R1l6Kxt??24(v)K&SK0^U+@c*YY@t;i;31X>6@uTdPw!Q#s$s%e)w
zm!%zf;;yfo;B~GwX8i7ye!8XTF7p~aXC|LEKOcFWJpD}e$<h^`>AYR9!dBTf3g#V=
zxVy?#2}cW7Aw44lRL?i&ExYd|Yq;r}+`Ic>*fF-3XD7=0cB)7?m4W1EzbDqEPtSuy
z?AJ%Gi~f0Es!%z-<u~>(ZR1tEmBPWio;%%QE%up##-{MxC)(v4mnX{ygHS!dV-M4-
z7jby9jhgTWw7H=&<0sRX+Hkv%MXWeTkT<xgJj*Hlyii6xA=IwiymLqNNcUlV^srsm
zVL5`!7UxA(o-pz~!HpKIm(2mmpUD|>61W`Qw`mESQ1LX>*&E=IU6r<n8dG)LbHw8q
z)=%~;-jbqfm(!M$U{_J^Kfb&8hP|gEQ8(^L<|K8!O>X}6nrA{#?bw^b9w!_m+-o!T
zvo;Kbz<9!rhx*hllwy^{o%YJ^uYaEXcPC8^8MOyPoj{OsAyq3XR~S=pb9cK@F^4^l
z6)3XmvbGW#G)_5X9J#KDaULf~YSpVJv@Y#cZCuImtk7HXUdyg`GSjo2%)TnIUVIa9
zOMSR3UJ5%&*ep#^V%PNpMlzqkx0$_Wo5&TWDNFD3ySYg}pn+cY*)`(~z3cE3O-=9p
zY0mAJrDSX+kHaiHAA8?q$=g_|^j6Bg6wh#zJpUrK<!14G1rbMkvBqk)t{|G>T1O4F
zZZ?`>NLzbh(V5=3@Z_vSd{P724<-9dU=qjWf>z{vi|*AU*M4D}X4ldiL~y?7Y(7n<
z;ry00YKKiPkm$Y9P*Vx;ne&#4;^;fKv)}JYezj22ikf`5F?1bFHH<=)ifiSfQf)-`
zj1J#!9DAx+U9%LQA5Ab^LoeslIaW_q*6_n7DN(8N1(?JHbCvsH!$lIRAFUr9?W3p0
zmewxzitcim1;HuiH@D_UI}8?6gsn}NL^zN2lkwl(2=e9Jt2WL#o-!Iyzy9u(nov5V
zTt$8HeDaM(jq|keHSM*V`S@zqDM_OBH1#!|NR%8|(@tW}h~h=6=2PmZI{KM!d3JrF
z3~hO|C4|8(vE_2bCa-VJtEo<{&n%m1U{Cd4cYUfvRJIx?aSbx{TUNQ#vo7&$XDflH
z^~p}VMZ{&*=kgt;GwHhfTqS*~O>s6OsioQb7XcY2SUNnPcB7u-Xk~2H1-$l*e)|n$
zNQ=*CyfH+Ce{S;$s_#?r>YJZ34VZsG-1k#BV^l(m0%#IGNthaKp#;2K?$*-o`fl@z
zfKinj<5N<G0ui#+-lx)rroIbQfo;Z-n@!r&410*%DJOVlsP}s|-+dx}=)TSPM-}Fd
zkc>lx$u<h-2@Ow6ELJ0>n!9ifKC!&}6Oo(9Pa7^!SvvhnOqnoIh+Z%ZKS@AaRMF(G
zQD^eMM_opULwZ7I0S2i~WtY#Yc`z7@&@r^zM)Fb@Ekj*1fY(*R=8K`}Qaz)*Z}CtB
zK|2`2<EdC2PT{Kuj#Sp>j7V-WW{h+uA8=w<sN<Uvs0U<-8tEwvabSZ=g=ADHPKMmS
zqjRIU-noGfkB+<n>)Yvs#s^ft>W{|H*1+SuzKN$l_%2-yv?m%G9^a<XJECYUeI3Rr
z9>qHMvx$_3URHk2PsIt%T`8Ipxm??RIu}Xt%0h{%_>8;d05QWiNGG<$t|{I4%+30G
zgzk7F6*1y2E=S9P=}OFC+eE^MWG_A4$DF{X;f_<T58#)rm9}Nwbu9e5)HI9L`e7Pn
zJs4dJIQKldlCbiITUkwlo^_i$s~4(hglhNWd`YGAWn$7Xq}@Ol5#g@wsSJ*O#$n$!
zX-CTz-S+K_T{40-clOy6!*`!7>eII5Fc@`{F4HeOf*aMO)-N}HK;24OPdQI~t(oi>
zDA<Y4<75<S6xi3jjBt#sbb^wGy6VL|9p6i*D9d*cIQoV<>Nwxy7TO>pE)?vTh$zjz
z5{?Gj#drw$#UPSFGkza??<+yqsmEGYYOc|#;eFe055IlB#}zq<gB`iPZ_6bb1$>cf
z|Kr~Z<roneTkn#^eob9*jwzdkz2dqhe<e~`yjaj83Y-7q%hgh{XM!$bi!|O1O%Ld&
zc*Hszr4@OVKkg(y8W!>Et$2Ird&{d&n)wLW1^4XjI|_p%NvCP|lb+6DHsI}?b%c6J
zE=sF9^SREfERMt`P_g*iMW*N6b8~QRDOj*Mw{U${{Lb$o|93TBwdXdTRYe#`UySgd
zF|38%STQhd=24JU-#D2P(x)~FK${U$6m`JReyE;kQI{A}rKqS`OBr~`FC=U@q=`)-
zQ9M|CL8CcNDKJ(0zyIHvYjoERw@xs^H-B9>dP}vMbhZ=~XM+n{jZ9k9z9vxnIUVZT
z!M2$&nwHrL#CH)l7{cxW80N$Gv-ha9_x*G>ik006`9s8{wD&K&U!Ae~h?vsuR7lu}
zudGTT@Y(!;G_t&fN<;6WRTk`?9bILLvgSp+3+!8Z%Od5vlj4wXHcr@fBKVOFj-}r3
zYbDohjx|M<dtv5SZ%W(7Jr6+8qgXT-dd!EUs5CPCd6rGWvFGSYc&p_EL9&vUb$R-j
z&mQp(As~_)dgO;=DR!EwH>caHgk7J%*R}LcGS}+q+M>o)KZ<D3$YB*{i=4z{-63Qy
zms@|T9m$Zh7FaPNJc#U9CG|e0RAS|hsQ8<}8QD?&lNU}i3SD?5q_*B;Ko4f>NfjWx
zu%n>mVtn!SejXB|?ji=2{M}baajBCr<x1*RZdlLcckyjCT}%hQQo(D|ciav_Cg4<J
zqcSY}E;*%Wcz<pYgGDSvlrnUvj)b$Vy!=%$ZRQ<^vYg0z<y|iF@K=5DF23+Va7!Zy
zVt3`<qieaV^S)f6R$oEfBp)n1zd!Oy(EZlKsrye6KDQR&DowpCZjULqQ|}NW_(Yj^
z(~UXpCE70e!M1t}$MZWBs<qxIf^GdW_C$zU?_y9E)_mR!ge)qm=(dmPicZp0AihXB
z&0BeZ{<6T2%dL9kfM4^Bhtc}-sG|;{{;~p>vpq^tpW0qfo|}vVndM@KgBFw2(O*f<
z_wM~Ww;aT1-+l}gwIU+D%{X=^gyUv-XPvM82FlmC_hYsG4}`un&?N~7zLI{H&)ObG
zE$4K+UPfDnEh%zC1U8S1FC^~|I7~04aq%G!I`pS^dMCs7K!kWn7kMupD#uWr@h1Dw
zLljfPX~frvB*~*2nxcVdarvT!8Fb3>?yt?fZH6Db7eA#WRL!_I{8ata54&mTUMeo}
zOCg5Dux2ha1i>xg1M0Nb*(aC7sdGP|FF&BSUNL);6XF@v!%x%Z5cqh?-c-pH;oiVm
zoWk52d0u^VlCnf<re`ym-EYl+0uTQ!l!fTi)W%DvC!|A&O=j&ZC__6<ucCQ&ka>~>
zG2eZgC4LzggZ8zEo-5kcFGPJ5%dRh$VhOh4E~Gn;54#ZA2ZA<QY);u*BeWmVu)mlu
z*ADGec*U4_%yxLk-7mAPm|*_?2h4bp4%f%`P<*ZD8R^;KpJRb=18%O4<#k}Pq1Kq&
zNg3TcKIS`FFJmcvz<5h`+kmYRHh*}k6uE3XsPzQKiH3b?vggEcXHBp@D4Vohsv=;V
z==6;>dRB;~B4zzh?gBPjAFR>s-t!4SXPEoVCC5A(fg2Xt%Lt8L4==Ybxp*p9lTS{s
zF)n?NDsL|o^fFx%<TmVaJt}(M%bqt~s&w(Xty=TFnbf<7$H=9Iq><b%1hV27lTu+4
zj~BQ&Bi@}hMZBpU7?`lQ!)6e5<F@GYqQbBSO1TgMIkq*081p(5(uhxaCE1BVo$X?A
zgH)<|^QLj%QoflK`h>*#+m1e$cte+)>|6RNb~`NAWSKL9gEBCJHpvc8C28`x*!+-+
zgP1-SwrFUqI&Rzzo;xS9T9fQrc2w<>XHVU#-+W<skDqO-b>lhaVs<V@1b(c}hlK^g
ztnNr{0&(&+`T9}AlzD?5Q3c#*BZnL}8*q}vBxpNf`Yp>3NZD(aW8F?~4RuH-`+VxG
z8j)g8PMRT`XfN9L{yPPFQM9lnPuhz3<VT)yzos!gDMedZdw>3!kyYWF3%pag*VwI7
zkB=%FCg1*mIKBNZ8MvJ1=>imeyubc{Iz(igcdD}*15l!3ECD2;<v;D~GE_X}RK1i9
zHd@>DlVN{GRUFn2MTQwp@lr~R<*NJ}bO_p&83wltR0~t3o)DMV@qT;w_Us`%D+P^L
zKi2H0vuL_O4*CAxqEulEj?eom!xX~YE6bf+;in_F7fP>RdL`gSvo~e|1L-sM9nB=t
zYVt7c$av?)fl`5&Y|%EA6t@WYlY!!vHkI}iN$6V9xCI-dF+S$@2j3A(4pesN9a*|&
znAAoqCEBo(gzp5d2DN7otw+i)Lu*(#facmPcbb>}&GHCa1;+-n=K6J*_;}d(#|)*D
z1zOo*KPsOU{};1qzm8~j>F(M4m?-uq<Ow~7hL*j}h{3xHLQH!V7P&&NLr?pfIIYmi
z*upQ#&X6{&t|~bzzpaE9X4Xh*wpTn>tt5KZc^ep*0{06E$0+tBM2SYR2xC<v;D{p`
zOO$3x)Qg{ms_n#{qTQkS0hK)P3*qIC*%;qbFq~Z$W1um7Z#atWq&36JJL(d5u^BU~
ze}%AY@xo$J{u2prVd%{N<LfJ+;s~BTkpRIVxLdFd5Zv8uv0W@caF-y#0)gP}5Zqy5
z7fEmpZb5_F;_g8M1judj|Gv9--@A7#Z>MLbd#9$RrmE}L)zxkTV4XI5)cTAOl8q4)
z=lnp4aYg2|ti%G8%{8hQEWUzGILNSrW991U(GWsH=r;K?mf8V`!=8W8XomV(io2l+
zf413Idc9xYn=8I4@tTwMp_?-+8)ryB<ya$Q;0jS_&f&foex8`lDqmD{6A9@j5RKfe
z*l$Hru&QPhiZtDg_bWOrokuNg>ewQ06kct32w=v^a;mV?*Sxgx{$5ejxXV+!m?p;U
zQAQ}X4cGU0nE=GQp-`iDm9$vP@@iEUG|`->Sw@RuvT$IWW^U&Kd!!xJV(Ua`5~imZ
zr;7s4z$PPWEPMXhxfd?p-<yv-sIxJ6&2?KN>%X7I<dS&*LF&@y+6wS(d@iYE#K6V;
zb6)ZJtNu{kK|w|1u5Z;!kRA+ko($|hAHjGkhTN2<QTp<J`^MLtGF856#K5pTU_T6*
zngD2_;A!P~e)rBodF|Fg?DNH>_V+dtZK$))5P7HRUE(*>%)ZQTl9)R;297=J3;PDY
zoU=&ByI;D#Jn?r<gG{%IN86+M%*PqW+o<Qs_bZ?fd3Q=JfP+9Teew>ztfW68{C32%
zT6gCW3Y?vAx;yvAM)mz=;8@6!c$BRbJLd@KWo@3i#w3@Qg}xY%N{)Pg($eT?_>u@u
zwNhE;QRV$f!LBql{QMsCOJpTWk)0d$tqDor`L_4i06ey3wb=GUTzqQ~uiEkF(WshA
z|8dHsv+n*_MA!J!>6Bh}HGFMO*LhP4dZzrN!ufUx!ufL=qR63bbF%Dh71Yb6sTq0D
z<I`A`KJwwzn$NqbTJc;-y{-5#)u8OV-KLjhwEQ6W1^jf%?UjnLGY{U-zDW{DdejOS
zCqBaHM{gm$r54X0Ez#J>Zh~4h;&H(F+ufNP5-vifpvla<ypwV*fGu2kufkl+9bCe>
zG5Zc-GV<h;1obizvaiP#WN_u@9~Bs%ek;1c94c6RCusv^Iw&1jV^xHtN5UZ~X_igk
z@2wnRa3UVK)1w-MqVJu|Gk%|)w4GtJ57K$oVcsuL9Aa-;sPp8Rz6LbhZxeYbd`Sxm
zXJ-SOay`9u{+u6^W;6-I0B5r)8CD7&n$O9&vQf(bHHaV8N-h2%y`6uJMX8g<X=e<%
zn?qpIhB;gpT$sre=Hex>MuN#t**sQmMKdk~4V3v@{oZ+~BIZ{w_^_gubbY$M#3H8V
zMlmT*?H{}XFjZ^L%y3^gHZG_1EKRmt`kp$7ly()3W6~7i)h#6(0#tN4UdSpbEz?+x
zPhM6^xUS}3r>gI&Jo7L20-VY+8}4D@jY}?;DqCh8*tn8%Z7o&wge`o3)nAiLR&>s?
zY#{PgS964^YLi!%dgcRAZyz3!hR0lMu_UqZHNypm+M;RCkQH-XELO6}DT0V)mP5e=
zB&Y;Sf7VLgIZKRsc`Uf7HbUCLWp6^pwSvbwY5tb2(V#69m{z?><d_mw%h)ZhxvR9}
zqPgGj%(#sb)3@OpR$KDC7NA+{d5zDK4T}W`J&G&;g*=}I5FOc5_%(Gn3E80uuMmex
zljgAA#}AwqySPa_R!PvFm9W8ant;q-U7OnplTPC=U~2=fud_-%o=o+9{2+i<y;BAS
zZAY{8jK{#<v!@AiRWnp8HC<B^a$MqL$>1%A{Xv@6$d1?tucm;CbC~_m4**ql!VZw0
z)9jM_sW10`kSf1YHAE60Vph3Jv~gfb_XV@&82se7`_Mp69aX;w-w)J2D4*PWZ}g!x
zU+rggC#C7pmrW-<$`AT#rgh+NS|7Rk+&+3I6(8BXt*o6uM701A`HqnhiI@Mzv>^Tv
zQ7wq<%&3Tv7J42c25w$y87*yBMl*9h*?-|Ih)Pn(Pf|d4r@(3Fa=*=)gt@~A7R2`;
z#f!}DheDK%&d&v1aSN)J9rHI0QqE&zP>-hBPNp2$OTqp@N1~`|bc{PuoNVxQYU7Oh
zFCvx5R&Ow3i_Unk3|e|km%wQTvCoKgLg(`9X~d1h3rwD(sdLDyP4BB1)sU35sS${(
z1j=m?MQWH)1i5)RBFFXFko1Sx-qDkjLXX&ubDk$u)Le+IZ{q!`7=0_rZpKpNlZCl!
zM<ku~>|m5T=ns;I$R$w>+QLAWWslzQ+7L9hVL3{3*|x%G!cJ=1$>jv2&*o7&za{n^
z0H@oaDxX2Pwt9*WX)rc+Q6n&Mip~%J&N)s06!h*3iQ;|gJk9AK3jK(`;=4i;w=L^I
zH<G$7Rvx8ZbKy^WcW69MUb=MdnL`UlC4K%kk{Hk{MwaS5YtS`2-r}u`8)3jh*+Yid
ztw9&xxq$`ylXSb2c@pt~m`I!^wL-ZPHyGV!w}7C<uKsd-K$sw~?pz{%Oxoq;b3B(`
zMuz*JdFM*~OoB9jkP>ib$xcCm#q|Z;Q;$F#7D{_dG^SrDXiF#MeI`t<W<D1!Cj=((
zXo)8hn>jQ&LP5<TTVKzJZZ9ssP1E!#-Amf~-@M5Bn7f;Qh!yI^&Fv!YNxyl_%MsEs
zjr4s{2T!P8GybQ?gRew8z9voIn~Yu5d_prO5xdl<@lEMn%FuIuo?YHekh*uoA0(DW
zQ#*2@p!EeXIl5pPI&xe>-&>(PiwBRv^Q)Vm4dUlwB_x5a++s07xTZ5m^<eClY;`Qt
zmQTnuHH4C5cd;3#HFSFSiEcK+1k|^NH6L;mwz}H=lLpUcZq5la?D5O(zh;_?#)*b|
zQd-9ne-F-}`rfBqxqWNm_7ti&BP2!WQ$s<BhbJyM<{grNw6#s%9!R74E=_CuAeviT
z?m<w9c9Y@0Eupz8_jpZ~t^YB*NB9o?HQk_oero=~<rYkG{ZvTkP9)^p@K*C*VG-hZ
z#-T~5Pv${j*=2EluF2!m{Pa$35Htt6hAUd+N;Hz7+dTp~`Rg%}P_{Rb%WqY8krSff
zeQ|wsgYyX~YJCQ%QGYA1j$~BD5B6!WdUNCW|B4y)Y5#*nS9WwE8+NX{$6I)UaYsPl
zv#QV6+SPSB`uaXd%>!w0ohp*y47rb0s!vzVO%(Y5{t%GRJgEt00HPB8NtEm}OY<|(
z^D#9MQv_ul`HbfUco4#mhB|yRW7Co!?6W}j>p{Ut{cybUfBY-WxLr7Oal1~J-ba#q
zw8zFOKrkj;oX~A>Yb_cBkb@A^oL>pQOVJ~lVXV;@K+PQk9hhx(u2W@3ib;F$@OL#o
zS&1bi4pa8a0dd+j3aQ7-bG1b~p%DQV1*Tn1JWM#!Zpaf|<AKQ_5!1}rF>HR0!Sx9q
z;TmHNdZ#;;KEyi{xSg6X|3KtH7L)d9z>k9;Askjob_bxQI!8rC%)?VOH?nce+AS2o
ztai+b3-021$f1r&Bj6zr3|v3wA7ioSBO+4CQlI2`fFzw@TUck=J@(!c>J$9RKQME8
zzzGtFn#onE1X^y}I1)icQ=kYv5-24XNhUFtEv{hf^y-GO(T|SZA1FVD{(d)zAG1Is
zr<*|h8C|&PH8znmiydE?sE14zFeC{z<RY`atLqOE1A!0u$H+2CMmKCClz?5HbpQ^1
zrT*gs%57*0N(u@-I)e;W5-K68?RITY-<wd6hw#jyp9vSMFWkgxg50*P9u=H?Gds0#
zx|%OiA2k>|&$jr&@=x~E@oWU>E+4{^&JwV@+jBII&B!lBAN$^YVG^{cMwF8>6d9Y&
zHpL#F*Pp`|F9r$qH6L73{vfg8;fLME4BUwDC`zK@D2SZ%*#P!72obe~=6lK)USw@`
z=F*Y9A4@u4SS_+`h9m4xsCh_Sa0Vl#>>;n4sH|w%LL|9HVlIQI?B6p9%v>D47tvO+
zy~;75n+6U4{h)ALWhJ1Xc1qL~;k^3a4N(cJvPNQjkOfyUqWyuO!VIDYrRFv?C+@y&
z6Y(;_5!!Jao`5d1pePRt+3>pmWP`Vc6FbhB^Fa8tygu#kB~+ey$_admJ7is0R-HJh
zO*)AY?rvcC<q*MY&BZxmi1-);PM+|S%a9`Fv4lMDujk1X3?+0hHn`+Z;ip3WcPuzX
z)ESG=3^S@v9LR#RS3k2>zBu8Bq<&D(*0Z6Kg@cqiZ3m9`0$tZogqm$4?&ht9pTXC+
zw%WGZ){3}&rDL$)Z_))TCbpq;RcE6Cm-Nye4HG`asFwK^4CA{ZwK;L|+!i@;+nXN5
zmYdDLqg?|~sWFwkCVC)$kQA?pj^AYO)qIm5bgNCvU$&s8(xvl~2_j#2F71yL$>2jr
z4RHv0<sjFPamYhN6p3d}5zFny?q)e!c7#ugxU`?DBW#hhywg4D#6L=NY1TKgH5Qd1
zkz<IGb}GNBjWcr8JS1lN`kU_W)W<6QjJ&xDZW~;vheO94qVeS&v#{7&4BCWPi<nV1
ztC%L4hM?4oykAn<=-#9#=omf5&&g@}%=$!VKjhWsf9ZuRepBdAYQSzi5Gu93St?@`
z9`53G20t1>rXfFKRgGOB?i@<~(%j5)K^XS4anMb6^x2Q42uVnNL`=qNY0$L$QUbL4
z$r2tC`P8Us0DqI;0J~(5pJQdwkvMlKZZA8s5#dcbbLf~aJHmmi>1mgqAV^+zxMcs|
z1oMkfMUEoj4zP-u1RRG@Wx64aqEb;s=A21v#^P4Hd5TcMA5AnA=jq(=10^&KHRm?~
zho3A)m&`??TMNkR1T!?=Aq1r{>Av>$eO*olD_EmE){}bJ*q}|L80hR^i{2l&0;A4A
zw<tGIrtVrlcW6hPyJWxb?ME;zZz{{SrAgcA{}4|!N6U%ey0w&nvs$+9%{M6{)Q}83
zbDB$s_P(12MW(13`x!eG@nPeoFM@xcR)9v*{elLA1>6UpP~_HzRV+JFEO%n;;4I*s
zru``^9TJW|0Uycxg&aj^EnIEIY$6EHY;9T`w}$QCSEbdd41FQqRY+%Zg?%cQtyiT#
zbz5E5^)Cg)dCdHS9)GDd{1JbVUlqrfH%SJB`6+DDZerO?99dmQw6n>Vogiu`9ge9#
z$^#|Fa<+#9zAhm|_vAxBQ^}fs#i*tuuR|{TRGg;rC@93n1XN;Coy~(7InAL!=*^5V
z3WRw=jvDWGx<lQDpA+Ry^l5lYO#8(YoHSpOC5W|v&`jZY_!&5TCW5Sl%V1O<ePC3d
z&1_>PYG##9L)M(5p;k!$?10#qBS6q+1^9_(_us)P%bdJ9$il9pp>{VpDF&efssQE;
zMb;dcK5vpreTG@~dE}Crt4#rYIcC<J$oI(GW1B+kAd&&G0c*yYHJaENChk7D5P`~a
z8Hobn81Tn2Sw|EB^&3(}B%q^%73wPDvfDSU+^Fqyjhk4(e~I{4eXi~ef)H+|hR+a@
zpqbG~6M2Wst&8H$^pLulTll&>nG3VTEVD$P4KX*vPr?jvSN^xNQ4R64m7=ZL!V<}%
zI3`-KSsjcOtn^V&5nHs#Q{H>_K{0dq&NKs00sgU1>Mf%uIXW8rQJ$s=ocg48Nt7V+
z2kC%DK*9Z67Ha<XOu~HHpk2g~B^N>^`wGV{MmH}Wd(Wia5Jgf+x-Wd%vqZFzME9^L
zEK`qXX`~+i@)Y<|V{BJyyUU{{<r-leqLQ3t$sRRMNZe{BW@LVSyNwzjpdi%1&-umU
zvjFek+O*vMq)8+P#O3E7;E1Yd3D3CyTEYZEvK=Va&J~Dl)m%qO5d~s#FA!%=*=fZE
zspPVRXX9p!9@HN+?Fdx<W6=NDe8~*A$Z@8pD6->|$-=>G$R@y5>VnIRPjOpNC%np0
zpb(4LvUg(QnOBE&d2u(BQmf{5JiCsFVVJUMh+j&WfMlLJXN%f?gO)8eI%`YzLm__I
zR&R>7ZH5KNi8&WN1G`vhZA_c164;&o8n2&u1MEW!Tinzd{#Khr8O2o8H_>8Gh;YMP
zZR6cppVS#be$I#&WmRbcGU}Kma_Z#6dLS)$7mrI;9|fQ6a0o{IF6V3b6oUd!3NRQ)
zQ6_%UJ_vxE#LrP)fXx`p682T0&x-s6jhiKjHh-bEx|{&BL?dJLM{Pkj;+<#|?+aMj
zZHUNdm+Ma(5bHT~`W9*#WOe<GVOj8HO=Q1st~UAhQ$RYcm-;#KD^%3Y*Y}@DKUwx|
zoif}njr=015&4-CsbTSYbxwo_V+(2sP4*y7Kb_TdQbni~j2C5<H0$Jq*~+<c$U~!U
zNvI^z?hKor>i^zRwO^K6kMhp42n&ouZ3siAXdrZGf0JJ|NGhPNIK!djQ;fnh#U~m^
z*zo3yP|2De0EfR*3u**%iZv)l^y6hqJZcn+k@~#4YTfV&kT{0$AJATZ(&vT}hy?YG
zkI7P|Fc)a9CB}}^i!6P=|Agq4w09nQkVyF%tV{FV-s=yA7ZAon)naJPHo@0XCk~CJ
z{Ruo0|8)3Uix11n8T~LnnLf)P^D)@DLqHR?(sctD=O3igS)T?jXZ_q@D0R0M6@qp=
zRs!8eM3H-_nX;%lLnC7hHqsxH!roW`zIk}$3Lw<7)v)Ko<(^gpqCcbcrgPH}B0(o+
z^d>UQ+HI*^VCQC|@(JCgA58p8F#8B}vLPSi<Zqwp!74k&`t;DM7wDYYT(gVEbl)#5
z2t&9WD715$2LDLNRR4pN;gglc1^Jyt^$VZd4e(*%O~LRYI@%!Nqch^h#%xVw&4wN0
zZz{%mI2<f#s?-DneG4t8PnKpb<8NFns>>@NM3GBb_JWYWQHc%m)Ch!GXxcmY9e}O1
z+Dk}v6u=TB>QTo39EobNj?iO^gDhhfbMqM|8pAJ?pntxUbiYOOyOh7Zl5|q>J`qyr
zsM5XQ6sPv(!kf$!8|~P?Hi3sqeb*j+{PqN~yw1^krx<$zYPcKS+)Q(w2jNrPwRb=4
z_uK48DvQx>TOK-zxEfo30~{xDLn@V=l{LDbm?yU^05c2Dq_43(JS3fgXxTjal0qN(
z+Q{qACnC%3hV-|Cm57WqywI7Vswy$5HHu|D#zK-r<FJWb-9+PXWzB>)9TC=P;e~Ln
zV%Wl(k!;`E-_rM>$W2E_NBi>ZzYVLV2p|~tpAp{bSk6u(I-@5gWvmwlVnfDqzvO6N
zg~<1~v=O<9*k^r0^L;>e0*dTXbLjpSe3hBpe$2#O&DcmUa*+}_mQj&87`3L3R1;ko
zxIOt4Kj`m8cd0fpVHsI`yiE0clx};=UUO!gJ`g_cFM@*5Yi62jaq&r+E3vv$Qahf6
z0`)VR4@;LD;|#v#<Co}W<Clg(gV~Gic=RGvsv%f}!dat-Knq7AgRH(o*}iczO*ks8
zYFtVbFyIeTW|<_)A0#NeE59YE38^O^F$f*V=mQEs&U!Y<Pf;@Vw~Nk?&qw_ny|`gn
zIctgOa6tpz+}%Rbk8b<wvFR^jpt%-XiJL&_wvNFg>5TBg@xL|r*7`YBm`_}MFg{@=
z$muusH4M}?qNV3q$DoLIr5CwNlPHxkX;4~$#^$CeIkJ6!(o}P#?l%>~Z!SCP*(2Zy
zs%wexA^LS`l+o_Y#8*o4{)E3%8>D&h!4eyx(6#e}6>&gG>+kFj(D7DG&M%iUgr98a
zPrm-*QAF=uB4v5y%$Y$&W$YE{cgwRT`073@a@QdXLf*xLsM-FG<C%ahc)Su1|03Fw
z)zXcuW$7203s<}I`jco`JtS~^4|+wf^FxQuL$()a4pAaB{=!X-aKTH&Y%Tkiwi?2F
z;l^H6rWx%4g5|$c6Xuo@5cmUhU|#(fA(hILD!Li@!b9Jdn=%=d>h80Fy{Owcgyl)8
ziGN17-^J5WwAEg+NdBavmiq;PyioN$c*=yZ=fuoz>g;tr)gq?EBd{YOLL_8V#1trW
zbW|k7f>)>r><F<U)-yta7d&W0^bCB&jNH63+9XWUvO2C>=5BIkK`;41N&kQ(l)pgI
zqm&%pg<38;{vV|M{6`>#LbG6K>6Fz?udS+!rMT`?=F6r=DpAllUpI*Mf{_IELM?sm
zPKAnaR@mS|dRcxr<rlpRmz17Pe`_q7SZ&{Cqo0RbpbKS<eQx*!omh0q8-4S-{+$i)
z@8y4xW)PN}{(y1}1k+rKjrS_UDY@q)AloK(9$Gg0W##+>CRxa9(|IjHZM3L#9p+Y#
z=G46_E>I77`&&Sk0<$5FMsTCat6g`d6tTWer2K^wN=X@9D6d^$i(_7!YG7?EXMNJW
zq?|QHpEna5o~=F!BW!3z<6rcvk|rY|HWZjA;}<t5n-;dKl(jmwu!;-FhkCvDwH!MO
z|FKU}CtiIIES<s1FIg*l?dZuit0<xG6zA1E?ZD&>`}P#BB5y9SvzHams+@^!7&~p$
zI)m({t&n2klQYn%`x33a=UF|Rt!!-Qsn~ARsn|s^e8c!PvJv;C>wy00f-&?J&gt;k
z3)t75hd6aFn~?ZPp)_eus({Zbi?q<`k=HDcsc&$&R<SMYxTbo9(v#q~>I#rFD$UCM
zgJVelU>rx=*C;L_0Nd-aA#6*ni@6JFGAcA;nf$X54rKUJOBl}lY1=gk5#Oj(rLBt{
zoCLLY%*mLGBkTa-9T6$JHvi07@6Ldrf<&h&L)y#Pi`h^QSfRfSib}c8l(T-U%Ec=i
zvOq_ZGvI8tFA~oBl4ZzSJ!0a9gXvn}TxLEs>QR-`y;;-`0~HwnOph4488LyZHUu`q
z7<kUVOEzdH6PPtCqdoHe466fiL3UU$PTcrMx6I#-WB|o?wk`LnQD<<A;Cxo!rCWK^
zB#^9y$U;H(2dU2I*&aHbV$}sPLOzew=cesM#&2ARXmU)i(XicngauQL`+~I8^29q9
zlH4p{_A43>W0N{_n2P#G>$-D0r;1Q^^+B<#^(8)gawAEO%JGi@@etz>Ht^TS)AQ$@
zjCr{H>6q1cWVE>IpHD*v_B<0Q6e6ZHX_WxpJA#ig&qv6qi4>X59m3^+ulb+5HusO=
zkphasCVv%c&38y@?iN>tJ(UZK$pyK(z*HBCuUoTfRobeyq2+3AQ}n0`;k?6)HWnH4
zy1+4hYf?ISUzR^eS881c8PgV83_V+67Y%t9nM|fT13tfE!R{X;x>$M+PDhVmUIsSz
zhK9L~Z`f9Hn;ylxGrJhda6d{sIqKp9J3!6WrST@R0b{Ng#P$vp`?cUeJCMd7Bn8?r
zx63pVe%F0r%q9VSE!&UTMa5<C+C5MYFl;#9Zs#JOv~<xD99!pM$#=n>1}piPoBrtn
z^YpdnaM&F!K5B>h6PjG*GK&yjWyEVpZp&M!$<0$<8ChEU8`v<2aD0q}#>Qnk>$YT3
zPxnmHh#w5jzmSTIi6P-ce|x1kEV|d{J~F1j$3kZR^GG8|p7$$`t&7i4Pf}BW3+gDV
z5PNM@%PIz%-H-Bd8`MD^mm`49%KZI@&%a!XMBYki>Ud@kNHg~9YLovy--jN>h}E)4
z)MD4)>WmI4z;zXj_D-7=)D&DEa&(jz!r=MFcX$S}#0|WczM!s!cr6!Q60Ut)FX&xu
zPHUmAIQldi@o|Q?W{_b8=sh(aByRVh5{HzUSN6MrcHhE7J4v22^j<C=<ejF@vHU1r
zbS%sd56CS(!bdL(tM$$t`jV@9W=%SYks8G7vwe}r4zNhjDP4Mb5zC?=pjHjtU&QAd
zJ=YX7a~`(R(Q6aWV%xNm9mA?E=;LkDfwH^%e;4>CDGoyN-id%Wg+iW7=X3WgzKTRD
ztuEHY*>k%;ZSp<8<5^<$!V&63cpOG(gI^|UP9}&yU7u^dArj|PmzpgSf8nlKl$jUf
zEB<z0UqeE_k43T7<FIZ*s73pS>Z31PIipSc4<!43raosb0I6s#aO+CiD6#94=O!Zi
zgxLNpe~*`GbWM}<EMJ`>cT&reY-xa!l_c_Z#6&h_uRCQi#TyKYS*2|{trOLdAt{Zi
z>+H=1jzVi}Hoc#Yt8X{3!P=1-l;SVAIKZY44a|8F(RzF4SaCPZ5tJE`VguzYFR*ER
z4q3-87NDCeO?k~td%!@X!=elPaxWNd#-kW=eU+3h@DgVH2MOP<anTA($kt38#NW%}
znz4TF7F)klChj2GsY2jqQrLgVla+cOF|zU>6|kktrMH9iS-fi0A0tK>=Hc~`BXkcy
zW@F*@wL5qW_38+igGKpKX3}YLSCYo3omrczOSm+_XPNCKcN<gl%dljJTt%hCsxj$n
zqs$eUGu<|b$tl3tDp8ROtj^cT*G|EHNfkyV<lHnh&T*~kOHd|gVb{`haI0b0eIHV^
zST-uoI>VFvd;(T2_zA{fhe7@G9ohhlV$_!DhtRG#1+$Z77V`CLbu+WC_xFW`;DHHU
zjlDEb<5}myJ*!RVM|JRVX!4pVwjEBj<E(#X#$19fO;M}~ui_9_?;t;J`lHMgh}J<g
zTq?3zNSE2Pn26qgkZ<}8IfuB|;@dw+Dmq+!gVwI>r=u>#eipVj`LFWt70Kx&E?!5B
zchHI6`X6mve))eEVZ!;?yq$**4q{?1ne~ib?I~84SCZ&IT<pFaH<fX_T>-;C)MaVN
zC=i*u=-ocUa40Fp$R;)1ob-Yk!A{B+z2^NmuO=o1vy?7B#OKDIJE)9VQ7c9@;A1v$
zUdt-B$zAbc*KawNAAA{GE3t>+ioC?t?^`+UU^%ls7xH@@)wbvlTpihTxiKa3uD#9v
zmi~XA1nIq7OHF_-1!xsn8a$-nf*J!WHNZ7vG<^~AikOsd!2H_%qnDDL!C&?0WVH9X
zlip#x+|OH6D02GZ5+=vvTXT;QTU{GZCc(>6r#XEU|DF3jxAZ1VfIE-pw6Odm&&pVl
z<I=g;&lG3yHT*(uwEU732Qe0htUV(W+QbcXGjCS+@o83w^C}e0EK{Inlnj)9gV$O9
z#>pk)cnsr^rOaw>Y`<Qo=X+RAt{Ol3&(v4jw(OMQlaYt<KO$M3Uz}<;xWF9zAA-Zv
z5)Z!o<hvV&T%_?E;toV5laKXS_Vy3PD^m|URr!8>RFQr7kx=PDc_MrK_32e@?`^?A
zlgtD4synnjGUftcpe7PWWNhF<>=AJx`D)uyKu6U|i#y%)nq@4IcjBJ7D<VyUW7N9r
z+JQdwJA4Ji;`l(OJm-+FqnYO69-ouvB8@y0P*M`064XCF%mwzuNx3^h?YUig1RcOv
zNGh|LvI}LQtL3@^Ug2Cn`W)WGX<uPZORQFahp4xQ-b~DNEoVh7F3`mOP%0NxFZcIv
z&{ki3{|Bk?v%pdrh<`thuZO$+14sOgQIj9%$YUbJ7g$OQt!Ze*pA{2TpWM08QD0~<
z+|3^;A`VQ_bX2QVEDV*GYG6{!Hv7U)d5Oio%=$xAk54Dg%G_)2H`mgd^|C=2*mf2J
z!~SaL#HEz7yyv9y#-yQRq_JtyYmQ}R;0#QSm;VI{;So!RMd!42GNLR2(#3yK{{7t!
zOlZgc4AI_cn<?p=#<~>WG9X7;vh&OMSuBP_eakp6<;f!3LX9FRdqoio?KzS5oZ_@v
z`z!e%SaMC(McK^IA0%B{5iEQBB4T&0zBA7SlhZh=Y3TO5qTQKcC}lCs@_OeQq)zW*
z%LZf09uCy1Sv023^1x0&fl&DmlrygiJ`pDi^0=4eUQ(fv&{a$u%-M-!vM*e}d>smB
zb2wWG`~d{dxw}9wI)LE!6G^;Dar0TYs2V~%)ibP<U+=()k`iE#4gunmbj@<tza5Ay
z7Vl!u=<sjn7lBeU{D>)!tE<Sn#dmzxKdn>cx%2}{56P(ro*pE?SB+;ppcztclcM=P
zmL=$6owq@8)Ks1-z-I92wsxxFVJXIhsHGfG=WTj5OA;HAxT_0;bryu7lJhC=v=V*)
zOgM6lH=gopMB;(6+X8V@{InvpOfD8to^mtV&%+|(K$^cAbS7N3+IgM0z}M&+atdf7
z>6w!Pg~7dp$$~>1;IFMrW1yMk);~xkFqqJa0t`}wbM}37Lx(xf<j15O_FqNftMUUO
zD~2@3RnD%%TLp+ht=OXdgRs3QTGHy8!s1TDMU~W{n-o)Tq7d0nz~G1$)qwD!^{N;f
z_~+@e$Cn@A{x&Z&Xz8lZ@1HQ+arY(#P2^Pg{wE}ZkJt;e9N<avTx&In-|_c=@4q;{
z&cFc93#($Ft;t!JczwIDc#_m2^UT&F&LJ3}GN1F_(om(HV(|+JjhJnR_0RpsS$PX~
zY>a2`2_*{WH5ZR@Us`IC-b>H^J!8V}itOye&Q2l5C*m(E<%u{p-&_346fa>#qnkRc
zxNq?rUucKN=AiTeRo20>$ceq@&qBNRJ-5#2;Ugo1rNvg0d#^Sof5TdNo{z%Wi;0xU
z^%3oLT?J84b;T_VQL%2{2OJ?Pe2Gvx?VzD+ttfTEZPVpowB2z>oH?u}e3oex_L9;2
zKf5qO?2D#506Slg@QS1%FQD$?xPUa)4g9^$q9j4Aj+W*Kv*C6m#1oiQ{o|)9B51lG
z;7}s~7rdw_T@*Qd#8S^~@R2$xipnBqnyM1Iv)Z(8Af^i(581baT|6{x8L8y&@)@(i
z{vd4y2-K(F#cnL-dy(XNyE+~4@v%0NaI6d~QVB|0-|BsDPk&fn{KoXO?pTOEZ_+{M
zxxDd9=ix5?#LKXg_|}w82#11b`vPsz<^i;@KbG^UBdQ)GHA#ut<Nq#Ul=~mo+_N=b
z^)C@ZGCW2?nBM1Pky&S-YglGD9aB6@_LaT$Ke(#n(+*+u&(neiIZ2bSwLQnK1KyT<
z?A?8+o&>pM<@@Gc9Q|uaP>^%asy(_UFGC%V6RZ?d&ov^nnMt%QXlD}a`I1**mztOc
zIb`9by}izWg|9tW!YzF25=~*ATup1p|EQ_=w9Q}gun{7Xg{n7xxKaOM?JoR3+wV?`
z9Gl~!)knQ)YIUFM8E^Vl9Ymf5Z-v*~<)=xH#-avSgZx9VRMf&j{rnIm`ps$A!W5s8
zpSpFgP74Bjy0`p#sSt_$m=NB{`?b=F818Z67cOgo1?2(CQAQ%4V>{RO%VB31YjMu3
z53xPbU!+C?n&+mh?_$^gi}BhjZK;7i&MY4IJ@FE78TCiF^-y;9Pp8$SKS-|0tm%1b
zo~*SiD#t|u2OC4wJ%<gM8^TUE)(Ju#B=~%)st|}1XD7@fL}A!*3E@-eC@!Mwvlp+3
z*Ep?a_Lz!*O^`}1h&_$?#*bg!4@YOHdx%MYLRI)?eX*8Da<z`Tr8nXCrq?|PBjXLz
zD^6I!(MEl1kk0hk$|H;7LVs2+6U8o@u&^;8+GbR$e)qE&JD7$bvKhEC-Pl*KzTukl
z<J_Vw!IQy-p9U%FYbyqKvym*$*eaUbJh}60Zm@}4_@rfyLNJ2-CLKS<sg?i9d{C!1
zn>USF8&}qzP4g^oM&~z1M>&NE>;NmcfCMOv4ixqTiX%%2u4%HKC2Ao(pZk6TP`(u7
z+59N)v<>#C)sXA<1UqjR=O)|t!ZNd)5}{V(6SSQLx@7VnNu#3+Mwi8=DVN-c>V#%d
zEnUm^`1taknI`EbJ~v&tMl89vpy#>Lh1*h2*B&dP$0yD#KYE5MZD8ok&hg9+I~#3*
z#U$AJrAySJapODXKS=FpVmjr_6SSsQ8*WxNr0q5G@K{{k<kL-nkd>=DmEuDP`1gH<
zVI%ncMbFbshBKkP-q=A7^JSXC4=havCEYsl)1J;s=#f0mh}A1Pwo@K2(cpJhBRgce
zIUB+{S8pH(ZCH4XRBGiU*u1@g@3&G-)EJU>5CcHUDXbk-3ZH%43-)6HFL{Slj0E<0
zT&Se|kL^T}#fEip7Qawj$=i?u$eRRwU6<aPmA7t1*!%V@t{4j@7$MdL`A^|a)b@-K
zBkBa76d;^Uo1?K!Lf_slpq1{uRH@4$R^!nxj?U*+WaZ-fRh!QX-cE!)pi7n?uVm{B
zK({iZ7SK6eHvc3DzIaD5sLv&nYKGeq_AGnAG`u05B8};yWA#bGwH-|>yGt_qxrtb9
z7_oCyi&5ybAn7i^(1fo}1k`n~VqRqV%y}3NV0FT6(NR7y$y_*|Xu}$BYxZ)=iM5M~
z0SLQ~AKjblvRvqZ@bpnSnCWV7Qv-$}+WeWpe^t>2vsHH=N}JQuQRBo}7*1P@^I2%(
z+e-6#<_Q)}Ybu<0Tr5g2Sq`FYC)rbgX!(wp9zvXpAB=<`uIb~tWYX;7VKjQ9mu*;2
zwM8X(RD;zrqP3({Ca4+4fR3o1l%iQ7-~wX6@$VyG6@F8CL99#AzJ&|%FVuQ3>lL+>
zR@d6>OxuW%_1qoyTJn-nBHEXBt~v^t-A@bu5%;k7XOXdCUW<?O&iN}UuXcn!EIt|w
zM&32`+Tv$vP{~z2<c$R~j$=qv?t;qv2RZDUQ1huCO0}<rYZFkqTswz#=|Ium*0E{W
z9?BRb=4V^7p46VUyOy$^8)+>Wvi8GAg<AyF93b+A0lh~Y?N)tjhhWk!croTnC*bIg
z_-XDufZT)+!F*sCg88+Lq`U4}w(7@&AqZJlQ6R2<jW9W{Hh#c{sF0DHK`O1O)TpQ`
zOtT2<5}C)DJtcLDx7a;!m)?u9-9awJ48q&EBM{szNbw_gALg^sk@D)<-m?(`gj8}@
zmHE$cfWg%f?GJ+K;J_H0t8o(WL}Yp{3F?>U<Z3c39_b1yn$7PdT)!Lv{9LlFnLPME
zWy-L7M%xW@!0uVGG-5ylHi`L4uehAQYk7WMGLde4Kkst9A%S{nk_8Zz!}q=4Fyy*<
z`!+hHh^Ss;rYd)~*Y3LWk`nKe#zpFh>f+@eq&~O*$U0WEwziAoM#zOJ4qbA25dojX
zEPpms?lTOM0meV^7c}(*s<RK?Brt<mZgkGJ4@!9?H?StWiVcrvJMuKyfTbQSLm=`w
zY@sf%=+p<eu@hGTbhVBB=au%XZ3-8!FIMrPn;z{>8bRAx|C@31g-O9NuB|HP+-yog
z!}QHmYhNr>pTPuOgZ-DoM1m>!87$zwNBr1<^qea2%qIFDBp;FP;2rQx=E@`6*8BM3
zSxr<k=Wu+VxRx9k0Oz!`4EI@O^xasxW5|U`HU4+6W+~>S^@lY7%CugF4sJb#Hj0(8
zzXwgV7M<p30Tf&DV&aScRqMYS>3yqJ%Phm93?IOLtB?30-B}JlUPV{S7@7<=N6SQy
zZS5=`s77^y50d!bCc0C+O2NIJN;>p{UXft=_wHZP65_`IpG&6m4|pN0`yd#jO{vnG
zK~=T5;1kyX)tZxJqk5R=*pHz{f-E5qG!=bfOI=(mg%Gh8D9qg73d3AMZ(-nMA4u^7
zx?^)30~2Z#aoKD$rc16)N){)jf{1_Jb%?OzftPHDPUd2Hs;kcqL)wH#Xo)=ul?WVj
za`n;LhYriFoZL-z{@$4hlhx;A;mH{VYKCfePh-+cR)?(3-V7E!StIwI|IM7%Qa?jB
zkN;-DfAh^*UPmFVx+kl-e<dI)O{-J3sq&X*MOaoE$k_U{PIHISJsYxkf@V$26krU;
zYv+aJ^lbG&Q<zAIxI8R%j%(87MN;}r3c!->nr4XxWmDhElH-%cFInpO4cxwyC$*@4
z<cI?Rl!(?4ILjuCjvpp>(f(l|6Tlm$nN$rQCAxWUn~j@F=wkT!iIY=a3p;7dUscND
zuP%dC@Lf=v13|>78jhRVze&#79@Bu@Ie(B$OYBVZ2sdYiIMTJ+#E=K7IeLY`DIX)c
zU-BD6-`WN;6A3ww#5rC$l-L-Y^_$$l=uDxNhXBd^_$SXoU7e`@0T^Xjm$wJYw=ZP&
zkH9+9(YpQ$8ynL_ZIv5Wu(YMfa#3)JSnG)o{Aag2Bxlr#A3Sp>Ha`Eti7Rd|4cXiU
zaDq}OKD3^+DYy$@Uw+N7HKMf;mqJSm?+vaiFTZ~)d5~GRocH3dS4>o18oK%-%tYQl
zZ$>boO-kLMg2bXyH@Zd-(EpzzA!mk9iD|N*`U|$zmoDZ}WV1k(Uy7MJw=E)q)j|%T
zv7#gye#PR>GtgH`3mw)nTGP+(a(w{1zfp>#dquV?$>I-Vm(*OreB#!!4+$89X^X3>
zK`l(E!3C?b(6Aypm86a}5VdCdFqu{MqL<3I^nbm|%w2Nrsi<&os2wBc>4m((BA;#F
zZZM3^GMe{%-JpV+ePc}uaLm0lr^|gxmwx+vJ=v7a6hBik-o`<g3G!L<-_B<PM1U^>
zXit3|F`BQyCqYO$Pg*k}Xa_9FDAPjpKHt1?3QQpZ&&_(l-gz!Tzs);9ewo0sSN?yy
z`75Xa0i5z;h?Lq6n6X?nlc)ifLFWxmX1Vf`Q*qQG3X9gV@tWXa!317MIbS@?T|%MX
zS_3v8hf(0oyDoM^+G4M|HxPZBMV;@tpKs0`N{8UZvof^jH|uU+TP5~baH>#mS2BOO
zN+1Bk;EFQ1*yrf*(n<>2l8UIfZ<8Xqo@DBP@sM^bnG4xeoCqw#P+pr?^}UX}h?G+$
z&G+{J?bjdg>5(RF?F2hWQVUPUS6mBApS`0C_gbCrX-zfq8D)cp=Kk9MR6D-BbgKu#
zq{wg#<)O$=Wh-=I98>6St<qHxvw3$DIqVde5Am|g@^{GcU%4p<;C!673wmbklcLV}
z9Aid8v75?CoWdw+n~g4y+XrB=D!8Rf9L{PY(A~4uo3zQ}o_EPqt;=uJcsU<jb!S-%
zv9ZTEU*<dQskW!$`vk~?DYm1$3;*G~(OOg%Z*aQaMlJchXM#at8mq40nEk*+<SF&N
zHs7R+<pVgCM@mE0js~@IM?sT%jCq46m?y0qfl)7*-GGxCRoq*=geB6PfYE9^0;Rj%
za&=20L!pHD4U)-Z_kb)VnNj=D_lciFthH6BEJZK`(5T(w{fDdL3XhQ(lyK{H>(Bd1
zZDQFDij&31pHKE4M_W@f7c6Qj(aI%yXiX}1uadEK6aLoKeU2*b1DX~s_=BV>DqMV}
z_&i~$4aaX}Ir&)253sOI{Mm)y;z#Ivon3s9G#Vp0&R2gGna;Ava3N_d`|HHT7wf)<
z&?AaAszDD8SkM>~ujmE%&X54hSB~i=v9U^PsoQ({)Dxoiey9D5I;mEco<sc(?_{X0
zKT;HO?QJZ;yHN!@`{8NAbF(QyLNMUcQ+xOpH#*+tds#?PR;5r15u^WUi}t`me?%C<
zs2#?uQRfJNZ_XNIL?RLRV>Lb*EzV!WqcnBcMVC`*^^`J`@0<2uT1#jAU(bbDM~&S_
z%jsesLwuv&)b7HsDtD^;QSPa{)m-mAbq4$tSNp5tj~_4=0zO_UStEFP$&0VTfQ-<Z
z#6qY)byk6IGWTYldwtqDrryMn`M+M8D3y?pwjh~~GbW!mKO(dGq6f@RZaEc7(dO$A
zGelBdS{=`q>Hz}ZMAUtbv};UI!orIdWpyaNc!n6;2>6jA<gEade9TPJ;hiE4!?9pN
z592Q)wPicOjM|1e_{sSmg-;%C)$O6R)rBV3nsRF{R!Yi3%KRmr*vek;y)N%j_1U>Z
zV;Q3}*Xg+h=62(-*ji)8;kanQb_tapH`F<az#)9fSi;NXb&4d!v8l!m|3rQ<{!(cF
zWmxTDzUE8C4JEysyA+2lcRc$aTYjuSDo^(7;*;kchGVJVfG-HZ&c~h42VRlmqAjir
zhx1K6j;be})2fO>q~0nMyx-u$omDfyU||)RqIE#TT0aQzo-RL@XIObAl9E1&A^LDO
z*kVes&$Vm=O(6Ay+>HN==jHb&z4rNRy|(#jp&jl}Q3kbbVW+2RDm9o?KZ1C@3J<!?
ztbwLs?y93SvPAZkWM0>Vae_%_+IV6b;`bVeK>)1sB{K6m{|H1B?+zlsgh~zaAJ0Lb
zKzWzgNalF^$w74A^pRd>muP{Ow*^Rhumi2;5ORpIYj*e1p6g|;CX#1%(aC{VGd(YS
zKR!JB3^%9|%g_khLj=eN@v;mPX_p~Fcr`|^a)%bR!4%oHj$t0|qk;L0kSW3|&7g!C
zR_y?0N_(TC6^&Xj=jh&~VB8);F$%r4;}=Rihi(4ufn<9f(Fm6WB|DUq`tk3E<n;lz
zu^Zd|qSmas%G<_!4#g0^8SqI=*f<Uuz!0apwKRsw#q*pQ8vmL{bIJ6RMnxVF3kMpI
zZjx2;`w!B66N%i)JD8>Vk|wQdaaFXY5obWfU&oLxZ^z%uTMgqH|GwxT%y81ZEI{SW
zv0$je`7UjSj#67BO5Sl5v+(Xqm`0?IFCLXtMflWV!nw8-KZ7!+eXRgd{Xz>UI<x<>
zdJOaj=~!pYcU4H+7o~Eanqv34U4?-uW+QP@#wJp6krzygUiaf)#+PBzB$u@PmWG??
z%5@~LDYDitgvn@FqMagozOIy)z>=Vz8_*>8*V94%-Ot%1b#*&J(^xr>imYQ-KLCtn
zyIqFRML}zC#rr2zD05B=;c%H1hJ9@u(~)9wDO(#q`drl)a?%rYSJ+hRGde{a%hUGi
z^LW%4+8)-tO~xN2DOqRXC(H&Mw<bceZ3HTp`v@?68gy&<i<Kwy#u0s-H>cg#{_2oT
zL{YHGG7R~+@pV$CH)mJW$6a+O3=Y1YNJ$YvBjKpK)IQ!{-rLP2qS&E+W+M5ST>#4@
zM@e{^H7jGG9Iz<#`&ta4*XycJadW47G)2G@_>lw+y6b{(RpTp#tpX~*^s!Wnb`=i2
zPe$AYiJ}}G3!0jwN}?mS*RD$@+D`!0+}_IfKv&mhjc}pt#80@}BqksW7rn!8;J4Bh
zA22BG`$nIB!Uymi*-Bo-g#JggzZ4w{zDwQEo^vm*#HDH>px>_~$PhJIc3qNivV-+E
zz3XL@%m9NM5#4qB@z-7!P(bf;()~tS$AYe|Aj^V7gfDzXTaab3{e>@<C`>i3_ijH6
z0f5BF%wxeIeH;SvYx$Q~-)#OMp%_!aGJk&KwPzAUJV;E+Ei)h5Zu%OXJ`2w@34H`c
zQ^2wWi;jJq+b{Su99V*6_w^^tAsgxIED^KZ<8WDlqu9i*ULMZZT60_W15*tTTuF#X
zK3QV*qSSWI#bqWOr~EU64aqX=Lz2*Lapt)%*2$$Gl=*!b-&bpJ%|2p$PzS8Wnz8wv
zhN4ZC<nr15;#-bPreYy;liI-VDoi^<zC9u(F~eF*M67d&xGmjklxkNF>U<F2fW8>%
zw^1Q`*$%T3*k=uS2w080PW2?^$pEWmkbe6xGmp1rK}kFbalw=)<(%=h#Kp-ZPfn&H
z>rJ)}kD(PUP)oYs&&mMb1XKWX!Z3mmjjGJm@?_r}L)};WuQvbdday|^L`oWF1pVnw
z`4@kQqHLL9JhseIZZE|x<o#$has397NQV8s>IudEmw!0)tEk3Rsj?x`X}klu?-^Y+
zewkxSyn>)okNfu`^m~gNOtk1MGI_87i=@V+z{cjuxm8k4Obbx!Ag~`-B;_xRUDVrC
z0VNRZ1rJCT9%6ZQE#nh>@};|%pfO<bx~`@Kzy=0*>rC%wXcTXo^zSK3RvKhT+D_+D
zegG#>vk=g;26v~|DGF*>bXH=#6VR_nJk|5l#Rtc%6Y;;}G2pbkSd#<I*6?KbYW+`0
zs%+0@j;S{5jV?b5`ttk}Y;oJ>FCZ{omUN$g52w+)<?=Ixc^dqd^^}h{6&UdbtPFp7
z1#);Rpbm3vkPaz}najSXMN{Jw;=a<B5<}idMpuC)C!I`ZwPj@MGkF55XbZ8L)9qtc
zyfVH`R>rdGJu!$vls*(tUlbR!j%QL?UfiZ#zN1UDBb^BD{ctw-zUWdYHc=#vS-+UT
zafdxM<P;be_rtZ7MNBJS<@VKgOl?G#dGGM|;Nm3jPaCdKe$K7;&H;s@aS`%%x%=9s
ziCkl^YmcXXGpH~Ci+-`!Cxuc{mBol>mye{X^C_d);gV95@I_L*ci3gQOGDhAwO9L#
zAx3jI9X-`cKbUCGWwPeX72{<*`%A)@w3qRz<<M_$KcQ-({f(k{W3lS2HACv|6-nTm
zfVKqCWcW$N^p=Z+tNMPW<VhyRW^lAK!mjlKIgF}yR9G;jt*}|qy`31hA2FTWX>L{4
z=j}Opi-t$3dpJ(ccn8N%)Am`M0Y1wj^e1d`in33GE_Gq3*~H%N@xUz){K{%C`{+U!
z10}qvShy4x`N%HDa)_Ox39b1-C=RbOl3e<sbJpsCH}W<l#b-woPdnrGntQo}gun5W
z4jrb%9b3xl>+EODcK9sfHHo|nueWS``s_aTM{7;PVZzVc!fywLcw1;PCsI<m1<@DV
zpBWoK1?^al0eNX(13RJnnaPCRy3FBP(5>;K`~t>9Jr_6vNM1v6%d!de0Euo5XY5L~
zuM&xQY}1))&$`>D2Gp62t`jNh1$8skwH}gMIXBZD2OnHY^vj5J=)2mLmU|>H6QA1e
zHmpN!5aHueud3F`dvj<bJD@W=W&8@5rSCE;>JzM&FfSUcv)&2O7f02^o0@{=+(TEn
zeYW$2+xw;L`4K2QB5xD%O4*%&f<AF8-7GQBUe*(w1aG(>)kEBMHt(e79XC(T5?`E1
zyXB`#4GLPspx7TIs<-eu0AiTi4LtubiLD^H0M2&fLAAHr#vv8$iNkfJbNs6=TcrHe
z%g~*Gs063D(Y2XnN%5N9U+Wd3XvzZO0-U3xlzde596ShEOOZ$D719Qb^aDgF;dZ5z
zrt8CEt;0CwVYYuGK-J`Y^n~aQC5N!XfqXHaC%7(y4)J^+{vhcn_A-UYTFOyU3Io~?
zQ@w@rl`&7#h*2c{c|jQ2VKm(4Et{2;B+9;YTQ&*46b@m#6f)9ld3-9Z=I)m27e*^Q
z!Gb%~ezG{#tN6NgyW{YP>1&p8J6_Z9igIXcppsz$IInY1pI^{LHLU+f%vOEW5Xxc|
z+V(9;96FhaRx%6u-%R7;h)m-sDCp?V(a;bxG7*t=|KjQpVRZ~VGTKD+jJ)P<&$#)d
zb=-rJm}Fg(3yJx)EP`vy<UG26{#Vj*bSad3NosF~Wtpclpjnq1Na3QlaD^J~Oga8;
zXao)a6EHnaIc@;-oE!dIDz%}zdXybQj{+LPSo&g>P52G|)IdV!TpGo~tZqBXhnl@y
zToKeNayk;CA&30KEBp&8jVn_ewJ0MEeuF8y#Ck~mn#_kKyW|cfrmNhL9hb?%hwWmq
zX?@^x;O2Q2j6u{t$?vy*fIz4AGxdjVU4j)!<@B5Q&hUzO3kS@n;@gAfA$GY%iVA1I
z0nYHUKw2zTiP)tMX)?t5BXb!^T_Z^&2~+)St@FsitD@{xJ4v(R%hR|EHp#bV_3Nb9
zE~<NeuQT6`WPP1z-aSr*>wd<Woz2ZGQ^I>tO{`DjbG&X0&i2ZJ;6%fI(_F<>kwfI@
z*a{ywwX=KP_eDM%k>xJ>MB|fgz#wPG+hL!O3Sr-#MI9Eag18{4dWL^kMmV)w<q_Rn
zsn@6JDX3vOs~an!YeNy=D(4T)R>hC<QkCsi&yN0gsr#%S$6jiTq;bF21Cr#vw}A&-
zoTYs#OUH!6w!Jq5PU>l)6P{hK#UQ@)?EdXKm~lgDt#<2=!|i^xI+j)fCojCr_3RhN
zRQGn~G^tUz1d~IR^Fs70QkOVKuRXIZ=i~wLYjnyMeOJWa>GrSYapVsk)i5#xvKTJ%
zDz1Kvh4>WHY}x;EhrCn|wikA$Jtz!2lqF=u?0oXnVKlclN2~(f?{eD-dkK%~MKf70
zZaJXx`G$ergGZ-K@z~fvL5+<YW;cE%s%FfBRsDT`kNY?=jC?jG@1sn}<mgJw=g+KG
zQUKXQqsb+o7V^F~zuR&Z&syyB59Ua-Wk4>c&n22@%j9{!p@&j((M(yshedd<DKiMM
z97<9Q>@--#<`8(OcbC*`)~WK)JM(eKLW%9E2Ch4cr51r-@Tl3cbCC4Jl#jDuLgsm-
zg+wJzb-htCRWDGnObAz_*D^+b0xex=hSK=j{vd58LMrkdDyMlW8V_7SmSrmE*s|}5
zMm?Y95ani7zw`EFqGogKNZ@Hn6>)fikT>m`LZY4SG%Df4)#qqGi!ktB)p-}{q$(`7
z&HC$y<6&FZc}E_;a6;C7XR{pcP#4kv@xFAN7ujDpXvKbPj){m&=NI<OF!vLvTtj7C
z7((|^C8lgf_nf7PAHz$83Y2+t^#SQ=>y6@%`mYf^Qla!pVg|xnbEBEh%({=yMGB{w
zgog2I9IMdmMfp`D81)iLaOugzgf;T<stL3PvEHIxk*%W_QiSg25K;2YgkR&r1$x~T
z7QMX?YxZ7!z?X2J#|(}&pwhbd{@m?mF^@qne0^h9FY>@um#PN8heuXOnL4xT?JHOq
zsHiucTK9kP_0GYSb<O{1Y}>YN+jb_l?M!UjwoYu@wl#4knb?!(cb@lq-+Sv;eebRA
zKhECk)Lwgis#ou>?q1#2P4K*Fr0q;OOl<Iq=&jB@6n`<3DNQrwA`EvoMm+k_S4Dvh
zr*xu;;A$Zv>K8j$+M(-91*WkXy$WdZ7QDQRD<hXS1wK;V_)*yg8**^JNchAl{1x?4
z^*kK(RUsZ=q7Z8YB$YP)0Wq!RKbBlzw8=Gev|W*+Y)sd&2amDm5kD5j{76W)S9j)7
z*StX@(7xis<<i%*KDHkx&i9rS7oe$!G$(eMskRfhLkpgdK>l6qx<Q-2`%ps6T-xaK
ztZB-@<DwpNgFCs~K_9o>QNo^cLw(WsVo=tHd2i~fFD}JS=k!*8T(*eEW5-8c54%+A
zDGofDL$V$XD#Bz<VFmc;Pc#RRko?KhIjY+*SNGNx-^y{v))oF-MRQbtw|Xm&gN;9`
zSLgMLbW`}?2cKKt2Gx&$`5)E-;mi7oT2P&|6aH7$rWNCYx+S1xXNV7VJYPUqQ{yGn
zNEB{&I{U!mNl_X08Irvx?beofX_NXh;Temym21Bq!Nt3=%4x29nB0-8qSs6!X89@5
zLW?JPPO$+hzw!gJGz12&SKbI1SzT(q;k7|}?2bgDalUQH9)sOyP!gaqK6>(~B+H%Y
z<xfetWxHAcE4IV>6~a<-`wz&RV#VYc#*xIU7SG=q>ujI2W8p1(t{*l`+=r-9e|LRz
zZrE~aeQxWI3s${1bJ&HYkNCM>BVAQ@#(!$?Amv+Cy3i5V_gTJ#KD4UV{{s?ZJnO;k
z(n0y}o<cEm{PWv2!=`RZc^L2^i2Sj&Z+PLB+g*hkNx5{?ao#45%qil~qFKz>*kkC|
zFeh{SjagCJ%(vneq-h*|PcMs+#8Xp;MrcqWHzIT?5M$S@<Y{ZU(F19dG;<LfM#{Ex
zqaXj7@hjl8^PtO-`}Y6)LMakMZY$Pr#z3oy(qSI=xSfo1zfaN$RHfjiI|HP4!o{4j
zG}23z8aA9qssXGHz=Q=T7BcZP(M7CLgkGc_bMLC2ZfOy;b_BKW40qh%Y~7+K;*Xtx
zGiRi8vB&+1>KAIKg=UcSzmpy{3)j?Z7QN*17FEyLl-9-4NdceuH8;G+0nC=Jme*K-
z6`+%G>34^8a}O{lsUEXgt2vfPQ~F?+0LgB6cP(W1J8_6d$>0n`<t_@3Li_SVg;V$#
zfH*Xw<;VsvxdiFuor+*bCU<a15IYXTThpko2x*_PrswA6oSOstA%-N$`b{cyH-hGe
zOTwmU%H^*bDCy(oP1i?;*gvK>!Kte|T?fN;Z-kS<9v@?@6$tdJfjxcOws^s1y{J2N
z7;)o5YE~SS#pATkzqb#betI(RG}$*IAMWSR$!ud<Zjb3!NXqUoT|01{0Ghf;j+`eh
zDRgvq{s9Sbzt=jp0l?p=asB(b^-qwl-gZr6)vyG#)+}-9r=&_mF3TtlyOu9-L;h4x
z{`Or&0_qM<E{AaIlr0zFD)g4I=pO29=q(DaHvAaY)}%3WTZCnUvBMGHV<;Te?L}dy
z0S@Gv89XNcfP`*a(;Kg8$<)sRhCASXPY*J7D5q>$f2dt}Hv&qz&HIT)FpfvXu%&Ih
zFmvZldE+@{#~d7*<UQWK5UYZJ9Cr}(umS8co(=6R248<x1~mYt9C<x095K632efmx
zoQ0M1)z8rM43q8e)WAf!5V*4WG1=|K<GBC~@B}P+H0=_^1?>tuu1VCX8k4ni4iYcg
zU8Z$@A)DTG9zXUO)uP+6MgTKiisPbkDD`ey{o)~w*qG+R9`+$Oc-XcF7ABDT$Xlk%
z0L}?aYI`EO`NuME3MDPZ$Qy6vWh~)g%bX(@La74GFvH46_>Y<ex~isrl+aS#K$Wub
z;8g?Ft#Ey06w&1V+aoQao%Nl{Atg=xZ2dr#dwoW5BZr`d2wTk79d@`8t`p5%rkP%>
zUa)<derOqc>Nm@pu{XfiUsA-e3=atW<OnZ=)pd_I$n1YWVn@F|y70wVN%ms35-96{
zo7?oZ*?f|05}1UrnkA?)zw;>QV6BfdB{NqKBOV`sbi0OsPj-Sa#d7osX;daf0l%JD
z!V+N_kkpOZ^{YA@gNmQE-tctv8&frax}LQ-!Nl6oQ*lq%EiOn?-(2{k!qeoercuV@
z*-%g;-xCr>RWXa`^20IKUfhHfrjOi_Nmup5vb7!MMH4rGTBv?J^`gVzH;@6%v3SZQ
zdtS|ZULE&XU|PTWdeVQw*PH{psYRj~E(4Lfq8=09sM;If#8|MtJ<{z-_@X6zIassa
z48ZxS&Ls`QTO#3)wi_Kz-WvoUh@T2hm-0&k1XOwI7mx;|(Ke~?g0VuSGH}vV-+`iB
z9J`g9ppkVaJ&GOoT=*kdo3j5D3*7;cFD{DcrkLZEbG{BTtr-jIx&LH3f%0}ib-^!+
zbh*i?>wichVkgIUvcQ(ir+a-26%V{cIm(nx5xqG0WvRt{bit6UZxnZWtp8*)Y0Ax|
zI4R$l{^wM@36)QUm`4!cmGM7B)s;YHg<0y8lmY*9Mrwpr%X6vJheXa3IEs%j+Vm~k
z)ja1pSQ|j6n~t2(l<`=nC+*mwRiC76=*Xsz46Qo*BIci{UTm_>U9{v$3B`4^JA+&-
zSup_#wB<T8@l9GfqfiruI!|R2AsoKu=7X1h;R|W2`AVRkIo8?oNefDgayLiS4ZD?4
zn1zQ#zUj79qc4csxMUr6BsT90O_PSe*WzOvpCHIsgvLWl4ZoZBK+`qhYn*5VWvio<
zpEWsxPgYBqSn-khR7Ia@Zo$qwTBkxTW60slFF<bcYWmsskV}t57>ogxy1F|#6V?)s
z^X~m1jiPgnD;*1%d29VJb+coLuc&+4fNWb1(<Mk`-bET0b^&|~c(&GXVa6I6g*5;P
z)y)mQ$rX5?c9q!mt#QWt3YoQdanCKppW6^F{91xZ4igbo7F~a0%Zb>0e3&9hyPWt?
z^;?msa7qZZYyEmSs%XTax_G|xM{S2zQCD>-y3Oih>!g`z#4om;Hd%@MC1=eXb9I9R
zzVz_<HrCBukKM-*roMUl&)m=Y^q#ps@P}NuLL<!0DIw;#SJI_l#PrpIWH2pf7%->_
z`_Oy}-sHynY^(9oGUrtb@a>8yzpN|}=GN2Es6^2`$b6Pmh434uJe6Jya{E%rkkcwU
ze@Lu6I<7%cG1J-n>9-Vx=24>Utyyrko~<77_CAay<1(%s=D|dtlTc=hyefH@qhn5q
zbd|j4=la&jp}<O%+kRIHUM7w9PLunC*n!EF9nS9RHRiBY@v(S7SL+6KFPgNY!5ocR
zccy8{!{aP9-NfSRMran|#1=INh255?MAt$<z(Y0>9a17Txhyb-o`QrG5-DTd)-#O_
zK<T2<5UW|fW-&<Z%QXLELCw*T^Hll;Cp=ZU@=l{XS$z%dEr;aLFr<Bn^rWdr!RgcO
z+vKx!S&N>|bY4YxL`TlnVbB<Xm0rdVSWk9efTZf)O;o2{7r@B5cI7L>I5P=J-gn6N
z>m3rmwMc|&5wgEX7M<m1es@*J!ffZtHGeD$p@Q4wXKL3~$4f|FP(k%pId)cMcU+D{
zW($>qO@iV|!(--RT)OR$?q)gGIV|ychV$Yq<zHOMaU|s<BAF7i6y?)jXrvN|USn5t
zlBT#*s9o9}PoT+)uNh`9&DBumL=~7Ou8BRRsp^*_oU(q>?5u<_z+534uC>1De?}1Y
z)v9V0J1KofL_8Juuj0qfuH+{vc*RZ8it%GEZi1di_sJm>$g@`^T`-Sc^e;(1qy0+#
zV2=mz)3j}1Y+7Dh03{NuR-kq{@s0*~>@HFH<cJ?vUZ-gTvw6pD-HQTAuiFwfPb@8N
z$?rA4P6pj%463cHqD76FLi%}~Qt&-(DZ2G)&GE4+t54w%JW^-a&fZUSEDXX&c%)j>
zI0m|Ur0auOjCpe}QpAEv3erXu!|OZTQq;5Mnhr0tFfLe7Ni(}fm{FhHc-E>*f@f0^
zfnk#4k_DjNk4hXq%=#U-Vfnn($44&_JSXwEct^I0B;WqUv~e$P)%}Tx&|<NpVLkqv
zW7DB;5~|&4Y)mWWquBZ=MVSsdiRNE*mnN)<J{=Q#QoNgaMGl*oUNeY?X+W_6l5_7C
zwrZ#$`d{Q~&|-wEOE6KOIrc61Q@l9*TLY729x=Y<Wp+kVO}Wk?p;!(~O0X&6qQuaz
z<~$F=cLFf2>+7`3LH+^JgPm$65`X7u3|ueUzog42zzSRZ#cel`BG6W;p`6iIGYD0u
zB=fG+DjpND&$m3Oj$&7UF^1RR1hHYd9DE)7gKD`(+(GMfSAq*RB^19edOj5OOoZ&!
zAV>^f@Iee8nmr$ie1SBFmB<I7ja=oeo~iD4OyBp_>t_WQ!HE=ycmR5G3HjKcJ_%2%
zAprV<cz#9iNsrraAji?I)#a_O@?=e~lKBtH3Xu*{^Xx0EP>U18+Zxfi>-3Bd(h!N1
z_*A)T%N2V>m!im}c*bd)aFH9edLW+^%?y{Y;9|ql@<4T9Q#Jm8NHf$BQ?`nd<;n6R
z$Jp24p3YyIYSp80388N+#bWvfrz6ns-T`xB%b()U5z-T$Ec1y8q`0+yvcg9MQ~<$?
zKu0S#gzpfV0kV8Kz`mRkiM0E;f=O(<0UOhgat_~4a3f8&lO~yE<elYZho7RoD7^)u
zTHL$~Qjh;HM%I=G(n;=kCO=6HZ}UtorS;YC-0G;n8X*JA4z}n?J2on)X(M$0w(T#N
zvfi)lC1^~9yX#RdsASsghFFA-D1BCm2SH~uh+Qog#IumsYz~Iv_(h-$cGi?^<e#gU
z3QR)kZ0<tU8L*E~=lmVfzQr4GUi*xwvP8cQqKzPzM2v!n+qlImZic^Z)KhBN!6GpM
z@c;K;4ZEDYclo-_Sc`8ig_@b+pAi+qK_7?t)hZk96A<)0(&%Irrfp)tp7p`ou75|=
zjbM+C)s*Z$xoM;3MC+mmt~MEty6-ABi=62kW6<|dKX^!+?SZr9y*bwHuE#K21y3nR
z+9&VS|IW#+h{H!mDQRjNa>0V*V6AgR(vo!Qj^O}g+u9xT)w&sV+S(Nh_1G4@;PQ~{
zCpZ4Vf|~^BtBSE4+P9$RBbv(;*XK`-DD5OmE*Ypc_XQl)^ipd(=wBklVz91oQ6us@
zDxKxL?4!#cM+j*F7xEtfFt|rK^;m(A{x2|U7%Hz?-N8sS4ag6e$s)X%+Z}uQ80bk-
z1gvVrC%{@h8}P$sCkVrPgvN)LYGMy*8}Nx5BKscEODqn|zfAp_(bmJSN(fCSezZ$^
zo}sXE;f3l^Ky{g=$JepL;PfDhmJD(hjv@UFi0?=O^OCqs8hhcX9`-RsiM^g7YVBIw
zeXGRW67*Eo)aMezQMIS$qwSk%_WfPZ%Q80iLAG?*0-*3;uiy{o)7sxz5C6`W1)6+X
zuGWfHeGK7OwWc@LLN&}j1epzn^R_LXW(aP2NEs`n339F6(8y&=CRR@RKMYqdsIyj=
z#drS!i4u=7|9af0dnBo8AGgR^7WV(9W#WcBqv80$S&WI|yvpn`*$T_wfS7JY^0Mn8
zh+TdCv<8(rCaDu&h-p+ZmQ#y`>1d+AlsK>y8`D|)|K=)Pe7<GGG2P%SML(NlbhuvR
zHqC&=NkFN}y_SUSfm3%oiCWm!Jw0~1?vASPSw--`rA>bP_Tyx=cSPwURs}zT?`7ox
zTb7^)8OA)<tK!hjzEX60Sq~bJplJnx=NO<U42B}CFT$k{W0jy}6Pf)dbNsdXPU1dd
z(^r8ygq2Q{@m>+fEvq*W^zJByT_5nO?oRveu(}y$k*yE-Ogn&?VXgjm#E7}OAffTQ
zMruS+i=*>Sy$YJGvJ@~`Qx925{*~+Cu#f2%u=fAYCQjSI*hKAfFS|88&ilbw@rvzW
z{rIPII^Y@Sr}|V4QCC+A*4C@vXNMIxJG&}iM-3=u6ca9MZq7rR{BzgtW<FDZ;m4|T
zbJSyX{G@L#u3~$sNJvt9?jLbD6;-_$GEqdoK_s`bs|;02o>A)HxF&ZwIB)klYqmXS
za+n=28oeH|s4amlSgeyY<wqZimx`k$93I9KSEbO2X|!}|fM33%rzkN)QmG7@H-}Ek
zGKi2`gSO`4r7TL+_Q&GJohubP{8>OH)T269sd))}3?p~q`C$Rtb)1fw9ZHSRX5c+E
z$E-*807wfpL6VtoW(Qf83zn^x<EM)EGmKz+=vrnMb}rEK;#vOVM|M)j+r_H1ooQDQ
zey{=*sh@0GJZ6(!vcHxVyFuY84+254k65f^F3Z@hR*Q_A>u=J(wZ_)@LmE-M1S_*z
zDWY>Q_D#jS^_|h=cMH2U66p4sR_~%o;aY1s2-dj?F#KhB^LOE!>|35D{hIm#*fCL#
zEH~sFzu<^Rn`Lm~mnFvSN+MWT_}(Feh)=b{rt1Nc-f_7Vi6dVn#hoLqaVxDX-&8O*
z_+<g?YK!b!IDJG@hT9BV#(gs_^}x5my+Bvg9U@!o5uUC_kZrEONKU`}kliStX(<~^
zc33g!(U6O<&kq;P45Mk|zS;z2xmsVMibSz1n<VTNQ<xWX^+=}nNw^tqFE_90<Z4h0
zJzefm+}bQP`7&`syx#B!DVck#%Cl_gCkv*@Bn=_D<PR)lyeS(R!A+dz)Hsfn+vmCp
zDoiD58sG49>g>hF)C^s(anXzq$C10$udx=#vchxW4<ngmUD*kI(B?M6NJTLW+Gabp
z55|f64J5=%=m2Up$2jlvD0a+g>=}MoCgw!G$Aq84(b++sRE#*n_1$(tvWYrH$R_K%
zC=;`^Qgaai=Ge$zW1{Z;^yJ>P%fTm6FOjfv@nYkL2r;q-D~_n!hw~BFL-G;6%EcbS
zZ5gat3D^t>R;x9D)y0dYYrH5lm}w-(52GW*b<@&aDUM7es7HussaPy*-L;J?V63NQ
zB4H&Qo&s|Mm3~npZVOSccsGQjwB8$`wtI(zp$em>IgFss(hfy4A!(Yn|L}m|LbBk(
zceGX_=KqZ$N`N5+ze^FSv&d8HAi21WiycAJx-VQ9w_teGO7VNma$7)AEnrjYHxa$X
z;m3+iN;}Du5n}4G2EYp>w3PS(BZq>ogQYHSIp_Ym##Hp#c8hJ6R@h|Pc-D4q9`USZ
zXq&gXGm{r4Ig;vX(y9Ao9l=So<mk)Ymf{Cy6aH;oK=KwRPU6cHF(>jPCj2ypCU`!I
z6ox#xgfgp2S|DlZa`1_Y4=sMC>48P#;J$_+5FyOrcU9zBl#_wQ(l!1RI_xx>Z#}X{
zU~1UQKOmnHtYH_tnx$VWEaocqs^!G#)aVHJ>NZ)DiRh3L;YT#Q5w#Jda_sJTV(Gq-
zpR{2Yjs!7oh=+@~2);Fdw#_c=-Upzu`5j6}@~-OANv4m|)CrQenbFs|_-^L(c#GT7
zrME>e{O0sTH@+~fbt2h=sy6|s=5)w8m5oOv^vo}vExVbp)1&x3y!94;Sm&0bd9=G$
z2k*>y)tg?{SzE)+)~h^wmDzn5yHHYp^Xif7w0#$TXEGC;Y3;+Qvstg-By`G`{B!+D
zbe1`0@P0_9N9xb-3dTRG|Ju69|H@h@P}aiHsc9=lt@Fhl5RjV2S6}lWRuU}4RD<qv
z1ZjvQW_L`ZaLnIzDfBMxK?&6J_|!L-qUm2J_V{|95}<v65Mo8R!S<%sL{H8~Id~-W
z{SS(}Rk8Dt12ip)&YfXr+}?Va>WC{R`FJEX2F|5li`1@mPhQcL*0?kwr_^98V-f&C
zBJ@(*^?6B8qjddJcAJj4)u?16G}nUJiv-EFbSZdNUb;A}V>iiX`A$fKyTU=aQ$h5<
zRfuB|vcG3#u>_mxD70arb!eg)7`_9ri4S9~H2wi`FhwkCxNxKwM|oH3-vLh#YSTrX
zX%m{U8Jn>PEohw!21Y7`>1FO4g#`_)6EY$6k&nc`s)MQC@+vXMNvHgI9Gq}%Wuj|M
zKu?>rg06lIJ83#(22blJ3sCotmzKG$3IR?0m@v^!nQDBoR1xdi5EOD;o*zo|EVWUJ
zbrlLBi=zC*tVL{o3d2!L9AdqdoR=aGkZoIhPXrTMHd9*uR4M;D-^r110T`#@D80p!
z<?T1EGBF%ER3WTNeqL52`BVRjv7?6MxkMnZ7=&BPLziM1>X1TE7!=;RLJrWxb@v`O
z#KttuHj_QZ2oJ`$LWimp+!>wYLeSQXVu1K1G0U}(4jIQ;lGiBaora5GEAdbQ_`T<g
zWL68w&02PkfyJ^O7YLIY_;}~@4+uCn59pZA^7+{sz06$~=ct_NiQYzZ949<MO`%vA
z&qQiZ7*N@fZXtiyWiiummWX(0>bKz>rHqqLBPX_hHNuGvt*%8KXzDnK5B=)R#}J!3
z8E`%^eAFF(tk%L%8$ZFmC8%&x4|`bauN`IgK(kk8i0SK}IhLfbP_%Yr6u`RkVu_Ux
zf~GXYui<AIa6UDppV`YUJ(6J5ZvCLeX~u;ULEQzBOeW`@<5Aa5U=+Zpg?58ej<P+$
zlu?z(PcrKC04?DUf@!+XJIkXX`=9wwb<fOm<?L#^7i*t%lHnuJHGi05Tr5edIYLF1
znOIhgszJ%U6iPBustze+7jR59DKyi)eEvHdq(hC}E0R$s&|c2GC5U3(BUc`d(rd7J
zQe!n|gFE<wAm+Zq#BIYkY|W=UIF*gVoEx(Fwfz{Oq2)9ZU;^`#Y~A>o)w-f~xPARl
zQ~L%OT#0ERWL=*-Uy}F8rp?dtDFTLC)-)ZO^1UEQTOWPYum-R_!t2qY{{cZFkzylv
zuVpORK`$QSEFo|OMlD1ik=maFT?%I%^{m^+JiS#2^kA`Vu{sr)S0wnM-LEvAvm_Ti
zb5n9<ZPel@M`@b|pV|Ee)j}vo>kLl~1-~&#jj!@i_k$H~1W)CGogn@Yf7Op_BWvyi
zVC`xX8-48(vs`)ZQQqwcQ95a!)GcFnKfA59O>o)(=45vu6>t+eKE$s$LVspd@M|qm
zTVm|o;}7Y`!?kV@Xzj9JG>|Vj0sa9QZg$j1`MdsCbw~$(I!|50yli|XQMc4))AX<W
zSf$rx9_j?pAqQ7S+@;G+urccX2H8ARYX_D`exb#vX=>k7OC1u6j&@r-!cxLMeDkv%
zterrw-4L0xM@YVzzM1Zj7ton<0)X6I%~|BzOlD1wt{WR)UFRC)q&IwY)@+^6SsK03
zPw-8M`HkwC)MyNbLY_0a`={)#(@x8)`6yJ=`oI?GgI5QJJ@klHTs4jCgpVO`6Uui}
zCtj`ybS%LV0y}<&L;s~oPQXIc>KLX8@xBtXv~*|P!dS`rQ23SVA)i;_Ky_Fv1Pt8G
zw~j_Ij?&fds$+XFRZ+4Fm6msGX-7G@<kUk%61{zeM@No1){^^IOydM->3QIz_(yD$
zHgy#VrAh_j+A8c0RCO|vza|=$8@FJVxHRsqHnNVjlN`^Hv%{6EZP?j!<V^DM*7?(k
z$aqbDyA~r~*O-i=+vu~l`_R>49shoY2S%8wFysJ}hm`~9V^8_n-Fu=ihED4IfLowf
z8^;hum}Q_UXvI1uYdc6QIi;Z1ghiWYX5cB2SLJI!VS6cB!75BHMLj>qdV)~wF(lt~
zDM^e#oW*4|hf`7OPOPbJjkQ|Ga7`Q912M)cr%YnFVX08%O`~Lx=@_%o5PRg}5B)JA
zhCs*`*7?D&_vx^}`hn3XP@vwFxTl*`(02}4Bl$>}I*`M2w&+fn-OORZx@vVPuMB4{
z&k4hj4y)*4UEBLYfAFXwes0mSz%js?G<|M{ojX-xj|KWfId!%pLjVw$(5D*F+%4qZ
zVifFLg=O<GP61_HAC)~TT4ty15v`^{)0rLN432e=FwWmx7$)K25+OeEMk``MrnN$o
z<PV`bbgi~ojbSB;)2Th|W+6yep-;(4JAQGgq_H`iAcu+QwUk_Z4UmH8R<*hn)tUu%
z`PLQ^1cC9<$ShfZV3S2+<C&wAnxOX2bLH%T{-Szv4*ULZ>p_=oi{1VdG$-p8jR*0r
z5mn&?4^`Uja5KINu`Gwdbky;e_W2TyJ9IdLrcz)w3IhtTsuKtV1SG`&)%G5kje`1b
zCJG9Pi3>|`anqfMbMn2)(30`de_P%QlYR>Scouw$c@;?$;(@kF5_KiQmg~OLXQ<uU
z$l1Rr_~JNwFf$6BL#G3cY<RGRVwCr^mS7A6D_Tt(F~}aR6!}{V?>vtuH9$iER;|@0
z+(28Yy%Nk$ugvA0;jM<t_W%#AQ^XPwa3?aw{Eh&Me99Q(yr3<AbcrBgLQ9g`LJ||H
z4PxEB432h@7W`6}A?qv_6RWQZ-ZzpitE+O6nLVSrVZr4vmzpS^yAG>+q>|38u#-`?
zod5c>;a4^uR>4~a#WN+Dk||ubu|kUc_G>(eis>wG{jRH9?8awGFG^bVvc-9o?%(n<
zJ*5f!_h~;jbtkY~f(i7}y_iqt%5MC%*ux&woXz~H5J(5eEu_T7KhiW4`etG#XV($P
zC}wCNgJW4<+>W*;eI6MH2TA0iHu@`j#H|i7nCcXwJYL=jN5`fRLFu?!SNF7%xB4ZT
zqc$AMK0v#9c_*npY2mK~{VO1Qe6UU6m<>A5(Ro^nyym-t^(XEy>81D9?@6x2e3>-P
zN`D9vYZu6%qfQ*079_il5H`c?C}2(kvu?vSLz{O!kC&}R$2R;puWXdmZ<p?26Q$9+
z0^2@Vol4_ibdq|$Rw_c+{<v2CG;@Df>1PaFEdEX7@D5=+cR=y>)E_1WfiF4f*pLy>
zpr$!q8$hxtF#<W9pebmpg7x=8EAM-=-+j-nBGf4V4}!2CN(!RkKab249Bz(~*r(er
ziGrrPUBKsP4W1HQNB>d;-_58l8^Vqf!@Nyp4Kro-l9h)t9+7FlTc&u!M*11(W-jR!
ztavvrE1I=%eTw?l{UN8dT39wC%FM*0p_8)QD_LvBB@JpmuVS>$p#z`1q2r_cRgVIR
z03Nl@`w<=HRrVnuKe%9OQNW~qFv{TyGol#XUus>TV-#xGc^og=;wwfKda*p6C0efl
zJeI56iYF~i<vW5k3$in5%@1wrf<#hgadW<mX)C}1Bm0vHcYT_6om#)Q30i6LYup9D
zb69kqgiET(#rlE8aducgKdGp+=!4V>gh_a`t&e1ohJ|OD+A%5VKs}Rm<CKoxXVfN@
zR(cQ~66{w`jbX-yQ~8iT&p1EL+*?h+g8My5Y2#^inuXwDN$A2#C1WQ)J+47{ctPtS
zW9<%ZWMNI!#Z8<&i*kQ&0uH>Esnivt{`3#lpHRE4Dq79cZ_8hLIztXPS)Rw;@)A<=
z24<{7-Pcn~4`cIdpiJ=M0kkeNphi<MVN>VBx-}1RNL3W(m`|J37L3>e#8&+(W^AXf
zSjKUVW6X%Il~%|KmH}k!P;?U#;e%<`;{l&pH0834wVUa}2qpGpSt%8&1*IdlgpSy9
zy)Gk=skD0Bdp>;YC^6+4VBCVdzyiX2#q&GhOh0*k3Z2#DKQ*+Bzi+CHkV8kZ;?A={
zgNZr$c`HRWTFzQuoO#I^wjS()&<viM6RRc|*u&|?s1X3qWTH(+C`2tU2e*OXn%+Lv
zy`{}?t7m!BFL$AoxAgtMFw~`Qn3u@DwG)z0b-EOSHfor3=+vZ1W%C&MePI-gHtm|F
zK5xuH{VtvsgvHvnilVbM3AKpd*!~)@py87MGVfy!(cqG4#ocqSU_MTK1nZcupwjIZ
z_@W2Sd&hdb2F)UuY=tnt(lIvwmE*B^r_tSA<(`AI0KrbibIS5v?J=Bh_Lrm~RLF{o
z-|?Ys`8#jvDrCea;FHheNRn2cGUhXk-wdJ25@vn*5wYmX63c5Jv<4}{9E?w|7@|;{
zc(k<RjwCf6(oN`zd!I+KOZ1Qvbc6|s>^iGm&_3T%-hXIrv*(eo5<iHy6ei33d1Vm1
z2C@arl<_23gpJ3t3qh%+bR?I}w>tFl#mbuIqojXh>wp>=dsU^dPI;O78hs_{PWPt-
zewVmhb*$GAxQ&{m6I$$(Pe=R^+d<Z!QCV%Jggd%LQ>O+0R%b+C1<dt}%fW1OGv->Z
z2dW=isjJE~f9a-GyiIN-&1&Foe&%2L`VKV)lniZVAHohyL`vN=ykz~cVP-j3H2R&0
z7#hT)bIA~*#W@?HjtmQk?ZuCp-SDx6yk)yJ#Ic;#Yn>;%nki-&Z}xNRQpy~|)+m(g
z%pi$t^N!Hf6WievfALsOPFVkSMd+pCWk|SH%ZRUgJ$rMl&-M_u;#&lYPsDS6V)K?X
z$Ek5CbV;gxch)WcaGd=a@gqkc*i-;4bkI^zG;L$msQi*aZLXfJgQ*~_noDTGZjD&Q
zsXKK2F1~I>2gR2q+DX&*ah)%uxXpI=@I95{&ZTJC&5|0tJ_LzFFrYsnqEZ%Ctcx+5
z8q^uFMrg+YLs~bwX?(YrYG|kX9P#<Ep_Qx|&`nR<uK4~WJ2@@W^J5Vu2($^kk`9#W
zH|Lhz?}Dx@q2i-tW4@6_e&Vu6Os@DJULMjP!>N<tpJb|2o@IZ*0)mA_3X7B%sV~r<
zU_T)KdqaGpME^=7%bF6#*CJ`DcX8}c-46RP3`b7FJ*+j#`3o(K2Vh_Xs;e(WcHpD-
z;+2$5eL||m{Te;x(*k3X0aMUp1_gQCJ^>F5Odaaxg5%J8q%NC9F6*$sS<6XXxP6jA
zT$>j5{O=Tfk3jy+1Fadls@BXk6^G3jCH%X_0g1^2Dx|?09(s~Rph#5;I;!5`bWCmv
zbn|}WkcSG4b9Ps8Dt6T}l*<Bz#khc{(bXhe6EWTcolkE)(CT(QJ-@%)@b>&YvbQ`e
zR_uIh8P9I@)K_fH6!NqV`z_SClll(nlVTLdJNct5q{V})Fkdb^>D!F*uTv2NW{pTm
zVk?GWD7_$Ym70l`XmnBuH`biQd`Pv~+qx+YyDd?h_lUD6%wCU0b|j`x;Tnh|(D8hz
zIXIcY5i=AJ*5Pf}t^eC&>sLF8?ZW)z!VP8EcEiWVkX;w5pXv=(^ZasFp!gf-&o|cc
zp{+7+<|eRFs6e&1_MKLQGg8&0&=SD`8?4x%hA&K_T3wcyCf38CvSu@QLepl_-m>2c
zb<_~@_;<{rerN|(xHGPXs(!(tFnGi^jI--L_l;>zun~m|9)<HL^r`n0^T4bxGkTbI
zONDNpS>dWXNAAe9ztm8a=BPQv?XU^W7HrSXjFH>c{;RqO{x)BC=2$Jb7Hu<OgF#(9
z-{c~lz$Epdcy(3_0~e|YzuBFs!m0?}uTH;$m9@xnUlxTv{=e1T2B6EHhXlusL<taZ
z-Cb>I_L3`pU4f<?omGp(^I{jzLPF})eN1OYo2jDbV)V@c>cTxG_&?h|+#2R9etfz~
z4x(%MmOkVzwPyaz{(wt==}<{A@GvFnJ6wVaTQi4hsRM0^Vu5hC<k!;v$Zv$a2hp_V
zG>d+2%^o}tDY?4O>AMNC^;yWzF7pxpQ`ABhX{uUir27tX{v;!(SJ!fdrS?5n$39s(
zmfabE&gOH^`wo*F;#2t+2|gOg!{>D}omw(2-BN^B=OI)nts%0VF!U)_Vu@0!Q-C>p
z?E}7#%Gh!wSlv|1I-P*mC`X+Q8GhkbM9UCH%V?zMntjS7{TT#d?{8n;M-<EeyEv^e
zXonwwQ3SqtUJAV$PG^56?Z$uXr7f4!VYEudnGLdL7HD5Nd^gZa?=vy70$h8HOcZVH
zkb6e&R28}+1kU>P-7ZKDTc;EEn@G(`ER@>1>@g{eW%IKQ-|;VlbqOBoLn=cYJbAvE
z9AVgWOkjQ)W~M9RUwY;eXm4HUUVI#;EVKec!25u;Q@C+Y0a6{CmAq9U=`V6``#Ba4
z6e0RYf7AN0&oRa&_q#_LN;7RGs3Y9l8%T^^ueW$kv~K;Wb;|H`_fU)MpTtFr-RPWJ
zT%$pdIOv{14O2lOU)y&>jojp~vY%zrqWS`$jUE5_EvZJ{^2Lk217Fyv&>zI4LfA|u
zQMU9CNa~0L!zhjY9UT|$PPiMR{FIGoErPP@<;sMJdNj*?%Jdp-ruYyI<6ul@D8?G?
ze(^!sWKqxuJ{c+$+v73qKGA_>6rP2(6HH6k<}b-TvtyED;(0oIEQ*RzSJKN0emWK@
z^}c?pE|Ii^=3EqOl#w(wN~*j{KD!Y0iY&ujh5KoZJCwso@m@*t>=6!#R)=9ZbhfRj
z3#Q;1cD5!)QGXF0lo)5~2JgyR21deY80KIZutg6G`DE1KfrLEzN@>_e)Y{9TLWgb7
zBhq+o#9xjp8I~5p8j??@%pnfT>7Cd=_?_iE)tufbJ)H3Wy5-_nn+5TWt9W&=>uG`M
zhkrDXK?2Y+F8&nsFKBVf{B|X0uf5H-U^26KBOF8*^8mL;Su6QqwIUvzbwsFdPh7-`
zxg<uft&dQlDFwga%h^TDuo$86l&+y<``&kQ<bHL1J$-^k4qZIy#L4h9)#V2fc+*yZ
z-1An6xFaYeFUE?^=uG=n*tD?u%d7=%tgt#-&O8Aof?b{VBijM@j-_mp3eT{rPhod&
zX^bHIdJ!x_Bw`(_ZOCNGhPXP8fB>Pgn<aE-SwaqBmp08EHP>Ck)D&a<2MwZgG*<Ef
zVo_5Oe#4^a1p4Aiq{CE~H|SPogrLflXx1IWTrn1Hq^$XSJ`VaOB3=<6%NY%^2MM-D
z<^1KyD)qq2VLE~Zwy;@Y(@Yj<bA=P~<ew4t@a&zh^xL7z0N>YNTxkS+gAyuu+3_gd
zmFbcUKTVbnU2%Qk>wDSHA#SFX%&}2t<&sZ`%9?!rx>$}QA2L&oA9){sp(Z=SBwT;|
z0DFaK^+lF}U~{>@>SaWF7-X&Z{E6uwNcD1*H_sh?xsJ$XJe%(=3<j1b+ZX4bDB}Dk
zh$LUK0Z|i|d88<pMr#$kPZz88E+j4HYn{Z>PpTVMiQeAANI`kXLoc%^NLn+=1kQo1
zNWv>vkxz~yD3gb-?fe7%o|RzQi-$Z_(ARgs{XM?2z7V_tSuRMkU%x1%Ags2mtpuDv
z_J`gg+aCxt*DCk;6mf~-m?r#bL1^gm`AQy0mTeLwK^j45P5cll=vUYtj?{DRd}56O
zm-seoUT94i-I}Z%Dxf`8)-SfXy4aMfuCeWZn<psd_Ya68Vp}XVD%@;**xb=O;hUv%
z3x8mWsB@Vgj|gdM^gL?Z0x#nZf!C0kAd;kPIH4sR%?YfN75vHc>x@6cpHcEI9v|*@
zU`G%ozqK$dvzCMGK4oz?<lBwGX&QU3-68l^A88C&Rc?zHIjmmogtTu4x}QcRB2uXo
z30Z^#ABPB7yh*h<J4N_QQOR>%Hv%9y8gWGM5gTI{NW{>^lW(L95$Lhfy~9$W)1;8=
zf<-4o5{+3ke@iWglMK;<v}~v+FPuwlq!zP%+1IH^^t96;>cgEI%$4G5YtlT*XnSu&
z>C<Q3Dl%E7b8~||GY>*|**7X{UzM}AeJ}6%?w+dDac#GaE8@{iPueMFD=7X%P?s`C
z`j0Q~omV?Qb;;kyp!2e0alnUD9JLHe)Xkr~&mAu|fl`4sVbBhC-~AbVJz*01v#l~(
z>d+qgoKLaO;+Os(Nj=i0*;eg<`+q=99Vfu@aYN^3o+THuW14nH>8-^GiSaeB0@ccx
zpdmRK!?}h^E=Fnt$+P2bpp>_q;F$L5*7;%oi;R#6nnw28$ds}Dcmkq0MGEtL%(5k)
z2i%=a)-KRw#)$O`Hc=1n@qU*o$@9+=_z3cFx-Y`sJ~H8Z8)ILRy#pL3f#;NL`THTT
zuIQFa&%`2u5VCm2I9n1@qlTUU9<olWKCA7_3CiZEum*&1iT^PxIi&RDg#vtQ)s;xu
zl`u?a!K%cMEkn(JK*ERH9serfB%2tz@q82~E#uS`#naDaDdvvn3AuUw2i%5NQRUig
z->40n?@nJ0-l%)QQ)8q})Z_B}*=Z>xsfE0qNFcIr%v@EGmY*tWd=m{DJ3+w8M9O*l
ze19sdT>iu#B=y(A^wIu_)4n}HCAv7eLO=L)u1o6(yAp<74L~6zD6W?D^2b>$JKW|o
zf=_fhxmGz@Ny$gRc0QAvl42HaaQjp5=!^$uzo0ylwtQU(JHV-$RpK)kEQ#ydSl8&?
zKi`l)eE}Z39<5BvTqjUMVM-kb9xXF0B}goOGp%yime76l$5HjMVS?1Jz!&261U^C$
zn3_IE;_3??J_+a|Fnk@`cJfF27yucBm<m-S8K*Z1ux{TeWS+c`Xrg@2TARR$Y7GTz
zi8Co1HMxRwXT>rN<upv~b-i6?udf&&U}?p3pg)1*bAFrK{Ox(@RKUaY3y}%t+n8<C
z%w&@^W|im0+F@jgD*W<2qg`bfn#t091{B6Af-09{!nd8-WkN|)P(HGJ8dumoTEaD)
z&=W7E`&LCPWEUpRC?ANUZ`v~w=Y7uu_J$QesY14Y_ve3hI-FYA@U9u2sEIj=@$fqW
ztGr|)X#V8uqAaXb6{88nwvD@RDlsR#j<ETt!i1LT;U5yX`dSNZ#Me8To@$9Jo+HR(
z4J&qe=?GhMY!*2-av?!Dbz+~ngK;nAGZ6%MLGRjd!>%d$jQ(C7N_wQ-uK9v43#;J!
z`7RFjE+wBXnreWYF+4t>H=wN*LeS$Q5adl?OUU7GyWVX8si0`rV0;emi1QAwS~!mM
ztkr+WxUxt+0gQ%G$P5D=g!|0@tkgm|YvDgMNOP(L=F?<wK5GKn_yb`tmqgUgoUQrX
zN79}1DD6FN0;??3tR{yY2BN;56QM59FG$rBjeGD3KmRdAzmPQob_8OS-yf&n%e@kj
zM^;)58*|i|z!3YI=%xJfgu;3d3f+uA{fs3Pgdvf$oq~XS+{V&n->8QjN0m9`e30;C
z%x^@TZYgGUO6R9DS0QVfnM}poJxm+Gd38Dz3JoD`e7In8_>98YYSy@N6b)uatLMLO
zKFcOse&-CGBBGrHWz}f1k(I$tz3?u|E^ZEnvRffRq*go3m5_Wxh0k!PWS)+;j#FtJ
zy=fHg+N!q3LgRaXh2-MgXtw-gVy;0ZwnPNvpm$5(LUaKDr8H}Ae<wscyA}}-hh)bs
z&i}K3S0TYDkH!mxmFTg(cQ&S)vLm)Aj#G3w;G(dbBx$v)!4T<39NoWHq;kYj0h4=5
z^kWrJkVK7~{>XUC%N2{7n>-ymL$guok#r@46tiQF_nk;O6>O|dGr4CEiQv`GWZlbu
zjfkP&hO(?C{SZ1FQGk9Am2ItsZ98xge?7L2r_53z5|#`;1$l#BPPq#l_`E1ex)w)p
zo>Bn@Br2?stsocY4-|x=dOOb<VRlyw%WXlj@j}Api&l<PY=IJ}Kq9>_M#m#DJMnDB
zsvJbtFX#Es?6I2{laI^)l`fv5I_$<6BrxXS#=XeWLrm@O#mr~T5=e7fT5DuqWjv{6
z*?rE@nHS|}y=2^Mg!3Ru8~l_+v0U7UmY<r2b{5p@PQ7HOM1=3>n`@gvsK}2~8Nj&m
zg9!yz)}|yaJf0F!vvAI^ujIpgY7;Jb`=VE3@D5+OR7`g!C(rRYbV8^&W$8}b)p|h@
z&`;^t-VWa;CyaA;9>`BEH=GWIA<s~`inmor@P;sDl~EvLi<G*yA*^wa^Rm7#4kfaJ
zw~d&NTn0(A?k_9m23MIq^+CL{s;pQVPG<2z-5vu^-UlB158j2Gz6!a&m2>|Ap`HU;
z$7lb5O#R<uV6=Sl&?aWb>5=-iWllfSxXhra$XvC$Bbp=)^IQ<<{i;(!x*T5#G4yfJ
zn~F|;%6uPlHMLR@LP86=bt)p2x(2hk93$|=nO(IlYjNf7jN$JIjruY$CxfL~jK8g#
z@^if_To8|cfCI}P(d<Sim=Zrj=ySQI{{zz5Gfsy48GW~-Z1?Aov~GRzAdJtM4RGSX
z2RFkZ(Ad-_)VtL_;)+dbj#k7!JLo7fZ-+;KXlifdjR}H>qCA@nDr-K7Jo9>3b8KoG
zB!P!E#8ftqih9i9ys<DznlZqc-g$Om0&=B*9CK#BtQIJ|cpyJsyj0MFatR9Rs*Fy^
zCCR^Pjp8!H9SAnKPo<r_ZNQ6lG6GPqW&<7=C8rl3`C;44ZAnHO+&cVMyOMIy<w~RG
zK5)VpJOY&O5CKN-yWsIC!W%9dfpFI@=|lo~_RXQP?e%E4aU@?F?W<(<DOql(OBkID
znwqA@6;6WH-E@}-Fw^S7h`59#Wa7`aPg;H*Cuv_K6_%5R*2(NTPPs?G7G^(V<r5{(
z8?IwA7QxhL-eiaSmO&Y#>75KZFTw!A^aed4cFUSI6fCoE5Jxv$b1{K(M-<jqdttnL
zcJ|GqK?<y9X}Viax<%4f9Gg1QoCq)?e9^yV+HMT8b?8%B<|}BXz#xjlyIN{x9}Luh
zuw(gyv&+PtKU-rk7Uv4e#+EBTOnOyApNsF^3(m7d?|3Vmsn?Fei7hCGR>6rZh6Mp{
zL8CdS6`f19W+JTf4~Qj^h;X5Y)${!|Dxd@#T#KHN@39vf1W||l28~Z^R*Zj6Ioyb4
zRKB`;Z~8TLdZn(6n?==VNM77QLE_0js|{uT^<>)gbg*Jaa3J9c8Uh-H@scU0yD~g+
zrAJvWLE-)8e8fSpp?6tT#2-Ai2S;oEGVITV1<7d(9u?wW%b!vlX%0%9Y;%#v6r3h$
zUIG2YxIIibd(k0>`V1)=m|o0-H8Qp<)p;K5r|m&1jgBTwl9S?`#!c(Xz8KR-7Ox9B
z1r`3|D=;qYAXG>3=0hXZ+!<1`Y9S{JXVCAuj<Z@E_$@g68T4ihoYx~;F0Q>y+j+?2
z{&BFL8EooJyygP*LYPXG@Ey~ZG+M=8{O$sbnd}5U5X(torQt@eST{i?x@TVIY<)+i
zSnwi*CQ*<HV2C+#%IBAR8;gGKNN$+W8RoTkuk+gRn~9P<{m?o{jebs&&Mz{@ZF|kC
zFbragchBQ2f1tExMOo}0NKhF}VVsQaGb`#HRYvBT(@r}DT2DMg7q1>D;}}X0)cyg{
z0VxGfT5I*CqQDwkMo+`=-eA}_+VBO|085n&(;+R_bCtb!U8Dv`Q~AF<9<>*2>=WKF
z57F0qvoU0p=nV2^z9`EJkvkHdM;3oJ#@OndFdFA!n#G+ffg5S)KI}+2h=yXMk6BGR
z3Bp-8H-DbjDXR;aS^s8N9XgyrnEyd;i}QvuJN@RzM6!!ZK|@}zs+8J+JPRW|MT#sa
z?PhHHJSk!#x@;yzT~q~;!Iu=x<%wGX=KVv{ZBdNe%BSGaL^^eofblQHByT&+)A;>I
z(+G{GaN$er^9M$k_q*+|nUfT|ER-CPi)kbOOaLJ3k*Ko;-)U57Cg{GYhs1AIYS~u=
zj7y-H;T@AuVFh*?$;deEo>^8I+)@Hr;Wd&{oy<CtmbMk$U>9n1<j<vmNRsNBMUarG
zut-AO0O=m}@8oSjpid&7KDo(>89g5y0tumV4Nx#=1J(4s68{Ib!}fTEUSw}(b8V0a
za*XBXT#-hc`lPGb`TLyW(yCI-7t>=%@_V$Q*@E-PQoqI#-xNkmuQ?Z*HF889x^?zf
znk#@<-ua9J%RA8*A@lTc`$gmnT%`<LQHQm=Zd5^&pu&56m+K4tzJ%@Q#P<-Z_c>gz
znQ6s*rymo>RrnC9*c@l(W=l+hJ0@*a$JJpk4rwS1Y8<iN&=do?32V9-f4DSlR<s8G
zMI7q06zh97VJ#!=t2>#wDBuk;y-AU&A4jw;8dnI#<1nIb;X5FC)i)5Vsz?5qs}^zy
zZB|JgDV#zI=Xet2Hqp@~kU~KeDK0>M8ta!tV3uo1OXoy3o@z{!<E2R??vZaVXX#dT
zLhRxk1Au)xy@zEmBqJhDt+OA+UB=C=7tudWax=L=fusNR>8ElLk3Ui5e<W}GZjUBn
z))~xt7HX(i<@xAgm=Y^Rea1uD7*S{Yw9(^8Nt=6V1d`=q-|ri^p&1m6BG=*ULkX1#
zMWy**;3rhECNQmL90V%|Kr3cXEfIf3!O2t3yBkkq;1H|%jy|)Wah=Y*&7FEcIp*U~
z)@q_0Lsf%%;Iv+j@JB}`E_w#Zp|0kuEH)>B7BjM)K?Kw<g+=j!gu3qXr-EP@i>%YZ
zz{xZ1|E`nO>FzB62)gSt9TDHc0b73>K_GyOfEGi&(M5S+<r<y;1~#bw{7d2OFkbXd
zwuz5frUq3nqHb2dB&FonSX;vU3V~(neWid~C$egJ$A~eiL4+PN75SoI;gzw{;3y6P
z6&X?oUp$*t-%|9EfzI2ZoFj1%tLVd8ml-T1i<+`x#~SU1kR7b?N1gPe-U33+H_R~2
zBaVJDGzzTGwD(zse?o>b`9%CI6%Nz@2}>!0M~>TjxLnAa6%A0|0EVQ2qc9j(8`UJJ
z(bWB0_U#7DmYjtQ!p2Xs14m>!6t+Mi-E5HbEk#I{aLt0$66PGYn032A&(^d)q9y+g
zOYg-80r2KXXlRO0pMw{xv0V?Ygd;-aL_(>Lfbkb6uAHw4#yBeptS|df7DzGxQQ5GC
z@Rs5P6uv(=B9RMF<QlcLzzzbI7vG>s9HFw#4wuFVIb_V<;e#voC{(|}Kwa3B=<4zK
z<&xT&v3(a25IbTc9JjMiT}^8LN=JBV??NHFkNG*chf95Z9iWg{MSc@Ye|1r`k~qrk
zEx8T`_aOD-;)<ztHhfJ3%Wy_}@FCA$3JZ%Vu#T`*oE%#5u~|$3UBXRKd2tdStWNH-
z2Fk2y+yNSV*rkUrGR!zf=}ax}!}U~&&j=v6(BYN$yO#X4V1!l2|A0()I^&yCA?n{{
z9?oYApUr(S_~Sb(4h}?P49AD*>`NW}Z8G~SYnp55%cbFo)@fLwmerAn$wc6f>@LS1
zs8*n!`M9b{tjZGXIjkAnL`#EoWl7{Bq(;en{jBgM^zJPPg?no|-JfDb8@qbX$MV_8
zHE4kNy=NdNww7oQ?mh@<*&GR(hB)X^g%Iu{p2cpEn{*kux<9XAeXGY}-!gomX8DU5
z9ALtC=9YZ+j6R@RxZ!If^rYlVy>In%o1DBzj+3a4)I<;&<4Kag!uY1aTSvX<WQ3uv
zk!eX66`P?yl1e0!aTBDgH=7f8VCP0yT=(frDeJO2>&O!=Im`xfQjZAEto`8|2n9*x
zPwN)e6mPPH8m3PFYq1$RJd-}OzVG%R-s7|x#{Dlq+2<Fwg!Kc@yUyV$N9;A9oUl#1
z(Px)#{rDqMRM9dRslSSbH0rw9kt5Y2{`ROpM00T{EAJS(xBMa2Cnal4eI3MSO@C9!
z4-}<pAG1=hKZcMG_e`QMf1$yASHDT3leD*O(Q}|ldQ`?tGt0@*wz&lSkXX}R6ZEex
z56`Y~L}$)XY6B(CG<6h;58)Xhphy-!ChVH7`Ji~k5%SHiqq1^^UP);1lGlIixE5R7
z%oW<)Z)H!l@b#r4Jr@j!!0OS47*-hJ6M;;&pq>-wd?^-(_ig9Jz&lemvdhyx12gY>
zpO~H6t$mkCP?KEHvms|sc3^xHiKO&H1h-(*7>5^IPdIfU2c-oN7lRKVOcF?bO@(ZK
ztD|)X1VE0cN-e>rN|AeMhD{e26PX$maa3HQ6gi#%464um`iAd5=Nl2ch{W?WHLdG9
zQLkB|)wib^iWVJg`(+IeP(j#1G6E*(66=|eGA;FVi;vgt)H+M^SxyMdDcLD!ZGS=!
z*XC0ngO~?`JJx~7Np*e|O^N1Am*Lp@$WO&KMdo4#rOAJk1u%si0gUjbS=OB`2?}Lj
za<WX1HczojcN^-M5IocA_b|sM=7P$cWw5}x$g<Z3+DGWioiqx^7o)2E1egP~<oFF&
zaAe0`L}rqZ)D8v2TxcEg`6i&k6So!eAfP$LQ})92-c`(XE{WCoq7sB^l{7bcU&3j4
z@!YigoAn#NIpnc6y%GuV40FcehDVP>7eITM_04Wso{+kRGnQ=-9ZdCaNXU8w8Wam^
zFaFwn{fxNVy#7DLy#-tx%eF5(xVr?`A-KCsu)!rru;3Eh-6dF%f#B{ITmuOn+%33k
zf=hq^`G)Mh&%W=R{mwb}d-tA9*RQ8~RZp#duUcKTx~gX_bVme}@R891e%21yP5+dn
zZWIg*$on^_5O*=qkD=HAm_H!@u=>w$cRB;S93b*Z*)1>#_;+cx=aHE3p9l5G(K{7L
z3IZ+<@NoPCE)T81xK1Eg`BwnDiv-5I1LHx!)PI1*#QL;W5eW<u{S~;rqk};OVA%pN
z{U5C;Z}FSt;#^>7K@?E~z+VCD2VnTA#G@9)$qqyIkI5a+m-J_5-E?697^hwEOBC!O
zZh)Z{qTHfzlfS{DaRG}NKjL$ij6;Ip6H@yn`gJ5(5jOw?OB4kB220!qg6SP3FCq2_
z4g?G+{U!PpL9K?p1y+0&U;4A{K$MSYGz-8WwzHqGz{mx^LchKN!8a(REW>Atra#3)
zF$mfMM?fIbJpBz8h=B7~;93TYNd~{p$a`iA=6@7eXg?45IV=JQ7@qog2uaAlM7<<H
z>{Jl;vX)?3Lu^RKo;pc(8XEx!e)c;ou+lG4FAy*$9)jSB6Nse`cMA-v4?+Saf!e@g
zB)>@u41$<0|M~3{2o_gLlg*6;0c+<`ut8Mn5Shsso`E>jel{W)M7{c-M+FHU36V-F
z?Ox^pkfje8TnY?PDgcAvLqI^uf#2IPqUu-R;($m+_Jtb=7!ScA0|a{mYeCRhM!*D!
zhW!*+nsxhs9@qW;@7%$xkC`)B%y4ZkY~?Mm*w^1sfn8Vr^Qe9R&P{)3FFOs%Kx~Rw
zP{&&TCot$~?N4EWWnX{!6}XmuhXtbMfDGIiKrj{r=+i%lk0P96{S~-&ev=9am=4Lv
zDuY3|av<Kv?o8=-K}L}NCt;mE!ts0*$77Po0E2iT{X}-zs@Nk%xB=<6BI*AmCe20L
z#)X34A%S4>K)~upFwA9-dq^Y+p`S(7kj1M1{C0=^69fdo76@28@SAiV_X)wpwLgmv
ze#w}4`Uk8y8|UXQ{)7cq_~`UlL|gl7O!}KYp<vVhnFoUi`Ewr+eSeinzXf6bmnqF!
zXcB_!$*+25ob>r?T=5aK-Gq3b#DCE<<AYT?#s5WOU?oNba|q~PVst(9c;o#PnAl|V
zAN^S1i*AFTSOb3U|MR`XBgY4+2>de$e}&u~O1j@PEjHPy?;-IIt)uuQ&y0`I#DQ^-
z_vP*+=;?sfqwoT7QNgm2EI*|MISh^cH6nw6l7+zGK7#;x^=KZ(E%re6Q9F+q9}}$q
zuK@-zCZ0}$Xb&DyKtn_J0zcu%Zeu@EfN{<cUwFT5*aA=g3C8pPVmQA0f4W`JLBOB^
zAjZHW`?MAySW)*;J|N)Y&plYOVCpwKCn^J_?GJdjjSi4u2^-=l|F<prcjou8kblqq
zv90SRMF4U9|E*`uRA9UoFahal9*7cKIs^>DRQrvw!y^bV2n_yx6uic%hw{G^y+`OL
ze*j?n6-<xiNbP-3Es%oQa3^W~0hpkt4hNVW{9CdBg5}r25~i6*K-mGRNf1!;H<lpW
zpS&r~{^)>?#IjQTr+)xWnTh>x&$N7%Qb&VlELgrW=&1R^am)Mw;G4$q6DF7Zaozvy
z`#}vvoFv-}76!)KnuZMkGY2S?AomL)@MPfeN>f08n~}QS_}&e1=MHgq{HgHOnZ!2f
z*7PlgMm7u8hLuz#cU<t@YbQS7Q-l0}#_hMVhdW4{f}V27dVv)h!1lm+1Yjy05X@Zx
zR{bemh~WRIWa{la?ma}*M>FAL`NPH-p&XV%laS!Ym$8K|h~NePZ^r#w51&P%{y6`i
zeP05#1|BcS2}D&Z+Xj|@4koPt%etw7j2@d5V&4DWqz~uc^2jeS$v=P}Yl{w1Sxo7b
ziS)c^m}N;kI?=KE0a$)P9V33Bll{-Q{ZZEEV+91$QaV9cSWsevSRouIK~$dyC~6@T
zNLOU_yK1~=Ex`E!_+q=#4Iy;fW|Q10jh{bTzRi{ltV*)UUA$kH&u#pM@ozq14@W?*
zC?z8G@w$RRKsnIUvH@U-H!$Awk!hT%=^yY8{TBbo{^Pg*Bgy^;VD+c}iywgYe>~;;
zKa&2M0s-_WdQ&h6!-*OA=M1P+0fY{gdH7qC|Mk!R_oxq#0OIB`yFe6;(n8>8rg1+T
zCJ@B+2n>Xp{PKT~_g~liQzDPdpP7d39+(b5fk8ZA-$!b^H*n)8I<S=J-~aY#{(_SH
zk=Wh*_eFmk(?a^A)xA>4*zNxZ>Hq$H0$J|>kPJXXKvg6=8bC<(2?WHDt$V~JTMy|e
zeoE(Wy~CgNsKfPN`S0GL@II{mNrYtEAw36HTbK|D&StLYpC$h~2btf2G|<n<35x+>
zJSWip5yCnc_IC*XpgH#nT@v%l=5QM`*##Z$ep656Ip2!TQqndYHPE@E|7(W-^^Bg!
z%M??A>^lh|TwUS_3cw&ls=rNn{oZH%`IAemNF$>h9ArN<OR?8{7ggIrwk8i!hbPKs
zXEi$Nf1da6<R&4!LBN+nP^8C@3{4EE1|Ebw1tN5Mq{Bl0F&_L`)inKnXp%o$V=B6i
zn&al=`#Vd4*t=Z)qlPOh|0~Fi{O@n~KUss}wK+H+F~sQu-^?a34p7xX=;Cq5h8O=>
zm3rUK6G@i{A43aF<>Mu}FV*C7B5#v4s-Xo@j2-@4Eq?#V@{be%mRkdZ_?RJcjS&zc
zzcxsg^Y58I4iTx_BFR^x!KXW{<uQzvJ;M7x00%6xI;6n&-eG@#{y#r{w9NiUG<hu)
zzu6oiybz*@07MpJfB*Au8292wuapOo(feY^Z&cX6hrvVsR95=LgdG<w+DrcTr~mU~
z>_3?U$7_thxIeK3Z$V77E=ZBA|3ClvUzJ{i&;N@2-=W<NKw!W=0ssLMrGU_~GqsR8
zf$3?;q26QBUvvcjy84IzmR9_AeUQZk5LNcK3J8Qp^T8b$CgLGM6Ad|x-+zSs552=*
zSM$F?T>{G<^?{N-AjqUm!Ll}B*@OFbrbnQ<rqLkkynpCB{x?AUb)DECLOX~izuf|Z
zAb@BeG5wYxDA7%`SN{hZ=C2w5E9xDH7BbF&Wd%7vKxhzf^u-^*Kr~LWo?y|x=y(2A
zmH$)a_rSM5WfTtC`)q-IP5&mf01%C|Y{#$EwD|a+a>CyNgU-P=f0NlCcGfS`wEM}Y
z1@Qw<i$TJWyOawP_HQBsgF?Wv3fliTg#Ayo*1xLf2(rB9e36(8q#b~aX!ZXE7<H{|
zFuv3OuMX{BG5z<-=c%1QO0`-`VDA6YkUv!~0YnK8;`)c-@87HT|NX2p$Z{VQ1BePN
z`}M!b>nBKbQ&tf0^)J)2X~-(pPe>FTKLzz);PHV=fnX$2h}WH`SdjO4pkSdPK6f5J
z5c3w|b%!03f>NB#NKDm1#nCV@zVoNQ9mpA?n0NjOx6^QVHLKE5-fgV2sk1{Ij-vk4
z3UY?Cw2SaJqRii{Sw2q4KWnzy<M~VinROym&ZD0k4fMgBtj~4Oe^9}@Wl-5($ad16
zk(=Fh65|wSbj~cwec_*xJA~J>9UjODFiboV(=x{`qK_EBhQS!Hy0SLDdx_B}o)S|p
z>U6x8@l@52TeTBP|C-}Xe^4wA)?GAnsfs1D%%HVHpMm%*De)P-G*KdgJ}UG>RZ`CK
zCzwzcY4y5x`a=v2B^z+ncT}EFX);9PRbJV~&v45#Jb6&Dsp|=}L5<;d7Z>wUO0h^m
zfazqg34FK<p(?le>K0IhPA0TrY$O`D^BI$vRhMrR;-u_>qp+dc+<HSFwYVp_8>=fe
z;+0;~*`1&#McFpWT~KaaVhrb(=h!Jt1VP?HxKhc|qZvh`52OsVCjH6XFrJu9Co?@Y
zDs)v5#?R-rpd)HOM~uM_af_)FC!Vwwn*lbZP{&;PHhAd)bklZ*#<;2{H7Hr!s`9X&
zJlhmTb%I%Nc^eIbQP&MmsS6*3m=R5E@62><=5YswkshiKq|DfL@mpfWBS!fb>UB9-
znXy#8J_|gb?F-t_sDUwA%Tz;o1?TgM()IeZu9ZDovVD-*+-v7dp8oCGCcn{>O&7}C
zcb}4VO$Ok&8PI}J-AIqqg43@zqhi|03|E5GaSmkGL!d0e(=7;0JklKs37n>BpV{Qw
z45=?5=CWs@4utix0P^jm(FNHRyq8NXuXm>TUej(ix6usIk6fZa8)nY)aQ3kB_X$Sp
z;_QWu%W#>!^<BuJkK7_5Iqpy4+A8!unJ;n9TW3FZX7h0;GQM+v5)Q{6Kdx*Jx005*
z=d`5ojSYr4d=aN2fP{!**SX}JI7W3PJ;(_Ip0eZ+k&bw2_$4)KUo@Ex4Y^uusmyd0
z3Lr>)U7kLBTkuUt>5RNAeCw(U<9TU9$Byw0p#phKnJ8oYrmD)GJ36jdotElB0H13=
zXJ~Y>z@#d@?iz02sbZ+Zi6xyVDUlt)4Laq}CNJ`*gG)SJa|xzFb*AC(FG8kAYASqq
zE8a40M21dlK(F@AByaJ>(uPaKCgSq$q()Gz(uRz&Q9#Lz5tx+dP4n9K&BTH?vM423
zpq5IO@V`Y$eak}~ZI)PrBNHrjKSk>*+Gyxv_s4P|Qvm?rOt#9Glsv+y*J>fL;|^F=
z6xUHz*TjdPq*QQZ4BgA$D~0fr8MC}XHiiT2Ky{x;y_49r-=MXXhZOzQrljJNA^RNb
z>vrL{Wf`jT?L1YwYYi4EbxfA+NIyVPp4fv(&W*59?2>vVpzhVI1&}3XwX@|3b|s+s
zH9HHX(={UhU5Hh4iJuhBumpW1b9cC5ORR!=XZDr?!b$W~RV+uqi(Q@Vz~_Dei2Yd+
zdjV|z_}H6H6lMJ{JZ0!k-n0XE{MUkVW-G4?!Yz6b2N@%VShoZ9$iXV_-?4t*e^$>C
zX-p%Y5_ANkBk32SW=@T8X4F&SIzp7e#N@v=zC+VvwwH99bek0}OWHwjS2QRw>cWok
z9?BSD2{F$=LE`!edvxg~{bd0YR$rfZ5;Z*}4>@9WkRi`z+z_JFj)jFew(~|vY{t^V
zhH29AN~uiwRAl~Soz5JIv|u~<vJeuKqj^B2_-SC=jTm#vw=+E1Ub8IZZRH;L&u_3F
z3<)4UZ!^gOdPs>AP$^Jv_MD`QO}W4~xY(&<3>mbn{T|s>@a701Bk!qx0Q`go`9s$>
zEczQ#?J=vuJv~7?SWcrNoYDMdUPx+7?_gs4Ew4Njsquo_;A)IHWzq}jwl{UQQ_QLS
zQ=nt{(o8;@`S?h@^kJ<lM(Kf)iAhqwq`ys>OjVvP{&Is`n_U&!=L!k&q|#Y?2Tz)L
z=g7F~4}A}Airgkh^6WugyQZLz*)>^r`1C?<{(QL@vpADsKIJWoi}fLK%v>Hi52_&?
zchPu?=1_3Ma{^CJtMsAKIJgghsPWh2!iD)dBdD_xIh5E7Wm0i;E)v0Fxf4Vf`zps)
zwD2+44R(vo9}Wn^VCuqCS<y(S-v{9OaB%f#$o&8y&~%;$z}wxL&)etA<0x4;I{yH?
zr<iRRiB%X(Gg6<zQioojj&S9GPpuz;(U$a@;Oi@*Dpo)$1aoy^QWDtW%!z)^aE#AN
zfkvC&r_yvm?(#Cn%_<GF3s5Ia>@1>>vZIrG7{D)FStF=`eKrhZzF5kK7V9$MA^5ga
z2{d4{MFaCOv{z%$AAd3%mgR*^7xQes`~vp{TIR(_ZM%|*ltQiX$}nUOH7P^+`K4SD
zS~3$?-mP{uT1zB~p<yT2kmX2`Rgig%xvjP42Eak-)d$o~fM#c#f^@~#w-;hu3i+_|
zlw@lfoVfA~c$1xEve2n!HO$WNLo}i0XzU6)aB^9t2jQs?gUl#x%Q;P^25JD+`o-N<
z(^cYnJ=!3hCU+z@GBRjGp0-gc2Qr^2gl=_Zov6BIZsG*Vj|6%|-==uFBP53+RK)U%
z388GQyz&Li{lA%n?>M%rGL=d)ppj}D`QQXfwhJKs0n{X~Q0KL;yxNW}yF#mZd2ik(
zRj+WGs#TPXIrp31V3sEAK?|fu$*~?n+(8GZv$a+S+md0Y$}RU-l|)9UHKG_Gy|934
zd`o1~Ih{C#leE~2r#{LoWwK6{N0={$-{<z}xfqwF#D<{jaglAyI#a3IWnn8GwXpLX
zddS$r9u12(ZL9LVFN=U<wkiRp5=CRaYw1sL(IXX9dRXw4Xh{kS#;I<j^y%UzG7*tR
zB*&m`>;fp$dS9+ycFO^)uUY-?4y5Dn^?Sa;t0D(=XWsB8dN4Gu9na8N3ULf<Xet(U
zp;eNZVngnWprdf;H>itPx}>VGs<~0d<!<g1wKE{7LfsrVrS0@q(eHWqM_NZ(#|p+;
z9LY}WQMSW6YSn3dJmKY7E5Th&{Il;~5koWYz~OOPMIr+mtxZo><+U)bxcY|G;rUk*
z!uS(;=Wu%qr&3?GylmEsFc|I@xlrhf@cRK!JfdwOFBO1&LIY4;+md=`*<zPXMhjJG
z`@M^}akKxxL;sTZo#v7imiGB1qVQ9sbE-VVZ#gK&RjQ<zy+lxr0w0<hv-Xc5DJE$)
zZE4I!Aj;WD+2tD~NwkYEsV_6ZhgSqRcViuKiEnu4(mZ><fw5G9s&!zPvdfNKuk6AI
z`Vyzd_I1$O88<j51!bv*1+U_pyjplg_=Z$BNs;DwWyPyuXJ$F?oR?+q^EFLU7;1qH
zS$q4I&~?kgQ_I4WY4vt|N|WBjR>U#n(?oVEsQLXi+HaCKQPO9og5NGrx-CJcph}tp
zaP46faLocL(YmuclnEIu!w1dC3_$!4)sE=+6l{`ukW~^px4}iGs;=_I6SQzrg8ykP
zL%KOH%5GoK|7i;%^l*<M^w>a4Hp3U&WSgF*H*5Gk8^-4RGnUOu5|PV+Pw1=Rs+(^{
zrlBl)KIUg47BM!V^CcahhH|7T6sglE4w^k?1cXX`#5&;83P=0bwWB**lYDywC!EB0
zb}i(zhCBxaJ~t;~WPa{^X3~U49-&;75DK}Yl_fQ$Lt)11%U%JAqx*tVl`>2>$}(h5
z*q(-|%)jR1Fdyd69hZD3)e-E9c|hgx1E5emSXNfXJC@YmT$#c<I-H9$MG8C$G6$HL
zkvrZ{Xc713381e~Ib`W*@S#OX^(7(0+<dqK6zN=|1}?GNwnUnqV8<nm+gQLYZ7FAw
zs{tJ3^bJDjGoiRjUA+KSFZKepGv0ckq3+dVMpA{D8^t=(R~?s&ST`#?!L(24mxdLy
zJV{3quYDVz*$J1$hTr2hc(-eYn@qmzJ}yguWfyeJ3=&pdFO4*v$S$2w*6VY`EJCb?
z4o^}i&m*<D6t9GOF2)~sn+dejx2&F~>0?9pGy+gw%6nM(%igO-k|<E8XbIIm<iJO@
zs~1IG(zUD4z<-bkab#f(Qyp_DEJNnFD)~ITnF6h6CK*&RWMHgP)8kAZG~pNw$k_{`
z{Wdc<7LWYA=h_i*1Go8U>=Ul%hgx0Km$3LAVvD5bg2Z`wKLDAl(i;>jk=!H+xC3xy
zc#=DmzSZI4PL3fa+NDotJy`Lhk~is7pi>PM)Y*0TQ%u=wGGsV$b(kYOdbX(POtBGp
zsNJ!%`4>W8Dn!5yT5w@hTV+#RMbCDPivc9Q?a_5xQq)`8rbZ}=u6l|<S@5gDuw$Z=
z+U1ds<wO?yz&UsvJl~c}ZmPxGFsE4IDKRJPVQ9%r*E4N_7}~q;lLIo&t<7c2dJuGI
zZ^+PMtRl@9@<N6$It;DA#>p%xly9Op_*3!<i)=;jt)jf%7(0>_>4sAe0MuD>G)zs9
z<}JC|>EDs60#s3Tv2=?$@uOlLdU1Ef<-Z?fclFEc^<1V41e>F<!I0V2w=40ELZd<@
z-zMKi_Uaugs^}6f71}3=^zM`Oh|Fe^vPBapYjB>m?x#D0jWec8U3Agws|ZSJAc|zZ
z(1@t<T)Z%(V!SHB8F!#ak{ydt5-Wx}HPU>FCvt9yn8g7IDvM#R;l$OKba2Mvvw-oK
zAXI*iF0E#*v?L`7C7J8gTX13JDw2~Y`Mej-%IN;`+4VE-7S=G`%tu?rOk`VR?M2En
zH<|@@Cf!)VCnN|kazI102+ve1_F-1_d*y^xg~g0G_<G7uM3&IY3S#3p`pl&@_RirH
zwRH6XB$#hF1yhO?pDh<MPji|&k_@Z!q}Gq22E@={ztI&(gXMopnYB^&*`!X+*AhOu
zJBcvg+;Yc^9Ts1bBn>K`efRsdXi#n@6j88QXBue$eawOD9rUa@dwA?LfbJBK&+#xV
zq8f{Y`^mm4;jOZZhHkZh`Z6cSJ6iXA*nP8Q)fdo#>R5W-c|7%l^{t9xYlhSBBVIsf
z5OtO+y9GEpa<io3ev@zfOz(K)s6?=U@+QSXzB;mH4tC#dO2E7LJtWbuwBRS(Lgoyh
zVy_9p440dOgJ`ZSg`zv(QhNmyaYl9aKv^Uzvx^QJ*ik^oVj^?qL~r&7Lza5cT~YVL
zsp}rB5ypz?zjH|}R>QG3x=|#4;tv#|=wLf(iT)Dv{3zNZtmmcCYsfzn-?F71#i;)P
z@V@Sf&bg2(7S@V}VJ8gsIQs!O5yHoJWgu-y4M^(1B#n!0^fsa0Q<{W9?pWX2NTKoh
z0pP@UFEMu&V+m&>*6WtCLRvp<4rUG9iVa!W!LpIM=&`8uTC3KtMuduG{!SE*t6G;B
z$?J?Y+TDWR8q-b-_ojn6a@Pf5(iPlIvK8AI?348bhc|#NRg@RkxmE5<KE$Ig5d$hQ
z>zR@50`%t?Q~tBXVd`Sc-7W$TKDs9y@3Pr-g2GlzBv3AEh>0i=wsu43BkZ2*?pB3V
zC5Ni2(9Cpew5)KxhyG~63kPFKWHJ^8$Tvn(XlOvW_fr<H1%of|U_S~y2Z)VoTt1;}
zAR!lJ>byy5%*nA1Z{Z0l?4i;Z)ORFx=Byo(qhFJUZ7yaZko6jBrnLwn6BU|@9KHLF
zkmr^Ajn@B0=0T}Xg>K>cohQ+IomOHp6DY`YP}(ad;+c<>)H8VeqpETNJbsGGbtawY
z`i++O)5whKMx{9m43O6<xqGB-2U{S`_@=>|YI+0h%nxLUB!)o%eTtGbwI!i>#1|X#
zU>na*z&qMFjD`tEe5BseFK`!!G4T4u>P>Gqak5rNi252;B?Hl8%xtEg^Ci%*a4?TC
zvmZadc`3%EP&Hz6jL)qRa|nd^C|*A~HT*ei0{u8^@?CVt@g@fGE!xVs<l%ta{@Hrt
zJ0&wg4?+{7jDS_;h)g#>e|42v3k^0pO-Z*pq+o}kXNLywpE+wW9m)>5*WP<-D}N`!
zqMz7#CTxISTGOBO92tI<^*bi)y;zjvXA(=UL8{X5Z`4t9fpwv7kZ2&^mE)`uxU%9>
zMKS1cjhbF4w1%g}nC>+>>AoA9(>2gF$lLC&xpj?5r;^fj=4g-{6<il{<p?k{O5fmL
zNhR4xa~OUG#<4zR&YufjCg)u8TbfzZ;%&VDeB3XR5mn~elz1*oac>?9==Xd5fu^OG
zy<kkE&AEXFFxbsIOek%?&kD!Zc)Y-k(}u&tm%QAjg1r}xo~ev!sc$Wq&?Cu1gHm(R
z{MKIf4VPQgx_9R*ZL$el#Mq@sdu96#eua-b9=+lfGcaUnz7)uO<4uZUOgyWwPZO}L
zx&_Y<@iuLmzj2xCe&mZ{-W*sygxwdxA%)gn#)pKKrI#UbE>T*@mTthlzd3;=OXKh9
z7B&m*$+Mc+(9`MB0mt3xHAu6Xh!7B9Cxm3GiHvXfv(TG~HM!Sg5uZB2r*+$yPF<fw
z(T-h5X=T60(lTbV(YdD<)xi`kT!+fXvC78e*qiGDl)S6en-__xyn(V2$GHj~nZMl1
zL34PRVwnpkU>p0yIf?t~=KP&mfM%0>!2;(B0N1fZ%k5>DAGyrjtoorxfIcFp1kR)n
z5vi?7U>Fg?q$wKV+r9g2TJupEyYtB_0tF#;(r6RC{T4P~;azdzQ}outxG%2gy_tEp
z=wUU^gp&lw=**3~p2Xgm&tz|baE7)n_c>59q`oxkb;%|aJXLSjURiOAJ_$h0<4nD(
zn*4l}YM|Ei_55S>_;!_&qS1^`dyL+)vYI)w;0Tl-K^Qji%#FE3LcO4Oc|VknVlLM)
z%rLr&Ewp9&#;Rr|&BAIFafOC1Az3U{O$={7Qop4l>keA-Sgbu=0RW?@@g1RDRo#rp
zE(df<L3;=^ugP35lpT2T!<cp#dHnZt7)y>%-uG<<+I9+o9v(m{myI>+&MBjQ8-Y*m
z^$z^>N}fhzx)Us9tI7`h$+2}^cSr8xCfL%q0&;h|`u$Yv>xK;Uxf8P{WNxCV#mr54
zUMC|I5B|24f_IARO|n`WMG8u__vu9s$X83rP|8-Cd)tE<ohMuTf@3CQrdh9Uy?_uK
zx7|YOnyhyB3f^FItveD!%~BrLWlLq&mAs%WcR4M5<tUE4-=Adh;B)d|`|?xFT$4Tj
z_oF3#OX_Igbq!mzagn=g7D2l{SQS0W6X_0}-e=udE8b-0f@+}`I}_MxF?05H&DZ*3
zwdSNB@_BRz2?m9Bu(J~2#|Lw-Az{<0<|0*ET01RONAl<K_I?0n0D&>c+8=FcirR;9
z+WlT-C3(UGwzf&F-ke}ECpC{>Q)u$3B@8H8fJ)iVL^3CdSbhL3z*U^R>S}Hl=5B^)
z7znP1{#K32L5ew_@*hNJ)~QV9FwS{C@3tH$G#10<&D*74@0u65U*x?;kY=>uzH&K~
zcqXb+uZRDhj9l~egVO11cG4$oO5b3yQ@`#&MP^k;)mr0n2P~ylhM}LY_W{i^J^X}_
zLvjUt8Na&6$XB$OWY^8Q<))FVzJqRkAm5U#y}3Kb`Cy#M$Md3(j&qjA;q&*R!(-0X
zLik+0mjfcn-!TFC9oF}L>Ad&XPk#W~$`1mid^2fX#!5z%)lV8`qCzfX$M|hQwb|kD
z!yde}sm3nX0T&PLOl+BEIkrNjxF~*Oo)~1=D!Vw^7>M0BVm|<+^#}sc7UR3n7YB)o
zWaBzIhA~R&@1}9kz9mV7yX>7zBtYffDinhjQewU(zkcq{BGO+%A5&NDHQM<_5TW8L
z*<WXC=<P2lP+L>dZ*r5A19$34bjST@!hZmSMLiqa0fYDof$Eh$-Qr<iTjBY3$0O$r
z&RI3To$B$7*s5y`Yoht$;T};vm%J7=wH4opfK0j5q!qCqXrOkhwiXnF9=>qE+Kzpk
zc0WU%>Z!B(oEZ*P99z}3akI}YI|d-mKb;(mj5Kqh<g@sCUpUb>y?c{m5@3}0eFTX+
zBZv999EKB*(AYR$Nx3oMrb2Kob*k<K%I6l1tDxB2%tMh}JPH7I@RGj6{==+bWt!2`
zOdENP6^yYvm(X?JmpSF}t@%gFxq)lC?5tsald7Z&zJ}Z`8uhngPUNy?ShrOC!fT}A
zI~6Yp8!#emD|+e*SX@LVHLFDL@N%r5@Z4da42kf);WOu@vK-+!RtA)-0~i=|lWghH
z^2s4F<~QdeMB>?=Df`c58V#c3@TcOI^6@D?!73TOJMP>QqA8PpK2V6mfq!2li6(1d
z=O9iWI8DW`MqDF$;t}jjcVI=BmgqjNkBiTZDrVi@Ag%pDtDceRBGOIVnsd{4*MmDe
zE%`Of#Ova5tHkklF$<YnywWaB83Hr+{Iil%i)S%i>w<fB(R*Wj!c|Qp5uD}TVq8?>
zUs%z#ATx2&Qvx;~k#KcRWRr2(ROSxZeQUaPqv6vO=cZ2k5GND!2u&9f3wefb>Qr(U
zkUA<R?^Shj;ivm@FM=ls%XJ4Wmdv?rj@eQvA}pq7tOdnbX_f2gq=(rjeP9n14T+}b
zx@yjqEF`GquLCsn_PsifO26<pPKPQQR7=+NEy<cMjcAbW*mJRjI!8%%*~43Y5r|*n
zaS1e2RxZ)zk&L^jv`JV!M3bAt06-BWdx>C4^*}sB0mih#0*cHrHW>VM5SdN^2H|t#
zU+7++L*uq%28Y>39WtZ<8D3r9+KWZJduj4Lsb{vjGq?TtDr|acdu`JBBdtKV*6nx2
z1N%*E+8y~O6MNJ}v6%h4JRMAjz0-Z0(!KfUuusEtd%f?R9}qh#uq!6Qx<^hrbwneU
zZ#i2pjNc-!VNcvaau)7;JsPxoH(dTW?HA^0_W%P#VTL@0?7KA5I@GY(K-c#i>!ayb
zC>|dB9u`V3Ub}cOzA#=kI_3d{1(Qo;oH8r&#3pZFyy(kiV?A`N!YTE)3>u-q4mLT)
z$_4A<Fbhh62PB^|32#s<Gc;NW?&nzDIWn9>MFF*m5yPjta|CacZuMrD!c|*KSCwwv
zr#`09lhM9kKU&3Yq4*@;=>yGkLU+Wu8KF6oc>#ZA-z}N6>r48^Je}#d*jI3W^;yM^
z{;<+5tc}WvPD**^MeFCP=~_hv=YTr>ZT(NrJu9rWaPnlvsKT^W;LhXiigullo8R6L
zRt07_eL*DU4O2##s0B-fq&`u9nd8Xx1F+@qz_`cq=1po9GU9saER9i`^47zWGlpQs
z`(_c*&Vg4AYx^Hot5A}+96q42Z9)8enFQ0siw^GI=vl+9Bzz2wLVv=~;652Yg*D!Y
zXXbMXcrR>{*oWcTz1+?gr5Z%9g|G+`+*d1IPjv};B2#q<*Ct%oVeN7V>m{33^Jr1Q
z$#xMasa-s8rm+fH#uye^yfLSi5@MdAf-AEaMAav&Gi?z*Kkt^sw}BJR@4H(;3o6gv
zcD}2mbX%G^TQA(Y@vy!T62X|RU_KwUx|S0X=8w&JgDANB)cMmLsfdzB-scfLA_)|Q
zvekj$y=z#G&yn~Ql)SFD24&<}Lnal(Os99{N$|&cWg>1KGZs63C#tnjICbr?Z5)Gq
zOItIYrw`}~<qCY7qAa+yT1-4wR2-`bcbVb)L^2h}7T)A}?N<b7JA|d#N>9o)4)LQ5
z>v$$msa7iLxFncx>ZS47mlnJ$$qsL_d3U_=Un!gVoXng>`)3%|)1~v)?$o~1(w3Aq
z<avRMKg48l<Zz|R=wglZ7DrK;-^C{CRF`1$c{byY9wy@Jth2p&^33S3800>8LvZzM
z<7QA>bA#S8u{UiT!h-WFpZ2Ez4{;>7_;g~AzA^|?F?;>)PVAWsbr8asc}Cz+*F%i%
z+I|o3$F?lxWS5L9igOF4*ena1rh1*FYv%c;dZjE+72MJALH6m>8PDBeybJBJ5fio1
zqc%)ABhyd)p(XNI1MLO?%pRc%oBcj5guZKjEEqK;U2u9!w(PQJ0F0HKeG<DhXM>=+
zulikPj3O#z(svea_T1r#%IN2m#!8A3eO|bEZAm`CPZ0&KYcNY$UtYKRS&ZCd&7>vF
zlM8YC<m#Q$rLGY7Ru%vnCLGk0GH9#)Xg-){Cv?w0W1bh+s#kDNwvK_}b@Hi7+2CKC
zxDN1+T-RFjyYoFi7cQu1+dB(OLsio;Z-cxYnLhNjs45wam3FB6<-q!hU-6v4j(Sn&
z=@@52Dtbn9*YeJ*iXMIUw@gLcC@O$XtR@=wdd1PDA*sFtHuq7DC4#0Ts=5~n?^8Ud
zT~}iezYgbl9S_O5rDkREBfH%sk&EWx<hQ~lp`-o)AkDHvg0L@|Xp$hKBf2(H!8dG{
z2XEeyH0ImHVM#^k4DX)?A-7UPaVvdU017bpC)AKWMW>$hj}YyNd{-N2_4>4H$8z_~
zp@YPysMSV<{|kGMe4RbUnY+bf2a$U2XIS%fM3&P{#N*YCM6oX-Of>e%D1nuba&^|g
z^?Lr+$(1T1g}MNnT71d3HH<BY<{0n3_cL!wM#G@~wt1YLdPplfJc$;-(~d5>bHbdr
zd!2A6YsE}mcC|M1Rn!mlii9kt@4&s)=Jt%xRxU~sinQ%v;gzSe+525_`mliQu|f0p
zgf&(1Xs24G*SH@&@m)3&J;k%)A=5>M*Q4m4)O18bUYG^Bx_g}%PGiL+^+4XoCopa1
zw;Vgk<mYzKllrim`bB8$MXNG;{9b46wG@i?B=hz*q*F2Gr&>OmdVi5QSAeXzW=tW0
z;lzYr0OX+-xe#~v!!XmFka@BA`bMzEYYCTXY#4^8JtasTIc$oxsoC07vK5-TOwBU!
z3#`(Td}HQ3gMJEcnx8U;85GXbcvj4cLrGGLdYvIO9wQO0;km5+v=u$Bw(NGujWlK@
ze9oY82I<y#gCh!+zD&9sfb%{Y6&7Vxi<=@dqY)-Z`L{~uEX;)Ccc3U@uuk{wwn=hR
z*~vhMXW-_w!PvZosUl_xujgKWhZhm`rn$^uc;v=e(<{|_+?j%$g(2+jfLbP!b2WX;
z%Jy(Gk)2@&D%LaqM20p}h}q0vqrCIWxYDepm{gKox_fX>PO{q@bd9pbio;!dLC?h=
zKyDMR3hv10ifPGArNy>Z+i&#Vt4L8lyd7>9w-b%@*=FP!O3Dsmf|##@N-OvZJki{7
zx=4yqrfU2;9X9JpPGLw<-!j`&Jp!*eCkds6rZ1=f#JP&k*NrUaLp~3?*1u*X%xrrX
z)EGDk#x!+ZAT~j+jr{!D4@TCQfZ(uL^J&TR!!_$r@^)-kp3QU2jvi)#E`bm(%B9RU
zab%b1UbxW}xAUgVHVK+KB`CrVJveB??%MFg`_PWw*)zCG6Y*?uq!?%ec%-RSu(c^{
zjlMZC3G4b{6%F2wHLl4QZ9^CtL^o;s!``Nrjucd#qiI|ewdf8MIM31wzA%wzldRN|
zx5<iHd{4zfWSQA0()k84CLHe|Zz?R_gzw*7n;+^lXCH~Cu73CDs5Cshk`6hHRmS^b
zpCY7H8TL`F%D&Sfg+{broV^cpo(f;Z6FX>mo0_{VqSe>o-;{<aIH)txHX3-9R_J-%
zd{h%}U;(kOegI%|spf{V_9jG+x$>K@Hf-vtI+m}(p4k~$?+((WvClz!?4;Vz<ef3z
zQFM=-Uh%r47Ai};yn0$CO8$u|E!$iWr{?dH0Lx}C;N5n{qAZMaI5I)FNYATs!LHgW
z{vvQ@f~+AMi|1;@hovA416QP}>;cqs@c|W{F%<YAAr0sivK5l#^L@VH3U$>>p49T#
z{i9el5;99-NsW39Z*GEeE6k)ZfKAAugUJWtvDNe;T@&>S)P`OCoSl_w;-(>Xtm5#d
z*KK`G6#}PMV^7sF^m9KLR9g=XQspX>^s@=(+;vvQCNPYMmJ)S9XJt=+6&5Z1?B%as
zeeqCiw12PEJ$0M;y7*EML;1js?EfgvwL>U?MkB{%vz)X?tFlBeiSw%E<x<QUVmCNV
zM@rU$DT+~Av*K}X1EBje6sKa^e55yHpE93fn(K816Sxr?YVyrrNY>3{#)~S>bo$`w
zQC*HuyH!S;B45ztFSoxq1U+Q=0r<>==dagLq-JecU)0ti%vFbxoe<$lcd%F!lVbS6
zMBZWo@@!BN*-%Tl`2;nI+ym&S+@jXTPu9H8B?`F@#o^*Vr&#tWnn3<c!73v3Dty;t
z>`rC!#fI*(m;Bsya2py^$p?7X{Dh)#*ast??)7&bt6pZ8{7hjLU!RE<zgm-C)9S=e
z(HZlDP47uHx8sZ>LOB;M6`dLj{oMB)b^2S>TV)BN+2x|?Mza%~He_7PMNoM5NNm_B
zZmy~d{X+L}m11r^hOC|Sc6dzF%X8Ek&or!ZGlOb5pMHbD)+!Dr&akJWP={<Ld?nI5
zt}xql!sm!^)RQ#bx(=TlxD9nzZo(#osbI}W+}Er=;PsRa=`<vk>(`-06kbForj}JS
zLkVEk%qdE`i4(!1*VH=6MVUfRf#S{NDTilQpiFp3U#2iLTuYeMqepEEC=PSh-zrkC
z&fQgB@7jpc*V@IkdhV~4Fekmps<YNN!#F90zcyQ#*p|%VrJ)~uO*RHUH}cU&A>f9j
zX+1Z>_|i{QX{IAD@dp6sS(tTT*7m80?7r}q9d9-N;tVlf^F_z5p?VQ2mo%uFiBd59
zkRA`;`(Rc^EFEviQWUKlGQK_q$M_pB*gjmg-e+M{t(^1mMETV<lQ@yO+fNf`&P6<|
zJV!vK!Ua#qsdb~xdj;6E6PnA`F@w$Z=twDP=&ZYChTa4Z6hoDyrie$a$Fw0f1!fK5
zq}^>(R^ktZ_KhNsQ&(1Cxxd{k(4T%zu9k;R@b#5GckJB5vpw`aVe@LGg085i)l(~$
z`MrcpJY6tPJO_hT>EKv5P^8ER8D3`+0G%k-(>AYDCtDTFE#b<y8D`{#Vqe(14aWIn
zGLi)3mZ7kP+upiW!s=*$3F)fXllG6Tzo9PpR+ajwt`2CK9yB%%=9R;S`A2sr4<py>
zrzeoN2Hdb>;-Qoh8ZXl6J3{q~>uCHZ85+l&d`9TYcYIDJ&(jjryk&<4gviM50QsR5
zL@(h#A3`oQl1CjCI_n&<@%XO8rj{0kAo38Nn@z8BtHbbH4;E9zCr&{JI`ZiyvSaOa
zYSAv2=<2JmSj)`Pdi}gLm!`2V_tPR#qF|Aa1@b6o0ed3tORcygU6-jmI23E|El(SN
z0QhGMu$Z<-BfWa7a9<)T`lZ;1A0icVZ(|LZ>(d=WS2tBLW^z#aM}*a$!Yu8#`3id!
z`T-(8UuqqTc7K-<`S5ZH=j}!G%xkMin`2mfU(HH*1}`7%Wske~N$<Jgs{&+6^tjI2
zele#HIl7X*4m&V{IPc4bcWg$Z<*c&FA(oAyYZwJiQ4JAKe@Qj1GhT1ttT%_x%PjQl
z7Oq^($!uBV32yX9;eZaCy&s;y&xSnnh%K#uuX`4V#*)G1)2x}!f+es+#3P5JfN-iu
z@P-E!vt<eD7)w=w`t!#OC?XaOA-m4rogs!QV-%uB`W~rQ7i%=FNXuX*WJ7AL4r|-k
zxdT%B3%tBd`KcA_LAY@f!<m8!e->YO^RVXzF{FBPQDfsM7Sb!HRwpN?A8`F0qE+(C
zIgrPFXep3E#iG#)i@vEDGZUfXb28HhYuAvrrX3)qZS^xQ%~gd`;2`P|xZpZwqk*@h
zW1htF<Mn{VQpS4bGUCrdzI8NO-4K{Gpkj@h7oN-fU0j!QK4I<dglGUcKdeB$o6BzF
z4P$93H*I~^;_LSHV<Xs4!}v4t)3WTW_$Sxsl&m1gyBbtqBms00cppL>OS%T0tytsR
zk|oHN9)5qO+Hzxry>-Pjo!K#qu1lo}55SeOw_l*rtom}4aDn}9S}o9E$`w7@NJ=IZ
zff^D8B%O`ua&1MK1g=8L{)#4W0u>(vMGwPjS~CAWE&y4GNS?cUX6nG^RPXp6V}n;7
z@-|X-#Of`1kK{Y;w-ao=%Z*m(6~Y^##zvaWYpG#s(K_RVQJ>r&UY~M=pGYhP&=)}|
zDotqELxJ*#t|Px<B%k(SM{^_^-ik~S?{4U}k3Udn8s=H|KTx;AY~MK`(Ua3Z)~;Kw
z#a5Ux)Kq7knlL`dEnf_++9=G=9;E_f>1(u&SGxl9g5u&5z!RXZUaz6ksgf2)@^buv
z)_?Eu@m};NKrBV!*bVD$m3|nmPWsXXhIjTq0Dv#U_W-s-Tigrm<oE(DwGYjrH_(Vf
zGXR4aRwc6+0wcFkxfW4&)VRjv;{h__>#qX$8F#caHAs%G19B}MNDd|~FN08Mh<f2_
z<X?6%K<=a+--+{$sfyy4xq@%>X*JvJV1j9>r+R9&UA8KCB=vSdt}esu`fH8HodO5R
z>vy%^$}qGh0dyygR7nt@vF~)+Z}ilM@lI2UA<<sH2X{g*OKc3}aU)2tYO@R%n+v2<
zeJ?`6hk14Pyz3f6pJRs>WKq$-5yY0yPAD}%)NsA|G}MNCJLL|23LP)iRZ`$}#9L9Y
zQS^J?x*Ydi{6T6_U>jk;&{`n^5g9Um`7Ck#DNjw>wNe7hGHal*ls@%XvBK#4u$6Sz
zPgt~?c}!<k4rSaMV0EAJ6k6G>WsRvo(*=>cG^lvK(i*0Q%Gd>OW%=t}>O`x_mj;RW
zp=4-;wf6j&v)5vheZl41_~^%i;R7zIqW<qHba%AdslRR8Mf#l7o$=YOAmb05GYEW~
zaszBTGj>-{Lrm{T8j_3bGYLRl$E@z0fjisOA+w)eS4maHJ0duFf4#GS_f{Q2CbV&J
zuddc-h>)SK(i&X1#2Q&GC*iNIZxKdynutAUpNl2KjZ=@znNlUK#KDnkSB+Sh#%LLt
z2x4on@>Wr>8HMkmkGFC(K~|7n?Si9TWU`3_z_IIbEj({cy9PAI(J_0AIlOGAnypP>
zT>NtXUHJ7PH?13?Ac<y_aa+XE7M{1f$^`vvU%a?Yt^h^uJS@JG(fb6!i4(H4I5<=V
zL*b`nM_a_2GI}*`D!JribCKsSw&p}edP_fl#nAK@XTudHZ@@!QXkq^1Blk_=EXOMg
zMz+stzc<cNQYZki$0VQ8t4%;a4rAO_AMEK*QU+IZsLXqvICVBWS&v$F`|MPiPU=F~
zJkPs<GNk6aqR-{ElSz!9#v#ub0!~{F-vm2W5nR2bMKa^8I;p5)=~d6{-Pr2ev$joJ
zau0$%e*H{x&(=n40DSC%qC}EqfRiACmAY432@OZ5q_Xpn%YL%biVe8e{hlj*DdtU@
zA;6K>?X`PFSFrdfEZ@v7-b+!8`f$zMp%WbWy$9v}^Mje8^CG_R_e>_Q5CX@I9JE)i
zf36}v#yW+9fr5wsyI7}2m=unI@wsd@of9XgVh-ynzpWxd0U)c057|=qh4Y^;!$y#O
zpK3<tTi>Guln_*gy5oT~Sf0GSs2qCH4)`uO$7%6qdDDG9ei*0D6C>ME-^}S1)IQ;x
zv@1X5d%+2G&0@XbSC?pp<2rW3r+{f%*viGe6tP~Td(8kiZ5R)_Ac3CFebrU31nn?}
z;i9A;fXaQ~qS}#q^@yYStVx?q(TA@2^RJaG^y_^N;)wKwLC#7+tAnK8Y+nB3Dktz-
ziN*TSu?1E#o-mWI&c+-<!wH|q6j(F9>-oUW8gM!v`#MG*k8YVv87Unl{}?i?4%{o0
zFxCZ3t>j?RAwyG^eLT?=NP^2``{vbp4j(ZqjAZK?O)DoS6#K-Z%rP4(CkCfPv)W3d
z{wQ)^Iilsev{^$ok^d-idGbpniA>^y?=mI2<uB4u@?*g1fjPjwqvZ3~vlS#~q{gsv
zFbo|V7^1+#mfHqyLi5hgeR+(pEED6Wd0)~7GoFy*+$JhWp>Y^~o2!2JGU$`)ilHvx
zT>swCHsoA?jTh9ZbNbz%G}runR=nyA%S{Kjzl!fpy@&k@70Z4^rh}tsrx=}reJf^h
zaPD}3Jt@3UOG+)zN9l1uPM#H_-ahGjEMgj{w}wtIR|uYra-AI~<{AfFUh$41c&cRs
zvAtuLgpx7O%ApLa({rngNm%DARo$gO8Z8>J@6<F)hm9z+Mrev@ymdB+PgF=>_zrrv
znrVL&^FW-<ey3`6&+*Yma`sYlezO*<db?(Q^F1o;oRCS#oE9;>0V>l~xO+3!X~6U*
zX#A8ac&XMS-N#~&_&6onU}kXWWNzF?9ZCf{xIy0_zlO9{g-{cL!t;i<LmZ3AEof7f
z;5(DYNPHI?l2O+OjF$%t<#7m-?3Zb76u2)VbLOF6D%=Y`TQ~8Qi<JoDtve7mCMJ+s
zhto`Jvn9C$MqN<wz(Y;dSSH_jl4$#`MI=lhKM-&L25YK#X7D!H>L-282^4Zj4~=0h
zI}1WHGT>R@#~0xHzf508BL(*NhLvk-OBvN4bmYAej5+&`qq<KB)0>n<j=G0|R4flI
zU~CzI=#as(;$I?Hx61WhP@EZa7=vk<_<mz!=_zBWZ=)z?SkbCvd7c?tc7_irRV(sT
zD4r%R>bd9D&c5|<_pEC9VvD~UfoMpMZjcaO>*hK_0Jq7#4>idJ3V{zZdht~XqS)?%
z549v%NSYxFK%*odeDfRtP_ezE{^S~%pR&t@QSW!5MeTeWIFoPHKeyQYz9XPR)Y9IS
zjzuf}*3&JnFQ$tv`+0K8AyoY5xzypgwk?3pJ6OIW`j;{ZfCa)iw@f9&B|0>~p+?>`
zM(Nj{+BbUr?m~Xq-RdRfWbPRiO~XFdA1TkDP)O;=*}l&~MReJ^7KWxZF@_moTwCfs
zRY5rE#4-sn%VdQm?Z3`~zToj!4$WmF!)^^!bzMTkh7(&_RR2c7_AH5d(V&Ginn>v$
zV}NWD?a1E)RyS1j)HRa~3iO>WpxhjjrCi<WOD(Y8vNo$~f$%Eg8y^iM))0ba8@t^h
zYysE%yY^?WKwyHHXvj$vO;T=YBMG@IK0H*-qK++6a(YB+7lwsf%F8&OwtS;c!3jNw
zY|XZ-MDZ^e-7TEIoRAqw*6?d!U-3|CroU;A#9?~kN)gXG0VaKWJMj9}>l4#ulFP8S
zyA~sWr)c6;Q$qRv23nHoq5Ldr=RvH_EX;A-yNjM86&s*0q0R#ecErdOS%v;Ldi5{i
z#0JI5h5KBG3SZ>{k_$Z*gmuLzU<Wd*`h+J5CNH2>2}-$q$)los(5#iJopJEjdcCeb
za>pNR2qEY+XfHkw+2gxB(h1Fq)HC^7_|?WsCK`VSW&sMj4~ab^l#3gKF*p^Fc~_$y
z>plrcmYpO1{tP_?=KB4R<2!1F14ZgL!tM`Q9kV<hY5>4^pUYe*bkD|1kKmUJVPSbG
z#I$T;)Fv&bFx~Ux*ok(ZUP77$9mSw-o9ifjI<vV?Mk&Z;{yaLx)nb%wkVf9eqpy2`
z!)gu>jfMxk)ZVH&T>4^nfhr!0En2O-FQRy^rRHJdImmv3r%gH~(Zq1M8^KnuXoT05
znmy6C=Hhtv%`M*CHmq4<W!24{BW|lb!X^GuNIL?i4UWvMTT7?+E=fs+?E058!Gfv}
zbflh7w>sQ1an|WM>fT)=_7hABi&urniIgv7*CGRu0Xau$C^;>BXzR7frO!-8t)-1H
zq{EY^abY$!KL@Bqy-~P)vy~K5M3GGEK#GI6&2Uw?;R%TrYHL3n0z0+uR+zZ;W{MT?
zeuIemQ~A&`;z{qNEWZr9fp0e?1e&~zpWx0hGYa-f?_3CSbiN<Kg9u$)u`~~C&@)jA
zk=3bs7UmPE08OkFeosp)k!Ulmi{)z}U^!JWTU*h1u+CuhWf*K4wS}XlW~n5Aro|#`
z+(?(G;$(4_(!1#+ce||m0pq~LWtzKYvm7t$Auoz~sKdPxl|;$;oW~(mh`vi7TU+NB
z;gxX%uX=(@qS{lhm^d`ELc_{kgUs`5z2}s5{-3{gN+pgPd=*HK=QUYNhnff#Ik$m7
ztoYc`G_55siL7p){vkG$6t28oo7(P!;tv3c=E&>%_HV#eSHG(LMTFPu1Vm*uLZpSC
zhO<9@i~UT<;}abphac@c5Q=E~(JR;IOlE<l$;M(fFWCV79{y>)PR%7%n27C!7s9O7
zDHVp@DY`+-VeE^H&~mxYzDCsm7X)KVT^bhoNvoyDt~q4V@5_ecaGeyJ?NH}2d*Qa9
z5XJ6tXD{E^IV9We`o=`SXCFWgSP%<0zII%}YnmMwmozFpeVQ)>;d|7vx2AW~C<&P;
z>t?#h^F49zPkXAz_ku>dbE0@dx_OYlYBMhQxn8{W)2hF+iVfO%yQDxCWdxOXWLMS6
zurDZS(#i4}ad!vD;1K%>{@3^<n`1O(rP+!Q=?~%58pHcr$8`Ah#5LnsWvd}j-At~;
zZg>lLOv|1IpOOawfDZTC6T%~Ze$%z=Ubgt04>5g6S8tOdy~m!sTz<%`spj6xv|+t@
z;uk*JxDcsBrgd_Xs%I~IudWjMzR0`OOhC%hj!3^F7<JRax%z}C(TM6x*B1i}P^AD=
zET^UCu_SFhlrb%kq5rImVg7k7`((QE%;)Gu{%O%UyGT-X?RI9!n4s^yF)^v%%cO8=
zDeNCr67eZugT<U~ri36an=ZUXZv>nV5l6#A$H-aD;a$`dat4kts%3@;f}%S6b;lW7
zgEYZDK4`Yln|d-#V&t9)L3_|z`+-2cZSb^WxF~Y-$KY1w$u;6<iFG@5u=$LPWA)-(
z<(y0b;g%;9Pw}8~d|=%LS?;>$3Wc9sH%~~CD-0oZA#L8K9wcF8Ptuv)b-6H!7E6Q8
zg+hM-r~=0ZLx$pu<*Gu}km;wnbeV7gx62)r%4J-~xs=r>>xmH+-&W!jg)95k3ONW<
zskhZdqFn>NHh5RQ+@0)2wr8n*$5l6G$ro8wUSOhWeCi-mz*M&Okd>!DaRG5JA16RZ
zjT)V#!m@WQ^)4EIJ*ejh%}scSFebdL$ae$bFow^45daVWfuQXBsQ8v!*o^BZR%uk7
z<rm8XBc#fpR8}aH{uP6W#Uck{iS$n#ZS5GP;~GpdF60|l#N{)w6|f|D>)e8pe0;GT
zTh>rPw~{b6l|nZU@x&8UCH2;)mU)qMKNGWXS^3I)4}Y2%4b5_*A-vDJ2!oqyTqyHZ
z9mVn}JCp=z&hi>JwVm+Ya(B)ci0`guG;e*-ob-5^s4dh7;GxkF4sD+xyiqQEYap8&
zVblt6AIM(G<!-dqJ!FXmf!pc>0C4cDSh9OLlb^*;5#O%qhkAos3~n&mD74?xd?28D
zk#G&01qn>VjwPdBhr$LuOHfo(a{3UjF$q&vw0nqi74cp2KF@DL)H1tXd4cv10&krI
zp7yr~MW0l1)s8h-GEPP{{8Ee1Te$-ly!??lzwcCxZu8-pQF$l)ViYi9Y(C1)5@Qpz
zdkOQVBEo%rgI{IwKaw~*ax>0RS;1}f$Yn&4zW{6Yl~?-l?T9Owl+r0yVVyN8zl0`5
zYq7rdSAXW!j>z-!Oq9h*!i#+@pCtk9|7+_j!{P{<br&ZP+=5$h2=2DHCBfYxxQ5`m
zEbfrt?(Xg^i@UqKyAvRn@7!~q^W)z6Io&f|HC6reJEc4}=o*(6(S2R2t@PH*-5l5&
z*q6LlNe`Ho<O?sTMKa4+&Cpr?C^2oG@1MZL<mv#2wIzjwkl!5A^eX-@XjGWo6qo=@
z@>%3KVw^k}qvS6I{{WQuwWZ~4GWoQJ{*#QtPBrl_k+gkN3_W>MX!ejlL%AsW4idYO
z3y(zy_=m%Nm&l`DMi^*%y(o}2=bbmS705jpWl?|ztCVqgqnFyl#*$)kcC7SqH>W}t
zygr3N^Pb3N!hi&LB_FjX+%d%)(|z5{366TZWWNW!musnYH`5!qrm#X|q(ofjzUqS|
zvAi{rx0>EPLLA}nmJ(NGVyF~L2pC9#R*&>N{~-vV`-Arn0B-)vpc5(RC5~c48a*0B
zoyVfdeC;k1@fG|VrM1RhA`cF*hED`=BfdDocQkKEiLWW{oXX|ZWE^dn6-5wFo<+K&
zDK9moMQZ)#1;+%K9X`o?6=@Z#9nE_9%9#3j_C44$+wBuV4<N=JerB&-&$L)YCS1ZP
zGqMn;xd*v`AB##syKm>MA7$}2?*Q$4V?`3Ut6SNDQKv=g8MS0)7r2^Sas5{4O^*iU
zk?u^&1ZVv`C6KIum2ojL&rFwIlrqC9MakVlmvPV5nR;*bEa10kMR{!g-pC1|^x0Y@
zPP%)rmTH>WOGz9+pw?TUm@Z7^9c#$NckFKiKw<M!GwXs(h;pX}qAmZGQ6_2<n_D-H
zWVow^8rkA?@X>xof*v}@*v1np043ZM@=D;1wDrA7-vs<M0$e|>rZL}#7wHN-K~981
z=5+?$KWASXy_!Nw8Vu=$h<iJ;`lq>3oHVD|V#tH7(I&3oPKYl<!gyGrdBV-2+LAoZ
z@IE;dmGK)zmkizXwtgBr<{I~|KAZbyX+DNOD29NO@}2Kp$<<HAfH(@1u9+J7%tmGC
zt?GAMSRZ<sc|2c$<u)o{)wVtoL(-RAfhhPa=9&Pt1)=`xhWTQVAM-+%$<`I4xNU5<
z-g)0+j_$$|H%E@CKSwixeT;q(9Ux!7;g@{LSLk52ByaypJ@akfTz$$>MRV`z)lpd?
zc;?{Aw`MyD*T<M~0q#y(Zog}XjW<*&0@IhbvUV+tBqn;@@%rF{=}W>KpH10wL>RY@
z0mH(`bD%0_KnE}UC5pQ%r4#~}O@~TSvSv4?(hZ%6A984bj3(HsEcF7{F)FLvxXFO7
z$_Ik;qZX-mklR7!g9a<XLMV8QJ@0WH&R8p&JTki>FVXlHG}^aj?zJCglEQ;kemwXF
zH@H=pO>7_J)^OS<y<yw=)u`nN^DNP9X|ER^i{oZ*;u<Dz@^VCyFP{~8S^(>b2ubGG
z$g`?nMCPp%F?kk*NRIkvG7s%-k<9)#UqCD#dZkHja-<%zsRd;7(R`Hw6`PS>%SGTd
zu9Lvg&(dbZ66!5ceP0Uur4c;fKaGLor^l)DSG;c$gn}YMG{Y{-Z1ndw;O=W&G5bCn
zV1@2`NI8ItI@b^PoN<0+j-2ASLNmB3N*;X>a_JJqK7CHI;_fFeN}z+=6z|oA7^`eA
zK;>g`AtiW(PL{h!0kMgu>gBFUxPNSgD9zB^OG+0A8j|4{1_C}9gQ6ggpFA@&Xi~};
zGDG2{v^eg3`MRwlM+W<uU3o-jWtoyD<gWm+8j^4Lan}9T$37GBkVuiA3yGiJp=mdI
zs|;Jzj32VOT7$@^6BukSoXe{G7p5cpKx_JYG~g=TurJ<iR*(<1Ka2REHvx+MvKXtU
zq-m-+1|C09D2yh+f%!mpsW>V_R>g034h7+6)YVEiP6Woj@Gkn{MSl~eo=|Iv42azw
zBUL%p$v=p!BG^ag9fx@;f$F^U_(chJZkfa6w<zof@wYW(06o_mvKdD5wRnlyrO5TH
zor=!})Z01Z{#FI%B7URq`Th*ObfQ=MQX|RyKu!TSS2C+I37G>W&!P&euL32G5?+N^
z^$=q20>Yv@$)Tu6Q_cFc7bnj^b~FmQHnc$JuwjrnS&?_LfEo=L9TxrpZcKuq#A>1G
zbf((p6o?(^t<p=N<L8B+K>Ae1n1!~r)g0yWF6<d}febnY5=F@Mi@t#x<>A+Kd@#aP
zG<4IG53z$AgaX@KOjphy?foXQq9^rb+^h*TscsQycPy`H!2vE(8rRvTAy_*<Z|x}z
zkCL0e{wr7^V%Btj%4g%Kz0?<Aub}v>{SP4LNN&7gEuTBts?5S8dmXu@=6SPD*Ks#8
zcbgK+WBBK&>Ssy-V?Fj!tLQW`m`5<<Jh!v>QSg^=kC1*;cRrt6oinHA9w1n<Zc}HQ
zpG+nlH&%!qn<$(2_#fconW?jdl|ONeH<v6U9eG>N3!E~r(ZGk@$^}Dn83up=({zcq
zJ#61e7W)AKpY}Dx04+oYE;*Ej7AwY)IXc5(7#aM-MEm>i#vhQsis>^Q6L#m?3Z<<r
z9qB+Z=AU0B!W%p|o~q1^5qh<KezV~BPEw?5m%8t?TwEjSAVBh!i9+IEIFCd>J}Y2m
z&ynHW^W_A`BAg03(H?W&^XYU!3iImaNy|PKpmGXtBT5(>${B?ybYHri-gm{{&s+=D
zo_wK=vLXA8d59dES3*z5SkIqT1NoL1^#1prgey~NDt>RDuCztQfF&EBCdpl&OwOR|
zHA(iFd8ngA4PFvcr#Z}~O}U9^`(qwnn2$B~%5<3-iR-U>grZ2cL4B0l@Nj_%%Q@^2
z*?V4DG5W%4oS@Q6nKQ<37MfO4gwT)ek(1>wWCsT=rv%6%(L-2N8oNt$^-r%^iATZ{
z<EKRCD~Fd?S;0PZTUm0l$`c{!59C$mNe7t&I|8o0h5>I(S3ikm-h)1pHh_0x4iZj1
z+Hx&L%W7IPTqN?^spv9os@;G!8wM?Er<Ny8r?5t7fuLCaSK3`a2zJBPn%dFOp(LtP
zKVV~=rly7=86UPX(lE=BD9<=2=SgoCgdXK}oXvpbW@5pGSC)Y+gG}l`-bXz^pZZ>3
zkaG$R+;lz9)(G$r5ze=*`=N~7VyQD1@<{zH**uvfvqM!2Bw4d896amUOd|PNtcEQX
zC7@}hXQAeOqYAJu;O8$4{g<>2Rhy44^i%Bw(=-(BQoo|nmA87S+55Y=6(VQgE0lIj
z_{DZ%T}QQ2;_+wIOZLeM<c-o4sbeUFCr^?pqzpO=PL(VLHnfM3vxl-Uu)^yqAM7D3
zI_d9QZd=1LieU+;U`koR&M?J=^C%yF{BNn(-J}=owJ171O*lMxi89Q8?hYAW2t?2o
zo5X6zyVd@w41ix6gcQi!StzO@gvz6q&l!F1N4Q>8BI#z22dA^Y;ZIm>wiwknpbj8u
z;GmWfdX`VZfM_j&HUZ>FzvtSWs9?UWa9*wEg-$nKC7}+(O3zzP+5`}m#d_zyr`fCs
z`U#J=3*I>rAUs00Ekdujm!Etr{#WcsE{Vg_|G}`qm<sgV!UHEu1y2VxkK-9xNt^!w
zc^=U`vNvR-ZnnL<UUS-Ungdt~b_E)wrJr1M65HJ`gWN6A555OQ+gA<p-h#w{N^Tqj
zyqC(0T6TuU(TB!;&ulXS_qsCEoU1qr#9lLDbzm}qSHYuz@Nw6WUuHES4n=OVQCB3U
z^IC9+_}(J0{{bJAT19}H#BT#jTWe$$u~+o^sHECd+WiA+OD{V+Ii=O!6szh>?;XKD
z;0R2~-T;Ur+3XyQHi=?usBhv8X>WgG4)-#A`lQbAls6$9LkOc4t4!?WCR6xx?V$1D
z^RPdk^pKnX-Wc0U0b>t8uQKx`*7iihC<!?fC3EAL+@&YDpQKFklRR12GcG*^VCn0_
z+erRx23`IP25SBb9ml|T0`*;=lVKg}EGDY@#+iyK3?f!il?_*0dE+sGqQE-Yrp48Y
zA5&r1$gI=UI_Ke%={ZXJJ8(<CP*ks){~w*O`7fQ&58|#^2_2J12~D<R)T=s?T3fGO
z{k3CH^S7Jh@CI=+0L7i1rRBY}=*>%!_K7G?&-<C9Ee40?ICaK7786I_`g;{&lhV3~
z7oh*w6$efh&4t{_S1`Vf3pEj!hYztB4DoM<t12>5X1rNwcse)A8TwneCEL(u+H(S9
z!^|v=KBmE|@9L|Y{~#(@L*#$;&hC*gB}(}FimSdIsfL+e<dH{9Prew>8mU~@3P#)_
zBqA~%h;Ur{nkdf)20nYF1qPEE!-^SM2FKUMLOCr+c~rIfkMh~qnQaC>lk(j-zu7oZ
zJ#4Rt_~+#X${l)bn{*yvrVqWv_b-RG>D(tFDbm}^-UMJ{&%NRIG`Y1=x{zWM4u%95
z6IHX^xTH{B4_EK;zgxlqe_s0<S8KR3-fvzQAD$;lp7Ps2%|7M2&m3I!jx=8q2j-oj
z`F+4mYOQJR8TBE#U^UuS3G&AiR3#Rt?~h=A$o8x3P8eCJz9lluYQT2^SHcAZw7nk$
z%Nx}T7Ra7@0^vF9L*{N2bKKWjA3+FZp8~_$jGk8U=P2d?uaxs~Is<1E*uC?;4^Q0Y
zSnLs&Ah<12s%Oa_$)Y<+`RRr7C6^W5vbg}W6k2pl=l;A4CHl<-kF9s~x13#JCXBX0
zrMZtBBi2iH<evnx?n_#s&`ep$dv8p(qBwXx(eD(_qvrGOH<@q`cZYrH$cjH<)?f+H
zEnpy>1VqVk1BIY@2E|t2XfmSeU&iZhyxaau7b>-7>V^1;%-y~+rAg~5W0aG2;&-qt
z@|Lb_Zi$i(Q$;BzkTz}EK8%kUjtEyx{1S!h!J=XBQG&3+9A5Uk(Cg3UKR^AC_$f*$
z?U+)Y2&R3dZX*N+VPohe8?X-VX~TuCBm6|5ab{mw6_bn!E2<Qq@m88<S@kH7R<-!F
zz8J!}yCJFF>4#GIW4LvB3%t@p-_%dm5hEkI-F7xS7mBq;PGhjH&zFhl&d><RDc66f
zn;(x7n<x*OJpn1QmE2VKgM@yqB&@2R6!}Ri!mHo6abj(6th6HP7rUSe59NVGObJmw
z`*QN)M@CA(7ExDrb(<ZHRIhnTz>8TNy24c(t=W>Af)Ee})+5!`Yi5~+r0_E-4SKRw
zDh^?3`j-i^(H~$ti@p`JY05of)W0AtTc^NR)iDhE)F+2&A>Rg)_kq-4tt8hk>!9b<
zG=&REZ5P+eBaGac36@>_PloL;RqFzO`F9z=?15&DpD;hvm9QrD8B0A$<D&N8cAwzp
z%HElk!1L~}1r7GlXUL^>CQP5NcYu>pkXq25C2Obz?iFcvi_NhzS?KCHEvW?Kf&_}e
z>vB@Q<dUZ^16l(*Y5E9%N9zi2Rl<I47DVvuJEVrdD3{!Q%Z)SkpGyC2h_A+YHq)8^
zqKNT+A{c7`7gUvQf~ltDu-WA2S|ew9N{`yS2k2p}&*<IHNmMm&!XD36uT~WyP805@
zb1!wvFAtp8LY!CLbuJ|uY3&=|H%6Q@4-Q<FCgG?~s^tDJhr+7K>+Nf|;nI@MY^(`A
zi%PtNEf3+tE`&Es8wC>g?3MMC0ycm@$cuEL+WVC6wdM-NW1S<!#J(Jp%f=qhd#Sa_
zY*Nk{i_uR0Im5uR{&>d<skl*Cwj1*)I2&b}bCC2{Rn=K~wAJSq{@|63Y96s{$3?dk
zy}^3!R;uy)n!Fh;O{R3gqgEJp>D09|$8ON(V&h|Zk;F^o!ca++bWFvA5^^Ft{c)fB
z!3kagI72bU_?p4VXhP0w{6cdWz?HYc#-ApoeI=!eIIjT{Tp=Jp8pVvPa17ssH&TZ0
zf{BR4D(ei!G;?%5?Yv5GY9}>)tZ0gssd5H{8c*bi%H1nY`~11h`teG)#6&X(bSPQm
zS_Pz`neleNk13QB(%Y5aUhsFpuZXz|{O{EFF$t8(WhDoLK1jhbapbSCXT@4&SIi(H
zLjF^?oSGR+HxSWGTv%yZbr=1c8m<tCw@mJR3e2XIywvUqQk!XfA}f?!pCGZ*krbZ0
zVf3dOy_1l@0LRBFkU1gG;iDRMLbEeUgZKNAvFrJ$3Yq4b5#}uO;}mAlv#RkQ>5;+r
z<8guhWyW2|>^!LS-T7SMq~<|McI14@c~VH@T9}As@I-R;^jGhc%J>IP693GE;1Jfs
z06U95<1T77JoWLKM_5dguQ{4^cjGTM$4Nu-CxZ?_9Nb$U`tpU62-<-<T@3FOQ}kz8
zM@2r~*FuY|_4p`M_&6B0u-X9E%<r8U=Vc|jQ|&F^X^a~(VuXv93oomas-!y-8G3)v
z_s?lo{$FZa%N1qU-P2xd!hnF^Tp}#(Lay;1wQ-JeW<y)`^UUhqJ>CBR%GB9S%Am{P
z;48dF0c13QyZ4tOD*Bdl@WMO{O_=E-!*WspDYz`^!uSZ0eM<yWsntHG?KY}>$FjmV
zqi|)4j%Nlx2El=R!Lw7PQ|YoU!mZTT@w`#4v?^BLg@#WWT6^@t4D;g8<KW%0Y~Pm=
z&OMg>AYC$c^kfj1;37xaX~;A^sdwp{ASN+(dtm^sB5}@AAoK6jwy~(3;J#C5kuOwt
z7UE5oV6$2{_fl8uWh~%k=M?<<&V#Rq=;h%~oBnX+8Hro*wx(w^jo+7O(Ubj}g!L#9
z`s%O?vP->P)RLGYo24z;k%?gwm$Q0bWExl~ymQ!hBXo6%Uj~zF1-_tRPq{8Zk&d&U
z1RN6%yQzGJu3FI|eglGMaMNg`B5b~diOp)^dbi>i5<iN<n(ny!TPN_`ZbX<4u5B_q
z@3`a_Zd#Vbg5;;D;bw{6W{F*@2cE$+Q5oCo#4Vnf#s%C1%z`nTOAlux5!BOk@0n_r
z_n>Ar(%mJA6P1Y87<V^P0wALLr2md*T~>5OLvTsGOzN!*>G<A}n>G{I!h!csyHrB|
z#pu{&QR&Yz+Nwv|gl<D4t6#+<#!f}DX7GJ_|38+||G>=9f$u<!lkKQ`z~zX~GmL$f
zEIe89D%ni+EfY50*c1O1ZO~5oWwKl1r>X+IPe2d4ah<?lZ<Fb$HoQl;<X|NKcGVMd
zj6&d*)Z(qk>uB#}o`j|K>B-l$ERokQhS|KoSk*JrUj;+ILo@d|tx;CXCBGtswOpxB
zYE(`VTEoqlVBh`pb*OTj)}|i(pjSFF_re)FpiE6xF8U|AKcnvU=JtB=F)HJGj(&=p
z?_5(;m<g*&E*fzQC|G%L20<?fMxme9p`SsAFmDr4+zl645?tDbWJ7380_12YPr2!B
zFC>~iubTP?@Yl)R7j~N6L;Q%?U`eJt43qygqxENT)s1=HAl4_ozU?@MA`C04%7F9Q
zo0%S@7J{l<>LwIC>SY&0=@JEDXW(_X7>}rI%x7zehu<{Y@5IN(XI6(W_5Z$vbe-s9
z@(cEff6i=I15o~EOW_+<ATlg!W%Laja39kor_V`1^TP3aPR%(!G=v9(&Sn&4<qq_p
zdmsqPRR&&Q_`ANjX=?H24bK}eCdAfl)@5lsuE#MVcjgR^2jK1+3uGYO%nth%&lGv=
zw)mokJKkM+!kkl|hH;-0szi@IWs7K$1KU{5--rmhpLlwaD`4$MK3qi<{ifm4OlX_b
z#00ez)y<Sjidda0WX;E9u-rZqC4_n@Cal(FF35r;8kmT><&|zueL-&G8}k@r$wCRE
zQb08ol#MRCe*nb4P3zqx1nWmAQA&r%+<vCNvK855^bnPFo_eK7J~JgYj@gHVYoQ=l
zH}`z&1AP14kH~fEE@QD!hcJpSGKI*Y#05W?Qbr6$m*z{#DdqkYKNAdZ*_J!D7a}V@
zBg!No5KjOg)JkM?S|t2-c^gT&Z=3Z{Kcnr(^T%`RsvbTOO(?_IOuVk_uf%3!1bJu_
z)s|Cx2X&mX9ZY*pUQ+7|tRFBAR@vt(2gEQ?^`&yZQ4UTYs%4gWNa5dzHB;0>O5t)3
zrmes{U8J$2Vx6^hLrKCaqAdL@r8AHdm91=e^Z1>f4Y8ZCK{~#4oIAiMm5r!j!v7Z*
zFz4Osh4}2`kB8&<k#2`i(dxPlyG5QBJ%qV?`^U^Kc6V9PVhqI(uS?soJGgv)N<)?T
zOl2%^vP>ElMX#0e*ShSYfE|XFoCs=xEVUL(?OLb%glm;OqhPU)ZB;GFP4$}NxSyKP
z_Nnsf{7FJ@VD@1SZeJHic8ybTe<L`DW0I>K6}$eH>HC<o*1VeL7phmij-D!$8t>6w
z%Uo$a@opG+N&J`L6wv1*#J%7(@wzXYRyf$<H6jg+9R&5?HfpU18QTlr$<;?OGT+aj
zhMUs}DF#Xkbf$TKZ<-^%ZZZ>;@-O|iB92m6enZqv6IS+dXpX-An%D~U@I3=H+ftb;
ze5^;WssETI!kT)uyEG-}HI#+(O9D0;35iUpk{il4z<Q*KW}7J%g2~c;4S7Vkrbhc%
zE6JkYN9l7+F?A~6SFIZ!h&)*~m*n})j;L%l$|ueFgC{?-Jp^7Am4me<HJ2*as<>NX
z;3L+h=*4bC!LeavqWGPO`?~=vJka?0Cwzp5l5ZE1ek=`q;WwJULN!X~Rzk?`=ynE%
zL4{2IEk*SxvNx9Goq}Oz{8W_sX`1M<dwXR?s^utft^)2an1T{;e?Xy2YTuF8DfI%5
zuTx!%@hmxN^LASwd`va$G<lBR1M71j288o-82Kgfk;OkIVvK<lc}l~+IEh|XPnEx}
z(%)?}N~$%OC#XX}CPdAC){(QLH=@xgLL;V#vSi)H=YXM*{Z}DStB`YiGYgN3Lb_IN
z*!L7x1#GDmU=@j!PRYfx(GJ^CHuP~7Xtx4l2^+_Ymr?hKX^KV)3?X%<%`k2=$a23g
zd5XrQAEd73VK+1@=EXnRV{~-U{Qayr{8RM9LQ_`gwpYlwuUDY86yYLOGqBr*z<sAt
zNU2TOI3AbsGU89*GcrLSy&0+o`5ms;GZv2tKz@6Ab5^1nJ)lnWYQS>9dQWee)S*Uh
z=E5<$^@r%66#EAai;TKy8^nHH3p=4UBE7e*DD$%LPcdSQJSNR`TW$9)Sz1NvQS8-I
zQF|eGnD2_p*#x`WE+RX`(PAczPEPV_lBf5hwo-i{ID%J$Q+5_#YH;fX){01BbV>B0
zp_0v;{RL^U$6VwJB<M=-f<{ARVgP^jccgoT$1@omHJ`wd{(Ia)nXi;u)~PeF#-&#I
zs64;F9<y~}UZ<vfEe0W|{*VYGSW@@brWGLfMBs<%zLBT@DhDLr*$g-qVBht_AWWlT
zicZJD=kV+Rrpn6lyk-}Z7Mfam*^=~yi~AZ`K3he^?*|(I7jbP^>bG>BE9zifz%Q6;
zp!4JGZU$X>(dV`|KX#*CDtRLhNyyz``<-hV1?(k^=!X&E`j-X%$8nrx?_xXo9PgQ>
zRK1duKQ*0(I!wrNCMxVYHB#<H?Gr;c=MQ3m2sZJJMAyYrq-_*`j?{f(Jlm~A*`b=4
z3TE`Cye4yNS)eUZhF<cN2?tTE-Up2Imj~qNxqygM+er0$+F*^wN>3dtK*XPIu2bbK
zBdevd$DM}H!j*B!#oVi80$$SGfsAaN_X{RcpCoBBzSpp~c_2<9_vQXJTG#NnU_Y;B
zOM>)3ZLs^<bC@~nW5)^z0v6XY(qs|>Cr$bd>v{HYS%FwHdpVwf=twGJ44|62l?bL3
z{d56f%XXeD+*STW*b4zdh_3tBZ=>x2Dd!CtUW`;)301cG!*WPF)UZu++84&hEd52)
za+>jB;3g()xoj~yC{2_K>wRzUsIjFZ<<r+Y>aVa7!@j%Rn|32jy`SO-oJr90YiZRP
zHUFS7G<EoVGI1J#S2;n@Vx&FtKBv>St*Yg=6VPy`Xjo^?L|mI8x?X=p_UHG)q)i+?
zTKMs3jnGVCGp1<HC1UyHfk#%u*QJ5)y!s49HcWbp<H{_h%}p1pFg-&rhW>46v9g(A
z^<PKksA2X?fq<kOIW#qH&R*!4-_5;x2itrS=Hki_D*oh4zUO`}K<HLHyCX}Bp%ye=
ziCZgowoGLn;}4qjS9h+g`a5l><0t448F6VeN*vZf%K$9+em;I@*&qZ#ym=y0xm27=
z-dIlZ*@TL9?@>lyRfeGaWdJ$VFVz)p5%C@<NR>I2&l1#N6RcGMXmAgWWNd6AoBJQ3
zqc7Y~#F2jbaGd1tN=SigJ4C;|eb&GJQ<tV(cZSgaR%(*CaKR_FD_W4y*!_D_@|SVy
z)#jQg^JZ(0eiYmquMxgI8qQ8#S9pp}oAj4KF4$geut5*aVFtChMkW4biVD#xnQx7X
z8J6WYF6vKt>D>$Es3-`d8CvSWh4<800SFR@aF}8ZrJ&oeZ=4&0;YGEQ2n_>a%KrfN
z@dl3R(5IYw|F)8RNJ?CuVb`-_-$*>cov7j?RmG%6ZbEZN4h%&qwdopqDYaw}w8(!d
zA*!5p4RM6)LWr4{JFLX3!&53Lw;;0@N+DEze48ZktaT?}d5D1)3~L~bQ<kU>og@bV
z0Uwc|5N+tnC63}JR*AV4sP>zFUEjza(t7UvV+uHpf@S*zV2NbkOjgZt>bq8zF5mkE
zB}0#$A^*_C?dcwOEICwm<?zz!<>2%m`A(_+ytyn9Ch`9YYb>|;B)({A?0SHin0*H)
z<`D|=j+RX6N~+32qulmV0mT<J(+ZFZGM}n1)rCw`geD3~Pa;-Vs(m%IHMX?`I4nw7
zC6>|Yn&m#uS9hYp!+x0()FNTLf#;FZU&%_|5`Gvy6_-bg`N)Ay0}by&<j2MhGbQli
zbhmGvhRHecZ-0@&Srz$pvnpt~A|mPRMW$z40rSGiF=G@u61ZDpk&eA$&}+4QYNDG(
zU9Y$DwbaQqB%xdZ+vOzoPF6xXKx~hN8m^)v2`r2&5Xul3go@|^l9Y6#JuBV1D~1Qq
z!-8p7*nN4=uo#D0n*TzklzsH)&VA{^F0%No4!<?QL5Xc@Z!z(571jK|&LY5z=`dO7
zF67%rQLFnMrFwt;t0OG)hDyx>Nu}ui=|^jB;AmYq*KRFs^MOMuTr$<6NEq7BY_At9
z_p2cLpdYq99ZBLmSV_EhV<(}gK?#eDDgfgtU|GMYN}`-l4Q|V77hyni304;!KOm<D
zQ5MLXrGd(peJIq4$|S&OFReALGkDcHb@GyqUof*zci6f3sEcG>=77GFaKgr#9;eb#
z)hOB<*V<UK@+vV)LAz1L1x_x5$3xDwjFY(S^57WXtU5rj^Foy=vVZ0&C6RPWnhH%#
zNF(PDYRhiD$;$m}{FB47)zau>$*S`{=?_c)oK9CdL<LUf1gFs{vDykp1^tmEn}|pr
znBd7>7-ApeR6L@^Sl1EhF22D3F}NAGi-R3gMI%NwvP`cWQHc=9#TD>mc}pf^io;B6
z$l;rImUu@x*TgJNjWgJ+)UD$g8&Or6nni`Mb4I!l)t9@9mEDBG=j?{&yePcavB3SZ
zvq?kMR550B+vkNDpC@TW;~q8awQsN{UUk5I4V-%J3)d(p7qbhsO$7o$*;Tc^5ohmQ
zSiFCk_QwFq>+k}n7B3E_6JrmKbvyO4C&*bmk*IcJ8H3F~0BFV5;Jq>#m&s@q&WA6f
z1u`ECgNE?-qK98yh0=%n>{zOItqI~IYnBs8jh6(a!j@Hud-dX;Nduvdm%R&O3cm0t
z+HG_)+Z{xU!_L&8!d;uWz{S-(;m_>5*&;aHfGwxgx#>k-4LHYm4o63CU}3x<&OZQ#
zdP~z3>L|rbuGWNe0txPMJSG^tcIV*AWX+<l`47M`#Qp3L8YS!A>q3r&H02#@+wbQu
zA!2>AN0!z<>)Vlbw?wvy5nTJjgQh$Nt$US{T2_yi)TJ|vV^Ts5Lo!|Vd8E`1lWInF
zX0tHQwkbQNov%tna!~EL>N5FJn*eDJkgP<H5m*tSp0YyCQxrLONQ#VttTcS-EP7o4
z_pC?uou<_=<=X%Fqf&dM-~Q37qD8m0PGu6SKb{&Fw7nrJf_(IZNMqeH>$`<X1Uvzw
z*D(DHM!XeG#E^)fghMJz7J-!CxA=qcO#mWXXEqmw&HLLzyuyXQy2+FB4ZIbIM`2y}
z&Lc`z@oDLr9*gOwqkxmnM|>!XHUd~S5Li3lo^mN#>fDAufzON&%JVAbgXB@YPwI|f
zxXN=EvU)X|pY`m!6zNM}A?}$DCqi=Wok0)%VLI{BVfDd=umT!<Uz)gQLOyw1AY!DI
z*U1YZxc*HhU?pBFHS>?5?Q{wPUE{*^b$31kKVuDMp|mbcBY(797^+&>#16_VmQt>k
zkx(r1P3|9|qL)71^pMgaEqU9C@@Tau5AxaGpo+xp#F%EJaxj0{HWpS$ibr7;uZplP
zLGWlqxoa`X1obt1L^fX(j91ow@SHnTSS{@P4pJ-I!M$tuO6ltD5P&)1YVIcCIEAyU
zVm<ak)9)(2FbnRs{w9HDsmQXJ^kcB)CixM><xQFk;fnWCI{sU`8yz(92(<N*?m`To
z6E(*`_%nF%CmD9>r&4>Vtp6E_^_z`Reb@}(8QTAde{r;?SfRtSwn(8YZBKnyxjh?J
z=7`-!k`QT=Yf9AnnDqM1F2(XrY;AHVVD6`Yr7=1zf@HOmUsWhr^*5P4n@fh#j~tOV
zS$hSEUz>1Lz4`G#9^H|R2CffSFG}YXO!KU$F)RVY+_K|^yl-aW-Cr;#+M&30Hv=<m
zcBvP}Ift$m<LU+KNKqZV16lggnqz`2G6x`@jW{k8iIL~j5EU63i;ZTU@H`WIT*c;_
zq!K}g;WwV@<Im8k2rOFZN)hB&wXw5&_bQcJ)+boi688avJ200fYDaGZmc$8g5ElXI
z1`Ad3GrdH-iTgn-*^G?x?g`Nm(Kno^UvR&}gTEW>T(Hd}Spsb%>No9S7_9x#;T(>=
z%+O<~mQEk={|u%%#y2w6N!7rHb3N{dWxGd#bz;bOc~{6){Xpb_#FF(b;{l@k08|dZ
zk?;UAqPitj@o%OmbepFQ@E+z=(UhNdIUMHk7~at)-bxe=D=c3Ue7dDHGMpRJ>e$(F
zhqg!Gr2pQhgdMZHBknWfcdxLNoh+kgB0CCJ{V{tZBK+z(iq?GEdAM2thUv{CI(s>~
z0oy4zr727Cmn8x6QwyUciwW7%f<~1~kz|9(H(7?H@8(wPiZ|VeNrQ}^>{7_q9>mKl
zM5K*^#sC<Jbq9mKjvfv@WlUncXWpnG!vL(BDbbSoQB_)Ih*wAdjK7fIkQ582RV3sc
zA^Zf1Kik7a_kGC6&OI1m?P>Uy4ZlKX-C9w%Y18bei$o0{5vWKUyjiZOx<#!d!g=>0
zH^l!R00Ax6g2iH;v|?$8@cBUzrUDm!<PU*r%Y)2PB#ZY$2;G5#`w0(%h63Nzb`jJz
ztwb?|t*_y_FJR1mOcMj+jtB2}@$ygq-vsbhy}RiNjJETK{@2+8Q?XL3yHjo}U`P(Y
z!}UBM21ituMN87vG_*b&L`ob@!0Ie#%v))%Rnc<U?l-2JID$BCcN?HLdmtLnRwSI2
zg)y&LiN_j9d?k^6zMKHcP80Tou*|EvgnY)J!jW`-%V%RQQgBHSQE?N%`a9kkQ|<O0
zvqbkdbb3W>i}PtXj|~01qLXoD?3+VjI4k!$X)kYr!h)Hw=>Cc_+kT4hkcA7emlD`L
zkXfdQzMLQJ!zeo#)mPdG_fwvxTSs}9XfFF(mTWGEdV<}1*no<mukEC+VA-`RxZUA$
z+;9Mk$93T46qm5Rv4OMo!z?=bGA>hks`nnfx*n5a6Qni#1axu%bBuGEu=H=~{{U&2
BXe|H$

literal 0
HcmV?d00001


From 6c8eb9ac38c459c00a9f7d99e5eb7b81afbe4886 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 20 Feb 2026 13:56:11 +0100
Subject: [PATCH 1238/1357] abgabetool dbupdate script check&insert new
 tbl_vorlage entry "PAANoSigAssSM"

---
 .../61164_abgabetool_quality_gates.php            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
index aa955ab07..21b0335da 100644
--- a/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
+++ b/system/dbupdate_3.4/61164_abgabetool_quality_gates.php
@@ -363,6 +363,21 @@ if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzb
 	}
 }
 
+if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'PAANoSigAssSM'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "INSERT INTO public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype)
+				VALUES ('PAANoSigAssSM', 'PAANoSigAssSM', null, 'text/html')
+				ON CONFLICT (vorlage_kurzbz) DO NOTHING;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_vorlage: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>system.tbl_vorlage PAANoSigAssSM hinzugefuegt";
+	}
+}
+
 if($result = $db->db_query("SELECT 1 FROM public.tbl_vorlage WHERE vorlage_kurzbz = 'QualGateNegativ'"))
 {
 	if($db->db_num_rows($result) === 0)

From 1e827fffee84927e71a561cf105c1bf7904ab624 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 24 Feb 2026 15:58:44 +0100
Subject: [PATCH 1239/1357] additional erstbetreuer/zweitbetreuer name parts
 fetch & columns default invisible, columns next/prev termin header filter &
 custom sort func, list header filter for qgate 1/2 status assistenz &
 mitarbeiter, change all "Assessor" and "Assesor" phrasen to "Reviewer"

---
 .../controllers/api/frontend/v1/Abgabe.php    |  10 +-
 .../models/education/Projektarbeit_model.php  |  46 ++++
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |   8 +-
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   4 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 111 +++++++-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  93 ++++++-
 .../Cis/Abgabetool/AbgabetoolStudent.js       |   8 +-
 .../Cis/Abgabetool/DeadlineOverview.js        |   2 +-
 system/phrasesupdate.php                      | 246 +++++++++++++++---
 9 files changed, 450 insertions(+), 78 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index a6390e97d..eb841f050 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -1222,7 +1222,7 @@ class Abgabe extends FHCAPI_Controller
 
 			$email = $this->getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id);
 
-			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
+			if(!$email) $this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
 			
 			$mailres = sendSanchoMail(
 				'ParbeitsbeurteilungEndupload',
@@ -1235,7 +1235,7 @@ class Abgabe extends FHCAPI_Controller
 
 			if(!$mailres)
 			{
-				$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
+				$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
 			}
 
 			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
@@ -1255,14 +1255,14 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$tokenGenRes)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
 						}
 
 						$begutachterMitTokenRetval = getData($this->ProjektbetreuerModel->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id));
 						
 						if (!$begutachterMitTokenRetval && count($begutachterMitTokenRetval) <= 0)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
 						}
 
 						$begutachterMitToken = $begutachterMitTokenRetval[0];
@@ -1296,7 +1296,7 @@ class Abgabe extends FHCAPI_Controller
 
 						if (!$mailres)
 						{
-							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachter'), 'general');
+							$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
 						}
 
 					}
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 5e453056d..3b1ea55e5 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -354,8 +354,10 @@ class Projektarbeit_model extends DB_Model
 				   student_person.nachname as student_nachname,
 				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
 				   betreuer_benutzer.uid as betreuer_benutzer_uid,
+				   betreuer_person.titelpre as betreuer_titelpre,
 				   betreuer_person.vorname as betreuer_vorname,
 				   betreuer_person.nachname as betreuer_nachname,
+				   betreuer_person.titelpost as betreuer_titelpost,
 				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
 				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
 				   lehre.tbl_projektarbeit.sprache               as sprache,
@@ -415,6 +417,50 @@ class Projektarbeit_model extends DB_Model
 					   LIMIT 1
 				   )
 					   as zweitbetreuer_full_name,
+			       (
+					   SELECT titelpre
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpre,
+			       (
+					   SELECT vorname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_vorname,
+			       (
+					   SELECT nachname
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_nachname,
+			       (
+					   SELECT titelpost
+					   FROM public.tbl_person
+								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
+								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
+					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
+						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
+					   LIMIT 1
+				   )
+					   as zweitbetreuer_titelpost,
 			       (
 					   SELECT
 						   COALESCE(tbl_studienplan.orgform_kurzbz,
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index b760f567d..8a41306ba 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -640,7 +640,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4zieldatumv2') )}}</div>
 					<div class="col-8 col-md-9">
 						<VueDatePicker
 							v-model="newTermin.datum"
@@ -698,8 +698,8 @@ export const AbgabeMitarbeiterDetail = {
 				<p> {{getProjektarbeitStudent}}</p>
 				<p> {{getProjektarbeitTitel}}</p>
 				<template v-if="assistenzMode">
-					<p v-if="projektarbeit?.erstbetreuer_full_name"> {{ projektarbeit.betreuerart ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.betreuerart)) : $capitalize( $p.t('abgabetool/c4betreuer') )}}: {{projektarbeit?.erstbetreuer_full_name}}</p>
-					<p v-if="projektarbeit?.zweitbetreuer_full_name"> {{ projektarbeit?.zweitbetreuer_betreuerart_kurzbz ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.zweitbetreuer_betreuerart_kurzbz)) : $capitalize( $p.t('abgabetool/c4zweitbetreuer') )}}: {{projektarbeit?.zweitbetreuer_full_name}}</p>
+					<p v-if="projektarbeit?.erstbetreuer_full_name"> {{ projektarbeit.betreuerart ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.betreuerart)) : $capitalize( $p.t('abgabetool/c4betreuerv2') )}}: {{projektarbeit?.erstbetreuer_full_name}}</p>
+					<p v-if="projektarbeit?.zweitbetreuer_full_name"> {{ projektarbeit?.zweitbetreuer_betreuerart_kurzbz ? $capitalize($p.t('abgabetool/c4betrart' + projektarbeit.zweitbetreuer_betreuerart_kurzbz)) : $capitalize( $p.t('abgabetool/c4zweitbetreuerv2') )}}: {{projektarbeit?.zweitbetreuer_full_name}}</p>
 				</template>
 				<template v-else>
 					<p v-if="projektarbeit?.betreuer"> {{$capitalize($p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz))}}: {{projektarbeit?.betreuer?.first}}</p>
@@ -796,7 +796,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 					<div class="row mt-2">
 						<div class="col-12 col-md-3 align-content-center">
-							<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+							<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatumv2') )}}</div>
 							<div class="row fw-light" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4abgabeuntil2359') )}}</div>
 						</div>
 						<div class="col-12 col-md-9">
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index da3f84047..dff6ecf3a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -334,7 +334,7 @@ export const AbgabeStudentDetail = {
 				<div class="col-8">
 					<p> {{$capitalize( $p.t('person/student') ) }}: {{projektarbeit?.student}}</p>
 					<p> {{$capitalize( $p.t('abgabetool/c4titel') ) }}: {{projektarbeit?.titel}}</p>
-					<p> {{$capitalize( $p.t('abgabetool/c4betreuer') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
+					<p> {{$capitalize( $p.t('abgabetool/c4betreuerv2') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
 				</div>
 				<div class="col-4">
 					<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 
@@ -414,7 +414,7 @@ export const AbgabeStudentDetail = {
 						
 						<div class="row mt-2">
 							<div class="col-12 col-md-3 align-content-center">
-								<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+								<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatumv2') )}}</div>
 								<div class="row fw-light" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4abgabeuntil2359') )}}</div>
 							</div>
 							<div class="col-12 col-md-9">
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 290a3d2ec..65f803862 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -9,6 +9,7 @@ import AbgabeterminStatusLegende from "./StatusLegende.js";
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { splitMailsHelper } from "../../../helpers/EmailHelpers.js"
 import { getDateStyleClass} from "./getDateStyleClass.js";
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export const AbgabetoolAssistenz = {
 	name: "AbgabetoolAssistenz",
@@ -179,7 +180,7 @@ export const AbgabetoolAssistenz = {
 					// 	frozen: true,
 					// 	width: 40
 					// },
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -191,15 +192,41 @@ export const AbgabetoolAssistenz = {
 						 formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true,  formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuer'))), field: 'erstbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuer'))), field: 'zweitbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))), headerFilter: true, field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))), headerFilter: true, field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerv2'))), field: 'erstbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+					
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerTitelPre'))), field: 'betreuer_titelpre', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerVorname'))), field: 'betreuer_vorname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerNachname'))), field: 'betreuer_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4erstbetreuerTitelPost'))), field: 'betreuer_titelpost', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerv2'))), field: 'zweitbetreuer', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerTitelPre'))), field: 'zweitbetreuer_titelpre', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerVorname'))), field: 'zweitbetreuer_vorname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerNachname'))), field: 'zweitbetreuer_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zweitbetreuerTitelPost'))), field: 'zweitbetreuer_titelpost', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1, visible: false},
+
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))),
+						headerFilter: dateFilter,
+						headerFilterFunc: this.headerFilterTerminCol,
+						sorter: this.sortFuncTerminCol,
+						field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), field: 'nextTermin',
+						headerFilter: dateFilter,
+						headerFilterFunc: this.headerFilterTerminCol,
+						sorter: this.sortFuncTerminCol,
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))),
+						headerFilter: 'list',
+						headerFilterParams: { valuesLookup: this.getQGateStatusList },
+						field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))),
+						headerFilter: 'list',
+						headerFilterParams: { valuesLookup: this.getQGateStatusList },
+						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2025_12"
+				persistenceID: "abgabetool_2026_02"
 			},
 			abgabeTableEventHandlers: [
 			{
@@ -220,6 +247,67 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		getQGateStatusList() {
+			return [
+				this.$p.t('abgabetool/c4keinTerminVorhanden'),
+				this.$p.t('abgabetool/c4positivBenotet'),
+				this.$p.t('abgabetool/c4negativBenotet'),
+				this.$p.t('abgabetool/c4notYetGraded'),
+				this.$p.t('abgabetool/c4notSubmitted'),
+				this.$p.t('abgabetool/c4notHappenedYet')
+			]	
+		},
+		sortFuncTerminCol(a, b, aRow, bRow, column, dir, params) {
+			if (a === null || typeof a === "undefined") return 1;
+			if (b === null || typeof b === "undefined") return -1;
+			
+			// try to handle the prev/next interpretation consistently
+			// can only make this wrong UX whise so whatever
+			if(column._column.field == 'prevTermin') {
+				return Math.abs(b.diffMs) - Math.abs(a.diffMs)
+			} else if (column._column.field == 'nextTermin') {
+				return Math.abs(a.diffMs) - Math.abs(b.diffMs)
+			}
+			
+			// just in case someone reuses this
+			return Math.abs(b.diffMs) - Math.abs(a.diffMs) 
+		},
+		headerFilterTerminCol(filterVal, rowVal) {
+			if (!rowVal || !rowVal.luxonDate || !rowVal.luxonDate.isValid) {
+				return false;
+			}
+
+			const rowDate = rowVal.luxonDate;
+
+			const toLuxon = (val) => {
+				if (!val) return null;
+				let dt;
+				if (val instanceof Date) {
+					dt = luxon.DateTime.fromJSDate(val);
+				} else if (typeof val === "string") {
+					dt = luxon.DateTime.fromISO(val);
+				} else { // fallback
+					dt = luxon.DateTime.fromMillis(Number(val));
+				}
+
+				return dt.isValid ? dt : null;
+			};
+
+			const von = toLuxon(filterVal[0]);
+			const bis = toLuxon(filterVal[1]);
+
+			// specific day
+			if (von && !bis) {
+				return rowDate.hasSame(von, "day");
+			}
+
+			// range case
+			if (von && bis) {
+				return rowDate >= von.startOf("day") && rowDate <= bis.endOf("day");
+			}
+
+			return false
+		},
 		sammelMailStudent(param) {
 			
 			const emails = this.selectedData
@@ -389,6 +477,7 @@ export const AbgabetoolAssistenz = {
 				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 
 				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
+				termin.luxonDate = date
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
 
 				if (termin.diffMs < 0) {
@@ -951,7 +1040,7 @@ export const AbgabetoolAssistenz = {
 			
 			if(this.ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER) {
 				menu.push({
-					label: this.$p.t('abgabetool/c4sendEmailBetreuerv2', [this.uniqueBetreuerEmailCount]),
+					label: this.$p.t('abgabetool/c4sendEmailBetreuerv3', [this.uniqueBetreuerEmailCount]),
 					command: this.sammelMailBetreuer
 				})
 			}
@@ -1130,7 +1219,7 @@ export const AbgabetoolAssistenz = {
 			
 				<div class="row mt-2">
 					<div class="col-12 col-md-3 align-content-center">
-						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatumv2') )}}</div>
 					</div>
 					<div class="col-12 col-md-9">
 						<VueDatePicker
@@ -1265,7 +1354,7 @@ export const AbgabetoolAssistenz = {
 				<template #opposite="slotProps">
 					<div class="row g-1">
 						<div class="col-5 fw-semibold text-end">
-							{{ $capitalize($p.t('abgabetool/c4zieldatum')) }}:
+							{{ $capitalize($p.t('abgabetool/c4zieldatumv2')) }}:
 						</div>
 						<div class="col-7">
 							{{ formatDate(slotProps.item.datum) }}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index cc1c40407..67d724ee7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -5,6 +5,7 @@ import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass } from "./getDateStyleClass.js";
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -136,7 +137,7 @@ export const AbgabetoolMitarbeiter = {
 						width: 50,
 						cssClass: 'sticky-col'
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, headerFilter: false, headerSort: false, widthGrow: 1, tooltip: false, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
@@ -145,14 +146,28 @@ export const AbgabetoolMitarbeiter = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerart'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), headerFilter: true, field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), headerFilter: true, field: 'nextTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))), headerFilter: true, field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))), headerFilter: true, field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false}
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerartv2'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), field: 'prevTermin',
+						headerFilter: dateFilter,
+						headerFilterFunc: this.headerFilterTerminCol,
+						sorter: this.sortFuncTerminCol,
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), field: 'nextTermin',
+						headerFilter: dateFilter,
+						headerFilterFunc: this.headerFilterTerminCol,
+						sorter: this.sortFuncTerminCol,
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))),
+						headerFilter: 'list',
+						headerFilterParams: { valuesLookup: this.getQGateStatusList }, 
+						field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))),
+						headerFilter: 'list',
+						headerFilterParams: { valuesLookup: this.getQGateStatusList }, 
+						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false}
 				],
 				persistence: false,
-				persistenceID: 'abgabeTableBetreuer2026-02-18'
+				persistenceID: 'abgabeTableBetreuer2026-02-24'
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -188,6 +203,67 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		getQGateStatusList() {
+			return [
+				this.$p.t('abgabetool/c4keinTerminVorhanden'),
+				this.$p.t('abgabetool/c4positivBenotet'),
+				this.$p.t('abgabetool/c4negativBenotet'),
+				this.$p.t('abgabetool/c4notYetGraded'),
+				this.$p.t('abgabetool/c4notSubmitted'),
+				this.$p.t('abgabetool/c4notHappenedYet')
+			]
+		},
+		sortFuncTerminCol(a, b, aRow, bRow, column, dir, params) {
+			if (a === null || typeof a === "undefined") return 1;
+			if (b === null || typeof b === "undefined") return -1;
+
+			// try to handle the prev/next interpretation consistently
+			// can only make this wrong UX whise so whatever
+			if(column._column.field == 'prevTermin') {
+				return Math.abs(b.diffMs) - Math.abs(a.diffMs)
+			} else if (column._column.field == 'nextTermin') {
+				return Math.abs(a.diffMs) - Math.abs(b.diffMs)
+			}
+
+			// just in case someone reuses this
+			return Math.abs(b.diffMs) - Math.abs(a.diffMs)
+		},
+		headerFilterTerminCol(filterVal, rowVal) {
+			if (!rowVal || !rowVal.luxonDate || !rowVal.luxonDate.isValid) {
+				return false;
+			}
+			
+			const rowDate = rowVal.luxonDate;
+			
+			const toLuxon = (val) => {
+				if (!val) return null;
+				let dt;
+				if (val instanceof Date) {
+					dt = luxon.DateTime.fromJSDate(val);
+				} else if (typeof val === "string") {
+					dt = luxon.DateTime.fromISO(val);
+				} else { // fallback
+					dt = luxon.DateTime.fromMillis(Number(val));
+				}
+
+				return dt.isValid ? dt : null;
+			};
+
+			const von = toLuxon(filterVal[0]);
+			const bis = toLuxon(filterVal[1]);
+
+			// specific day
+			if (von && !bis) {
+				return rowDate.hasSame(von, "day");
+			}
+
+			// range case
+			if (von && bis) {
+				return rowDate >= von.startOf("day") && rowDate <= bis.endOf("day");
+			}
+
+			return false
+		},
 		loadState() {
 			return JSON.parse(localStorage.getItem(this.abgabeTableOptions.persistenceID) || "null");
 		},
@@ -370,6 +446,7 @@ export const AbgabetoolMitarbeiter = {
 				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 
 				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
+				termin.luxonDate = date
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past
 
 				if (termin.diffMs < 0) {
@@ -806,7 +883,7 @@ export const AbgabetoolMitarbeiter = {
 			
 				<div class="row mt-2">
 					<div class="col-12 col-md-3 align-content-center">
-						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatum') )}}</div>
+						<div class="row fw-bold" style="margin-left: 2px">{{$capitalize( $p.t('abgabetool/c4zieldatumv2') )}}</div>
 					</div>
 					<div class="col-12 col-md-9">
 						<VueDatePicker
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index ccdfd6eb2..e8401d309 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -356,11 +356,11 @@ export const AbgabetoolStudent = {
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4beurteilung') )}}</div>
 					<div class="col-8 col-md-9">
 						<button v-if="projektarbeit.beurteilung1" @click="handleDownloadBeurteilung1(projektarbeit)" class="btn btn-primary">
-							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungErstbetreuer') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungErstbetreuerv2') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
 						<a v-else>{{$capitalize( $p.t('abgabetool/c4nobeurteilungVorhanden') )}}</a>
 						<button v-if="projektarbeit.beurteilung2" @click="handleDownloadBeurteilung2(projektarbeit)" class="btn btn-primary" style="margin-left: 4px;">
-							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungZweitbetreuer') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
+							<a> {{$capitalize( $p.t('abgabetool/c4downloadBeurteilungZweitbetreuerv2') )}} <i class="fa fa-file-pdf" style="margin-left:4px; cursor: pointer;"></i></a>
 						</button>
 					</div>
 				</div>
@@ -379,13 +379,13 @@ export const AbgabetoolStudent = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit?.betreuerart_kurzbz ? $capitalize( $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) ) : $capitalize( $p.t('abgabetool/c4betreuer') ) }}</div>
+					<div class="col-4 col-md-3 fw-bold">{{ projektarbeit?.betreuerart_kurzbz ? $capitalize( $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) ) : $capitalize( $p.t('abgabetool/c4betreuerv2') ) }}</div>
 					<div class="col-8 col-md-9">
 						{{ projektarbeit.betreuerart_kurzbz ? projektarbeit.betreuer : '' }}
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuerEmailKontakt') )}}</div>
+					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4betreuerEmailKontaktv2') )}}</div>
 					<div class="col-8 col-md-9">
 						<a :href="getMailLink(projektarbeit)"><i class="fa fa-envelope" style="color:#00649C"></i></a>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 274d94120..1fb2ffada 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -34,7 +34,7 @@ export const DeadlineOverview = {
 				layout: 'fitColumns',
 				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				columns: [
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zieldatum'))), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zieldatumv2'))), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4fixterminv4'))), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabetyp'))), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabekurzbz'))), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e21a167a3..dd02acbba 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -10872,7 +10872,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'First Assessor',
+				'text' => 'First Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -11512,7 +11512,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The second assessor’s assessment has been submitted and is part of the final grade.',
+				'text' => 'The second reviwer’s assessment has been submitted and is part of the final grade.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -11692,7 +11692,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Second Assessor',
+				'text' => 'Second Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -11712,7 +11712,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor',
+				'text' => 'Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12092,7 +12092,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'To assessment of second assessor',
+				'text' => 'To assessment of second reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12112,7 +12112,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The assessment of the second assessor is not available yet.',
+				'text' => 'The assessment of the second reviewer is not available yet.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12192,7 +12192,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Send token to Second Assessor',
+				'text' => 'Send token to Second Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12310,7 +12310,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Sending only possible after completion of assessment by Second Assessor',
+				'text' => 'Sending only possible after completion of assessment by Second Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12550,7 +12550,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor grade',
+				'text' => 'Reviewer grade',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12570,7 +12570,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor',
+				'text' => 'Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12610,7 +12610,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor type',
+				'text' => 'Reviewer type',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -12630,7 +12630,7 @@ Any unusual occurrences
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'secondary assessor',
+				'text' => 'secondary reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43359,7 +43359,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4betreuer',
+		'phrase' => 'c4betreuerv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43370,7 +43370,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Assessor",
+				'text' => "Reviewer",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -43639,7 +43639,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4zieldatum',
+		'phrase' => 'c4zieldatumv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43650,7 +43650,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Target date",
+				'text' => "Deadline",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44190,7 +44190,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor type',
+				'text' => 'Reviewer type',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44955,7 +44955,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4betreuerEmailKontakt',
+		'phrase' => 'c4betreuerEmailKontaktv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -44966,7 +44966,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Email Assessor',
+				'text' => 'Email Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44995,7 +44995,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4downloadBeurteilungErstbetreuer',
+		'phrase' => 'c4downloadBeurteilungErstbetreuerv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45006,7 +45006,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Download evaluation of first assesor',
+				'text' => 'Download evaluation of first reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45015,7 +45015,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4downloadBeurteilungZweitbetreuer',
+		'phrase' => 'c4downloadBeurteilungZweitbetreuerv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45026,7 +45026,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Download evaluation of second assesor',
+				'text' => 'Download evaluation of second reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45450,7 +45450,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4erstbetreuer',
+		'phrase' => 'c4erstbetreuerv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45461,7 +45461,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'First Assessor',
+				'text' => 'First Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45470,7 +45470,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4zweitbetreuer',
+		'phrase' => 'c4zweitbetreuerv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45481,7 +45481,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Second Assessor',
+				'text' => 'Second Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45550,7 +45550,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4sendEmailBetreuerv2',
+		'phrase' => 'c4sendEmailBetreuerv3',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45561,7 +45561,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Send Email to {0} assessors',
+				'text' => 'Send Email to {0} reviewers',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45650,7 +45650,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fehlerMailBegutachter',
+		'phrase' => 'c4fehlerMailBegutachterv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45661,7 +45661,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Error sending E-Mail to first Assessor!',
+				'text' => 'Error sending E-Mail to first Reviewer!',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -45670,7 +45670,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fehlerMailZweitBegutachter',
+		'phrase' => 'c4fehlerMailZweitBegutachterv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -45681,7 +45681,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Error sending E-Mail to second Assessor!',
+				'text' => 'Error sending E-Mail to second Reviewer!',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -46413,6 +46413,166 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4erstbetreuerTitelPre',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ErstbetreuerIn Titel Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First Reviewer Title Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4erstbetreuerVorname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ErstbetreuerIn Vorname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First Reviewer First Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4erstbetreuerNachname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ErstbetreuerIn Nachname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First Reviewer Last Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4erstbetreuerTitelPost',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ErstbetreuerIn Titel Post',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'First Reviewer Title Post',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zweitbetreuerTitelPre',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZweitbetreuerIn Titel Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Second Reviewer Title Pre',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zweitbetreuerVorname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZweitbetreuerIn Vorname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Second Reviewer First Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zweitbetreuerNachname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZweitbetreuerIn Nachname',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Second Reviewer Last Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zweitbetreuerTitelPost',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZweitbetreuerIn Titel Post',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Second Reviewer Title Post',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',
@@ -54221,7 +54381,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'assessor',
+				'text' => 'reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54241,7 +54401,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Assessor',
+				'text' => 'Reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54261,7 +54421,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'assessor type',
+				'text' => 'reviewer type',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54461,7 +54621,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Deleting not possible, assessors were already assigned to this projekt work',
+				'text' => 'Deleting not possible, reviewers were already assigned to this projekt work',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54501,7 +54661,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Invalid project assessors',
+				'text' => 'Invalid project reviewers',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54521,7 +54681,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Deleting not possible, project assessor has a contract already',
+				'text' => 'Deleting not possible, project reviewer has a contract already',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54961,7 +55121,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Edit assessor',
+				'text' => 'Edit reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -54981,7 +55141,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Save assessor',
+				'text' => 'Save reviewer',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -55121,7 +55281,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'project assessor short name',
+				'text' => 'project reviewer short name',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -55161,7 +55321,7 @@ I have been informed that I am under no obligation to consent to the transmissio
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'This project assessor is already assigned',
+				'text' => 'This project reviewer is already assigned',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 7680a5c7732ad84bf69d34dfab50a8679d8f3511 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 24 Feb 2026 17:19:49 +0100
Subject: [PATCH 1240/1357] add bpk to api output if authuser has permission

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 2721bbd6f..8f09b82aa 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -108,6 +108,10 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
 		$this->PrestudentModel->addSelect('p.zugangscode');
+		if($this->permissionlib->isBerechtigt('student/bpk'))
+		{
+			$this->PrestudentModel->addSelect('p.bpk');
+		}
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

From ee0fa9f7d467fba4aeda23e0a0a5d37842148748 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 24 Feb 2026 17:23:50 +0100
Subject: [PATCH 1241/1357] studvw reduce height of elements e.g:  - tabulator
 header filter  - tabulator rows  - form input and select  - primevue
 autocomplete  - primevue tabs

---
 public/css/Studentenverwaltung.css            | 48 ++++++++++--
 .../components/DetailHeader/DetailHeader.js   |  4 +-
 .../Studentenverwaltung/Details/Details.js    | 24 +++---
 .../Studentenverwaltung/Details/Prestudent.js | 74 +++++++++++--------
 .../Details/Prestudent/History.js             |  2 +-
 .../Stv/Studentenverwaltung/List.js           |  4 +-
 .../Stv/Studentenverwaltung/List/Filter.js    |  2 +-
 public/js/components/Tabs.js                  |  3 +-
 8 files changed, 106 insertions(+), 55 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index eb6becc15..5139099c6 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -12,22 +12,22 @@ html {
   font-size: .875em;
 }
 html.fs_xx-small {
-	font-size: .5em;
+	font-size: .625em;
 }
 html.fs_x-small {
-	font-size: .625em;
+	font-size: .6875em;
 }
 html.fs_small {
 	font-size: .75em;
 }
 html.fs_normal {
-  font-size: .875em;
+	font-size: .8125em;
 }
 html.fs_big {
-  font-size: 1em;
+	font-size: .875em;
 }
 html.fs_huge {
-	font-size: 1.125em;
+	font-size: 1em;
 }
 
 #appMenu {
@@ -185,3 +185,41 @@ html.fs_huge {
 .tiny-90 div.tox.tox-tinymce {
 	height: 90% !important;
 }
+
+/* slim begin */
+.stv .form-label {
+	margin-bottom: .15rem;
+}
+
+.stv .form-control,
+.stv .form-select,
+.stv .input-group-text {
+	padding-top: .15rem;
+	padding-bottom: .15rem;
+	line-height: 1.25;
+}
+
+:root {
+	--bs-body-line-height: 1.25;
+}
+
+.stv .tabulator-row .tabulator-cell,
+.stv .tabulator-header-filter input {
+	padding-top: 1px !important;
+	padding-bottom: 1px !important;
+}
+
+.stv .tabulator-row {
+	min-height: 18px;
+}
+
+.stv .btn {
+	--bs-btn-padding-y: 0.15rem;
+	--bs-btn-line-height: 1.25;
+}
+
+.stv .p-button.p-button-icon-only {
+	padding-top: 0;
+	padding-bottom: 0;
+}
+/* slim ende */
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 04c6d1835..caf6492bb 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -112,7 +112,7 @@ export default {
 		}
 	},
 	template: `
-		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-2 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<template v-if="typeHeader==='student'">
 					<div
@@ -122,7 +122,7 @@ export default {
 					>
 						<img
 						  class="d-block rounded"
-						  style="height: 84px;"
+						  style="height: 75px;"
 						  alt="Profilbild"
 						  :src="getFotoSrc(person.foto)"
 						/>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 6ef38674f..3cd314fc1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -164,14 +164,14 @@ export default {
 		this.updateStudent(this.modelValue);
 	},
 	template: `
-	<core-form ref="form" class="stv-details-details" @submit.prevent="save">
+	<core-form ref="form" class="stv-details-details mb-4" @submit.prevent="save">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!changedLength">{{$p.t('ui', 'speichern')}}</button>
 		</div>
-		<fieldset class="overflow-hidden">
+		<fieldset class="overflow-hidden mb-2">
 			<legend>Person</legend>
 			<template v-if="data">
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('person_id')"
 						container-class="col stv-details-details-person_id"
@@ -211,7 +211,7 @@ export default {
  						>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('anrede')"
 						container-class="col stv-details-details-anrede"
@@ -243,7 +243,7 @@ export default {
  						>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('nachname')"
 						container-class="col stv-details-details-nachname"
@@ -286,7 +286,7 @@ export default {
 					</form-input>
 
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('gebdatum')"
 						container-class="col stv-details-details-gebdatum"
@@ -337,7 +337,7 @@ export default {
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 
 					<form-input
 						v-if="!config.hiddenFields.includes('matr_nr')"
@@ -380,7 +380,7 @@ export default {
 						<option v-for="(bezeichnung, key) in familienstaende" :key="key" :value="key">{{bezeichnung}}</option>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('foto')"
 						container-class="col stv-details-details-foto"
@@ -420,16 +420,16 @@ export default {
 				v-if="!config.hideUDFs"
 				@load="udfsLoaded"
 				v-model="data"
-				class="row-cols-3 g-3 mb-3"
+				class="row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1"
 				ci-model="person/person"
 				:pk="{person_id:modelValue.person_id}"
 				>
 			</core-udf>
 		</fieldset>
-		<fieldset v-if="data?.student_uid" class="overflow-hidden">
+		<fieldset v-if="data?.student_uid" class="overflow-hidden mb-2">
 			<legend>{{$p.t('person', 'studentIn')}}</legend>
 			<template v-if="data">
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('student_uid')"
 						container-class="col stv-details-details-student_uid"
@@ -471,7 +471,7 @@ export default {
 						>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('semester')"
 						container-class="col stv-details-details-semester"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index 603e318fb..5f70e4951 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -260,9 +260,9 @@ export default {
 			<div class="position-sticky top-0 z-1">
 				<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 			</div>
-			<fieldset class="overflow-hidden">
+			<fieldset class="overflow-hidden mb-2">
 				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 					v-if="!config.hiddenFields.includes('prestudent_id')"
 						container-class="col stv-details-prestudent-prestudent_id"
@@ -284,7 +284,7 @@ export default {
 						>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgv_code')"
 						container-class="col stv-details-prestudent-zgv_code"
@@ -348,7 +348,7 @@ export default {
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmas_code')"
 						container-class="col stv-details-prestudent-zgvmas_code"
@@ -413,7 +413,7 @@ export default {
 					</form-input>
 				</div>
 				<!--ZGV Doktor-->
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktor_code')"
 						container-class="col stv-details-prestudent-zgvdoktor_code"
@@ -477,11 +477,13 @@ export default {
 						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 					</form-input>
 				</div>
-																
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 g-3 mb-3">
-					<template class="col pt-4 d-flex align-items-center">
+
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
+					<div
+						class="col pt-4 d-flex align-items-center"
+						v-if="!config.hiddenFields.includes('zgv_erfuellt')"
+					>
 						<form-input
-							v-if="!config.hiddenFields.includes('zgv_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgv_erfuellt"
 							:label="$p.t('infocenter', 'zgvErfuellt')"
 							type="checkbox"
@@ -489,10 +491,12 @@ export default {
 							name="zgv_erfuellt"
 							>
 						</form-input>
-					</template>
-					<template class="col pt-4 d-flex align-items-center">
+					</div>
+					<div
+						class="col pt-4 d-flex align-items-center"
+						v-if="!config.hiddenFields.includes('zgvmas_erfuellt')"
+					>
 						<form-input
-							v-if="!config.hiddenFields.includes('zgvmas_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgvmas_erfuellt"
 							:label="$p.t('lehre', 'zgvMasterErfuellt')"
 							type="checkbox"
@@ -500,10 +504,12 @@ export default {
 							name="zgvmas_erfuellt"
 							>
 						</form-input>
-					</template>
-					<template class="col pt-4 d-flex align-items-center">
+					</div>
+					<div
+						class="col pt-4 d-flex align-items-center"
+						v-if="!config.hiddenFields.includes('zgvdoktor_erfuellt')"
+					>
 						<form-input
-							v-if="!config.hiddenFields.includes('zgvdoktor_erfuellt')"
 							container-class="form-check stv-details-prestudent-zgvdoktor_erfuellt"
 							:label="$p.t('lehre', 'zgvDoktorErfuellt')"
 							type="checkbox"
@@ -511,12 +517,12 @@ export default {
 							name="zgvdoktor_erfuellt"
 							>
 						</form-input>
-					</template>
+					</div>
 				</div>
 			</fieldset>
-			<fieldset class="overflow-hidden">
+			<fieldset class="overflow-hidden mb-2">
 				<legend>PrestudentIn</legend>
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('aufmerksamdurch_kurzbz')"
 						container-class="col stv-details-prestudent-aufmerksamdurch_kurzbz"
@@ -551,7 +557,7 @@ export default {
 					</form-input>
 				</div>
 				
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('aufnahmeschluessel')"
 						container-class="col stv-details-prestudent-aufnahmeschluessel"
@@ -563,9 +569,11 @@ export default {
 						>
 					</form-input>
 					
-					<template class="col pt-4 d-flex align-items-center">
+					<div
+						v-if="!config.hiddenFields.includes('facheinschlaegigBerufstaetig')"
+						class="col pt-4 d-flex align-items-center"
+					>
 						<form-input
-							v-if="!config.hiddenFields.includes('facheinschlaegigBerufstaetig')"
 							container-class="form-check stv-details-prestudent-facheinschlaegigBerufstaetig"
 							:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
 							type="checkbox"
@@ -573,7 +581,7 @@ export default {
 							name="facheinschlberuf"
 							>
 						</form-input>
-					</template>
+					</div>
 					
 					<form-input
 						v-if="!config.hiddenFields.includes('standort_code')"
@@ -587,7 +595,7 @@ export default {
 					</form-input>		 
 				</div>
 								
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('studiengang_kz')"
 						container-class="col stv-details-prestudent-studiengang_kz"
@@ -611,7 +619,7 @@ export default {
 					</form-input>
 				</div>
 				
-				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 g-3 mb-3">
+				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-3 gx-3 gy-1 mb-1">
 					<form-input
 						v-if="!config.hiddenFields.includes('anmerkung')"
 						container-class="col stv-details-prestudent-anmerkung"
@@ -623,9 +631,11 @@ export default {
 					</form-input>
 					<div class="col">
 						<div class="row g-3 align-items-center mb-3">
-							<template class="col-12 col-md-6 pt-4 d-flex align-items-center">
+							<div
+								class="col-12 col-md-6 pt-4 d-flex align-items-center"
+								v-if="!config.hiddenFields.includes('bismelden')"
+							>
 								<form-input
-									v-if="!config.hiddenFields.includes('bismelden')"
 									container-class="col form-check stv-details-prestudent-bismelden"
 									:label="$p.t('person', 'bismelden')"
 									type="checkbox"
@@ -634,10 +644,12 @@ export default {
 									:disabled="!hasBismeldenPermission"
 									>
 								</form-input>
-							</template>
-							<template class="col-12 col-md-6 pt-4 d-flex align-items-center">
+							</div>
+							<div
+								class="col-12 col-md-6 pt-4 d-flex align-items-center"
+								v-if="!config.hiddenFields.includes('dual')"
+							>
 								<form-input
-									v-if="!config.hiddenFields.includes('dual')"
 									container-class="col form-check stv-details-prestudent-dual"
 									:label="$p.t('lehre', 'dual')"
 									type="checkbox"
@@ -645,7 +657,7 @@ export default {
 									name="dual"
 									>
 								</form-input>
-							</template>
+							</div>
 						</div>
 					</div>
 					
@@ -677,7 +689,7 @@ export default {
 					v-if="!config.hideUDFs" 
 					@load="udfsLoaded" 
 					v-model="data" 
-					class="row-cols-3 g-3 mb-3" 
+					class="row-cols-3 gx-3 gy-1 mb-1"
 					ci-model="crm/prestudent" 
 					:pk="{prestudent_id:modelValue.prestudent_id}"
 					>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 44b318f5b..15e1c6fa7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -73,7 +73,7 @@ export default{
 		},
 	},
 	template: `
-	<div class="stv-details-prestudent-history h-100 pt-3">
+	<div class="stv-details-prestudent-history h-100">
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 045326ae6..592dd97ba 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -501,8 +501,8 @@ export default {
 				@table-built="translateTabulator"
 			>
 			<template #filter>
-				<div class="card">
-					<div class="card-body">
+				<div class="card mt-2">
+					<div class="card-body p-2">
 						<list-filter @change="updateFilter" />
 					</div>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/List/Filter.js b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
index 0570d8ef2..892593eae 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/Filter.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/Filter.js
@@ -95,7 +95,7 @@ export default {
 			:key="i"
 			v-model="filters[i]"
 			:filter-config="filterConfig"
-			class="mt-3"
+			class="mt-2"
 			@remove="remove(i)"
 		/>
 	</div>`
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 56506bd9d..d96d3b769 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -219,13 +219,14 @@ export default {
 			:scrollable="true"
 			:lazy="true"
 			:activeIndex="calcActiveIndex"
-			:pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll', style: 'flex: 1 1 auto;'}}"
+			:pt="{navContainer:{style: 'flex: 0 0 auto;'}, panelContainer:{class: 'overflow-y-scroll p-2', style: 'flex: 1 1 auto;'}}"
 			@tab-click="handleTabClick"
 		>
 			<tabpanel
 				v-for="tab in tabs"
 				:key="tab.key"
 				:header="tab.title + ((tab.value.showSuffix && tab.value.suffix !== '') ? ' ' + tab.value.suffix : '')"
+				:pt="{headerAction:{class: 'p-2'}}"
 			>
 				<keep-alive>
 					<component

From 379880aef8e67191d8fff2fe77e2340bd0e1a45b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 25 Feb 2026 13:10:30 +0100
Subject: [PATCH 1242/1357] filter paabgabe uploads from newOrChanged job,
 since uploading a file still writes updateamum/updatevon fields -> compare
 student_uid with updatevon; when logging new paabgabe termine insert the
 whole paabgabe object into the logs, not just the result id;

---
 .../controllers/api/frontend/v1/Abgabe.php    | 24 +++++++++++++++++--
 .../controllers/jobs/AbgabetoolJob.php        | 19 ++++++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index eb841f050..d976cea15 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -599,7 +599,18 @@ class Abgabe extends FHCAPI_Controller
 					'insertamum' => date('Y-m-d H:i:s')
 				)
 			);
-			$this->logLib->logInfoDB(array('paabgabe created',$result, getAuthUID(), getAuthPersonId()));
+			$this->logLib->logInfoDB(array('paabgabe created',array(
+				'projektarbeit_id' => $projektarbeit_id,
+				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+				'fixtermin' => $fixtermin,
+				'datum' => $datum,
+				'kurzbz' => $kurzbz,
+				'note' => $note,
+				'beurteilungsnotiz' => $beurteilungsnotiz,
+				'upload_allowed' => $upload_allowed,
+				'insertvon' => getAuthUID(),
+				'insertamum' => date('Y-m-d H:i:s')
+			), getAuthUID(), getAuthPersonId()));
 		} else {
 			// load existing entry of paabgabe and check if note has changed to negativ, to avoid sending when
 			// only notiz has changed.
@@ -773,7 +784,16 @@ class Abgabe extends FHCAPI_Controller
 			$abgaben[]= getData($this->PaabgabeModel->load($dataAbgabe))[0];
 		}
 
-		$this->logLib->logInfoDB(array('serientermin angelegt',$res, getAuthUID(), getAuthPersonId()));
+		$this->logLib->logInfoDB(array('serientermin angelegt',array(
+				'projektarbeit_id' => $projektarbeit_id,
+				'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+				'fixtermin' => $fixtermin,
+				'datum' => $datum,
+				'kurzbz' => $kurzbz,
+				'upload_allowed' => $upload_allowed,
+				'insertvon' => getAuthUID(),
+				'insertamum' => date('Y-m-d H:i:s')
+			), getAuthUID(), getAuthPersonId()));
 
 		$this->terminateWithSuccess($abgaben);
 	}
diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 3e0774538..a053b2472 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -495,11 +495,6 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
-
-		if(count($retval) == 0) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -509,17 +504,29 @@ class AbgabetoolJob extends JOB_Controller
 			if (isset($newOrChangedAbgabe->projektarbeit_id)) {
 				$projektarbeitId = $newOrChangedAbgabe->projektarbeit_id;
 
+				// check if the updatevon field is NOT the same as the student the projektarbeit is assigned to
+				// since uploading a file to a paabgabe is also putting updateamum & updatevon
+				// we have our own "student has uploaded a file" emailjob anyways
+				if($newOrChangedAbgabe->student_uid === $newOrChangedAbgabe->updatevon) {
+					continue;
+				}
+				
 				// If the 'projektarbeit_id' is not yet a key in $projektarbeiten, 
 				// initialize it as an empty array.
 				if (!isset($projektarbeiten[$projektarbeitId])) {
 					$projektarbeiten[$projektarbeitId] = [];
 				}
-
+				
 				// Add the current row to the array associated with its 'projektarbeit_id'.
 				$projektarbeiten[$projektarbeitId][] = $newOrChangedAbgabe;
 			}
 		}
 
+		if(count($projektarbeiten) == 0) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
+
 		// for each projektarbeit fetch their betreuer and save them in their own dictionary to avoid too many mails
 		$betreuerMap = [];
 		forEach($projektarbeiten as $projektarbeit_id => $abgaben) {

From 325c84e6fe3723fb91c2c04ff40411c5893e2290 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 25 Feb 2026 13:31:00 +0100
Subject: [PATCH 1243/1357] phrasen consistency "Short description of the
 submitted file" -> "Short description of the submitted document" + "Type of
 document submitted"

---
 .../js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js   | 4 ++--
 public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js    | 2 +-
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js    | 2 +-
 public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js  | 2 +-
 public/js/components/Cis/Abgabetool/DeadlineOverview.js       | 2 +-
 system/phrasesupdate.php                                      | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 8a41306ba..4c5aa3e66 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -678,7 +678,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 				</div>
 				<div class="row mt-2">
-					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-4 col-md-3 fw-bold align-content-center">{{ $capitalize( $p.t('abgabetool/c4abgabekurzbzv2') )}}</div>
 					<div class="col-8 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="newTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
@@ -858,7 +858,7 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 					
 					<div class="row mt-2">
-						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbzv2') )}}</div>
 						<div class="col-12 col-md-9">
 							<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" class="w-100" rows="1" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index dff6ecf3a..47d30beda 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -455,7 +455,7 @@ export const AbgabeStudentDetail = {
 						</div>
 						
 						<div v-if="termin.kurzbz && termin.kurzbz.length > 0" class="row mt-2">
-							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbzv2') )}}</div>
 							<div class="col-12 col-md-9">
 								<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="1" class="w-100" :disabled="true"></Textarea>
 							</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 65f803862..6f63a8f83 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -1261,7 +1261,7 @@ export const AbgabetoolAssistenz = {
 				</div>
 				
 				<div class="row mt-2">
-					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbzv2') )}}</div>
 					<div class="col-12 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 67d724ee7..3e6ea2e7f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -926,7 +926,7 @@ export const AbgabetoolMitarbeiter = {
 				</div>
 				
 				<div class="row mt-2">
-					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbz') )}}</div>
+					<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabekurzbzv2') )}}</div>
 					<div class="col-12 col-md-9">
 						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="1" class="w-100"></Textarea>
 					</div>
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
index 1fb2ffada..6d0ddd02d 100644
--- a/public/js/components/Cis/Abgabetool/DeadlineOverview.js
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -37,7 +37,7 @@ export const DeadlineOverview = {
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4zieldatumv2'))), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4fixterminv4'))), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabetyp'))), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabekurzbz'))), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4abgabekurzbzv2'))), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('person/studentIn'))), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'semester', formatter: this.centeredTextFormatter, widthGrow: 1}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9c16fd840..131f0ae2b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43740,7 +43740,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4abgabekurzbz',
+		'phrase' => 'c4abgabekurzbzv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -43751,7 +43751,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Short description of the submitted file",
+				'text' => "Short description of the submitted document",
 				'description' => '',
 				'insertvon' => 'system'
 			)

From f1dbc6ab7de80ecfc246751a38b176829392979c Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 25 Feb 2026 14:46:15 +0100
Subject: [PATCH 1244/1357] mc4 vorlage hinzugefuegt

---
 content/student/studentoverlay.js.php                  |  2 ++
 .../Stv/Studentenverwaltung/Details/Archiv.js          | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index f64ed5f91..9ebe73cfe 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3550,9 +3550,11 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredentialzertifikat_1':
 		case 'microcredentialzertifikat_2':
 		case 'microcredentialzertifikat_3':
+		case 'microcredentialzertifikat_4':
 		case 'microcredential_1':
 		case 'microcredential_2':
 		case 'microcredential_3':
+		case 'microcredential_4':
 			xml = 'microcredential.xml.php';
 			break;
 			
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 9f28a51a1..4953fabc0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -74,6 +74,16 @@ export default {
 				],
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
+				],
+				'microcredential.xml.php' : [
+					'microcredentialzertifikat_1',
+					'microcredentialzertifikat_2',
+					'microcredentialzertifikat_3',
+					'microcredentialzertifikat_4',
+					'microcredential_1',
+					'microcredential_2',
+					'microcredential_3',
+					'microcredential_4',
 				]
 			},
 			documentDropdownObject: {}

From 4e2c3f7741b0bfb63d59f17dfca49b01b1198296 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 26 Feb 2026 11:18:27 +0100
Subject: [PATCH 1245/1357] show qgate benotungsstatus of saved note, not
 currently selected note

---
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 27 ++++++++-----------
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |  2 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     |  5 ++++
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  5 ++++
 system/phrasesupdate.php                      |  2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 4c5aa3e66..a39aa364c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -81,9 +81,9 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	methods: {
 		getNoteBezeichnung(termin){
-			if(termin.note?.bezeichnung) {
-				return termin.note?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
-			} else if(termin.bezeichnung?.benotbar === true && !termin.note) {
+			if(termin.noteBackend?.bezeichnung) {
+				return termin.noteBackend?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
+			} else if(termin.bezeichnung?.benotbar === true && !termin.noteBackend) {
 				return this.$capitalize(this.$p.t('abgabetool/c4notYetGraded'));
 			} else {
 				return ''
@@ -109,7 +109,10 @@ export const AbgabeMitarbeiterDetail = {
 						'allowedToDelete': true,
 						...res.data[0]
 					}
-					if(newTerminRes.note) newTerminRes.note = noteOpt
+					if(newTerminRes.note) {
+						newTerminRes.note = noteOpt
+						newTerminRes.noteBackend = noteOpt // certain UI elements should only reflect persisted state
+					}
 					newTerminRes.invertedFixtermin = !newTerminRes.fixtermin
 					const existingTerminRes = res.data[1]
 					
@@ -121,8 +124,6 @@ export const AbgabeMitarbeiterDetail = {
 						benotbar: abgabeOpt.benotbar
 					}
 					
-					
-					
 					// only insert new abgabe if we actually created a new one, not when saving/editing existing
 					if(!existingTerminRes){
 						newTerminRes.dateStyle = getDateStyleClass(newTerminRes, this.notenOptions)
@@ -130,6 +131,9 @@ export const AbgabeMitarbeiterDetail = {
 					} else {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
+
+						const existingTerminResCurrObj = this.projektarbeit.abgabetermine.find(paa => paa.paabgabe_id == existingTerminRes.paabgabe_id)
+						existingTerminResCurrObj.noteBackend = noteOpt // do NOT take noteOptExisting -> should reflect the "yes the qgate grade is confirmed in backend ux behaviour"
 						termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 					}
 					
@@ -742,16 +746,7 @@ export const AbgabeMitarbeiterDetail = {
 					<template #header>
 						<div class="d-flex flex-nowrap align-items-center w-100">
 			
-							<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -66px;">
-<!--								<i v-if="getDateStyleClass(termin, notenOptions) == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'standard'" v-tooltip.right="getTooltipStandard" class="fa-solid fa-clock"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'abgegeben'" v-tooltip.right="getTooltipAbgegeben" class="fa-solid fa-paperclip"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>-->
-<!--								<i v-else-if="getDateStyleClass(termin, notenOptions) == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>-->
-								
+							<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -68px;">	
 								<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 								<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 								<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 47d30beda..a7931f307 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -348,7 +348,7 @@ export const AbgabeStudentDetail = {
 					<AccordionTab :headerClass="termin.dateStyle + '-header'">
 						<template #header>
 							<div class="d-flex flex-nowrap align-items-center w-100">
-								<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -66px;">
+								<div class="flex-shrink-0 d-flex align-items-center justify-content-center" style="width: 36px; height: 36px; margin-left: -68px;">
 									<i v-if="termin.dateStyle == 'verspaetet'" v-tooltip.right="getTooltipVerspaetet" class="fa-solid fa-triangle-exclamation"></i>
 									<i v-else-if="termin.dateStyle == 'verpasst'" v-tooltip.right="getTooltipVerpasst" class="fa-solid fa-calendar-xmark"></i>
 									<i v-else-if="termin.dateStyle == 'abzugeben'" v-tooltip.right="getTooltipAbzugeben" class="fa-solid fa-hourglass-half"></i>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 6f63a8f83..689bc6d02 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -831,6 +831,11 @@ export const AbgabetoolAssistenz = {
 				if(typeof termin.note !== 'object') {
 					termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 				}
+
+				// only set this if it has not been set yet and abgabetermin has a note (qgate)
+				if(!termin.noteBackend && termin.note) {
+					termin.noteBackend = termin.note
+				}
 				
 				termin.file = []
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 3e6ea2e7f..7d5888166 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -680,6 +680,11 @@ export const AbgabetoolMitarbeiter = {
 				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
 				termin.file = []
 				
+				// only set this if it has not been set yet and abgabetermin has a note (qgate)
+				if(!termin.noteBackend && termin.note) {
+					termin.noteBackend = termin.note
+				}
+				
 				// update 08-01-2026: everybody is allowed to do everything in client, critical checks happen at backend level
 				// termin.allowedToSave = true
 				
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 131f0ae2b..580f15bc2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44240,7 +44240,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4betreuerart',
+		'phrase' => 'c4betreuerartv2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(

From 859cb39a9d16c7c62630591fa794f5ef6b3a980f Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 26 Feb 2026 11:36:06 +0100
Subject: [PATCH 1246/1357] EmailJobs log & skip cases where no benutzer_uid
 email and no private email is available

---
 application/controllers/jobs/AbgabetoolJob.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index a053b2472..9b59a72e7 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -645,6 +645,11 @@ class AbgabetoolJob extends JOB_Controller
 			);
 			
 			$email = $betreuerRow->uid ? $betreuerRow->uid."@".DOMAIN : $betreuerRow->private_email;
+
+			if(!$email) {
+				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
+				continue;
+			}
 			
 			// send email with bundled info
 			sendSanchoMail(
@@ -768,6 +773,12 @@ class AbgabetoolJob extends JOB_Controller
 
 			$email = $data->uid ? $data->uid."@".DOMAIN : $data->private_email;
 
+			// in rare cases there are betreuer (often zweitbetreuer) without uid and without private email
+			if(!$email) {
+				$this->_ci->logInfo('Could not send Email for Betreuer PersonID: "'.$data->person_id.'".');
+				continue;
+			}
+			
 			// send email with bundled info
 			sendSanchoMail(
 				'PaabgabeUpdatesBetSM',

From f3986688f231ec97e619208cd0e619a13a4ceb7a Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 26 Feb 2026 12:50:37 +0100
Subject: [PATCH 1247/1357] selfoverview: nur aktive kategorien anzeigen
 uebersetzungen hinzugefuegt

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index deb856663..f7fe822ce 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -3863,6 +3863,172 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'geplZeitraum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'geplanter Zeitraum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'planned Period',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'bitteAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte auswählen...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'hinweisLehrende',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hinweis für Lehrende',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Note for Lecturers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lehreinheiten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'lead',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lead',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'teamlead',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Team / Leitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Team / Lead',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'ausblick_lvplanung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausblick auf Ihre mögliche LV-Planung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Preview of Your Potential Course Planning',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+	array(
+		'app' => 'pep',
+		'category' => 'ui',
+		'phrase' => 'detailselfoverview',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<b>Achtung:</b> die vorliegenden Informationen stellen eine Vorabplanung dar und sind als Anfrage an Sie gedacht. <br /><br />
+						Die Beauftragung der tatsächlichen Lehrveranstaltungen erfolgt durch Ihre Kompetenzfeldleitung. <br /><br />
+					Ihre aktuell gültigen Lehraufträge und den LV Plan des aktuellen Semesters (Termine) finden Sie wie gewohnt unter „mein CIS“ -> „LV-Plan Hauptmenü“ bzw. „Lehrauftragsverwaltung“.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<b>Please note:</b> The information provided represents a preliminary planning and is intended as an inquiry to you.<br /><br />
+							The official assignment of the actual courses will be carried out by your Competence Field Manager.<br /><br />
+							Your currently valid teaching assignments and the course schedule for the current semester (dates) can be found as usual under “My CIS” → “Schedule Main Menu” or “Teaching Assignment Administration”',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 	array(
 		'app' => 'pep',
 		'category' => 'ui',

From 26fca87c75ff5d4caa57754192d76c32c60099ae Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 26 Feb 2026 14:56:33 +0100
Subject: [PATCH 1248/1357] refactor VueJs App magic into a helper function

---
 application/helpers/hlp_header_helper.php | 78 +++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 24c02eac5..86c7dae63 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -246,3 +246,81 @@ function generateSkipLink($skipID)
 	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
+
+/*
+ * Manipulate CI views includes Array to load
+ *   - public/js/FhcApps.js via customJSs and
+ *   - app customisation js and/or css from extensions via customJSModules
+ * if customJSModules contains at least one vuejs app and customisation files
+ * exist in extensions
+ */
+function extendableApps($includes)
+{
+	$start = microtime(true);
+	if(!isset($includes['customJSModules']))
+	{
+		return;
+	}
+
+	if(!is_array($includes['customJSModules']))
+	{
+		$includes['customJSModules'] = array($includes['customJSModules']);
+	}
+
+	$extensions = array();
+	$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
+	foreach ($fsiterator as $fsitem)
+	{
+		if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
+		{
+			$extensions[] = $fsitem->getBasename();
+		}
+	}
+
+	$appscount = 0;
+	foreach($includes['customJSModules'] as $item)
+	{
+		$matches = array();
+		if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
+		{
+			$appscount++;
+
+			$fhcextension = $matches[1];
+			$app = $matches[2];
+
+			$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
+			$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
+
+			foreach($extensions as $extension)
+			{
+				$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
+				$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
+
+				if(is_readable(FHCPATH . $extend_js))
+				{
+					array_push($includes['customJSModules'], $extend_js);
+				}
+
+				if(is_readable(FHCPATH . $extend_css))
+				{
+					array_push($includes['customCSSs'], $extend_css);
+				}
+			}
+		}
+	}
+
+	if($appscount > 0)
+	{
+		if(!isset($includes['customJSs']))
+		{
+			$includes['customJSs'] = array();
+		}
+		elseif(!is_array($includes['customJSs']))
+		{
+			$includes['customJSs'] = array($includes['customJSs']);
+		}
+		array_push($includes['customJSs'], 'public/js/FhcApps.js');
+	}
+
+	return $includes;
+}

From 1ae072390edf23a0bb32fdeeedfee30e370922c6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 26 Feb 2026 15:27:52 +0100
Subject: [PATCH 1249/1357] revert changes to add fhcApps property, not using
 path based syntax, to CI views include array

---
 application/views/Cis/Documents.php           |  6 +-
 application/views/Cis/ProfilUpdate.php        |  8 +--
 .../views/CisRouterView/CisRouterView.php     |  4 +-
 application/views/LVVerwaltung.php            |  8 +--
 application/views/Studentenverwaltung.php     |  8 +--
 application/views/codex/bismeldestichtag.php  |  6 +-
 application/views/lehre/Antrag/Create.php     |  6 +-
 .../views/lehre/Antrag/Leitung/List.php       |  6 +-
 .../views/lehre/Antrag/Student/List.php       |  6 +-
 .../lehre/Antrag/Wiederholung/Student.php     |  6 +-
 .../lehre/lvplanung/lvTemplateUebersicht.php  |  6 +-
 application/views/system/logs/logsViewer.php  |  6 +-
 application/views/templates/CISVUE-Footer.php |  6 +-
 application/views/templates/CISVUE-Header.php |  6 +-
 application/views/templates/FHC-Common.php    | 57 -------------------
 15 files changed, 44 insertions(+), 101 deletions(-)

diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index fa491fa11..fcafff57c 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -1,9 +1,9 @@
 <?php
-$includesArray = array(
+$includesArray = extendableApps(array(
 	'title' => 'Documents',
 	'tabulator5' => true,
-	'fhcApps' => ['Cis/Documents']
-);
+	'customJSModules' => ['public/js/apps/Cis/Documents.js']
+));
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index 525d261a7..2295a753f 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -1,18 +1,18 @@
 <?php 
-$includesArray = array(
+$includesArray = extendableApps(array(
     'title' => 'Profil Änderungen',
     'vue3' => true,
     'bootstrap5' => true,
     'fontawesome6'=> true,
     'axios027' => true,
     'tabulator5' => true,
-    'fhcApps' => array(
-		'Cis/ProfilUpdateRequests'
+    'customJSModules' => array(
+	'public/js/apps/Cis/ProfilUpdateRequests.js'
     ),
     'customCSSs' => array(
 	'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'
     )
-);
+));
 
 if(defined("CIS4"))
 {
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index ab22fbb81..42e49e38b 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -1,6 +1,6 @@
 <?php
 
-$includesArray = array(
+$includesArray = extendableApps(array(
 	'title' => 'Cis4',
 	'axios027' => true,
 	'bootstrap5' => true,
@@ -36,7 +36,7 @@ $includesArray = array(
 		'public/js/apps/Dashboard/Fhc.js'
 	),
 
-);
+));
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
diff --git a/application/views/LVVerwaltung.php b/application/views/LVVerwaltung.php
index 5c4c9549e..d2856ad3e 100644
--- a/application/views/LVVerwaltung.php
+++ b/application/views/LVVerwaltung.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = array(
+	$includesArray = extendableApps(array(
 		'title' => 'LVVerwaltung',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -17,10 +17,10 @@
 			'public/css/Lvverwaltung.css'
 
 		],
-		'fhcApps' => [
-			'LVVerwaltung'
+		'customJSModules' => [
+			'public/js/apps/LVVerwaltung.js'
 		]
-	);
+	));
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index aa4891e9a..fb0913806 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = array(
+	$includesArray = extendableApps(array(
 		'title' => 'Studentenverwaltung',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -26,10 +26,10 @@
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
-		'fhcApps' => [
-			'Studentenverwaltung'
+		'customJSModules' => [
+			'public/js/apps/Studentenverwaltung.js'
 		]
-	);
+	));
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index 2f024d25e..fc0311674 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = array(
+	$includesArray = extendableApps(array(
 		'title' => 'Bismeldestichtage',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -10,8 +10,8 @@
 		'tabulator5' => true,
 		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css'),
 		'customJSs' => array('vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'),
-		'fhcApps' => array('Bismeldestichtag/Bismeldestichtag')
-	);
+		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
+	));
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 36a39078f..56d1e0a28 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = array(
+$sitesettings = extendableApps(array(
 	'title' => 'Antrag auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -8,7 +8,7 @@ $sitesettings = array(
 	'fontawesome6' => true,
 	'phrases' => array(
 	),
-	'fhcApps' => array('lehre/Antrag'),
+	'customJSModules' => array('public/js/apps/lehre/Antrag.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
@@ -16,7 +16,7 @@ $sitesettings = array(
 	),
 	'customJSs' => array(
 	)
-);
+));
 
 if(defined('CIS4')){
 	$this->load->view(
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index b1ba44a4c..f6c95bc86 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -2,7 +2,7 @@
 
 use \DateTime as DateTime;
 
-$sitesettings = array(
+$sitesettings = extendableApps(array(
 	'title' => 'Anträge auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -18,14 +18,14 @@ $sitesettings = array(
 		'lehre',
 		'person',
 	),
-	'fhcApps' => array('lehre/Antrag/Leitung'),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Leitung.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
 	),
 	'customJSs' => array(
 	)
-);
+));
 
 $this->load->view(
 	'templates/FHC-Header',
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 9454e2006..1b467e576 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = array(
+$sitesettings = extendableApps(array(
 	'title' => 'Antrag auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -8,14 +8,14 @@ $sitesettings = array(
 	'fontawesome6' => true,
 	'phrases' => array(
 	),
-	'fhcApps' => array('lehre/Antrag/Student'),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Student.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
 	),
 	'customJSs' => array(
 	)
-);
+));
 
 if(defined('CIS4')){
 	$this->load->view(
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index 73405fc0a..65707cc7b 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = array(
+$sitesettings = extendableApps(array(
 	'title' => 'Antrag Wiederholung vom Studium',
 	'cis' => true,
 	'vue3' => true,
@@ -12,14 +12,14 @@ $sitesettings = array(
 		'lehre',
 		'global'
 	),
-	'fhcApps' => array('lehre/Antrag/Lvzuweisung'),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Lvzuweisung.js'),
 	'customCSSs' => array(
 		'public/css/Fhc.css',
 		'public/css/components/primevue.css',
 	),
 	'customJSs' => array(
 	)
-);
+));
 
 $this->load->view(
 	'templates/FHC-Header',
diff --git a/application/views/lehre/lvplanung/lvTemplateUebersicht.php b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
index 1d5a2e777..8e47677f0 100644
--- a/application/views/lehre/lvplanung/lvTemplateUebersicht.php
+++ b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
@@ -1,5 +1,5 @@
 <?php
-$includesArray = array(
+$includesArray = extendableApps(array(
 	'title' => 'LV Template Übersicht',
 	'vue3' => true,
 	'axios027' => true,
@@ -9,12 +9,12 @@ $includesArray = array(
 	'primevue3' => true,
 	'navigationcomponent' => true,
 	'filtercomponent' => true,
-	'fhcApps' => array('lehre/lvplanung/LvTemplates'),
+	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
 	'customCSSs' => array(
 	    'public/css/Fhc.css',
 	    'public/css/lvTemplateUebersicht.css'
 	)
-);
+));
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
index 60d9075d0..1d6b50394 100644
--- a/application/views/system/logs/logsViewer.php
+++ b/application/views/system/logs/logsViewer.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = array(
+	$includesArray = extendableApps(array(
 		'title' => 'Logs Viewer',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -13,8 +13,8 @@
 			'global' => array('mailAnXversandt'),
 			'ui' => array('bitteEintragWaehlen')
 		),
-		'fhcApps' => array('LogsViewer/LogsViewer'),
-	);
+		'customJSModules' => array('public/js/apps/LogsViewer/LogsViewer.js'),
+	));
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/templates/CISVUE-Footer.php b/application/views/templates/CISVUE-Footer.php
index 48943650d..d7c1de24c 100644
--- a/application/views/templates/CISVUE-Footer.php
+++ b/application/views/templates/CISVUE-Footer.php
@@ -5,9 +5,9 @@ $includesArray = array(
 	'bootstrap5' => true,
 	'fontawesome6' => true,
 	'axios027' => true,
-	'fhcApps' => array_merge([
-		'Cis'
-	], $fhcApps ?? []),
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'
 	], $customCSSs ?? [])
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 943d26d80..358fc75c9 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -7,9 +7,9 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'primevue3' => true,
-	'fhcApps' => array_merge([
-		'Cis'
-	], $fhcApps ?? []),
+	'customJSModules' => array_merge([
+		'public/js/apps/Cis.js'
+	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',
 		$this->config->item('theme_css'),
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 955583500..71f9c46c4 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -48,60 +48,3 @@
 	$udfs = isset($udfs) ? $udfs : false;
 	$widgets = isset($widgets) ? $widgets : false;
 	$tags = isset($tags) ? $tags : false;
-
-// VueJs App magic
-if (isset($fhcApps)) {
-	if (!isset($customJSs))
-		$customJSs = ['public/js/FhcApps.js'];
-	elseif (!is_array($customJSs))
-		$customJSs = [$customJSs, 'public/js/FhcApps.js'];
-	else
-		array_push($customJSs, 'public/js/FhcApps.js');
-
-	if (!isset($customJSModules))
-		$customJSModules = [];
-	elseif (!is_array($customJSModules))
-		$customJSModules = [$customJSModules];
-
-	if (!isset($customCSSs))
-		$customCSSs = [];
-	elseif (!is_array($customCSSs))
-		$customCSSs = [$customCSSs];
-
-	$ext_path = 'public/extensions/';
-	$ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $ext_path);
-
-	foreach ($fhcApps as $app) {
-		if (!strstr($app, ':')) {
-			$app_js_path = 'public/js/apps/' . $app . '.js';
-			$app_css_path = 'public/css/apps/' . $app . '.css';
-			$app_js_ext_path = '/js/extend_app/' . $app . '.js';
-			$app_css_ext_path = '/css/extend_app/' . $app . '.css';
-		} else {
-			list($ext_name, $app_path) = explode(':', $app);
-			$app_js_path = 'public/extensions/' . $ext_name . '/js/apps/' . $app_path . '.js';
-			$app_css_path = 'public/extensions/' . $ext_name . '/css/apps/' . $app_path . '.css';
-			$app_js_ext_path = '/js/extend_app/extensions/' . $ext_name . '/' . $app_path . '.js';
-			$app_css_ext_path = '/css/extend_app/extensions/' . $ext_name . '/' . $app_path . '.css';
-		}
-
-		if (file_exists(FHCPATH . str_replace('/', DIRECTORY_SEPARATOR, $app_css_path)))
-			array_push($customCSSs, $app_css_path);
-
-		foreach (scandir(FHCPATH . $ext_realpath) as $extension_name) {
-			if ($extension_name[0] == '.')
-				continue;
-			
-			$app_js_ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $app_js_ext_path);
-			if (file_exists(FHCPATH . $ext_realpath . $extension_name . $app_js_ext_realpath)) {
-				array_push($customJSModules, $ext_path . $extension_name . $app_js_ext_path);
-			}
-			$app_css_ext_realpath = str_replace('/', DIRECTORY_SEPARATOR, $app_css_ext_path);
-			if (file_exists(FHCPATH . $ext_realpath . $extension_name . $app_css_ext_realpath)) {
-				array_push($customCSSs, $ext_path . $extension_name . $app_css_ext_path);
-			}
-		}
-		
-		array_push($customJSModules, $app_js_path);
-	}
-}

From 4deed45f298bf95952a5aa957cfc0a032699d474 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 26 Feb 2026 15:53:41 +0100
Subject: [PATCH 1250/1357] prepend extend_app js to customJSModules array, use
 FhcApps in Dashboard/Fhc App

---
 application/helpers/hlp_header_helper.php | 2 +-
 public/js/apps/Dashboard/Fhc.js           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 86c7dae63..2d425500d 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -298,7 +298,7 @@ function extendableApps($includes)
 
 				if(is_readable(FHCPATH . $extend_js))
 				{
-					array_push($includes['customJSModules'], $extend_js);
+					array_unshift($includes['customJSModules'], $extend_js);
 				}
 
 				if(is_readable(FHCPATH . $extend_css))
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 093ad815b..3dd2f3fc7 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -321,6 +321,9 @@ const app = Vue.createApp({
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
 
+FhcApps.router.makeExtendable(router);
+FhcApps.makeExtendable(app);
+
 app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {

From aa2334afe71546fa483935c453f8dd7735c37dd0 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 26 Feb 2026 17:58:48 +0100
Subject: [PATCH 1251/1357] sammelmail button betreuer page; fix notenOpt
 retrieval in setDetailComponent for Betreuer when reopening detailView;
 $emit("paUpdated") after savingTermin/deletingTermin to update projektarbeit
 in overview table aswell;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js |  8 +-
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 35 +++++---
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 83 +++++++++++++++----
 4 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index d976cea15..af598a345 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -89,13 +89,15 @@ class Abgabe extends FHCAPI_Controller
 		$abgabetypenBetreuer = $this->config->item('ALLOWED_ABGABETYPEN_BETREUER');
 		$ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT');
 		$ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER = $this->config->item('ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER');
+		$BETREUER_SAMMELMAIL_BUTTON_STUDENT = $this->config->item('BETREUER_SAMMELMAIL_BUTTON_STUDENT');
 		
 		$ret = array(
 			'old_abgabe_beurteilung_link' => $old_abgabe_beurteilung_link,
 			'turnitin_link' => $turnitin_link,
 			'abgabetypenBetreuer' => $abgabetypenBetreuer,
 			'ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT' => $ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT,
-			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER
+			'ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER' => $ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER,
+			'BETREUER_SAMMELMAIL_BUTTON_STUDENT' => $BETREUER_SAMMELMAIL_BUTTON_STUDENT,
 		);
 		
 		$this->terminateWithSuccess($ret);
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index a39aa364c..011e75145 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -17,6 +17,7 @@ export const AbgabeMitarbeiterDetail = {
 		Message: primevue.message,
 		VueDatePicker
 	},
+	emits: ['paUpdated'],
 	inject: [
 		'abgabeTypeOptions',
 		'abgabetypenBetreuer',
@@ -132,8 +133,8 @@ export const AbgabeMitarbeiterDetail = {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
 
-						const existingTerminResCurrObj = this.projektarbeit.abgabetermine.find(paa => paa.paabgabe_id == existingTerminRes.paabgabe_id)
-						existingTerminResCurrObj.noteBackend = noteOpt // do NOT take noteOptExisting -> should reflect the "yes the qgate grade is confirmed in backend ux behaviour"
+						termin.paabgabetyp_kurzbz = newTerminRes.paabgabetyp_kurzbz
+						termin.noteBackend = noteOpt // do NOT take noteOptExisting -> should reflect the "yes the qgate grade is confirmed in backend ux behaviour"
 						termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 					}
 					
@@ -174,6 +175,8 @@ export const AbgabeMitarbeiterDetail = {
 					} else {
 						this.showAutomagicModalPhrase = false	
 					}
+					
+					this.$emit("paUpdated", this.projektarbeit)
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
@@ -257,6 +260,7 @@ export const AbgabeMitarbeiterDetail = {
 					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
 					const deletedTerminIndex = this.projektarbeit.abgabetermine.findIndex(t => t.paabgabe_id === termin.paabgabe_id)
 					this.projektarbeit.abgabetermine.splice(deletedTerminIndex, 1)
+					this.$emit("paUpdated", this.projektarbeit)
 				} else if(res?.meta?.status == 'error'){
 					this.$fhcAlert.alertError()
 				}
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 689bc6d02..d5caf97a6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -210,12 +210,12 @@ export const AbgabetoolAssistenz = {
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+						field: 'prevTermin', formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), field: 'nextTermin',
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))),
 						headerFilter: 'list',
 						headerFilterParams: { valuesLookup: this.getQGateStatusList },
@@ -226,7 +226,7 @@ export const AbgabetoolAssistenz = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2026_02"
+				persistenceID: "abgabetool_2026_02_26"
 			},
 			abgabeTableEventHandlers: [
 			{
@@ -247,6 +247,10 @@ export const AbgabetoolAssistenz = {
 			]};
 	},
 	methods: {
+		handlePaUpdated(projektarbeit) {
+			this.checkAbgabetermineProjektarbeit(projektarbeit)
+			this.$refs.abgabeTable.tabulator.redraw(true)
+		},
 		getQGateStatusList() {
 			return [
 				this.$p.t('abgabetool/c4keinTerminVorhanden'),
@@ -309,11 +313,13 @@ export const AbgabetoolAssistenz = {
 			return false
 		},
 		sammelMailStudent(param) {
-			
-			const emails = this.selectedData
-				.map(row => `${row.student_uid}@${this.domain}`)
-				.join(',');
-			const uniqueRecipients = [...new Set(emails)];
+
+			const recipientList = [];
+			this.selectedData.forEach(d => {
+				recipientList.push(`${d.student_uid}@${this.domain}`)
+			})
+
+			const uniqueRecipients = [...new Set(recipientList)];
 			const subject = this.$p.t('abgabetool/c4sammelmailStudentBetreff', [this.selectedStudiengangOption?.bezeichnung]);
 			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
 		},
@@ -362,7 +368,6 @@ export const AbgabetoolAssistenz = {
 			return false;
 		},
 		checkQualityGateStatus(projekt) {
-			// TODO: might refine the representation of these states and maybe refactor code a little
 			const qgate1Termine = []
 			const qgate2Termine = []
 			
@@ -382,7 +387,7 @@ export const AbgabetoolAssistenz = {
 			// reuse luxon calculated diffMs (termin.datum in relation to today) from previous datestyle check 
 			qgate1Termine.forEach(qgate => {
 				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
-					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					const noteOpt = typeof qgate.note !== 'object' ? this.notenOptions.find(opt => opt.note == qgate.note) : qgate.note
 					if(noteOpt.positiv) {
 						projekt.qgate1Status = this.$p.t('abgabetool/c4positivBenotet')
 						projekt.qgate1StatusRank = 5
@@ -404,7 +409,7 @@ export const AbgabetoolAssistenz = {
 
 			qgate2Termine.forEach(qgate => {
 				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
-					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					const noteOpt = typeof qgate.note !== 'object' ? this.notenOptions.find(opt => opt.note == qgate.note) : qgate.note
 					if(noteOpt.positiv) {
 						projekt.qgate2Status = this.$p.t('abgabetool/c4positivBenotet')
 						projekt.qgate2StatusRank = 5
@@ -1287,7 +1292,13 @@ export const AbgabetoolAssistenz = {
 				</div>
 			</template>
 			<template v-slot:default>
-				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen" :assistenzMode="true"></AbgabeDetail>
+				<AbgabeDetail 
+					:projektarbeit="selectedProjektarbeit" 
+					:isFullscreen="detailIsFullscreen" 
+					:assistenzMode="true"
+					@paUpdated="handlePaUpdated">
+				
+				</AbgabeDetail>
 				
 			</template>
 		</bs-modal>	
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 7d5888166..ee1d18942 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -6,6 +6,7 @@ import ApiAbgabe from '../../../api/factory/abgabe.js'
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass } from "./getDateStyleClass.js";
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
+import {splitMailsHelper} from "../../../helpers/EmailHelpers.js";
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -16,6 +17,7 @@ export const AbgabetoolMitarbeiter = {
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
 		Textarea: primevue.textarea,
+		TieredMenu: primevue.tieredmenu,
 		VueDatePicker,
 		FhcOverlay
 	},
@@ -48,6 +50,7 @@ export const AbgabetoolMitarbeiter = {
 			phrasenResolved: false,
 			turnitin_link: null,
 			old_abgabe_beurteilung_link: null,
+			BETREUER_SAMMELMAIL_BUTTON_STUDENT: null,
 			saving: false,
 			loading: false,
 			abgabeTypeOptions: null,
@@ -139,7 +142,6 @@ export const AbgabetoolMitarbeiter = {
 					},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, headerFilter: false, headerSort: false, widthGrow: 1, tooltip: false, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4kontakt'))),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -151,12 +153,12 @@ export const AbgabetoolMitarbeiter = {
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), field: 'nextTermin',
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 220, tooltip: false},
+						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))),
 						headerFilter: 'list',
 						headerFilterParams: { valuesLookup: this.getQGateStatusList }, 
@@ -167,7 +169,7 @@ export const AbgabetoolMitarbeiter = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false}
 				],
 				persistence: false,
-				persistenceID: 'abgabeTableBetreuer2026-02-24'
+				persistenceID: 'abgabeTableBetreuer2026-02-26'
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -203,6 +205,20 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		handlePaUpdated(projektarbeit) {
+			this.checkAbgabetermineProjektarbeit(projektarbeit)
+			this.$refs.abgabeTable.tabulator.redraw(true)
+		},
+		sammelMailStudent(param) {
+			
+			const recipientList = [];
+			this.selectedData.forEach(d => {
+				recipientList.push(`${d.student_uid}@${this.domain}`)
+			})
+			const uniqueRecipients = [...new Set(recipientList)];
+			const subject = ""; // empty subject line 
+			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
+		},
 		getQGateStatusList() {
 			return [
 				this.$p.t('abgabetool/c4keinTerminVorhanden'),
@@ -375,7 +391,6 @@ export const AbgabetoolMitarbeiter = {
 			});
 		},
 		checkQualityGateStatus(projekt) {
-			// TODO: might refine the representation of these states and maybe refactor code a little
 			const qgate1Termine = []
 			const qgate2Termine = []
 
@@ -395,7 +410,7 @@ export const AbgabetoolMitarbeiter = {
 			// reuse luxon calculated diffMs (termin.datum in relation to today) from previous datestyle check 
 			qgate1Termine.forEach(qgate => {
 				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
-					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					const noteOpt = typeof qgate.note !== 'object' ? this.notenOptions.find(opt => opt.note == qgate.note) : qgate.note
 					if(noteOpt.positiv) {
 						projekt.qgate1Status = this.$p.t('abgabetool/c4positivBenotet')
 						projekt.qgate1StatusRank = 5
@@ -417,7 +432,7 @@ export const AbgabetoolMitarbeiter = {
 
 			qgate2Termine.forEach(qgate => {
 				if(qgate.note != null && projekt.qgate1StatusRank <= 5) {
-					const noteOpt = this.notenOptions.find(opt => opt.note == qgate.note)
+					const noteOpt = typeof qgate.note !== 'object' ? this.notenOptions.find(opt => opt.note == qgate.note) : qgate.note
 					if(noteOpt.positiv) {
 						projekt.qgate2Status = this.$p.t('abgabetool/c4positivBenotet')
 						projekt.qgate2StatusRank = 5
@@ -677,12 +692,13 @@ export const AbgabetoolMitarbeiter = {
 			}
 
 			pa.abgabetermine.forEach(termin => {
-				termin.note = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				const noteOpt = this.allowedNotenOptions.find(opt => opt.note == termin.note)
+				if(noteOpt) termin.note =  noteOpt
 				termin.file = []
 				
 				// only set this if it has not been set yet and abgabetermin has a note (qgate)
-				if(!termin.noteBackend && termin.note) {
-					termin.noteBackend = termin.note
+				if(!termin.noteBackend && noteOpt) {
+					termin.noteBackend = noteOpt
 				}
 				
 				// update 08-01-2026: everybody is allowed to do everything in client, critical checks happen at backend level
@@ -719,11 +735,6 @@ export const AbgabetoolMitarbeiter = {
 			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 				'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
 		},
-		mailFormatter(cell) {
-			const val = cell.getValue()
-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
-		},
 		beurteilungFormatter(cell) {
 			const val = cell.getValue()
 			if(val) {
@@ -828,6 +839,29 @@ export const AbgabetoolMitarbeiter = {
 		},
 	},
 	computed: {
+		emailItems() {
+			const menu = []
+
+			if(this.BETREUER_SAMMELMAIL_BUTTON_STUDENT){
+				menu.push({
+					label: this.$p.t('abgabetool/c4sendEmailStudierendev2', [this.uniqueStudentEmailCount]),
+					command: this.sammelMailStudent
+				})
+			}
+
+			return menu
+		},
+		uniqueStudentEmailCount() {
+			const emails = new Set();
+
+			this.selectedData.forEach(row => {
+				if (row.student_uid) {
+					emails.add(row.student_uid); // actually dont need domain for this
+				}
+			});
+
+			return emails.size;
+		},
 		getAllowedAbgabeTypeOptions() {
 			return this.abgabeTypeOptions.filter(opt => this.abgabetypenBetreuer.includes(opt.paabgabetyp_kurzbz))
 		}
@@ -840,6 +874,7 @@ export const AbgabetoolMitarbeiter = {
 			this.turnitin_link = res.data?.turnitin_link
 			this.old_abgabe_beurteilung_link = res.data?.old_abgabe_beurteilung_link
 			this.abgabetypenBetreuer = res.data?.abgabetypenBetreuer
+			this.BETREUER_SAMMELMAIL_BUTTON_STUDENT = res.data?.BETREUER_SAMMELMAIL_BUTTON_STUDENT
 		}).catch(e => {
 			this.loading = false
 		})
@@ -952,7 +987,11 @@ export const AbgabetoolMitarbeiter = {
 				</div>
 			</template>
 			<template v-slot:default>
-				<AbgabeDetail :projektarbeit="selectedProjektarbeit" :isFullscreen="detailIsFullscreen"></AbgabeDetail>
+				<AbgabeDetail 
+					:projektarbeit="selectedProjektarbeit" 
+					:isFullscreen="detailIsFullscreen"
+					@paUpdated="handlePaUpdated">
+				</AbgabeDetail>
 				
 			</template>
 		</bs-modal>	
@@ -988,7 +1027,17 @@ export const AbgabetoolMitarbeiter = {
 						<i class="fa fa-hourglass-end"></i>
 						{{ $p.t('abgabetool/showDeadlines') }}
 					</button>
-					
+					<button 
+						v-if="emailItems.length"
+						role="button"
+						@click="evt => $refs.menu.toggle(evt)"
+						class="btn btn-outline-secondary dropdown-toggle"
+						aria-haspopup="true"
+					>
+						<i class="fa fa-envelope"></i>
+					</button>
+					<tiered-menu ref="menu" :model="emailItems" popup :autoZIndex="false" />
+
 				</template>
 			</core-filter-cmpt>
 		

From abeb411742b6ac8082571fc2805dd9787d5802aa Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 26 Feb 2026 18:00:14 +0100
Subject: [PATCH 1252/1357] betreuer email button config

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

diff --git a/application/config/abgabe.php b/application/config/abgabe.php
index 82782b043..90aedbd8b 100644
--- a/application/config/abgabe.php
+++ b/application/config/abgabe.php
@@ -41,3 +41,5 @@ $config['STG_MOODLE_LINK'] = 'https://moodle.technikum-wien.at/course/view.php?i
 
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;
+
+$config['BETREUER_SAMMELMAIL_BUTTON_STUDENT'] = true;

From 43a37021a5eafedca620b9a791cecc29da931483 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 27 Feb 2026 09:24:47 +0100
Subject: [PATCH 1253/1357] ensure extend_app js files from extensions are
 loaded directly before the apps js file

---
 application/helpers/hlp_header_helper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 9c085f6cb..68ab2c23f 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -279,7 +279,6 @@ function absoluteJsImportUrl($relurl)
  */
 function extendableApps($includes)
 {
-	$start = microtime(true);
 	if(!isset($includes['customJSModules']))
 	{
 		return;
@@ -301,6 +300,7 @@ function extendableApps($includes)
 	}
 
 	$appscount = 0;
+	$tmpCustomJSModules = array();
 	foreach($includes['customJSModules'] as $item)
 	{
 		$matches = array();
@@ -321,7 +321,7 @@ function extendableApps($includes)
 
 				if(is_readable(FHCPATH . $extend_js))
 				{
-					array_unshift($includes['customJSModules'], $extend_js);
+					array_push($tmpCustomJSModules, $extend_js);
 				}
 
 				if(is_readable(FHCPATH . $extend_css))
@@ -330,7 +330,9 @@ function extendableApps($includes)
 				}
 			}
 		}
+		array_push($tmpCustomJSModules, $item);
 	}
+	$includes['customJSModules'] = $tmpCustomJSModules;
 
 	if($appscount > 0)
 	{

From 28f4a38752da069eac5bb212f0db1849a8838217 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 27 Feb 2026 16:50:50 +0100
Subject: [PATCH 1254/1357] refactor helper function extendableApps to
 singleton helper class ExtendableAppsHelper and use it in FHC-Header and
 FHC-Footer, revert previous changes to other CI views

---
 application/helpers/hlp_header_helper.php     | 206 ++++++++++++++----
 application/views/Cis/Documents.php           |   4 +-
 application/views/Cis/ProfilUpdate.php        |   4 +-
 .../views/CisRouterView/CisRouterView.php     |   4 +-
 application/views/LVVerwaltung.php            |   4 +-
 application/views/Studentenverwaltung.php     |   4 +-
 application/views/codex/bismeldestichtag.php  |   4 +-
 application/views/lehre/Antrag/Create.php     |   4 +-
 .../views/lehre/Antrag/Leitung/List.php       |   4 +-
 .../views/lehre/Antrag/Student/List.php       |   4 +-
 .../lehre/Antrag/Wiederholung/Student.php     |   4 +-
 .../lehre/lvplanung/lvTemplateUebersicht.php  |   4 +-
 application/views/system/logs/logsViewer.php  |   4 +-
 application/views/templates/FHC-Footer.php    |  10 +-
 application/views/templates/FHC-Header.php    |   7 +-
 15 files changed, 197 insertions(+), 74 deletions(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 68ab2c23f..27dfba5a1 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -277,75 +277,191 @@ function absoluteJsImportUrl($relurl)
  * if customJSModules contains at least one vuejs app and customisation files
  * exist in extensions
  */
-function extendableApps($includes)
+class ExtendableAppsHelper
 {
-	if(!isset($includes['customJSModules']))
+	private static $instance = null;
+
+	protected $extensions;
+
+	protected $customCSSs;
+	protected $customJSs;
+	protected $customJSModules;
+
+	protected $initialised;
+	protected $appscount;
+
+	protected $extCustomCSSs;
+	protected $extCustomJSs;
+	protected $extCustomJSModules;
+
+	private function __construct()
 	{
-		return;
+		$this->extensions = array();
+		$this->customCSSs = null;
+		$this->customJSs = null;
+		$this->customJSModules = null;
+
+		$this->initialised = false;
+		$this->appscount = 0;
+
+		$this->extCustomCSSs = null;
+		$this->extCustomJSs = null;
+		$this->extCustomJSModules = null;
 	}
 
-	if(!is_array($includes['customJSModules']))
+	public static function getInstance()
 	{
-		$includes['customJSModules'] = array($includes['customJSModules']);
-	}
-
-	$extensions = array();
-	$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-	foreach ($fsiterator as $fsitem)
-	{
-		if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
+		if(self::$instance === null)
 		{
-			$extensions[] = $fsitem->getBasename();
+			self::$instance = new ExtendableAppsHelper();
 		}
+		return self::$instance;
 	}
 
-	$appscount = 0;
-	$tmpCustomJSModules = array();
-	foreach($includes['customJSModules'] as $item)
+	public function init($customCSSs, $customJSs, $customJSModules)
 	{
-		$matches = array();
-		if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
+		if($this->initialised)
 		{
-			$appscount++;
+			return;
+		}
 
-			$fhcextension = $matches[1];
-			$app = $matches[2];
+		$this->customCSSs = $customCSSs;
+		$this->customJSs = $customJSs;
+		$this->customJSModules = $customJSModules;
+		$this->initialised = true;
 
-			$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
-			$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
+		if(!isset($this->customJSModules))
+		{
+			return;
+		}
 
-			foreach($extensions as $extension)
+		if(!is_array($this->customJSModules))
+		{
+			$this->customJSModules = array($this->customJSModules);
+		}
+
+		if(count($this->customJSModules) < 1)
+		{
+			return;
+		}
+
+		$this->buildExtensionsList();
+		$this->prepareExtendedArrays();
+	}
+
+	public function getCustomCSSs()
+	{
+		if(is_null($this->extCustomCSSs))
+		{
+			return $this->customCSSs;
+		}
+		return $this->extCustomCSSs;
+	}
+
+	public function getCustomJSs()
+	{
+		if(is_null($this->extCustomJSs))
+		{
+			return $this->customJSs;
+		}
+		return $this->extCustomJSs;
+	}
+
+	public function getCustomJSModules()
+	{
+		if(is_null($this->extCustomJSModules))
+		{
+			return $this->customJSModules;
+		}
+		return $this->extCustomJSModules;
+	}
+
+	protected function buildExtensionsList()
+	{
+		$this->extensions = array();
+		$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
+		foreach ($fsiterator as $fsitem)
+		{
+			if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
 			{
-				$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
-				$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
-
-				if(is_readable(FHCPATH . $extend_js))
-				{
-					array_push($tmpCustomJSModules, $extend_js);
-				}
-
-				if(is_readable(FHCPATH . $extend_css))
-				{
-					array_push($includes['customCSSs'], $extend_css);
-				}
+				$this->extensions[] = $fsitem->getBasename();
 			}
 		}
-		array_push($tmpCustomJSModules, $item);
 	}
-	$includes['customJSModules'] = $tmpCustomJSModules;
 
-	if($appscount > 0)
+	protected function prepareExtendedArrays()
 	{
-		if(!isset($includes['customJSs']))
+		$this->appscount = 0;
+		$this->initExtCustomCSSs();
+		$this->extCustomJSModules = array();
+		foreach($this->customJSModules as $item)
 		{
-			$includes['customJSs'] = array();
+			$matches = array();
+			if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
+			{
+				$this->appscount++;
+
+				$fhcextension = $matches[1];
+				$app = $matches[2];
+
+				$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
+				$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
+
+				foreach($this->extensions as $extension)
+				{
+					$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
+					$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
+
+					if(is_readable(FHCPATH . $extend_js))
+					{
+						array_push($this->extCustomJSModules, $extend_js);
+					}
+
+					if(is_readable(FHCPATH . $extend_css))
+					{
+						array_push($this->extCustomCSSs, $extend_css);
+					}
+				}
+			}
+			array_push($this->extCustomJSModules, $item);
 		}
-		elseif(!is_array($includes['customJSs']))
+
+		if($this->appscount > 0)
 		{
-			$includes['customJSs'] = array($includes['customJSs']);
+			$this->addFhcAppsJs();
 		}
-		array_push($includes['customJSs'], 'public/js/FhcApps.js');
 	}
 
-	return $includes;
+	protected function initExtCustomCSSs()
+	{
+		if(!isset($this->customCSSs))
+		{
+			$this->extCustomCSSs = array();
+		}
+		elseif(!is_array($this->customCSSs))
+		{
+			$this->extCustomCSSs = array($this->customCSSs);
+		}
+		else
+		{
+			$this->extCustomCSSs = $this->customCSSs;
+		}
+	}
+
+	protected function addFhcAppsJs()
+	{
+		if(!isset($this->customJSs))
+		{
+			$this->extCustomJSs = array();
+		}
+		elseif(!is_array($this->customJSs))
+		{
+			$this->extCustomJSs = array($this->customJSs);
+		}
+		else
+		{
+			$this->extCustomJSs = $this->customJSs;
+		}
+		array_push($this->extCustomJSs, 'public/js/FhcApps.js');
+	}
 }
diff --git a/application/views/Cis/Documents.php b/application/views/Cis/Documents.php
index fcafff57c..f34ce3fc1 100644
--- a/application/views/Cis/Documents.php
+++ b/application/views/Cis/Documents.php
@@ -1,9 +1,9 @@
 <?php
-$includesArray = extendableApps(array(
+$includesArray = array(
 	'title' => 'Documents',
 	'tabulator5' => true,
 	'customJSModules' => ['public/js/apps/Cis/Documents.js']
-));
+);
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
diff --git a/application/views/Cis/ProfilUpdate.php b/application/views/Cis/ProfilUpdate.php
index 76e195b57..2e69208c7 100644
--- a/application/views/Cis/ProfilUpdate.php
+++ b/application/views/Cis/ProfilUpdate.php
@@ -1,5 +1,5 @@
 <?php 
-$includesArray = extendableApps(array(
+$includesArray = array(
     'title' => 'Profil Änderungen',
     'vue3' => true,
 	'primevue3' => true,
@@ -16,7 +16,7 @@ $includesArray = extendableApps(array(
     'customCSSs' => array(
 	'public/css/components/FilterComponent.css','public/css/components/FormUnderline.css'
     )
-));
+);
 
 if(defined("CIS4"))
 {
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 44f3a3fcc..6ff428362 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -1,6 +1,6 @@
 <?php
 
-$includesArray = extendableApps(array(
+$includesArray = array(
 	'title' => 'Cis4',
 	'axios027' => true,
 	'bootstrap5' => true,
@@ -42,7 +42,7 @@ $includesArray = extendableApps(array(
 		'public/js/apps/Dashboard/Fhc.js',
 	),
 
-));
+);
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
diff --git a/application/views/LVVerwaltung.php b/application/views/LVVerwaltung.php
index d2856ad3e..4cebae839 100644
--- a/application/views/LVVerwaltung.php
+++ b/application/views/LVVerwaltung.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = extendableApps(array(
+	$includesArray = array(
 		'title' => 'LVVerwaltung',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -20,7 +20,7 @@
 		'customJSModules' => [
 			'public/js/apps/LVVerwaltung.js'
 		]
-	));
+	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 59b05063e..1cd28d735 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = extendableApps(array(
+	$includesArray = array(
 		'title' => 'Studentenverwaltung',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -30,7 +30,7 @@
 		'customJSModules' => [
 			'public/js/apps/Studentenverwaltung.js'
 		]
-	));
+	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/codex/bismeldestichtag.php b/application/views/codex/bismeldestichtag.php
index fc0311674..37af16cc6 100644
--- a/application/views/codex/bismeldestichtag.php
+++ b/application/views/codex/bismeldestichtag.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = extendableApps(array(
+	$includesArray = array(
 		'title' => 'Bismeldestichtage',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -11,7 +11,7 @@
 		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css'),
 		'customJSs' => array('vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'),
 		'customJSModules' => array('public/js/apps/Bismeldestichtag/Bismeldestichtag.js')
-	));
+	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
index 56d1e0a28..00e41d1cd 100644
--- a/application/views/lehre/Antrag/Create.php
+++ b/application/views/lehre/Antrag/Create.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = extendableApps(array(
+$sitesettings = array(
 	'title' => 'Antrag auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -16,7 +16,7 @@ $sitesettings = extendableApps(array(
 	),
 	'customJSs' => array(
 	)
-));
+);
 
 if(defined('CIS4')){
 	$this->load->view(
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index f6c95bc86..1225b16b6 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -2,7 +2,7 @@
 
 use \DateTime as DateTime;
 
-$sitesettings = extendableApps(array(
+$sitesettings = array(
 	'title' => 'Anträge auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -25,7 +25,7 @@ $sitesettings = extendableApps(array(
 	),
 	'customJSs' => array(
 	)
-));
+);
 
 $this->load->view(
 	'templates/FHC-Header',
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 1b467e576..6d769dafe 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = extendableApps(array(
+$sitesettings = array(
 	'title' => 'Antrag auf Änderung des Studierendenstatus',
 	'cis' => true,
 	'vue3' => true,
@@ -15,7 +15,7 @@ $sitesettings = extendableApps(array(
 	),
 	'customJSs' => array(
 	)
-));
+);
 
 if(defined('CIS4')){
 	$this->load->view(
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index 65707cc7b..e51cfd1bc 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -1,5 +1,5 @@
 <?php
-$sitesettings = extendableApps(array(
+$sitesettings = array(
 	'title' => 'Antrag Wiederholung vom Studium',
 	'cis' => true,
 	'vue3' => true,
@@ -19,7 +19,7 @@ $sitesettings = extendableApps(array(
 	),
 	'customJSs' => array(
 	)
-));
+);
 
 $this->load->view(
 	'templates/FHC-Header',
diff --git a/application/views/lehre/lvplanung/lvTemplateUebersicht.php b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
index 8e47677f0..5c873486c 100644
--- a/application/views/lehre/lvplanung/lvTemplateUebersicht.php
+++ b/application/views/lehre/lvplanung/lvTemplateUebersicht.php
@@ -1,5 +1,5 @@
 <?php
-$includesArray = extendableApps(array(
+$includesArray = array(
 	'title' => 'LV Template Übersicht',
 	'vue3' => true,
 	'axios027' => true,
@@ -14,7 +14,7 @@ $includesArray = extendableApps(array(
 	    'public/css/Fhc.css',
 	    'public/css/lvTemplateUebersicht.css'
 	)
-));
+);
 
 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
index 1d6b50394..ddfe855fe 100644
--- a/application/views/system/logs/logsViewer.php
+++ b/application/views/system/logs/logsViewer.php
@@ -1,5 +1,5 @@
 <?php
-	$includesArray = extendableApps(array(
+	$includesArray = array(
 		'title' => 'Logs Viewer',
 		'axios027' => true,
 		'bootstrap5' => true,
@@ -14,7 +14,7 @@
 			'ui' => array('bitteEintragWaehlen')
 		),
 		'customJSModules' => array('public/js/apps/LogsViewer/LogsViewer.js'),
-	));
+	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c816ebf2e..d2eb229f1 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -17,6 +17,7 @@
 	$use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version');
 
 	// By default set the parameters to null
+	$customCSSs = isset($customCSSs) ? $customCSSs : null;
 	$customJSs = isset($customJSs) ? $customJSs : null;
 	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 
@@ -191,12 +192,13 @@
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
-	
-	
+	$extapphelper = ExtendableAppsHelper::getInstance();
+	$extapphelper->init($customCSSs, $customJSs, $customJSModules);
+
 	// Eventually required JS
 	// NOTE: keep it as the latest
-	generateJSsInclude($customJSs);
-	generateJSModulesInclude($customJSModules);
+	generateJSsInclude($extapphelper->getCustomJSs());
+	generateJSModulesInclude($extapphelper->getCustomJSModules());
 ?>
 	</body>
 </html>
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index f7b5491a1..7b53cbf5d 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -9,6 +9,8 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
+	$customJSs = isset($customJSs) ? $customJSs : null;
+	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
@@ -132,8 +134,11 @@
 			//Tags
 			if ($tags === true) generateCSSsInclude('public/css/tags.css');
 
+			$extapphelper = ExtendableAppsHelper::getInstance();
+			$extapphelper->init($customCSSs, $customJSs, $customJSModules);
+
 			// Eventually required CSS
-			generateCSSsInclude($customCSSs); // Eventually required CSS
+			generateCSSsInclude($extapphelper->getCustomCSSs()); // Eventually required CSS
 		?>
 	</head>
 	<body>

From c57eb1b8de9108dcfbbaa561bf75bc70095bfa98 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Mon, 2 Mar 2026 11:00:05 +0100
Subject: [PATCH 1255/1357] Adapted method getLvLeitung: filter Dummy and allow
 only active Benutzer/Person

---
 application/models/education/Lehrveranstaltung_model.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index ccac33bc7..5422c290e 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -402,14 +402,17 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheit le
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
+				le.lehrveranstaltung_id= ?
+				AND le.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
+				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
+			  	AND b.aktiv = TRUE 
+			  	AND p.aktiv = TRUE
             ORDER BY 
                 lema.insertamum DESC
 			LIMIT 1

From db75cd2f627703694b78d06cbaf5b7ccdbf97aae Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 3 Mar 2026 10:42:47 +0100
Subject: [PATCH 1256/1357] also skip email loop/relevant abgaben loop when
 every occurance is filtered out to avoid empty notification emails;

---
 application/controllers/jobs/AbgabetoolJob.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/application/controllers/jobs/AbgabetoolJob.php b/application/controllers/jobs/AbgabetoolJob.php
index 9b59a72e7..b81053032 100644
--- a/application/controllers/jobs/AbgabetoolJob.php
+++ b/application/controllers/jobs/AbgabetoolJob.php
@@ -495,6 +495,10 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
+		if(!$retval) {
+			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
+			return;
+		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -557,6 +561,8 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
+			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
+			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -575,6 +581,8 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
+				$relevantCounter++;
+
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -633,6 +641,11 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
+			if($relevantCounter == 0) {
+				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
+				continue;
+			}
+			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 

From 56a6aa993e7c8c9d8d01c3aebfdc39bd04994745 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 3 Mar 2026 10:52:12 +0100
Subject: [PATCH 1257/1357] getMitarbeiterProjektarbeiten safeguard in case a
 person without any assigned betreuungen opens the page for some reason to
 avoid nasty confusing sql error messages from querying with empty parameters

---
 application/controllers/api/frontend/v1/Abgabe.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index af598a345..0b82b7c20 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -511,10 +511,11 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
-
-		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
+		if(count($projektarbeiten_ids) > 0) {
+			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
+		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			

From bcd8f11f3519650c180cdef5ac9d8b64d293b86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 3 Mar 2026 11:26:18 +0100
Subject: [PATCH 1258/1357] Fixed Merge Problem

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

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f01f3e138..2fb354f0c 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -542,38 +542,6 @@ class Student extends FHCAPI_Controller
 
 		$this->_validate();
 
-		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_invalid_date')
-		]);
-		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
-		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
-		]);
-		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
-		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
-		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
-		// TODO(chris): validate studienplan with studiengang, semester and orgform?
-		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
 		// TODO(chris): This should be in a library
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -826,8 +794,8 @@ class Student extends FHCAPI_Controller
 		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
 			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
 		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_invalid_date')
 		]);
 		//$this->form_validation->set_rules('address[checked]', 'Address', 'required');
 		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [

From e054f1222bcde63bfe60bc2ae9249038a05e99d3 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Tue, 3 Mar 2026 11:50:45 +0100
Subject: [PATCH 1259/1357] basic model and factory for lohnguide

---
 .../VertragsbestandteilFactory.php            |  12 ++
 .../VertragsbestandteilLohnguide.php          | 137 ++++++++++++++++++
 .../VertragsbestandteilLohnguide_model.php    |  11 ++
 3 files changed, 160 insertions(+)
 create mode 100644 application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
 create mode 100644 application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php

diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php b/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
index 6e7b0af06..2a7955a45 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
@@ -22,6 +22,7 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
+	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -69,6 +70,11 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
+
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$vertragsbestandteil = new VertragsbestandteilLohnguide();
+				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
+				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -127,6 +133,12 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;
 
+			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
+				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
+					'VertragsbestandteilLohnguide_model');
+				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
+				break;
+
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
new file mode 100644
index 000000000..ef87e35e9
--- /dev/null
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
@@ -0,0 +1,137 @@
+<?php
+namespace vertragsbestandteil;
+
+use vertragsbestandteil\Vertragsbestandteil;
+use vertragsbestandteil\VertragsbestandteilFactory;
+
+class VertragsbestandteilLohnguide extends Vertragsbestandteil
+{
+	protected $stellenbezeichnung;
+	protected $fachrichtung_kurzbz;
+	protected $modellstelle_kurzbz;
+	protected $kommentar_person;
+	protected $kommentar_modellstelle;
+
+	public function getStellenbezeichnung()
+	{
+		return $this->stellenbezeichnung;
+	}
+
+	public function setStellenbezeichnung($stellenbezeichnung): self
+	{
+		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
+		$this->stellenbezeichnung = $stellenbezeichnung;
+		return $this;
+	}
+
+	public function getFachrichtung_kurzbz()
+	{
+		return $this->fachrichtung_kurzbz;
+	}
+
+	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
+	{
+		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
+		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
+		return $this;
+	}
+
+	public function getModellstelle_kurzbz()
+	{
+		return $this->modellstelle_kurzbz;
+	}
+
+	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
+	{
+		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
+		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
+		return $this;
+	}
+
+	public function getKommentar_person()
+	{
+		return $this->kommentar_person;
+	}
+
+	public function setKommentar_person($kommentar_person): self
+	{
+		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
+		$this->kommentar_person = $kommentar_person;
+		return $this;
+	}
+
+	public function getKommentar_modellstelle()
+	{
+		return $this->kommentar_modellstelle;
+	}
+
+	public function setKommentar_modellstelle($kommentar_modellstelle): self
+	{
+		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
+		$this->kommentar_modellstelle = $kommentar_modellstelle;
+		return $this;
+	}
+
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+	
+	public function hydrateByStdClass($data, $fromdb=false)
+	{
+		parent::hydrateByStdClass($data, $fromdb);
+		$this->fromdb = $fromdb;
+		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
+		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
+		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
+		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
+		$this->fromdb = false;
+	}
+	
+	public function toStdClass(): \stdClass
+	{
+		$tmp = array(
+			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
+			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'fachrichtung' => $this->getFachrichtung_kurzbz(),
+			'modellstelle' => $this->getModellstelle_kurzbz(),
+			'kommentar_person' => $this->getKommentar_person(),
+			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
+		);
+		
+		$tmp = array_filter($tmp, function($k) {
+			return in_array($k, $this->modifiedcolumns);
+		},  ARRAY_FILTER_USE_KEY);
+		
+		return (object) $tmp;
+	}
+	
+	public function __toString() 
+	{
+		$txt = <<<EOTXT
+		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
+
+EOTXT;
+		return parent::__toString() . $txt;
+	}
+
+	/* public function validate()
+	{
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		}
+		
+		return parent::validate();
+	} */
+}
diff --git a/application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php b/application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php
new file mode 100644
index 000000000..6f3f8e47a
--- /dev/null
+++ b/application/models/vertragsbestandteil/VertragsbestandteilLohnguide_model.php
@@ -0,0 +1,11 @@
+<?php
+
+class VertragsbestandteilLohnguide_model extends DB_Model
+{
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'hr.tbl_vertragsbestandteil_lohnguide';
+		$this->pk = 'vertragsbestandteil_id';
+	}
+}

From 0283c6ca43129ddab6f9f4aad62d5e3e3213eed3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Mar 2026 12:24:34 +0100
Subject: [PATCH 1260/1357] bg-color in details, padding-y tabs, messages align
 table and preview area

---
 public/css/Studentenverwaltung.css            | 51 +++++++++++++++++--
 .../Messages/Details/TableMessages.js         |  8 +--
 public/js/components/Tabs.js                  |  2 +-
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 5139099c6..5d1c1d5c5 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -189,6 +189,7 @@ html.fs_huge {
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
+	font-weight: bold;
 }
 
 .stv .form-control,
@@ -196,11 +197,10 @@ html.fs_huge {
 .stv .input-group-text {
 	padding-top: .15rem;
 	padding-bottom: .15rem;
-	line-height: 1.25;
 }
 
 :root {
-	--bs-body-line-height: 1.25;
+	--bs-body-line-height: 1.2;
 }
 
 .stv .tabulator-row .tabulator-cell,
@@ -214,12 +214,55 @@ html.fs_huge {
 }
 
 .stv .btn {
-	--bs-btn-padding-y: 0.15rem;
-	--bs-btn-line-height: 1.25;
+	--bs-btn-padding-y: 0.25rem;
+	--bs-btn-line-height: 1.2;
 }
 
 .stv .p-button.p-button-icon-only {
 	padding-top: 0;
 	padding-bottom: 0;
 }
+
+.stv .p-tabview .p-tabview-nav li .p-tabview-nav-link {
+	padding: 0.25rem .5rem;
+}
+
+.stv .p-tabview .p-tabview-panels {
+	background-color: #e5eff5;
+}
+
+.stv .p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
+	background: #e5eff5;
+	border-color: #dee2e6 #dee2e6 #e5eff5 #dee2e6;
+}
+
+.stv-details-details-foto img {
+	max-height: 120px;
+}
+
+.stv .tabulator-row .tabulator-frozen,
+.stv .tabulator-row .tabulator-cell {
+	border-bottom: none;
+}
+
+/*
+.stv .p-treetable .p-treetable-thead > tr > th,
+.stv .p-treetable .p-treetable-tbody > tr {
+	background-color: #e5eff5;
+}
+
+.stv .p-treetable .p-treetable-tbody > tr.p-highlight {
+	background: #007bff;
+	color: #fff;
+}
+
+.stv .p-treetable.p-treetable-hoverable-rows .p-treetable-tbody > tr:not(.p-highlight):hover {
+	background: #fff;
+	color: #212529;
+}
+
+.tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #e5eff5;
+}
+*/
 /* slim ende */
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 6a4cf5ca0..75bd056cf 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -392,7 +392,7 @@ export default {
 
 			<div class="row">
 				<!--table-->
-				<div class="col-sm-6 pt-6">
+				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
 						ref="table"
 						:tabulator-options="tabulatorOptions"
@@ -408,9 +408,9 @@ export default {
 				</div>
 
 				<!--preview wysiwyg-window-->
-				<div class="col-sm-6 pt-6">
-				<br><br><br><br>
-					<div ref="preview">
+				<div class="col-sm-6 pt-5">
+					<div class="msg-preview-spacer pt-2" aria-hidden="true"></div>
+					<div ref="preview" class="bg-white">
 						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
 					</div>
 
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index d96d3b769..50a8cf0e7 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -226,7 +226,7 @@ export default {
 				v-for="tab in tabs"
 				:key="tab.key"
 				:header="tab.title + ((tab.value.showSuffix && tab.value.suffix !== '') ? ' ' + tab.value.suffix : '')"
-				:pt="{headerAction:{class: 'p-2'}}"
+				:pt="{headerAction:{class: 'px-2 py-1'}}"
 			>
 				<keep-alive>
 					<component

From 5347cb1d636a8b201d674c2a118796afacd4aa8b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Mar 2026 17:15:23 +0100
Subject: [PATCH 1261/1357] add config STV_TAGS_ENABLED and use it to enable or
 disable tags in StudVw

---
 application/views/Studentenverwaltung.php     |  1 +
 config/global.config-default.inc.php          |  2 ++
 .../js/components/Stv/Studentenverwaltung.js  |  1 +
 .../Stv/Studentenverwaltung/List.js           | 32 ++++++++++++-------
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 4d7181c65..8dd2dd93d 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -48,6 +48,7 @@ $configArray = [
 	'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),
+	'stvTagsEnabled' => defined('STV_TAGS_ENABLED') ? STV_TAGS_ENABLED : false,
 ];
 ?>
 
diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php
index c43cb38d1..943363f6d 100644
--- a/config/global.config-default.inc.php
+++ b/config/global.config-default.inc.php
@@ -371,4 +371,6 @@ define('STATUS_VORRUECKEN_ANZEIGEN', true);
 //externe Ueberwachung im Testtool erlauben
 define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 
+//enable tags in StudVW
+define('STV_TAGS_ENABLED', false);
 ?>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 64f25c114..66ff7f891 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -85,6 +85,7 @@ export default {
 			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
 			configUseReihungstestPunkte: this.config.useReihungstestPunkte,
 			configHasExcludedAreas: this.config.hasExcludedAreas,
+			configStvTagsEnabled: this.config.stvTagsEnabled,
 			appConfig: Vue.computed(() => this.appconfig),
 			hasZGVBakkPermission: this.permissions['student/editBakkZgv'],
 			hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 5bc094a3c..aff26a2db 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -35,7 +35,11 @@ export default {
 		currentSemester: {
 			from: 'currentSemester',
 			required: true
-		}
+		},
+		tagsEnabled: {
+			from: 'configStvTagsEnabled',
+			default: false
+		},
 	},
 	props: {
 		selected: Array,
@@ -65,16 +69,6 @@ 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) => tagFormatter(cell, this.$refs.tagComponent),
-						width: 150,
-					},
 					{title:"Nachname", field:"nachname", headerFilter: true},
 					{title:"Vorname", field:"vorname", headerFilter: true},
 					{title:"Wahlname", field:"wahlname", visible:false, headerFilter: true},
@@ -279,6 +273,21 @@ export default {
 			return "StudentList_" + today + ".csv";
 		},
 	},
+	created: function() {
+		if(this.tagsEnabled) {
+			const coltags = {
+				title: 'Tags',
+				field: 'tags',
+				tooltip: false,
+				headerFilter: "input",
+				headerFilterFunc: tagHeaderFilter,
+				headerFilterFuncParams: {field: 'tags'},
+				formatter: (cell) => tagFormatter(cell, this.$refs.tagComponent),
+				width: 150,
+			};
+			this.tabulatorOptions.columns.splice(2, 0, coltags);
+		}
+	},
 	watch: {
 		'$p.user_language.value'(n, o) {
 			if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
@@ -582,6 +591,7 @@ export default {
 
 			<template #actions>
 				<core-tag ref="tagComponent"
+					v-if="tagsEnabled"
 					:endpoint="tagEndpoint"
 					:values="selectedColumnValues"
 					@added="addedTag"

From 1810bd40bd3380efbe110d3a86c9b6c40ede1c10 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 4 Mar 2026 09:39:58 +0100
Subject: [PATCH 1262/1357] fix bug introduced in commit
 043b1bcf114047eb39ece39ad801a3fbe330b4d7 send intern also using private email
 addresses

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
index 43995b918..d075b5a82 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js
@@ -26,7 +26,7 @@ export default {
 		internMail(event) {
 			if (this.internMails.length)
 			{
-				splitMailsHelper(this.privateMails, event, null, this.$fhcAlert, this.$p)
+				splitMailsHelper(this.internMails, event, null, this.$fhcAlert, this.$p)
 			}
 		},
 		privateMail(event) {

From 41b2a6d1d49b37f454313695aaa877317ae070b9 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 4 Mar 2026 10:53:30 +0100
Subject: [PATCH 1263/1357] added db migration for lohnguide

---
 system/dbupdate_3.4.php                 |   6 +
 system/dbupdate_3.4/70376_lohnguide.php | 337 ++++++++++++++++++++++++
 2 files changed, 343 insertions(+)
 create mode 100644 system/dbupdate_3.4/70376_lohnguide.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 793930243..c6d38dddd 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -91,6 +91,7 @@ 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');
+require_once('dbupdate_3.4/70376_lohnguide.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -238,6 +239,11 @@ $tabellen=array(
 	"hr.tbl_valorisierung_instanz" => array("updateamum", "oe_kurzbz", "valorisierungsdatum", "valorisierung_kurzbz", "beschreibung", "ausgewaehlt", "updatevon", "valorisierung_instanz_id"),
 	"hr.tbl_valorisierung_instanz_methode" => array("valorisierung_instanz_id", "valorisierung_methode_kurzbz", "beschreibung", "valorisierung_methode_parameter"),
 	"hr.tbl_valorisierung_methode" => array("beschreibung", "valorisierung_methode_kurzbz"),
+	"hr.tbl_lohnguide_jobfamilie" => array("jobfamilie_kurzbz", "bezeichnung", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
+	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
+	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
+	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
new file mode 100644
index 000000000..f99d6acd8
--- /dev/null
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -0,0 +1,337 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_jobfamilie' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_jobfamilie (
+    jobfamilie_kurzbz character varying(32) NOT NULL,
+    bezeichnung varchar(64) NOT NULL,
+    aktiv boolean DEFAULT FALSE,
+    sort smallint,
+    insertvon character varying(32) NOT NULL,
+    insertamum timestamp without time zone DEFAULT now() NOT NULL,
+    updatevon character varying(32),
+    updateamum timestamp without time zone,
+    CONSTRAINT tbl_lohnguide_jobfamilie_pkey PRIMARY KEY (jobfamilie_kurzbz)
+);
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_jobfamilie TO vilesci;
+
+INSERT INTO hr.tbl_lohnguide_jobfamilie(jobfamilie_kurzbz, bezeichnung,aktiv, sort, insertvon, insertamum) VALUES
+('FÜHRUNG','Führung',true,1,'system',NOW()),
+('ALLGEMEIN','Allgemein',true,2,'system',NOW()),
+('TECHNIK','Technik',true,3,'system',NOW()),
+('IT','IT',true,4,'system',NOW()),
+('PRODUKTION','Produktion',true,5,'system',NOW()),
+('HANDW_IH_LOG','Handwerk, Instandhaltung + Logistik',true,6,'system',NOW())
+ON CONFLICT (jobfamilie_kurzbz) DO NOTHING;
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Lohnguide Jobfamilie: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'hr.tbl_lohnguide_jobfamilie wurde neu erstellt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_modellfunktion' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellfunktion (
+    modellfunktion_kurzbz character varying(32) NOT NULL,
+    bezeichnung varchar(64) NOT NULL,
+    jobfamilie_kurzbz character varying(32) NOT NULL,
+    aktiv boolean DEFAULT FALSE,
+    sort smallint,
+    insertvon character varying(32) NOT NULL,
+    insertamum timestamp without time zone DEFAULT now() NOT NULL,
+    updatevon character varying(32),
+    updateamum timestamp without time zone,
+    CONSTRAINT tbl_lohnguide_modellfunktion_pkey PRIMARY KEY (modellfunktion_kurzbz),
+	CONSTRAINT tbl_lohnguide_modellfunktion_jobfamilie_fk FOREIGN KEY (jobfamilie_kurzbz) REFERENCES hr.tbl_lohnguide_jobfamilie (jobfamilie_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellfunktion TO vilesci;
+
+INSERT INTO hr.tbl_lohnguide_modellfunktion(modellfunktion_kurzbz, bezeichnung, jobfamilie_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FÜHRUNG_I','Führung I','FÜHRUNG',true,1,'system',NOW()),
+('FÜHRUNG_II','Führung I','FÜHRUNG',true,2,'system',NOW()),
+('FÜHRUNG_III','Führung I','FÜHRUNG',true,3,'system',NOW()),
+('GF','Geschäftsführung','FÜHRUNG',true,4,'system',NOW()),
+/* Allgemein */
+('FK_ALLGM','Fachkraft Allgemein','ALLGEMEIN',true,5,'system',NOW()),
+('SFK_ALLGM','Spezial-Fachkraft Allgemein','ALLGEMEIN',true,6,'system',NOW()),
+('SP_ALLGM','Spezialist:in Allgemein','ALLGEMEIN',true,7,'system',NOW()),
+('EXP_ALLGM','Expert:in Allgemein','ALLGEMEIN',true,8,'system',NOW()),
+('TOP_EXP_ALLGM','Top-Expert:in Allgemein','ALLGEMEIN',true,9,'system',NOW()),
+/* Technik */
+('FK_TECH','Fachkraft Technik','TECHNIK',true,10,'system',NOW()),
+('SFK_TECH','Spezial-Fachkraft Technik','TECHNIK',true,11,'system',NOW()),
+('SP_TECH','Spezialist:in Technik','TECHNIK',true,12,'system',NOW()),
+('EXP_TECH','Expert:in Technik','TECHNIK',true,13,'system',NOW()),
+('TOP_EXP_TECH','Top-Expert:in Technik','TECHNIK',true,14,'system',NOW()),
+/* IT */
+('FK_IT','Fachkraft IT','IT',true,15,'system',NOW()),
+('SFK_IT','Spezial-Fachkraft IT','IT',true,16,'system',NOW()),
+('SP_IT','Spezialist:in IT','IT',true,17,'system',NOW()),
+('EXP_IT','Expert:in IT','IT',true,18,'system',NOW()),
+('TOP_EXP_IT','Top-Expert:in IT','IT',true,19,'system',NOW()),
+/* Produktion */
+('HK_PROD','Hilfskraft Produktion','PRODUKTION',true,20,'system',NOW()),
+('FK_PROD','Fachkraft Produktion','PRODUKTION',true,21,'system',NOW()),
+('SFK_PROD','Spezial-Fachkraft Produktion','PRODUKTION',true,22,'system',NOW()),
+('SP_PROD','Spezialist:in Produktion','PRODUKTION',true,23,'system',NOW()),
+/* Handwerk, Instandhaltung, Logistik */
+('HK_HIL','Hilfskraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,24,'system',NOW()),
+('FK_HIL','Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,25,'system',NOW()),
+('SFK_HIL','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,26,'system',NOW()),
+('SP_HIL','Spezialist:in Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,27,'system',NOW())
+ON CONFLICT (modellfunktion_kurzbz) DO NOTHING;
+
+
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Lohnguide Modellfunktion: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'hr.tbl_lohnguide_modellfunktion wurde neu erstellt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_modellstelle' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
+    modellstelle_kurzbz character varying(32) NOT NULL,
+    bezeichnung varchar(128) NOT NULL,
+    grade int NOT NULL,
+    modellfunktion_kurzbz character varying(32) NOT NULL,
+    aktiv boolean DEFAULT FALSE,
+    sort smallint,
+    insertvon character varying(32) NOT NULL,
+    insertamum timestamp without time zone DEFAULT now() NOT NULL,
+    updatevon character varying(32),
+    updateamum timestamp without time zone,
+    CONSTRAINT tbl_lohnguide_modellstelle_pkey PRIMARY KEY (modellstelle_kurzbz),
+	CONSTRAINT tbl_lohnguide_modellstelle_modellfunktion_fk FOREIGN KEY (modellfunktion_kurzbz) REFERENCES hr.tbl_lohnguide_modellfunktion (modellfunktion_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellstelle TO vilesci;
+
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('111','Führung III 1/5',9,'FÜHRUNG_III',true,13,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('112','Führung III 2/5',10,'FÜHRUNG_III',true,14,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('113','Führung III 3/5',11,'FÜHRUNG_III',true,15,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('114','Führung III 4/5',12,'FÜHRUNG_III',true,16,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('115','Führung III 5/5',13,'FÜHRUNG_III',true,17,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('121','Führung II 1/4',14,'FÜHRUNG_II',true,7,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122a','Führung II 2a/4',15,'FÜHRUNG_II',true,8,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122b','Führung II 2b/4',15,'FÜHRUNG_II',true,9,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123a','Führung II 3a/4',16,'FÜHRUNG_II',true,10,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123b','Führung II 3b/4',16,'FÜHRUNG_II',true,11,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('124','Führung II 4/4',17,'FÜHRUNG_II',true,12,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('131','Führung I 1/4',18,'FÜHRUNG_I',true,1,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132a','Führung I 2a/4',19,'FÜHRUNG_I',true,2,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132b','Führung I 2b/4',19,'FÜHRUNG_I',true,3,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133a','Führung I 3a/4',20,'FÜHRUNG_I',true,4,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133b','Führung I 3b/4',20,'FÜHRUNG_I',true,5,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('134','Führung I 4/4',21,'FÜHRUNG_I',true,6,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- GF
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('141','Geschäftsführung 1/5',22,'GF',true,18,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142a','Geschäftsführung 2a/5',23,'GF',true,19,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142b','Geschäftsführung 2b/5',23,'GF',true,20,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143a','Geschäftsführung 3a/5',24,'GF',true,21,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143b','Geschäftsführung 3b/5',24,'GF',true,22,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144a','Geschäftsführung 4a/5',25,'GF',true,23,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144b','Geschäftsführung 4b/5',25,'GF',true,24,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('145','Geschäftsführung 5/5',26,'GF',true,25,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- Allgemein
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('211','Fachkraft Allgemein 1/3',4,'FK_ALLGM',true,26,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212a','Fachkraft Allgemein 2a/3',5,'FK_ALLGM',true,27,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212b','Fachkraft Allgemein 2b/3',5,'FK_ALLGM',true,28,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('213','Fachkraft Allgemein 3/3',6,'FK_ALLGM',true,29,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('221','Spezial-Fachkraft Allgemein 1/4', 7,'SFK_ALLGM',true,30,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222a','Spezial-Fachkraft Allgemein 2a/4',8,'SFK_ALLGM',true,31,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222b','Spezial-Fachkraft Allgemein 2b/4',8,'SFK_ALLGM',true,32,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223a','Spezial-Fachkraft Allgemein 3a/4',9,'SFK_ALLGM',true,33,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223b','Spezial-Fachkraft Allgemein 3b/4',9,'SFK_ALLGM',true,34,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('224','Spezial-Fachkraft Allgemein 4/4',10,'SFK_ALLGM',true,35,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('231','Spezialist:in Allgemein 1/4',11,'SP_ALLGM',true,36,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232a','Spezialist:in Allgemein 2a/4',12,'SP_ALLGM',true,37,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232b','Spezialist:in Allgemein 2b/4',12,'SP_ALLGM',true,38,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233a','Spezialist:in Allgemein 3a/4',13,'SP_ALLGM',true,39,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233b','Spezialist:in Allgemein 3b/4',13,'SP_ALLGM',true,40,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('234','Spezialist:in Allgemein 4/4',14,'SP_ALLGM',true,41,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('241','Expert:in Allgemein 1/4',15,'EXP_ALLGM',true,42,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242a','Expert:in Allgemein 2a/4',16,'EXP_ALLGM',true,43,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242b','Expert:in Allgemein 2b/4',16,'EXP_ALLGM',true,44,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243a','Expert:in Allgemein 3a/4',17,'EXP_ALLGM',true,45,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243b','Expert:in Allgemein 3b/4',17,'EXP_ALLGM',true,46,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('244','Expert:in Allgemein 4/4',18,'EXP_ALLGM',true,47,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('251','Top-Expert:in Allgemein 1/1',19,'TOP_EXP_ALLGM',true,48,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- Technik
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('311','Fachkraft Technik 1/3',4,'FK_TECH',true,49,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312a','Fachkraft Technik 2a/3',5,'FK_TECH',true,50,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312b','Fachkraft Technik 2b/3',5,'FK_TECH',true,51,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('313','Fachkraft Technik 3/3',6,'FK_TECH',true,52,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('321','Spezial-Fachkraft Technik 1/4',7,'SFK_TECH',true,53,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322a','Spezial-Fachkraft Technik 2a/4',8,'SFK_TECH',true,54,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322b','Spezial-Fachkraft Technik 2b/4',8,'SFK_TECH',true,55,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323a','Spezial-Fachkraft Technik 3a/4',9,'SFK_TECH',true,56,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323b','Spezial-Fachkraft Technik 3b/4',9,'SFK_TECH',true,57,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('324','Spezial-Fachkraft Technik 4/4',10,'SFK_TECH',true,58,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('331','Spezialist:in Technik 1/4',11,'SP_TECH',true,59,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332a','Spezialist:in Technik 2a/4',12,'SP_TECH',true,60,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332b','Spezialist:in Technik 2b/4',12,'SP_TECH',true,61,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333a','Spezialist:in Technik 3a/4',13,'SP_TECH',true,62,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333b','Spezialist:in Technik 3b/4',13,'SP_TECH',true,63,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('334','Spezialist:in Technik 4/4',14,'SP_TECH',true,64,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('341','Expert:in Technik 1/4',15,'EXP_TECH',true,65,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342a','Expert:in Technik 2a/4',16,'EXP_TECH',true,66,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342b','Expert:in Technik 2b/4',16,'EXP_TECH',true,67,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343a','Expert:in Technik 3a/4',17,'EXP_TECH',true,68,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343b','Expert:in Technik 3b/4',17,'EXP_TECH',true,69,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('344','Expert:in Technik 4/4',18,'EXP_TECH',true,70,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('351','Top-Expert:in Technik 1/1',19,'TOP_EXP_TECH',true,71,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- IT
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('411','Fachkraft IT 1/2',5,'FK_IT',true,72,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('412','Fachkraft IT 2/2',6,'FK_IT',true,73,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('421','Spezial-Fachkraft IT 1/4',7,'SFK_IT',true,74,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('422','Spezial-Fachkraft IT 2/4',8,'SFK_IT',true,75,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('423','Spezial-Fachkraft IT 3/4',9,'SFK_IT',true,76,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('424','Spezial-Fachkraft IT 4/4',10,'SFK_IT',true,77,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('431','Spezialist:in IT 1/4',11,'SP_IT',true,78,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432a','Spezialist:in IT 2a/4',12,'SP_IT',true,79,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432b','Spezialist:in IT 2b/4',12,'SP_IT',true,80,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433a','Spezialist:in IT 3a/4',13,'SP_IT',true,81,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433b','Spezialist:in IT 3b/4',13,'SP_IT',true,82,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('434','Spezialist:in IT 4/4',14,'SP_IT',true,83,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('441','Expert:in IT 1/4',15,'EXP_IT',true,84,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('442','Expert:in IT 2/4',16,'EXP_IT',true,85,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('443','Expert:in IT 3/4',17,'EXP_IT',true,86,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('444','Expert:in IT 4/4',18,'EXP_IT',true,87,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('451','Top-Expert:in IT 1/1',19,'TOP_EXP_IT',true,88,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- Produktion
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('511','Hilfskraft Produktion 1/4',1,'HK_PROD',true,89,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('512','Hilfskraft Produktion 2/4',2,'HK_PROD',true,90,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('513','Hilfskraft Produktion 3/4',3,'HK_PROD',true,91,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('514','Hilfskraft Produktion 4/4',4,'HK_PROD',true,92,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('521','Fachkraft Produktion 1/2',5,'FK_PROD',true,93,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('522','Fachkraft Produktion 2/2',6,'FK_PROD',true,94,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('531','Spezial-Fachkraft Produktion 1/4',7,'SFK_PROD',true,95,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('532','Spezial-Fachkraft Produktion 2/4',8,'SFK_PROD',true,96,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('533','Spezial-Fachkraft Produktion 3/4',9,'SFK_PROD',true,97,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('534','Spezial-Fachkraft Produktion 4/4',10,'SFK_PROD',true,98,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('541','Spezialist:in Produktion 1/4',11,'SP_PROD',true,99,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542a','Spezialist:in Produktion 2a/4',12,'SP_PROD',true,100,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542b','Spezialist:in Produktion 2b/4',12,'SP_PROD',true,101,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543a','Spezialist:in Produktion 3a/4',13,'SP_PROD',true,102,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543b','Spezialist:in Produktion 3b/4',13,'SP_PROD',true,103,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('544','Spezialist:in Produktion 4/4',14,'SP_PROD',true,104,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+-- Handwerk, Logistik, ..
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('611','Hilfskraft Handwerk, Instandhaltung + Logistik 1/4',1,'HK_HIL',true,105,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('612','Hilfskraft Handwerk, Instandhaltung + Logistik 2/4',2,'HK_HIL',true,106,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('613','Hilfskraft Handwerk, Instandhaltung + Logistik 3/4',3,'HK_HIL',true,107,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('614','Hilfskraft Handwerk, Instandhaltung + Logistik 4/4',4,'HK_HIL',true,108,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('621','Fachkraft Handwerk, Instandhaltung + Logistik 1/2',5,'FK_HIL',true,109,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('622','Fachkraft Handwerk, Instandhaltung + Logistik 2/2',6,'FK_HIL',true,110,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('631','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 1/4',7,'SFK_HIL',true,111,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('632','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 2/4',8,'SFK_HIL',true,112,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('633','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 3/4',9,'SFK_HIL',true,113,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('634','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 4/4',10,'SFK_HIL',true,114,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Lohnguide Modellstelle: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'hr.tbl_lohnguide_modellstelle wurde neu erstellt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_lohnguide_fachrichtung' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_fachrichtung (
+    fachrichtung_kurzbz character varying(32) NOT NULL,
+    bezeichnung varchar(32) NOT NULL,
+    aktiv boolean DEFAULT FALSE,
+    insertvon character varying(32) NOT NULL,
+    insertamum timestamp without time zone DEFAULT now() NOT NULL,
+    updatevon character varying(32),
+    updateamum timestamp without time zone,
+    CONSTRAINT tbl_lohnguide_fachrichtung_pkey PRIMARY KEY (fachrichtung_kurzbz)
+);
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_fachrichtung TO vilesci;
+
+INSERT INTO hr.tbl_lohnguide_fachrichtung(fachrichtung_kurzbz,bezeichnung,aktiv,insertvon,insertamum) VALUES
+('FA00','Keine Berücksichtigung',true,'system',NOW()),
+('FA01','Administration allgemein',true,'system',NOW()),
+('FA02','Dienste Infrastruktur',true,'system',NOW()),
+('FA03','Finanzwesen & Controlling',true,'system',NOW()),
+('FA04','IT',true,'system',NOW()),
+('FA05','Logistik',true,'system',NOW()),
+('FA06','Marketing & Digitales Marketing',true,'system',NOW()),
+('FA07','Produktion',true,'system',NOW()),
+('FA08','Technik',true,'system',NOW()),
+('FA09','Verkauf',true,'system',NOW())
+ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
+
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Lohnguide Fachrichtung: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'hr.tbl_lohnguide_fachrichtung wurde neu erstellt<br>';
+	}
+}
+
+
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_vertragsbestandteil_lohnguide' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
+    vertragsbestandteil_id integer NOT NULL,
+    stellenbezeichnung varchar(255),
+    fachrichtung_kurzbz character varying(32) NOT NULL,
+    modellstelle_kurzbz character varying(32) NOT NULL,
+    kommentar_person varchar(255),
+    kommentar_modellstelle varchar(255),
+    CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
+	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
+	CONSTRAINT tbl_vertragsbestandteil_modellstelle_fachrichtung_fk FOREIGN KEY (modellstelle_kurzbz) REFERENCES hr.tbl_lohnguide_modellstelle (modellstelle_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+COMMENT ON TABLE hr.tbl_vertragsbestandteil_lohnguide IS E'Zuordnung für EU-Entgelttransparenzrichtlinie';
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_vertragsbestandteil_lohnguide TO vilesci;
+
+
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Vertragsbestandteil Lohnguide: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'hr.tbl_vertragsbestandteil_lohnguide wurde neu erstellt<br>';
+	}
+}
+		
\ No newline at end of file

From fc4e79c1f532dfa2f5deaaa470e383a60abe528f Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 4 Mar 2026 11:12:58 +0100
Subject: [PATCH 1264/1357] Personalmeldung: include Lehrgaenge in Lehre in
 legacy script

---
 include/lehreinheitmitarbeiter.class.php | 11 +++++++++--
 vilesci/bis/personalmeldung.php          | 19 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/include/lehreinheitmitarbeiter.class.php b/include/lehreinheitmitarbeiter.class.php
index 80cdd0c8b..90617ccfe 100644
--- a/include/lehreinheitmitarbeiter.class.php
+++ b/include/lehreinheitmitarbeiter.class.php
@@ -554,7 +554,8 @@ class lehreinheitmitarbeiter extends basis_db
 
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden, stg.studiengang_kz
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -577,13 +578,17 @@ class lehreinheitmitarbeiter extends basis_db
 			SELECT
 				studiengang_kz,
 				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode,
 				sum(semesterstunden)				AS summe,
 				round(sum(semesterstunden) / 15, 2)	AS sws
 			FROM
 				semester_sws_tbl
 			GROUP BY
 				studiengang_kz,
-				studiensemester_kurzbz
+				studiensemester_kurzbz,
+				melde_studiengang_kz,
+				lgartcode
 			ORDER BY
 				studiengang_kz;
 		';
@@ -595,6 +600,8 @@ class lehreinheitmitarbeiter extends basis_db
 				$obj = new StdClass();
 				$obj->studiengang_kz = $row->studiengang_kz;
 				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
+				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
 				$this->result []= $obj;
 			}
diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
index cd929c24b..69c358db6 100644
--- a/vilesci/bis/personalmeldung.php
+++ b/vilesci/bis/personalmeldung.php
@@ -875,7 +875,6 @@ function _getLehrecontainer($sws_proStg_arr)
 		$sws_proStg_arr = array_filter($sws_proStg_arr, function ($obj) {
 			return
 				!in_array($obj->studiengang_kz, BIS_EXCLUDE_STG) &&
-				$obj->studiengang_kz > 0 &&
 				$obj->studiengang_kz < 10000;
 		});
 	}
@@ -886,13 +885,17 @@ function _getLehrecontainer($sws_proStg_arr)
 		{
 			$is_sommersemester = substr($sws_proStg->studiensemester_kurzbz, 0, 2) == 'SS';
 			$is_wintersemester = substr($sws_proStg->studiensemester_kurzbz, 0, 2) == 'WS';
+			$is_lehrgang = isset($sws_proStg->lgartcode);
+			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';
 
 			// Lehreobjekt generieren
 			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();
 
-				$lehre_obj->StgKz = setLeadingZero(intval($sws_proStg->studiengang_kz), 4);
+				$lehre_obj->{$kennzeichen_name} = $sws_proStg->melde_studiengang_kz;
+				//~ $lehre_obj->StgKz = setLeadingZero(intval($sws_proStg->studiengang_kz), 4);
+
 				$lehre_obj->SommersemesterSWS = $is_sommersemester ? $sws_proStg->sws : 0.00;
 				$lehre_obj->WintersemesterSWS = $is_wintersemester ? $sws_proStg->sws : 0.00;
 
@@ -1020,7 +1023,12 @@ function _generateXML($person_arr)
 		foreach ($person->lehre_arr as $lehre)
 		{
 			$xml .= '<Lehre>';
-			$xml .= '<StgKz><![CDATA['. $lehre->StgKz. ']]></StgKz>';
+
+			if (isset($lehre->LehrgangNr))
+				$xml .= '<LehrgangNr><![CDATA['. $lehre->LehrgangNr. ']]></LehrgangNr>';
+			else
+				$xml .= '<StgKz><![CDATA['. $lehre->StgKz. ']]></StgKz>';
+
 			$xml .= '<SommersemesterSWS><![CDATA['. $lehre->SommersemesterSWS. ']]></SommersemesterSWS>';
 			$xml .= '<WintersemesterSWS><![CDATA['. $lehre->WintersemesterSWS. ']]></WintersemesterSWS>';
 			$xml .= '</Lehre>';
@@ -1211,7 +1219,7 @@ function _outputHTML($person_arr)
 			{
 				echo '
 				<tr>
-					<td>'. $lehre->StgKz. '</td>
+					<td>'. (isset($lehre->LehrgangNr) ? $lehre->LehrgangNr : $lehre->StgKz). '</td>
 					<td>'. $lehre->SommersemesterSWS. '</td>
 					<td>'. $lehre->WintersemesterSWS. '</td>
 				</tr>';
@@ -1359,7 +1367,8 @@ function lehre_stg_exists($studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		if($row->StgKz == $studiengang_kz)
+		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
+		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}
 	return false;

From 35d83942c09c1c08391431c278481dbc2cad988a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 4 Mar 2026 16:03:51 +0100
Subject: [PATCH 1265/1357] use primevue tabs in LVVerwaltung

---
 public/js/components/LVVerwaltung/Setup/Tabs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/LVVerwaltung/Setup/Tabs.js b/public/js/components/LVVerwaltung/Setup/Tabs.js
index 62c5bbc31..c8101846c 100644
--- a/public/js/components/LVVerwaltung/Setup/Tabs.js
+++ b/public/js/components/LVVerwaltung/Setup/Tabs.js
@@ -47,6 +47,7 @@ export default {
 				<fhc-tabs 
 					v-if="lv.length === 1"
 					ref="tabs"
+					:useprimevue="true"
 					:modelValue="lv[0]"
 					:config="configLVTabs"
 					:default="$route.params.tab"

From c40fdb2c4f8967d117e2adc0c4c68e54d9a28a3f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Mar 2026 11:35:57 +0100
Subject: [PATCH 1266/1357] getMessagesForTable laststatus only for
 filteredmessages

---
 application/models/system/Message_model.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 19129b606..3e59d7250 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -276,6 +276,8 @@ class Message_model extends DB_Model
 							s.message_id, s.person_id, MAX(s.insertamum) as lastinserted
 						from
 							public.tbl_msg_status s
+						join
+							filtered_messages fm on fm.message_id = s.message_id and fm.recipient_id = s.person_id
 						group by
 							s.message_id, s.person_id
 					) ls

From 5fbcf588ed8a975250098212e925fb7f87d4b48e Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 5 Mar 2026 14:29:56 +0100
Subject: [PATCH 1267/1357] fix vertragsbestandteil lohnguide

---
 .../VertragsbestandteilFactory.php            |  1 +
 .../VertragsbestandteilLib.php                |  1 +
 .../VertragsbestandteilLohnguide.php          | 19 +++++++++++--------
 system/dbupdate_3.4/70376_lohnguide.php       | 13 +++++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php b/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
index 2a7955a45..50504099a 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilFactory.php
@@ -3,6 +3,7 @@ namespace vertragsbestandteil;
 
 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
+use vertragsbestandteil\VertragsbestandteilLohnguide;
 
 /**
  * Description of VertragsbestandteilFactory
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
index 1ecb9ac60..61208eda0 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
@@ -10,6 +10,7 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
+require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
 
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
index ef87e35e9..5a61cc5db 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
@@ -12,6 +12,14 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 	protected $kommentar_person;
 	protected $kommentar_modellstelle;
 
+
+	public function __construct()
+	{
+		parent::__construct();
+		$this->setVertragsbestandteiltyp_kurzbz(
+			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
+	}
+
 	public function getStellenbezeichnung()
 	{
 		return $this->stellenbezeichnung;
@@ -73,12 +81,7 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 	}
 
 	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
-	}
+	
 	
 	public function hydrateByStdClass($data, $fromdb=false)
 	{
@@ -97,8 +100,8 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 		$tmp = array(
 			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
 			'stellenbezeichnung' => $this->getStellenbezeichnung(),
-			'fachrichtung' => $this->getFachrichtung_kurzbz(),
-			'modellstelle' => $this->getModellstelle_kurzbz(),
+			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
+			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
 			'kommentar_person' => $this->getKommentar_person(),
 			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
 		);
diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index f99d6acd8..33052023a 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -334,4 +334,17 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_vertragsbestandteil_lohnguide
 			echo 'hr.tbl_vertragsbestandteil_lohnguide wurde neu erstellt<br>';
 	}
 }
+
+if($result = $db->db_query("SELECT 1 FROM hr.tbl_vertragsbestandteiltyp WHERE vertragsbestandteiltyp_kurzbz = 'lohnguide'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "insert into hr.tbl_vertragsbestandteiltyp (vertragsbestandteiltyp_kurzbz,bezeichnung,ueberlappend) values('lohnguide','Lohnguide',false)";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Public Tabelle person: '.$db->db_last_error().'</strong><br>';
+		else
+			echo "<br>Vertragsbestandteiltyp 'lohnguide' hinzugefuegt";
+	}
+}
 		
\ No newline at end of file

From 6b816def3107fa7d782e0ec16603011f12fa1035 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 5 Mar 2026 15:34:51 +0100
Subject: [PATCH 1268/1357] add lohnguide to vertragsbestandteil SQL

---
 .../models/vertragsbestandteil/Vertragsbestandteil_model.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
index ce741268d..fe6823293 100644
--- a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
@@ -37,7 +37,8 @@ class Vertragsbestandteil_model extends DB_Model
 				kf.arbeitgeber_frist, kf.arbeitnehmer_frist,
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
-				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice
+				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
+				lg.stellenbezeichnung, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
@@ -63,6 +64,8 @@ class Vertragsbestandteil_model extends DB_Model
 				hr.tbl_vertragsbestandteil_urlaubsanspruch u USING(vertragsbestandteil_id)
 			LEFT JOIN
 				hr.tbl_vertragsbestandteil_zeitaufzeichnung z USING(vertragsbestandteil_id)
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_lohnguide lg USING(vertragsbestandteil_id)
 EOSQL;
 		return $sql;
 	}

From 32a2e7708f0123230de53bb6e32e47755d7e5d8b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 9 Mar 2026 12:10:22 +0100
Subject: [PATCH 1269/1357] remove bg color in stv and lvvw Tabs, detailsheader
 ajust foto buttons

---
 public/css/Studentenverwaltung.css     | 4 ++--
 public/css/components/Detailheader.css | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 6347f6840..cb4b8f2e9 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -241,7 +241,7 @@ html.fs_huge {
 .stv .p-tabview .p-tabview-nav li .p-tabview-nav-link {
 	padding: 0.25rem .5rem;
 }
-
+/*
 .stv .p-tabview .p-tabview-panels {
 	background-color: #e5eff5;
 }
@@ -250,7 +250,7 @@ html.fs_huge {
 	background: #e5eff5;
 	border-color: #dee2e6 #dee2e6 #e5eff5 #dee2e6;
 }
-
+*/
 .stv-details-details-foto img {
 	max-height: 120px;
 }
diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css
index e283a55cc..dcfcf6806 100644
--- a/public/css/components/Detailheader.css
+++ b/public/css/components/Detailheader.css
@@ -45,11 +45,11 @@
 }*/
 
 .buttonleft {
-    margin-left: 1rem;
+    margin-left: .25rem;
 }
 
 .buttonright {
-    margin-right: 1rem;
+    margin-right: .25rem;
 }
 
 /*.fotoEditMa {

From 33252de895843840595436a1eca423c796a5702f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 10 Mar 2026 11:11:40 +0100
Subject: [PATCH 1270/1357] use ma0646 tabulator scroll fix on
 students/prestudents list

---
 .../Stv/Studentenverwaltung/List.js           | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c47a65885..1aa2c6b70 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -178,6 +178,14 @@ export default {
 					event: 'rowSelectionChanged',
 					handler: this.rowSelectionChanged
 				},
+				{
+					event: 'dataLoading',
+					handler: this.handleDataLoading
+				},
+				{
+					event: 'renderComplete',
+					handler: this.handleRenderComplete
+				},
 				{
 					event: 'dataProcessed',
 					handler: (data) => {
@@ -226,7 +234,10 @@ export default {
 			tagEndpoint: ApiTag,
 			currentEndpoint: null,
 			headerFilterActive: false,
-			dragSource: []
+			dragSource: [],
+			oldScrollUrl: '',
+			oldScrollLeft: 0,
+			oldScrollTop: 0
 		}
 	},
 	computed: {
@@ -567,6 +578,24 @@ export default {
 
 			this.dragSource = (isAlreadySelected && this.selected?.length) ? this.selected : [data];
 		},
+		handleDataLoading() {
+			this.oldScrollLeft = this.$refs.table.tabulator.rowManager.scrollLeft;
+			this.oldScrollTop = this.$refs.table.tabulator.rowManager.scrollTop;
+		},
+		handleRenderComplete() {
+			const table = this.$refs.table.tabulator.element.querySelector('.tabulator-tableholder');
+			if(table) {
+				const curAjaxUrl = this.$refs.table.tabulator.getAjaxUrl();
+				if(this.oldScrollUrl === curAjaxUrl) {
+					table.scrollLeft = this.oldScrollLeft;
+					table.scrollTop = this.oldScrollTop;
+				} else {
+					this.oldScrollLeft = table.scrollLeft;
+					this.oldScrollTop = table.scrollTop;
+				}
+				this.oldScrollUrl = this.$refs.table.tabulator.getAjaxUrl();
+			}
+		},
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features

From 7cd438d18839d1b059a2934144942baff9b907be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 10 Mar 2026 11:47:24 +0100
Subject: [PATCH 1271/1357] Wenn Punkteeingabe aktiviert ist werden auch Punkte
 in der Excel Notenliste exportiert damit es beim Import von Spezialnoten (zb
 18) nicht zu Problemen kommt

---
 cis/private/lehre/notenliste.xls.php | 41 ++++++++++++++++++----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 6c8db5246..8202302a0 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -264,7 +264,7 @@ else
 		tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
 		tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
 		(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
-		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
+		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
 	FROM
 		campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
 		JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
@@ -306,7 +306,14 @@ else
 						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
 							$inc.=' (o)';
 
-					$note = $elem->note;
+					if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+					{
+						$note = $elem->punkte;
+					}
+					else
+					{
+						$note = $elem->note;
+					}
 
 					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
@@ -346,13 +353,16 @@ else
 						{
 							$resultPr = $output2[0];
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
+							else
+								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+						}
+						else
+						{
+								$worksheet->write($lines,9, '', $format_highlightright_date);
+								$worksheet->write($lines,10, '', $format_highlightright);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,10, '', $format_highlightright);
-                                                }
 					}
 
 					// Nachprüfung
@@ -367,13 +377,16 @@ else
 						{
 							$resultPr = $output3[0];
 							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
+							else
+								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+						}
+						else
+						{
+								$worksheet->write($lines,13, '', $format_highlightright_date);
+								$worksheet->write($lines,14, '', $format_highlightright);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,14, '', $format_highlightright);
-                                                }
 					}
 
 					$i++;

From 5ce0232890cc6ccc0b93fa441854bf535d396d13 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Mar 2026 11:50:09 +0100
Subject: [PATCH 1272/1357] fix bug in archiv tab

---
 .../api/frontend/v1/stv/Dokumente.php         |  4 ++++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 22 +++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 9f54d0aa4..b8c7830bd 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -753,6 +753,10 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
+		if(!(is_array($data) && count($data) > 0))
+		{
+			return null;
+		}
 		$student = current($data);
 
 		return $student->student_uid;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 9477b08f4..756d9a774 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -225,18 +225,32 @@ export default {
 			return events;
 		},
 		studentUids() {
-			if (this.modelValue.uid)
+			if(Array.isArray(this.modelValue))
+			{
+				return this.modelValue.map(e => e.uid);
+			}
+			else if (this.modelValue.uid)
 			{
 				return [this.modelValue.uid];
 			}
-			return this.modelValue.map(e => e.uid);
+			else
+			{
+				return [];
+			}
 		},
 		studentKzs(){
-			if (this.modelValue.uid)
+			if(Array.isArray(this.modelValue))
+			{
+				return this.modelValue.map(e => e.studiengang_kz);
+			}
+			else if (typeof this.modelValue.studiengang_kz !== 'undefined')
 			{
 				return [this.modelValue.studiengang_kz];
 			}
-			return this.modelValue.map(e => e.studiengang_kz);
+			else
+			{
+				return [];
+			}
 		},
 		stg_kz(){
 			return this.studentKzs[0];

From c3d20bb181a6dbd347ee6e6df3a97580a9fa1094 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 11 Mar 2026 12:37:28 +0100
Subject: [PATCH 1273/1357] Personalmeldung Lehrgaenge: distributed sws among
 Lehrgang types (Zertifikat, Master etc...)

---
 include/lehreinheitmitarbeiter.class.php | 158 ++++++++++++++++++++++-
 1 file changed, 153 insertions(+), 5 deletions(-)

diff --git a/include/lehreinheitmitarbeiter.class.php b/include/lehreinheitmitarbeiter.class.php
index 90617ccfe..b892863e8 100644
--- a/include/lehreinheitmitarbeiter.class.php
+++ b/include/lehreinheitmitarbeiter.class.php
@@ -552,6 +552,36 @@ class lehreinheitmitarbeiter extends basis_db
 		$beginn = new DateTime($beginn);
 		$ende = new DateTime($ende);
 
+		// get relevant Studiensemester
+		$studiensemester_kurzbz_arr = [];
+
+		$qry = '
+			SELECT
+				studiensemester_kurzbz
+			FROM
+				public.tbl_studiensemester
+			WHERE
+				start BETWEEN
+				'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
+				'. $this->db_add_param($ende->format('Y-m-d'));
+
+		if ($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$studiensemester_kurzbz_arr[] = $row->studiensemester_kurzbz;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		$lehrgaengeDistr = $this->_getLehrgaengeForDistribution($studiensemester_kurzbz_arr);
+
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return true;
+
 		$qry = '
 			WITH semester_sws_tbl AS (
 				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
@@ -565,14 +595,11 @@ class lehreinheitmitarbeiter extends basis_db
 					JOIN public.tbl_studiengang stg ON stg.studiengang_kz = sto.studiengang_kz
 					JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
 				WHERE mitarbeiter_uid =  '. $this->db_add_param($uid). '
-					 AND (
-					 	ss.start BETWEEN
-					 	'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
-					 	'. $this->db_add_param($ende->format('Y-m-d')). ')
+					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
 				-- keine lehreinheiten ohne semesterstunden
-				AND lema.semesterstunden != 0
+					AND lema.semesterstunden != 0
 			)
 
 			SELECT
@@ -595,6 +622,8 @@ class lehreinheitmitarbeiter extends basis_db
 
 		if ($this->db_query($qry))
 		{
+			$additionalLehrgaenge = [];
+
 			while($row = $this->db_fetch_object())
 			{
 				$obj = new StdClass();
@@ -603,6 +632,66 @@ class lehreinheitmitarbeiter extends basis_db
 				$obj->melde_studiengang_kz = $row->melde_studiengang_kz;
 				$obj->lgartcode = $row->lgartcode;
 				$obj->sws = $row->sws;
+
+				if (isset($lehrgaengeDistr[$uid][$row->studiensemester_kurzbz]))
+				{
+					$lehrgaenge = $lehrgaengeDistr[$uid][$row->studiensemester_kurzbz];
+
+					foreach ($lehrgaenge as $lehreinheit_id => $lehrgangKzArr)
+					{
+						// wenn lehrgang gefunden, zusammenhängende Lehrgaenge holen und sws aufteilen
+						if (array_key_exists($row->studiengang_kz, $lehrgangKzArr))
+						{
+							foreach ($lehrgangKzArr as $studiengang_kz => $lehrgang)
+							{
+								// check: nur eine Studiengangsverknüpfung pro Mitarbeiter, Semester, und Referenzstudiengang
+								if (
+									$studiengang_kz == $row->studiengang_kz
+									|| isset(
+										$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz]
+									)
+								) continue;
+
+								// Lehrgang erstellen
+								$lg = new StdClass();
+								$lg->mitarbeiter_uid = $uid;
+								$lg->melde_studiengang_kz = $lehrgang->melde_studiengang_kz;
+								$lg->lgartcode = $lehrgang->lgartcode;
+								$lg->studiengang_kz = $lehrgang->studiengang_kz;
+								$lg->studiensemester_kurzbz = $lehrgang->studiensemester_kurzbz;
+								$lg->summe = $row->summe;
+								$lg->sws = $row->sws;
+								// Lehrgang, der mit Ursprungsstudiengang aufgrund lehreinheit "verknüpft" ist, hinzufügen
+								$additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz][$studiengang_kz] = $lg;
+							}
+						}
+					}
+
+					// ignorieren, wenn für den Studiengang keine verknüpften Lehrgaenge hat
+					if (isset($additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz]))
+					{
+						$addLehrgaenge = $additionalLehrgaenge[$uid][$row->studiensemester_kurzbz][$row->studiengang_kz];
+
+						// sws Durchschnitt über alle verknuepften Lehrgaenge berechnet
+						$summeSws = $row->summe/(count($addLehrgaenge) + 1);
+						$sws = $row->sws/(count($addLehrgaenge) + 1);
+
+						// neue sws zuweisen
+						$obj->summe = $summeSws;
+						$obj->sws = $sws;
+
+						foreach ($addLehrgaenge as $conn_ws_studiengang_kz => $lehrgang)
+						{
+							// sws fuer jeden verknuepften Lehrgang zuweisen
+							$lehrgang->summe = $summeSws;
+							$lehrgang->sws = $sws;
+
+							// neue lehrgang sws hinzufuegen
+							$this->result [] = $lehrgang;
+						}
+					}
+				}
+
 				$this->result []= $obj;
 			}
 			return true;
@@ -662,4 +751,63 @@ class lehreinheitmitarbeiter extends basis_db
 		return false;
 	}
 
+	/**
+	 * Get "connected" Lehrgaenge for equal sws distribution.
+	 * @param $studiensemester_kurzbz_arr all semester for which Lehrgaenge should be retrieved
+	 * @return object success or error
+	 */
+	private function _getLehrgaengeForDistribution($studiensemester_kurzbz_arr)
+	{
+		if (!is_array($studiensemester_kurzbz_arr) || empty($studiensemester_kurzbz_arr)) return [];
+
+		$qry = "
+			WITH gruppen AS (
+				SELECT
+					mitarbeiter_uid, lehreinheit_id, lehrveranstaltung_id, studiensemester_kurzbz, sem.start, sem.ende,
+					lehreinheitgruppe_id, studiengang_kz, melde_studiengang_kz, lgartcode
+				FROM
+					lehre.tbl_lehreinheitmitarbeiter lema
+					JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+					JOIN lehre.tbl_lehreinheitgruppe legr USING (lehreinheit_id)
+					JOIN public.tbl_studiengang stg USING (studiengang_kz)
+					JOIN public.tbl_studiensemester sem USING (studiensemester_kurzbz)
+				WHERE
+					bismelden
+					AND stg.melderelevant
+					AND stg.typ = 'l'
+					AND le.studiensemester_kurzbz IN (".$this->implode4SQL($studiensemester_kurzbz_arr).")
+			)
+			SELECT
+				DISTINCT mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			FROM
+				gruppen gr
+			GROUP BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode
+			ORDER BY
+				mitarbeiter_uid, studiensemester_kurzbz, lehreinheit_id, studiengang_kz, melde_studiengang_kz, lgartcode";
+
+		$lehrgaengeDistributions = [];
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				// group by properties
+				$lehrgaengeDistributions
+					[$row->mitarbeiter_uid]
+					[$row->studiensemester_kurzbz]
+					[$row->lehreinheit_id]
+					[$row->studiengang_kz]
+					= $row;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Datenbankabfrage';
+			return false;
+		}
+
+		return $lehrgaengeDistributions;
+	}
+
 }

From 6cd4aebe8dc34df37b9756e4ea9aea1c8dc6922b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Mar 2026 14:54:06 +0100
Subject: [PATCH 1274/1357] stv projektarbeit projektbetreuer use correct ref

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 433d745b4..ea8c742eb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -135,7 +135,7 @@ export default {
 						await this.$p.loadCategory(['global', 'person', 'lehre', 'stv', 'projektarbeit', 'ui']);
 
 						const setHeader = (field, text) => {
-							const col = this.$refs.table.tabulator.getColumn(field);
+							const col = this.$refs.projektbetreuerTable.tabulator.getColumn(field);
 							if (!col) return;
 
 							const el = col.getElement();

From b43f1ec920f76a07cc40241a075b1624920d06ec Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 11 Mar 2026 17:00:56 +0100
Subject: [PATCH 1275/1357] AbgabetoolAssistenz download latest uploaded file
 action button; UX changes Projektarbeit Tab Stv; fix stv form input bug after
 invalidation for selects;

---
 .../controllers/api/frontend/v1/Abgabe.php    |  7 ++--
 .../Cis/Abgabetool/AbgabetoolAssistenz.js     | 32 ++++++++++++++-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  4 +-
 public/js/components/Form/Input.js            |  7 ++--
 .../Details/Projektarbeit/Details.js          | 10 +++--
 .../Details/Projektarbeit/Projektbetreuer.js  |  1 -
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 7 files changed, 89 insertions(+), 12 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Abgabe.php b/application/controllers/api/frontend/v1/Abgabe.php
index 0b82b7c20..43dc18d1c 100644
--- a/application/controllers/api/frontend/v1/Abgabe.php
+++ b/application/controllers/api/frontend/v1/Abgabe.php
@@ -847,9 +847,10 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		$email = $this->getDataOrTerminateWithError($result, 'general');
-		
-		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+		if(count($result->retval) > 0) {
+			$email = getData($result);
+			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
+		} else return '';
 
 	}
 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index d5caf97a6..85ca901d9 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -675,8 +675,20 @@ export const AbgabetoolAssistenz = {
 				createButton('fa fa-timeline', 'abgabetool/c4termineTimeLine', () => this.openTimeline(val))
 			);
 
+			if(val.latestTerminWithUpload) {
+				actionButtons.append(
+					createButton('fa fa-download', 'abgabetool/c4downloadLatestAbgabe', () => this.downloadAbgabe(val.latestTerminWithUpload.paabgabe_id, val.student_uid, val.projektarbeit_id))
+				)
+			}
+
 			return actionButtons;
 		},
+		downloadAbgabe(paabgabe_id, student_uid, projektarbeit_id) {
+			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}&projektarbeit_id=${projektarbeit_id}`;
+
+			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
+			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
+		},
 
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -780,6 +792,8 @@ export const AbgabetoolAssistenz = {
 					// TODO: mehrsprachig englisch
 					projekt.note_bez = opt.bezeichnung
 				}
+
+				const latestTerminWithUpload = this.findLatestTerminWithUpload(projekt)
 				
 				return {
 					...projekt,
@@ -787,6 +801,7 @@ export const AbgabetoolAssistenz = {
 					details: {
 						student_uid: projekt.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
+						latestTerminWithUpload: latestTerminWithUpload ?? null
 					},
 					pkz: this.buildPKZ(projekt),
 					beurteilung: projekt.beurteilungLink ?? null,
@@ -800,6 +815,15 @@ export const AbgabetoolAssistenz = {
 				}
 			})
 		},
+		findLatestTerminWithUpload(projekt) {
+			const withAbgabedatumSorted = projekt?.abgabetermine?.filter(t => t.abgabedatum != null)?.sort((a,b) => a < b)
+
+			if(withAbgabedatumSorted.length) {
+				return withAbgabedatumSorted[0]
+			}
+
+			return null
+		},
 		createInfoString(data) {
 			let str = '';
 
@@ -1413,9 +1437,12 @@ export const AbgabetoolAssistenz = {
 		
 		<div id="abgabetable" style="max-height:40vw;">
 			<div class="row">
-				<div class="col-auto">
+				<div class="col-auto me-auto">
 					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 				</div>
+				<div class="col-auto">
+					<label class="col-form-label">{{$capitalize($p.t('lehre/studiengang'))}}:</label>
+				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$capitalize($p.t('lehre/studiengang'))" 
@@ -1430,6 +1457,9 @@ export const AbgabetoolAssistenz = {
 						</template>
 					</Dropdown>
 				</div>
+				<div class="col-auto">
+					<label class="col-form-label">{{$capitalize($p.t('lehre/note'))}}:</label>
+				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$p.t('lehre/note')" 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index ee1d18942..6791d31aa 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -667,8 +667,10 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loading=true
 
-			const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+			const projektarbeiten = this.projektarbeiten?.retval ?? this.projektarbeiten
 
+			const pa = projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+			
 			let paIsBenotet = false
 			if(pa.note !== undefined && pa.note !== null) {
 				// check if the note is not defined as a non final projektarbeit note
diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js
index 3c3fa45d5..4ad555ab7 100644
--- a/public/js/components/Form/Input.js
+++ b/public/js/components/Form/Input.js
@@ -170,6 +170,7 @@ export default {
 				return this.$attrs.modelValue;
 			},
 			set(v) {
+				this.clearValidationForThisName()
 				if (!this.$attrs.hasOwnProperty('modelValue'))
 					this.modelValueDummy = v;
 				this.$emit('update:modelValue', v);
@@ -242,9 +243,9 @@ export default {
 	template: `
 	<component :is="!hasContainer ? 'FhcFragment' : 'div'" class="position-relative" :class="autoContainerClass">
 		<label v-if="label && lcType != 'radio' && lcType != 'checkbox'" :class="!noAutoClass && 'form-label'" :for="idCmp">{{label}}</label>
-		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
-		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)"></textarea>
-		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="clearValidationForThisName(); $emit('input', $event)">
+		<input v-if="tag == 'input'" :type="lcType" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)">
+		<textarea v-else-if="tag == 'textarea'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)"></textarea>
+		<select v-else-if="tag == 'select'" ref="input" v-model="modelValueCmp" v-bind="$attrs" :id="idCmp" :name="name" :class="validationClass" :modelValue="undefined" @input="$emit('input', $event)">
 			<slot></slot>
 		</select>
 		<component
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
index 34dd99c8f..4ff1e236a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Details.js
@@ -14,6 +14,9 @@ export default {
 	inject: {
 		defaultSemester: {
 			from: 'defaultSemester'
+		},
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	computed: {
@@ -95,8 +98,9 @@ export default {
 			this.formData.themenbereich = null;
 			this.formData.projekttyp_kurzbz = null;
 			this.formData.firma = null;
-			this.formData.lehrveranstaltung_id = null;
-			this.formData.lehreinheit_id = null;
+			// dont reset these form fields for UX reasons
+			// this.formData.lehrveranstaltung_id = null;
+			// this.formData.lehreinheit_id = null;
 			this.formData.beginn = null;
 			this.formData.ende = null;
 			this.formData.freigegeben = true;
@@ -109,7 +113,7 @@ export default {
 		getFormData(newProjektarbeit, studiensemester_kurzbz, additional_lehrveranstaltung_id) {
 
 			this.additional_lehrveranstaltung_id = additional_lehrveranstaltung_id;
-			this.studiensemester = studiensemester_kurzbz || this.defaultSemester;
+			this.studiensemester = studiensemester_kurzbz || this.currentSemester;
 			this.newProjektarbeit = newProjektarbeit;
 
 			this.$api
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index 6c39ba9ae..51bd4829c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -121,7 +121,6 @@ export default {
 				height: 'auto',
 				minHeight: '100',
 				selectable: true,
-				selectable: 1,
 				index: 'betreuer_id',
 				persistence:{
 					columns: true, //persist column layout
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 580f15bc2..a78a42486 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -45173,6 +45173,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4downloadLatestAbgabe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zuletzt getätigte Abgabe herunterladen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download latest uploaded File',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4termineTimeLine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zeitstrahl Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Timeline Deadlines',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 40757322e78cfbd8c82ff8aa0227b04fa23e74bf Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Wed, 11 Mar 2026 17:52:31 +0100
Subject: [PATCH 1276/1357] =?UTF-8?q?Spalte=20"FGM"=20(F=C3=B6rder-Guthabe?=
 =?UTF-8?q?n-Monate)=20bei=20Prestudentstatus=20einblendbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentdetailoverlay.xul.php | 5 +++++
 include/prestudent.class.php                 | 1 +
 rdf/prestudentrolle.rdf.php                  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 36740d209..c3bf8c191 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -798,6 +798,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon" />
 								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-fgm" label="FGM" flex="1" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
+								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -823,6 +827,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
 											</treerow>
 										</treeitem>
 									</treechildren>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 7317572ba..7cff1da3b 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -705,6 +705,7 @@ class prestudent extends person
 				$rolle->studienplan_bezeichnung = $row->studienplan_bezeichnung;
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
+				$rolle->fgm = $row->fgm;
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 0a6caf05c..1c64ba15d 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -143,6 +143,7 @@ foreach($ps->result as $row)
 			<ROLLE:updatevon><![CDATA['.$row->updatevon.']]></ROLLE:updatevon>
 			<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
 			<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
+			<ROLLE:fgm><![CDATA['.$row->fgm.']]></ROLLE:fgm>
       	</RDF:Description>
       </RDF:li>
 	';

From b91efb6189a4906ba46a4f8ca38bc07f166214d7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Mar 2026 13:56:03 +0100
Subject: [PATCH 1277/1357] stv notizperson fix permission check to be able to
 add notes to prestudents that do not have an uid

---
 .../api/frontend/v1/notiz/NotizPerson.php     | 41 ++++---------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index 7f0645bc6..a047129d7 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -24,6 +24,7 @@ class NotizPerson extends Notiz_Controller
 		//Load Models
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 		//Permission checks for allowed Oes
 		if ($this->router->method == 'addNewNotiz')
@@ -38,7 +39,7 @@ class NotizPerson extends Notiz_Controller
 			{
 				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 			}
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ( $this->router->method == 'updateNotiz')
@@ -59,7 +60,7 @@ class NotizPerson extends Notiz_Controller
 			$person_id = current($data)->person_id;
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 
 		if ($this->router->method == 'deleteNotiz' )
@@ -78,7 +79,7 @@ class NotizPerson extends Notiz_Controller
 			}
 
 			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOneUidExists($person_id, $allowedStgs);
+			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
 		}
 	}
 
@@ -99,44 +100,20 @@ class NotizPerson extends Notiz_Controller
 	}
 
 	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOneUidExists($person_id, $allowedStgs)
+	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
 	{
-		//get all studentUids of person_id
-		$result = $this->BenutzerModel->loadWhere(['person_id' => $person_id]);
+		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$checkarray = [];
 		foreach ($data as $item)
 		{
-			//check if isStudent
-			$result = $this->StudentModel->isStudent($item->uid);
-
-			$isStudent = $this->getDataOrTerminateWithError($result);
-			if($isStudent)
+			if(in_array($item->studiengang_kz, $allowedStgs))
 			{
-				$checkarray[]  = $this->_checkAllowedStgsFromUid($item->uid, $allowedStgs);
+				return true;
 			}
-
 		}
-		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;
-		}
+		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
 	}
 }

From d4b81da4379406748d90c2b68c0d6b98441ede3b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Mar 2026 14:34:42 +0100
Subject: [PATCH 1278/1357] fix filter component also consider tabulator 6
 selectableRows option to determine if tabulator has selector

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

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 7bfc1aebb..052199092 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -280,7 +280,7 @@ export const CoreFilterCmpt = {
 				});
 			}
 
-			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
+			if (tabulatorOptions.selectable || tabulatorOptions.selectableRows || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
 				this.tabulatorHasSelector = true;
 
 			if (this.idField) {
@@ -358,7 +358,7 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulatorHasSelector = this.tabulatorOptions.selectable || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
+			this.tabulatorHasSelector = this.tabulatorOptions.selectable || tabulatorOptions.selectableRows || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
 			this.tabulator.setData(this.filteredData);
 			this._setHeaderFilter()

From 5ef1dccfc97a340df7d2f99b1ce1691f03ba156a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Mar 2026 14:58:35 +0100
Subject: [PATCH 1279/1357] added missing phrase c4noZuordnungBetreuerStudent

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 11dbe5a8c..14dd0a26c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -46735,6 +46735,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4noZuordnungBetreuerStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Zuordnung oder Berechtigung für die Projektarbeit gefunden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No assignment or authorization found for the project!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ABGABETOOL PHRASEN END
 	array(
 		'app' => 'core',

From 8c36fe585a670f55961e44bea740cc4b8c8e60e6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Mar 2026 15:09:46 +0100
Subject: [PATCH 1280/1357] filter component add missing this

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

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 052199092..3f0edb672 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -358,7 +358,7 @@ export const CoreFilterCmpt = {
 			}
 		},
 		_updateTabulator() {
-			this.tabulatorHasSelector = this.tabulatorOptions.selectable || tabulatorOptions.selectableRows || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
+			this.tabulatorHasSelector = this.tabulatorOptions.selectable || this.tabulatorOptions.selectableRows || this.filteredColumns.filter(el => el.formatter == 'rowSelection').length;
 			this.tabulator.setColumns(this.filteredColumns);
 			this.tabulator.setData(this.filteredData);
 			this._setHeaderFilter()

From 0764a597afd0128f23ce8303b17271c2fd34a3f6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Mar 2026 15:18:26 +0100
Subject: [PATCH 1281/1357] do not allow foto editing in contract management

---
 public/js/components/Vertraege/Vertragsverwaltung.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index a3e52261a..afde796b2 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -71,7 +71,6 @@ export default {
 							:mitarbeiter_uid="this.mitarbeiter_uid"
 							typeHeader="mitarbeiter"
 							:domain="config.domain"
-							fotoEditable
 							@redirectToLeitung="handleSelection"
 						>
 							<template #uid>{{tile_MaUid}}</template>

From df05af98d25b996f2f271ffdb1277ccb46451039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Mar 2026 09:01:33 +0100
Subject: [PATCH 1282/1357] FHB - Markierung von Outgoing ohne Endedatum

---
 include/lehrelisthelper.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php
index b1821391f..f511b27cc 100644
--- a/include/lehrelisthelper.class.php
+++ b/include/lehrelisthelper.class.php
@@ -270,6 +270,8 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
+					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
+						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

From 4778bb82c3f60a1d8cf8729fe66e7ff677aa2d70 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 16 Mar 2026 10:56:51 +0100
Subject: [PATCH 1283/1357] assistenz action buttons lefthand alignment & lower
 minwidth

---
 public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 85ca901d9..1a4e4171d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -180,7 +180,7 @@ export const AbgabetoolAssistenz = {
 					// 	frozen: true,
 					// 	width: 40
 					// },
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 100, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -645,7 +645,7 @@ export const AbgabetoolAssistenz = {
 			actionButtons.className = "d-flex gap-3"; // you can keep Bootstrap gap if loaded
 			actionButtons.style.display = "flex";
 			actionButtons.style.alignItems = "stretch"; // buttons stretch to full height
-			actionButtons.style.justifyContent = "center";
+			actionButtons.style.justifyContent = "start";
 			actionButtons.style.height = "100%"; // full grid cell height
 
 			const val = cell.getValue();

From 6ec32b0ca39e377a70184d311e5f72b294ce041e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 16 Mar 2026 11:05:48 +0100
Subject: [PATCH 1284/1357] update tabulator persistence id

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

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
index 1a4e4171d..bb5c6a710 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
@@ -226,7 +226,7 @@ export const AbgabetoolAssistenz = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2026_02_26"
+				persistenceID: "abgabetool_2026_03_16"
 			},
 			abgabeTableEventHandlers: [
 			{

From a4f2502fe62c1b22c626d9e8d0e23f46a50d5bb8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 18 Mar 2026 10:58:05 +0100
Subject: [PATCH 1285/1357] dashboard admin: funktionen sortieren,
 allgemein/general wieder hinzufuegen

---
 .../api/frontend/v1/dashboard/DashboardAdmin.php      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
index 5e5ba4d40..42a95c034 100644
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -205,12 +205,19 @@ class DashboardAdmin extends FHCAPI_Controller
 	//Presets
 	public function funktionen()
 	{
-		$result = $this->FunktionModel->load();
+		$this->FunktionModel->addSelect('funktion_kurzbz, beschreibung');
+		$this->FunktionModel->addOrder('beschreibung', 'ASC');
+		$result = $this->FunktionModel->loadWhere(array('aktiv' => true));
 
 		if (isError($result))
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 
-		$this->terminateWithSuccess(getData($result) ?: []);
+		$funktionen = getData($result) ?: [];
+		array_unshift($funktionen, (object) array(
+			'funktion_kurzbz' => 'general',
+			'beschreibung' => 'Allgemein'
+		));
+		$this->terminateWithSuccess($funktionen);
 	}
 
 	public function addWidgetsToPreset()

From 7603f8f12b871facc59755eb59f33f075b117f1c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Mar 2026 14:32:09 +0100
Subject: [PATCH 1286/1357] Bugfix: use null instead of empty string, provide
 kuerzel

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

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index dcc0bb9ac..13c0a2eba 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -220,7 +220,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: '',
+			'uid' => $this->input->post_get('uid') ?: null,
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -334,6 +334,7 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

From 14a8e2f001ec052db0f91563c23dd356edce5333 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 18 Mar 2026 15:48:57 +0100
Subject: [PATCH 1287/1357] Funktionen fett schreiben, die schon presets
 hinterlegt haben, demo aus views und Controller namen entfernen, preview
 hinzufuegen

---
 .../frontend/v1/dashboard/DashboardAdmin.php  | 59 ++++++++++++++++---
 .../{DashboardDemo.php => DashboardAdmin.php} | 19 +++---
 ...ard_demo_admin.php => dashboard_admin.php} |  4 ++
 ...shboard_demo.php => dashboard_preview.php} | 11 +++-
 .../api/factory/dashboard/dashboardAdmin.js   |  5 +-
 public/js/apps/Dashboard/Preview.js           | 17 ++++++
 .../js/components/Dashboard/Admin/Presets.js  | 31 ++++++----
 7 files changed, 114 insertions(+), 32 deletions(-)
 rename application/controllers/dashboard/{DashboardDemo.php => DashboardAdmin.php} (70%)
 rename application/views/dashboard/{dashboard_demo_admin.php => dashboard_admin.php} (90%)
 rename application/views/dashboard/{dashboard_demo.php => dashboard_preview.php} (67%)
 create mode 100644 public/js/apps/Dashboard/Preview.js

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
index 42a95c034..eb9d02776 100644
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -205,18 +205,63 @@ class DashboardAdmin extends FHCAPI_Controller
 	//Presets
 	public function funktionen()
 	{
-		$this->FunktionModel->addSelect('funktion_kurzbz, beschreibung');
-		$this->FunktionModel->addOrder('beschreibung', 'ASC');
-		$result = $this->FunktionModel->loadWhere(array('aktiv' => true));
+		$dashboard_kurzbz = $this->input->get('db');
+		if(!$dashboard_kurzbz)
+		{
+			$this->terminateWithError('missing query parameter db');
+		}
+		$sql = <<<EOSQL
+			with
+			dashboard_presets as (
+					select
+						*
+					from
+						dashboard.tbl_dashboard_preset dp
+					join
+						dashboard.tbl_dashboard d on d.dashboard_id = dp.dashboard_id
+					where
+						d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
+			),
+			general as 	(
+				select
+					'general' as funktion_kurzbz,
+					'Allgemein' as beschreibung
+			)
+
+			(
+				select
+					f.funktion_kurzbz,
+					f.beschreibung,
+					count(p.preset_id) as has_preset
+				from
+					general f
+				left join
+					dashboard_presets p on p.funktion_kurzbz is null
+				group by
+					f.funktion_kurzbz, f.beschreibung
+			)
+			union ALL
+			(
+				select
+					f.funktion_kurzbz,
+					f.beschreibung,
+					count(p.preset_id) as has_preset
+				from
+					public.tbl_funktion f
+				left join
+					dashboard_presets p on p.funktion_kurzbz = f.funktion_kurzbz
+				group by
+					f.funktion_kurzbz, f.beschreibung
+				order by
+					f.beschreibung asc
+			)
+EOSQL;
+		$result = $this->FunktionModel->execReadOnlyQuery($sql);
 
 		if (isError($result))
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 
 		$funktionen = getData($result) ?: [];
-		array_unshift($funktionen, (object) array(
-			'funktion_kurzbz' => 'general',
-			'beschreibung' => 'Allgemein'
-		));
 		$this->terminateWithSuccess($funktionen);
 	}
 
diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardAdmin.php
similarity index 70%
rename from application/controllers/dashboard/DashboardDemo.php
rename to application/controllers/dashboard/DashboardAdmin.php
index 35d530384..b799d9ae9 100644
--- a/application/controllers/dashboard/DashboardDemo.php
+++ b/application/controllers/dashboard/DashboardAdmin.php
@@ -4,7 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  */
-class DashboardDemo extends Auth_Controller
+class DashboardAdmin extends Auth_Controller
 {
     private $_uid;  // uid of the logged user
 
@@ -16,8 +16,8 @@ class DashboardDemo extends Auth_Controller
         // Set required permissions
         parent::__construct(
             array(
-                'index' => 'dashboard/benutzer:r',
-                'admin' => 'dashboard/admin:rw'
+                'index' => 'dashboard/admin:rw',
+				'preview' => 'dashboard/admin:r',
             )
         );
 
@@ -33,15 +33,14 @@ class DashboardDemo extends Auth_Controller
     // Public methods
 	public function index()
 	{
-		$this->load->view('dashboard/dashboard_demo.php', []);
+        $this->load->view('dashboard/dashboard_admin.php', []);
 	}
 
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-    public function admin()
-    {
-        $this->load->view('dashboard/dashboard_demo_admin.php', []);
-    }
+	public function preview()
+	{
+		$dashboard_kurzbz = $this->input->get('db') ?? 'CIS';
+		$this->load->view('dashboard/dashboard_preview.php', ['dashboard_kurzbz' => $dashboard_kurzbz]);
+	}
 
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_admin.php
similarity index 90%
rename from application/views/dashboard/dashboard_demo_admin.php
rename to application/views/dashboard/dashboard_admin.php
index b57a2bfa0..e10fc30c2 100644
--- a/application/views/dashboard/dashboard_demo_admin.php
+++ b/application/views/dashboard/dashboard_admin.php
@@ -9,6 +9,10 @@ $this->load->view(
 		'restclient' => true,
 		'vue3' => true,
 		'primevue3' => true,
+		'vuedatepicker11' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
 		'customJSModules' => ['public/js/apps/Dashboard/Admin.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css',
diff --git a/application/views/dashboard/dashboard_demo.php b/application/views/dashboard/dashboard_preview.php
similarity index 67%
rename from application/views/dashboard/dashboard_demo.php
rename to application/views/dashboard/dashboard_preview.php
index 8efc230b7..f8c37c0c8 100644
--- a/application/views/dashboard/dashboard_demo.php
+++ b/application/views/dashboard/dashboard_preview.php
@@ -8,7 +8,12 @@ $this->load->view(
 		'axios027' => true,
 		'restclient' => true,
 		'vue3' => true,
-		'customJSModules' => ['public/js/apps/Dashboard.js'],
+		'vuedatepicker11' => true,
+		'primevue3' => true,
+		'customJSs' => [
+			'vendor/moment/luxonjs/luxon.min.js'
+		],
+		'customJSModules' => ['public/js/apps/Dashboard/Preview.js'],
 		'customCSSs' => [
 			'public/css/components/dashboard.css'
 		],
@@ -23,9 +28,9 @@ $this->load->view(
 
 		<div id="content">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-				<h1 class="h2">Dashboard</h1>
+				<h1 class="h2">Dashboard <?= $dashboard_kurzbz ?></h1>
 			</div>
-			<core-dashboard dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></core-dashboard>
+			<core-dashboard dashboard="<?= $dashboard_kurzbz ?>"></core-dashboard>
 		</div>
 	</div>
 
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
index a672460e4..4733d0461 100644
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -55,10 +55,11 @@ export default {
 			params
 		};
 	},
-	loadFunktionen(){
+	loadFunktionen(dashboard_kurzbz){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/funktionen'
+			url: 'api/frontend/v1/dashboard/DashboardAdmin/funktionen?db='
+				+ encodeURIComponent(dashboard_kurzbz)
 		};
 	},
 	addWidgetsToPreset(params){
diff --git a/public/js/apps/Dashboard/Preview.js b/public/js/apps/Dashboard/Preview.js
new file mode 100644
index 000000000..a270c3028
--- /dev/null
+++ b/public/js/apps/Dashboard/Preview.js
@@ -0,0 +1,17 @@
+import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import CoreDashboard from '../../components/Dashboard/Dashboard.js';
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+
+const app = Vue.createApp({
+  name: 'DashboardPreviewApp',
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    CoreDashboard
+  }
+});
+app.use(PluginsPhrasen);
+app.directive('tooltip', primevue.tooltip);
+app.mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index a63c28680..518e9d20f 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -53,6 +53,11 @@ export default {
 								section.widgets.push(widget);
 							}
 						});
+						this.funktionen.forEach(funktion => {
+							if(funktion.funktion_kurzbz === section_name && funktion.has_preset < 1) {
+								funktion.has_preset = 1;
+							}
+						});
 					})
 					.catch(this.$fhcAlert.handleSystemError);
 			})
@@ -151,30 +156,36 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 
+		},
+		loadFunktionen() {
+			this.$api
+				.call(ApiDashboardAdmin.loadFunktionen(this.dashboard))
+				.then(result => {
+					this.funktionen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
-		this.$api
-			.call(ApiDashboardAdmin.loadFunktionen())
-			.then(result => {
-				//console.log(result);
-				result.data.forEach(funktion => {
-					this.funktionen[funktion.funktion_kurzbz] = funktion.beschreibung;
-				});
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+		this.loadFunktionen();
 	},
 	watch: {
 		dashboard() {
 			// TODO(chris): this should be done without a watcher
 			this.loadSections({target:this.$refs.funktionenList});
+			this.loadFunktionen();
 		}
 	},
 	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
 				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
-					<option v-for="name,id in funktionen" :key="id" :value="id">{{ name }}</option>
+					<option
+						v-for="funktion in funktionen"
+						:key="funktion.funktion_kurzbz"
+						:value="funktion.funktion_kurzbz"
+						:class="(funktion.has_preset > 0) ? 'fw-bold' : ''"
+					>{{ funktion.beschreibung }}</option>
 				</select>
 			</div>
 			<div class="col-9">

From 126a2d3b7b5959d3009b8ae6ceb8ca8d4fbdc4fd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 20 Mar 2026 11:23:35 +0100
Subject: [PATCH 1288/1357] add deepToRaw function to helpers/ObjectUtils

---
 public/js/helpers/ObjectUtils.js | 99 ++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 29 deletions(-)

diff --git a/public/js/helpers/ObjectUtils.js b/public/js/helpers/ObjectUtils.js
index 348d18843..c68e92e1e 100644
--- a/public/js/helpers/ObjectUtils.js
+++ b/public/js/helpers/ObjectUtils.js
@@ -1,31 +1,72 @@
-export default {
-	/**
-	* Performs a deep merge of objects and returns new object. Does not modify
-	* objects (immutable) and merges arrays via concatenation.
-	*
-	* @param {...object} objects - Objects to merge
-	* @returns {object} New object with merged key/values
-	*/
-	mergeDeep(...objects) {
-		const isObject = obj => obj && typeof obj === 'object';
-		
-		return objects.reduce((prev, obj) => {
-			Object.keys(obj).forEach(key => {
-				const pVal = prev[key];
-				const oVal = obj[key];
-				
-				if (Array.isArray(pVal) && Array.isArray(oVal)) {
-					prev[key] = pVal.concat(...oVal);
-				}
-				else if (isObject(pVal) && isObject(oVal)) {
-					prev[key] = this.mergeDeep(pVal, oVal);
-				}
-				else {
-					prev[key] = oVal;
-				}
-			});
+/**
+ * Performs a deep merge of objects and returns new object. Does not modify
+ * objects (immutable) and merges arrays via concatenation.
+ *
+ * @param {...object} objects - Objects to merge
+ * @returns {object} New object with merged key/values
+ */
+function mergeDeep(...objects) {
+	const isObject = obj => obj && typeof obj === 'object';
+	
+	return objects.reduce((prev, obj) => {
+		Object.keys(obj).forEach(key => {
+			const pVal = prev[key];
+			const oVal = obj[key];
 			
-			return prev;
-		}, {});
-	}
+			if (Array.isArray(pVal) && Array.isArray(oVal)) {
+				prev[key] = pVal.concat(...oVal);
+			}
+			else if (isObject(pVal) && isObject(oVal)) {
+				prev[key] = this.mergeDeep(pVal, oVal);
+			}
+			else {
+				prev[key] = oVal;
+			}
+		});
+		
+		return prev;
+	}, {});
+}
+
+/**
+ * Extends VUEs toRaw() function to nested Proxies
+ * @see https://www.reddit.com/r/javascript/comments/10gzynk/deep_cloning_objects_in_javascript_the_modern_way/
+ *
+ * @param object		sourceObj - Object to transform
+ * @returns object
+ */
+function deepToRaw(sourceObj) {
+	const objectIterator = input => {
+		if (Array.isArray(input))
+			return input.map(objectIterator);
+		if (Vue.isRef(input) || Vue.isReactive(input) || Vue.isProxy(input))
+			return objectIterator(Vue.toRaw(input));
+		if (input && typeof input === 'object') {
+			/** use custom handling of 'Date' objects to avoid data loss if treating it like any other object.
+			 * reminder:
+			 * typeof (new Date())        ==> 'object'
+			 * Object.keys(new Date())    ==> []
+			 */
+			if (input instanceof Date)
+				return input;
+
+			return Object.keys(input).reduce((acc, key) => {
+				acc[key] = objectIterator(input[key]);
+				return acc;
+			}, {});
+		}
+
+		return input;
+	};
+	
+	return objectIterator(sourceObj);
+}
+
+export {
+	mergeDeep,
+	deepToRaw
+}
+export default {
+	mergeDeep,
+	deepToRaw
 }
\ No newline at end of file

From 65c7ad2aac86bb51d513cbda8e172dcc27d69588 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 20 Mar 2026 12:29:01 +0100
Subject: [PATCH 1289/1357] use correct error handling in FhcApi in case of
 success

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

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index 889d694eb..115dd28fa 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -430,16 +430,16 @@ export default {
 
 		fhcApiAxios.interceptors.response.use(
 			response => {
-				if (response.config?.errorHandling == 'off'
-					|| response.config?.errorHandling === false
-					|| response.config?.errorHandling == 'fail')
+				const errorConfig = get_error_handler(response.config);
+
+				if (!errorConfig.success)
 					return clean_return_value(response);
 
-				// NOTE(chris): loop through errors
-				if (response.data.errors)
-					response.data.errors = response.data.errors.filter(
-						err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config)
-					);
+				const errors = popHandleableErrors(errorConfig, response.data.errors);
+
+				for (var type in errors) {
+					errorConfig.handler[type](errors[type]);
+				}
 
 				return clean_return_value(response);
 			},

From b90c26412afb08ee79be063c648901b7fd5fb8fd Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 20 Mar 2026 13:06:16 +0100
Subject: [PATCH 1290/1357] DB update: new Organisationseinheittyp Programm

---
 system/dbupdate_3.4.php                           |  1 +
 ...nt_neuer_organisationseinheitstyp_programm.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 system/dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 4ddb38203..ac8695de2 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -92,6 +92,7 @@ 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');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
+require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php b/system/dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php
new file mode 100644
index 000000000..3574a8424
--- /dev/null
+++ b/system/dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php
@@ -0,0 +1,15 @@
+<?php
+
+// neuen Organisationseinheittyp (Programm) als Zeile hinzufügen
+if($result = @$db->db_query("SELECT 1 FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz= 'Programm';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_organisationseinheittyp(organisationseinheittyp_kurzbz, beschreibung, bezeichnung) VALUES ('Programm', 'Programm', 'Programm');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.tbl_organisationseinheittyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.tbl_organisationseinheittyp: Zeile Programm hinzugefuegt!<br>';
+	}
+}

From bac2c13da355ec8cbce05e999b25e20831060a92 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 10:44:39 +0100
Subject: [PATCH 1291/1357] viewData is mandatory so we dont need to load it if
 its not set

---
 public/js/components/Dashboard/Dashboard.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 652a2778e..c27f0c405 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -2,8 +2,6 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
-import ApiDashboard from '../../api/factory/cis/dashboard.js';
-
 export default {
 	name: 'Dashboard',
 	components: {
@@ -20,7 +18,7 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name && value.uid && value.timezone
+				return value && value.name && value.timezone
 			}
 		}
 	},
@@ -29,7 +27,6 @@ export default {
 			sections: [],
 			widgets: null,
 			editMode: false,
-			viewDataInternal: this.viewData
 		}
 	},
 	provide() {
@@ -182,16 +179,10 @@ export default {
 			});
 		}).catch(err => console.error('ERROR:', err));
 	},
-	async beforeMount() {
-		if (!this.viewData.name || !this.viewData.uid) {
-			const res = await this.$api.call(ApiDashboard.getViewData());
-			this.viewDataInternal = res.data
-		}	
-	},
 	template: `
 	<div class="core-dashboard">
-		<h3 v-show="viewDataInternal?.name">
-			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
+		<h3>
+			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>

From e957926a4d16da39cb6bc39e6b81c480dcaa0e80 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 10:57:43 +0100
Subject: [PATCH 1292/1357] replace controllers/dashboard/Widget.php with
 controllers/api/frontend/v1/dashboard/Widget.php

---
 .../frontend/v1/dashboard/DashboardAdmin.php  |  51 -------
 .../api/frontend/v1/dashboard/Widget.php      | 137 ++++++++++++++++++
 application/controllers/dashboard/Widget.php  | 134 -----------------
 .../api/factory/dashboard/dashboardAdmin.js   |  14 --
 public/js/api/factory/dashboard/widget.js     |  46 ++++++
 .../js/components/Dashboard/Admin/Widgets.js  |  15 +-
 public/js/components/Dashboard/Dashboard.js   |  33 ++---
 public/js/components/Dashboard/Item.js        |  10 +-
 public/js/components/Dashboard/Section.js     |  19 ++-
 .../Dashboard/CachedWidgetLoader.js           |  57 ++++----
 10 files changed, 251 insertions(+), 265 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/dashboard/Widget.php
 delete mode 100644 application/controllers/dashboard/Widget.php
 create mode 100644 public/js/api/factory/dashboard/widget.js

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
index eb9d02776..31e73b6ba 100644
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -32,11 +32,6 @@ class DashboardAdmin extends FHCAPI_Controller
 			'createDashboard'				=> 'dashboard/admin:rw',
 			'updateDashboard'				=> 'dashboard/admin:rw',
 			'deleteDashboard'				=> 'dashboard/admin:rw',
-			'loadWidget'					=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-			'getAllWidgets'					=> 'dashboard/admin:r',
-			'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-			'setWidgetAllowed'				=> 'dashboard/admin:rw',
-
 			'index'							=> 'dashboard/benutzer:r',
 			'dummy'							=> 'dashboard/benutzer:r',
 			'genWidgetId'					=> 'dashboard/benutzer:rw',
@@ -156,52 +151,6 @@ class DashboardAdmin extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getAllWidgets()
-	{
-		$dashboard_id = $this->input->get('dashboard_id');
-		if(!$dashboard_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
-		}
-		//$this->terminateWithError($dashboard_id);
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
-
-		if (isError($result))
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess(getData($result) ?: []);
-	}
-
-	public function setWidgetAllowed()
-	{
-		$dashboard_id = $this->input->post('dashboard_id');
-		$widget_id = $this->input->post('widget_id');
-		$action = $this->input->post('action');
-
-		if ($action == 'add')
-		{
-			$result = $this->DashboardWidgetModel->insert([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		}
-		elseif ($action == 'delete')
-		{
-			$result = $this->DashboardWidgetModel->delete([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		}
-		else
-		{
-			$this->terminateWithError("action value invalid", self::ERROR_TYPE_GENERAL);
-		}
-		if (isError($result))
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess(getData($result) ?: []);
-	}
-
 	//Presets
 	public function funktionen()
 	{
diff --git a/application/controllers/api/frontend/v1/dashboard/Widget.php b/application/controllers/api/frontend/v1/dashboard/Widget.php
new file mode 100644
index 000000000..cd01d9102
--- /dev/null
+++ b/application/controllers/api/frontend/v1/dashboard/Widget.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the users dashboard
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Widget extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
+			'list'							=> 'dashboard/admin:r',
+			'listAllowed'					=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
+			'setAllowed'					=> 'dashboard/admin:rw'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('dashboard/Widget_model', 'WidgetModel');
+	}
+
+	public function get($id)
+	{
+		$result = $this->WidgetModel->load($id);
+
+		$widget = $this->getDataOrTerminateWithError($result);
+
+		if (!$widget)
+			return $this->terminateWithSuccess([
+				"widget_id" => 0,
+				"widget_kurzbz" => "notfound",
+				"arguments" => [
+					"className" => 'alert-danger',
+					"title" => 'Widget Not Found',
+					"msg" => 'The widget with the id ' . $id . ' could not be found'
+				],
+				"setup" => [
+					"name" => 'Widget Not Found',
+					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
+					"width" => 1,
+					"height" => 1
+				]
+			]);
+
+		$widget = current($widget);
+		$widget->arguments = json_decode($widget->arguments);
+		$tmpsetup = json_decode($widget->setup);
+		$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
+		$widget->setup = $tmpsetup;
+
+		$this->terminateWithSuccess($widget);
+	}
+
+	public function list($dashboard)
+	{
+		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard);
+
+		$widgets = $this->getDataOrTerminateWithError($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;
+		}, $widgets);
+
+		$this->terminateWithSuccess($widgets);
+	}
+
+	public function listAllowed($dashboard)
+	{
+		$result = $this->WidgetModel->getForDashboard($dashboard);
+
+		$widgets = $this->getDataOrTerminateWithError($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;
+		}, $widgets);
+
+		$this->terminateWithSuccess($widgets);
+	}
+
+	public function setAllowed()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget', 'Widget', 'required');
+		$this->form_validation->set_rules('allowed', 'Allowed', 'required|is_bool');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$data = [
+			'dashboard_id' => $this->input->post('dashboard'),
+			'widget_id' => $this->input->post('widget')
+		];
+
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+		
+		if ($this->input->post('allowed'))
+			$result = $this->DashoardWidgetModel->insert($data);
+		else
+			$result = $this->DashoardWidgetModel->delete($data);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/dashboard/Widget.php b/application/controllers/dashboard/Widget.php
deleted file mode 100644
index 9966ddc12..000000000
--- a/application/controllers/dashboard/Widget.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Widget
- *
- * @author chris
- */
-class Widget extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> ['dashboard/benutzer:r', 'dashboard/admin:r'],
-				'getAll'						=> 'dashboard/admin:r',
-				'getWidgetsForDashboard'		=> ['dashboard/benutzer:rw', 'dashboard/admin:r'],
-				'setAllowed'					=> 'dashboard/admin:rw'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-	}
-	
-	public function index()
-	{
-		$widget_id = $this->input->get('id');
-
-		$widget = $this->WidgetModel->load($widget_id);
-
-		if (isError($widget) || !getData($widget))
-			return $this->outputJsonSuccess([
-				"widget_id" => 0,
-				"widget_kurzbz" => "notfound",
-				"arguments" => [
-					"className" => 'alert-danger',
-					"title" => 'Widget Not Found',
-					"msg" => 'The widget with the id ' . $widget_id . ' could not be found'
-				],
-				"setup" => [
-					"name" => 'Widget Not Found',
-					"file" => absoluteJsImportUrl('public/js/components/DashboardWidget/Default.js'),
-					"width" => 1,
-					"height" => 1
-				]
-			]);
-
-		$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()
-	{
-		$dashboard_id = $this->input->get('dashboard_id');
-		$result = $this->WidgetModel->getWithAllowedForDashboard($dashboard_id);
-
-		if (isError($result))
-			return $this->outputJsonError(getError($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()
-	{
-		$db = $this->input->get('db');
-		$result = $this->WidgetModel->getForDashboard($db);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($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()
-	{
-		$input = $this->getPostJSON();
-
-		$dashboard_id = $input->dashboard_id;
-		$widget_id = $input->widget_id;
-		$action = $input->action;
-
-		if ($action == 'add') {
-			$result = $this->DashboardWidgetModel->insert([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		} elseif ($action == 'delete') {
-			$result = $this->DashboardWidgetModel->delete([
-				'dashboard_id' => $dashboard_id,
-				'widget_id' => $widget_id
-			]);
-		} else {
-			http_response_code(404); // TODO(chris): 400?
-			$this->terminateWithJsonError([
-				'error' => 'action value invalid'
-			]);
-		}
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		return $this->outputJsonSuccess(getData($result));
-	}
-}
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
index 4733d0461..4a6745866 100644
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -41,20 +41,6 @@ export default {
 			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllDashboards'
 		};
 	},
-	getAllWidgets(dashboard_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllWidgets',
-			params: {dashboard_id}
-		};
-	},
-	setWidgetAllowed(params){
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/setWidgetAllowed',
-			params
-		};
-	},
 	loadFunktionen(dashboard_kurzbz){
 		return {
 			method: 'get',
diff --git a/public/js/api/factory/dashboard/widget.js b/public/js/api/factory/dashboard/widget.js
new file mode 100644
index 000000000..d7d1bbc86
--- /dev/null
+++ b/public/js/api/factory/dashboard/widget.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get(widget) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/get/' + widget
+		};
+	},
+	list(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/list/' + dashboard
+		};
+	},
+	listAllowed(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/widget/listAllowed/' + dashboard
+		};
+	},
+	setAllowed(dashboard_id, widget_id, allowed) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/widget/setAllowed',
+			params: {
+				dashboard_id, widget_id, allowed
+			}
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index 60ad6e1b8..203be9d9c 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -1,4 +1,4 @@
-import ApiDashboardAdmin from "../../../api/factory/dashboard/dashboardAdmin.js";
+import ApiDashboardWidget from "../../../api/factory/dashboard/Widget.js";
 
 export default {
 	emits: [
@@ -12,25 +12,16 @@ export default {
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
-			const params = {
-				dashboard_id: this.dashboard_id,
-				widget_id,
-				action: allow ? 'add' : 'delete'
-			};
 
 			this.$api
-				.call(ApiDashboardAdmin.setWidgetAllowed(params))
+				.call(ApiDashboardWidget.setAllowed(this.dashboard_id, widget_id, allow))
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
 		this.$api
-			.call(ApiDashboardAdmin.getAllWidgets(this.dashboard_id))
+			.call(ApiDashboardWidget.list(this.dashboard_id))
 			.then(result => {
-/*				console.log(result.data.map(el => ({
-						...el,
-						...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
-				})));*/
 				this.$emit('assignWidgets', result.data.map(el => ({
 					...el,
 					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index c27f0c405..3ed8aac09 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -2,6 +2,8 @@ import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
+import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
+
 export default {
 	name: 'Dashboard',
 	components: {
@@ -25,14 +27,14 @@ export default {
 	data() {
 		return {
 			sections: [],
-			widgets: null,
+			widgetsSetup: null,
 			editMode: false,
 		}
 	},
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgets),
+			widgetsSetup: Vue.computed(() => this.widgetsSetup),
 			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
@@ -43,17 +45,6 @@ export default {
 	},
 	methods: {
 		widgetAdd(section_name, widget) {
-			if (this.widgets === null) {
-				axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {params:{
-					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));
-			}
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
 				widget.id = 'loading_' + String((new Date()).valueOf());
@@ -143,13 +134,13 @@ export default {
 	},
 	created() {
 		this.$p.loadCategory('dashboard');
-		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
-			params: {
-				db: this.dashboard
-			}
-		}).then(res => {
-			this.widgets = res.data.retval;
-		}).catch(err => console.error('ERROR:', err));
+
+		this.$api
+			.call(ApiDashboardWidget.listAllowed(this.dashboard))
+			.then(res => {
+				this.widgetsSetup = res.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
@@ -186,6 +177,6 @@ export default {
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
-		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 06a03ae3a..1fe67ab45 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -1,5 +1,5 @@
 import BsModal from "../Bootstrap/Modal.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
 export default {
@@ -142,8 +142,14 @@ export default {
 			this.isLoading = false;
 		},
 	},
+	setup() {
+		const { actions } = useCachedWidgetLoader();
+		return {
+			loadWidget: actions.load
+		};
+	},
 	async created() {
-		this.widget = await CachedWidgetLoader.loadWidget(this.id);
+		this.widget = await this.loadWidget(this.id);
 		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;
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 75cfe8e85..817cc52a3 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,7 +1,7 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
 export default {
@@ -125,23 +125,23 @@ export default {
 		},
 		checkResizeLimit(item, w, h) {
 			// NOTE(chris): widgets needs to be loaded for this to work
-			let widget = CachedWidgetLoader.getWidget(item.widget);
+			let widget = this.widgetState[item.widget];
 			if (widget) {
-				let minmaxW = widget.setup.width;
+				let minmaxW = { ...widget.setup.width };
 				if (minmaxW.max)
 					minmaxW.min = minmaxW.min || 1;
 				else
-					minmaxW = {min:minmaxW,max:minmaxW};
+					minmaxW = { min: minmaxW, max: minmaxW };
 				if (w < minmaxW.min)
 					w = minmaxW.min; 
 				if (w > minmaxW.max)
 					w = minmaxW.max;
 
-				let minmaxH = widget.setup.height;
+				let minmaxH = { ...widget.setup.height };
 				if (minmaxH.max)
 					minmaxH.min = minmaxH.min || 1;
 				else
-					minmaxH = {min:minmaxH,max:minmaxH};
+					minmaxH = { min: minmaxH, max: minmaxH };
 				if (h < minmaxH.min)
 					h = minmaxH.min;
 				if (h > minmaxH.max)
@@ -199,6 +199,13 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
+	setup() {
+		const { state: widgetState } = useCachedWidgetLoader();
+
+		return {
+			widgetState
+		};
+	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
diff --git a/public/js/composables/Dashboard/CachedWidgetLoader.js b/public/js/composables/Dashboard/CachedWidgetLoader.js
index a92e3e557..4bc2d4992 100644
--- a/public/js/composables/Dashboard/CachedWidgetLoader.js
+++ b/public/js/composables/Dashboard/CachedWidgetLoader.js
@@ -1,29 +1,36 @@
-let __widgets = {};
-let __widgetsStarted = {};
-let __path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard/Widget';
+import ApiWidget from "../../api/factory/dashboard/widget.js";
 
-export default {
-	getWidget(id) {
-		return __widgets[id];
-	},
-	loadWidget(id) {
-		if (__widgets[id])
-			return Promise.resolve(__widgets[id]);
-		if (__widgetsStarted[id])
-			return __widgetsStarted[id];
-		if (!__path)
-			return Promise.reject('Widget could not be loaded because there is no path yet!');
+const promises = Vue.ref([]);
+const stateRef = Vue.ref([]);
+const state = Vue.readonly(stateRef);
 
-		__widgetsStarted[id] = new Promise((resolve, reject) => {
-			axios.get(__path, {params:{id}}).then(res => {
-				__widgets[id] = res.data.retval;
-				__widgetsStarted[id] = undefined;
-				resolve(__widgets[id]);
-			}).catch(error => reject(error.response.data.retval.error));
-		});
-		return __widgetsStarted[id];
-	},
-	setPath(path) {
-		__path = path;
+export function useCachedWidgetLoader() {
+	const $api = Vue.inject('$api');
+	const $fhcAlert = Vue.inject('$fhcAlert');
+
+	function load(id) {
+		if (state.value[id])
+			return Promise.resolve(state.value[id]);
+
+		if (!promises.value[id])
+			promises.value[id] = new Promise((resolve, reject) => {
+				$api
+					.call(ApiWidget.get(id))
+					.then(res => {
+						stateRef.value[id] = res.data;
+						promises.value[id] = undefined;
+						resolve(state.value[id]);
+					})
+					.catch($fhcAlert.handleSystemError);
+			});
+
+		return promises.value[id];
 	}
+
+	return {
+		state,
+		actions: {
+			load
+		}
+	};
 }
\ No newline at end of file

From 1972b461e7be8e5d69ef8f95624ce81f9006fe3c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:21:15 +0100
Subject: [PATCH 1293/1357] replace controllers/dashboard/Config.php with
 controllers/api/frontend/v1/dashboard/User.php &
 controllers/api/frontend/v1/dashboard/DashboardAdmin.php

---
 .../frontend/v1/dashboard/DashboardAdmin.php  |   6 -
 .../api/frontend/v1/dashboard/User.php        | 152 ++++++++++++
 application/controllers/dashboard/Config.php  | 216 ------------------
 public/js/api/factory/dashboard/user.js       |  45 ++++
 public/js/components/Dashboard/Dashboard.js   | 194 +++++++---------
 5 files changed, 285 insertions(+), 328 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/dashboard/User.php
 delete mode 100644 application/controllers/dashboard/Config.php
 create mode 100644 public/js/api/factory/dashboard/user.js

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
index 31e73b6ba..af844b29e 100644
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -32,15 +32,9 @@ class DashboardAdmin extends FHCAPI_Controller
 			'createDashboard'				=> 'dashboard/admin:rw',
 			'updateDashboard'				=> 'dashboard/admin:rw',
 			'deleteDashboard'				=> 'dashboard/admin:rw',
-			'index'							=> 'dashboard/benutzer:r',
-			'dummy'							=> 'dashboard/benutzer:r',
-			'genWidgetId'					=> 'dashboard/benutzer:rw',
 			'addWidgetsToPreset'			=> 'dashboard/admin:rw',
 			'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-			'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
-			'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
 			'funktionen'					=> 'dashboard/admin:r',
-			'preset'						=> 'dashboard/admin:r',
 			'presetBatch'					=> 'dashboard/admin:r'
 		]);
 
diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
new file mode 100644
index 000000000..1242232a2
--- /dev/null
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about the users dashboard
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class User extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get'							=> 'dashboard/benutzer:r',
+			'addWidget'						=> 'dashboard/benutzer:rw',
+			'removeWidget'					=> 'dashboard/benutzer:rw'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+
+	public function get($dashboard_kurzbz)
+	{
+		$dashboard = $this->dashboardlib->getDashboardByKurzbz($dashboard_kurzbz);
+		if (!$dashboard)
+			show_404();
+		
+		$uid = $this->authlib->getAuthObj()->username;
+
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
+
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id, $uid);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_merge_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_merge_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
+	}
+
+	public function addWidget()
+	{
+		$this->terminateWithValidationErrors(['test' => 'Test']);
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$widget = $this->input->post('widget');
+		$dashboard_kurzbz = $this->input->post('dashboard');
+		$uid = $this->authlib->getAuthObj()->username;
+		
+		if (!isset($widget['widgetid']))
+			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
+
+		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
+		
+		$override_decoded = json_decode($override->override, true);
+
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];
+
+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+		
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->dashboardlib->insertOrUpdateOverride($override);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($widget['widgetid']);
+	}
+
+	public function removeWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$widget_id = $this->input->post('widget');
+		$dashboard_kurzbz = $this->input->post('dashboard');
+		$uid = $this->authlib->getAuthObj()->username;
+		
+		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
+		if (empty($override))
+			show_404();
+		
+		$override_decoded = json_decode($override->override, true);
+
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}
+
+		$override->override = json_encode($override_decoded);
+				
+		$result = $this->dashboardlib->insertOrUpdateOverride($override);
+
+		$this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess();
+	}
+}
diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
deleted file mode 100644
index f6db9509f..000000000
--- a/application/controllers/dashboard/Config.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Config
- *
- * @author bambi
- */
-class Config extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> 'dashboard/benutzer:r',
-				'dummy'							=> 'dashboard/benutzer:r',
-				'genWidgetId'					=> 'dashboard/benutzer:rw',
-				'addWidgetsToPreset'			=> 'dashboard/admin:rw',
-				'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-				'addWidgetsToUserOverride'		=> 'dashboard/benutzer:rw',
-				'removeWidgetFromUserOverride'	=> 'dashboard/benutzer:rw',
-				'funktionen'					=> 'dashboard/admin:r',
-				'preset'						=> 'dashboard/admin:r',
-				'presetBatch'					=> 'dashboard/admin:r'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->library('AuthLib', null, 'AuthLib');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-	
-	public function index()
-	{
-		$dashboard_kurzbz = $this->input->get('db');
-		$uid = $this->AuthLib->getAuthObj()->username;
-
-		$dashboard = $this->DashboardLib->getDashboardByKurzbz($dashboard_kurzbz);
-		if(!$dashboard) {
-			http_response_code(404);
-			$this->terminateWithJsonError(array(
-				'error' => 'Dashboard ' . $dashboard_kurzbz . ' not found.'
-			));
-		}
-		
-		$mergedconfig = $this->DashboardLib->getMergedConfig($dashboard->dashboard_id, $uid);
-		$this->outputJsonSuccess($mergedconfig);
-	}
-	
-	public function genWidgetId()
-	{
-		$dashboard_kurzbz = $this->input->get('db');
-		$widgetid = $this->DashboardLib->generateWidgetId($dashboard_kurzbz);
-		$this->outputJsonSuccess(array(
-			'widgetid' => $widgetid
-		));
-	}
-	
-	public function addWidgetsToPreset()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		
-		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-		
-		$preset_decoded = json_decode($preset->preset, true);
-		
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
-		
-		$preset->preset = json_encode($preset_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if (isError($result)) {
-			http_response_code(500);
-			$this->terminateWithJsonError('preset could not be saved');
-		}
-		
-		$this->outputJsonSuccess(array('msg' => 'preset successfully stored.', 'data' => $preset_decoded));
-	}
-	
-	public function removeWidgetFromPreset()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$widgetid = $input->widgetid;
-				
-		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if ($preset === null) {
-			http_response_code(404);
-			$this->terminateWithJsonError('preset for dashboard ' . $dashboard_kurzbz . ' and funktion ' . $funktion_kurzbz . ' not found.');
-		}
-		
-		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
-		{
-			http_response_code(404);
-			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
-		}
-		
-		$preset->preset = json_encode($preset_decoded);
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if (isError($result))
-		{
-			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');
-		}
-		$this->outputJsonSuccess(array('msg' => 'preset successfully updated.'));
-	}
-
-	public function addWidgetsToUserOverride()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $this->AuthLib->getAuthObj()->username;
-		
-		$override = $this->DashboardLib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-		
-		$override_decoded = json_decode($override->override, true);
-
-		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
-		
-		$override->override = json_encode($override_decoded);
-				
-		$result = $this->DashboardLib->insertOrUpdateOverride($override);
-		if (isError($result)) {
-			http_response_code(500);
-			$this->terminateWithJsonError('override could not be saved');
-		}
-		
-		$this->outputJsonSuccess(array('msg' => 'override successfully stored.', 'data' => $override_decoded));
-	}
-	
-	public function removeWidgetFromUserOverride()
-	{
-		$input = json_decode($this->input->raw_input_stream);
-		$dashboard_kurzbz = $input->db;
-		$funktion_kurzbz = $input->funktion_kurzbz;
-		$uid = $this->AuthLib->getAuthObj()->username;
-		$widgetid = $input->widgetid;
-		
-		$override = $this->DashboardLib->getOverride($dashboard_kurzbz, $uid);
-		if (empty($override)) {
-			http_response_code(404);
-			$this->terminateWithJsonError('userconfig for dashboard ' . $dashboard_kurzbz . ' not found.');
-		}
-		
-		$override_decoded = json_decode($override->override, true);
-		
-		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
-		{
-			http_response_code(404);
-			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
-		}
-		
-		$override->override = json_encode($override_decoded);
-		$result = $this->DashboardLib->insertOrUpdateOverride($override, $uid);
-		if (isError($result))
-		{
-			http_response_code(500);
-			$this->terminateWithJsonError('failed to remove widget');
-		}
-		$this->outputJsonSuccess(array('msg' => 'override successfully updated.'));
-	}
-	
-	public function funktionen()
-	{
-		$funktionen = $this->FunktionModel->load();
-
-		if (isError($funktionen)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($funktionen)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($funktionen) ?: []);
-	}
-	
-	public function preset()
-	{
-		$db = $this->input->get('db');
-		$funktion = $this->input->get('funktion');
-
-		$conf = $this->DashboardLib->getPreset($db, $funktion);
-
-		if (!$conf)
-			return $this->outputJsonSuccess(['widgets' => [$funktion => []]]);
-
-		return $this->outputJsonSuccess(json_decode($conf->preset, true));
-	}
-	
-	public function presetBatch()
-	{
-		$db = $this->input->get('db');
-		$funktionen = $this->input->get('funktionen');
-		$result = [];
-
-		foreach ($funktionen as $funktion) {
-			$conf = $this->DashboardLib->getPreset($db, $funktion);
-			if ($conf)
-			{
-				$preset = json_decode($conf->preset, true);
-				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-					$result[$funktion] = [];
-				else
-					$result[$funktion] = $preset[$funktion]['widgets'];
-			}
-			else
-				$result[$funktion] = [];
-		}
-
-		return $this->outputJsonSuccess($result);
-	}
-}
diff --git a/public/js/api/factory/dashboard/user.js b/public/js/api/factory/dashboard/user.js
new file mode 100644
index 000000000..e660d077e
--- /dev/null
+++ b/public/js/api/factory/dashboard/user.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	get(dashboard) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/dashboard/user/get/' + dashboard
+		};
+	},
+	addWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/addWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	},
+	removeWidget(dashboard, widget) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/dashboard/user/removeWidget',
+			params: {
+				dashboard,
+				widget
+			}
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 3ed8aac09..497564fa5 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -3,6 +3,7 @@ import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
 import ApiDashboardWidget from '../../api/factory/dashboard/widget.js';
+import ApiDashboardUser from '../../api/factory/dashboard/user.js';
 
 export default {
 	name: 'Dashboard',
@@ -26,9 +27,10 @@ export default {
 	},
 	data() {
 		return {
-			sections: [],
+			widgets: [],
+			originalWidgets: {},
 			widgetsSetup: null,
-			editMode: false,
+			editMode: false
 		}
 	},
 	provide() {
@@ -38,98 +40,83 @@ export default {
 			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
-	computed: {
-		apiurl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/dashboard';
-		}
-	},
 	methods: {
 		widgetAdd(section_name, widget) {
-			this.$refs.widgetpicker.getWidget().then(widget_id => {
-				widget.widget = widget_id;
-				widget.id = 'loading_' + String((new Date()).valueOf());
-				let loading = {...widget};
-				loading.loading = true;
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets.push(loading);
-				});
-				
-				axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
-					db: this.dashboard,
-					funktion_kurzbz: section_name,
-					widgets: [widget]
-				}).then(result => {
-					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
-					widget.id = newId;
-					this.sections.forEach(section => {
-						if (section.name == section_name) {
-							section.widgets.splice(section.widgets.indexOf(loading),1);
-							section.widgets.push(widget);
-						}
-					});
-				}).catch(error => {
-					console.error('ERROR: ', error);
-					alert('ERROR: ' + error.response.data.retval);
-				});
-			}).catch(() => {});
+			// TODO(chris): remove section_name? (change order of params => get rid of it)
+			this.$refs.widgetpicker
+				.getWidget()
+				.then(widget_id => {
+					widget.widget = widget_id;
+					widget.id = 'loading_' + String((new Date()).valueOf());
+					let loading = { ...widget };
+					loading.loading = true;
+					this.widgets.push(loading);
+					
+					this.$api
+						.call(ApiDashboardUser.addWidget(this.dashboard, widget))
+						.then(result => {
+							widget.id = result.data;
+							this.widgets.splice(this.widgets.indexOf(loading), 1);
+							this.widgets.push(widget);
+							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(widget));
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				})
+				.catch(() => {});
 		},
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				for (var i in this.sections) {
-					if (this.sections[i].name == section_name) {
-						for (var wid in this.sections[i].widgets) {
-							if (this.sections[i].widgets[wid].id == k) {
-								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
-								// NOTE(chris): remove internal props
-								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1,preset:1})
-									if (payload[k][prop])
-										delete payload[k][prop];
-								break;
-							}
-						}
+				for (var wid in this.widgets) {
+					if (this.widgets[wid].id == k) {
+						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
+						// NOTE(chris): remove internal props
+						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
+							if (payload[k][prop])
+								delete payload[k][prop];
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 			}
-			axios.post(this.apiurl + '/Config/addWidgetsToUserOverride', {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgets: payload
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name) {
-						section.widgets.forEach((widget, i) => {
-							if (payload[widget.id]) {
-								payload[widget.id].id = widget.id;
-								payload[widget.id].index = widget.index;
-								section.widgets[i] = payload[widget.id];
+			this.$api
+				.call(Object.entries(payload).map(([key, widget]) => [key, ApiDashboardUser.addWidget(this.dashboard, widget)]))
+				.then(result => {
+					const failed = result
+						.filter(o => o.status == 'rejected')
+						.map(o => o.reason.config.errorHeader);
+
+					this.widgets.forEach((widget, i) => {
+						if (failed.includes(widget.id)) {
+							this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
+							/** NOTE(chris): if you wanna hide or unhide a
+							 * preset and it fails: switch around the hidden
+							 * value to revert it properly (checkboxes can't
+							 * really handle it otherwise)
+							 */
+							if (payload[widget.id].hidden !== undefined) {
+								this.widgets[i].hidden = payload[widget.id].hidden;
+								this.$nextTick(() => {
+									this.widgets[i] = structuredClone(ObjectUtils.deepToRaw(this.originalWidgets[widget.id]));
+								});
 							}
-						});
-					}
-				});
-			}).catch(error => {
-				// TODO(chris): revert placement on failure
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+						} else if (payload[widget.id]) {
+							payload[widget.id].id = widget.id;
+							payload[widget.id].index = widget.index;
+							this.widgets[i] = payload[widget.id];
+							this.originalWidgets[widget.id] = structuredClone(ObjectUtils.deepToRaw(this.widgets[i]));
+						}
+					});
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		},
 		widgetRemove(section_name, id) {
-			axios.post(this.apiurl + '/Config/removeWidgetFromUserOverride', {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgetid: id
-			}).then(() => {
-				this.sections.forEach(section => {
-					if (section.name == section_name)
-						section.widgets = section.widgets.filter(widget => widget.id != id);
-				});
-			}).catch(error => {
-				console.error('ERROR: ', error);
-				alert('ERROR: ' + error.response.data.retval);
-			});
+			this.$api
+				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
+				.then(() => {
+					this.widgets = this.widgets.filter(widget => widget.id != id);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	created() {
@@ -142,33 +129,28 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		axios.get(this.apiurl + '/Config', {params:{
-			db: this.dashboard
-		}}).then(res => {
-			for (var name in res.data.retval) {
-				let widgets = [];
-				let remove = [];
-				for (var wid in res.data.retval[name].widgets) {
-					res.data.retval[name].widgets[wid].id = wid;
-					if (res.data.retval[name].widgets[wid].custom || res.data.retval[name].widgets[wid].preset)
-						widgets.push(res.data.retval[name].widgets[wid]);
-					else
+		this.$api
+			.call(ApiDashboardUser.get(this.dashboard))
+			.then(res => {
+				const widgets = [];
+				const remove = [];
+
+				for (var wid in res.data.general.widgets) {
+					let widget = res.data.general.widgets[wid];
+					widget.id = wid;
+					if (widget.custom || widget.preset) {
+						widgets.push(widget);
+						this.originalWidgets[wid] = structuredClone(widget);
+					} else {
 						remove.push(wid);
+					}
 				}
-				this.sections.push({
-					name: name,
-					widgets: widgets
-				});
-				remove.forEach(wid => this.widgetRemove(name, wid));
-			}
-			this.sections = this.sections.sort((section1, section2) => {
-				if(section1.name == 'custom')
-					return 1;
-				if (section2.name == 'custom')
-					return -1;
-				return section2.widgets.length - section1.widgets.length;
-			});
-		}).catch(err => console.error('ERROR:', err));
+
+				remove.forEach(wid => this.widgetRemove('general', wid));
+
+				this.widgets = widgets;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="core-dashboard">
@@ -176,7 +158,7 @@ export default {
 			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
 	</div>`
 }

From d01dedb79c0cd6fa8b62f939b1df45272a570441 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:23:01 +0100
Subject: [PATCH 1294/1357] remove unused file

---
 application/controllers/dashboard/Api.php | 76 -----------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 application/controllers/dashboard/Api.php

diff --git a/application/controllers/dashboard/Api.php b/application/controllers/dashboard/Api.php
deleted file mode 100644
index 422bf0675..000000000
--- a/application/controllers/dashboard/Api.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class Api extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'		=> 'dashboard/admin:rw',
-				'getNews'	=> 'dashboard/benutzer:r',
-                'getAmpeln'	=> 'dashboard/benutzer:r',
-			)
-		);
-
-		$this->load->library('AuthLib', null, 'AuthLib');
-
-		$this->_setAuthUID();
-	}
-
-	public function index()
-	{
-		echo 'Dashboard API Controller';
-	}
-
-	/**
-	 * Get News.
-	 */
-	public function getNews()
-	{
-		$limit =  $this->input->get('limit');
-
-		$this->load->model('content/News_model', 'NewsModel');
-
-		$result = $this->NewsModel->getAll($limit);
-
-		if (hasData($result))
-		{
-			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->terminateWithJsonError('fehler entdeckt');
-		}
-	}
-
-
-	/**
-	 * Get Ampeln.
-	 */
-	public function getAmpeln()
-	{
-
-		$this->load->model('content/Ampel_model', 'AmpelModel');
-		$result = $this->AmpelModel->getByUser($this->_uid);
-
-		if (hasData($result))
-		{
-			$this->outputJson(getData($result), REST_Controller::HTTP_OK);
-		}
-		else
-		{
-			$this->terminateWithJsonError('fehler entdeckt');
-		}
-	}
-
-	/**
-	 * Retrieve the UID of the logged user and checks if it is valid
-	 */
-	private function _setAuthUID()
-	{
-		$this->_uid = getAuthUID();
-
-		if (!$this->_uid) show_error('User authentification failed');
-	}
-}

From 42fbbc52579433c2d24640cd2ff1f85ec3ece656 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:28:31 +0100
Subject: [PATCH 1295/1357] remove unused file

---
 .../controllers/dashboard/Dashboard.php       | 86 -------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 application/controllers/dashboard/Dashboard.php

diff --git a/application/controllers/dashboard/Dashboard.php b/application/controllers/dashboard/Dashboard.php
deleted file mode 100644
index 3773a6d73..000000000
--- a/application/controllers/dashboard/Dashboard.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-/**
- * Description of Widget
- *
- * @author chris
- */
-class Dashboard extends Auth_Controller
-{
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index'							=> 'dashboard/admin:r',
-				'create'						=> 'dashboard/admin:rw',
-				'update'						=> 'dashboard/admin:rw',
-				'delete'						=> 'dashboard/admin:rw'
-			)
-		);
-		
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-	}
-	
-	public function index()
-	{
-		$result = $this->DashboardModel->load();
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function create()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->insert($input);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function update()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->update($input->dashboard_id, $input);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-	
-	public function delete()
-	{
-		$input = $this->getPostJSON();
-
-		$result = $this->DashboardModel->delete($input->dashboard_id);
-
-		if (isError($result)) {
-			http_response_code(404);
-			$this->terminateWithJsonError([
-				'error' => getError($result)
-			]);
-		}
-		
-		return $this->outputJsonSuccess(getData($result) ?: []);
-	}
-}

From 60e556b2a827fbb7d352f3b88ab534b40255a4dd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:33:45 +0100
Subject: [PATCH 1296/1357] wrong case

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

diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index 203be9d9c..8217fff4b 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -1,4 +1,4 @@
-import ApiDashboardWidget from "../../../api/factory/dashboard/Widget.js";
+import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
 
 export default {
 	emits: [

From 6971aed030c58198dd6387c09a751a91f694c97f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:46:45 +0100
Subject: [PATCH 1297/1357] parsing happens in backend not frontend

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

diff --git a/public/js/components/Dashboard/Admin/Widgets.js b/public/js/components/Dashboard/Admin/Widgets.js
index 8217fff4b..a0c7b2139 100644
--- a/public/js/components/Dashboard/Admin/Widgets.js
+++ b/public/js/components/Dashboard/Admin/Widgets.js
@@ -24,7 +24,7 @@ export default {
 			.then(result => {
 				this.$emit('assignWidgets', result.data.map(el => ({
 					...el,
-					...{setup:JSON.parse(el.setup),arguments:JSON.parse(el.arguments),allowed:!!el.allowed}
+					allowed: !!el.allowed
 				})));
 			})
 			.catch(this.$fhcAlert.handleSystemError);

From ccade6ae0e9dc90cd371d03b5e4848ab5cdc0576 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 11:47:28 +0100
Subject: [PATCH 1298/1357] rename dashboard admin controller and views

---
 application/controllers/dashboard/Admin.php   | 52 +++++++++++++++++
 .../controllers/dashboard/DashboardAdmin.php  | 57 -------------------
 .../{dashboard_admin.php => admin.php}        |  2 +-
 .../{dashboard_preview.php => preview.php}    |  0
 4 files changed, 53 insertions(+), 58 deletions(-)
 create mode 100644 application/controllers/dashboard/Admin.php
 delete mode 100644 application/controllers/dashboard/DashboardAdmin.php
 rename application/views/dashboard/{dashboard_admin.php => admin.php} (90%)
 rename application/views/dashboard/{dashboard_preview.php => preview.php} (100%)

diff --git a/application/controllers/dashboard/Admin.php b/application/controllers/dashboard/Admin.php
new file mode 100644
index 000000000..702c04bab
--- /dev/null
+++ b/application/controllers/dashboard/Admin.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ */
+class Admin extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'dashboard/admin:rw',
+				'preview' => 'dashboard/admin:r',
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+		$this->load->view('dashboard/admin.php', []);
+	}
+
+	public function preview($dashboard_kurzbz = 'CIS')
+	{
+		$this->load->view('dashboard/preview.php', [
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
+	}
+}
diff --git a/application/controllers/dashboard/DashboardAdmin.php b/application/controllers/dashboard/DashboardAdmin.php
deleted file mode 100644
index b799d9ae9..000000000
--- a/application/controllers/dashboard/DashboardAdmin.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- */
-class DashboardAdmin extends Auth_Controller
-{
-    private $_uid;  // uid of the logged user
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        // Set required permissions
-        parent::__construct(
-            array(
-                'index' => 'dashboard/admin:rw',
-				'preview' => 'dashboard/admin:r',
-            )
-        );
-
-        $this->load->library('AuthLib');
-        $this->load->library('WidgetLib');
-
-        $this->_setAuthUID(); // sets property uid
-
-        $this->setControllerId(); // sets the controller id
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-	public function index()
-	{
-        $this->load->view('dashboard/dashboard_admin.php', []);
-	}
-
-	public function preview()
-	{
-		$dashboard_kurzbz = $this->input->get('db') ?? 'CIS';
-		$this->load->view('dashboard/dashboard_preview.php', ['dashboard_kurzbz' => $dashboard_kurzbz]);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-    /**
-     * Retrieve the UID of the logged user and checks if it is valid
-     */
-    private function _setAuthUID()
-    {
-        $this->_uid = getAuthUID();
-
-        if (!$this->_uid) show_error('User authentification failed');
-    }
-}
diff --git a/application/views/dashboard/dashboard_admin.php b/application/views/dashboard/admin.php
similarity index 90%
rename from application/views/dashboard/dashboard_admin.php
rename to application/views/dashboard/admin.php
index e10fc30c2..1e338e125 100644
--- a/application/views/dashboard/dashboard_admin.php
+++ b/application/views/dashboard/admin.php
@@ -31,7 +31,7 @@ $this->load->view(
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
 				<h1 class="h2">Dashboard</h1>
 			</div>
-			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+			<dashboard-admin></dashboard-admin>
 		</div>
 	</div>
 
diff --git a/application/views/dashboard/dashboard_preview.php b/application/views/dashboard/preview.php
similarity index 100%
rename from application/views/dashboard/dashboard_preview.php
rename to application/views/dashboard/preview.php

From 2a762fa4ab5962a44af7ccea6e3bce16b064b72a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 13:22:30 +0100
Subject: [PATCH 1299/1357] add renderers & timezone to dashboard admin for
 calendar widget

---
 public/js/apps/Dashboard/Admin.js | 68 +++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 7c57abbda..9f060f2ce 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -1,16 +1,66 @@
-import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
+import { CoreNavigationCmpt } from '../../components/navigation/Navigation.js';
 import DashboardAdmin from '../../components/Dashboard/Admin.js';
+
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const app = Vue.createApp({
-  name: 'AdminApp',
-  data: () => ({
-      appSideMenuEntries: {}
-    }),
-  components: {
-    CoreNavigationCmpt,
-    DashboardAdmin
-  }
+	name: 'DashboardAdminApp',
+	data: () => ({
+		appSideMenuEntries: {},
+		renderers: null
+	}),
+	components: {
+		CoreNavigationCmpt,
+		DashboardAdmin
+	},
+	provide() {
+		return {
+			// TODO(chris): move those two into the components that need it
+			renderers: Vue.computed(() => this.renderers),
+			timezone: 'Europe/Vienna'
+		};
+	},
+	created() {
+		this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => {
+				for (let rendertype of Object.keys(res.data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (res.data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
+					if (res.data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
+					if (res.data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
+
+					if (res.data[rendertype].calendarEventStyles) {
+						var head = document.head;
+						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = res.data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if (this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			})
+			.catch(this.$fhcAlert.handleSystemErrors);
+	}
 });
 app.use(PluginsPhrasen);
 app.directive('tooltip', primevue.tooltip);

From dc067a619b78a6db060de6f35066c57deccd812b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 14:07:31 +0100
Subject: [PATCH 1300/1357] make widgets resizeable in dashboard admin

---
 public/js/components/Dashboard/Admin.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index 3ea7a3260..d2e8292ec 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -4,6 +4,7 @@ import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
 import ApiDashboardAdmin from "../../api/factory/dashboard/dashboardAdmin.js";
+import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
 	name: 'DashboardAdmin',
@@ -14,7 +15,8 @@ export default {
 	},
 	provide() {
 		return {
-			adminMode: true
+			adminMode: true,
+			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
 		};
 	},
 	data() {
@@ -93,6 +95,14 @@ export default {
 			.call(ApiDashboardAdmin.getAllDashboards())
 			.then(result => {
 				this.dashboards = result.data.retval;
+				for (const dashboard of this.dashboards) {
+					this.$api
+						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
+						.then(res => {
+							dashboard.widgetSetup = res.data;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From 054cf2f258b0613a34cfe5f40158bc9db05a7274 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 15:06:25 +0100
Subject: [PATCH 1301/1357] correct form validation & typo in api dashboard
 widget

---
 .../api/frontend/v1/dashboard/Widget.php           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/Widget.php b/application/controllers/api/frontend/v1/dashboard/Widget.php
index cd01d9102..ac8c682e8 100644
--- a/application/controllers/api/frontend/v1/dashboard/Widget.php
+++ b/application/controllers/api/frontend/v1/dashboard/Widget.php
@@ -111,24 +111,24 @@ class Widget extends FHCAPI_Controller
 	{
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
-		$this->form_validation->set_rules('widget', 'Widget', 'required');
-		$this->form_validation->set_rules('allowed', 'Allowed', 'required|is_bool');
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard', 'required');
+		$this->form_validation->set_rules('widget_id', 'Widget', 'required');
+		$this->form_validation->set_rules('allowed', 'Allowed', 'is_bool');
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$data = [
-			'dashboard_id' => $this->input->post('dashboard'),
-			'widget_id' => $this->input->post('widget')
+			'dashboard_id' => $this->input->post('dashboard_id'),
+			'widget_id' => $this->input->post('widget_id')
 		];
 
 		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
 		
 		if ($this->input->post('allowed'))
-			$result = $this->DashoardWidgetModel->insert($data);
+			$result = $this->DashboardWidgetModel->insert($data);
 		else
-			$result = $this->DashoardWidgetModel->delete($data);
+			$result = $this->DashboardWidgetModel->delete($data);
 
 		$data = $this->getDataOrTerminateWithError($result);
 

From f15fd406362b3534224add49e7f769eb88e322ed Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 15:41:32 +0100
Subject: [PATCH 1302/1357] dashboardlib bug: array <=> stdclass

---
 application/libraries/dashboard/DashboardLib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index f6d7d6599..eb91350fd 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -195,11 +195,11 @@ class DashboardLib
 	{
 		foreach ($addwigets as $widget)
 		{
-			if(!isset($widget->widgetid))
+			if(!isset($widget['widgetid']))
 			{
-				$widget->widgetid = $this->generateWidgetId($dashboard_kurzbz);
+				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
 			}
-			$this->addWidgetToWidgets($widgets, $section, $widget, $widget->widgetid);
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
 		}
 	}
 	

From 3d7a6b1ad35b638539fc7e298fae238c076e82f1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 15:42:28 +0100
Subject: [PATCH 1303/1357] dashboard user api: empty -> check for false/null

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

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 1242232a2..1cf112a28 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -123,7 +123,7 @@ class User extends FHCAPI_Controller
 		$uid = $this->authlib->getAuthObj()->username;
 		
 		$override = $this->dashboardlib->getOverride($dashboard_kurzbz, $uid);
-		if (empty($override))
+		if (!$override)
 			show_404();
 		
 		$override_decoded = json_decode($override->override, true);

From 9cff50fa3b5475642a11c6fca148568d11fb6fb5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 15:44:42 +0100
Subject: [PATCH 1304/1357] extract preset logic from dashboard admin api

---
 .../frontend/v1/dashboard/DashboardAdmin.php  | 148 +------------
 .../frontend/v1/dashboard/admin/Preset.php    | 196 ++++++++++++++++++
 .../api/factory/dashboard/dashboardAdmin.js   |  20 +-
 system/phrasesupdate.php                      |  60 ------
 4 files changed, 207 insertions(+), 217 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/dashboard/admin/Preset.php

diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
index af844b29e..414475aba 100644
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
@@ -31,11 +31,7 @@ class DashboardAdmin extends FHCAPI_Controller
 			'getAllDashboards'				=> 'dashboard/admin:r',
 			'createDashboard'				=> 'dashboard/admin:rw',
 			'updateDashboard'				=> 'dashboard/admin:rw',
-			'deleteDashboard'				=> 'dashboard/admin:rw',
-			'addWidgetsToPreset'			=> 'dashboard/admin:rw',
-			'removeWidgetFromPreset'		=> 'dashboard/admin:rw',
-			'funktionen'					=> 'dashboard/admin:r',
-			'presetBatch'					=> 'dashboard/admin:r'
+			'deleteDashboard'				=> 'dashboard/admin:rw'
 		]);
 
 		// Load language phrases
@@ -144,146 +140,4 @@ class DashboardAdmin extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess($result);
 	}
-
-	//Presets
-	public function funktionen()
-	{
-		$dashboard_kurzbz = $this->input->get('db');
-		if(!$dashboard_kurzbz)
-		{
-			$this->terminateWithError('missing query parameter db');
-		}
-		$sql = <<<EOSQL
-			with
-			dashboard_presets as (
-					select
-						*
-					from
-						dashboard.tbl_dashboard_preset dp
-					join
-						dashboard.tbl_dashboard d on d.dashboard_id = dp.dashboard_id
-					where
-						d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
-			),
-			general as 	(
-				select
-					'general' as funktion_kurzbz,
-					'Allgemein' as beschreibung
-			)
-
-			(
-				select
-					f.funktion_kurzbz,
-					f.beschreibung,
-					count(p.preset_id) as has_preset
-				from
-					general f
-				left join
-					dashboard_presets p on p.funktion_kurzbz is null
-				group by
-					f.funktion_kurzbz, f.beschreibung
-			)
-			union ALL
-			(
-				select
-					f.funktion_kurzbz,
-					f.beschreibung,
-					count(p.preset_id) as has_preset
-				from
-					public.tbl_funktion f
-				left join
-					dashboard_presets p on p.funktion_kurzbz = f.funktion_kurzbz
-				group by
-					f.funktion_kurzbz, f.beschreibung
-				order by
-					f.beschreibung asc
-			)
-EOSQL;
-		$result = $this->FunktionModel->execReadOnlyQuery($sql);
-
-		if (isError($result))
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
-		$funktionen = getData($result) ?: [];
-		$this->terminateWithSuccess($funktionen);
-	}
-
-	public function addWidgetsToPreset()
-	{
-		$raw = $this->input->raw_input_stream;
-		$json = json_decode($raw);
-
-		$dashboard_kurzbz = $json->db;
-		$funktion_kurzbz = $json->funktion_kurzbz;
-		$widgets = $json->widgets;
-
-		$preset = $this->DashboardLib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
-
-		$preset_decoded = json_decode($preset->preset, true);
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $widgets);
-
-		$preset->preset = json_encode($preset_decoded);
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-
-		if (isError($result))
-			$this->terminateWithError($this->p->t('dashboard', 'error_savePreset'), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($preset_decoded);
-	}
-
-	public function removeWidgetFromPreset()
-	{
-		$raw = $this->input->raw_input_stream;
-		$json = json_decode($raw);
-
-		$dashboard_kurzbz = $json->db;
-		$funktion_kurzbz = $json->funktion_kurzbz;
-		$widgetid = $json->widgetid;
-
-		$preset = $this->DashboardLib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
-		if ($preset === null)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_presetAndFunctionNotFound', ['dashboard'=> $dashboard_kurzbz, 'funktion'=> $funktion_kurzbz]), self::ERROR_TYPE_GENERAL);
-		}
-
-		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Widget ID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$preset->preset = json_encode($preset_decoded);
-		$result = $this->DashboardLib->insertOrUpdatePreset($preset);
-		if (isError($result))
-		{
-			$this->terminateWithError($this->p->t('dashboard', 'error_deleteWidget'), self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
-	}
-
-	public function presetBatch()
-	{
-		$db = $this->input->get('db');
-		$funktionen = $this->input->get('funktionen');
-		$result = [];
-
-		if($funktionen)
-		{
-			foreach ($funktionen as $funktion) {
-				$conf = $this->DashboardLib->getPreset($db, $funktion);
-				if ($conf) {
-					$preset = json_decode($conf->preset, true);
-					if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
-						$result[$funktion] = [];
-					else {
-						$result[$funktion] = $preset[$funktion]['widgets'];
-					}
-				} else
-					$result[$funktion] = [];
-			}
-		}
-		else
-			$result = [];
-
-		return $this->terminateWithSuccess($result);
-	}
 }
diff --git a/application/controllers/api/frontend/v1/dashboard/admin/Preset.php b/application/controllers/api/frontend/v1/dashboard/admin/Preset.php
new file mode 100644
index 000000000..7dc810181
--- /dev/null
+++ b/application/controllers/api/frontend/v1/dashboard/admin/Preset.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Preset extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'list'					=> 'dashboard/admin:r',
+			'getBatch'				=> 'dashboard/admin:r',
+			'addWidgets'			=> 'dashboard/admin:rw',
+			'removeWidget'			=> 'dashboard/admin:rw'
+		]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+
+		// Libraries
+		$this->load->library('dashboard/DashboardLib');
+
+		// Models
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+	}
+
+	public function list($dashboard_kurzbz)
+	{
+		$sql = "
+			WITH
+			dashboard_presets AS (
+				SELECT
+					*
+				FROM
+					dashboard.tbl_dashboard_preset dp
+				JOIN
+					dashboard.tbl_dashboard d ON d.dashboard_id = dp.dashboard_id
+				WHERE
+					d.dashboard_kurzbz = {$this->db->escape($dashboard_kurzbz)}
+			),
+			general AS 	(
+				SELECT
+					'general' AS funktion_kurzbz,
+					'Allgemein' AS beschreibung
+			)
+
+			(
+				SELECT
+					f.funktion_kurzbz,
+					f.beschreibung,
+					COUNT(p.preset_id) AS has_preset
+				FROM
+					general f
+				LEFT JOIN
+					dashboard_presets p ON p.funktion_kurzbz IS NULL
+				GROUP BY
+					f.funktion_kurzbz, f.beschreibung
+			)
+			UNION ALL
+			(
+				SELECT
+					f.funktion_kurzbz,
+					f.beschreibung,
+					COUNT(p.preset_id) AS has_preset
+				FROM
+					public.tbl_funktion f
+				LEFT JOIN
+					dashboard_presets p ON p.funktion_kurzbz = f.funktion_kurzbz
+				GROUP BY
+					f.funktion_kurzbz, f.beschreibung
+				ORDER BY
+					f.beschreibung ASC
+			)
+		";
+
+		$result = $this->FunktionModel->execReadOnlyQuery($sql);
+
+		$funktionen = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($funktionen);
+	}
+
+	public function getBatch()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$db = $this->input->post('db');
+		$funktionen = $this->input->post('funktionen') ?: [];
+
+		$result = [];
+
+		foreach ($funktionen as $funktion) {
+			$conf = $this->dashboardlib->getPreset($db, $funktion);
+			if ($conf) {
+				$preset = json_decode($conf->preset, true);
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
+			} else {
+				$result[$funktion] = [];
+			}
+		}
+
+		return $this->terminateWithSuccess($result);
+	}
+
+	public function addWidgets()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_kurzbz = $this->input->post('db');
+		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
+		$widgets = $this->input->post('widgets') ?: [];
+
+		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
+
+		$preset_decoded = json_decode($preset->preset, true);
+		
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $widgets);
+
+		$preset->preset = json_encode($preset_decoded);
+
+		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($preset_decoded);
+	}
+
+	public function removeWidget()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
+		$this->form_validation->set_rules('widgetid', 'Widget', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_kurzbz = $this->input->post('db');
+		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
+		$widgetid = $this->input->post('widgetid');
+
+		$preset = $this->dashboardlib->getPreset($dashboard_kurzbz, $funktion_kurzbz);
+		if (!$preset)
+			show_404();
+
+		$preset_decoded = json_decode($preset->preset, true);
+
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
+			show_404();
+
+		$preset->preset = json_encode($preset_decoded);
+
+		$result = $this->dashboardlib->insertOrUpdatePreset($preset);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(array('msg' => $this->p->t('dashboard', 'success_savePreset')));
+	}
+}
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
index 4a6745866..f734dae64 100644
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -41,32 +41,32 @@ export default {
 			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllDashboards'
 		};
 	},
-	loadFunktionen(dashboard_kurzbz){
+	loadFunktionen(dashboard_kurzbz) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/funktionen?db='
+			url: 'api/frontend/v1/dashboard/admin/preset/list/'
 				+ encodeURIComponent(dashboard_kurzbz)
 		};
 	},
-	addWidgetsToPreset(params){
+	presetBatch(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/addWidgetsToPreset',
+			url: 'api/frontend/v1/dashboard/admin/preset/getBatch',
 			params
 		};
 	},
-	removeWidgetFromPreset(params){
+	addWidgetsToPreset(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/removeWidgetFromPreset',
+			url: 'api/frontend/v1/dashboard/admin/preset/addWidgets',
 			params
 		};
 	},
-	presetBatch(params){
+	removeWidgetFromPreset(params) {
 		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/presetBatch',
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/admin/preset/removeWidget',
 			params
 		};
-	},
+	}
 }
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9c458fd47..f7628f8ef 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -57217,66 +57217,6 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'error_savePreset',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Voreinstellung konnten nicht gespeichert werden.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Preset could not be saved.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'error_presetAndFunctionNotFound',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Voreinstellung für Dashboard {dashboard} und Funktion {funktion} nicht gefunden.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Preset for dashboard {dashboard} and function {funktion} not found.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'error_deleteWidget',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widget konnte nicht entfernt werden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'failed to remove widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',

From ca630e94ae741e74a2a0a9fd3db858b542f3ea6c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 15:46:13 +0100
Subject: [PATCH 1305/1357] remove debug line

---
 application/controllers/api/frontend/v1/dashboard/User.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 1cf112a28..e0fcd915a 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -71,7 +71,6 @@ class User extends FHCAPI_Controller
 
 	public function addWidget()
 	{
-		$this->terminateWithValidationErrors(['test' => 'Test']);
 		$this->load->library('form_validation');
 
 		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');

From 2fc392c0843b11eb3bfb8ac0b7afb1e31e57a347 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 23 Mar 2026 16:05:22 +0100
Subject: [PATCH 1306/1357] refactor dashboards Preset->addWidgets to (single)
 Preset->addWidget

---
 .../frontend/v1/dashboard/admin/Preset.php    | 18 +++++---
 .../api/factory/dashboard/dashboardAdmin.js   |  2 +-
 .../js/components/Dashboard/Admin/Presets.js  | 46 +++++++++----------
 public/js/components/Dashboard/Dashboard.js   |  5 +-
 4 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/admin/Preset.php b/application/controllers/api/frontend/v1/dashboard/admin/Preset.php
index 7dc810181..5983d9660 100644
--- a/application/controllers/api/frontend/v1/dashboard/admin/Preset.php
+++ b/application/controllers/api/frontend/v1/dashboard/admin/Preset.php
@@ -30,7 +30,7 @@ class Preset extends FHCAPI_Controller
 		parent::__construct([
 			'list'					=> 'dashboard/admin:r',
 			'getBatch'				=> 'dashboard/admin:r',
-			'addWidgets'			=> 'dashboard/admin:rw',
+			'addWidget'				=> 'dashboard/admin:rw',
 			'removeWidget'			=> 'dashboard/admin:rw'
 		]);
 
@@ -132,25 +132,29 @@ class Preset extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
-	public function addWidgets()
+	public function addWidget()
 	{
 		$this->load->library('form_validation');
 
-		$this->form_validation->set_rules('db', 'Dashboard', 'required');
+		$this->form_validation->set_rules('dashboard', 'Dashboard', 'required');
 		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required');
+		$this->form_validation->set_rules('widget[widget]', 'Widget', 'required');
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$dashboard_kurzbz = $this->input->post('db');
+		$dashboard_kurzbz = $this->input->post('dashboard');
 		$funktion_kurzbz = $this->input->post('funktion_kurzbz');
-		$widgets = $this->input->post('widgets') ?: [];
+		$widget = $this->input->post('widget');
+
+		if (!isset($widget['widgetid']))
+			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
 
 		$preset = $this->dashboardlib->getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz);
 
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $widgets);
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
 
 		$preset->preset = json_encode($preset_decoded);
 
@@ -158,7 +162,7 @@ class Preset extends FHCAPI_Controller
 
 		$this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($preset_decoded);
+		$this->terminateWithSuccess($widget['widgetid']);
 	}
 
 	public function removeWidget()
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
index f734dae64..f685df485 100644
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -58,7 +58,7 @@ export default {
 	addWidgetsToPreset(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/admin/preset/addWidgets',
+			url: 'api/frontend/v1/dashboard/admin/preset/addWidget',
 			params
 		};
 	},
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 518e9d20f..88584cc03 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -26,6 +26,7 @@ export default {
 		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
+				widget.id = 'loading_' + String((new Date()).valueOf());
 				delete widget.custom;
 				widget.preset = 1;
 				let loading = {...widget};
@@ -36,15 +37,15 @@ export default {
 				});
 
 				const params = {
-					db: this.dashboard,
+					dashboard: this.dashboard,
 					funktion_kurzbz: section_name,
-					widgets: [widget]
+					widget
 				};
 
 				return this.$api
 					.call(ApiDashboardAdmin.addWidgetsToPreset(params))
 					.then(result => {
-						let newId = Object.keys(result.data[section_name].widgets).pop();
+						let newId = result.data;
 						widget.id = newId;
 						widget.custom = 1;
 						this.sections.forEach(section => {
@@ -66,34 +67,29 @@ export default {
 		widgetUpdate(section_name, payload) {
 			payload = payload[section_name];
 			for (var k in payload) {
-				for (var i in this.sections) {
-					if (this.sections[i].name == section_name) {
-						for (var wid in this.sections[i].widgets) {
-							if (this.sections[i].widgets[wid].id == k) {
-								payload[k] = ObjectUtils.mergeDeep(this.sections[i].widgets[wid], payload[k]);
-								// NOTE(chris): remove internal props
-								for (var prop in {_x:1,_y:1,_w:1,_h:1,index:1,id:1})
-									if (payload[k][prop])
-										delete payload[k][prop];
-								break;
-							}
-						}
+				const section = this.sections.find(section => section.name == section_name);
+				for (var wid in section.widgets) {
+					if (section.widgets[wid].id == k) {
+						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
+						// NOTE(chris): remove internal props
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
+							if (payload[k][prop])
+								delete payload[k][prop];
 						break;
 					}
 				}
 				payload[k].widgetid = k;
 				delete payload[k].custom;
 			}
-
-			//TODO(manu) test
-			const params = {
-				db: this.dashboard,
-				funktion_kurzbz: section_name,
-				widgets: payload
-			};
-
-			return this.$api
-				.call(ApiDashboardAdmin.addWidgetsToPreset(params))
+			this.$api
+				.call(Object.entries(payload).map(([key, widget]) => [
+					key,
+					ApiDashboardAdmin.addWidgetsToPreset({
+						dashboard: this.dashboard,
+						funktion_kurzbz: section_name,
+						widget
+					})
+				]))
 				.then(result => {
 					this.sections.forEach(section => {
 						if (section.name == section_name) {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 497564fa5..e92e34f29 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -80,7 +80,10 @@ export default {
 				payload[k].widgetid = k;
 			}
 			this.$api
-				.call(Object.entries(payload).map(([key, widget]) => [key, ApiDashboardUser.addWidget(this.dashboard, widget)]))
+				.call(Object.entries(payload).map(([key, widget]) => [
+					key,
+					ApiDashboardUser.addWidget(this.dashboard, widget)
+				]))
 				.then(result => {
 					const failed = result
 						.filter(o => o.status == 'rejected')

From 2720ed9ffba17d25609441909998c977aacf27d6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 11:00:09 +0100
Subject: [PATCH 1307/1357] timezone from global object

---
 public/js/apps/Dashboard/Admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/apps/Dashboard/Admin.js b/public/js/apps/Dashboard/Admin.js
index 9f060f2ce..32909a50a 100644
--- a/public/js/apps/Dashboard/Admin.js
+++ b/public/js/apps/Dashboard/Admin.js
@@ -19,7 +19,7 @@ const app = Vue.createApp({
 		return {
 			// TODO(chris): move those two into the components that need it
 			renderers: Vue.computed(() => this.renderers),
-			timezone: 'Europe/Vienna'
+			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
 		};
 	},
 	created() {

From 8c75608eafb7ccd9b42feb0aebcd34ca69a7ca2d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 24 Mar 2026 13:21:50 +0100
Subject: [PATCH 1308/1357] add menu entry for Dashboard Admin

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

diff --git a/application/config/navigation.php b/application/config/navigation.php
index c70aba57c..4d4dcc22a 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -208,7 +208,14 @@ $config['navigation_header'] = array(
                     'expand' => true,
                     'sort' => 30,
                     'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-                )
+                ),
+				'dashboardadmin' => array(
+					'link' => site_url('dashboard/Admin'),
+					'description' => 'Dashboard Admin',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'dashboard/admin:r'
+				)
 			)
 		)
 	)

From 46817b846ad88d4ab9a809a84549081d4abd740f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 24 Mar 2026 13:29:20 +0100
Subject: [PATCH 1309/1357] fix e.g. long lines of underscores in cms content

---
 public/css/components/dashboard/news.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 4c4616aa5..116c96ddd 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -193,3 +193,6 @@
 	word-break: break-word;
 }
 
+.news-list-item p {
+	word-break: break-word;
+}
\ No newline at end of file

From 49c712a5b6ae73870240c468814eeeb264af04cc Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 24 Mar 2026 13:57:23 +0100
Subject: [PATCH 1310/1357] Personalmeldung sws: rounding to 2 decimals

---
 vilesci/bis/personalmeldung.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
index 69c358db6..1def6774d 100644
--- a/vilesci/bis/personalmeldung.php
+++ b/vilesci/bis/personalmeldung.php
@@ -1029,8 +1029,8 @@ function _generateXML($person_arr)
 			else
 				$xml .= '<StgKz><![CDATA['. $lehre->StgKz. ']]></StgKz>';
 
-			$xml .= '<SommersemesterSWS><![CDATA['. $lehre->SommersemesterSWS. ']]></SommersemesterSWS>';
-			$xml .= '<WintersemesterSWS><![CDATA['. $lehre->WintersemesterSWS. ']]></WintersemesterSWS>';
+			$xml .= '<SommersemesterSWS><![CDATA['. number_format($lehre->SommersemesterSWS, 2, '.', ''). ']]></SommersemesterSWS>';
+			$xml .= '<WintersemesterSWS><![CDATA['. number_format($lehre->WintersemesterSWS, 2, '.', ''). ']]></WintersemesterSWS>';
 			$xml .= '</Lehre>';
 		}
 

From aeb5d408403d0010a1c2afb95a191b0b04cc11fa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 15:14:39 +0100
Subject: [PATCH 1311/1357] rename api endpoints

---
 .../api/frontend/v1/dashboard/Board.php       | 121 +++++++++++++++
 .../frontend/v1/dashboard/DashboardAdmin.php  | 143 ------------------
 .../v1/dashboard/{admin => }/Preset.php       |   0
 .../api/factory/dashboard/dashboardAdmin.js   |  26 ++--
 4 files changed, 134 insertions(+), 156 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/dashboard/Board.php
 delete mode 100644 application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
 rename application/controllers/api/frontend/v1/dashboard/{admin => }/Preset.php (100%)

diff --git a/application/controllers/api/frontend/v1/dashboard/Board.php b/application/controllers/api/frontend/v1/dashboard/Board.php
new file mode 100644
index 000000000..c50fec128
--- /dev/null
+++ b/application/controllers/api/frontend/v1/dashboard/Board.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about addresses
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Board extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'list'					=> 'dashboard/admin:r',
+			'create'				=> 'dashboard/admin:rw',
+			'update'				=> 'dashboard/admin:rw',
+			'delete'				=> 'dashboard/admin:rw'
+		]);
+
+		// Models
+		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
+	}
+
+	public function list()
+	{
+		$result = $this->DashboardModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function create()
+	{
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		
+		$result = $this->DashboardModel->insert([
+			'dashboard_kurzbz' => $dashboard_kurzbz
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_id = $this->input->post('dashboard_id');
+		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
+		$beschreibung = $this->input->post('beschreibung');
+
+		$result = $this->DashboardModel->update([
+			'dashboard_id' => $dashboard_id
+		], [
+			'dashboard_kurzbz' => $dashboard_kurzbz,
+			'beschreibung' => $beschreibung
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('dashboard_id', 'Dashboard ID', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$dashboard_id = $this->input->post('dashboard_id');
+
+		//delete all presets
+		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
+
+		$result = $this->DashboardPresetModel->delete([
+			'dashboard_id' => $dashboard_id
+		]);
+		$this->getDataOrTerminateWithError($result);
+
+		//delete all widgets
+		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
+
+		$result = $this->DashboardWidgetModel->delete([
+			'dashboard_id' => $dashboard_id
+		]);
+		$this->getDataOrTerminateWithError($result);
+
+		$result = $this->DashboardModel->delete($dashboard_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($result);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php b/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
deleted file mode 100644
index 414475aba..000000000
--- a/application/controllers/api/frontend/v1/dashboard/DashboardAdmin.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 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/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about addresses
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class DashboardAdmin extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getAllDashboards'				=> 'dashboard/admin:r',
-			'createDashboard'				=> 'dashboard/admin:rw',
-			'updateDashboard'				=> 'dashboard/admin:rw',
-			'deleteDashboard'				=> 'dashboard/admin:rw'
-		]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		$this->load->library('dashboard/DashboardLib', null, 'DashboardLib');
-
-		$this->load->model('dashboard/Dashboard_model', 'DashboardModel');
-		$this->load->model('dashboard/Widget_model', 'WidgetModel');
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-	}
-
-	public function getAllDashboards()
-	{
-		$result = $this->DashboardModel->load();
-
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result);
-	}
-
-	public function createDashboard()
-	{
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$result = $this->DashboardModel->insert(
-			[
-				'dashboard_kurzbz' => $dashboard_kurzbz
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess((getData($result) ?: []));
-	}
-
-	public function updateDashboard()
-	{
-		$dashboard_id = $this->input->post('dashboard_id');
-		$dashboard_kurzbz = $this->input->post('dashboard_kurzbz');
-		$beschreibung = $this->input->post('beschreibung');
-		if(!$dashboard_id)
-		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->DashboardModel->update(
-			[
-			'dashboard_id' => $dashboard_id,
-			],
-			[
-				'dashboard_kurzbz' => $dashboard_kurzbz,
-				'beschreibung' => $beschreibung,
-			]
-		);
-
-		if (isError($result))
-		{
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result);
-	}
-
-	public function deleteDashboard()
-	{
-		$dashboard_id = $this->input->post('dashboard_id');
-		if(!$dashboard_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Dashboard ID']), self::ERROR_TYPE_GENERAL);
-		}
-
-		//delete all presets
-		$this->load->model('dashboard/Dashboard_Preset_model', 'DashboardPresetModel');
-		$resultPresets = $this->DashboardPresetModel->delete(
-			array('dashboard_id' => $dashboard_id)
-		);
-		if ($resultPresets === false)
-		{
-			return $this->terminateWithError($resultPresets, self::ERROR_TYPE_GENERAL);
-		}
-
-		//delete all widgets
-		$this->load->model('dashboard/Dashboard_Widget_model', 'DashboardWidgetModel');
-
-		$resultWidgets = $this->DashboardWidgetModel->delete(
-			array('dashboard_id' => $dashboard_id)
-		);
-		if ($resultWidgets === false)
-		{
-			return $this->terminateWithError($resultWidgets, self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->DashboardModel->delete(
-			array('dashboard_id' => $dashboard_id)
-		);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result);
-	}
-}
diff --git a/application/controllers/api/frontend/v1/dashboard/admin/Preset.php b/application/controllers/api/frontend/v1/dashboard/Preset.php
similarity index 100%
rename from application/controllers/api/frontend/v1/dashboard/admin/Preset.php
rename to application/controllers/api/frontend/v1/dashboard/Preset.php
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
index f685df485..edc53ff02 100644
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ b/public/js/api/factory/dashboard/dashboardAdmin.js
@@ -14,58 +14,58 @@
 */
 
 export default {
+	getAllDashboards() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/board/list'
+		};
+	},
 	addDashboard(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/createDashboard',
+			url: 'api/frontend/v1/dashboard/board/create',
 			params
 		};
 	},
 	updateDashboard(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/updateDashboard',
+			url: 'api/frontend/v1/dashboard/board/update',
 			params
 		};
 	},
 	deleteDashboard(dashboard_id) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/deleteDashboard',
+			url: 'api/frontend/v1/dashboard/board/delete',
 			params: { dashboard_id }
 		};
 	},
-	getAllDashboards(){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/DashboardAdmin/getAllDashboards'
-		};
-	},
 	loadFunktionen(dashboard_kurzbz) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/dashboard/admin/preset/list/'
+			url: 'api/frontend/v1/dashboard/preset/list/'
 				+ encodeURIComponent(dashboard_kurzbz)
 		};
 	},
 	presetBatch(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/admin/preset/getBatch',
+			url: 'api/frontend/v1/dashboard/preset/getBatch',
 			params
 		};
 	},
 	addWidgetsToPreset(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/admin/preset/addWidget',
+			url: 'api/frontend/v1/dashboard/preset/addWidget',
 			params
 		};
 	},
 	removeWidgetFromPreset(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/dashboard/admin/preset/removeWidget',
+			url: 'api/frontend/v1/dashboard/preset/removeWidget',
 			params
 		};
 	}

From 3a4015eced7e4fce82728bfebef766704c360072 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 15:15:04 +0100
Subject: [PATCH 1312/1357] dashboard useroverwrite: remove doubles in other
 funktionen

---
 .../controllers/api/frontend/v1/dashboard/User.php        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index e0fcd915a..27cb2c789 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -97,6 +97,14 @@ class User extends FHCAPI_Controller
 				$override_decoded['general']['widgets'] = [];
 
 		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
 		
 		$override->override = json_encode($override_decoded);
 				

From b11d8d056a25b7f8c62d17d504b710baa3208d3c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 15:15:12 +0100
Subject: [PATCH 1313/1357] get access rights from permissionlib

---
 application/libraries/PermissionLib.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/application/libraries/PermissionLib.php b/application/libraries/PermissionLib.php
index 42502f999..d3fdc6642 100644
--- a/application/libraries/PermissionLib.php
+++ b/application/libraries/PermissionLib.php
@@ -50,6 +50,7 @@ class PermissionLib
 	const LOGINAS_PERSONIDS_BLACKLIST = 'permission_loginas_personids_blacklist';
 
 	private $_ci; // CI instance
+	private $access_rights; // current users access rights
 	private static $bb; // benutzerberechtigung
 
 	/**
@@ -61,6 +62,8 @@ class PermissionLib
 		// Loads CI instance
 		$this->_ci =& get_instance();
 
+		$this->access_rights = null;
+
 		$this->_ci->config->load('permission'); // Loads permission configuration
 
 		// If it's NOT called from command line
@@ -69,8 +72,10 @@ class PermissionLib
 			// API Caller rights initialization
 			$authObj = $this->_ci->authlib->getAuthObj();
 			self::$bb = new benutzerberechtigung();
-			if ($authObj)
+			if ($authObj) {
 				self::$bb->getBerechtigungen($authObj->{AuthLib::AO_USERNAME});
+				$this->access_rights = self::$bb->berechtigungen;
+			}
 		}
 	}
 
@@ -340,6 +345,16 @@ class PermissionLib
         }
     }
 
+	/**
+	 * Returns the access rights for the current user
+	 *
+	 * @return array|null
+	 */
+	public function getAccessRights()
+	{
+		return $this->access_rights;
+	}
+
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 

From e3093bdf3f55ab27cd7b7bb27360c6815f0148a1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 15:15:36 +0100
Subject: [PATCH 1314/1357] get magic funktionen (Mitarbeiter, Student) as
 dashboard presets

---
 .../api/frontend/v1/dashboard/User.php        |  2 +-
 .../libraries/dashboard/DashboardLib.php      | 30 ++++++++---
 .../dashboard/Dashboard_Preset_model.php      | 53 -------------------
 public/js/components/Dashboard/Item.js        | 10 +++-
 4 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 27cb2c789..6c7b934dc 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -56,7 +56,7 @@ class User extends FHCAPI_Controller
 				$mergedconfig
 			)
 		]);*/
-		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id, $uid);
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
 		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
 
 		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_merge_recursive', $defaultconfig) : [];
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index eb91350fd..9b5306d94 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -49,7 +49,7 @@ class DashboardLib
 	
 	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getDefaultConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
@@ -57,14 +57,28 @@ class DashboardLib
 		return $mergedconfig;
 	}
 	
-	public function getDefaultConfig($dashboard_id, $uid)
+	public function getDefaultConfig($dashboard_id)
 	{
-		$res_presets = $this->_ci->DashboardPresetModel->getPresets($dashboard_id, $uid);
+		$funktion_kurzbzs = [];
+		$rights = $this->_ci->permissionlib->getAccessRights();
+		if ($rights)
+			$funktion_kurzbzs = array_unique(array_map(function ($right) {
+				return $right->funktion_kurzbz;
+			}, $rights));
+		
+		$this->_ci->DashboardPresetModel->db->where_in('funktion_kurzbz', $funktion_kurzbzs);
+		$this->_ci->DashboardPresetModel->db->or_where('funktion_kurzbz IS NULL');
+
+		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
+		
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard_id
+		]);
 		$defaultconfig = array();
 		
-		if (hasData($res_presets))
+		if (hasData($result))
 		{
-			$presets = getData($res_presets);
+			$presets = getData($result);
 			foreach ($presets as $presetobj)
 			{
 				$preset = json_decode($presetobj->preset, true);
@@ -137,8 +151,10 @@ class DashboardLib
 		$dashboard = $this->getDashboardByKurzbz($dashboard_kurzbz);
 		
 		$funktion_kurzbz = ($section === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL) ? null : $section;
-		$result = $this->_ci->DashboardPresetModel
-			->getPresetByDashboardAndFunktion($dashboard->dashboard_id, $funktion_kurzbz);
+		$result = $this->_ci->DashboardPresetModel->loadWhere([
+			'dashboard_id' => $dashboard->dashboard_id,
+			'funktion_kurzbz' => $funktion_kurzbz
+		]);
 		
 		if (hasData($result))
 		{
diff --git a/application/models/dashboard/Dashboard_Preset_model.php b/application/models/dashboard/Dashboard_Preset_model.php
index ca10ce98a..42570d091 100644
--- a/application/models/dashboard/Dashboard_Preset_model.php
+++ b/application/models/dashboard/Dashboard_Preset_model.php
@@ -11,57 +11,4 @@ class Dashboard_Preset_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard_preset';
 		$this->pk = 'preset_id';
 	}
-
-	/**
-	 * Get Presets of given uid.
-	 * @param integer dashboard_id
-	 * @param string $uid
-	 * @return array
-	 */
-	public function getPresets($dashboard_id, $uid)
-	{
-		// TODO: get Funktionen for uid and load all preset for all funktionen for uid
-		//return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz'=> null));
-		$sql = <<<EOSQL
-			SELECT 
-				* 
-			FROM 
-				dashboard.tbl_dashboard_preset 
-			WHERE 
-				dashboard_id = ? 
-			AND (
-					funktion_kurzbz IN (
-						SELECT 
-							DISTINCT funktion_kurzbz 
-						FROM 
-							public.tbl_benutzerfunktion 
-						WHERE 
-							uid = ? 
-						AND 
-							NOW()::date 
-						BETWEEN 
-							COALESCE(datum_von, '1970-01-01') 
-						AND 
-							COALESCE(datum_bis, '2170-12-31')
-					) 
-					OR 
-						funktion_kurzbz IS NULL
-				) 
-			ORDER BY 
-				funktion_kurzbz DESC
-EOSQL;
-		
-		return $this->execQuery($sql, array($dashboard_id, $uid));
-	}
-	
-	/**
-	 * Get Preset by Dashboard and Funktion
-	 * @param integer dashboard_id
-	 * @param string funktion_kurzbz
-	 * @return array
-	 */
-	public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
-	{
-		return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
-	}
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 1fe67ab45..79e61293d 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -70,6 +70,14 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
+		visible: {
+			get() {
+				return !this.hidden;
+			},
+			set(value) {
+				this.$emit('remove', this.hidden);
+			}
+		}
 	},
 	methods: {
 		unpin(){
@@ -191,7 +199,7 @@ export default {
 			</a>
 			<Transition>
 				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
 				</div>
 			</Transition>
 		</div>

From 1951cd6fa866b25a8b2fa4289e3c06362ae53921 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 24 Mar 2026 16:08:02 +0100
Subject: [PATCH 1315/1357] split/rename dashboard api factories

---
 public/js/api/factory/dashboard/board.js      | 46 ++++++++++++
 .../api/factory/dashboard/dashboardAdmin.js   | 72 -------------------
 public/js/api/factory/dashboard/preset.js     | 47 ++++++++++++
 public/js/components/Dashboard/Admin.js       | 10 +--
 .../js/components/Dashboard/Admin/Presets.js  | 12 ++--
 5 files changed, 104 insertions(+), 83 deletions(-)
 create mode 100644 public/js/api/factory/dashboard/board.js
 delete mode 100644 public/js/api/factory/dashboard/dashboardAdmin.js
 create mode 100644 public/js/api/factory/dashboard/preset.js

diff --git a/public/js/api/factory/dashboard/board.js b/public/js/api/factory/dashboard/board.js
new file mode 100644
index 000000000..b5e9b5be3
--- /dev/null
+++ b/public/js/api/factory/dashboard/board.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	list() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/board/list'
+		};
+	},
+	add(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/create',
+			params
+		};
+	},
+	update(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/update',
+			params
+		};
+	},
+	delete(dashboard_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/board/delete',
+			params: { dashboard_id }
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/factory/dashboard/dashboardAdmin.js b/public/js/api/factory/dashboard/dashboardAdmin.js
deleted file mode 100644
index edc53ff02..000000000
--- a/public/js/api/factory/dashboard/dashboardAdmin.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export default {
-	getAllDashboards() {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/board/list'
-		};
-	},
-	addDashboard(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/create',
-			params
-		};
-	},
-	updateDashboard(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/update',
-			params
-		};
-	},
-	deleteDashboard(dashboard_id) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/board/delete',
-			params: { dashboard_id }
-		};
-	},
-	loadFunktionen(dashboard_kurzbz) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/dashboard/preset/list/'
-				+ encodeURIComponent(dashboard_kurzbz)
-		};
-	},
-	presetBatch(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/getBatch',
-			params
-		};
-	},
-	addWidgetsToPreset(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/addWidget',
-			params
-		};
-	},
-	removeWidgetFromPreset(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/dashboard/preset/removeWidget',
-			params
-		};
-	}
-}
\ No newline at end of file
diff --git a/public/js/api/factory/dashboard/preset.js b/public/js/api/factory/dashboard/preset.js
new file mode 100644
index 000000000..3f380581e
--- /dev/null
+++ b/public/js/api/factory/dashboard/preset.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2026 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	list(dashboard_kurzbz) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dashboard/preset/list/'
+				+ encodeURIComponent(dashboard_kurzbz)
+		};
+	},
+	getBatch(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/getBatch',
+			params
+		};
+	},
+	addWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/addWidget',
+			params
+		};
+	},
+	removeWidget(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/dashboard/preset/removeWidget',
+			params
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Admin.js b/public/js/components/Dashboard/Admin.js
index d2e8292ec..ff117a956 100644
--- a/public/js/components/Dashboard/Admin.js
+++ b/public/js/components/Dashboard/Admin.js
@@ -3,7 +3,7 @@ import DashboardAdminEdit from "./Admin/Edit.js";
 import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
-import ApiDashboardAdmin from "../../api/factory/dashboard/dashboardAdmin.js";
+import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
 import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
@@ -41,7 +41,7 @@ export default {
 						dashboard_kurzbz: name
 					};
 					return this.$api
-						.call(ApiDashboardAdmin.addDashboard(params))
+						.call(ApiDashboardBoard.add(params))
 						.then(response =>{
 							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
@@ -58,7 +58,7 @@ export default {
 		},
 		dashboardUpdate(dashboard) {
 			return this.$api
-				.call(ApiDashboardAdmin.updateDashboard(dashboard))
+				.call(ApiDashboardBoard.update(dashboard))
 				.then(response =>{
 
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
@@ -71,7 +71,7 @@ export default {
 		},
 		dashboardDelete(dashboard_id) {
 			return this.$api
-				.call(ApiDashboardAdmin.deleteDashboard(dashboard_id))
+				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
@@ -92,7 +92,7 @@ export default {
 	},
 	created() {
 		this.$api
-			.call(ApiDashboardAdmin.getAllDashboards())
+			.call(ApiDashboardBoard.list())
 			.then(result => {
 				this.dashboards = result.data.retval;
 				for (const dashboard of this.dashboards) {
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index 88584cc03..ef1c06e00 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -1,7 +1,7 @@
 import DashboardSection from "../Section.js";
 import DashboardWidgetPicker from "../Widget/Picker.js";
 import ObjectUtils from "../../../helpers/ObjectUtils.js";
-import ApiDashboardAdmin from "../../../api/factory/dashboard/dashboardAdmin.js";
+import ApiDashboardPreset from "../../../api/factory/dashboard/preset.js";
 
 export default {
 	components: {
@@ -43,7 +43,7 @@ export default {
 				};
 
 				return this.$api
-					.call(ApiDashboardAdmin.addWidgetsToPreset(params))
+					.call(ApiDashboardPreset.addWidget(params))
 					.then(result => {
 						let newId = result.data;
 						widget.id = newId;
@@ -84,7 +84,7 @@ export default {
 			this.$api
 				.call(Object.entries(payload).map(([key, widget]) => [
 					key,
-					ApiDashboardAdmin.addWidgetsToPreset({
+					ApiDashboardPreset.addWidget({
 						dashboard: this.dashboard,
 						funktion_kurzbz: section_name,
 						widget
@@ -113,7 +113,7 @@ export default {
 				widgetid: id
 			};
 			return this.$api
-				.call(ApiDashboardAdmin.removeWidgetFromPreset(params))
+				.call(ApiDashboardPreset.removeWidget(params))
 				.then(result => {
 					this.sections.forEach(section => {
 						if (section.name == section_name)
@@ -133,7 +133,7 @@ export default {
 			};
 
 			return this.$api
-				.call(ApiDashboardAdmin.presetBatch(params))
+				.call(ApiDashboardPreset.getBatch(params))
 				.then(result => {
 					if (this.tmpLoading !== funktionen.join('###'))
 						return; // NOTE(chris): prevent race condition
@@ -155,7 +155,7 @@ export default {
 		},
 		loadFunktionen() {
 			this.$api
-				.call(ApiDashboardAdmin.loadFunktionen(this.dashboard))
+				.call(ApiDashboardPreset.list(this.dashboard))
 				.then(result => {
 					this.funktionen = result.data;
 				})

From 5139c3e44e725f1fe6b7a43c1264f25d3634857e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 25 Mar 2026 15:15:05 +0100
Subject: [PATCH 1316/1357] use array_replace_recursive instead of
 array_merge_recursive to prevent two scalar values being merged to an array

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

diff --git a/application/controllers/api/frontend/v1/dashboard/User.php b/application/controllers/api/frontend/v1/dashboard/User.php
index 6c7b934dc..9d020649e 100644
--- a/application/controllers/api/frontend/v1/dashboard/User.php
+++ b/application/controllers/api/frontend/v1/dashboard/User.php
@@ -59,8 +59,8 @@ class User extends FHCAPI_Controller
 		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
 		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
 
-		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_merge_recursive', $defaultconfig) : [];
-		$userconfig_squashed = $userconfig ? call_user_func_array('array_merge_recursive', $userconfig) : [];
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
 
 		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
 

From 6fbb09eb6ead9fa88012b104420ee137b5c7b46c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 25 Mar 2026 16:32:43 +0100
Subject: [PATCH 1317/1357] group or clause

---
 application/libraries/dashboard/DashboardLib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 9b5306d94..1c3983108 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -66,8 +66,11 @@ class DashboardLib
 				return $right->funktion_kurzbz;
 			}, $rights));
 		
-		$this->_ci->DashboardPresetModel->db->where_in('funktion_kurzbz', $funktion_kurzbzs);
-		$this->_ci->DashboardPresetModel->db->or_where('funktion_kurzbz IS NULL');
+		$this->_ci->DashboardPresetModel->db
+			->group_start()
+				->where_in('funktion_kurzbz', $funktion_kurzbzs)
+				->or_where('funktion_kurzbz IS NULL')
+			->group_end();
 
 		$this->_ci->DashboardPresetModel->addOrder('funktion_kurzbz', 'DESC');
 		

From 21c1f13b28f13b28078c6a1a4b410c93a7c90ebc Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Thu, 26 Mar 2026 11:43:20 +0100
Subject: [PATCH 1318/1357] Spalte "faktiv" (Foebis-Aktiv) im FAS

---
 content/student/studentdetailoverlay.xul.php | 5 +++++
 include/prestudent.class.php                 | 1 +
 rdf/prestudentrolle.rdf.php                  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index c3bf8c191..63e26d011 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -802,6 +802,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
 								<splitter class="tree-splitter"/>
+								<treecol id="student-prestudent-tree-rolle-faktiv" label="F-Aktiv" flex="1" hidden="true" persist="hidden, width, ordinal"
+									class="sortDirectionIndicator"
+									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv" />
+								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -828,6 +832,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
+												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#faktiv"/>
 											</treerow>
 										</treeitem>
 									</treechildren>
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 7cff1da3b..32961b2be 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -706,6 +706,7 @@ class prestudent extends person
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
 				$rolle->fgm = $row->fgm;
+				$rolle->faktiv = $this->db_parse_bool($row->faktiv);
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;
diff --git a/rdf/prestudentrolle.rdf.php b/rdf/prestudentrolle.rdf.php
index 1c64ba15d..b793dbeff 100644
--- a/rdf/prestudentrolle.rdf.php
+++ b/rdf/prestudentrolle.rdf.php
@@ -144,6 +144,7 @@ foreach($ps->result as $row)
 			<ROLLE:stichtagsaktiv><![CDATA['.$stichtagsaktiv.']]></ROLLE:stichtagsaktiv>
 			<ROLLE:aktiv><![CDATA['.$aktiv.']]></ROLLE:aktiv>
 			<ROLLE:fgm><![CDATA['.$row->fgm.']]></ROLLE:fgm>
+			<ROLLE:faktiv><![CDATA['.($row->faktiv?'Ja':'Nein').']]></ROLLE:faktiv>
       	</RDF:Description>
       </RDF:li>
 	';

From 2c057aad58f42454465ad96822ecba0696255342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 1 Apr 2026 13:00:50 +0200
Subject: [PATCH 1319/1357] Updated Startup Dump to Final 3.3 Version

---
 system/FHComplete-3.3.sql | 6105 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 5998 insertions(+), 107 deletions(-)

diff --git a/system/FHComplete-3.3.sql b/system/FHComplete-3.3.sql
index 18c9c2c3d..041943d7e 100644
--- a/system/FHComplete-3.3.sql
+++ b/system/FHComplete-3.3.sql
@@ -2,8 +2,10 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 13.4 (Debian 13.4-0+deb11u1)
--- Dumped by pg_dump version 13.4 (Debian 13.4-0+deb11u1)
+\restrict 2Y3Q8Pggmu0tPpehsGNIym2tWUXRPkjsnoLHPATTfaERaqrOEyOGu7nkmvh7lwP
+
+-- Dumped from database version 15.16 (Debian 15.16-0+deb12u1)
+-- Dumped by pg_dump version 15.16 (Debian 15.16-0+deb12u1)
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -112,6 +114,15 @@ ALTER SCHEMA lehre OWNER TO fhcomplete;
 COMMENT ON SCHEMA lehre IS 'Teaching and Learning';
 
 
+--
+-- Name: public; Type: SCHEMA; Schema: -; Owner: fhcomplete
+--
+
+-- *not* creating schema, since initdb creates it
+
+
+ALTER SCHEMA public OWNER TO fhcomplete;
+
 --
 -- Name: reports; Type: SCHEMA; Schema: -; Owner: fhcomplete
 --
@@ -227,6 +238,167 @@ CREATE FUNCTION campus.get_highest_content_version(bigint) RETURNS smallint
 
 ALTER FUNCTION campus.get_highest_content_version(bigint) OWNER TO fhcomplete;
 
+--
+-- Name: get_ects_summe_beruflich(character varying); Type: FUNCTION; Schema: public; Owner: fhcomplete
+--
+
+CREATE FUNCTION public.get_ects_summe_beruflich(character varying) RETURNS numeric
+    LANGUAGE plpgsql
+    AS $_$
+				DECLARE var_student_uid ALIAS FOR $1;
+				DECLARE sum_berufliche_ects numeric(4, 1) := 0;
+
+				BEGIN
+
+					SELECT INTO sum_berufliche_ects COALESCE(SUM(ects), 0) FROM (
+						SELECT
+							lehrveranstaltung_id, studiensemester_kurzbz, ects
+						FROM
+							lehre.tbl_zeugnisnote
+							LEFT JOIN lehre.tbl_anrechnung USING(lehrveranstaltung_id, studiensemester_kurzbz)
+							JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+							JOIN public.tbl_student USING(student_uid)
+						WHERE
+							tbl_zeugnisnote.note = 6
+							AND student_uid = var_student_uid
+							AND lehre.tbl_anrechnung.prestudent_id IN (tbl_student.prestudent_id, NULL)
+							AND begruendung_id = 4  -- beruflich
+							AND (anrechnung_id IS NULL OR (anrechnung_id IS NOT NULL AND genehmigt_von IS NOT NULL )) -- Anrechnungen aus Zeit vor Anrechnungstool ODER digitale Anrechnungen mit Noteneintrag UND Genehmigung (wichtig, um zurückgenommene Genehmigungen, die in der Notentabelle noch als angerechnet eingetragen sind, rauszufiltern)
+
+						UNION
+
+						SELECT
+							lehrveranstaltung_id, studiensemester_kurzbz, ects
+						FROM
+							lehre.tbl_anrechnung
+							JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+							JOIN public.tbl_student USING(prestudent_id)
+						WHERE
+							genehmigt_von is not null
+							AND student_uid = var_student_uid
+							AND begruendung_id = 4  -- beruflich
+					) lvsangerechnet;
+
+				RETURN sum_berufliche_ects;
+
+				END;
+				$_$;
+
+
+ALTER FUNCTION public.get_ects_summe_beruflich(character varying) OWNER TO fhcomplete;
+
+--
+-- Name: get_ects_summe_schulisch(character varying, integer, integer); Type: FUNCTION; Schema: public; Owner: fhcomplete
+--
+
+CREATE FUNCTION public.get_ects_summe_schulisch(character varying, integer, integer) RETURNS numeric
+    LANGUAGE plpgsql
+    AS $_$
+				DECLARE var_student_uid ALIAS FOR $1;
+				DECLARE var_prestudent_id ALIAS FOR $2;
+				DECLARE var_studiengang_kz ALIAS FOR $3;
+				DECLARE var_einstiegsausbildungssemester integer;
+				DECLARE var_einstiegsstudiensemester_kurzbz varchar(32);
+				DECLARE var_einstiegsorgform_kurzbz varchar(32);
+				DECLARE rec_quereinstiegs_studiensemester RECORD;
+				DECLARE sum_quereinstiegs_ects numeric(4, 1) := 0;
+				DECLARE sum_schulische_ects numeric(4, 1) := 0;
+
+
+				BEGIN
+
+				-- IF STUDENT IS QUEREINSTEIGER, GET ECTS SUMME OF ANGERECHNETE SEMESTER
+				-- Get Einstiegssemester
+				   SELECT INTO var_einstiegsausbildungssemester , var_einstiegsstudiensemester_kurzbz, var_einstiegsorgform_kurzbz  ausbildungssemester, studiensemester_kurzbz, orgform_kurzbz from public.tbl_prestudentstatus
+				   WHERE prestudent_id = var_prestudent_id
+				   AND status_kurzbz = 'Student'
+				   ORDER BY datum, insertamum, ext_id
+				   LIMIT 1;
+
+				-- If Einstiegssemester > 1 (= Quereinsteiger)
+				IF (var_einstiegsausbildungssemester > 1) THEN
+				-- ...get all Quereinstiegssemester
+				   FOR rec_quereinstiegs_studiensemester IN SELECT studiensemester_kurzbz FROM public.tbl_studiensemester
+					 WHERE ende <= (select start from public.tbl_studiensemester WHERE studiensemester_kurzbz = var_einstiegsstudiensemester_kurzbz )
+					 ORDER BY start DESC
+					 LIMIT (var_einstiegsausbildungssemester -1)
+				-- ...loop the Quereinstiegssemester
+				   LOOP
+				-- ...and sum up ECTS of each Quereinstiegssemester
+					  sum_quereinstiegs_ects = sum_quereinstiegs_ects + (SELECT
+								SUM(tbl_lehrveranstaltung.ects)
+							FROM
+								lehre.tbl_studienplan
+								JOIN lehre.tbl_studienplan_lehrveranstaltung USING (studienplan_id)
+								JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+							WHERE
+								tbl_studienplan.studienplan_id = (
+									SELECT
+										studienplan_id
+									FROM
+										lehre.tbl_studienordnung
+										JOIN lehre.tbl_studienplan USING (studienordnung_id)
+										JOIN lehre.tbl_studienplan_semester USING (studienplan_id)
+										WHERE tbl_studienordnung.studiengang_kz = var_studiengang_kz
+										AND tbl_studienplan_semester.semester = var_einstiegsausbildungssemester - 1
+										AND tbl_studienplan_semester.studiensemester_kurzbz = rec_quereinstiegs_studiensemester.studiensemester_kurzbz
+										AND tbl_studienplan.orgform_kurzbz = var_einstiegsorgform_kurzbz
+
+									LIMIT 1
+								)
+							AND tbl_studienplan_lehrveranstaltung.semester = var_einstiegsausbildungssemester
+							AND studienplan_lehrveranstaltung_id_parent IS NULL -- auf Modulebene
+							AND tbl_studienplan_lehrveranstaltung.export = TRUE);
+
+							var_einstiegsausbildungssemester = var_einstiegsausbildungssemester - 1;
+				   END LOOP;
+				END IF;
+
+
+				-- GET ECTS SUMME OF ALLE BISHER ANGERECHNETEN LEHRVERANSTALTUNGEN. ANRECHNUNGSGRUND: SCHULISCH.
+				SELECT INTO sum_schulische_ects COALESCE(SUM(ects), 0) FROM (
+									SELECT
+										lehrveranstaltung_id, studiensemester_kurzbz, ects
+									FROM
+										lehre.tbl_zeugnisnote
+										LEFT JOIN lehre.tbl_anrechnung USING(lehrveranstaltung_id, studiensemester_kurzbz)
+										JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+										JOIN public.tbl_student USING(student_uid)
+									WHERE
+										tbl_zeugnisnote.note = 6
+										AND student_uid = var_student_uid
+										AND lehre.tbl_anrechnung.prestudent_id IN (tbl_student.prestudent_id, NULL)
+										AND begruendung_id != 5  -- universitäre ECTS nicht mitrechnen
+                        				AND begruendung_id != 4  -- berufliche ECTS nicht mitrechnen
+                        				AND (anrechnung_id IS NULL OR (anrechnung_id IS NOT NULL AND genehmigt_von IS NOT NULL )) -- Anrechnungen aus Zeit vor Anrechnungstool ODER digitale Anrechnungen mit Noteneintrag UND Genehmigung (wichtig, um zurückgenommene Genehmigungen, die in der Notentabelle noch als angerechnet eingetragen sind, rauszufiltern)
+
+									UNION
+
+									SELECT
+										lehrveranstaltung_id, studiensemester_kurzbz, ects
+									FROM
+										lehre.tbl_anrechnung
+										JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+										JOIN public.tbl_student USING(prestudent_id)
+									WHERE
+										genehmigt_von IS NOT NULL
+										AND student_uid = var_student_uid
+										AND begruendung_id != 5  -- universitäre ECTS nicht mitrechnen
+                        				AND begruendung_id != 4  -- berufliche ECTS nicht mitrechnen
+				) lvsangerechnet;
+
+				-- BUILD ECTS SUMME OF QUEREINSTIEGSSEMESTER- + ANGERECHNETEN LVs-ECTS
+				-- Summe aller bisher schulisch begründet angerechneten LVs + der Quereinstiegssemester
+				sum_schulische_ects = sum_schulische_ects + sum_quereinstiegs_ects;
+
+				RETURN sum_schulische_ects ;
+
+				END;
+				$_$;
+
+
+ALTER FUNCTION public.get_ects_summe_schulisch(character varying, integer, integer) OWNER TO fhcomplete;
+
 --
 -- Name: get_rolle_prestudent(integer, character varying); Type: FUNCTION; Schema: public; Owner: fhcomplete
 --
@@ -533,7 +705,8 @@ CREATE TABLE bis.tbl_bisio (
     universitaet character varying(256),
     lehreinheit_id integer,
     ects_erworben numeric(5,2),
-    ects_angerechnet numeric(5,2)
+    ects_angerechnet numeric(5,2),
+    herkunftsland_code character varying(3)
 );
 
 
@@ -852,7 +1025,8 @@ CREATE TABLE bis.tbl_gsprogramm (
     gsprogramm_id integer DEFAULT nextval('bis.tbl_gsprogramm_gsprogramm_id_seq'::regclass) NOT NULL,
     bezeichnung character varying(255),
     programm_code bigint,
-    gsprogrammtyp_kurzbz character varying(32)
+    gsprogrammtyp_kurzbz character varying(32),
+    studienkennung_uni character varying(32)
 );
 
 
@@ -1199,7 +1373,8 @@ CREATE TABLE bis.tbl_zgv (
     zgv_code integer NOT NULL,
     zgv_bez character varying(64),
     zgv_kurzbz character varying(16),
-    bezeichnung character varying(128)[]
+    bezeichnung character varying(128)[],
+    aktiv boolean DEFAULT true NOT NULL
 );
 
 
@@ -1220,7 +1395,8 @@ CREATE TABLE bis.tbl_zgvdoktor (
     zgvdoktor_code integer NOT NULL,
     zgvdoktor_bez character varying(64),
     zgvdoktor_kurzbz character varying(16),
-    bezeichnung character varying(128)[]
+    bezeichnung character varying(128)[],
+    aktiv boolean DEFAULT true NOT NULL
 );
 
 
@@ -1296,7 +1472,8 @@ CREATE TABLE bis.tbl_zgvmaster (
     zgvmas_code integer NOT NULL,
     zgvmas_bez character varying(64),
     zgvmas_kurzbz character varying(16),
-    bezeichnung character varying(128)[]
+    bezeichnung character varying(128)[],
+    aktiv boolean DEFAULT true NOT NULL
 );
 
 
@@ -1583,6 +1760,34 @@ CREATE SEQUENCE campus.seq_pruefungstermin_pruefungstermin_id
 
 ALTER TABLE campus.seq_pruefungstermin_pruefungstermin_id OWNER TO fhcomplete;
 
+--
+-- Name: seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id; Type: SEQUENCE; Schema: campus; Owner: fhcomplete
+--
+
+CREATE SEQUENCE campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id OWNER TO fhcomplete;
+
+--
+-- Name: seq_zeitwunsch_zeitwunsch_id; Type: SEQUENCE; Schema: campus; Owner: fhcomplete
+--
+
+CREATE SEQUENCE campus.seq_zeitwunsch_zeitwunsch_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE campus.seq_zeitwunsch_zeitwunsch_id OWNER TO fhcomplete;
+
 --
 -- Name: tbl_abgabe; Type: TABLE; Schema: campus; Owner: fhcomplete
 --
@@ -1978,7 +2183,7 @@ COMMENT ON TABLE campus.tbl_coodle_termin IS 'Time Slots of a Survey';
 CREATE TABLE campus.tbl_dms (
     dms_id bigint DEFAULT nextval('campus.seq_dms_dms_id'::regclass) NOT NULL,
     oe_kurzbz character varying(32),
-    dokument_kurzbz character varying(8),
+    dokument_kurzbz character varying(32),
     kategorie_kurzbz character varying(32)
 );
 
@@ -3212,7 +3417,9 @@ CREATE TABLE campus.tbl_zeitwunsch (
     updateamum timestamp without time zone,
     updatevon character varying(32),
     insertamum timestamp without time zone DEFAULT now(),
-    insertvon character varying(32)
+    insertvon character varying(32),
+    zeitwunsch_id integer DEFAULT nextval('campus.seq_zeitwunsch_zeitwunsch_id'::regclass) NOT NULL,
+    zeitwunsch_gueltigkeit_id integer NOT NULL
 );
 
 
@@ -3225,6 +3432,38 @@ ALTER TABLE campus.tbl_zeitwunsch OWNER TO fhcomplete;
 COMMENT ON TABLE campus.tbl_zeitwunsch IS 'Teaching Time Preferences';
 
 
+--
+-- Name: COLUMN tbl_zeitwunsch.mitarbeiter_uid; Type: COMMENT; Schema: campus; Owner: fhcomplete
+--
+
+COMMENT ON COLUMN campus.tbl_zeitwunsch.mitarbeiter_uid IS 'DEPRECATED';
+
+
+--
+-- Name: COLUMN tbl_zeitwunsch.zeitwunsch_gueltigkeit_id; Type: COMMENT; Schema: campus; Owner: fhcomplete
+--
+
+COMMENT ON COLUMN campus.tbl_zeitwunsch.zeitwunsch_gueltigkeit_id IS 'Ordnet die Zeitwuensche einer Gueltigkeitsdauer von-bis zu';
+
+
+--
+-- Name: tbl_zeitwunsch_gueltigkeit; Type: TABLE; Schema: campus; Owner: fhcomplete
+--
+
+CREATE TABLE campus.tbl_zeitwunsch_gueltigkeit (
+    zeitwunsch_gueltigkeit_id integer DEFAULT nextval('campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id'::regclass) NOT NULL,
+    mitarbeiter_uid character varying(32) NOT NULL,
+    von date,
+    bis date,
+    insertamum timestamp without time zone DEFAULT now(),
+    insertvon character varying(32),
+    updateamum timestamp without time zone,
+    updatevon character varying(32)
+);
+
+
+ALTER TABLE campus.tbl_zeitwunsch_gueltigkeit OWNER TO fhcomplete;
+
 --
 -- Name: tbl_benutzer; Type: TABLE; Schema: public; Owner: fhcomplete
 --
@@ -3296,6 +3535,7 @@ CREATE TABLE public.tbl_person (
     matr_aktiv boolean DEFAULT false NOT NULL,
     matr_nr character varying(32),
     zugangscode_timestamp timestamp without time zone,
+    wahlname character varying(128),
     CONSTRAINT chk_person_svnr CHECK (((char_length((svnr)::text) = 10) OR (char_length((svnr)::text) = 16) OR (svnr IS NULL)))
 );
 
@@ -3383,7 +3623,8 @@ CREATE VIEW campus.vw_benutzer AS
     tbl_benutzer.insertvon,
     tbl_benutzer.updateamum,
     tbl_benutzer.updatevon,
-    tbl_benutzer.ext_id
+    tbl_benutzer.ext_id,
+    tbl_person.wahlname
    FROM (public.tbl_benutzer
      JOIN public.tbl_person USING (person_id));
 
@@ -3601,7 +3842,8 @@ CREATE TABLE lehre.tbl_lehrveranstaltung (
     las numeric(5,2),
     benotung boolean DEFAULT true NOT NULL,
     lvinfo boolean DEFAULT true NOT NULL,
-    lehrauftrag boolean DEFAULT true
+    lehrauftrag boolean DEFAULT true,
+    lehrveranstaltung_template_id integer
 );
 
 
@@ -3752,6 +3994,7 @@ CREATE TABLE public.tbl_studiengang (
     foerderrelevant boolean DEFAULT true NOT NULL,
     standort_code integer,
     onlinebewerbung boolean DEFAULT false NOT NULL,
+    melde_studiengang_kz character varying(32),
     CONSTRAINT tbl_studiengang_max_gruppe CHECK (((max_gruppe >= '1'::bpchar) AND (max_gruppe <= '9'::bpchar))),
     CONSTRAINT tbl_studiengang_max_semester CHECK ((max_semester >= 0)),
     CONSTRAINT tbl_studiengang_max_verband CHECK (((max_verband >= 'A'::bpchar) AND (max_verband <= 'Z'::bpchar))),
@@ -3824,6 +4067,13 @@ COMMENT ON COLUMN public.tbl_studiengang.foerderrelevant IS 'Zeigt an, ob Studie
 COMMENT ON COLUMN public.tbl_studiengang.standort_code IS 'Zu meldender Standortcode der Studierenden des Studiengangs';
 
 
+--
+-- Name: COLUMN tbl_studiengang.melde_studiengang_kz; Type: COMMENT; Schema: public; Owner: fhcomplete
+--
+
+COMMENT ON COLUMN public.tbl_studiengang.melde_studiengang_kz IS 'Studiengangskennzahl, mit der der Studiengang gemeldet wird (z.B. Bismeldung)';
+
+
 --
 -- Name: vw_lehreinheit; Type: VIEW; Schema: campus; Owner: fhcomplete
 --
@@ -3975,7 +4225,8 @@ CREATE VIEW campus.vw_mitarbeiter AS
          LIMIT 1) AS email_privat,
     tbl_benutzer.updateaktivam,
     tbl_benutzer.updateaktivvon,
-    GREATEST(tbl_person.updateamum, tbl_benutzer.updateamum, tbl_mitarbeiter.updateamum) AS lastupdate
+    GREATEST(tbl_person.updateamum, tbl_benutzer.updateamum, tbl_mitarbeiter.updateamum) AS lastupdate,
+    tbl_person.wahlname
    FROM ((public.tbl_mitarbeiter
      JOIN public.tbl_benutzer ON (((tbl_mitarbeiter.mitarbeiter_uid)::text = (tbl_benutzer.uid)::text)))
      JOIN public.tbl_person USING (person_id));
@@ -4229,7 +4480,8 @@ CREATE VIEW campus.vw_student AS
            FROM public.tbl_kontakt
           WHERE ((tbl_kontakt.person_id = tbl_person.person_id) AND ((tbl_kontakt.kontakttyp)::text = 'email'::text))
           ORDER BY tbl_kontakt.zustellung DESC
-         LIMIT 1) AS email_privat
+         LIMIT 1) AS email_privat,
+    tbl_person.wahlname
    FROM ((public.tbl_student
      JOIN public.tbl_benutzer ON (((tbl_student.student_uid)::text = (tbl_benutzer.uid)::text)))
      JOIN public.tbl_person USING (person_id));
@@ -5700,7 +5952,7 @@ COMMENT ON TABLE lehre.tbl_moodle_version IS 'DEPRECATED';
 
 CREATE TABLE lehre.tbl_note (
     note smallint NOT NULL,
-    bezeichnung character varying(32),
+    bezeichnung character varying(64),
     anmerkung character varying(256),
     farbe character(6),
     offiziell boolean DEFAULT true NOT NULL,
@@ -7115,6 +7367,20 @@ CREATE SEQUENCE public.seq_filter_filter_id
 
 ALTER TABLE public.seq_filter_filter_id OWNER TO fhcomplete;
 
+--
+-- Name: seq_gruppe_manager_gruppe_manager_id; Type: SEQUENCE; Schema: public; Owner: fhcomplete
+--
+
+CREATE SEQUENCE public.seq_gruppe_manager_gruppe_manager_id
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.seq_gruppe_manager_gruppe_manager_id OWNER TO fhcomplete;
+
 --
 -- Name: seq_notiz_notiz_id; Type: SEQUENCE; Schema: public; Owner: fhcomplete
 --
@@ -7268,7 +7534,7 @@ CREATE TABLE public.tbl_adresse (
     ort character varying(256),
     gemeinde character varying(256),
     nation character varying(3),
-    typ character(1),
+    typ character varying(32),
     heimatadresse boolean DEFAULT false NOT NULL,
     zustelladresse boolean DEFAULT false NOT NULL,
     firma_id integer,
@@ -7327,6 +7593,27 @@ ALTER TABLE public.tbl_adresse_adresse_id_seq OWNER TO fhcomplete;
 ALTER SEQUENCE public.tbl_adresse_adresse_id_seq OWNED BY public.tbl_adresse.adresse_id;
 
 
+--
+-- Name: tbl_adressentyp; Type: TABLE; Schema: public; Owner: fhcomplete
+--
+
+CREATE TABLE public.tbl_adressentyp (
+    adressentyp_kurzbz character varying(32) NOT NULL,
+    bezeichnung character varying(256),
+    bezeichnung_mehrsprachig character varying(256)[],
+    sort smallint
+);
+
+
+ALTER TABLE public.tbl_adressentyp OWNER TO fhcomplete;
+
+--
+-- Name: TABLE tbl_adressentyp; Type: COMMENT; Schema: public; Owner: fhcomplete
+--
+
+COMMENT ON TABLE public.tbl_adressentyp IS 'Types of Addresses';
+
+
 --
 -- Name: tbl_akte; Type: TABLE; Schema: public; Owner: fhcomplete
 --
@@ -7334,7 +7621,7 @@ ALTER SEQUENCE public.tbl_adresse_adresse_id_seq OWNED BY public.tbl_adresse.adr
 CREATE TABLE public.tbl_akte (
     akte_id integer NOT NULL,
     person_id integer NOT NULL,
-    dokument_kurzbz character varying(8) NOT NULL,
+    dokument_kurzbz character varying(32) NOT NULL,
     inhalt text,
     mimetype character varying(128),
     erstelltam date DEFAULT now(),
@@ -7749,7 +8036,7 @@ COMMENT ON TABLE public.tbl_buchungstyp IS 'Key-Table of Payment Types';
 --
 
 CREATE TABLE public.tbl_dokument (
-    dokument_kurzbz character varying(8) NOT NULL,
+    dokument_kurzbz character varying(32) NOT NULL,
     bezeichnung character varying(128),
     ext_id bigint,
     ausstellungsdetails boolean DEFAULT false NOT NULL,
@@ -7779,7 +8066,7 @@ COMMENT ON COLUMN public.tbl_dokument.ausstellungsdetails IS 'Sollen beim Dokume
 --
 
 CREATE TABLE public.tbl_dokumentprestudent (
-    dokument_kurzbz character varying(8) NOT NULL,
+    dokument_kurzbz character varying(32) NOT NULL,
     prestudent_id integer NOT NULL,
     mitarbeiter_uid character varying(32),
     datum date,
@@ -7805,7 +8092,7 @@ COMMENT ON TABLE public.tbl_dokumentprestudent IS 'Accepted Documents of Degree
 --
 
 CREATE TABLE public.tbl_dokumentstudiengang (
-    dokument_kurzbz character varying(8) NOT NULL,
+    dokument_kurzbz character varying(32) NOT NULL,
     studiengang_kz integer NOT NULL,
     ext_id bigint,
     stufe smallint,
@@ -8122,6 +8409,42 @@ ALTER TABLE public.tbl_geschlecht OWNER TO fhcomplete;
 COMMENT ON TABLE public.tbl_geschlecht IS 'Key-Table of Gender';
 
 
+--
+-- Name: tbl_gruppe_manager; Type: TABLE; Schema: public; Owner: fhcomplete
+--
+
+CREATE TABLE public.tbl_gruppe_manager (
+    gruppe_manager_id integer DEFAULT nextval('public.seq_gruppe_manager_gruppe_manager_id'::regclass) NOT NULL,
+    gruppe_kurzbz character varying(32) NOT NULL,
+    uid character varying(32) NOT NULL,
+    insertamum timestamp without time zone DEFAULT now(),
+    insertvon character varying(32)
+);
+
+
+ALTER TABLE public.tbl_gruppe_manager OWNER TO fhcomplete;
+
+--
+-- Name: TABLE tbl_gruppe_manager; Type: COMMENT; Schema: public; Owner: fhcomplete
+--
+
+COMMENT ON TABLE public.tbl_gruppe_manager IS 'Table to save assignments groups to their managers.';
+
+
+--
+-- Name: COLUMN tbl_gruppe_manager.gruppe_kurzbz; Type: COMMENT; Schema: public; Owner: fhcomplete
+--
+
+COMMENT ON COLUMN public.tbl_gruppe_manager.gruppe_kurzbz IS 'Name of group';
+
+
+--
+-- Name: COLUMN tbl_gruppe_manager.uid; Type: COMMENT; Schema: public; Owner: fhcomplete
+--
+
+COMMENT ON COLUMN public.tbl_gruppe_manager.uid IS 'User id of group manager';
+
+
 --
 -- Name: tbl_kontakt_kontakt_id_seq; Type: SEQUENCE; Schema: public; Owner: fhcomplete
 --
@@ -9133,7 +9456,10 @@ CREATE TABLE public.tbl_prestudent (
     gsstudientyp_kurzbz character varying(32) DEFAULT 'Intern'::character varying,
     aufnahmegruppe_kurzbz character varying(32),
     foerderrelevant boolean,
-    standort_code integer
+    standort_code integer,
+    zgv_erfuellt boolean DEFAULT false,
+    zgvmas_erfuellt boolean DEFAULT false,
+    zgvdoktor_erfuellt boolean DEFAULT false
 );
 
 
@@ -9799,7 +10125,7 @@ CREATE TABLE public.tbl_vorlage (
     archivierbar boolean DEFAULT false,
     signierbar boolean DEFAULT false,
     stud_selfservice boolean DEFAULT false,
-    dokument_kurzbz character varying(8),
+    dokument_kurzbz character varying(32),
     insertamum timestamp without time zone,
     insertvon character varying(32),
     updateamum timestamp without time zone,
@@ -9867,7 +10193,7 @@ CREATE TABLE public.tbl_vorlagedokument (
     vorlagedokument_id integer DEFAULT nextval('public.tbl_vorlagedokument_vorlagedokument_id_seq'::regclass) NOT NULL,
     sort integer NOT NULL,
     vorlagestudiengang_id bigint NOT NULL,
-    dokument_kurzbz character varying(8) NOT NULL
+    dokument_kurzbz character varying(32) NOT NULL
 );
 
 
@@ -10236,7 +10562,7 @@ CREATE VIEW public.vw_msg_vars AS
                            FROM public.tbl_prestudentstatus tbl_prestudentstatus_1
                           WHERE ((tbl_prestudentstatus_1.prestudent_id = pr.prestudent_id) AND ((tbl_prestudentstatus_1.status_kurzbz)::text = 'Interessent'::text))
                          LIMIT 1))::text) AND ((tbl_prestudentstatus.status_kurzbz)::text = 'Interessent'::text))) prest
-          WHERE (((prest.laststatus)::text <> ALL ((ARRAY['Abbrecher'::character varying, 'Abgewiesener'::character varying, 'Absolvent'::character varying])::text[])) AND (prest.priorisierung <= pr.priorisierung))) AS "Relative Prio",
+          WHERE (((prest.laststatus)::text <> ALL (ARRAY[('Abbrecher'::character varying)::text, ('Abgewiesener'::character varying)::text, ('Absolvent'::character varying)::text])) AND (prest.priorisierung <= pr.priorisierung))) AS "Relative Prio",
     last_prestudent_status.orgform_bezeichnung_de AS "Orgform DE",
     last_prestudent_status.orgform_bezeichnung_en AS "Orgform EN"
    FROM ((((((((((public.tbl_person p
@@ -10248,7 +10574,7 @@ CREATE VIEW public.vw_msg_vars AS
      LEFT JOIN ( SELECT tbl_kontakt.person_id,
             tbl_kontakt.kontakt
            FROM public.tbl_kontakt
-          WHERE ((tbl_kontakt.zustellung = true) AND ((tbl_kontakt.kontakttyp)::text = ANY ((ARRAY['telefon'::character varying, 'mobil'::character varying])::text[])))
+          WHERE ((tbl_kontakt.zustellung = true) AND ((tbl_kontakt.kontakttyp)::text = ANY (ARRAY[('telefon'::character varying)::text, ('mobil'::character varying)::text])))
           ORDER BY tbl_kontakt.kontakt_id DESC) kt USING (person_id))
      LEFT JOIN ( SELECT tbl_adresse.person_id,
             tbl_adresse.strasse,
@@ -10351,7 +10677,7 @@ CREATE VIEW public.vw_msg_vars_person AS
      LEFT JOIN ( SELECT tbl_kontakt.person_id,
             tbl_kontakt.kontakt
            FROM public.tbl_kontakt
-          WHERE ((tbl_kontakt.zustellung = true) AND ((tbl_kontakt.kontakttyp)::text = ANY ((ARRAY['telefon'::character varying, 'mobil'::character varying])::text[])))
+          WHERE ((tbl_kontakt.zustellung = true) AND ((tbl_kontakt.kontakttyp)::text = ANY (ARRAY[('telefon'::character varying)::text, ('mobil'::character varying)::text])))
           ORDER BY tbl_kontakt.kontakt_id DESC) kt USING (person_id))
      LEFT JOIN ( SELECT tbl_adresse.person_id,
             tbl_adresse.strasse,
@@ -10981,7 +11307,9 @@ CREATE TABLE system.tbl_fehler_zustaendigkeiten (
     fehlercode character varying(64) NOT NULL,
     person_id integer,
     oe_kurzbz character varying(32),
-    funktion_kurzbz character varying(16)
+    funktion_kurzbz character varying(16),
+    insertamum timestamp without time zone DEFAULT now(),
+    insertvon character varying(32)
 );
 
 
@@ -11173,6 +11501,7 @@ CREATE TABLE system.tbl_issue (
     insertamum timestamp without time zone DEFAULT now(),
     updatevon character varying(32),
     updateamum timestamp without time zone,
+    behebung_parameter jsonb,
     CONSTRAINT chk_tbl_issue_person_id_oe_kurzbz CHECK (((person_id IS NOT NULL) OR (oe_kurzbz IS NOT NULL)))
 );
 
@@ -12384,7 +12713,8 @@ CREATE TABLE testtool.tbl_pruefling (
     idnachweis character varying(50),
     registriert timestamp without time zone DEFAULT now() NOT NULL,
     prestudent_id integer,
-    semester smallint
+    semester smallint,
+    gesperrt boolean DEFAULT false NOT NULL
 );
 
 
@@ -13361,7 +13691,7 @@ CREATE TABLE wawi.tbl_kostenstelle (
     insertamum timestamp without time zone,
     insertvon character varying(32),
     ext_id bigint,
-    kostenstelle_nr character varying(4),
+    kostenstelle_nr character varying(6),
     deaktiviertvon character varying(32),
     deaktiviertamum timestamp without time zone,
     geschaeftsjahrvon character varying(32),
@@ -14030,7 +14360,7 @@ COPY bis.tbl_bisfunktion (bisverwendung_id, studiengang_kz, sws, updateamum, upd
 -- Data for Name: tbl_bisio; Type: TABLE DATA; Schema: bis; Owner: fhcomplete
 --
 
-COPY bis.tbl_bisio (bisio_id, mobilitaetsprogramm_code, nation_code, von, bis, zweck_code, student_uid, updateamum, updatevon, insertamum, insertvon, ext_id, ort, universitaet, lehreinheit_id, ects_erworben, ects_angerechnet) FROM stdin;
+COPY bis.tbl_bisio (bisio_id, mobilitaetsprogramm_code, nation_code, von, bis, zweck_code, student_uid, updateamum, updatevon, insertamum, insertvon, ext_id, ort, universitaet, lehreinheit_id, ects_erworben, ects_angerechnet, herkunftsland_code) FROM stdin;
 \.
 
 
@@ -34789,7 +35119,7 @@ COPY bis.tbl_gemeinde (gemeinde_id, plz, name, ortschaftskennziffer, ortschaftsn
 -- Data for Name: tbl_gsprogramm; Type: TABLE DATA; Schema: bis; Owner: fhcomplete
 --
 
-COPY bis.tbl_gsprogramm (gsprogramm_id, bezeichnung, programm_code, gsprogrammtyp_kurzbz) FROM stdin;
+COPY bis.tbl_gsprogramm (gsprogramm_id, bezeichnung, programm_code, gsprogrammtyp_kurzbz, studienkennung_uni) FROM stdin;
 \.
 
 
@@ -35159,24 +35489,24 @@ COPY bis.tbl_verwendung (verwendung_code, verwendungbez) FROM stdin;
 -- Data for Name: tbl_zgv; Type: TABLE DATA; Schema: bis; Owner: fhcomplete
 --
 
-COPY bis.tbl_zgv (zgv_code, zgv_bez, zgv_kurzbz, bezeichnung) FROM stdin;
-4	Anerkannte Studienberechtigungsprüfung	Studberprüfung	{"Anerkannte Studienberechtigungsprüfung","Anerkannte Studienberechtigungsprüfung"}
-5	Ausländische Universitätsreife	Ausl.Univreife	{"Ausländische Universitätsreife","Ausländische Universitätsreife"}
-7	Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen	Lehrabschluss	{"Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen","Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen"}
-8	Werkmeister	Werkmeister	{Werkmeister,Werkmeister}
-9	AHS (langform)	AHS-lang	{"AHS (langform)","AHS (langform)"}
-10	Oberstufenrealgymnasium	OberstufenRG	{Oberstufenrealgymnasium,Oberstufenrealgymnasium}
-11	AHS (Sonderformen)	AHS-sonder	{"AHS (Sonderformen)","AHS (Sonderformen)"}
-13	Handelsakademien	Handelsakademien	{Handelsakademien,Handelsakademien}
-16	Höhere Schulen der Lehrer- und Erzieherbildung	Lehrer	{"Höhere Schulen der Lehrer- und Erzieherbildung","Höhere Schulen der Lehrer- und Erzieherbildung"}
-17	Externistenreifeprüfung	Externist	{Externistenreifeprüfung,Externistenreifeprüfung}
-18	Berufreifeprüfung	Berufsreife	{Berufreifeprüfung,Berufreifeprüfung}
-19	Inländische postsekundäre Bildungseinrichtung	Inl.postsekundär	{"Inländische postsekundäre Bildungseinrichtung","Inländische postsekundäre Bildungseinrichtung"}
-99	Sonstige	Sonstige	{Sonstige,Sonstige}
-14	Höhere Lehranstalt für wirtschaftliche Berufe	HL wirtsch.Ber.	{"Höhere Lehranstalt für wirtschaftliche Berufe","Höhere Lehranstalt für wirtschaftliche Berufe"}
-12	Höhere technische und gewerbliche Lehranstalten	HTBLA	{"Höhere technische und gewerbliche Lehranstalten","Höhere technische und gewerbliche Lehranstalten"}
-6	Abschlusszeugnis einer facheinschlägigen BMS	BMS(facheinschl)	{"Abschlusszeugnis einer facheinschlägigen BMS","Abschlusszeugnis einer facheinschlägigen BMS"}
-15	Höhere land- und forstwirtschaftliche Lehranstalten	HL Land-u.Forst	{"Höhere land- und forstwirtschaftliche Lehranstalten","Höhere land- und forstwirtschaftliche Lehranstalten"}
+COPY bis.tbl_zgv (zgv_code, zgv_bez, zgv_kurzbz, bezeichnung, aktiv) FROM stdin;
+4	Anerkannte Studienberechtigungsprüfung	Studberprüfung	{"Anerkannte Studienberechtigungsprüfung","Anerkannte Studienberechtigungsprüfung"}	t
+5	Ausländische Universitätsreife	Ausl.Univreife	{"Ausländische Universitätsreife","Ausländische Universitätsreife"}	t
+7	Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen	Lehrabschluss	{"Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen","Lehrabschlussprüfung mit allfälligen Zusatzqualifikationen"}	t
+8	Werkmeister	Werkmeister	{Werkmeister,Werkmeister}	t
+9	AHS (langform)	AHS-lang	{"AHS (langform)","AHS (langform)"}	t
+10	Oberstufenrealgymnasium	OberstufenRG	{Oberstufenrealgymnasium,Oberstufenrealgymnasium}	t
+11	AHS (Sonderformen)	AHS-sonder	{"AHS (Sonderformen)","AHS (Sonderformen)"}	t
+13	Handelsakademien	Handelsakademien	{Handelsakademien,Handelsakademien}	t
+16	Höhere Schulen der Lehrer- und Erzieherbildung	Lehrer	{"Höhere Schulen der Lehrer- und Erzieherbildung","Höhere Schulen der Lehrer- und Erzieherbildung"}	t
+17	Externistenreifeprüfung	Externist	{Externistenreifeprüfung,Externistenreifeprüfung}	t
+18	Berufreifeprüfung	Berufsreife	{Berufreifeprüfung,Berufreifeprüfung}	t
+19	Inländische postsekundäre Bildungseinrichtung	Inl.postsekundär	{"Inländische postsekundäre Bildungseinrichtung","Inländische postsekundäre Bildungseinrichtung"}	t
+99	Sonstige	Sonstige	{Sonstige,Sonstige}	t
+14	Höhere Lehranstalt für wirtschaftliche Berufe	HL wirtsch.Ber.	{"Höhere Lehranstalt für wirtschaftliche Berufe","Höhere Lehranstalt für wirtschaftliche Berufe"}	t
+12	Höhere technische und gewerbliche Lehranstalten	HTBLA	{"Höhere technische und gewerbliche Lehranstalten","Höhere technische und gewerbliche Lehranstalten"}	t
+6	Abschlusszeugnis einer facheinschlägigen BMS	BMS(facheinschl)	{"Abschlusszeugnis einer facheinschlägigen BMS","Abschlusszeugnis einer facheinschlägigen BMS"}	t
+15	Höhere land- und forstwirtschaftliche Lehranstalten	HL Land-u.Forst	{"Höhere land- und forstwirtschaftliche Lehranstalten","Höhere land- und forstwirtschaftliche Lehranstalten"}	t
 \.
 
 
@@ -35184,7 +35514,7 @@ COPY bis.tbl_zgv (zgv_code, zgv_bez, zgv_kurzbz, bezeichnung) FROM stdin;
 -- Data for Name: tbl_zgvdoktor; Type: TABLE DATA; Schema: bis; Owner: fhcomplete
 --
 
-COPY bis.tbl_zgvdoktor (zgvdoktor_code, zgvdoktor_bez, zgvdoktor_kurzbz, bezeichnung) FROM stdin;
+COPY bis.tbl_zgvdoktor (zgvdoktor_code, zgvdoktor_bez, zgvdoktor_kurzbz, bezeichnung, aktiv) FROM stdin;
 \.
 
 
@@ -35208,18 +35538,18 @@ COPY bis.tbl_zgvgruppe_zuordnung (zgvgruppe_id, studiengang_kz, zgv_code, zgvmas
 -- Data for Name: tbl_zgvmaster; Type: TABLE DATA; Schema: bis; Owner: fhcomplete
 --
 
-COPY bis.tbl_zgvmaster (zgvmas_code, zgvmas_bez, zgvmas_kurzbz, bezeichnung) FROM stdin;
-1	FH-Abschluss Bachelor (Inland)	FH-Bachelor (I)	{"FH-Abschluss Bachelor (Inland)","FH-Abschluss Bachelor (Inland)"}
-2	FH-Abschluss Bachelor (Ausland)	FH-Bachelor (A)	{"FH-Abschluss Bachelor (Ausland)","FH-Abschluss Bachelor (Ausland)"}
-3	Abschluss postsekundäres Studium (Inland)	postsek.Inland	{"Abschluss postsekundäres Studium (Inland)","Abschluss postsekundäres Studium (Inland)"}
-4	Abschluss postsekundäres Studium (Ausland)	postsek.Ausland	{"Abschluss postsekundäres Studium (Ausland)","Abschluss postsekundäres Studium (Ausland)"}
-5	Univ.-Abschluss Bachelor (Inland)	Uni-Bachelor (I)	{"Univ.-Abschluss Bachelor (Inland)","Univ.-Abschluss Bachelor (Inland)"}
-6	Univ.-Abschluss Bachelor (Ausland)	Uni-Bachelor (A)	{"Univ.-Abschluss Bachelor (Ausland)","Univ.-Abschluss Bachelor (Ausland)"}
-11	Sonstige	Sonstige	{Sonstige,Sonstige}
-9	Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)	Uni (I)	{"Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)","Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)"}
-10	Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)	Uni (A)	{"Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)","Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)"}
-7	FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)	FH (I)	{"FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)","FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)"}
-8	FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)	FH (A)	{"FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)","FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)"}
+COPY bis.tbl_zgvmaster (zgvmas_code, zgvmas_bez, zgvmas_kurzbz, bezeichnung, aktiv) FROM stdin;
+1	FH-Abschluss Bachelor (Inland)	FH-Bachelor (I)	{"FH-Abschluss Bachelor (Inland)","FH-Abschluss Bachelor (Inland)"}	t
+2	FH-Abschluss Bachelor (Ausland)	FH-Bachelor (A)	{"FH-Abschluss Bachelor (Ausland)","FH-Abschluss Bachelor (Ausland)"}	t
+3	Abschluss postsekundäres Studium (Inland)	postsek.Inland	{"Abschluss postsekundäres Studium (Inland)","Abschluss postsekundäres Studium (Inland)"}	t
+4	Abschluss postsekundäres Studium (Ausland)	postsek.Ausland	{"Abschluss postsekundäres Studium (Ausland)","Abschluss postsekundäres Studium (Ausland)"}	t
+5	Univ.-Abschluss Bachelor (Inland)	Uni-Bachelor (I)	{"Univ.-Abschluss Bachelor (Inland)","Univ.-Abschluss Bachelor (Inland)"}	t
+6	Univ.-Abschluss Bachelor (Ausland)	Uni-Bachelor (A)	{"Univ.-Abschluss Bachelor (Ausland)","Univ.-Abschluss Bachelor (Ausland)"}	t
+11	Sonstige	Sonstige	{Sonstige,Sonstige}	t
+9	Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)	Uni (I)	{"Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)","Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)"}	t
+10	Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)	Uni (A)	{"Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)","Univ. Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)"}	t
+7	FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)	FH (I)	{"FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)","FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. (Inland)"}	t
+8	FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)	FH (A)	{"FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)","FH-Abschluss Dipl.-Ing. / Mag. / Master / Dr. / PhD (Ausland)"}	t
 \.
 
 
@@ -35771,6 +36101,7 @@ ZA	Zeitausgleich	FFA605
 Arzt	Arztbesuch	0066FF
 Konfernz	Konferenz/Tagung/Seminar	CC6633
 Urlaub	Urlaub	FF0000
+ZVerfueg	Zeitverfügbarkeit	\N
 \.
 
 
@@ -35778,7 +36109,15 @@ Urlaub	Urlaub	FF0000
 -- Data for Name: tbl_zeitwunsch; Type: TABLE DATA; Schema: campus; Owner: fhcomplete
 --
 
-COPY campus.tbl_zeitwunsch (stunde, mitarbeiter_uid, tag, gewicht, updateamum, updatevon, insertamum, insertvon) FROM stdin;
+COPY campus.tbl_zeitwunsch (stunde, mitarbeiter_uid, tag, gewicht, updateamum, updatevon, insertamum, insertvon, zeitwunsch_id, zeitwunsch_gueltigkeit_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: tbl_zeitwunsch_gueltigkeit; Type: TABLE DATA; Schema: campus; Owner: fhcomplete
+--
+
+COPY campus.tbl_zeitwunsch_gueltigkeit (zeitwunsch_gueltigkeit_id, mitarbeiter_uid, von, bis, insertamum, insertvon, updateamum, updatevon) FROM stdin;
 \.
 
 
@@ -35952,6 +36291,7 @@ COPY lehre.tbl_anrechnung_begruendung (begruendung_id, bezeichnung) FROM stdin;
 2	kompatible Lehrveranstaltung
 3	Prüfung
 4	berufliche Praxis
+5	Hochschulzeugnis
 \.
 
 
@@ -36084,6 +36424,7 @@ COPY lehre.tbl_lehrtyp (lehrtyp_kurzbz, bezeichnung) FROM stdin;
 lv	Lehrveranstaltung
 modul	Modul
 lf	Lehrfach
+tpl	Template
 \.
 
 
@@ -36091,7 +36432,7 @@ lf	Lehrfach
 -- Data for Name: tbl_lehrveranstaltung; Type: TABLE DATA; Schema: lehre; Owner: fhcomplete
 --
 
-COPY lehre.tbl_lehrveranstaltung (lehrveranstaltung_id, kurzbz, bezeichnung, studiengang_kz, semester, sprache, ects, semesterstunden, anmerkung, lehre, lehreverzeichnis, aktiv, planfaktor, planlektoren, planpersonalkosten, plankostenprolektor, updateamum, updatevon, insertamum, insertvon, ext_id, sort, zeugnis, koordinator, projektarbeit, lehrform_kurzbz, bezeichnung_english, orgform_kurzbz, incoming, lehrmodus_kurzbz, lehrtyp_kurzbz, oe_kurzbz, raumtyp_kurzbz, anzahlsemester, semesterwochen, lvnr, farbe, old_lehrfach_id, semester_alternativ, sws, lvs, alvs, lvps, las, benotung, lvinfo, lehrauftrag) FROM stdin;
+COPY lehre.tbl_lehrveranstaltung (lehrveranstaltung_id, kurzbz, bezeichnung, studiengang_kz, semester, sprache, ects, semesterstunden, anmerkung, lehre, lehreverzeichnis, aktiv, planfaktor, planlektoren, planpersonalkosten, plankostenprolektor, updateamum, updatevon, insertamum, insertvon, ext_id, sort, zeugnis, koordinator, projektarbeit, lehrform_kurzbz, bezeichnung_english, orgform_kurzbz, incoming, lehrmodus_kurzbz, lehrtyp_kurzbz, oe_kurzbz, raumtyp_kurzbz, anzahlsemester, semesterwochen, lvnr, farbe, old_lehrfach_id, semester_alternativ, sws, lvs, alvs, lvps, las, benotung, lvinfo, lehrauftrag, lehrveranstaltung_template_id) FROM stdin;
 \.
 
 
@@ -36442,6 +36783,19 @@ COPY public.tbl_adresse (adresse_id, person_id, name, strasse, plz, ort, gemeind
 \.
 
 
+--
+-- Data for Name: tbl_adressentyp; Type: TABLE DATA; Schema: public; Owner: fhcomplete
+--
+
+COPY public.tbl_adressentyp (adressentyp_kurzbz, bezeichnung, bezeichnung_mehrsprachig, sort) FROM stdin;
+h	Hauptwohnsitz	{Hauptwohnsitz,"Principal residence"}	1
+n	Nebenwohnsitz	{Nebenwohnsitz,"Secondary residence"}	2
+ho	Homeoffice	{Homeoffice,Homeoffice}	3
+r	Rechnungsadresse	{Rechnungsadresse,"Billing address"}	4
+f	Firma	{Firma,Company}	5
+\.
+
+
 --
 -- Data for Name: tbl_akte; Type: TABLE DATA; Schema: public; Owner: fhcomplete
 --
@@ -36597,6 +36951,10 @@ BD-Zeugs	Bakkalaureats- bzw. Diplompruefungszeugnis	\N	f	{"Bakkalaureats- bzw. D
 Lebenslf	Lebenslauf	\N	f	{Lebenslauf,Lebenslauf}	\N
 Motivat	Motivationsschreiben	\N	f	{Motivationsschreiben,Motivationsschreiben}	\N
 UStatBla	UStat. Blatt	\N	f	{"UStat. Blatt","UStat. Blatt"}	\N
+LVZeugnisEng	Lehrveranstaltungszeugnis Englisch	\N	f	{Lehrveranstaltungszeugnis,"Course Certificate"}	\N
+LVZeugnis	Lehrveranstaltungszeugnis	\N	f	{Lehrveranstaltungszeugnis,"Course Certificate"}	\N
+Zertifikat	Zertifikat	\N	f	{Zertifikat,Certificate}	\N
+GrantAgr	Grant Agreement	\N	f	{"Grant Agreement","Grant Agreement"}	\N
 \.
 
 
@@ -36778,6 +37136,14 @@ CMS_LOCK	0	\N	CMS_LOCK	Sperrgruppe CMS	f	t	t	\N	f	f	\N	\N	2021-11-11 09:52:12.55
 \.
 
 
+--
+-- Data for Name: tbl_gruppe_manager; Type: TABLE DATA; Schema: public; Owner: fhcomplete
+--
+
+COPY public.tbl_gruppe_manager (gruppe_manager_id, gruppe_kurzbz, uid, insertamum, insertvon) FROM stdin;
+\.
+
+
 --
 -- Data for Name: tbl_kontakt; Type: TABLE DATA; Schema: public; Owner: fhcomplete
 --
@@ -37021,9 +37387,9 @@ COPY public.tbl_ortraumtyp (ort_kurzbz, hierarchie, raumtyp_kurzbz) FROM stdin;
 -- Data for Name: tbl_person; Type: TABLE DATA; Schema: public; Owner: fhcomplete
 --
 
-COPY public.tbl_person (person_id, staatsbuergerschaft, geburtsnation, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen, gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen, familienstand, geschlecht, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id, bundesland_code, kompetenzen, kurzbeschreibung, zugangscode, foto_sperre, udf_values, bpk, matr_aktiv, matr_nr, zugangscode_timestamp) FROM stdin;
-1	\N	\N	\N	\N	\N	\N	Administrator	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	m	\N	t	2013-06-04 16:51:25.448077	\N	\N	\N	\N	\N	\N	\N	\N	f	\N	\N	f	\N	\N
-2	\N	\N	\N	\N	\N	\N	Dummy	Dieter	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	m	\N	t	2013-08-06 07:41:48.894325	\N	\N	\N	\N	\N	\N	\N	\N	f	\N	\N	f	\N	\N
+COPY public.tbl_person (person_id, staatsbuergerschaft, geburtsnation, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen, gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen, familienstand, geschlecht, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id, bundesland_code, kompetenzen, kurzbeschreibung, zugangscode, foto_sperre, udf_values, bpk, matr_aktiv, matr_nr, zugangscode_timestamp, wahlname) FROM stdin;
+1	\N	\N	\N	\N	\N	\N	Administrator	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	m	\N	t	2013-06-04 16:51:25.448077	\N	\N	\N	\N	\N	\N	\N	\N	f	\N	\N	f	\N	\N	\N
+2	\N	\N	\N	\N	\N	\N	Dummy	Dieter	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	m	\N	t	2013-08-06 07:41:48.894325	\N	\N	\N	\N	\N	\N	\N	\N	f	\N	\N	f	\N	\N	\N
 \.
 
 
@@ -37119,7 +37485,7 @@ COPY public.tbl_preoutgoing_status (preoutgoing_status_kurzbz, bezeichnung) FROM
 -- Data for Name: tbl_prestudent; Type: TABLE DATA; Schema: public; Owner: fhcomplete
 --
 
-COPY public.tbl_prestudent (prestudent_id, aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id, anmerkung, dual, rt_punkte1, rt_punkte2, ausstellungsstaat, rt_punkte3, udf_values, priorisierung, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, mentor, zgvnation, zgvmanation, zgvdoktornation, gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, foerderrelevant, standort_code) FROM stdin;
+COPY public.tbl_prestudent (prestudent_id, aufmerksamdurch_kurzbz, person_id, studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf, reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte, bismelden, insertamum, insertvon, updateamum, updatevon, ext_id, anmerkung, dual, rt_punkte1, rt_punkte2, ausstellungsstaat, rt_punkte3, udf_values, priorisierung, zgvdoktor_code, zgvdoktorort, zgvdoktordatum, mentor, zgvnation, zgvmanation, zgvdoktornation, gsstudientyp_kurzbz, aufnahmegruppe_kurzbz, foerderrelevant, standort_code, zgv_erfuellt, zgvmas_erfuellt, zgvdoktor_erfuellt) FROM stdin;
 \.
 
 
@@ -37285,10 +37651,10 @@ COPY public.tbl_studentlehrverband (student_uid, studiensemester_kurzbz, studien
 -- Data for Name: tbl_studiengang; Type: TABLE DATA; Schema: public; Owner: fhcomplete
 --
 
-COPY public.tbl_studiengang (studiengang_kz, kurzbz, kurzbzlang, typ, bezeichnung, english, farbe, email, telefon, max_semester, max_verband, max_gruppe, erhalter_kz, bescheid, bescheidbgbl1, bescheidbgbl2, bescheidgz, bescheidvom, titelbescheidvom, aktiv, ext_id, orgform_kurzbz, zusatzinfo_html, moodle, oe_kurzbz, sprache, testtool_sprachwahl, studienplaetze, lgartcode, mischform, projektarbeit_note_anzeige, melderelevant, foerderrelevant, standort_code, onlinebewerbung) FROM stdin;
-2	S2	STG2	m	Studiengang 2	Studiengang 2	\N	invalid@example.com	\N	4	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ		t	stg2	English	t	\N	\N	f	t	t	t	\N	f
-1	S1	STG1	b	Studiengang 1	Studiengang 1	\N	invalid@example.com	\N	6	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ		t	stg1	English	t	\N	\N	f	t	t	t	\N	f
-0	TW	ETW	e	Erhalter	Erhalter	      	invalid@example.com	\N	4	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ	\N	t	etw	German	f	\N	\N	f	t	f	t	\N	f
+COPY public.tbl_studiengang (studiengang_kz, kurzbz, kurzbzlang, typ, bezeichnung, english, farbe, email, telefon, max_semester, max_verband, max_gruppe, erhalter_kz, bescheid, bescheidbgbl1, bescheidbgbl2, bescheidgz, bescheidvom, titelbescheidvom, aktiv, ext_id, orgform_kurzbz, zusatzinfo_html, moodle, oe_kurzbz, sprache, testtool_sprachwahl, studienplaetze, lgartcode, mischform, projektarbeit_note_anzeige, melderelevant, foerderrelevant, standort_code, onlinebewerbung, melde_studiengang_kz) FROM stdin;
+0	TW	ETW	e	Erhalter	Erhalter	      	invalid@example.com	\N	4	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ	\N	t	etw	German	f	\N	\N	f	t	f	t	\N	f	\N
+2	S2	STG2	m	Studiengang 2	Studiengang 2	\N	invalid@example.com	\N	4	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ		t	stg2	English	t	\N	\N	f	t	t	t	\N	f	0002
+1	S1	STG1	b	Studiengang 1	Studiengang 1	\N	invalid@example.com	\N	6	B	2	5	\N	\N	\N	\N	\N	\N	t	\N	VZ		t	stg1	English	t	\N	\N	f	t	t	t	\N	f	0001
 \.
 
 
@@ -37300,6 +37666,10 @@ COPY public.tbl_studiengangstyp (typ, bezeichnung, beschreibung, bezeichnung_meh
 m	\N	\N	{NULL,NULL}
 b	\N	\N	{NULL,NULL}
 e	\N	\N	{NULL,NULL}
+p	PhD	\N	{PhD,PhD}
+l	Lehrgang	\N	{Lehrgang,Course}
+d	Diplom	\N	{Diplom,Diploma}
+w	Weiterbildung	\N	{Weiterbildung,"Further education"}
 \.
 
 
@@ -37442,6 +37812,7 @@ db_stpl_table	stundenplan
 allow_lehrstunde_drop	false
 alle_unr_mitladen	false
 infocenter_studiensgangtyp	b
+projektuebersicht_studiensemester	\N
 \.
 
 
@@ -37452,7 +37823,6 @@ infocenter_studiensgangtyp	b
 COPY public.tbl_vorlage (vorlage_kurzbz, bezeichnung, anmerkung, mimetype, archivierbar, signierbar, stud_selfservice, dokument_kurzbz, insertamum, insertvon, updateamum, updatevon, attribute) FROM stdin;
 Studienerfolg	\N	\N	\N	f	f	f	\N	\N	\N	\N	\N	\N
 AccountInfo	AccountInfoBlatt	\N	\N	f	f	f	\N	\N	\N	\N	\N	\N
-Zertifikat	Zertifikat Freifächer		\N	f	f	f	\N	\N	\N	\N	\N	\N
 Diplomurkunde	\N	\N	\N	f	f	f	\N	\N	\N	\N	\N	\N
 Diplomzeugnis	\N	\N	\N	f	f	f	\N	\N	\N	\N	\N	\N
 Bakkurkunde	\N	\N	\N	f	f	f	\N	\N	\N	\N	\N	\N
@@ -37468,6 +37838,7 @@ DiplSupplement	\N	\N	\N	t	f	f	\N	\N	\N	\N	\N	\N
 Zeugnis	\N	erledigt	\N	t	f	f	\N	\N	\N	\N	\N	\N
 ZeugnisEng	ZeugnisEng	ZeugnisEng	\N	t	f	f	\N	\N	\N	\N	\N	\N
 Bewerberakt	Bewerberakt Deckblatt	wird als Deckblatt fuer den Bewerberakt verwendet	application/vnd.oasis.opendocument.text	f	f	f	\N	\N	\N	\N	\N	\N
+Zertifikat	Zertifikat Freifächer		\N	t	t	t	\N	\N	\N	\N	\N	\N
 \.
 
 
@@ -37529,6 +37900,7 @@ budget
 reporting
 projektarbeitsbeurteilung
 dvuh
+international
 \.
 
 
@@ -37731,6 +38103,11 @@ lehre/lehrveranstaltungAnlegen	Recht zur Anlage von Lehrveranstaltungen
 system/change_outputformat	Recht, um Dokumente aus dem FAS als Nicht-PDF exportieren zu duerfen (mittels UMSCHALT- oder STRG-Taste)
 basis/studiensemester	Studiensemester verwalten
 basis/status	Status verwalten
+lehre/zeitverfuegbarkeit	Zeitverfuegbarkeit verwalten
+lehre/gruppenmanager	Manager einer Gruppe werden und die Gruppe verwalten
+student/keine_studstatuspruefung	Ermöglicht Umgehen der Checks beim Speichern der Presstudentstatus
+basis/variable_persoenlich	Verwaltung eigener Variablen
+student/editMakkZgv	Bearbeiten der Master ZGV eines PreStudenten
 \.
 
 
@@ -37756,6 +38133,46 @@ COPY system.tbl_extensions (extension_id, name, version, description, license, u
 
 COPY system.tbl_fehler (fehlercode, fehler_kurzbz, fehlercode_extern, fehlertext, fehlertyp_kurzbz, app) FROM stdin;
 UNKNOWN_ERROR	\N	\N	Fehler ist aufgetreten	error	core
+CORE_ZGV_0001	zgvDatumInZukunft	\N	ZGV Datum in Zukunft	error	core
+CORE_ZGV_0002	zgvDatumVorGeburtsdatum	\N	ZGV Datum vor Geburtsdatum	error	core
+CORE_ZGV_0003	zgvMasterDatumInZukunft	\N	ZGV Masterdatum in Zukunft	error	core
+CORE_ZGV_0004	zgvMasterDatumVorZgvdatum	\N	ZGV Masterdatum vor Zgvdatum	error	core
+CORE_ZGV_0005	zgvMasterDatumVorGeburtsdatum	\N	ZGV Masterdatum vor Geburtsdatum	error	core
+CORE_INOUT_0001	keinAufenthaltszweckPlausi	\N	Kein Aufenthaltszweck gefunden	error	core
+CORE_INOUT_0002	zuVieleZweckeIncomingPlausi	\N	Es sind %s Aufenthaltszwecke eingetragen (max. 1 Zweck für Incomings)	error	core
+CORE_INOUT_0003	falscherIncomingZweckPlausi	\N	Aufenthaltszweckcode ist %s (für Incomings ist nur Zweck 1, 2, 3 erlaubt)	error	core
+CORE_INOUT_0004	outgoingAufenthaltfoerderungfehltPlausi	\N	Keine Aufenthaltsfoerderung angegeben (bei Outgoings >= 29 Tage Monat im Ausland muss mind. 1 gemeldet werden)	error	core
+CORE_INOUT_0005	outgoingAngerechneteEctsFehlenPlausi	\N	Angerechnete ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)	error	core
+CORE_INOUT_0006	outgoingErworbeneEctsFehlenPlausi	\N	Erworbene ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)	error	core
+CORE_INOUT_0007	IncomingHeimatNationOesterreich	\N	Heimatnation bei Incoming Österreich	error	core
+CORE_INOUT_0008	IncomingOhneIoDatensatz	\N	Incoming hat keinen IO Datensatz (prestudent_id %s)	error	core
+CORE_INOUT_0009	IncomingOrGsFoerderrelevant	\N	Incoming oder gemeinsames Studium ist nicht als nicht förderrelevant markiert. (prestudent_id %s)	error	core
+CORE_STG_0001	StgPrestudentUngleichStgStudent	\N	Studiengang des Prestudenten ist ungleich dem Studiengang des Studenten. (prestudent_id %s)	error	core
+CORE_STG_0002	OrgformStgUngleichOrgformPrestudent	\N	Es ist kein Studienplan mit Studiengang (%s) und Organisationsform (%s) des Studenten zugewiesen. (prestudent_id %s, Studiensemester %s)	error	core
+CORE_STG_0003	PrestudentMischformOhneOrgform	\N	Organisationsform ist für Studierenden/BewerberIn in Mischformstudiengang nicht eingetragen. (prestudent_id %s, Studiensemester %s)	error	core
+CORE_STG_0004	StgPrestudentUngleichStgStudienplan	\N	Studiengang des Prestudenten passt nicht zu Studiengang des Studienplans. (prestudent_id %s, Studienplan %s)	error	core
+CORE_STUDENTSTATUS_0001	AbbrecherAktiv	\N	AbbrecherIn hat aktiven Benutzer. (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0002	StudentstatusNachAbbrecher	\N	Aktiver Status nach Abbrecher Status. (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0003	AusbildungssemPrestudentUngleichAusbildungssemStatus	\N	Ausbildungssemester %s des aktuellen Status stimmt nicht mit Ausbildungssemester %s bei StudentIn (Lehrverband) überein. (student_uid %s, prestudent_id %s, Studiensemester %s)	error	core
+CORE_STUDENTSTATUS_0004	InaktiverStudentAktiverStatus	\N	Inaktiver Benutzer hat aktiven Status. (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0005	InskriptionVorLetzerBismeldung	\N	Datum der Inskription liegt vor dem Datum der letzten BIS-Meldung %s. (prestudent_id %s, Studiensemester %s)	error	core
+CORE_STUDENTSTATUS_0006	DatumStudiensemesterFalscheReihenfolge	\N	Datum und Studiensemester sind bei den Status in falscher Reihenfolge. (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0007	AktiverStudentOhneStatus	\N	Aktive/r StudentIn ohne aktuellen Status (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0008	StudienplanUngueltig	\N	Studienplan %s ist im Ausbildungssemester %s nicht gültig (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0009	FalscheAnzahlAbschlusspruefungen	\N	Mehrere oder keine bestandenen Abschlussprüfungen (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0010	DatumAbschlusspruefungFehlt	\N	Kein Abschlussprüfung Datum (prestudent_id %s, abschlusspruefung_id %s)	error	core
+CORE_STUDENTSTATUS_0011	DatumSponsionFehlt	\N	Kein Sponsionsdatum (prestudent_id %s, abschlusspruefung_id %s)	error	core
+CORE_STUDENTSTATUS_0012	BewerberNichtZumRtAngetreten	\N	Bewerber nicht zum Reihungstest angetreten (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0013	AktSemesterNull	\N	Aktuelles Ausbildungssemester ist 0 (prestudent_id %s, Studiensemester %s)	error	core
+CORE_STUDENTSTATUS_0014	AbschlussstatusFehlt	\N	Kein Abschlussstatus (prestudent_id %s)	error	core
+CORE_STUDENTSTATUS_0015	AktiverStudentstatusOhneKontobuchung	\N	Keine Kontobuchung bei aktivem Studentstatus (prestudent_id %s, Studiensemester %s)	error	core
+CORE_STUDENTSTATUS_0016	DualesStudiumOhneMarkierung	\N	StudentIn in dualem Studiengang nicht als dual markiert (prestudent_id %s, Studienplan %s)	error	core
+CORE_PERSON_0001	GbDatumWeitZurueck	\N	Geburtsdatum vor dem 01.01.1920	error	core
+CORE_PERSON_0002	NationNichtOesterreichAberGemeinde	\N	Nation der Adresse ist ungleich Österreich, es ist aber eine österreichische Gemeinde (%s) angegeben (adresse_id %s)	error	core
+CORE_PERSON_0003	FalscheAnzahlHeimatadressen	\N	Es sind mehrere oder keine Heimatadressen eingetragen	error	core
+CORE_PERSON_0004	FalscheAnzahlZustelladressen	\N	Es sind mehrere oder keine Zustelladressen eingetragen	error	core
+CORE_PERSON_0005	geburtsnationFehlt	\N	Geburtsnation nicht vorhanden	error	core
+CORE_PERSON_0006	uhstatPersonkennungFehltCore	\N	Personkennung fehlt (vBpk AS, vBpk BF oder Ersatzkennzeichen fehlt)	error	core
 \.
 
 
@@ -37763,7 +38180,7 @@ UNKNOWN_ERROR	\N	\N	Fehler ist aufgetreten	error	core
 -- Data for Name: tbl_fehler_zustaendigkeiten; Type: TABLE DATA; Schema: system; Owner: fhcomplete
 --
 
-COPY system.tbl_fehler_zustaendigkeiten (fehlerzustaendigkeiten_id, fehlercode, person_id, oe_kurzbz, funktion_kurzbz) FROM stdin;
+COPY system.tbl_fehler_zustaendigkeiten (fehlerzustaendigkeiten_id, fehlercode, person_id, oe_kurzbz, funktion_kurzbz, insertamum, insertvon) FROM stdin;
 \.
 
 
@@ -37783,32 +38200,48 @@ info	{info,info}
 --
 
 COPY system.tbl_filters (filter_id, app, dataset_name, filter_kurzbz, person_id, description, sort, default_filter, filter, oe_kurzbz, statistik_kurzbz) FROM stdin;
-10	reihungstest	overview	Reihungstest	\N	{"Reihungstest Übersicht"}	1	t	{"name": "Reihungstest", "columns": [{"name": "fakultaet"}, {"name": "datum"}, {"name": "uhrzeit"}, {"name": "anmeldefrist"}, {"name": "oeffentlich"}, {"name": "studiengaenge"}, {"name": "freie_plaetze"}, {"name": "anzahl_angemeldet"}, {"name": "rt_studiengang"}, {"name": "reihungstest_id"}], "filters": []}	\N	\N
-12	infocenter	zgvUeberpruefung	zgvOffen	\N	{"ZGV Überprüfung"}	1	t	{"name": "Zgv Überprüfung", "columns": [{"name": "PreStudentID"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}], "filters": [{"name": "Status", "condition": "stg", "operation": "contains"}]}	\N	\N
-2	infocenter	overview	InfoCenterSentApplication3days	\N	{"3 Tage keine Aktion"}	2	\N	{"name": "Abgeschickt - 3 Tage keine Aktion", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "StgAbgeschickt"}, {"name": "Studiensemester"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}], "filters": [{"name": "LastAction", "option": "days", "condition": "3", "operation": "gt"}, {"name": "AnzahlAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
 3	infocenter	overview	InfoCenterNotSentApplicationAll	\N	{Alle}	1	\N	{"name": "Nicht abgeschickt - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "StgNichtAbgeschickt"}, {"name": "StgAbgeschickt"}, {"name": "StgAktiv"}, {"name": "Studiensemester"}], "filters": [{"name": "AnzahlStgNichtAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
 4	infocenter	overview	InfoCenterNotSentApplication14Days	\N	{"14 Tage keine Aktion"}	3	\N	{"name": "Nicht abgeschickt - 14 Tage keine Aktion", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "StgNichtAbgeschickt"}, {"name": "StgAbgeschickt"}, {"name": "StgAktiv"}, {"name": "Studiensemester"}], "filters": [{"name": "LastAction", "option": "days", "condition": "14", "operation": "gt"}, {"name": "SendDate", "option": "", "condition": "", "operation": "nset"}]}	\N	\N
 5	infocenter	overview	InfoCenterSentApplicationLt3days	\N	{"< 3 Tage"}	3	\N	{"name": "Abgeschickt - Aktion innert der letzten 3 Tage", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "StgAbgeschickt"}, {"name": "Studiensemester"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}], "filters": [{"name": "LastAction", "option": "days", "condition": "3", "operation": "lt"}, {"name": "AnzahlAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
 7	infocenter	freigegeben	InfoCenterFreigegeben5days	\N	{"5 Tage Letzte Aktion"}	2	\N	{"name": "Freigegeben - 5 Tage Letzte Aktion", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "Statusgrund"}], "filters": [{"name": "LastAction", "option": "days", "condition": "5", "operation": "lt"}, {"name": "ReihungstestAngetreten", "operation": "false"}]}	\N	\N
-8	infocenter	freigegeben	InfoCenterFreigegebenAlle	\N	{Alle}	1	t	{"name": "Freigegeben - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "Statusgrund"}, {"name": "Studiensemester"}, {"name": "ReihungstestApplied"}, {"name": "ReihungstestDate"}], "filters": [{"name": "ReihungstestAngetreten", "operation": "false"}]}	\N	\N
-9	core	overview	BPKWartung	\N	{"bPK Uebersicht"}	1	t	{"name": "Fehlende bPK", "columns": [{"name": "person_id"}, {"name": "vorname"}, {"name": "nachname"}, {"name": "svnr"}, {"name": "ersatzkennzeichen"}], "filters": []}	\N	\N
+8	infocenter	freigegeben	InfoCenterFreigegebenAlle	\N	{Alle}	1	t	{"name": "Freigegeben - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "AktenId"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "Statusgrund"}, {"name": "Studiensemester"}, {"name": "ReihungstestApplied"}, {"name": "ReihungstestDate"}], "filters": [{"name": "ReihungstestAngetreten", "operation": "false"}]}	\N	\N
+9	core	overview	BPKWartung	\N	{"bPK Uebersicht"}	1	t	{"name": "Fehlende bPK", "columns": [{"name": "person_id"}, {"name": "vorname"}, {"name": "nachname"}, {"name": "svnr"}, {"name": "ersatzkennzeichen"}, {"name": "mitarbeiter"}], "filters": []}	\N	\N
+10	reihungstest	overview	Reihungstest	\N	{"Reihungstest Übersicht"}	1	t	{"name": "Reihungstest", "columns": [{"name": "fakultaet"}, {"name": "datum"}, {"name": "uhrzeit"}, {"name": "anmeldefrist"}, {"name": "oeffentlich"}, {"name": "studiengaenge"}, {"name": "freie_plaetze"}, {"name": "anzahl_angemeldet"}, {"name": "rt_studiengang"}, {"name": "reihungstest_id"}], "filters": []}	\N	\N
 11	infocenter	reihungstestAbsolviert	InfoCenterReihungstestAbsolviert5days	\N	{"Letzten 5 Tage"}	2	\N	{"name": "Reihungstest absolviert - Letzten 5 Tage", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}], "filters": [{"name": "ReihungstestDatum", "option": "days", "condition": "5", "operation": "lt"}, {"name": "ReihungstestAngetreten", "operation": "true"}]}	\N	\N
+12	infocenter	zgvUeberpruefung	zgvOffen	\N	{"ZGV Überprüfung"}	1	t	{"name": "Zgv Überprüfung", "columns": [{"name": "PreStudentID"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}], "filters": [{"name": "Status", "condition": "stg", "operation": "contains"}]}	\N	\N
 19	core	logs	jqws48hours	\N	{"Last 48 hours JQWs logs"}	2	\N	{"name": "All Job Queue Workers logs from the last 48 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "job", "operation": "contains"}, {"name": "RequestId", "condition": "JQW", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "48", "operation": "lt"}]}	\N	\N
-24	core	issues	offeneFehler	\N	{"Alle offenen"}	1	t	{"name": "Alle offenen Fehler, hauptzuständig", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}], "filters": [{"name": "Fehlerstatus", "condition": "behoben", "operation": "ncontains"}, {"name": "Hauptzuständig", "condition": "Ja", "operation": "contains"}]}	\N	\N
-25	core	issues	FehlerLetze7Tage	\N	{"Letzten 7 Tage"}	2	\N	{"name": "Alle in den letzten 7 Tagen aufgetretenen Fehler", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}], "filters": [{"name": "Datum", "option": "days", "condition": "7", "operation": "lt"}]}	\N	\N
-20	core	logs	repots14days	\N	{"Last 14 days reports logs"}	3	\N	{"name": "All reports logs from the last 14 days", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "reports", "operation": "contains"}, {"name": "ExecutionTime", "option": "days", "condition": "14", "operation": "lt"}]}	\N	\N
-21	core	logs	content3minutes	\N	{"Last 3 minutes content logs"}	4	\N	{"name": "All content logs from the last 3 minutes", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "content", "operation": "contains"}, {"name": "ExecutionTime", "option": "minutes", "condition": "3", "operation": "lt"}]}	\N	\N
-22	core	logs	wienerlinien24hours	\N	{"Last 24 hours Wiener Linien logs"}	5	\N	{"name": "All Wiener Linien logs from the last 24 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "wienerlinien", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "24", "operation": "lt"}]}	\N	\N
-14	budget	budgetoverview	BudgetUebersicht	\N	{"Budgetanträge Übersicht"}	1	t	{"name": "Budgetanträge", "columns": [{"name": "Budgetantrag"}, {"name": "Kostenstelle"}, {"name": "Organisationseinheit"}, {"name": "Geschäftsjahr"}, {"name": "Budgetstatus"}, {"name": "Betrag"}], "filters": [{"name": "Budgetstatus", "condition": "Freigegeben", "operation": "ncontains"}, {"name": "Geschäftsjahr", "condition": "GJ2019-2020", "operation": "contains"}]}	\N	\N
+24	core	issues	offeneFehler	\N	{"Alle offenen"}	1	t	{"name": "Alle offenen Fehler, hauptzuständig", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}, {"name": "Zugehörigkeit"}, {"name": "Person Zuständigkeiten"}, {"name": "Organisationseinheit Zuständigkeiten"}], "filters": [{"name": "Statuscode", "condition": "resolved", "operation": "ncontains"}, {"name": "Hauptzuständig", "condition": "Ja", "operation": "contains"}]}	\N	\N
+25	core	issues	FehlerLetze7Tage	\N	{"Letzten 7 Tage"}	2	\N	{"name": "Alle in den letzten 7 Tagen aufgetretenen Fehler", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}, {"name": "Zugehörigkeit"}, {"name": "Person Zuständigkeiten"}, {"name": "Organisationseinheit Zuständigkeiten"}], "filters": [{"name": "Datum", "option": "days", "condition": "7", "operation": "lt"}]}	\N	\N
+6	infocenter	overview	InfoCenterNotSentApplication5DaysOnline	\N	{"5 Tage keine BewAktion"}	2	\N	{"name": "Nicht abgeschickt - 5 Tage keine Aktion durch BewerberIn", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "StgNichtAbgeschickt"}, {"name": "StgAbgeschickt"}, {"name": "StgAktiv"}, {"name": "Studiensemester"}], "filters": [{"name": "SendDate", "option": "", "condition": "", "operation": "nset"}, {"name": "LastAction", "option": "days", "condition": "5", "operation": "gt"}, {"name": "User/Operator", "option": "", "condition": "online", "operation": "contains"}]}	\N	\N
+13	infocenter	zgvUeberpruefung	zgvRest	\N	{"ZGV abgeschlossen"}	2	t	{"name": "Zgv abgeschlossen", "columns": [{"name": "PreStudentID"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}, {"name": "Status"}], "filters": [{"name": "Status", "condition": "stg", "operation": "ncontains"}]}	\N	\N
+23	core	jq	lastHour	\N	{"Last hour queued jobs"}	1	t	{"name": "All jobs queued in the last hour", "columns": [{"name": "JobId"}, {"name": "CreationTime"}, {"name": "Type"}, {"name": "Status"}, {"name": "StartTime"}, {"name": "EndTime"}, {"name": "UserService"}], "filters": [{"name": "CreationTime", "option": "hours", "condition": "1", "operation": "lt"}]}	\N	\N
 15	core	logs	last1min	\N	{"Last minute logs"}	1	t	{"name": "All logs from the last minute", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "ExecutionTime", "option": "minutes", "condition": "1", "operation": "lt"}]}	\N	\N
 16	core	logs	jobs24hours	\N	{"Last 24 hours jobs logs"}	2	\N	{"name": "All jobs logs from the last 24 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "job", "operation": "contains"}, {"name": "RequestId", "condition": "JOB", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "24", "operation": "lt"}]}	\N	\N
 17	core	logs	jobs48hours	\N	{"Last 48 hours jobs logs"}	2	\N	{"name": "All jobs logs from the last 48 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "job", "operation": "contains"}, {"name": "RequestId", "condition": "JOB", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "48", "operation": "lt"}]}	\N	\N
 18	core	logs	jqws24hours	\N	{"Last 24 hours JQWs logs"}	2	\N	{"name": "All Job Queue Workers logs from the last 24 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "job", "operation": "contains"}, {"name": "RequestId", "condition": "JQW", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "24", "operation": "lt"}]}	\N	\N
-13	infocenter	zgvUeberpruefung	zgvRest	\N	{"ZGV abgeschlossen"}	2	t	{"name": "Zgv abgeschlossen", "columns": [{"name": "PreStudentID"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}, {"name": "Status"}], "filters": [{"name": "Status", "condition": "stg", "operation": "ncontains"}]}	\N	\N
-23	core	jq	lastHour	\N	{"Last hour queued jobs"}	1	t	{"name": "All jobs queued in the last hour", "columns": [{"name": "JobId"}, {"name": "CreationTime"}, {"name": "Type"}, {"name": "Status"}, {"name": "StartTime"}, {"name": "EndTime"}, {"name": "UserService"}], "filters": [{"name": "CreationTime", "option": "hours", "condition": "1", "operation": "lt"}]}	\N	\N
-1	infocenter	overview	InfoCenterSentApplicationAll	\N	{Alle}	1	\N	{"name": "Abgeschickt - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "StgAbgeschickt"}, {"name": "Studiensemester"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}], "filters": [{"name": "AnzahlAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
-6	infocenter	overview	InfoCenterNotSentApplication5DaysOnline	\N	{"5 Tage keine BewAktion"}	2	\N	{"name": "Nicht abgeschickt - 5 Tage keine Aktion durch BewerberIn", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "LastAction"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "StgNichtAbgeschickt"}, {"name": "StgAbgeschickt"}, {"name": "StgAktiv"}, {"name": "Studiensemester"}], "filters": [{"name": "SendDate", "option": "", "condition": "", "operation": "nset"}, {"name": "LastAction", "option": "days", "condition": "5", "operation": "gt"}, {"name": "User/Operator", "option": "", "condition": "online", "operation": "contains"}]}	\N	\N
-26	core	issues	FehlerLetzte7TageBearbeitet	\N	{"Letzten 7 Tage bearbeitet"}	3	\N	{"name": "Alle in den letzten 7 Tagen bearbeiteten Fehler", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}, {"name": "Verarbeitet von"}], "filters": [{"name": "Verarbeitet am", "option": "days", "condition": "7", "operation": "lt"}, {"name": "Fehlerstatus", "condition": "behoben", "operation": "contains"}]}	\N	\N
+20	core	logs	repots14days	\N	{"Last 14 days reports logs"}	3	\N	{"name": "All reports logs from the last 14 days", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "reports", "operation": "contains"}, {"name": "ExecutionTime", "option": "days", "condition": "14", "operation": "lt"}]}	\N	\N
+21	core	logs	content3minutes	\N	{"Last 3 minutes content logs"}	4	\N	{"name": "All content logs from the last 3 minutes", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "content", "operation": "contains"}, {"name": "ExecutionTime", "option": "minutes", "condition": "3", "operation": "lt"}]}	\N	\N
+22	core	logs	wienerlinien24hours	\N	{"Last 24 hours Wiener Linien logs"}	5	\N	{"name": "All Wiener Linien logs from the last 24 hours", "columns": [{"name": "RequestId"}, {"name": "ExecutionTime"}, {"name": "ExecutedBy"}, {"name": "Description"}, {"name": "Data"}], "filters": [{"name": "WebserviceType", "condition": "wienerlinien", "operation": "contains"}, {"name": "ExecutionTime", "option": "hours", "condition": "24", "operation": "lt"}]}	\N	\N
+14	budget	budgetoverview	BudgetUebersicht	\N	{"Budgetanträge Übersicht"}	1	t	{"name": "Budgetanträge", "columns": [{"name": "Budgetantrag"}, {"name": "Kostenstelle"}, {"name": "Organisationseinheit"}, {"name": "Geschäftsjahr"}, {"name": "Budgetstatus"}, {"name": "Betrag"}], "filters": [{"name": "Budgetstatus", "condition": "Freigegeben", "operation": "ncontains"}, {"name": "Geschäftsjahr", "condition": "GJ2019-2020", "operation": "contains"}]}	\N	\N
+26	core	issues	FehlerLetzte7TageBearbeitet	\N	{"Letzten 7 Tage bearbeitet"}	3	\N	{"name": "Alle in den letzten 7 Tagen bearbeiteten Fehler", "columns": [{"name": "Datum"}, {"name": "Inhalt"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, {"name": "Fehlerstatus"}, {"name": "Zugehörigkeit"}, {"name": "Verarbeitet von"}, {"name": "Verarbeitet am"}], "filters": [{"name": "Verarbeitet am", "option": "days", "condition": "7", "operation": "lt"}, {"name": "Statuscode", "condition": "resolved", "operation": "contains"}]}	\N	\N
+1	infocenter	overview	InfoCenterSentApplicationAll	\N	{Alle}	1	\N	{"name": "Abgeschickt - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}, {"name": "HoldDate"}, {"name": "Rueckstellgrund"}, {"name": "Kaution"}], "filters": [{"name": "AnzahlAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
+2	infocenter	overview	InfoCenterSentApplication3days	\N	{"3 Tage keine Aktion"}	2	\N	{"name": "Abgeschickt - 3 Tage keine Aktion", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "ZGVNation"}, {"name": "ZGVMNation"}, {"name": "StgAbgeschickt"}, {"name": "Studiensemester"}, {"name": "LastAction"}, {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "InfoCenterMitarbeiter"}, {"name": "LockUser"}], "filters": [{"name": "LastAction", "option": "days", "condition": "3", "operation": "gt"}, {"name": "AnzahlAbgeschickt", "option": "", "condition": "0", "operation": "gt"}]}	\N	\N
+27	core	leistungsstipendium	LeistungsstipendiumAlle	\N	{Alle}	1	t	{"name": "Leistungsstipendium - Alle", "columns": [{"name": "Vorname"}, {"name": "Nachname"}, {"name": "Buchungsdatum"}, {"name": "Betrag"}, {"name": "Buchungstyp"}, {"name": "VorgangsId"}, {"name": "FoerderfallId"}, {"name": "LeistungsdatenId"}, {"name": "startjahr"}, {"name": "endjahr"}, {"name": "Uebermittelt"}], "filters": []}	\N	\N
+28	infocenter	abgewiesen	InfoCenterAbgewiesenAlle	\N	{Alle}	1	t	{"name": "Abgewiesen - Alle", "columns": [{"name": "PersonId"}, {"name": "PreStudentID"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}, {"name": "AbgewiesenAm"}, {"name": "Nachricht"}, {"name": "Kaution"}, {"name": "LockUser"}], "filters": []}	\N	\N
+29	infocenter	onboarding	InfoCenterOnboarding	\N	{Alle}	1	t	{"name": "Electronic Onboarding - Alle", "columns": [{"name": "PersonId"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "LockUser"}, {"name": "HoldDate"}, {"name": "Rueckstellgrund"}], "filters": []}	\N	\N
+30	infocenter	aufgenommen	InfoCenterAufgenommenAlle	\N	{Alle}	1	t	{"name": "Aufgenommen - Lehrgänge", "columns": [{"name": "PersonId"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Studiengang"}], "filters": []}	\N	\N
+31	projektarbeitsbeurteilung	projektuebersicht	alleProjekte	\N	{Projektübersicht}	1	t	{"name": "Projektübersicht", "columns": [{"name": "Studiengang"}, {"name": "StudentNachname"}, {"name": "Abgabedatum"}, {"name": "Note"}, {"name": "ErstNachname"}, {"name": "ErstAbgeschickt"}, {"name": "ZweitNachname"}, {"name": "ZweitAbgeschickt"}], "filters": []}	\N	\N
+32	dvuh	storno	DVUHStorno	\N	{"DVUH Storno Übersicht"}	1	t	{"name": "DVUHStorno", "columns": [{"name": "vorname"}, {"name": "nachname"}, {"name": "matrikelnummer"}, {"name": "studiengang"}, {"name": "studiensemester"}, {"name": "last_status"}, {"name": "bismelden"}], "filters": []}	\N	\N
+33	dvuh	overview	BPKWartungDVUH	\N	{"bPK Uebersicht"}	1	t	{"name": "Fehlende bPK", "columns": [{"name": "person_id"}, {"name": "vorname"}, {"name": "nachname"}, {"name": "svnr"}, {"name": "ersatzkennzeichen"}, {"name": "mitarbeiter"}], "filters": []}	\N	\N
+34	core	employees	mitarbeiter	\N	{"MA Uebersicht"}	1	t	{"name": "Mitarbeiter", "columns": [{"name": "PersonId"}, {"name": "Vorname"}, {"name": "Nachname"}, {"name": "Alias"}, {"name": "Aktiv"}, {"name": "Raum"}, {"name": "Geschlecht"}, {"name": "Standardkostenstelle"}], "filters": [{"name": "Nachname", "option": "", "condition": "", "operation": ""}]}	\N	\N
+37	core	fehlerZustaendigkeiten	fehlerZustaendigkeiten	\N	{"Fehler Zustaendigkeiten"}	1	t	{"name": "Fehler Zuständigkeiten", "columns": [{"name": "fehlercode"}, {"name": "person_id"}, {"name": "vorname"}, {"name": "nachname"}, {"name": "oe_bezeichnung"}, {"name": "funktion_beschreibung"}], "filters": []}	\N	\N
+38	core	fehlerKonfiguration	fehlerKonfiguration	\N	{"Fehler Konfiguration"}	1	t	{"name": "Fehler Konfiguration", "columns": [{"name": "konfigurationstyp_kurzbz"}, {"name": "fehlercode"}, {"name": "fehler_kurzbz"}, {"name": "konfiguration"}, {"name": "app"}], "filters": []}	\N	\N
+39	core	gruppenmanagement	gruppenmanagement	\N	{"Meine Gruppen"}	1	t	{"name": "gruppenmanagement", "columns": [{"name": "gruppe_kurzbz"}, {"name": "gruppe_bezeichnung"}, {"name": "gruppe_beschreibung"}, {"name": "studiengang_kurzbz"}], "filters": []}	\N	\N
+40	core	softwareManagement	SoftwareManagement	\N	{"Software Verwaltung"}	1	t	{"name": "SoftwareManagement", "columns": [{"name": "software_kurzbz"}, {"name": "version"}, {"name": "beschreibung"}, {"name": "hersteller"}, {"name": "os"}, {"name": "lizenzserver_kurzbz"}, {"name": "lizenzserver_port"}, {"name": "anzahl_lizenzen"}, {"name": "softwarestatus_kurzbz"}], "filters": []}	\N	\N
+41	core	imageVerwaltung	ImageVerwaltung	\N	{"Image Verwaltung"}	1	t	{"name": "ImageVerwaltung", "columns": [{"name": "bezeichnung"}, {"name": "betriebssystem"}, {"name": "verfuegbarkeit_start"}, {"name": "verfuegbarkeit_ende"}, {"name": "anmerkung"}, {"name": "ort_count"}, {"name": "software_count"}], "filters": []}	\N	\N
+42	core	lizenzserverVerwaltung	LizenzserverVerwaltung	\N	{"Lizenzserver Verwaltung"}	1	t	{"name": "LizenzserverVerwaltung", "columns": [{"name": "lizenzserver_kurzbz"}, {"name": "bezeichnung"}, {"name": "macadresse"}, {"name": "ipadresse"}, {"name": "ansprechpartner"}, {"name": "anmerkung"}, {"name": "location"}], "filters": []}	\N	\N
+49	core	vertragsverwaltung	VertragsverwaltungAktiv	\N	{"Aktive Mitarbeiter"}	1	t	{"name": "Aktive Mitarbeiter", "columns": [{"name": "uid"}, {"name": "person_id"}, {"name": "nachname"}, {"name": "vorname"}, {"name": "aktiv"}, {"name": "gebdatum"}, {"name": "unternehmen"}, {"name": "vertragsarten"}, {"name": "ids"}], "filters": [{"name": "aktiv", "option": "", "condition": "true", "operation": "equal"}]}	\N	\N
+50	core	vertragsverwaltung	VertragsverwaltungAlle	\N	{"Alle Mitarbeiter"}	1	\N	{"name": "Alle Mitarbeiter", "columns": [{"name": "uid"}, {"name": "person_id"}, {"name": "nachname"}, {"name": "vorname"}, {"name": "aktiv"}, {"name": "gebdatum"}, {"name": "unternehmen"}, {"name": "vertragsarten"}, {"name": "ids"}], "filters": []}	\N	\N
 \.
 
 
@@ -37816,7 +38249,7 @@ COPY system.tbl_filters (filter_id, app, dataset_name, filter_kurzbz, person_id,
 -- Data for Name: tbl_issue; Type: TABLE DATA; Schema: system; Owner: fhcomplete
 --
 
-COPY system.tbl_issue (issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz, datum, verarbeitetvon, verarbeitetamum, status_kurzbz, insertvon, insertamum, updatevon, updateamum) FROM stdin;
+COPY system.tbl_issue (issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz, datum, verarbeitetvon, verarbeitetamum, status_kurzbz, insertvon, insertamum, updatevon, updateamum, behebung_parameter) FROM stdin;
 \.
 
 
@@ -38521,6 +38954,7 @@ COPY system.tbl_phrase (phrase_id, app, phrase, insertamum, insertvon, category)
 621	core	Laedt	2021-11-11 12:39:58.772826	system	eucovidqr
 622	core	3G	2021-11-11 12:39:58.782679	system	eucovidqr
 623	core	FehlerBeimSpeichernDesGueltigkeitsdatums	2021-11-11 12:39:58.793249	system	eucovidqr
+723	core	lektorbereitsverplant	2026-03-31 14:08:34.173785	system	lehre
 624	core	PersondatenInFH-CompleteStimmenNichtMitDemZertifikatUeberein	2021-11-11 12:39:58.802993	system	eucovidqr
 625	core	UploadSuccessful	2021-11-11 12:39:58.812686	system	eucovidqr
 626	core	UploadFailed	2021-11-11 12:39:58.832062	system	eucovidqr
@@ -38564,6 +38998,1769 @@ COPY system.tbl_phrase (phrase_id, app, phrase, insertamum, insertvon, category)
 664	core	bitteFehlerWaehlen	2021-11-11 12:39:59.248734	system	fehlermonitoring
 665	core	statusAendernFehler	2021-11-11 12:39:59.261363	system	fehlermonitoring
 666	core	statusAendernUnbekannterFehler	2021-11-11 12:39:59.272519	system	fehlermonitoring
+667	core	raum	2026-03-31 14:08:33.779482	system	global
+668	core	feiertag	2026-03-31 14:08:33.784123	system	global
+669	core	collapseMenu	2026-03-31 14:08:33.792346	system	global
+670	core	extendMenu	2026-03-31 14:08:33.796688	system	global
+671	core	insertvon	2026-03-31 14:08:33.861474	system	global
+672	core	insertamum	2026-03-31 14:08:33.865537	system	global
+673	core	updatevon	2026-03-31 14:08:33.869702	system	global
+674	core	updateamum	2026-03-31 14:08:33.873769	system	global
+675	core	speichern	2026-03-31 14:08:33.877825	system	global
+676	core	create	2026-03-31 14:08:33.881798	system	global
+677	core	loeschen	2026-03-31 14:08:33.885909	system	global
+678	core	actions	2026-03-31 14:08:33.89006	system	global
+679	core	unknown_error	2026-03-31 14:08:33.894283	system	global
+680	core	filesizeExceeded	2026-03-31 14:08:33.899683	system	global
+681	core	loading	2026-03-31 14:08:33.903968	system	ui
+682	core	n_errors	2026-03-31 14:08:33.908092	system	ui
+683	core	toggle_nav	2026-03-31 14:08:33.912097	system	ui
+684	core	change	2026-03-31 14:08:33.91761	system	ui
+685	core	logout	2026-03-31 14:08:33.937947	system	ui
+686	core	settings	2026-03-31 14:08:33.942012	system	ui
+687	core	settings_saved	2026-03-31 14:08:33.945988	system	ui
+688	core	geloescht	2026-03-31 14:08:33.960675	system	ui
+689	core	error_fieldWriteAccess	2026-03-31 14:08:33.964701	system	ui
+690	core	error_fieldMustBeArray	2026-03-31 14:08:33.968726	system	ui
+691	core	filterdelete	2026-03-31 14:08:33.972736	system	ui
+692	core	filter	2026-03-31 14:08:33.978123	system	filter
+693	core	filterDelete	2026-03-31 14:08:33.988791	system	filter
+694	core	filterActive	2026-03-31 14:08:33.992808	system	filter
+695	core	person_id	2026-03-31 14:08:33.996862	system	person
+696	core	email_private	2026-03-31 14:08:34.023455	system	person
+697	core	email_intern	2026-03-31 14:08:34.027482	system	person
+698	core	adressen	2026-03-31 14:08:34.034198	system	person
+699	core	bankverbindungen	2026-03-31 14:08:34.038242	system	person
+700	core	rechnungsadresse	2026-03-31 14:08:34.042257	system	person
+701	core	heimatadresse	2026-03-31 14:08:34.046335	system	person
+702	core	co_name	2026-03-31 14:08:34.050392	system	person
+703	core	gemeinde	2026-03-31 14:08:34.05441	system	person
+704	core	gemeinde_waehlen	2026-03-31 14:08:34.05846	system	person
+705	core	plz_waehlen	2026-03-31 14:08:34.062448	system	person
+706	core	plz	2026-03-31 14:08:34.070448	system	person
+707	core	zustellung	2026-03-31 14:08:34.074482	system	person
+708	core	error_uidNotInPerson	2026-03-31 14:08:34.083777	system	person
+709	core	unruly	2026-03-31 14:08:34.087744	system	person
+710	core	error_noBenutzer	2026-03-31 14:08:34.091691	system	person
+711	core	lvOptions	2026-03-31 14:08:34.095675	system	lehre
+712	core	noGrades	2026-03-31 14:08:34.099626	system	lehre
+713	core	cancelvertrag	2026-03-31 14:08:34.105003	system	lehre
+714	core	vertragConfirm	2026-03-31 14:08:34.109091	system	lehre
+715	core	orgform	2026-03-31 14:08:34.11593	system	lehre
+716	core	grp	2026-03-31 14:08:34.122866	system	lehre
+717	core	weitereLektoren	2026-03-31 14:08:34.126901	system	lehre
+718	core	lehrveranstaltung_id	2026-03-31 14:08:34.147027	system	lehre
+719	core	sem	2026-03-31 14:08:34.15501	system	lehre
+720	core	bereitzugeteilt	2026-03-31 14:08:34.161541	system	lehre
+721	core	grpbereitszugeteilt	2026-03-31 14:08:34.165623	system	lehre
+722	core	grpbereitsverplant	2026-03-31 14:08:34.169726	system	lehre
+724	core	keinvertrag	2026-03-31 14:08:34.177766	system	lehre
+736	core	studiengangskennzahlLehre	2026-03-31 14:08:34.208651	system	lehre
+737	core	studiengang_kz	2026-03-31 14:08:34.212695	system	lehre
+738	core	verb	2026-03-31 14:08:34.216698	system	lehre
+739	core	dual_short	2026-03-31 14:08:34.220662	system	lehre
+740	infocenter	rueckstelldatum	2026-03-31 14:08:34.290987	system	infocenter
+741	infocenter	rueckstellgrund	2026-03-31 14:08:34.294973	system	infocenter
+742	infocenter	kaution	2026-03-31 14:08:34.320592	system	infocenter
+743	infocenter	rechnungsnummer	2026-03-31 14:08:34.324475	system	infocenter
+744	infocenter	date	2026-03-31 14:08:34.328238	system	infocenter
+745	infocenter	faelligam	2026-03-31 14:08:34.332069	system	infocenter
+746	infocenter	gesamtbetrag	2026-03-31 14:08:34.335967	system	infocenter
+747	infocenter	rechnungsempfaenger	2026-03-31 14:08:34.33968	system	infocenter
+748	infocenter	rechnung	2026-03-31 14:08:34.343333	system	infocenter
+749	infocenter	studiensemester	2026-03-31 14:08:34.346928	system	infocenter
+750	infocenter	bezeichnung	2026-03-31 14:08:34.350663	system	infocenter
+751	infocenter	datum	2026-03-31 14:08:34.354495	system	infocenter
+752	infocenter	zahlungsbestaetigung	2026-03-31 14:08:34.35838	system	infocenter
+753	infocenter	erklaerungInvoices	2026-03-31 14:08:34.362081	system	bewerbung
+754	infocenter	rechnungserklaerung	2026-03-31 14:08:34.365868	system	infocenter
+755	infocenter	kontoinfotitle	2026-03-31 14:08:34.369869	system	infocenter
+756	infocenter	kontoinfobody	2026-03-31 14:08:34.373809	system	infocenter
+757	infocenter	kontoinfoausland	2026-03-31 14:08:34.377805	system	infocenter
+758	infocenter	rechnungtitle	2026-03-31 14:08:34.381748	system	infocenter
+759	infocenter	faq0frage	2026-03-31 14:08:34.385757	system	infocenter
+760	infocenter	faq0antwort	2026-03-31 14:08:34.389759	system	infocenter
+761	infocenter	faq1frage	2026-03-31 14:08:34.393776	system	infocenter
+762	infocenter	faq1antwort	2026-03-31 14:08:34.39776	system	infocenter
+763	infocenter	faq2frage	2026-03-31 14:08:34.401769	system	infocenter
+764	infocenter	faq2antwort	2026-03-31 14:08:34.405731	system	infocenter
+765	infocenter	faq3frage	2026-03-31 14:08:34.409759	system	infocenter
+766	infocenter	faq3antwort	2026-03-31 14:08:34.413722	system	infocenter
+767	infocenter	faq4frage	2026-03-31 14:08:34.417589	system	infocenter
+768	infocenter	faq4antwort	2026-03-31 14:08:34.421434	system	infocenter
+769	infocenter	faq5frage	2026-03-31 14:08:34.425168	system	infocenter
+770	infocenter	faq5antwort	2026-03-31 14:08:34.429039	system	infocenter
+771	infocenter	faq6frage	2026-03-31 14:08:34.433019	system	infocenter
+772	infocenter	faq6antwort	2026-03-31 14:08:34.436965	system	infocenter
+773	infocenter	faq7frage	2026-03-31 14:08:34.440864	system	infocenter
+774	infocenter	faq7antwort	2026-03-31 14:08:34.444871	system	infocenter
+775	infocenter	zahlungsempfaenger	2026-03-31 14:08:34.448808	system	infocenter
+776	infocenter	unrulyPersonFound	2026-03-31 14:08:34.452743	system	infocenter
+777	core	status_bestaetigung	2026-03-31 14:08:34.490589	system	global
+778	core	neuUndGeaenderteAnzeigen	2026-03-31 14:08:34.526699	system	ui
+779	core	error_invalid_date	2026-03-31 14:08:34.569848	system	ui
+780	core	all_semester	2026-03-31 14:08:34.725989	system	ui
+781	core	current_semester	2026-03-31 14:08:34.73014	system	ui
+782	projektarbeitsbeurteilung	titelDerArbeit	2026-03-31 14:08:34.762449	system	projektarbeitsbeurteilung
+783	projektarbeitsbeurteilung	plagiatscheckBeschreibung	2026-03-31 14:08:34.766559	system	projektarbeitsbeurteilung
+784	projektarbeitsbeurteilung	plagiatscheckBeschreibungMaster	2026-03-31 14:08:34.770558	system	projektarbeitsbeurteilung
+785	projektarbeitsbeurteilung	methodeTextMaster	2026-03-31 14:08:34.785762	system	projektarbeitsbeurteilung
+786	projektarbeitsbeurteilung	eigenstaendigkeitTextMaster	2026-03-31 14:08:34.795446	system	projektarbeitsbeurteilung
+787	projektarbeitsbeurteilung	strukturTextMaster	2026-03-31 14:08:34.802382	system	projektarbeitsbeurteilung
+788	projektarbeitsbeurteilung	literaturTextMaster	2026-03-31 14:08:34.814197	system	projektarbeitsbeurteilung
+789	projektarbeitsbeurteilung	notenschluesselHinweisNullPunkteEinKriterium	2026-03-31 14:08:34.832368	system	projektarbeitsbeurteilung
+790	projektarbeitsbeurteilung	begutachter	2026-03-31 14:08:34.837937	system	projektarbeitsbeurteilung
+791	projektarbeitsbeurteilung	projektarbeitsbeurteilungUebersicht	2026-03-31 14:08:34.867393	system	projektarbeitsbeurteilung
+792	projektarbeitsbeurteilung	abgabedatum	2026-03-31 14:08:34.871602	system	projektarbeitsbeurteilung
+793	projektarbeitsbeurteilung	freischaltung	2026-03-31 14:08:34.875613	system	projektarbeitsbeurteilung
+794	projektarbeitsbeurteilung	resendToken	2026-03-31 14:08:34.879585	system	projektarbeitsbeurteilung
+795	projektarbeitsbeurteilung	freischalten	2026-03-31 14:08:34.88352	system	projektarbeitsbeurteilung
+796	projektarbeitsbeurteilung	kommissionellePruefungHinweis	2026-03-31 14:08:34.887584	system	projektarbeitsbeurteilung
+797	projektarbeitsbeurteilung	kommissionMailSenden	2026-03-31 14:08:34.891686	system	projektarbeitsbeurteilung
+798	projektarbeitsbeurteilung	kommissionMailGesendet	2026-03-31 14:08:34.895817	system	projektarbeitsbeurteilung
+799	projektarbeitsbeurteilung	kommissionMailFehler	2026-03-31 14:08:34.899806	system	projektarbeitsbeurteilung
+800	projektarbeitsbeurteilung	zweitbetreuerBewertungFehlt	2026-03-31 14:08:34.903842	system	projektarbeitsbeurteilung
+801	projektarbeitsbeurteilung	nichtErfuellt	2026-03-31 14:08:34.907899	system	projektarbeitsbeurteilung
+802	projektarbeitsbeurteilung	mindestanforderungErfuellt	2026-03-31 14:08:34.911886	system	projektarbeitsbeurteilung
+803	projektarbeitsbeurteilung	inWeitenTeilenErfuellt	2026-03-31 14:08:34.91579	system	projektarbeitsbeurteilung
+804	projektarbeitsbeurteilung	vollstaendigErfuellt	2026-03-31 14:08:34.919685	system	projektarbeitsbeurteilung
+805	projektarbeitsbeurteilung	kommissionsmitglieder	2026-03-31 14:08:34.923532	system	projektarbeitsbeurteilung
+806	projektarbeitsbeurteilung	plagiatscheckNichtGesetzt	2026-03-31 14:08:34.927443	system	projektarbeitsbeurteilung
+807	projektarbeitsbeurteilung	titelBearbeiten	2026-03-31 14:08:34.931231	system	projektarbeitsbeurteilung
+808	projektarbeitsbeurteilung	titelGespeichert	2026-03-31 14:08:34.935055	system	projektarbeitsbeurteilung
+809	projektarbeitsbeurteilung	titelSpeichernFehler	2026-03-31 14:08:34.939021	system	projektarbeitsbeurteilung
+810	projektarbeitsbeurteilung	plagiatscheckHinweisNegativeBeurteilung	2026-03-31 14:08:34.943039	system	projektarbeitsbeurteilung
+811	projektarbeitsbeurteilung	plagiatscheck	2026-03-31 14:08:34.947059	system	projektarbeitsbeurteilung
+812	projektarbeitsbeurteilung	betreuernote	2026-03-31 14:08:34.951145	system	projektarbeitsbeurteilung
+813	projektarbeitsbeurteilung	senatsvorsitz	2026-03-31 14:08:34.955229	system	projektarbeitsbeurteilung
+814	projektarbeitsbeurteilung	parbeitDownload	2026-03-31 14:08:34.959223	system	projektarbeitsbeurteilung
+815	projektarbeitsbeurteilung	betreuerart	2026-03-31 14:08:34.963187	system	projektarbeitsbeurteilung
+816	projektarbeitsbeurteilung	nebenBegutachter	2026-03-31 14:08:34.967288	system	projektarbeitsbeurteilung
+817	projektarbeitsbeurteilung	notenschluesselHinweisGewichtung	2026-03-31 14:08:34.971207	system	projektarbeitsbeurteilung
+818	projektarbeitsbeurteilung	gewichtet	2026-03-31 14:08:34.975115	system	projektarbeitsbeurteilung
+819	projektarbeitsbeurteilung	sprache	2026-03-31 14:08:34.97917	system	projektarbeitsbeurteilung
+820	projektarbeitsbeurteilung	spracheAendernFehler	2026-03-31 14:08:34.983225	system	projektarbeitsbeurteilung
+821	core	anrechnung	2026-03-31 14:08:34.989825	system	anrechnung
+822	core	antragStellenWegenHochschulzeugnis	2026-03-31 14:08:35.003237	system	anrechnung
+823	core	bisherAngerechneteEcts	2026-03-31 14:08:35.008915	system	anrechnung
+824	core	anrechnungEctsTooltipText	2026-03-31 14:08:35.012935	system	anrechnung
+825	core	anrechnungEctsTooltipTextBeiUeberschreitung	2026-03-31 14:08:35.017007	system	anrechnung
+826	core	anrechnungEctsTextBeiUeberschreitung	2026-03-31 14:08:35.021281	system	anrechnung
+827	core	textUebernehmenOderEigenenBegruendungstext	2026-03-31 14:08:35.025446	system	anrechnung
+828	core	begruendungEcts	2026-03-31 14:08:35.02951	system	anrechnung
+829	core	begruendungLvinhalt	2026-03-31 14:08:35.033387	system	anrechnung
+830	core	anrechnungBegruendungEctsTooltipText	2026-03-31 14:08:35.037319	system	anrechnung
+831	core	anrechnungBegruendungLvinhaltTooltipText	2026-03-31 14:08:35.041245	system	anrechnung
+832	core	requestAnrechnungInfoEctsBerechnungTitle	2026-03-31 14:08:35.045211	system	anrechnung
+833	core	requestAnrechnungInfoEctsBerechnungBody	2026-03-31 14:08:35.049292	system	anrechnung
+834	core	begruendungEctsLabel	2026-03-31 14:08:35.053128	system	anrechnung
+835	core	begruendungLvinhaltLabel	2026-03-31 14:08:35.056816	system	anrechnung
+836	core	empfehlungNegativKenntnisseNichtGleichwertigWeil	2026-03-31 14:08:35.102686	system	anrechnung
+837	core	empfehlungNegativKenntnisseNichtGleichwertigWeilHinweis	2026-03-31 14:08:35.106639	system	anrechnung
+838	core	genehmigungNegativKenntnisseNichtGleichwertigWeil	2026-03-31 14:08:35.110491	system	anrechnung
+839	core	genehmigungNegativKenntnisseNichtGleichwertigWeilHinweis	2026-03-31 14:08:35.114208	system	anrechnung
+840	core	bitteBegruendungVervollstaendigen	2026-03-31 14:08:35.122146	system	ui
+841	core	genehmigungNegativEctsHoechstgrenzeUeberschritten	2026-03-31 14:08:35.14491	system	anrechnung
+842	core	anrechnungenVerwalten	2026-03-31 14:08:35.162694	system	anrechnung
+843	core	anrechnungszeitraumFestlegen	2026-03-31 14:08:35.166761	system	anrechnung
+844	core	anrechnungszeitraumHinzufuegen	2026-03-31 14:08:35.170758	system	anrechnung
+845	core	anrechnungszeitraumSpeichern	2026-03-31 14:08:35.174649	system	anrechnung
+846	core	anrechnungszeitraumStart	2026-03-31 14:08:35.178408	system	anrechnung
+847	core	anrechnungszeitraumEnde	2026-03-31 14:08:35.182217	system	anrechnung
+848	core	errorStartdatumNichtInStudiensemester	2026-03-31 14:08:35.185991	system	ui
+849	core	errorEndedatumNichtInStudiensemester	2026-03-31 14:08:35.189831	system	ui
+850	core	errorStartdatumNachEndedatum	2026-03-31 14:08:35.193585	system	ui
+851	core	frageSicherLoeschen	2026-03-31 14:08:35.197411	system	ui
+852	core	antragNichtFuerVerganganeSS	2026-03-31 14:08:35.257163	system	anrechnung
+853	core	bearbeitetVon	2026-03-31 14:08:35.263527	system	ui
+854	core	bearbeitetAm	2026-03-31 14:08:35.267315	system	ui
+855	core	felderFehlen	2026-03-31 14:08:35.276127	system	ui
+856	core	errorDokumentZuGross	2026-03-31 14:08:35.281226	system	ui
+857	core	errorUploadFehltOderZuGross	2026-03-31 14:08:35.285168	system	ui
+858	core	fehlendeMinZeichen	2026-03-31 14:08:35.293932	system	ui
+859	core	maxtagebeschreibung	2026-03-31 14:08:35.327669	system	eucovidqr
+860	core	schliessen	2026-03-31 14:08:35.345534	system	ui
+861	core	fehlerZustaendigkeiten	2026-03-31 14:08:35.386015	system	fehlermonitoring
+862	core	zustaendigerMitarbeiter	2026-03-31 14:08:35.390291	system	fehlermonitoring
+863	core	oder	2026-03-31 14:08:35.394228	system	fehlermonitoring
+864	core	organisationseinheit	2026-03-31 14:08:35.397973	system	fehlermonitoring
+865	core	funktion	2026-03-31 14:08:35.401673	system	fehlermonitoring
+866	core	zustaendigkeitZuweisen	2026-03-31 14:08:35.40546	system	fehlermonitoring
+867	core	fehlerkurzbz	2026-03-31 14:08:35.409213	system	fehlermonitoring
+868	core	fehlertext	2026-03-31 14:08:35.412895	system	fehlermonitoring
+869	core	oeKurzbz	2026-03-31 14:08:35.416613	system	fehlermonitoring
+870	core	oeBezeichnung	2026-03-31 14:08:35.420377	system	fehlermonitoring
+871	core	funktionKurzbz	2026-03-31 14:08:35.424257	system	fehlermonitoring
+872	core	funktionBeschreibung	2026-03-31 14:08:35.428124	system	fehlermonitoring
+873	core	fehlercodeFehlt	2026-03-31 14:08:35.43222	system	fehlermonitoring
+874	core	mitarbeiterUndOeFehlt	2026-03-31 14:08:35.436157	system	fehlermonitoring
+875	core	nurOeOderMitarbeiterSetzen	2026-03-31 14:08:35.440172	system	fehlermonitoring
+876	core	ungueltigeMitarbeiterId	2026-03-31 14:08:35.444089	system	fehlermonitoring
+877	core	zustaendigkeitExistiert	2026-03-31 14:08:35.448002	system	fehlermonitoring
+878	core	ungueltigeZustaendigkeitenId	2026-03-31 14:08:35.451958	system	fehlermonitoring
+879	core	zustaendigkeitGespeichert	2026-03-31 14:08:35.455958	system	fehlermonitoring
+880	core	zustaendigkeitGespeichertFehler	2026-03-31 14:08:35.46016	system	fehlermonitoring
+881	core	zustaendigkeitGeloescht	2026-03-31 14:08:35.464503	system	fehlermonitoring
+882	core	zustaendigkeitGeloeschtFehler	2026-03-31 14:08:35.468347	system	fehlermonitoring
+883	core	keineAuswahl	2026-03-31 14:08:35.472021	system	fehlermonitoring
+884	core	zustaendigePersonen	2026-03-31 14:08:35.4759	system	fehlermonitoring
+885	core	zustaendigeOrganisationseinheiten	2026-03-31 14:08:35.479703	system	fehlermonitoring
+886	core	zugehoerigkeit	2026-03-31 14:08:35.483536	system	fehlermonitoring
+887	core	nurLeseberechtigung	2026-03-31 14:08:35.487317	system	ui
+888	core	op.label.type	2026-03-31 14:08:35.491075	system	kvp
+889	core	op.label.name	2026-03-31 14:08:35.494867	system	kvp
+890	core	op.label.email	2026-03-31 14:08:35.498669	system	kvp
+891	core	op.label.phone	2026-03-31 14:08:35.502492	system	kvp
+892	core	op.label.implemented	2026-03-31 14:08:35.506202	system	kvp
+893	core	op.label.items	2026-03-31 14:08:35.510205	system	kvp
+894	core	new.title	2026-03-31 14:08:35.514113	system	kvp
+895	core	new.info	2026-03-31 14:08:35.518014	system	kvp
+896	core	new.form.info	2026-03-31 14:08:35.521954	system	kvp
+897	core	new.workpackages	2026-03-31 14:08:35.525811	system	kvp
+898	core	list.empty	2026-03-31 14:08:35.529627	system	kvp
+899	core	new.form.success	2026-03-31 14:08:35.533543	system	kvp
+900	core	new.form.required	2026-03-31 14:08:35.537405	system	kvp
+901	core	new.error.required	2026-03-31 14:08:35.54128	system	kvp
+902	core	new.form.kurs_id	2026-03-31 14:08:35.545156	system	kvp
+903	core	new.form.kurs_id.label	2026-03-31 14:08:35.549004	system	kvp
+904	core	new.form.kurs_kurzbz	2026-03-31 14:08:35.55302	system	kvp
+905	core	new.form.kurs_kurzbz.label	2026-03-31 14:08:35.55691	system	kvp
+906	core	new.form.type	2026-03-31 14:08:35.560746	system	kvp
+907	core	new.form.type.label	2026-03-31 14:08:35.564629	system	kvp
+908	core	new.form.title	2026-03-31 14:08:35.568642	system	kvp
+909	core	new.form.title.label	2026-03-31 14:08:35.572626	system	kvp
+910	core	new.form.priority	2026-03-31 14:08:35.576583	system	kvp
+911	core	new.form.priority.label	2026-03-31 14:08:35.580538	system	kvp
+912	core	new.form.description	2026-03-31 14:08:35.584525	system	kvp
+913	core	new.form.description.label	2026-03-31 14:08:35.588594	system	kvp
+914	core	new.form.items	2026-03-31 14:08:35.592561	system	kvp
+915	core	new.form.items.label	2026-03-31 14:08:35.596533	system	kvp
+916	core	new.form.attachments	2026-03-31 14:08:35.600468	system	kvp
+917	core	new.form.implemented	2026-03-31 14:08:35.604496	system	kvp
+918	core	new.form.implemented.label	2026-03-31 14:08:35.608468	system	kvp
+919	core	new.form.submit	2026-03-31 14:08:35.612494	system	kvp
+920	core	new.error.nosourcecourse.title	2026-03-31 14:08:35.616452	system	kvp
+921	core	new.error.nosourcecourse.msg	2026-03-31 14:08:35.620437	system	kvp
+922	core	new.error.nostandardcourse.title	2026-03-31 14:08:35.624371	system	kvp
+923	core	new.error.nostandardcourse.msg	2026-03-31 14:08:35.628245	system	kvp
+924	core	admin.title.oes	2026-03-31 14:08:35.632233	system	kvp
+925	core	admin.title.openproject	2026-03-31 14:08:35.636299	system	kvp
+926	core	admin.title.edit	2026-03-31 14:08:35.64034	system	kvp
+927	core	admin.title.delete	2026-03-31 14:08:35.644248	system	kvp
+928	core	admin.title.source_linked	2026-03-31 14:08:35.648095	system	kvp
+929	core	admin.title.target_linked	2026-03-31 14:08:35.651964	system	kvp
+930	core	admin.text.delete	2026-03-31 14:08:35.655815	system	kvp
+931	core	admin.text.source_linked	2026-03-31 14:08:35.659771	system	kvp
+932	core	admin.text.target_linked	2026-03-31 14:08:35.663742	system	kvp
+933	core	admin.label.search	2026-03-31 14:08:35.667797	system	kvp
+934	core	admin.label.none	2026-03-31 14:08:35.671681	system	kvp
+935	core	admin.confirm.ok	2026-03-31 14:08:35.675602	system	kvp
+936	core	admin.confirm.cancel	2026-03-31 14:08:35.679428	system	kvp
+937	core	admin.search.error.none	2026-03-31 14:08:35.683323	system	kvp
+938	core	admin.label.template	2026-03-31 14:08:35.68729	system	kvp
+939	core	admin.label.oe	2026-03-31 14:08:35.691139	system	kvp
+940	core	admin.label.language	2026-03-31 14:08:35.694879	system	kvp
+941	core	admin.label.moodle	2026-03-31 14:08:35.698588	system	kvp
+942	core	admin.label.project	2026-03-31 14:08:35.702354	system	kvp
+943	core	admin.label.version	2026-03-31 14:08:35.706159	system	kvp
+944	core	error.opproject_does_not_exists	2026-03-31 14:08:35.710034	system	kvp
+945	international	studiensemesterGeplant	2026-03-31 14:08:35.7139	system	international
+946	international	internationalCredits	2026-03-31 14:08:35.717744	system	international
+947	international	studentstatus	2026-03-31 14:08:35.721582	system	international
+948	international	alledurchgefuehrten	2026-03-31 14:08:35.725434	system	international
+949	international	bestaetigungHochladen	2026-03-31 14:08:35.72928	system	international
+950	international	massnahmeLoeschen	2026-03-31 14:08:35.73307	system	international
+951	international	massnahmen	2026-03-31 14:08:35.736781	system	international
+952	international	internationalskills	2026-03-31 14:08:35.740603	system	international
+953	international	internationalbeschreibung	2026-03-31 14:08:35.745755	system	international
+954	international	nurBachelor	2026-03-31 14:08:35.749758	system	international
+955	international	bezeichnung	2026-03-31 14:08:35.75365	system	international
+956	international	bezeichnungeng	2026-03-31 14:08:35.757515	system	international
+957	international	beschreibung	2026-03-31 14:08:35.761386	system	international
+958	international	beschreibungeng	2026-03-31 14:08:35.765358	system	international
+959	international	massnahmeBearbeiten	2026-03-31 14:08:35.769246	system	international
+960	international	massnahmeLoeschenConfirm	2026-03-31 14:08:35.773126	system	international
+961	international	fileLoeschenConfirm	2026-03-31 14:08:35.77696	system	international
+962	international	planAblehnen	2026-03-31 14:08:35.780812	system	international
+963	international	entbestaetigenConfirm	2026-03-31 14:08:35.784685	system	international
+964	international	entakzeptierenConfirm	2026-03-31 14:08:35.788514	system	international
+965	international	allegeplanten	2026-03-31 14:08:35.792333	system	international
+966	international	alleGeplantenMarkieren	2026-03-31 14:08:35.796162	system	international
+967	international	alleMassnahmenJetzt	2026-03-31 14:08:35.800115	system	international
+968	international	alleStudierendeJetzt	2026-03-31 14:08:35.804005	system	international
+969	international	lastSemester	2026-03-31 14:08:35.807953	system	international
+970	international	meinMassnahmeplan	2026-03-31 14:08:35.811887	system	international
+971	international	ectsBestaetigt	2026-03-31 14:08:35.815933	system	international
+972	international	ectsMassnahme	2026-03-31 14:08:35.819944	system	international
+973	international	statusGeplant	2026-03-31 14:08:35.823886	system	international
+974	international	statusGeplantDesc	2026-03-31 14:08:35.827776	system	international
+975	international	statusAkzeptiert	2026-03-31 14:08:35.831747	system	international
+976	international	statusAkzeptiertDesc	2026-03-31 14:08:35.835664	system	international
+977	international	statusDurchgefuehrt	2026-03-31 14:08:35.839575	system	international
+978	international	statusDurchgefuehrtDesc	2026-03-31 14:08:35.843369	system	international
+979	international	statusBestaetigt	2026-03-31 14:08:35.847058	system	international
+980	international	statusBestaetigtDesc	2026-03-31 14:08:35.850836	system	international
+981	international	statusAbgelehnt	2026-03-31 14:08:35.854697	system	international
+982	international	statusAbgelehntDesc	2026-03-31 14:08:35.858725	system	international
+983	international	ampelRed	2026-03-31 14:08:35.862613	system	international
+984	international	ampelYellow	2026-03-31 14:08:35.86652	system	international
+985	international	ampelOrange	2026-03-31 14:08:35.870457	system	international
+986	international	ampelGreenyellow	2026-03-31 14:08:35.874329	system	international
+987	international	ampelGreen	2026-03-31 14:08:35.878162	system	international
+988	international	mailMeldungzuviele	2026-03-31 14:08:35.882024	system	international
+989	international	mailMeldung	2026-03-31 14:08:35.885932	system	international
+990	international	mailButton	2026-03-31 14:08:35.889849	system	international
+991	international	geplanteMassnahmen	2026-03-31 14:08:35.894099	system	international
+992	international	geplanteMassnahmenDesc	2026-03-31 14:08:35.898015	system	international
+993	international	akzpetierteMassnahmen	2026-03-31 14:08:35.901866	system	international
+994	international	mailversenden	2026-03-31 14:08:35.905794	system	international
+995	international	durchgefuehrteMassnahmen	2026-03-31 14:08:35.909699	system	international
+996	international	bestaetigteMassnahmen	2026-03-31 14:08:35.913506	system	international
+997	international	abgelehnteMassnahmen	2026-03-31 14:08:35.917379	system	international
+998	international	planAkzeptieren	2026-03-31 14:08:35.921112	system	international
+999	international	bestaetigungAkzeptieren	2026-03-31 14:08:35.924864	system	international
+1000	international	bestaetigungAblehnen	2026-03-31 14:08:35.928627	system	international
+1001	international	grund	2026-03-31 14:08:35.93246	system	international
+1002	international	anmerkungstgl	2026-03-31 14:08:35.936205	system	international
+1003	international	mehrverplant	2026-03-31 14:08:35.940066	system	international
+1004	international	stgtodo	2026-03-31 14:08:35.943893	system	international
+1005	international	wenigerverplant	2026-03-31 14:08:35.947894	system	international
+1006	international	mehrbestaetigt	2026-03-31 14:08:35.951731	system	international
+1007	international	wenigerbestaetigt	2026-03-31 14:08:35.955527	system	international
+1008	international	alleAkzeptierenPlan	2026-03-31 14:08:35.959297	system	international
+1009	international	downloadBestaetigung	2026-03-31 14:08:35.963044	system	international
+1010	international	addMassnahme	2026-03-31 14:08:35.966806	system	international
+1011	core	benutzerSchonZugewiesen	2026-03-31 14:08:35.970616	system	gruppenmanagement
+1012	core	gruppenmanagement	2026-03-31 14:08:35.974499	system	gruppenmanagement
+1013	core	kurzbezeichnung	2026-03-31 14:08:35.978337	system	gruppenmanagement
+1014	core	bezeichnung	2026-03-31 14:08:35.981967	system	gruppenmanagement
+1015	core	beschreibung	2026-03-31 14:08:35.985694	system	gruppenmanagement
+1016	core	zuweisenloeschen	2026-03-31 14:08:35.989518	system	gruppenmanagement
+1017	core	benutzergruppe	2026-03-31 14:08:35.993208	system	gruppenmanagement
+1018	core	benutzerHinzufuegen	2026-03-31 14:08:35.996859	system	gruppenmanagement
+1019	core	aktiv	2026-03-31 14:08:36.000661	system	gruppenmanagement
+1020	infocenter	stammdatenFeldFehlt	2026-03-31 14:08:36.004393	system	infocenter
+1021	infocenter	statusSetzen	2026-03-31 14:08:36.008192	system	infocenter
+1022	infocenter	abgewiesenam	2026-03-31 14:08:36.011999	system	infocenter
+1023	infocenter	statusAuswahl	2026-03-31 14:08:36.015809	system	infocenter
+1024	infocenter	statusZuruecksetzen	2026-03-31 14:08:36.019795	system	infocenter
+1025	core	fehlerFehlerKonfigurationLaden	2026-03-31 14:08:36.02372	system	fehlermonitoring
+1026	core	fehlerFehlerLaden	2026-03-31 14:08:36.02755	system	fehlermonitoring
+1027	core	ungueltigerKonfigurationstyp	2026-03-31 14:08:36.031451	system	fehlermonitoring
+1028	core	ungueltigerKonfigurationswert	2026-03-31 14:08:36.03529	system	fehlermonitoring
+1029	core	fehlerKonfiguration	2026-03-31 14:08:36.039144	system	fehlermonitoring
+1030	core	konfigurationstyp	2026-03-31 14:08:36.043026	system	fehlermonitoring
+1031	core	konfigurationswert	2026-03-31 14:08:36.046908	system	fehlermonitoring
+1032	core	konfigurationswertPlatzhalter	2026-03-31 14:08:36.05073	system	fehlermonitoring
+1033	core	konfigurationswertZuweisen	2026-03-31 14:08:36.054538	system	fehlermonitoring
+1034	core	konfigurationsbeschreibung	2026-03-31 14:08:36.058364	system	fehlermonitoring
+1035	core	konfigurationsdatentyp	2026-03-31 14:08:36.062295	system	fehlermonitoring
+1036	core	konfigurationGespeichert	2026-03-31 14:08:36.066221	system	fehlermonitoring
+1037	core	konfigurationGespeichertFehler	2026-03-31 14:08:36.07009	system	fehlermonitoring
+1038	core	konfigurationGeloescht	2026-03-31 14:08:36.073929	system	fehlermonitoring
+1039	core	konfigurationGeloeschtFehler	2026-03-31 14:08:36.077815	system	fehlermonitoring
+1040	core	konfigurationswertLoeschen	2026-03-31 14:08:36.081703	system	fehlermonitoring
+1041	core	angabeFehlt	2026-03-31 14:08:36.085407	system	uhstat
+1042	core	lehrveranstaltungsinformationen	2026-03-31 14:08:36.089074	system	lvinfo
+1043	core	Moodleinformationen	2026-03-31 14:08:36.09283	system	lvinfo
+1044	core	actionname	2026-03-31 14:08:36.096782	system	lvinfo
+1045	core	overdue	2026-03-31 14:08:36.100712	system	lvinfo
+1046	core	overdueEvent	2026-03-31 14:08:36.104696	system	lvinfo
+1047	core	moodleLink	2026-03-31 14:08:36.108673	system	lvinfo
+1048	core	raum_kurzbz	2026-03-31 14:08:36.112607	system	rauminfo
+1049	core	rauminfo	2026-03-31 14:08:36.116669	system	rauminfo
+1050	core	roomSearch	2026-03-31 14:08:36.120676	system	rauminfo
+1051	core	minCapacity	2026-03-31 14:08:36.124896	system	rauminfo
+1052	core	roomReservations	2026-03-31 14:08:36.128819	system	rauminfo
+1053	core	personcap	2026-03-31 14:08:36.132756	system	rauminfo
+1054	core	raumnummer	2026-03-31 14:08:36.136655	system	rauminfo
+1055	core	keineRaumReservierung	2026-03-31 14:08:36.140527	system	rauminfo
+1056	core	keinLektorZugeordnet	2026-03-31 14:08:36.144423	system	lehre
+1057	core	incomingplaetze	2026-03-31 14:08:36.148517	system	lehre
+1058	core	lehrbeauftragter	2026-03-31 14:08:36.152443	system	lehre
+1059	core	lvleitung	2026-03-31 14:08:36.156414	system	lehre
+1060	core	noLvFound	2026-03-31 14:08:36.16032	system	lehre
+1061	core	leitung	2026-03-31 14:08:36.164215	system	global
+1062	core	koordination	2026-03-31 14:08:36.168228	system	global
+1063	core	sprache	2026-03-31 14:08:36.172132	system	global
+1064	core	englisch	2026-03-31 14:08:36.176017	system	global
+1065	core	deutsch	2026-03-31 14:08:36.179947	system	global
+1066	core	verfuegbareSprachen	2026-03-31 14:08:36.183919	system	global
+1067	core	dokumente	2026-03-31 14:08:36.187793	system	tools
+1068	core	dokument	2026-03-31 14:08:36.191786	system	tools
+1069	core	erstelldatum	2026-03-31 14:08:36.195718	system	tools
+1070	core	bestaetigungenZeugnisse	2026-03-31 14:08:36.19957	system	tools
+1071	core	inskriptionsbestaetigung	2026-03-31 14:08:36.203705	system	tools
+1072	core	studienbeitragFuerSSBezahlt	2026-03-31 14:08:36.207721	system	tools
+1073	core	studienbeitragFuerSSNochNichtBezahlt	2026-03-31 14:08:36.21168	system	tools
+1074	core	studienbeitragFuerStgNochNichtBezahlt	2026-03-31 14:08:36.215636	system	tools
+1075	core	studienbeitragNochNichtBezahlt	2026-03-31 14:08:36.21953	system	tools
+1076	core	studienerfolgsbestaetigung	2026-03-31 14:08:36.22354	system	tools
+1077	core	studiensemesterAuswaehlen	2026-03-31 14:08:36.227535	system	tools
+1078	core	vorlageWohnsitzfinanzamt	2026-03-31 14:08:36.231515	system	tools
+1079	core	studienbuchblatt	2026-03-31 14:08:36.235476	system	tools
+1080	core	alleStudiensemester	2026-03-31 14:08:36.2394	system	tools
+1081	core	abschlussdokumente	2026-03-31 14:08:36.243681	system	tools
+1082	core	nochKeineAbschlussdokumenteVorhanden	2026-03-31 14:08:36.247699	system	tools
+1083	core	keinStatusImStudiensemester	2026-03-31 14:08:36.251661	system	tools
+1084	core	warnungDruckDigitaleSignatur	2026-03-31 14:08:36.255707	system	tools
+1085	core	ausbildungBildungsstaatUebereinstimmung	2026-03-31 14:08:36.259647	system	uhstat
+1086	core	erfolgreichGespeichert	2026-03-31 14:08:36.263565	system	uhstat
+1087	core	fehlerBeimSpeichern	2026-03-31 14:08:36.26751	system	uhstat
+1088	core	uhstat1AnmeldungUeberschrift	2026-03-31 14:08:36.271479	system	uhstat
+1089	core	rechtsbelehrung	2026-03-31 14:08:36.275506	system	uhstat
+1090	core	uhstat1AnmeldungEinleitungstext	2026-03-31 14:08:36.279505	system	uhstat
+1091	core	uhstat1EinleitungSvnrtext	2026-03-31 14:08:36.28348	system	uhstat
+1092	core	angabenErziehungsberechtigte	2026-03-31 14:08:36.287438	system	uhstat
+1093	core	angabenErziehungsberechtigteEinleitungstext	2026-03-31 14:08:36.291422	system	uhstat
+1094	core	bitteAuswaehlen	2026-03-31 14:08:36.295403	system	uhstat
+1095	core	erziehungsberechtigtePersonEins	2026-03-31 14:08:36.299354	system	uhstat
+1096	core	geburtsjahr	2026-03-31 14:08:36.303319	system	uhstat
+1097	core	geburtsstaat	2026-03-31 14:08:36.307313	system	uhstat
+1098	core	inDenHeutigenGrenzen	2026-03-31 14:08:36.311227	system	uhstat
+1099	core	hoechsterAbschlussStaat	2026-03-31 14:08:36.315159	system	uhstat
+1100	core	hoechsterAbschluss	2026-03-31 14:08:36.319109	system	uhstat
+1101	core	wennAbschlussInOesterreich	2026-03-31 14:08:36.323113	system	uhstat
+1102	core	wennAbschlussNichtInOesterreich	2026-03-31 14:08:36.327047	system	uhstat
+1103	core	erziehungsberechtigtePersonZwei	2026-03-31 14:08:36.330977	system	uhstat
+1104	core	pruefenUndSpeichern	2026-03-31 14:08:36.334913	system	uhstat
+1105	core	datenLoeschen	2026-03-31 14:08:36.338758	system	uhstat
+1106	core	erfolgreichGeloescht	2026-03-31 14:08:36.342606	system	uhstat
+1107	core	infotext_Wiederholung_0	2026-03-31 14:08:36.347814	system	studierendenantrag
+1108	core	infotext_Wiederholung_1	2026-03-31 14:08:36.351693	system	studierendenantrag
+1109	core	infotext_Wiederholung_2	2026-03-31 14:08:36.355588	system	studierendenantrag
+1110	core	infotext_Wiederholung_3	2026-03-31 14:08:36.359508	system	studierendenantrag
+1111	core	infotext_Wiederholung_4	2026-03-31 14:08:36.363507	system	studierendenantrag
+1112	core	antrag_Wiederholung_pruefung	2026-03-31 14:08:36.367404	system	studierendenantrag
+1113	core	antrag_Wiederholung_pruefung_date	2026-03-31 14:08:36.371189	system	studierendenantrag
+1114	core	antrag_Wiederholung_button_yes	2026-03-31 14:08:36.375048	system	studierendenantrag
+1115	core	antrag_Wiederholung_button_no	2026-03-31 14:08:36.378917	system	studierendenantrag
+1116	core	antrag_header	2026-03-31 14:08:36.382721	system	studierendenantrag
+1117	core	btn_new	2026-03-31 14:08:36.386565	system	studierendenantrag
+1118	core	cancel	2026-03-31 14:08:36.390784	system	ui
+1119	core	ok	2026-03-31 14:08:36.394676	system	ui
+1120	core	suche	2026-03-31 14:08:36.39877	system	ui
+1121	core	btn_create	2026-03-31 14:08:36.40268	system	studierendenantrag
+1122	core	btn_create_Abmeldung	2026-03-31 14:08:36.406588	system	studierendenantrag
+1123	core	btn_create_Unterbrechung	2026-03-31 14:08:36.410556	system	studierendenantrag
+1124	core	btn_cancel	2026-03-31 14:08:36.414502	system	studierendenantrag
+1125	core	filter_all	2026-03-31 14:08:36.418482	system	studierendenantrag
+1126	core	filter_todo	2026-03-31 14:08:36.422395	system	studierendenantrag
+1127	core	warning_Abmeldung	2026-03-31 14:08:36.426321	system	studierendenantrag
+1128	core	warning_AbmeldungStgl	2026-03-31 14:08:36.430291	system	studierendenantrag
+1129	core	title_Abmeldung	2026-03-31 14:08:36.434186	system	studierendenantrag
+1130	core	title_AbmeldungStgl	2026-03-31 14:08:36.438124	system	studierendenantrag
+1131	core	title_Unterbrechung	2026-03-31 14:08:36.441968	system	studierendenantrag
+1132	core	title_Wiederholung	2026-03-31 14:08:36.445769	system	studierendenantrag
+1133	core	title_new_Abmeldung	2026-03-31 14:08:36.449635	system	studierendenantrag
+1134	core	antrag_typ	2026-03-31 14:08:36.453454	system	studierendenantrag
+1135	core	antrag_status	2026-03-31 14:08:36.457178	system	studierendenantrag
+1136	core	antrag_studiensemester	2026-03-31 14:08:36.460974	system	studierendenantrag
+1137	core	antrag_erstelldatum	2026-03-31 14:08:36.465007	system	studierendenantrag
+1138	core	studierendenantraege	2026-03-31 14:08:36.468926	system	studierendenantrag
+1139	core	antrag_datum_wiedereinstieg	2026-03-31 14:08:36.472864	system	studierendenantrag
+1140	core	antrag_grund	2026-03-31 14:08:36.476927	system	studierendenantrag
+1141	core	antrag_unruly	2026-03-31 14:08:36.480892	system	studierendenantrag
+1142	core	antrag_unruly_updated	2026-03-31 14:08:36.484657	system	studierendenantrag
+1143	core	antrag_dateianhaenge	2026-03-31 14:08:36.488353	system	studierendenantrag
+1144	core	antrag_anhang	2026-03-31 14:08:36.49214	system	studierendenantrag
+1145	core	antrag_typ_Abmeldung	2026-03-31 14:08:36.496017	system	studierendenantrag
+1146	core	antrag_typ_AbmeldungStgl	2026-03-31 14:08:36.499974	system	studierendenantrag
+1147	core	antrag_typ_Unterbrechung	2026-03-31 14:08:36.503933	system	studierendenantrag
+1148	core	antrag_typ_Wiederholung	2026-03-31 14:08:36.507865	system	studierendenantrag
+1149	core	btn_show_lvs	2026-03-31 14:08:36.511761	system	studierendenantrag
+1150	core	btn_edit	2026-03-31 14:08:36.515572	system	studierendenantrag
+1151	core	btn_reopen	2026-03-31 14:08:36.519517	system	studierendenantrag
+1152	core	btn_pause	2026-03-31 14:08:36.52351	system	studierendenantrag
+1153	core	btn_unpause	2026-03-31 14:08:36.527457	system	studierendenantrag
+1154	core	btn_object	2026-03-31 14:08:36.531322	system	studierendenantrag
+1155	core	btn_objection_deny	2026-03-31 14:08:36.535276	system	studierendenantrag
+1156	core	btn_objection_approve	2026-03-31 14:08:36.539242	system	studierendenantrag
+1157	core	btn_lvzuweisen	2026-03-31 14:08:36.543151	system	studierendenantrag
+1158	core	btn_approve	2026-03-31 14:08:36.547017	system	studierendenantrag
+1159	core	btn_reject	2026-03-31 14:08:36.550972	system	studierendenantrag
+1160	core	skip	2026-03-31 14:08:36.554903	system	ui
+1161	core	select_studiensemester	2026-03-31 14:08:36.558835	system	ui
+1162	core	keineBerechtigung	2026-03-31 14:08:36.562784	system	ui
+1163	core	btn_save_lvs	2026-03-31 14:08:36.566721	system	studierendenantrag
+1164	core	btn_download_antrag	2026-03-31 14:08:36.570636	system	studierendenantrag
+1165	core	download	2026-03-31 14:08:36.57457	system	table
+1166	core	reload	2026-03-31 14:08:36.578553	system	table
+1167	core	error_no_student	2026-03-31 14:08:36.582522	system	studierendenantrag
+1168	core	error_no_student_for_prestudent	2026-03-31 14:08:36.586488	system	studierendenantrag
+1169	core	error_no_student_no_failed_exam	2026-03-31 14:08:36.590565	system	studierendenantrag
+1170	core	no_attachments	2026-03-31 14:08:36.594518	system	studierendenantrag
+1171	core	prestudent	2026-03-31 14:08:36.598484	system	lehre
+1172	core	studienjahr	2026-03-31 14:08:36.602428	system	lehre
+1173	core	title_lvzuweisen	2026-03-31 14:08:36.606196	system	studierendenantrag
+1174	core	title_lv_nicht_zugelassen	2026-03-31 14:08:36.610135	system	studierendenantrag
+1175	core	title_lv_wiederholen	2026-03-31 14:08:36.614085	system	studierendenantrag
+1176	core	title_show_lvs	2026-03-31 14:08:36.618114	system	studierendenantrag
+1177	core	my_lvs	2026-03-31 14:08:36.622099	system	studierendenantrag
+1178	core	with_selected	2026-03-31 14:08:36.626	system	table
+1179	core	lv_nicht_zulassen	2026-03-31 14:08:36.629985	system	studierendenantrag
+1180	core	lv_wiederholen	2026-03-31 14:08:36.63391	system	studierendenantrag
+1181	core	title_history	2026-03-31 14:08:36.637836	system	studierendenantrag
+1182	core	anmerkung_tooltip	2026-03-31 14:08:36.641742	system	studierendenantrag
+1183	core	fuer_alle_uebernehmen	2026-03-31 14:08:36.645686	system	studierendenantrag
+1184	core	fuer_x_uebernehmen	2026-03-31 14:08:36.649592	system	studierendenantrag
+1185	core	title_grund	2026-03-31 14:08:36.653613	system	studierendenantrag
+1186	core	error_no_lvs	2026-03-31 14:08:36.65747	system	studierendenantrag
+1187	core	status_x	2026-03-31 14:08:36.661472	system	studierendenantrag
+1188	core	status_saving	2026-03-31 14:08:36.665328	system	studierendenantrag
+1189	core	status_error	2026-03-31 14:08:36.669115	system	studierendenantrag
+1190	core	status_open	2026-03-31 14:08:36.672998	system	studierendenantrag
+1191	core	status_created	2026-03-31 14:08:36.676801	system	studierendenantrag
+1192	core	status_cancelling	2026-03-31 14:08:36.680692	system	studierendenantrag
+1193	core	status_cancelled	2026-03-31 14:08:36.684644	system	studierendenantrag
+1194	core	status_unpaused	2026-03-31 14:08:36.688847	system	studierendenantrag
+1195	core	status_stop	2026-03-31 14:08:36.692995	system	studierendenantrag
+1196	core	error_stg_blacklist	2026-03-31 14:08:36.697117	system	studierendenantrag
+1197	core	error_antrag_exists	2026-03-31 14:08:36.70113	system	studierendenantrag
+1198	core	error_antrag_pending	2026-03-31 14:08:36.704961	system	studierendenantrag
+1199	core	error_no_antrag_found	2026-03-31 14:08:36.709152	system	studierendenantrag
+1200	core	error_no_antrag_found_prestudent	2026-03-31 14:08:36.713057	system	studierendenantrag
+1201	core	error_no_stg_and_sem	2026-03-31 14:08:36.717054	system	studierendenantrag
+1202	core	error_no_stg	2026-03-31 14:08:36.720843	system	studierendenantrag
+1203	core	error_no_stg_antrag	2026-03-31 14:08:36.724937	system	studierendenantrag
+1204	core	error_no_stg_email	2026-03-31 14:08:36.728796	system	studierendenantrag
+1205	core	error_no_studienplan	2026-03-31 14:08:36.732682	system	studierendenantrag
+1206	core	error_no_antragstatus	2026-03-31 14:08:36.736501	system	studierendenantrag
+1207	core	error_multiple_studienplan	2026-03-31 14:08:36.740576	system	studierendenantrag
+1208	core	error_no_sem_after	2026-03-31 14:08:36.744451	system	studierendenantrag
+1209	core	error_no_stdsem	2026-03-31 14:08:36.748255	system	studierendenantrag
+1210	core	error_no_status_in_prev_sem	2026-03-31 14:08:36.752081	system	studierendenantrag
+1211	core	error_antrag_locked	2026-03-31 14:08:36.755963	system	studierendenantrag
+1212	core	error_no_lv	2026-03-31 14:08:36.759731	system	studierendenantrag
+1213	core	error_no_lv_in_application	2026-03-31 14:08:36.763811	system	studierendenantrag
+1214	core	error_no_right	2026-03-31 14:08:36.767753	system	studierendenantrag
+1215	core	error_no_objection	2026-03-31 14:08:36.771658	system	studierendenantrag
+1216	core	error_not_objected	2026-03-31 14:08:36.775467	system	studierendenantrag
+1217	core	error_not_approved	2026-03-31 14:08:36.779336	system	studierendenantrag
+1218	core	error_not_pausable	2026-03-31 14:08:36.783119	system	studierendenantrag
+1219	core	error_not_paused	2026-03-31 14:08:36.786836	system	studierendenantrag
+1220	core	error_stg_last_semester	2026-03-31 14:08:36.790546	system	studierendenantrag
+1221	core	error_no_person	2026-03-31 14:08:36.794349	system	studierendenantrag
+1222	core	error_no_person_prestudent	2026-03-31 14:08:36.798199	system	studierendenantrag
+1223	core	error_no_email	2026-03-31 14:08:36.802022	system	studierendenantrag
+1224	core	error_no_prestudent	2026-03-31 14:08:36.805818	system	studierendenantrag
+1225	core	error_no_prestudent_in_sem	2026-03-31 14:08:36.80958	system	studierendenantrag
+1226	core	error_no_stg_for_prestudent	2026-03-31 14:08:36.813304	system	studierendenantrag
+1227	core	error_no_prestudentstatus	2026-03-31 14:08:36.817156	system	studierendenantrag
+1228	core	error_mail_to	2026-03-31 14:08:36.821252	system	studierendenantrag
+1229	core	error_mail	2026-03-31 14:08:36.825088	system	studierendenantrag
+1230	core	error_name	2026-03-31 14:08:36.828957	system	studierendenantrag
+1231	core	error_mail_and_name	2026-03-31 14:08:36.832849	system	studierendenantrag
+1232	core	studentIn	2026-03-31 14:08:36.836757	system	studierendenantrag
+1233	core	error_U_Approve	2026-03-31 14:08:36.840704	system	studierendenantrag
+1234	core	error_U_Reject	2026-03-31 14:08:36.844583	system	studierendenantrag
+1235	core	mail_subject_A_Approve	2026-03-31 14:08:36.848512	system	studierendenantrag
+1236	core	mail_subject_A_Student	2026-03-31 14:08:36.852377	system	studierendenantrag
+1237	core	mail_subject_A_Stgl	2026-03-31 14:08:36.856275	system	studierendenantrag
+1238	core	mail_subject_A_ObjectionDenied	2026-03-31 14:08:36.860125	system	studierendenantrag
+1239	core	mail_subject_U_Approve	2026-03-31 14:08:36.863948	system	studierendenantrag
+1240	core	mail_subject_U_Reject	2026-03-31 14:08:36.867814	system	studierendenantrag
+1241	core	mail_subject_W_New	2026-03-31 14:08:36.871674	system	studierendenantrag
+1242	core	mail_subject_W_Approve	2026-03-31 14:08:36.875725	system	studierendenantrag
+1243	core	mail_subject_W_Student	2026-03-31 14:08:36.879377	system	studierendenantrag
+1244	core	mail_part_table	2026-03-31 14:08:36.883019	system	studierendenantrag
+1245	core	mail_part_x_new_Abmeldung	2026-03-31 14:08:36.886776	system	studierendenantrag
+1246	core	mail_part_x_new_Unterbrechung	2026-03-31 14:08:36.890603	system	studierendenantrag
+1247	core	mail_part_x_new_Wiederholung	2026-03-31 14:08:36.894592	system	studierendenantrag
+1248	core	mail_part_grund	2026-03-31 14:08:36.8984	system	studierendenantrag
+1249	core	mail_part_error_no_lvs	2026-03-31 14:08:36.902306	system	studierendenantrag
+1250	core	calltoaction_Abmeldung	2026-03-31 14:08:36.906153	system	studierendenantrag
+1251	core	calltoaction_Unterbrechung	2026-03-31 14:08:36.91017	system	studierendenantrag
+1252	core	calltoaction_Wiederholung	2026-03-31 14:08:36.914018	system	studierendenantrag
+1253	core	textLong_studentNichtGezahlt	2026-03-31 14:08:36.917958	system	studierendenantrag
+1254	core	textLong_studentNichtAnwesend	2026-03-31 14:08:36.921807	system	studierendenantrag
+1255	core	textLong_PruefunstermineNichtEingehalten	2026-03-31 14:08:36.925718	system	studierendenantrag
+1256	core	textLong_plageat	2026-03-31 14:08:36.929601	system	studierendenantrag
+1257	core	textLong_ungenuegendeLeistung	2026-03-31 14:08:36.933494	system	studierendenantrag
+1258	core	textLong_NichtantrittStudium	2026-03-31 14:08:36.937371	system	studierendenantrag
+1259	core	textLong_MissingZgv	2026-03-31 14:08:36.941169	system	studierendenantrag
+1260	core	textLong_unruly	2026-03-31 14:08:36.945004	system	studierendenantrag
+1261	core	dropdown_nichtGezahlt	2026-03-31 14:08:36.94889	system	studierendenantrag
+1262	core	dropdown_nichtAnwesend	2026-03-31 14:08:36.952746	system	studierendenantrag
+1263	core	dropdown_PruefunstermineNichtEingehalten	2026-03-31 14:08:36.95659	system	studierendenantrag
+1264	core	dropdown_plageat	2026-03-31 14:08:36.960512	system	studierendenantrag
+1265	core	dropdown_ungenuegendeLeistung	2026-03-31 14:08:36.964355	system	studierendenantrag
+1266	core	dropdown_NichtantrittStudium	2026-03-31 14:08:36.968277	system	studierendenantrag
+1267	core	dropdown_MissingZgv	2026-03-31 14:08:36.972097	system	studierendenantrag
+1268	core	dropdown_bitteWaehlen	2026-03-31 14:08:36.975992	system	studierendenantrag
+1269	core	grund_Wiederholung_deadline	2026-03-31 14:08:36.979894	system	studierendenantrag
+1270	core	dropdown_unruly	2026-03-31 14:08:36.983737	system	studierendenantrag
+1271	core	mark_person_as_unruly	2026-03-31 14:08:36.987659	system	studierendenantrag
+1272	core	dropdown_Studienwechsel	2026-03-31 14:08:36.991505	system	studierendenantrag
+1273	core	textLong_Studienwechsel	2026-03-31 14:08:36.995481	system	studierendenantrag
+1274	core	dropdown_Studienabbruch_allgemein	2026-03-31 14:08:36.99955	system	studierendenantrag
+1275	core	textLong_Studienabbruch_allgemein	2026-03-31 14:08:37.003421	system	studierendenantrag
+1276	core	dropdown_vsCodeOfConduct	2026-03-31 14:08:37.007521	system	studierendenantrag
+1277	core	textLong_vsCodeOfConduct	2026-03-31 14:08:37.011562	system	studierendenantrag
+1278	core	dropdown_additionalReason	2026-03-31 14:08:37.015402	system	studierendenantrag
+1279	core	textLong_additionalReason	2026-03-31 14:08:37.019481	system	studierendenantrag
+1280	core	document	2026-03-31 14:08:37.023447	system	notiz
+1281	core	notiz_new	2026-03-31 14:08:37.02731	system	notiz
+1282	core	notiz_edit	2026-03-31 14:08:37.031153	system	notiz
+1283	core	notiz_delete	2026-03-31 14:08:37.034992	system	notiz
+1284	core	verfasser	2026-03-31 14:08:37.038933	system	notiz
+1285	core	bearbeiter	2026-03-31 14:08:37.042757	system	notiz
+1286	core	verfasser_uid	2026-03-31 14:08:37.046621	system	ui
+1287	core	bearbeiter_uid	2026-03-31 14:08:37.050577	system	ui
+1288	core	erledigt	2026-03-31 14:08:37.054584	system	notiz
+1289	core	letzte_aenderung	2026-03-31 14:08:37.05875	system	notiz
+1290	core	error_fieldRequired	2026-03-31 14:08:37.062662	system	ui
+1291	core	error_fieldNotInteger	2026-03-31 14:08:37.06668	system	ui
+1292	core	error_typeNotizIdIncorrect	2026-03-31 14:08:37.070569	system	ui
+1293	core	error_fieldNotFound	2026-03-31 14:08:37.074394	system	ui
+1294	core	tag_rueckgaengig	2026-03-31 14:08:37.078249	system	notiz
+1295	core	tag_erledigt	2026-03-31 14:08:37.082111	system	notiz
+1296	core	tag_verfasser	2026-03-31 14:08:37.085958	system	notiz
+1297	core	tag_bearbeiter	2026-03-31 14:08:37.089804	system	notiz
+1298	core	error_fieldNotNumeric	2026-03-31 14:08:37.093641	system	ui
+1299	core	error_fieldNoValidEmail	2026-03-31 14:08:37.097616	system	ui
+1300	core	warnung	2026-03-31 14:08:37.101483	system	global
+1301	core	vornamen	2026-03-31 14:08:37.105414	system	person
+1302	core	maennlich	2026-03-31 14:08:37.109248	system	person
+1303	core	weiblich	2026-03-31 14:08:37.113177	system	person
+1304	core	sprache	2026-03-31 14:08:37.117085	system	person
+1305	core	zustelladresse	2026-03-31 14:08:37.123639	system	person
+1306	core	kontaktinformation	2026-03-31 14:08:37.127504	system	person
+1307	core	abweichenderEmpfaenger	2026-03-31 14:08:37.132827	system	person
+1389	core	stichtagHinzufuegen	2026-03-31 14:08:37.304517	system	bismeldestichtag
+1390	core	stichtageVerwalten	2026-03-31 14:08:37.308576	system	bismeldestichtag
+1391	core	stichtagLoeschen	2026-03-31 14:08:37.312507	system	bismeldestichtag
+1392	lehrauftrag	hinweistextLehrauftrag	2026-03-31 14:08:37.316414	system	ui
+1393	core	NOTFALLKONTAKT	2026-03-31 14:08:37.320188	system	profil
+1394	core	fotoSperren	2026-03-31 14:08:37.323947	system	profil
+1395	core	fotoEntsperren	2026-03-31 14:08:37.327741	system	profil
+1396	core	fotoHochladen	2026-03-31 14:08:37.331516	system	profil
+1397	core	profil	2026-03-31 14:08:37.335316	system	profil
+1398	core	gruppenLink	2026-03-31 14:08:37.338954	system	profil
+1399	core	verbandLink	2026-03-31 14:08:37.342621	system	profil
+1400	core	semesterLink	2026-03-31 14:08:37.347631	system	profil
+1401	core	TELEFON	2026-03-31 14:08:37.351382	system	profil
+1402	core	MOBIL	2026-03-31 14:08:37.355097	system	profil
+1403	core	EMAIL	2026-03-31 14:08:37.358815	system	profil
+1404	core	personenInformationen	2026-03-31 14:08:37.362563	system	profil
+1405	core	postnomen	2026-03-31 14:08:37.366439	system	profil
+1406	core	Username	2026-03-31 14:08:37.370191	system	profil
+1407	core	Anrede	2026-03-31 14:08:37.373884	system	profil
+1408	core	Titel	2026-03-31 14:08:37.377637	system	profil
+1409	core	Postnomen	2026-03-31 14:08:37.38144	system	profil
+1410	core	Geburtsdatum	2026-03-31 14:08:37.385209	system	profil
+1411	core	Geburtsort	2026-03-31 14:08:37.388955	system	profil
+1412	core	Büro	2026-03-31 14:08:37.392742	system	profil
+1413	core	Kurzzeichen	2026-03-31 14:08:37.3965	system	profil
+1414	core	Telefon	2026-03-31 14:08:37.400304	system	profil
+1415	core	telefon	2026-03-31 14:08:37.404046	system	profil
+1416	core	intern	2026-03-31 14:08:37.407882	system	profil
+1417	core	alias	2026-03-31 14:08:37.411706	system	profil
+1418	core	email	2026-03-31 14:08:37.415508	system	profil
+1419	core	Anmerkung	2026-03-31 14:08:37.419391	system	profil
+1420	core	notfallkontakt	2026-03-31 14:08:37.423308	system	profil
+1421	core	Straße	2026-03-31 14:08:37.427163	system	profil
+1422	core	Strasse	2026-03-31 14:08:37.430952	system	profil
+1423	core	PLZ	2026-03-31 14:08:37.434855	system	profil
+1424	core	Ort	2026-03-31 14:08:37.438683	system	profil
+1425	core	Typ	2026-03-31 14:08:37.442397	system	profil
+1426	core	privateKontakte	2026-03-31 14:08:37.446104	system	profil
+1427	core	privateAdressen	2026-03-31 14:08:37.44992	system	profil
+1428	core	profilBearbeiten	2026-03-31 14:08:37.453829	system	profil
+1429	core	mitarbeiterIn	2026-03-31 14:08:37.457584	system	profil
+1430	core	entlehnteBetriebsmittel	2026-03-31 14:08:37.461435	system	profil
+1431	core	mitarbeiterInformation	2026-03-31 14:08:37.465146	system	profil
+1432	core	studentIn	2026-03-31 14:08:37.46885	system	profil
+1433	core	studentInformation	2026-03-31 14:08:37.47254	system	profil
+1434	core	zutrittsGruppen	2026-03-31 14:08:37.476204	system	profil
+1435	core	fhAusweisStatus	2026-03-31 14:08:37.479817	system	profil
+1436	core	mailverteiler	2026-03-31 14:08:37.483484	system	profil
+1437	core	mailverteilerMitglied	2026-03-31 14:08:37.487249	system	profil
+1438	core	quickLinks	2026-03-31 14:08:37.491092	system	profil
+1439	core	zeitwuensche	2026-03-31 14:08:37.494872	system	profil
+1440	core	lehrveranstaltungen	2026-03-31 14:08:37.4986	system	profil
+1441	core	zeitsperren	2026-03-31 14:08:37.502426	system	profil
+1442	core	inventarnummer	2026-03-31 14:08:37.506143	system	profil
+1443	core	ausgabedatum	2026-03-31 14:08:37.509836	system	profil
+1444	core	wochenstunden	2026-03-31 14:08:37.513597	system	profil
+1445	core	stg_short	2026-03-31 14:08:37.517376	system	profil
+1446	core	orgform_short	2026-03-31 14:08:37.521099	system	profil
+1447	core	orgeinheit_short	2026-03-31 14:08:37.524868	system	profil
+1448	core	sem_short	2026-03-31 14:08:37.528638	system	profil
+1449	core	previousWeek	2026-03-31 14:08:37.532407	system	LvPlan
+1450	core	previousYear	2026-03-31 14:08:37.536259	system	LvPlan
+1451	core	previousMonth	2026-03-31 14:08:37.540117	system	LvPlan
+1452	core	previousDay	2026-03-31 14:08:37.543899	system	LvPlan
+1453	core	nextDay	2026-03-31 14:08:37.547633	system	LvPlan
+1454	core	nextWeek	2026-03-31 14:08:37.55145	system	LvPlan
+1455	core	nextMonth	2026-03-31 14:08:37.555327	system	LvPlan
+1456	core	nextYear	2026-03-31 14:08:37.559204	system	LvPlan
+1457	core	modeDay	2026-03-31 14:08:37.563001	system	LvPlan
+1458	core	modeWeek	2026-03-31 14:08:37.567004	system	LvPlan
+1459	core	modeMonth	2026-03-31 14:08:37.571193	system	LvPlan
+1460	core	profilBild	2026-03-31 14:08:37.575176	system	profilUpdate
+1461	core	deleteAttachment	2026-03-31 14:08:37.579155	system	profilUpdate
+1462	core	documentUpload	2026-03-31 14:08:37.583217	system	profilUpdate
+1463	core	profilUpdates	2026-03-31 14:08:37.587017	system	profilUpdate
+1464	core	topic	2026-03-31 14:08:37.590793	system	profilUpdate
+1465	core	zustell_adressen_warning	2026-03-31 14:08:37.594632	system	profilUpdate
+1466	core	zustell_kontakte_warning	2026-03-31 14:08:37.59866	system	profilUpdate
+1467	core	kontaktTyp	2026-03-31 14:08:37.602433	system	profilUpdate
+1468	core	nebenwohnsitz	2026-03-31 14:08:37.606234	system	profilUpdate
+1469	core	hauptwohnsitz	2026-03-31 14:08:37.610006	system	profilUpdate
+1470	core	homeoffice	2026-03-31 14:08:37.613759	system	profilUpdate
+1471	core	rechnungsadresse	2026-03-31 14:08:37.617605	system	profilUpdate
+1472	core	notfallkontakt	2026-03-31 14:08:37.62168	system	profilUpdate
+1473	core	mobiltelefonnummer	2026-03-31 14:08:37.625473	system	profilUpdate
+1474	core	homepage	2026-03-31 14:08:37.629286	system	profilUpdate
+1475	core	faxnummer	2026-03-31 14:08:37.633316	system	profilUpdate
+1476	core	zustellungsKontakt	2026-03-31 14:08:37.637061	system	profilUpdate
+1477	core	statusMessage	2026-03-31 14:08:37.640975	system	profilUpdate
+1478	core	profilUpdateInformationMessage	2026-03-31 14:08:37.64473	system	profilUpdate
+1479	core	profilBildUpdateMessage	2026-03-31 14:08:37.648529	system	profilUpdate
+1480	core	profilUpdateRequest	2026-03-31 14:08:37.652502	system	profilUpdate
+1481	core	profilUpdateRequests	2026-03-31 14:08:37.656165	system	profilUpdate
+1482	core	statusDate	2026-03-31 14:08:37.65982	system	profilUpdate
+1483	core	userID	2026-03-31 14:08:37.663529	system	profilUpdate
+1484	core	anfrageThema	2026-03-31 14:08:37.667326	system	profilUpdate
+1485	core	anfrageDatum	2026-03-31 14:08:37.671109	system	profilUpdate
+1486	core	update	2026-03-31 14:08:37.674907	system	profilUpdate
+1487	core	accept	2026-03-31 14:08:37.678721	system	profilUpdate
+1488	core	deny	2026-03-31 14:08:37.682509	system	profilUpdate
+1489	core	UID	2026-03-31 14:08:37.686305	system	profilUpdate
+1490	core	pendingRequests	2026-03-31 14:08:37.690074	system	profilUpdate
+1491	core	acceptedRequests	2026-03-31 14:08:37.693813	system	profilUpdate
+1492	core	rejectedRequests	2026-03-31 14:08:37.6976	system	profilUpdate
+1493	core	allRequests	2026-03-31 14:08:37.701356	system	profilUpdate
+1494	core	deleteContact	2026-03-31 14:08:37.705102	system	profilUpdate
+1495	core	deleteItem	2026-03-31 14:08:37.708854	system	profilUpdate
+1496	core	addItem	2026-03-31 14:08:37.71256	system	profilUpdate
+1497	core	deleteAddress	2026-03-31 14:08:37.716388	system	profilUpdate
+1498	core	addContact	2026-03-31 14:08:37.720158	system	profilUpdate
+1499	core	vorname	2026-03-31 14:08:37.725225	system	profilUpdate
+1500	core	nachname	2026-03-31 14:08:37.729039	system	profilUpdate
+1501	core	title	2026-03-31 14:08:37.732823	system	profilUpdate
+1502	core	pending	2026-03-31 14:08:37.736613	system	profilUpdate
+1503	core	accepted	2026-03-31 14:08:37.740601	system	profilUpdate
+1504	core	rejected	2026-03-31 14:08:37.744329	system	profilUpdate
+1505	core	profilUdate_address_error	2026-03-31 14:08:37.748079	system	profilUpdate
+1506	core	profilUpdate_permission_error	2026-03-31 14:08:37.751905	system	profilUpdate
+1507	core	profilUpdate_dms_error	2026-03-31 14:08:37.755657	system	profilUpdate
+1508	core	profilUpdate_email_error	2026-03-31 14:08:37.759438	system	profilUpdate
+1509	core	profilUpdate_studentCheck_error	2026-03-31 14:08:37.763198	system	profilUpdate
+1510	core	profilUpdate_mitarbeiterCheck_error	2026-03-31 14:08:37.766985	system	profilUpdate
+1511	core	profilUpdate_loading_error	2026-03-31 14:08:37.770878	system	profilUpdate
+1512	core	profilUpdate_dmsVersion_error	2026-03-31 14:08:37.774702	system	profilUpdate
+1513	core	profilUpdate_deleteZustellung_error	2026-03-31 14:08:37.778509	system	profilUpdate
+1514	core	profilUpdate_changeTwice_error	2026-03-31 14:08:37.782303	system	profilUpdate
+1515	core	profilUpdate_changeTopicTwice_error	2026-03-31 14:08:37.786074	system	profilUpdate
+1516	core	profilUpdate_loadingOE_error	2026-03-31 14:08:37.789898	system	profilUpdate
+1517	core	profilUpdate_requiredInformation_error	2026-03-31 14:08:37.79371	system	profilUpdate
+1518	core	profilUpdate_insert_error	2026-03-31 14:08:37.797486	system	profilUpdate
+1519	core	profilUpdate_insertKontakt_error	2026-03-31 14:08:37.801302	system	profilUpdate
+1520	core	profilUpdate_insertAdresse_error	2026-03-31 14:08:37.80507	system	profilUpdate
+1521	core	profilUpdate_updateKontakt_error	2026-03-31 14:08:37.808906	system	profilUpdate
+1522	core	profilUpdate_updateAdresse_error	2026-03-31 14:08:37.812717	system	profilUpdate
+1523	core	profilUpdate_loadingZustellkontakte_error	2026-03-31 14:08:37.816476	system	profilUpdate
+1524	core	profilUpdate_loadingZustellAdressen_error	2026-03-31 14:08:37.820566	system	profilUpdate
+1525	core	acceptUpdate	2026-03-31 14:08:37.824342	system	profilUpdate
+1526	core	denyUpdate	2026-03-31 14:08:37.827987	system	profilUpdate
+1527	core	showRequest	2026-03-31 14:08:37.831661	system	profilUpdate
+1528	core	profilUpdate_status_error	2026-03-31 14:08:37.83538	system	profilUpdate
+1529	core	profilUpdate_topic_error	2026-03-31 14:08:37.839154	system	profilUpdate
+1530	core	profilUpdate_address_error	2026-03-31 14:08:37.843037	system	profilUpdate
+1531	core	profilUpdate_kontakt_error	2026-03-31 14:08:37.847019	system	profilUpdate
+1532	core	Name	2026-03-31 14:08:37.85095	system	profilUpdate
+1533	core	Topic	2026-03-31 14:08:37.854854	system	profilUpdate
+1534	core	insertamum	2026-03-31 14:08:37.858721	system	profilUpdate
+1535	core	actions	2026-03-31 14:08:37.86278	system	profilUpdate
+1536	core	Status	2026-03-31 14:08:37.866702	system	profilUpdate
+1537	core	infoHeimatadresse	2026-03-31 14:08:37.870727	system	profilUpdate
+1538	core	infoZustelladresse	2026-03-31 14:08:37.874654	system	profilUpdate
+1539	core	geloescht	2026-03-31 14:08:37.878627	system	global
+1540	core	previous	2026-03-31 14:08:37.882559	system	global
+1541	core	next	2026-03-31 14:08:37.886454	system	global
+1542	core	switchTheme	2026-03-31 14:08:37.890318	system	global
+1543	core	aenderungGespeichert	2026-03-31 14:08:37.894481	system	global
+1549	core	alleGenehmigt	2026-03-31 14:08:37.908815	system	global
+1550	core	alleAbgelehnt	2026-03-31 14:08:37.912616	system	global
+1551	core	dokument	2026-03-31 14:08:37.916299	system	global
+1552	core	aktionen	2026-03-31 14:08:37.920163	system	global
+1667	core	digiAnw	2026-03-31 14:08:38.15251	system	lehre
+1732	core	newLink	2026-03-31 14:08:38.280993	system	bookmark
+1733	core	saveLink	2026-03-31 14:08:38.284755	system	bookmark
+1734	core	editLink	2026-03-31 14:08:38.288515	system	bookmark
+1735	core	bookmarkDeleted	2026-03-31 14:08:38.292339	system	bookmark
+1736	core	bookmarkAdded	2026-03-31 14:08:38.2963	system	bookmark
+1737	core	bookmarkUpdated	2026-03-31 14:08:38.301501	system	bookmark
+1738	core	myBookmarks	2026-03-31 14:08:38.305427	system	bookmark
+1739	core	emptyBookmarks	2026-03-31 14:08:38.309312	system	bookmark
+1740	core	invalidUrl	2026-03-31 14:08:38.31322	system	bookmark
+1741	core	invalidTitel	2026-03-31 14:08:38.317024	system	bookmark
+1742	core	gespeichert	2026-03-31 14:08:38.320923	system	global
+1744	core	raumzuordnung	2026-03-31 14:08:38.326811	system	global
+1745	core	statusSetzen	2026-03-31 14:08:38.331974	system	global
+1746	core	hierarchieAnsicht	2026-03-31 14:08:38.335792	system	global
+1747	core	aufgeklappt	2026-03-31 14:08:38.339596	system	global
+1748	core	zugeklappt	2026-03-31 14:08:38.343414	system	global
+1753	core	verfuegbarkeitBearbeiten	2026-03-31 14:08:38.354918	system	global
+1765	core	bezeichnung	2026-03-31 14:08:38.380209	system	global
+1767	core	verfuegbarkeitStart	2026-03-31 14:08:38.386512	system	global
+1768	core	verfuegbarkeitEnde	2026-03-31 14:08:38.390786	system	global
+1772	core	hersteller	2026-03-31 14:08:38.400675	system	global
+1773	core	verantwortliche	2026-03-31 14:08:38.404805	system	global
+1775	core	ansprechpartner	2026-03-31 14:08:38.410657	system	global
+1776	core	ansprechpartnerIntern	2026-03-31 14:08:38.414735	system	global
+1777	core	ansprechpartnerExtern	2026-03-31 14:08:38.418608	system	global
+1778	core	anmerkungIntern	2026-03-31 14:08:38.422488	system	global
+1786	core	kostentraegerOe	2026-03-31 14:08:38.439903	system	global
+1788	core	euroProJahr	2026-03-31 14:08:38.446018	system	global
+1789	core	alleWaehlen	2026-03-31 14:08:38.450198	system	global
+1794	core	existiertBereits	2026-03-31 14:08:38.461907	system	ui
+1795	core	datumEndeVorDatumStart	2026-03-31 14:08:38.465989	system	ui
+1800	core	zeilenAuswaehlen	2026-03-31 14:08:38.477434	system	global
+1805	core	firma_zusatz	2026-03-31 14:08:38.488944	system	person
+1806	core	firma	2026-03-31 14:08:38.493072	system	person
+1807	core	adresse_new	2026-03-31 14:08:38.496903	system	person
+1808	core	adresse_edit	2026-03-31 14:08:38.500673	system	person
+1809	core	adresse_delete	2026-03-31 14:08:38.504426	system	person
+1810	core	adresse_confirm_delete	2026-03-31 14:08:38.508182	system	person
+1811	core	kontakt_new	2026-03-31 14:08:38.511903	system	person
+1812	core	kontakt_edit	2026-03-31 14:08:38.515604	system	person
+1813	core	kontakt_delete	2026-03-31 14:08:38.519333	system	person
+1814	core	kontakt_confirm_delete	2026-03-31 14:08:38.523026	system	person
+1815	core	privatkonto	2026-03-31 14:08:38.526745	system	person
+1816	core	firmenkonto	2026-03-31 14:08:38.530472	system	person
+1817	core	bankvb_new	2026-03-31 14:08:38.534184	system	person
+1818	core	bankvb_edit	2026-03-31 14:08:38.537871	system	person
+1819	core	bankvb_delete	2026-03-31 14:08:38.541543	system	person
+1820	core	bankvb_confirm_delete	2026-03-31 14:08:38.545251	system	person
+1821	core	status_rolle	2026-03-31 14:08:38.548932	system	lehre
+1822	core	status_new	2026-03-31 14:08:38.552703	system	lehre
+1823	core	status_edit	2026-03-31 14:08:38.556355	system	lehre
+1824	core	status_delete	2026-03-31 14:08:38.559896	system	lehre
+1825	core	bestaetigt_am	2026-03-31 14:08:38.563631	system	lehre
+1826	core	bestaetigt_von	2026-03-31 14:08:38.567373	system	lehre
+1827	core	insert_am	2026-03-31 14:08:38.571056	system	lehre
+1828	core	insert_von	2026-03-31 14:08:38.575029	system	lehre
+1829	core	bewerbung_abgeschickt_am	2026-03-31 14:08:38.579378	system	lehre
+1830	core	aufnahmestufe	2026-03-31 14:08:38.583281	system	lehre
+1831	core	meldestichtag_erreicht	2026-03-31 14:08:38.587061	system	bismeldestichtag
+1832	core	status_confirm_delete	2026-03-31 14:08:38.590866	system	lehre
+1833	core	last_status_confirm_delete	2026-03-31 14:08:38.59461	system	lehre
+1834	core	modal_askAusbildungssem	2026-03-31 14:08:38.598435	system	lehre
+1835	core	modal_askAusbildungssemPlural	2026-03-31 14:08:38.602089	system	lehre
+1836	core	title_zgv	2026-03-31 14:08:38.605792	system	lehre
+1837	core	zgvMaster	2026-03-31 14:08:38.609389	system	lehre
+1838	core	zgvMasterOrt	2026-03-31 14:08:38.613055	system	lehre
+1839	core	zgvMasterDatum	2026-03-31 14:08:38.616875	system	lehre
+1840	core	zgvMasterNation	2026-03-31 14:08:38.620685	system	lehre
+1841	core	zgvMasterErfuellt	2026-03-31 14:08:38.624912	system	lehre
+1842	core	zgvDoktor	2026-03-31 14:08:38.62873	system	lehre
+1843	core	zgvDoktorOrt	2026-03-31 14:08:38.632633	system	lehre
+1844	core	zgvDoktorDatum	2026-03-31 14:08:38.636472	system	lehre
+1845	core	zgvDoktorNation	2026-03-31 14:08:38.640305	system	lehre
+1846	core	zgvDoktorErfuellt	2026-03-31 14:08:38.644247	system	lehre
+1847	core	aufmerksamDurch	2026-03-31 14:08:38.648047	system	person
+1848	core	berufstaetigkeit	2026-03-31 14:08:38.651763	system	person
+1849	core	facheinschlaegigBerufstaetig	2026-03-31 14:08:38.655613	system	person
+1850	core	bisstandort	2026-03-31 14:08:38.659475	system	person
+1851	core	studientyp	2026-03-31 14:08:38.663198	system	lehre
+1852	core	dual	2026-03-31 14:08:38.666829	system	lehre
+1853	core	foerderrelevant	2026-03-31 14:08:38.670521	system	lehre
+1854	core	prioritaet	2026-03-31 14:08:38.674176	system	lehre
+1855	core	title_history	2026-03-31 14:08:38.677771	system	lehre
+1856	core	error_keineSchreibrechte	2026-03-31 14:08:38.681499	system	lehre
+1857	core	error_rolleBereitsVorhanden	2026-03-31 14:08:38.685321	system	lehre
+1858	core	error_rolleBereitsVorhandenMitNamen	2026-03-31 14:08:38.689109	system	lehre
+1859	core	error_personBereitsStudent	2026-03-31 14:08:38.69287	system	lehre
+1860	core	error_keinReihungstestverfahren	2026-03-31 14:08:38.696702	system	lehre
+1861	core	error_ZGVNichtEingetragen	2026-03-31 14:08:38.700672	system	lehre
+1862	core	error_ZGVMasterNichtEingetragen	2026-03-31 14:08:38.704583	system	lehre
+1863	core	error_keinBewerber	2026-03-31 14:08:38.708402	system	lehre
+1864	core	error_keinAufgenommener	2026-03-31 14:08:38.71232	system	lehre
+1865	core	error_lastBewerberAndAufgenommenerSemesters	2026-03-31 14:08:38.716112	system	lehre
+1866	core	error_noStudstatus	2026-03-31 14:08:38.719915	system	lehre
+1867	core	error_dataVorMeldestichtag	2026-03-31 14:08:38.723804	system	lehre
+1868	core	error_duringInsertUpdateLehrverband	2026-03-31 14:08:38.727694	system	lehre
+1869	core	error_duringDeleteLehrverband	2026-03-31 14:08:38.731546	system	lehre
+1870	core	error_onlyAdminDeleteRolleStudent	2026-03-31 14:08:38.735355	system	lehre
+1871	core	error_onlyAdminDeleteLastStatus	2026-03-31 14:08:38.739175	system	lehre
+1872	core	error_noStatusFound	2026-03-31 14:08:38.743034	system	lehre
+1873	core	error_statusConfirmedYet	2026-03-31 14:08:38.746727	system	lehre
+1874	core	error_bewerbungNochNichtAbgeschickt	2026-03-31 14:08:38.750436	system	lehre
+1875	core	error_missingId	2026-03-31 14:08:38.754094	system	ui
+1876	core	error_deleteHomeAdress	2026-03-31 14:08:38.757798	system	person
+1877	core	btn_statusVorruecken	2026-03-31 14:08:38.76153	system	ui
+1878	core	btn_confirmStatus	2026-03-31 14:08:38.76526	system	ui
+1879	core	btn_editStatus	2026-03-31 14:08:38.769089	system	ui
+1880	core	btn_deleteStatus	2026-03-31 14:08:38.772936	system	ui
+1881	core	successSave	2026-03-31 14:08:38.776735	system	ui
+1882	core	successDelete	2026-03-31 14:08:38.780517	system	ui
+1883	core	successAdvance	2026-03-31 14:08:38.784453	system	ui
+1884	core	successConfirm	2026-03-31 14:08:38.788299	system	ui
+1885	core	betriebsmittel	2026-03-31 14:08:38.792073	system	ui
+1886	core	betriebsmittel_delete	2026-03-31 14:08:38.795937	system	ui
+1887	core	betriebsmittel_confirm_delete	2026-03-31 14:08:38.799773	system	ui
+1888	core	add_betriebsmittel	2026-03-31 14:08:38.80363	system	ui
+1889	core	edit_betriebsmittel	2026-03-31 14:08:38.80746	system	ui
+1890	core	inventarnummer	2026-03-31 14:08:38.811389	system	wawi
+1891	core	nummer	2026-03-31 14:08:38.81525	system	wawi
+1892	core	ausgegebenam	2026-03-31 14:08:38.81924	system	wawi
+1893	core	retouram	2026-03-31 14:08:38.82314	system	wawi
+1894	core	retourdatum	2026-03-31 14:08:38.82699	system	wawi
+1895	core	ausgabedatum	2026-03-31 14:08:38.830987	system	wawi
+1896	core	error_zutrittskarteOhneNummer	2026-03-31 14:08:38.834841	system	wawi
+1897	core	error_bmZutrittskarteOccupied	2026-03-31 14:08:38.838867	system	wawi
+1898	core	error_inventarWaehlen	2026-03-31 14:08:38.842698	system	wawi
+1899	core	error_retourdatumVorAusgabe	2026-03-31 14:08:38.846682	system	wawi
+1914	core	eingabeFehlt	2026-03-31 14:08:38.878526	system	global
+1915	core	unveraendert	2026-03-31 14:08:38.882471	system	global
+1919	core	verwalten	2026-03-31 14:08:38.892114	system	global
+1920	core	lvTemplatesVerwalten	2026-03-31 14:08:38.896179	system	lehre
+1921	core	lvTemplatesUebersicht	2026-03-31 14:08:38.899989	system	lehre
+1922	core	buchung	2026-03-31 14:08:38.903872	system	konto
+1923	core	buchungsdatum	2026-03-31 14:08:38.907696	system	konto
+1924	core	buchungstext	2026-03-31 14:08:38.911525	system	konto
+1925	core	betrag	2026-03-31 14:08:38.915332	system	konto
+1926	core	buchungstyp	2026-03-31 14:08:38.919074	system	konto
+1927	core	buchungsnr	2026-03-31 14:08:38.922887	system	konto
+1928	core	mahnspanne	2026-03-31 14:08:38.92663	system	konto
+1929	core	credit_points	2026-03-31 14:08:38.9304	system	konto
+1930	core	reference	2026-03-31 14:08:38.934231	system	konto
+1931	core	confirm_overwrite	2026-03-31 14:08:38.937981	system	konto
+1932	core	confirm_overwrite_1_add_pers	2026-03-31 14:08:38.941809	system	konto
+1933	core	confirm_overwrite_x_add_pers	2026-03-31 14:08:38.945603	system	konto
+1934	core	confirm_overwrite_proceed	2026-03-31 14:08:38.949648	system	konto
+1935	core	error_missing	2026-03-31 14:08:38.953473	system	konto
+1936	core	error_counter_level	2026-03-31 14:08:38.957376	system	konto
+1937	core	error_delete_level	2026-03-31 14:08:38.96119	system	konto
+1938	core	settings_no_displayed_past_sem	2026-03-31 14:08:38.964914	system	stv
+1939	core	settings_fontsize	2026-03-31 14:08:38.9686	system	stv
+1940	core	settings_fontsize_xx-small	2026-03-31 14:08:38.972378	system	stv
+1941	core	settings_fontsize_x-small	2026-03-31 14:08:38.976151	system	stv
+1942	core	settings_fontsize_small	2026-03-31 14:08:38.98	system	stv
+1943	core	settings_fontsize_normal	2026-03-31 14:08:38.983711	system	stv
+1944	core	settings_fontsize_big	2026-03-31 14:08:38.987741	system	stv
+1945	core	settings_fontsize_huge	2026-03-31 14:08:38.991574	system	stv
+1946	core	action_new	2026-03-31 14:08:38.995598	system	stv
+1947	core	warn_removed_favs	2026-03-31 14:08:38.999347	system	stv
+1948	core	notes_person	2026-03-31 14:08:39.003228	system	stv
+1949	core	notes_prestudent	2026-03-31 14:08:39.006936	system	stv
+1950	core	aufnahmegruppe_kurzbz	2026-03-31 14:08:39.010695	system	stv
+1951	core	mentor	2026-03-31 14:08:39.014535	system	stv
+1952	core	tab_details	2026-03-31 14:08:39.01826	system	stv
+1953	core	tab_notes	2026-03-31 14:08:39.022232	system	stv
+1954	core	tab_contact	2026-03-31 14:08:39.025906	system	stv
+1955	core	tab_prestudent	2026-03-31 14:08:39.02973	system	stv
+1956	core	tab_status	2026-03-31 14:08:39.033452	system	stv
+1957	core	tab_banking	2026-03-31 14:08:39.037469	system	stv
+1958	core	tab_resources	2026-03-31 14:08:39.041201	system	stv
+1959	core	tab_grades	2026-03-31 14:08:39.044911	system	stv
+1960	core	tab_exam	2026-03-31 14:08:39.048672	system	stv
+1961	core	grade_report	2026-03-31 14:08:39.052341	system	stv
+1962	core	grade_report_xls	2026-03-31 14:08:39.056232	system	stv
+1963	core	grade_report_xls_extended	2026-03-31 14:08:39.059927	system	stv
+1964	core	grade_report_html	2026-03-31 14:08:39.063811	system	stv
+1965	core	filter_for	2026-03-31 14:08:39.067515	system	stv
+1966	core	filter_konto_count_0	2026-03-31 14:08:39.071259	system	stv
+1967	core	filter_konto_missing_counter	2026-03-31 14:08:39.074949	system	stv
+1968	core	filter_documents	2026-03-31 14:08:39.078743	system	stv
+1969	core	filter_konto_missing_counter_past	2026-03-31 14:08:39.082392	system	stv
+1970	core	filter_konto_missing_studiengebuehr	2026-03-31 14:08:39.086156	system	stv
+1971	core	filter_konto_studiengebuehrerhoeht	2026-03-31 14:08:39.089872	system	stv
+1972	core	filter_zgv_without_date	2026-03-31 14:08:39.093624	system	stv
+1973	core	filter_statusgrund	2026-03-31 14:08:39.097399	system	stv
+1974	core	filter_konto_samestg	2026-03-31 14:08:39.101295	system	stv
+1975	core	filter_fhtw_ausbildungsvertrag_akzeptiert	2026-03-31 14:08:39.105027	system	stv
+1976	core	konto_title_new	2026-03-31 14:08:39.108902	system	stv
+1977	core	konto_title_new_multi	2026-03-31 14:08:39.112672	system	stv
+1978	core	konto_title_edit	2026-03-31 14:08:39.11653	system	stv
+1979	core	konto_counter	2026-03-31 14:08:39.120362	system	stv
+1980	core	konto_payment_confirmation	2026-03-31 14:08:39.124193	system	stv
+1981	core	konto_all_types	2026-03-31 14:08:39.127922	system	stv
+1982	core	konto_filter_open	2026-03-31 14:08:39.131744	system	stv
+1983	core	konto_filter_current_stg	2026-03-31 14:08:39.135685	system	stv
+1984	core	status_confirm_popup	2026-03-31 14:08:39.139539	system	stv
+1985	core	document_certificate	2026-03-31 14:08:39.143407	system	stv
+1986	core	document_coursecertificate	2026-03-31 14:08:39.14719	system	stv
+1987	core	document_download	2026-03-31 14:08:39.150945	system	stv
+1988	core	document_archive	2026-03-31 14:08:39.154743	system	stv
+1989	core	document_signed_and_archived	2026-03-31 14:08:39.158569	system	stv
+1990	core	grades_zeugnis	2026-03-31 14:08:39.162404	system	stv
+1991	core	grades_takeoverdate	2026-03-31 14:08:39.166124	system	stv
+1992	core	grades_gradingdate	2026-03-31 14:08:39.169824	system	stv
+1993	core	grades_approvaldate	2026-03-31 14:08:39.173629	system	stv
+1994	core	grades_numericgrade	2026-03-31 14:08:39.177468	system	stv
+1995	core	grades_studiengang_lv	2026-03-31 14:08:39.181219	system	stv
+1996	core	grades_studiengang_kz_lv	2026-03-31 14:08:39.184948	system	stv
+1997	core	grades_semester_lv	2026-03-31 14:08:39.188804	system	stv
+1998	core	grades_points	2026-03-31 14:08:39.192554	system	stv
+1999	core	grades_lehrveranstaltung_bezeichnung_english	2026-03-31 14:08:39.196225	system	stv
+2000	core	grades_setgrade	2026-03-31 14:08:39.199872	system	stv
+2001	core	grades_updated	2026-03-31 14:08:39.203533	system	stv
+2002	core	grades_title_zeugnis	2026-03-31 14:08:39.207347	system	stv
+2003	core	grades_title_teacher	2026-03-31 14:08:39.211209	system	stv
+2004	core	grades_title_repeater	2026-03-31 14:08:39.214964	system	stv
+2005	core	grades_action_copy	2026-03-31 14:08:39.218643	system	stv
+2006	core	grades_error_sign	2026-03-31 14:08:39.222349	system	stv
+2007	core	grades_error_archive	2026-03-31 14:08:39.225955	system	stv
+2008	core	grades_error_overwrite	2026-03-31 14:08:39.229652	system	stv
+2009	core	grades_error_lehreinheit_id	2026-03-31 14:08:39.233462	system	stv
+2010	core	grades_error_prestudentstatus	2026-03-31 14:08:39.237273	system	stv
+2011	core	groups_error_notallstudents	2026-03-31 14:08:39.241207	system	stv
+2012	core	groups_error_notsamestg	2026-03-31 14:08:39.24497	system	stv
+2013	core	error_unoconv	2026-03-31 14:08:39.248925	system	document_export
+2014	core	error_unoconv_version	2026-03-31 14:08:39.252748	system	document_export
+2015	core	error_conv_timeout	2026-03-31 14:08:39.256617	system	document_export
+2016	core	error_sign_timeout	2026-03-31 14:08:39.26046	system	document_export
+2017	core	error_sign_pdf	2026-03-31 14:08:39.264297	system	document_export
+2018	core	error_outputformat_missing	2026-03-31 14:08:39.26802	system	document_export
+2019	core	error_template_missing	2026-03-31 14:08:39.271834	system	document_export
+2020	core	error_headers	2026-03-31 14:08:39.275588	system	document_export
+2021	core	error_file_copy	2026-03-31 14:08:39.279433	system	document_export
+2022	core	error_file_load	2026-03-31 14:08:39.283508	system	document_export
+2023	core	error_xml_load	2026-03-31 14:08:39.287369	system	document_export
+2024	core	error_xsl_load	2026-03-31 14:08:39.291179	system	document_export
+2025	core	error_styles_load	2026-03-31 14:08:39.295062	system	document_export
+2026	core	error_manifest	2026-03-31 14:08:39.298923	system	document_export
+2027	core	kw	2026-03-31 14:08:39.302716	system	calendar
+2028	core	year_kw	2026-03-31 14:08:39.306574	system	calendar
+2029	core	today	2026-03-31 14:08:39.310347	system	calendar
+2030	core	error_noBuchung	2026-03-31 14:08:39.314092	system	sap
+2031	core	error_buchungLocked	2026-03-31 14:08:39.317879	system	sap
+2032	core	msg_buchung_deleted	2026-03-31 14:08:39.321669	system	sap
+2033	core	lehrverband	2026-03-31 14:08:39.325614	system	lehre
+2034	core	successNewStatus	2026-03-31 14:08:39.329452	system	ui
+2035	core	error_updateLehrverband	2026-03-31 14:08:39.333298	system	lehre
+2036	core	error_noLehrverband	2026-03-31 14:08:39.33709	system	lehre
+2037	core	error_updateStudentlehrverband	2026-03-31 14:08:39.340844	system	lehre
+2038	core	error_noStudentlehrverband	2026-03-31 14:08:39.344603	system	lehre
+2039	core	error_statuseintrag_zeitabfolge	2026-03-31 14:08:39.348478	system	lehre
+2040	core	error_endstatus	2026-03-31 14:08:39.352324	system	lehre
+2041	core	error_consecutiveUnterbrecher	2026-03-31 14:08:39.356133	system	lehre
+2042	core	error_consecutiveUnterbrecherAbbrecher	2026-03-31 14:08:39.359921	system	lehre
+2043	core	error_consecutiveDiplomandStudent	2026-03-31 14:08:39.363755	system	lehre
+2044	core	error_noStudiensemester	2026-03-31 14:08:39.367611	system	lehre
+2045	core	anzahl_existingRoles	2026-03-31 14:08:39.371509	system	lehre
+2046	core	error_entryInPast	2026-03-31 14:08:39.375277	system	lehre
+2047	core	btn_statusAendern	2026-03-31 14:08:39.379119	system	lehre
+2048	core	neuerTerminBachelorMasterbetreuung	2026-03-31 14:08:39.382962	system	abgabetool
+2049	core	neueTerminserie	2026-03-31 14:08:39.386776	system	abgabetool
+2050	core	c4Sprache	2026-03-31 14:08:39.390631	system	abgabetool
+2051	core	c4fehlerAktualitaetProjektarbeit 	2026-03-31 14:08:39.394483	system	abgabetool
+2052	core	serienTerminEmailSentInfo	2026-03-31 14:08:39.398284	system	abgabetool
+2053	core	serienTerminGespeichert	2026-03-31 14:08:39.402097	system	abgabetool
+2054	core	errorSerienterminSpeichern	2026-03-31 14:08:39.406009	system	abgabetool
+2055	core	c4abgabeMitarbeiterbereich	2026-03-31 14:08:39.409864	system	abgabetool
+2056	core	c4all	2026-03-31 14:08:39.413666	system	abgabetool
+2057	core	abgabe	2026-03-31 14:08:39.417507	system	abgabetool
+2058	core	genericDeleted	2026-03-31 14:08:39.421377	system	ui
+2059	core	error_lastRole	2026-03-31 14:08:39.425229	system	lehre
+2060	core	info_MeldestichtagStatusgrund	2026-03-31 14:08:39.428962	system	bismeldestichtag
+2061	core	info_MeldestichtagStatusgrundSemester	2026-03-31 14:08:39.432682	system	bismeldestichtag
+2062	core	error_location_combination	2026-03-31 14:08:39.436425	system	ui
+2063	core	bittePlzWaehlen	2026-03-31 14:08:39.440175	system	ui
+2064	core	bitteGemeindeWaehlen	2026-03-31 14:08:39.443961	system	ui
+2065	core	bitteStandortWaehlen	2026-03-31 14:08:39.447783	system	ui
+2066	core	error_wrongStatusOrderBeforeStudent	2026-03-31 14:08:39.45168	system	lehre
+2067	core	error_personenkennzeichenPasstNichtZuStudiensemester	2026-03-31 14:08:39.455602	system	lehre
+2068	core	error_bewerberOrgformUngleichStudentOrgform	2026-03-31 14:08:39.459472	system	lehre
+2069	core	error_benutzerBereitsVorhanden	2026-03-31 14:08:39.463392	system	lehre
+2070	core	error_noStatusgrund	2026-03-31 14:08:39.467079	system	lehre
+2071	core	modal_StatusactionSingle	2026-03-31 14:08:39.470802	system	lehre
+2072	core	modal_StatusactionPlural	2026-03-31 14:08:39.474547	system	lehre
+2080	core	add_pruefung	2026-03-31 14:08:39.493718	system	exam
+2081	core	edit_pruefung	2026-03-31 14:08:39.497572	system	exam
+2082	core	delete_pruefung	2026-03-31 14:08:39.501253	system	exam
+2083	core	newFromOld_pruefung	2026-03-31 14:08:39.504976	system	exam
+2084	core	hinweis_kommPrfg	2026-03-31 14:08:39.50886	system	exam
+2085	core	keineAuswahl	2026-03-31 14:08:39.512749	system	exam
+2086	core	hinweis_changeAfterExamDate	2026-03-31 14:08:39.51649	system	exam
+2087	core	bitteLvteilWaehlen	2026-03-31 14:08:39.520421	system	exam
+2088	core	punkte	2026-03-31 14:08:39.524111	system	exam
+2089	core	filter_currentSem	2026-03-31 14:08:39.528092	system	exam
+2090	core	student_uid	2026-03-31 14:08:39.531905	system	ui
+2091	core	btn_printUebernahmebestaetigung	2026-03-31 14:08:39.53578	system	betriebsmittel
+2092	core	btn_editBetriebsmittel	2026-03-31 14:08:39.539717	system	betriebsmittel
+2093	core	btn_deleteBetriebsmittel	2026-03-31 14:08:39.543544	system	betriebsmittel
+2094	core	unbekannt	2026-03-31 14:08:39.547404	system	uhstat
+2095	core	errorConfigFehlt	2026-03-31 14:08:39.551367	system	ui
+2096	core	errorUnbekannteUrl	2026-03-31 14:08:39.555348	system	ui
+2103	core	newestAmpeln	2026-03-31 14:08:39.572057	system	ampeln
+2104	core	allAmpeln	2026-03-31 14:08:39.576038	system	ampeln
+2105	core	overdue	2026-03-31 14:08:39.579941	system	ampeln
+2106	core	ampelnDeadline	2026-03-31 14:08:39.583821	system	ampeln
+2107	core	noOpenAmpeln	2026-03-31 14:08:39.587786	system	ampeln
+2108	core	openAmpeln	2026-03-31 14:08:39.591595	system	ampeln
+2109	core	allMyAmpeln	2026-03-31 14:08:39.595639	system	ampeln
+2110	core	mandatory	2026-03-31 14:08:39.599523	system	ampeln
+2111	core	ampelBestaetigt	2026-03-31 14:08:39.603423	system	ampeln
+2112	core	super	2026-03-31 14:08:39.607245	system	ampeln
+2113	core	allNews	2026-03-31 14:08:39.611105	system	news
+2114	core	topNews	2026-03-31 14:08:39.614912	system	news
+2115	core	noSubject	2026-03-31 14:08:39.618764	system	news
+2116	core	studiengangsleitung	2026-03-31 14:08:39.622723	system	global
+2117	core	stellvertreter	2026-03-31 14:08:39.626575	system	global
+2118	core	sekretariat	2026-03-31 14:08:39.630635	system	global
+2119	core	hochschulvertretung	2026-03-31 14:08:39.634494	system	global
+2120	core	studentenvertreter	2026-03-31 14:08:39.638332	system	global
+2121	core	allgemeinerdownload	2026-03-31 14:08:39.642126	system	global
+2122	core	nichtAngemeldet	2026-03-31 14:08:39.64592	system	global
+2123	core	lvInfoBearbeiten	2026-03-31 14:08:39.649771	system	lehre
+2124	core	lehrveranstaltungsinformation	2026-03-31 14:08:39.653646	system	lehre
+2125	core	lehrveranstaltungsmenue	2026-03-31 14:08:39.657508	system	lehre
+2126	core	lehrveranstaltungsmenueUnavailable	2026-03-31 14:08:39.661536	system	lehre
+2127	core	gesamtnote	2026-03-31 14:08:39.665374	system	lehre
+2128	core	noteneingabedeaktiviert	2026-03-31 14:08:39.669257	system	lehre
+2129	core	keinMailverteiler	2026-03-31 14:08:39.6731	system	lehre
+2130	core	mail	2026-03-31 14:08:39.676919	system	lehre
+2131	core	abmelden	2026-03-31 14:08:39.680692	system	lehre
+2132	core	anrechnung	2026-03-31 14:08:39.684442	system	lehre
+2133	core	anrechnungen	2026-03-31 14:08:39.688228	system	lehre
+2134	core	stundenplan	2026-03-31 14:08:39.692332	system	lehre
+2135	core	personalGreeting	2026-03-31 14:08:39.69608	system	global
+2136	core	myLV	2026-03-31 14:08:39.699892	system	lehre
+2137	core	previousStudSemester	2026-03-31 14:08:39.703702	system	lehre
+2138	core	nextStudSemester	2026-03-31 14:08:39.70747	system	lehre
+2139	core	abgabetoolTitle	2026-03-31 14:08:39.711279	system	abgabetool
+2140	core	keinTitel	2026-03-31 14:08:39.715028	system	abgabetool
+2141	core	c4details	2026-03-31 14:08:39.718825	system	abgabetool
+2142	core	c4sem	2026-03-31 14:08:39.722569	system	abgabetool
+2143	core	c4stg	2026-03-31 14:08:39.726379	system	abgabetool
+2144	core	c4kontakt	2026-03-31 14:08:39.730186	system	abgabetool
+2145	core	c4betreuerv2	2026-03-31 14:08:39.733926	system	abgabetool
+2146	core	c4projekttyp	2026-03-31 14:08:39.737707	system	abgabetool
+2147	core	c4titel	2026-03-31 14:08:39.741431	system	abgabetool
+2148	core	c4abgabeuntil2359	2026-03-31 14:08:39.745205	system	abgabetool
+2149	core	c4abgabeStudentenbereich	2026-03-31 14:08:39.74894	system	abgabetool
+2150	core	c4fixterminv4	2026-03-31 14:08:39.752726	system	abgabetool
+2151	core	c4orgform	2026-03-31 14:08:39.756485	system	abgabetool
+2152	core	c4studstatus	2026-03-31 14:08:39.760214	system	abgabetool
+2153	core	c4signaturGefunden	2026-03-31 14:08:39.764022	system	abgabetool
+2154	core	c4keineSignatur	2026-03-31 14:08:39.767814	system	abgabetool
+2155	core	c4signaturServerError	2026-03-31 14:08:39.771562	system	abgabetool
+2156	core	c4noFileFound	2026-03-31 14:08:39.775335	system	abgabetool
+2157	core	c4fileUploaded	2026-03-31 14:08:39.779064	system	abgabetool
+2158	core	c4actions	2026-03-31 14:08:39.782746	system	abgabetool
+2159	core	c4zieldatumv2	2026-03-31 14:08:39.786416	system	abgabetool
+2160	core	c4abgabetyp	2026-03-31 14:08:39.790227	system	abgabetool
+2161	core	c4abgabekurzbzv2	2026-03-31 14:08:39.793968	system	abgabetool
+2162	core	c4abgabedatum	2026-03-31 14:08:39.797774	system	abgabetool
+2163	core	c4aeltereParbeitBenotenv2	2026-03-31 14:08:39.80151	system	abgabetool
+2164	core	c4keinEnduploadErfolgt	2026-03-31 14:08:39.805376	system	abgabetool
+2165	core	c4fileupload	2026-03-31 14:08:39.809073	system	abgabetool
+2166	core	c4benoten	2026-03-31 14:08:39.812817	system	abgabetool
+2167	core	c4allowedFileTypes	2026-03-31 14:08:39.816617	system	abgabetool
+2168	core	c4save	2026-03-31 14:08:39.820566	system	abgabetool
+2169	core	c4delete	2026-03-31 14:08:39.824311	system	abgabetool
+2170	core	c4enduploadZusatzdaten	2026-03-31 14:08:39.827996	system	abgabetool
+2171	core	c4beurteilung	2026-03-31 14:08:39.83175	system	abgabetool
+2172	core	c4schlagwoerterGer	2026-03-31 14:08:39.835448	system	abgabetool
+2173	core	c4schlagwoerterEng	2026-03-31 14:08:39.839188	system	abgabetool
+2174	core	c4abstractGer	2026-03-31 14:08:39.843063	system	abgabetool
+2175	core	c4abstractEng	2026-03-31 14:08:39.84684	system	abgabetool
+2176	core	c4seitenanzahl	2026-03-31 14:08:39.850612	system	abgabetool
+2177	core	deadlinesTitle	2026-03-31 14:08:39.85437	system	abgabetool
+2178	core	c4yes	2026-03-31 14:08:39.858093	system	abgabetool
+2179	core	c4no	2026-03-31 14:08:39.86183	system	abgabetool
+2180	core	c4gelesenUndAkzeptiert	2026-03-31 14:08:39.865585	system	abgabetool
+2181	core	c4personenkennzeichen	2026-03-31 14:08:39.869364	system	abgabetool
+2182	core	c4vorname	2026-03-31 14:08:39.873099	system	abgabetool
+2183	core	c4nachname	2026-03-31 14:08:39.876892	system	abgabetool
+2184	core	currentlySaving	2026-03-31 14:08:39.880558	system	abgabetool
+2185	core	currentlyLoading	2026-03-31 14:08:39.884307	system	abgabetool
+2186	core	c4betreuerartv2	2026-03-31 14:08:39.887948	system	abgabetool
+2187	core	showAll	2026-03-31 14:08:39.891737	system	abgabetool
+2188	core	showDeadlines	2026-03-31 14:08:39.895543	system	abgabetool
+2189	core	c4abgabeStgSpezifischeRichtlinienBeachten	2026-03-31 14:08:39.899296	system	abgabetool
+2190	core	c4note	2026-03-31 14:08:39.903073	system	abgabetool
+2191	core	c4upload_allowed	2026-03-31 14:08:39.906906	system	abgabetool
+2192	core	c4student_perspective	2026-03-31 14:08:39.91074	system	abgabetool
+2193	core	c4upload	2026-03-31 14:08:39.914494	system	abgabetool
+2194	core	c4plagiatcheck_link	2026-03-31 14:08:39.918666	system	abgabetool
+2195	core	c4noEnduploadFound	2026-03-31 14:08:39.922461	system	abgabetool
+2196	core	c4notizQualGatev2	2026-03-31 14:08:39.926295	system	abgabetool
+2197	core	c4abgabeMitarbeiterDetailTitle	2026-03-31 14:08:39.9301	system	abgabetool
+2198	core	c4abgabeStudentDetailTitle	2026-03-31 14:08:39.933956	system	abgabetool
+2199	core	c4tooltipVerspaetet	2026-03-31 14:08:39.93776	system	abgabetool
+2200	core	c4tooltipBeurteilungerforderlich	2026-03-31 14:08:39.941526	system	abgabetool
+2201	core	c4tooltipBestanden	2026-03-31 14:08:39.94515	system	abgabetool
+2202	core	c4tooltipNichtBestanden	2026-03-31 14:08:39.948797	system	abgabetool
+2203	core	c4tooltipVerpasst	2026-03-31 14:08:39.952497	system	abgabetool
+2204	core	c4tooltipAbzugeben	2026-03-31 14:08:39.956113	system	abgabetool
+2205	core	c4tooltipStandardv2	2026-03-31 14:08:39.959727	system	abgabetool
+2206	core	c4tooltipAbgegeben	2026-03-31 14:08:39.963361	system	abgabetool
+2207	core	c4tooltipFixtermin	2026-03-31 14:08:39.967119	system	abgabetool
+2208	core	c4tooltipAbgabeDetected	2026-03-31 14:08:39.971026	system	abgabetool
+2209	core	c4tapForTooltipInfo	2026-03-31 14:08:39.974826	system	abgabetool
+2210	core	c4abgabeZeitstatus	2026-03-31 14:08:39.978627	system	abgabetool
+2211	core	c4notAllowedToEditAbgabeTermin	2026-03-31 14:08:39.98238	system	abgabetool
+2212	core	c4notAllowedToDeleteAbgabeTermin	2026-03-31 14:08:39.986339	system	abgabetool
+2213	core	c4ZusatzdatenBearbeiten	2026-03-31 14:08:39.990068	system	abgabetool
+2214	core	c4abgabeStudentNoProjectsFound	2026-03-31 14:08:39.993879	system	abgabetool
+2215	core	c4studentAbgabeNotAllowedInViewMode	2026-03-31 14:08:39.997639	system	abgabetool
+2216	core	c4studentAbgabeNotAllowedRegular	2026-03-31 14:08:40.001422	system	abgabetool
+2217	core	c4benotet	2026-03-31 14:08:40.005301	system	abgabetool
+2218	core	c4confirm_delete	2026-03-31 14:08:40.009074	system	abgabetool
+2219	core	c4nochNichtsAbgegeben	2026-03-31 14:08:40.012897	system	abgabetool
+2220	core	c4newAbgabetermin	2026-03-31 14:08:40.016702	system	abgabetool
+2221	core	c4qualgateNegativEmailSubjectv2	2026-03-31 14:08:40.020471	system	abgabetool
+2222	core	c4noGradeAssignedYet	2026-03-31 14:08:40.024224	system	abgabetool
+2223	core	c4abgabeQualGateNegativAddNewAutomagisch	2026-03-31 14:08:40.028298	system	abgabetool
+2224	core	c4betreuerEmailKontaktv2	2026-03-31 14:08:40.032091	system	abgabetool
+2225	core	c4projektdetailsOeffnen	2026-03-31 14:08:40.03593	system	abgabetool
+2226	core	c4downloadBeurteilungErstbetreuerv2	2026-03-31 14:08:40.039804	system	abgabetool
+2227	core	c4downloadBeurteilungZweitbetreuerv2	2026-03-31 14:08:40.043601	system	abgabetool
+2228	core	c4nobeurteilungVorhanden	2026-03-31 14:08:40.047371	system	abgabetool
+2229	core	c4AcceptAndProceed	2026-03-31 14:08:40.051159	system	abgabetool
+2230	core	c4Cancel	2026-03-31 14:08:40.054935	system	abgabetool
+2231	core	c4downloadAbgabe	2026-03-31 14:08:40.058729	system	abgabetool
+2232	core	c4downloadLatestAbgabe	2026-03-31 14:08:40.062497	system	abgabetool
+2233	core	c4termineTimeLine	2026-03-31 14:08:40.066271	system	abgabetool
+2234	core	confirmEnduploadSpeichern	2026-03-31 14:08:40.070016	system	abgabetool
+2235	core	confirmZusatzdatenSpeichern	2026-03-31 14:08:40.073804	system	abgabetool
+2236	core	c4errorLoadingStudentForProjektarbeitID	2026-03-31 14:08:40.077641	system	abgabetool
+2237	core	c4noAssignedStudentForProjektarbeitID	2026-03-31 14:08:40.081463	system	abgabetool
+2238	core	c4zusatzdatenausfuellen	2026-03-31 14:08:40.085229	system	abgabetool
+2239	core	warningShortAbstract	2026-03-31 14:08:40.088963	system	abgabetool
+2240	core	warningShortAbstractEn	2026-03-31 14:08:40.09265	system	abgabetool
+2241	core	warningShortSchlagwoerter	2026-03-31 14:08:40.096307	system	abgabetool
+2242	core	warningShortSchlagwoerterEn	2026-03-31 14:08:40.099944	system	abgabetool
+2243	core	warningSmallSeitenanzahl	2026-03-31 14:08:40.1037	system	abgabetool
+2244	core	c4saveNewAbgabetermin	2026-03-31 14:08:40.107337	system	abgabetool
+2245	core	c4eidesstattlicheErklaerung	2026-03-31 14:08:40.111082	system	abgabetool
+2246	core	c4fileUploadSuccessv3	2026-03-31 14:08:40.114996	system	abgabetool
+2247	core	c4fileUploadErrorv3	2026-03-31 14:08:40.118707	system	abgabetool
+2248	core	c4prevAbgabetermin	2026-03-31 14:08:40.122478	system	abgabetool
+2249	core	c4nextAbgabetermin	2026-03-31 14:08:40.126286	system	abgabetool
+2250	core	c4erstbetreuerv2	2026-03-31 14:08:40.129894	system	abgabetool
+2251	core	c4zweitbetreuerv2	2026-03-31 14:08:40.133559	system	abgabetool
+2252	core	c4projektarbeitTimelineTitle	2026-03-31 14:08:40.137186	system	abgabetool
+2253	core	c4sendEmailStudierendev2	2026-03-31 14:08:40.140808	system	abgabetool
+2254	core	c4sammelmailStudentBetreff	2026-03-31 14:08:40.144554	system	abgabetool
+2255	core	c4sendEmailBetreuerv3	2026-03-31 14:08:40.148253	system	abgabetool
+2256	core	c4sammelmailBetreuerBetreff	2026-03-31 14:08:40.151912	system	abgabetool
+2257	core	c4keineAbgabetermineGefunden	2026-03-31 14:08:40.155697	system	abgabetool
+2258	core	showStudentDetails	2026-03-31 14:08:40.159339	system	abgabetool
+2259	core	keineNoteEingetragen	2026-03-31 14:08:40.162962	system	abgabetool
+2260	core	c4fehlerMailBegutachterv2	2026-03-31 14:08:40.166646	system	abgabetool
+2261	core	c4fehlerMailZweitBegutachterv2	2026-03-31 14:08:40.170319	system	abgabetool
+2262	core	c4projektarbeitNichtGefunden	2026-03-31 14:08:40.173972	system	abgabetool
+2263	core	c4projektabgabeNichtGefunden	2026-03-31 14:08:40.178751	system	abgabetool
+2264	core	c4userNichtGefunden	2026-03-31 14:08:40.182373	system	abgabetool
+2265	core	changedAbgabeterminev2	2026-03-31 14:08:40.185913	system	abgabetool
+2266	core	c4paatypqualgate1	2026-03-31 14:08:40.189427	system	abgabetool
+2267	core	c4paatypqualgate2	2026-03-31 14:08:40.193062	system	abgabetool
+2268	core	c4paatypzwischen	2026-03-31 14:08:40.196785	system	abgabetool
+2269	core	c4paatypnote	2026-03-31 14:08:40.200448	system	abgabetool
+2270	core	c4paatypabstract	2026-03-31 14:08:40.204068	system	abgabetool
+2271	core	c4paatypend	2026-03-31 14:08:40.207843	system	abgabetool
+2272	core	c4paatypenda	2026-03-31 14:08:40.211516	system	abgabetool
+2273	core	c4projtypBachelor	2026-03-31 14:08:40.215185	system	abgabetool
+2274	core	c4projtypProjekt	2026-03-31 14:08:40.218876	system	abgabetool
+2275	core	c4projtypPraktikum	2026-03-31 14:08:40.222558	system	abgabetool
+2276	core	c4projtypPraxis	2026-03-31 14:08:40.226244	system	abgabetool
+2277	core	c4projtypDiplom	2026-03-31 14:08:40.229875	system	abgabetool
+2278	core	c4betrartBegutachter	2026-03-31 14:08:40.233563	system	abgabetool
+2279	core	c4betrartErstbetreuer	2026-03-31 14:08:40.23729	system	abgabetool
+2280	core	c4betrartErstbegutachter	2026-03-31 14:08:40.240987	system	abgabetool
+2281	core	c4betrartZweitbegutachter	2026-03-31 14:08:40.24463	system	abgabetool
+2282	core	c4betrartzweitbetreuer	2026-03-31 14:08:40.248335	system	abgabetool
+2283	core	c4betrartBetreuer	2026-03-31 14:08:40.25203	system	abgabetool
+2284	core	c4betrartSenatsvorsitz	2026-03-31 14:08:40.255675	system	abgabetool
+2285	core	c4betrartSenatsmitglied	2026-03-31 14:08:40.259163	system	abgabetool
+2286	core	c4qgate1Status	2026-03-31 14:08:40.262711	system	abgabetool
+2287	core	c4qgate2Status	2026-03-31 14:08:40.266238	system	abgabetool
+2288	core	c4keinTerminVorhanden	2026-03-31 14:08:40.269845	system	abgabetool
+2289	core	c4checkoutStgMoodleInfos	2026-03-31 14:08:40.273347	system	abgabetool
+2290	core	c4positivBenotet	2026-03-31 14:08:40.277001	system	abgabetool
+2291	core	c4negativBenotet	2026-03-31 14:08:40.280682	system	abgabetool
+2292	core	c4notYetGraded	2026-03-31 14:08:40.284416	system	abgabetool
+2293	core	c4notSubmitted	2026-03-31 14:08:40.2882	system	abgabetool
+2294	core	c4notHappenedYet	2026-03-31 14:08:40.291857	system	abgabetool
+2295	core	c4deadlineExceeded	2026-03-31 14:08:40.2956	system	abgabetool
+2296	core	c4missingSignatureNotification	2026-03-31 14:08:40.299297	system	abgabetool
+2297	core	c4erstbetreuerTitelPre	2026-03-31 14:08:40.302977	system	abgabetool
+2298	core	c4erstbetreuerVorname	2026-03-31 14:08:40.306687	system	abgabetool
+2299	core	c4erstbetreuerNachname	2026-03-31 14:08:40.310376	system	abgabetool
+2300	core	c4erstbetreuerTitelPost	2026-03-31 14:08:40.314053	system	abgabetool
+2301	core	c4zweitbetreuerTitelPre	2026-03-31 14:08:40.317866	system	abgabetool
+2302	core	c4zweitbetreuerVorname	2026-03-31 14:08:40.321605	system	abgabetool
+2303	core	c4zweitbetreuerNachname	2026-03-31 14:08:40.325355	system	abgabetool
+2304	core	c4zweitbetreuerTitelPost	2026-03-31 14:08:40.329113	system	abgabetool
+2305	core	c4noZuordnungBetreuerStudent	2026-03-31 14:08:40.332856	system	abgabetool
+2306	core	fachbereich	2026-03-31 14:08:40.336681	system	lehre
+2307	core	lehrtyp	2026-03-31 14:08:40.340445	system	lehre
+2308	core	assistenz	2026-03-31 14:08:40.344234	system	studiengangInformation
+2309	core	geschaeftsfuehrende_leitung	2026-03-31 14:08:40.347979	system	studiengangInformation
+2310	core	stellvertretende_leitung	2026-03-31 14:08:40.351731	system	studiengangInformation
+2311	core	geschaeftsfuehrende_stellvertretende_leitung	2026-03-31 14:08:40.355501	system	studiengangInformation
+2312	core	Jahrgangsvertretung	2026-03-31 14:08:40.35928	system	studiengangInformation
+2313	core	Studienvertretung	2026-03-31 14:08:40.363051	system	studiengangInformation
+2314	core	Hochschulvertretung	2026-03-31 14:08:40.366813	system	studiengangInformation
+2315	core	general	2026-03-31 14:08:40.370553	system	dashboard
+2316	core	addLine	2026-03-31 14:08:40.374642	system	dashboard
+2317	core	custom	2026-03-31 14:08:40.378552	system	dashboard
+2318	core	dashboardGeneralSectionDescription	2026-03-31 14:08:40.382348	system	dashboard
+2319	core	dashboardCustomSectionDescription	2026-03-31 14:08:40.38613	system	dashboard
+2320	core	dashboardSectionDescription	2026-03-31 14:08:40.389782	system	dashboard
+2321	core	tab_finalexam	2026-03-31 14:08:40.393572	system	stv
+2322	core	abschlussbeurteilung	2026-03-31 14:08:40.397405	system	abschlusspruefung
+2323	core	pruefer1	2026-03-31 14:08:40.40134	system	abschlusspruefung
+2324	core	pruefer2	2026-03-31 14:08:40.404955	system	abschlusspruefung
+2325	core	pruefer3	2026-03-31 14:08:40.408636	system	abschlusspruefung
+2326	core	uhrzeit	2026-03-31 14:08:40.412346	system	global
+2327	core	freigabe	2026-03-31 14:08:40.416242	system	abschlusspruefung
+2328	core	sponsion	2026-03-31 14:08:40.419926	system	abschlusspruefung
+2329	core	abschlusspruefung_id	2026-03-31 14:08:40.423646	system	abschlusspruefung
+2330	core	vorsitz_header	2026-03-31 14:08:40.428712	system	abschlusspruefung
+2331	core	zurBeurteilung	2026-03-31 14:08:40.432445	system	abschlusspruefung
+2332	core	akadGrad	2026-03-31 14:08:40.436114	system	abschlusspruefung
+2333	core	error_studentOhneFinalExam	2026-03-31 14:08:40.439794	system	abschlusspruefung
+2334	core	tab_kontaktieren	2026-03-31 14:08:40.443437	system	stv
+2335	core	internEMail	2026-03-31 14:08:40.44732	system	stv
+2336	core	privateEMail	2026-03-31 14:08:40.451036	system	stv
+2337	core	bccEMail	2026-03-31 14:08:40.454665	system	stv
+2338	core	weitereEMail	2026-03-31 14:08:40.458616	system	stv
+2339	core	zuvieleEMails	2026-03-31 14:08:40.462294	system	stv
+2340	core	notekommpruefung	2026-03-31 14:08:40.466088	system	abschlusspruefung
+2341	core	abschluessPruefungAnlegen	2026-03-31 14:08:40.470062	system	abschlusspruefung
+2342	core	abschluessPruefungBearbeiten	2026-03-31 14:08:40.473908	system	abschlusspruefung
+2343	core	nichtZumEditierenDerGruppeBerechtigt	2026-03-31 14:08:40.477734	system	gruppenmanagement
+2353	core	tab_groups	2026-03-31 14:08:40.497733	system	stv
+2354	core	gruppe	2026-03-31 14:08:40.501632	system	gruppenmanagement
+2355	core	special_groups	2026-03-31 14:08:40.505442	system	gruppenmanagement
+2356	core	add_group	2026-03-31 14:08:40.509225	system	gruppenmanagement
+2357	core	groups_added	2026-03-31 14:08:40.513017	system	gruppenmanagement
+2358	core	automatisch_generiert	2026-03-31 14:08:40.516795	system	gruppenmanagement
+2359	core	error_deleteGeneratedGroups	2026-03-31 14:08:40.52059	system	gruppenmanagement
+2360	core	error_alreadyInGroup	2026-03-31 14:08:40.524447	system	gruppenmanagement
+2361	core	wahlname	2026-03-31 14:08:40.528301	system	person
+2362	core	familienstand	2026-03-31 14:08:40.532191	system	person
+2363	core	foto	2026-03-31 14:08:40.536321	system	person
+2364	core	homepage	2026-03-31 14:08:40.540284	system	person
+2365	core	verband	2026-03-31 14:08:40.544226	system	lehre
+2366	core	aktiv	2026-03-31 14:08:40.54828	system	person
+2367	core	error_no_person	2026-03-31 14:08:40.552193	system	lehre
+2368	core	error_no_student	2026-03-31 14:08:40.556227	system	lehre
+2369	core	geschieden	2026-03-31 14:08:40.560019	system	person
+2370	core	ledig	2026-03-31 14:08:40.563995	system	person
+2371	core	verheiratet	2026-03-31 14:08:40.567864	system	person
+2372	core	verwitwet	2026-03-31 14:08:40.571595	system	person
+2373	core	firma_id	2026-03-31 14:08:40.575428	system	ui
+2374	core	adresse_id	2026-03-31 14:08:40.579574	system	ui
+2375	core	kontakt_id	2026-03-31 14:08:40.583318	system	ui
+2376	core	standort_id	2026-03-31 14:08:40.587154	system	ui
+2377	core	bankverbindung_id	2026-03-31 14:08:40.590841	system	ui
+2378	core	studienplan_id	2026-03-31 14:08:40.594648	system	ui
+2379	core	prestudent_id	2026-03-31 14:08:40.598349	system	ui
+2380	core	notiz_id	2026-03-31 14:08:40.602273	system	ui
+2381	core	notizzuordnung_id	2026-03-31 14:08:40.606085	system	ui
+2382	core	extension_id	2026-03-31 14:08:40.610068	system	ui
+2383	core	type_id	2026-03-31 14:08:40.613895	system	ui
+2384	core	betriebsmittel_id	2026-03-31 14:08:40.617619	system	ui
+2385	core	betriebsmittelperson_id	2026-03-31 14:08:40.621449	system	ui
+2386	core	dropdownLoading	2026-03-31 14:08:40.625193	system	ui
+2387	core	error_noInteger	2026-03-31 14:08:40.629014	system	ui
+2388	core	error_maxSem	2026-03-31 14:08:40.632745	system	ui
+2389	core	tab_mobility	2026-03-31 14:08:40.636508	system	stv
+2390	core	mobilitaetsprogramm	2026-03-31 14:08:40.640288	system	mobility
+2391	core	gastnation	2026-03-31 14:08:40.644009	system	mobility
+2392	core	herkunftsland	2026-03-31 14:08:40.647752	system	mobility
+2393	core	universitaet	2026-03-31 14:08:40.651346	system	mobility
+2394	core	ects_erworben	2026-03-31 14:08:40.655026	system	mobility
+2395	core	ects_angerechnet	2026-03-31 14:08:40.658676	system	mobility
+2396	core	zweck	2026-03-31 14:08:40.66237	system	mobility
+2397	core	aufenthalt	2026-03-31 14:08:40.666074	system	mobility
+2398	core	zweck_neu	2026-03-31 14:08:40.669866	system	mobility
+2399	core	foerderung_neu	2026-03-31 14:08:40.673606	system	mobility
+2400	core	kurzbz_program	2026-03-31 14:08:40.677545	system	mobility
+2401	core	bisio_id	2026-03-31 14:08:40.681282	system	mobility
+2402	core	archiv_dokument_archivieren	2026-03-31 14:08:40.685077	system	stv
+2403	core	tab_archive	2026-03-31 14:08:40.689141	system	stv
+2404	core	archiv_title	2026-03-31 14:08:40.692836	system	stv
+2405	core	archiv_description	2026-03-31 14:08:40.696599	system	stv
+2406	core	archiv_creation_date	2026-03-31 14:08:40.700337	system	stv
+2407	core	archiv_accepted_on_at	2026-03-31 14:08:40.704051	system	stv
+2408	core	archiv_gedruckt	2026-03-31 14:08:40.707773	system	stv
+2409	core	archiv_signiert	2026-03-31 14:08:40.711558	system	stv
+2410	core	archiv_title_edit	2026-03-31 14:08:40.715312	system	stv
+2411	core	archiv_akte	2026-03-31 14:08:40.718887	system	stv
+2412	core	archiv_new_file	2026-03-31 14:08:40.722686	system	stv
+2413	core	archiv_akte_id	2026-03-31 14:08:40.726464	system	stv
+2414	core	archiv_signed	2026-03-31 14:08:40.730292	system	stv
+2415	core	kurzbz	2026-03-31 14:08:40.734009	system	mobility
+2416	core	error_entryExisting	2026-03-31 14:08:40.737806	system	ui
+2417	core	error_existingEntryInExtension	2026-03-31 14:08:40.741535	system	mobility
+2418	core	mobility_anlegen	2026-03-31 14:08:40.745222	system	mobility
+2419	core	mobility_bearbeiten	2026-03-31 14:08:40.748854	system	mobility
+2420	core	lvdev_uebersichten	2026-03-31 14:08:40.752635	system	kvp
+2421	core	kompetenzfeld	2026-03-31 14:08:40.756337	system	lehre
+2422	core	expand_all	2026-03-31 14:08:40.759979	system	ui
+2423	core	collapse_all	2026-03-31 14:08:40.763693	system	ui
+2424	core	quellkurs	2026-03-31 14:08:40.767469	system	lehre
+2431	projektarbeitsbeurteilung	maxPunkte	2026-03-31 14:08:40.782001	system	projektarbeitsbeurteilung
+2432	projektarbeitsbeurteilung	bewertung	2026-03-31 14:08:40.785809	system	projektarbeitsbeurteilung
+2433	projektarbeitsbeurteilung	details	2026-03-31 14:08:40.789527	system	projektarbeitsbeurteilung
+2434	projektarbeitsbeurteilung	problemstellungZieldefinition	2026-03-31 14:08:40.793297	system	projektarbeitsbeurteilung
+2435	projektarbeitsbeurteilung	problemstellungZieldefinitionText	2026-03-31 14:08:40.797072	system	projektarbeitsbeurteilung
+2436	projektarbeitsbeurteilung	methodikLoesungsansatz	2026-03-31 14:08:40.800812	system	projektarbeitsbeurteilung
+2437	projektarbeitsbeurteilung	methodikLoesungsansatzText	2026-03-31 14:08:40.804601	system	projektarbeitsbeurteilung
+2438	projektarbeitsbeurteilung	ergebnisseDiskussion	2026-03-31 14:08:40.808351	system	projektarbeitsbeurteilung
+2439	projektarbeitsbeurteilung	ergebnisseDiskussionText	2026-03-31 14:08:40.812095	system	projektarbeitsbeurteilung
+2440	projektarbeitsbeurteilung	strukturAufbau	2026-03-31 14:08:40.815836	system	projektarbeitsbeurteilung
+2441	projektarbeitsbeurteilung	strukturAufbauText	2026-03-31 14:08:40.81957	system	projektarbeitsbeurteilung
+2442	projektarbeitsbeurteilung	stilAusdruck	2026-03-31 14:08:40.823332	system	projektarbeitsbeurteilung
+2443	projektarbeitsbeurteilung	stilAusdruckText	2026-03-31 14:08:40.82698	system	projektarbeitsbeurteilung
+2444	projektarbeitsbeurteilung	zitierregelnQuellenangaben	2026-03-31 14:08:40.830707	system	projektarbeitsbeurteilung
+2445	projektarbeitsbeurteilung	zitierregelnQuellenangabenText	2026-03-31 14:08:40.834443	system	projektarbeitsbeurteilung
+2446	projektarbeitsbeurteilung	notenschluesselHinweisGewichtungEinzeln	2026-03-31 14:08:40.838202	system	projektarbeitsbeurteilung
+2447	projektarbeitsbeurteilung	gesamtkommentar	2026-03-31 14:08:40.841861	system	projektarbeitsbeurteilung
+2448	projektarbeitsbeurteilung	gesamtkommentarVerpflichtend	2026-03-31 14:08:40.845869	system	projektarbeitsbeurteilung
+2449	projektarbeitsbeurteilung	eingabefeld	2026-03-31 14:08:40.849578	system	projektarbeitsbeurteilung
+2450	projektarbeitsbeurteilung	universitaetLogo	2026-03-31 14:08:40.85323	system	projektarbeitsbeurteilung
+2451	projektarbeitsbeurteilung	textEingabefeldBewertung	2026-03-31 14:08:40.856983	system	projektarbeitsbeurteilung
+2452	core	addVertrag	2026-03-31 14:08:40.860742	system	vertrag
+2453	core	editVertrag	2026-03-31 14:08:40.864455	system	vertrag
+2454	core	deleteVertrag	2026-03-31 14:08:40.868416	system	vertrag
+2455	core	addStatus	2026-03-31 14:08:40.872121	system	vertrag
+2456	core	editStatus	2026-03-31 14:08:40.87584	system	vertrag
+2457	core	deleteStatus	2026-03-31 14:08:40.87991	system	vertrag
+2458	core	deleteLehrauftrag	2026-03-31 14:08:40.883783	system	vertrag
+2459	core	datum_vertrag	2026-03-31 14:08:40.887653	system	vertrag
+2460	core	vertrag_urfassung	2026-03-31 14:08:40.891477	system	vertrag
+2461	core	filter_offeneVertraege	2026-03-31 14:08:40.895294	system	vertrag
+2462	core	error_addOrUpdateLehrauftraege	2026-03-31 14:08:40.899118	system	vertrag
+2463	core	error_insertOrUpdateStatusVertrag	2026-03-31 14:08:40.902915	system	vertrag
+2464	core	error_statusVorhanden	2026-03-31 14:08:40.906709	system	vertrag
+2465	core	vertragErstellen	2026-03-31 14:08:40.910657	system	vertrag
+2466	core	vertragDetails	2026-03-31 14:08:40.914527	system	vertrag
+2467	core	vertragStatus	2026-03-31 14:08:40.918496	system	vertrag
+2468	core	error_fieldNotValidDate	2026-03-31 14:08:40.922338	system	ui
+2469	core	text_explainLehrauftrag	2026-03-31 14:08:40.926129	system	vertrag
+2470	core	text_addLehrauftrag	2026-03-31 14:08:40.930051	system	vertrag
+2471	core	vertragsverwaltung	2026-03-31 14:08:40.933866	system	vertrag
+2472	core	nurAktiveMaAnzeigen	2026-03-31 14:08:40.937822	system	vertrag
+2473	core	printHonorarvertrag	2026-03-31 14:08:40.941579	system	vertrag
+2474	core	alertMindestensZweiVertraege	2026-03-31 14:08:40.945251	system	vertrag
+2475	core	alertOnlyApprovedContracts	2026-03-31 14:08:40.948847	system	vertrag
+2476	core	vertragsarten	2026-03-31 14:08:40.952493	system	vertrag
+2477	core	idsDienstverhaeltnisse	2026-03-31 14:08:40.956203	system	vertrag
+2478	core	vertragstyp	2026-03-31 14:08:40.959848	system	vertrag
+2479	core	vertragsdatum	2026-03-31 14:08:40.963506	system	vertrag
+2480	core	vertragsdatum_iso	2026-03-31 14:08:40.967139	system	vertrag
+2481	core	vertrag_id	2026-03-31 14:08:40.970819	system	ui
+2482	core	vertragsstunden	2026-03-31 14:08:40.974503	system	vertrag
+2483	core	vertragsstunden_studiensemester	2026-03-31 14:08:40.978135	system	vertrag
+2484	core	abgerechnet	2026-03-31 14:08:40.981782	system	vertrag
+2485	core	gewicht	2026-03-31 14:08:40.985414	system	lehre
+2486	core	newlehreinheit	2026-03-31 14:08:40.989034	system	lehre
+2487	core	bezeichnungeng	2026-03-31 14:08:40.992682	system	lehre
+2488	core	detailanmerkung	2026-03-31 14:08:40.996291	system	lehre
+2489	core	unr	2026-03-31 14:08:40.999931	system	lehre
+2490	core	las	2026-03-31 14:08:41.003633	system	lehre
+2491	core	lehre	2026-03-31 14:08:41.007276	system	lehre
+2492	core	raumtyp	2026-03-31 14:08:41.011021	system	lehre
+2493	core	lehrende	2026-03-31 14:08:41.014705	system	lehre
+2494	core	raumtypalternativ	2026-03-31 14:08:41.018333	system	lehre
+2495	core	startkw	2026-03-31 14:08:41.02195	system	lehre
+2496	core	stundenblockung	2026-03-31 14:08:41.025568	system	lehre
+2497	core	wochenrhythmus	2026-03-31 14:08:41.029235	system	lehre
+2498	core	lehrfunktion	2026-03-31 14:08:41.032932	system	lehre
+2499	core	anmerkung	2026-03-31 14:08:41.036611	system	lehre
+2500	core	aufklappen	2026-03-31 14:08:41.040208	system	lehre
+2501	core	zuklappen	2026-03-31 14:08:41.043855	system	lehre
+2502	core	planstunden	2026-03-31 14:08:41.047357	system	lehre
+2503	core	leplanstunden	2026-03-31 14:08:41.050775	system	lehre
+2504	core	default	2026-03-31 14:08:41.054237	system	lehre
+2505	core	stundensatz	2026-03-31 14:08:41.057811	system	lehre
+2506	core	bismelden	2026-03-31 14:08:41.061452	system	lehre
+2507	core	gesamtkosten	2026-03-31 14:08:41.065065	system	lehre
+2508	core	daten	2026-03-31 14:08:41.068672	system	lehre
+2509	core	lehreinheit_id	2026-03-31 14:08:41.072296	system	lehre
+2510	core	verplant	2026-03-31 14:08:41.075957	system	lehre
+2511	core	addLektor	2026-03-31 14:08:41.079717	system	lehre
+2512	core	gruppen	2026-03-31 14:08:41.083459	system	lehre
+2513	core	addGroup	2026-03-31 14:08:41.087201	system	lehre
+2514	core	assignPerson	2026-03-31 14:08:41.090913	system	lehre
+2515	core	assignedPersons	2026-03-31 14:08:41.094635	system	lehre
+2516	core	geaendert	2026-03-31 14:08:41.098373	system	lehre
+2517	core	vertragurfassung	2026-03-31 14:08:41.102129	system	lehre
+2518	core	vertragsdetails	2026-03-31 14:08:41.105857	system	lehre
+2519	core	semesterstunden	2026-03-31 14:08:41.109643	system	lehre
+2520	core	vertragsstatus	2026-03-31 14:08:41.113415	system	lehre
+2521	core	auslvplanentfernen	2026-03-31 14:08:41.117184	system	lehre
+2522	core	lehrfach	2026-03-31 14:08:41.120896	system	lehre
+2523	core	tab_messages	2026-03-31 14:08:41.124661	system	stv
+2524	core	unread	2026-03-31 14:08:41.128505	system	messages
+2525	core	read	2026-03-31 14:08:41.132206	system	messages
+2526	core	archived	2026-03-31 14:08:41.136001	system	messages
+2527	core	deleted	2026-03-31 14:08:41.139856	system	messages
+2528	core	body	2026-03-31 14:08:41.143617	system	messages
+2529	core	message_id	2026-03-31 14:08:41.147407	system	messages
+2530	core	sender	2026-03-31 14:08:41.151156	system	messages
+2531	core	recipient	2026-03-31 14:08:41.154933	system	messages
+2532	core	senderId	2026-03-31 14:08:41.158666	system	messages
+2533	core	recipientId	2026-03-31 14:08:41.162425	system	messages
+2534	core	successSent	2026-03-31 14:08:41.166226	system	ui
+2535	core	btnAktualisieren	2026-03-31 14:08:41.170007	system	ui
+2536	core	neueNachricht	2026-03-31 14:08:41.173811	system	messages
+2537	core	meineFelder	2026-03-31 14:08:41.177573	system	messages
+2538	core	reset	2026-03-31 14:08:41.18138	system	ui
+2539	core	tab_documents	2026-03-31 14:08:41.185253	system	stv
+2540	core	uploadDokument	2026-03-31 14:08:41.189012	system	ui
+2541	core	deleteDokument	2026-03-31 14:08:41.192865	system	ui
+2542	core	editDokument	2026-03-31 14:08:41.19667	system	ui
+2543	core	title	2026-03-31 14:08:41.200406	system	dokumente
+2544	core	dokTyp	2026-03-31 14:08:41.204107	system	dokumente
+2545	core	nachreichungAm	2026-03-31 14:08:41.207898	system	dokumente
+2546	core	dokDetails	2026-03-31 14:08:41.211527	system	dokumente
+2547	core	anmerkung_person	2026-03-31 14:08:41.215296	system	dokumente
+2548	core	successUpload	2026-03-31 14:08:41.219051	system	ui
+2549	core	dokumentAccept	2026-03-31 14:08:41.222792	system	dokumente
+2550	core	dokumentUnaccept	2026-03-31 14:08:41.226614	system	dokumente
+2551	core	accepted	2026-03-31 14:08:41.23041	system	dokumente
+2552	core	unaccepted	2026-03-31 14:08:41.234327	system	dokumente
+2553	core	err_deleteDokHere	2026-03-31 14:08:41.238109	system	dokumente
+2554	core	err_updateNotAllowed	2026-03-31 14:08:41.241929	system	dokumente
+2555	core	downloadDok	2026-03-31 14:08:41.245965	system	ui
+2556	core	successAccepted	2026-03-31 14:08:41.249988	system	dokumente
+2557	core	successUnaccepted	2026-03-31 14:08:41.253947	system	dokumente
+2558	core	successCountUnaccepted	2026-03-31 14:08:41.257958	system	dokumente
+2559	core	successCountAccepted	2026-03-31 14:08:41.261936	system	dokumente
+2560	core	errorUnaccepted	2026-03-31 14:08:41.26579	system	dokumente
+2561	core	errorAccepted	2026-03-31 14:08:41.269612	system	dokumente
+2562	core	errorMissingValue	2026-03-31 14:08:41.273571	system	ui
+2563	core	error_valueNotNumeric	2026-03-31 14:08:41.277389	system	ui
+2564	core	nachgereicht	2026-03-31 14:08:41.281261	system	dokumente
+2565	core	vorhanden	2026-03-31 14:08:41.285167	system	dokumente
+2566	core	akte_id	2026-03-31 14:08:41.288947	system	global
+2567	core	nachgereicht_am	2026-03-31 14:08:41.292739	system	global
+2568	core	datumAkzeptiert	2026-03-31 14:08:41.296546	system	dokumente
+2569	core	akzeptiertVon	2026-03-31 14:08:41.300343	system	dokumente
+2570	core	dms_id	2026-03-31 14:08:41.304091	system	global
+2571	core	error_fileMissing	2026-03-31 14:08:41.307925	system	dokumente
+2572	core	error_fileType	2026-03-31 14:08:41.311805	system	dokumente
+2573	core	error_duplicateDokument_kurzbz	2026-03-31 14:08:41.315649	system	dokumente
+2574	core	begruendung	2026-03-31 14:08:41.319586	system	anrechnung
+2575	core	genehmigtVon	2026-03-31 14:08:41.323652	system	anrechnung
+2576	core	editAnrechnung	2026-03-31 14:08:41.327547	system	anrechnung
+2577	core	existingNotes	2026-03-31 14:08:41.331441	system	anrechnung
+2578	core	anrechnung_id	2026-03-31 14:08:41.335344	system	ui
+2579	core	lehrveranstaltung_id_kompatibel	2026-03-31 14:08:41.339186	system	anrechnung
+2580	core	lehrveranstaltung_bez_kompatibel	2026-03-31 14:08:41.343107	system	anrechnung
+2581	core	tab_jointstudies	2026-03-31 14:08:41.34699	system	stv
+2582	core	gemeinsamesStudium	2026-03-31 14:08:41.350799	system	jointstudies
+2583	core	gemeinsameStudien	2026-03-31 14:08:41.354654	system	jointstudies
+2584	core	studienprogramm	2026-03-31 14:08:41.358499	system	jointstudies
+2585	core	neuAnlegen	2026-03-31 14:08:41.362419	system	jointstudies
+2586	core	edit	2026-03-31 14:08:41.366395	system	jointstudies
+2587	core	mobilitaet_id	2026-03-31 14:08:41.370363	system	global
+2588	core	tab_courseDates	2026-03-31 14:08:41.374295	system	stv
+2589	core	export	2026-03-31 14:08:41.378295	system	ui
+2590	core	stundenplanDev	2026-03-31 14:08:41.382315	system	lehre
+2591	core	lehreinheit_id	2026-03-31 14:08:41.386322	system	global
+2592	core	dateFrom	2026-03-31 14:08:41.390316	system	ui
+2593	core	dateTo	2026-03-31 14:08:41.394331	system	ui
+2594	core	gruppen	2026-03-31 14:08:41.398315	system	global
+2595	core	ortLocation	2026-03-31 14:08:41.402342	system	global
+2596	core	lehrfach	2026-03-31 14:08:41.40634	system	global
+2597	core	termine	2026-03-31 14:08:41.410338	system	global
+2598	core	tab_admissionDates	2026-03-31 14:08:41.414213	system	stv
+2599	core	reihungstest	2026-03-31 14:08:41.418079	system	lehre
+2600	core	admission_edit	2026-03-31 14:08:41.422062	system	admission
+2601	core	admission_delete	2026-03-31 14:08:41.426083	system	admission
+2602	core	admission_new	2026-03-31 14:08:41.430003	system	admission
+2603	core	anmeldundRtAm	2026-03-31 14:08:41.433887	system	admission
+2604	core	rtAngetreten	2026-03-31 14:08:41.437726	system	admission
+2605	core	rtAbsolviert	2026-03-31 14:08:41.441675	system	admission
+2606	core	gesamtpunkte	2026-03-31 14:08:41.445515	system	admission
+2607	core	gesamtpunkteBerechnen	2026-03-31 14:08:41.449323	system	admission
+2608	core	allgemein	2026-03-31 14:08:41.453155	system	admission
+2609	core	headerRTVerwaltung	2026-03-31 14:08:41.457324	system	admission
+2610	core	loadZukuenftigeRT	2026-03-31 14:08:41.461418	system	admission
+2611	core	getRTErgebnis	2026-03-31 14:08:41.465371	system	admission
+2612	core	filterOnlyFutureActive	2026-03-31 14:08:41.469257	system	ui
+2613	core	reihungstest_id	2026-03-31 14:08:41.473184	system	ui
+2614	core	reihungstest_person_id	2026-03-31 14:08:41.477047	system	ui
+2615	core	stufe	2026-03-31 14:08:41.480861	system	admission
+2616	core	anmeldedatum	2026-03-31 14:08:41.484662	system	admission
+2617	core	teilgenommen	2026-03-31 14:08:41.488487	system	admission
+2618	core	stg_kurz	2026-03-31 14:08:41.492479	system	admission
+2619	core	ausgewaehlt	2026-03-31 14:08:41.49633	system	global
+2620	core	gefiltert	2026-03-31 14:08:41.500433	system	global
+2621	core	gesamt	2026-03-31 14:08:41.504681	system	global
+2622	core	tab_functions	2026-03-31 14:08:41.508932	system	stv
+2623	core	filter_active	2026-03-31 14:08:41.513026	system	funktion
+2624	core	addFunktion	2026-03-31 14:08:41.516791	system	funktion
+2625	core	editFunktion	2026-03-31 14:08:41.52074	system	funktion
+2626	core	saveAsCopy	2026-03-31 14:08:41.524655	system	ui
+2627	core	error_fieldMustBePositiveInteger	2026-03-31 14:08:41.528414	system	ui
+2628	core	bitteUnternehmenWaehlen	2026-03-31 14:08:41.532179	system	ui
+2629	core	error_keineBerechtigungStg	2026-03-31 14:08:41.53582	system	ui
+2630	core	attention	2026-03-31 14:08:41.539441	system	alert
+2631	core	confirm_delete	2026-03-31 14:08:41.54318	system	alert
+2632	core	systemerror	2026-03-31 14:08:41.548243	system	alert
+2633	core	chooseStudent	2026-03-31 14:08:41.551989	system	ui
+2634	core	notizHinzufuegen	2026-03-31 14:08:41.55573	system	ui
+2635	core	mitarbeiter_uid	2026-03-31 14:08:41.559516	system	ui
+2636	core	pruefung_id	2026-03-31 14:08:41.563283	system	ui
+2637	core	error_fieldInvalidAlias	2026-03-31 14:08:41.566983	system	ui
+2638	core	error_fieldLessThan1000	2026-03-31 14:08:41.57081	system	ui
+2639	core	error_fieldNoValidNumber	2026-03-31 14:08:41.574571	system	ui
+2640	core	submit	2026-03-31 14:08:41.578315	system	search
+2641	core	input_search_label	2026-03-31 14:08:41.582077	system	search
+2642	core	type_employee	2026-03-31 14:08:41.585887	system	search
+2643	core	type_student	2026-03-31 14:08:41.589675	system	search
+2644	core	type_prestudent	2026-03-31 14:08:41.593391	system	search
+2645	core	type_room	2026-03-31 14:08:41.5971	system	search
+2646	core	type_organisationunit	2026-03-31 14:08:41.600811	system	search
+2647	core	type_cms	2026-03-31 14:08:41.604605	system	search
+2648	core	type_dms	2026-03-31 14:08:41.608361	system	search
+2649	core	button_filter_label	2026-03-31 14:08:41.612187	system	search
+2650	core	applyfilter_label	2026-03-31 14:08:41.61609	system	search
+2651	core	action_default_label	2026-03-31 14:08:41.619938	system	search
+2652	core	result_student_uid	2026-03-31 14:08:41.623976	system	search
+2653	core	result_prestudent_id	2026-03-31 14:08:41.627878	system	search
+2654	core	result_emails	2026-03-31 14:08:41.63179	system	search
+2655	core	result_group_emails	2026-03-31 14:08:41.635665	system	search
+2656	core	result_employee	2026-03-31 14:08:41.639529	system	search
+2657	core	result_stdkst	2026-03-31 14:08:41.643474	system	search
+2658	core	result_stdkst_none	2026-03-31 14:08:41.647364	system	search
+2659	core	result_parent_oe	2026-03-31 14:08:41.651375	system	search
+2660	core	result_oe_none	2026-03-31 14:08:41.65523	system	search
+2661	core	result_room_address	2026-03-31 14:08:41.659108	system	search
+2662	core	result_address_floor	2026-03-31 14:08:41.663054	system	search
+2663	core	result_address_none	2026-03-31 14:08:41.666928	system	search
+2664	core	result_workplaces	2026-03-31 14:08:41.670783	system	search
+2665	core	result_workplaces_pc	2026-03-31 14:08:41.674662	system	search
+2666	core	result_workplaces_none	2026-03-31 14:08:41.678639	system	search
+2667	core	result_building	2026-03-31 14:08:41.68251	system	search
+2668	core	result_equipment	2026-03-31 14:08:41.686361	system	search
+2669	core	result_leader	2026-03-31 14:08:41.690233	system	search
+2670	core	result_leader_none	2026-03-31 14:08:41.694104	system	search
+2671	core	result_number_of_employees	2026-03-31 14:08:41.697974	system	search
+2672	core	result_dms_id	2026-03-31 14:08:41.701954	system	search
+2673	core	result_version	2026-03-31 14:08:41.705896	system	search
+2674	core	result_keywords	2026-03-31 14:08:41.709827	system	search
+2675	core	result_content_none	2026-03-31 14:08:41.713731	system	search
+2676	core	error_missing_type	2026-03-31 14:08:41.717619	system	search
+2677	core	error_no_results	2026-03-31 14:08:41.721711	system	search
+2678	core	error_unknown_type	2026-03-31 14:08:41.725627	system	search
+2679	core	error_general	2026-03-31 14:08:41.72957	system	search
+2680	core	error_missing_config	2026-03-31 14:08:41.733556	system	search
+2681	core	error_invalid_config	2026-03-31 14:08:41.737339	system	search
+2682	core	error_invalid_config_searchfield	2026-03-31 14:08:41.741104	system	search
+2683	core	error_fotoupload	2026-03-31 14:08:41.744926	system	header
+2684	core	successFotoUpload	2026-03-31 14:08:41.748864	system	ui
+2685	core	alert_chooseFoto	2026-03-31 14:08:41.752713	system	header
+2686	core	error_noPhoto	2026-03-31 14:08:41.756615	system	header
+2687	core	termineImLvPlan	2026-03-31 14:08:41.760495	system	lehre
+2688	core	meldebestaetigung	2026-03-31 14:08:41.76436	system	profilUpdate
+2689	core	nachweisdokumente	2026-03-31 14:08:41.768241	system	profilUpdate
+2690	core	emailFehlt	2026-03-31 14:08:41.772079	system	onboarding
+2691	core	emailUngueltig	2026-03-31 14:08:41.775939	system	onboarding
+2692	core	emailRegistriert	2026-03-31 14:08:41.779833	system	onboarding
+2693	core	bewerbungZugangEmailBetreff	2026-03-31 14:08:41.7837	system	onboarding
+2694	core	bewerbungZugangEmailAnredeWeiblich	2026-03-31 14:08:41.787574	system	onboarding
+2695	core	bewerbungZugangEmailAnredeMaennlich	2026-03-31 14:08:41.791415	system	onboarding
+2696	core	bewerbungZugangEmailAnredeNeutral	2026-03-31 14:08:41.795325	system	onboarding
+2697	core	bewerbungVerifzieren	2026-03-31 14:08:41.799226	system	onboarding
+2698	core	bewerbungVerifizierungEinleitung	2026-03-31 14:08:41.803212	system	onboarding
+2699	core	bewerbungVerifizierungKontakthinweis	2026-03-31 14:08:41.807124	system	onboarding
+2700	core	bewerbungVerifizierungDatenschutzhinweis	2026-03-31 14:08:41.810959	system	onboarding
+2701	core	bewerbungVerifizierungDatenschutzhinweisText	2026-03-31 14:08:41.814882	system	onboarding
+2702	core	bewerbungVerifizierungInformationenDatenschutzGrundverordnung	2026-03-31 14:08:41.818921	system	onboarding
+2703	core	bewerbungVerifizierungDatenschutzFragen	2026-03-31 14:08:41.822742	system	onboarding
+2704	core	vorname	2026-03-31 14:08:41.826441	system	onboarding
+2705	core	nachname	2026-03-31 14:08:41.830212	system	onboarding
+2706	core	geburtsdatum	2026-03-31 14:08:41.834129	system	onboarding
+2707	core	emailAdresse	2026-03-31 14:08:41.838151	system	onboarding
+2708	core	emailGesendet	2026-03-31 14:08:41.842176	system	onboarding
+2709	core	emailGesendetHinweis	2026-03-31 14:08:41.846478	system	onboarding
+2710	core	fehlerBeiRegistrierung	2026-03-31 14:08:41.850487	system	onboarding
+2711	core	fehlerBeiRegistrierungText	2026-03-31 14:08:41.854458	system	onboarding
+2712	core	fehlerBeiRegistrierungNochmalVersuchen	2026-03-31 14:08:41.858459	system	onboarding
+2713	core	zustimmungDatenuebermittlung	2026-03-31 14:08:41.862525	system	onboarding
+2714	core	zustimmungDatenschutzerklaerung	2026-03-31 14:08:41.866545	system	onboarding
+2715	core	bitteDatenuebermittlungZustimmen	2026-03-31 14:08:41.87052	system	onboarding
+2716	core	bitteDatenschutzerklaerungZustimmen	2026-03-31 14:08:41.874552	system	onboarding
+2717	core	tab_projektarbeit	2026-03-31 14:08:41.878537	system	stv
+2718	core	projektarbeitAnlegen	2026-03-31 14:08:41.882502	system	projektarbeit
+2719	core	projektarbeitBearbeiten	2026-03-31 14:08:41.886455	system	projektarbeit
+2720	core	titel	2026-03-31 14:08:41.890698	system	projektarbeit
+2721	core	titelEnglisch	2026-03-31 14:08:41.894658	system	projektarbeit
+2722	core	themenbereich	2026-03-31 14:08:41.898628	system	projektarbeit
+2723	core	typ	2026-03-31 14:08:41.902629	system	projektarbeit
+2724	core	firma	2026-03-31 14:08:41.906655	system	projektarbeit
+2725	core	lehrveranstaltung	2026-03-31 14:08:41.910663	system	projektarbeit
+2726	core	lvTeil	2026-03-31 14:08:41.914782	system	projektarbeit
+2727	core	betreuer	2026-03-31 14:08:41.918737	system	projektarbeit
+2728	core	betreuerGross	2026-03-31 14:08:41.922697	system	projektarbeit
+2729	core	betreuerart	2026-03-31 14:08:41.926861	system	projektarbeit
+2730	core	note	2026-03-31 14:08:41.930808	system	projektarbeit
+2731	core	stunden	2026-03-31 14:08:41.934927	system	projektarbeit
+2732	core	stundensatz	2026-03-31 14:08:41.93893	system	projektarbeit
+2733	core	beginn	2026-03-31 14:08:41.942877	system	projektarbeit
+2734	core	ende	2026-03-31 14:08:41.946937	system	projektarbeit
+2735	core	freigegeben	2026-03-31 14:08:41.950925	system	projektarbeit
+2736	core	gesperrtBis	2026-03-31 14:08:41.954928	system	projektarbeit
+2737	core	anmerkung	2026-03-31 14:08:41.958828	system	projektarbeit
+2738	core	firmaId	2026-03-31 14:08:41.962673	system	projektarbeit
+2739	core	error_betreuerNichtGeloescht	2026-03-31 14:08:41.966607	system	projektarbeit
+2740	core	error_paabgabeNichtGeloescht	2026-03-31 14:08:41.970399	system	projektarbeit
+2741	core	error_invalidProjektbetreuer	2026-03-31 14:08:41.974229	system	projektarbeit
+2742	core	error_betreuerHatVertrag	2026-03-31 14:08:41.978165	system	projektarbeit
+2743	core	neuePersonAnlegen	2026-03-31 14:08:41.982013	system	projektarbeit
+2744	core	titelPre	2026-03-31 14:08:41.985817	system	person
+2745	core	titelPost	2026-03-31 14:08:41.989738	system	person
+2746	core	weitereVornamen	2026-03-31 14:08:41.99367	system	person
+2747	core	bestehendeAdresseUeberschreiben	2026-03-31 14:08:41.997572	system	person
+2748	core	adresseHinzufuegen	2026-03-31 14:08:42.00146	system	person
+2749	core	adresseNichtAnlegen	2026-03-31 14:08:42.005296	system	person
+2750	core	land	2026-03-31 14:08:42.009101	system	person
+2751	core	mobil	2026-03-31 14:08:42.012924	system	person
+2752	core	letzeAusbildung	2026-03-31 14:08:42.016843	system	lehre
+2753	core	ausbildungsart	2026-03-31 14:08:42.020696	system	lehre
+2754	core	anmerkungen	2026-03-31 14:08:42.024482	system	lehre
+2755	core	personAnlegen	2026-03-31 14:08:42.028253	system	person
+2756	core	interessentAnlegen	2026-03-31 14:08:42.032212	system	lehre
+2757	core	personExistiertPruefung	2026-03-31 14:08:42.036196	system	person
+2758	core	zurueck	2026-03-31 14:08:42.040179	system	ui
+2759	core	kontaktdatenBearbeiten	2026-03-31 14:08:42.044139	system	projektarbeit
+2760	core	projektbeurteilungErstellen	2026-03-31 14:08:42.048056	system	projektarbeit
+2761	core	projektarbeitNochNichtBeurteilt	2026-03-31 14:08:42.051987	system	projektarbeit
+2762	core	vertragStornieren	2026-03-31 14:08:42.055927	system	lehre
+2763	core	nochKeinVertrag	2026-03-31 14:08:42.059835	system	lehre
+2764	core	betreuerBearbeiten	2026-03-31 14:08:42.063801	system	projektarbeit
+2765	core	betreuerSpeichern	2026-03-31 14:08:42.06768	system	projektarbeit
+2766	core	zurFirmenverwaltung	2026-03-31 14:08:42.071482	system	projektarbeit
+2767	core	punkte	2026-03-31 14:08:42.075328	system	projektarbeit
+2768	core	gesamtnote	2026-03-31 14:08:42.079196	system	projektarbeit
+2769	core	abgabeEndupload	2026-03-31 14:08:42.083152	system	projektarbeit
+2770	core	vertrag_id	2026-03-31 14:08:42.087102	system	projektarbeit
+2771	core	projektarbeit_id	2026-03-31 14:08:42.091171	system	projektarbeit
+2772	core	betreuerart_kurzbz	2026-03-31 14:08:42.095135	system	projektarbeit
+2773	core	typ_kurzbz	2026-03-31 14:08:42.099117	system	projektarbeit
+2774	core	betreuerZugewiesen	2026-03-31 14:08:42.103119	system	projektarbeit
+2775	core	error_paarbeitHatBeurteilung	2026-03-31 14:08:42.107094	system	projektarbeit
+2776	core	dokument_erstellen	2026-03-31 14:08:42.111161	system	dokumente
+2777	core	abschicken	2026-03-31 14:08:42.115105	system	global
+2778	core	zurueckZumStart	2026-03-31 14:08:42.119082	system	global
+2802	core	tab_combine_people	2026-03-31 14:08:42.168518	system	stv
+2803	core	question_combine_people	2026-03-31 14:08:42.172436	system	stv
+2804	core	error_combinePeople_samePerson	2026-03-31 14:08:42.17633	system	stv
+2805	core	errorMissingOrInvalidParameterRecipientTypeId	2026-03-31 14:08:42.180292	system	ui
+2806	core	errorMissingOrInvalidParameterRecipientIds	2026-03-31 14:08:42.184041	system	ui
+2807	core	errorMissingOrInvalidParameters	2026-03-31 14:08:42.187953	system	ui
+2808	core	errorEditorNotAvailable	2026-03-31 14:08:42.19169	system	messages
+2809	core	error_missingLogic	2026-03-31 14:08:42.195685	system	messages
+2810	core	error_noLehrverbandAssigned	2026-03-31 14:08:42.199652	system	stv
+2811	core	deleteInfo	2026-03-31 14:08:42.203505	system	ui
+2812	core	success_savePreset	2026-03-31 14:08:42.2075	system	dashboard
+2813	core	alert_deleteWidget	2026-03-31 14:08:42.211516	system	dashboard
+2814	core	confirm_delete	2026-03-31 14:08:42.215509	system	ui
 \.
 
 
@@ -39851,6 +42048,7 @@ COPY system.tbl_phrasentext (phrasentext_id, phrase_id, sprache, orgeinheit_kurz
 1277	640	English	\N	\N	Error when getting student union fees	\N	2021-11-11 12:39:58.98887	system
 1278	641	German	\N	\N	Fehler beim Holen der Semester	\N	2021-11-11 12:39:58.996667	system
 1279	641	English	\N	\N	Error when getting semester	\N	2021-11-11 12:39:59.00013	system
+1330	667	German	\N	\N	Raum	\N	2026-03-31 14:08:33.781429	system
 1280	642	German	\N	\N	Fehler beim Hinzufügen des ÖH-Beitrags	\N	2021-11-11 12:39:59.007091	system
 1281	642	English	\N	\N	Error when adding student union fee	\N	2021-11-11 12:39:59.010497	system
 1282	643	German	\N	\N	Fehler beim Aktualisieren des ÖH-Beitrags	\N	2021-11-11 12:39:59.018402	system
@@ -39901,6 +42099,3533 @@ COPY system.tbl_phrasentext (phrasentext_id, phrase_id, sprache, orgeinheit_kurz
 1327	665	English	\N	\N	Error when changing state	\N	2021-11-11 12:39:59.268937	system
 1328	666	German	\N	\N	Unbekannter Fehler beim Status Ändern	\N	2021-11-11 12:39:59.276827	system
 1329	666	English	\N	\N	Unknown error when changing state	\N	2021-11-11 12:39:59.280329	system
+1331	667	English	\N	\N	Room	\N	2026-03-31 14:08:33.782835	system
+1332	668	German	\N	\N	Ferien / Feiertag	\N	2026-03-31 14:08:33.785732	system
+1333	668	English	\N	\N	Holidays	\N	2026-03-31 14:08:33.787003	system
+1334	669	German	\N	\N	Menu einklappen	\N	2026-03-31 14:08:33.794003	system
+1335	669	English	\N	\N	Collapse menu	\N	2026-03-31 14:08:33.795356	system
+1336	670	German	\N	\N	Menu ausklappen	\N	2026-03-31 14:08:33.798309	system
+1337	670	English	\N	\N	Extend menu	\N	2026-03-31 14:08:33.799563	system
+1338	671	German	\N	\N	Erstellt von	\N	2026-03-31 14:08:33.863164	system
+1339	671	English	\N	\N	Inserted by	\N	2026-03-31 14:08:33.86436	system
+1340	672	German	\N	\N	Erstellt am	\N	2026-03-31 14:08:33.867118	system
+1341	672	English	\N	\N	Inserted on	\N	2026-03-31 14:08:33.868469	system
+1342	673	German	\N	\N	Geändert von	\N	2026-03-31 14:08:33.871332	system
+1343	673	English	\N	\N	Updated by	\N	2026-03-31 14:08:33.872543	system
+1344	674	German	\N	\N	Geändert am	\N	2026-03-31 14:08:33.875376	system
+1345	674	English	\N	\N	Updated on	\N	2026-03-31 14:08:33.876627	system
+1346	675	German	\N	\N	Speichern	\N	2026-03-31 14:08:33.879345	system
+1347	675	English	\N	\N	Save	\N	2026-03-31 14:08:33.880584	system
+1348	676	German	\N	\N	Anlegen	\N	2026-03-31 14:08:33.883426	system
+1349	676	English	\N	\N	Create	\N	2026-03-31 14:08:33.884696	system
+1350	677	German	\N	\N	Löschen	\N	2026-03-31 14:08:33.887506	system
+1351	677	English	\N	\N	Delete	\N	2026-03-31 14:08:33.8888	system
+1352	678	German	\N	\N	Aktionen	\N	2026-03-31 14:08:33.891722	system
+1353	678	English	\N	\N	Actions	\N	2026-03-31 14:08:33.892969	system
+1354	679	German	\N	\N	Ein unbekannter Fehler ist aufgetreten: {error}	\N	2026-03-31 14:08:33.89587	system
+1355	679	English	\N	\N	An unknown error occurred: {error}	\N	2026-03-31 14:08:33.89713	system
+1356	680	German	\N	\N	Die maximale Dateigröße wurde überschritten!	\N	2026-03-31 14:08:33.901344	system
+1357	680	English	\N	\N	The maximum file size has been exceeded!	\N	2026-03-31 14:08:33.90271	system
+1358	681	German	\N	\N	Lädt...	\N	2026-03-31 14:08:33.905643	system
+1359	681	English	\N	\N	Loading...	\N	2026-03-31 14:08:33.906872	system
+1360	682	German	\N	\N	{n} Fehler	\N	2026-03-31 14:08:33.909691	system
+1361	682	English	\N	\N	{n} Error(s)	\N	2026-03-31 14:08:33.910882	system
+1362	683	German	\N	\N	Navigation ein-/ausblenden	\N	2026-03-31 14:08:33.913777	system
+1363	683	English	\N	\N	Toggle navigation	\N	2026-03-31 14:08:33.915	system
+1364	684	German	\N	\N	Ändern	\N	2026-03-31 14:08:33.919227	system
+1365	684	English	\N	\N	Change	\N	2026-03-31 14:08:33.920511	system
+1366	685	German	\N	\N	Logout	\N	2026-03-31 14:08:33.939601	system
+1367	685	English	\N	\N	Logout	\N	2026-03-31 14:08:33.940819	system
+1368	686	German	\N	\N	Einstellungen	\N	2026-03-31 14:08:33.943611	system
+1369	686	English	\N	\N	Settings	\N	2026-03-31 14:08:33.944811	system
+1370	687	German	\N	\N	Einstellungen gespeichert	\N	2026-03-31 14:08:33.947538	system
+1371	687	English	\N	\N	Settings saved	\N	2026-03-31 14:08:33.948773	system
+1372	688	German	\N	\N	Gel&ouml;scht	\N	2026-03-31 14:08:33.962282	system
+1373	688	English	\N	\N	Deleted	\N	2026-03-31 14:08:33.963506	system
+1374	689	German	\N	\N	Sie haben keine Schreibrechte für dieses Feld	\N	2026-03-31 14:08:33.966295	system
+1375	689	English	\N	\N	You do not have writing rights for this field	\N	2026-03-31 14:08:33.967518	system
+1376	690	German	\N	\N	Das {field} Feld muss ein Array sein	\N	2026-03-31 14:08:33.970331	system
+1377	690	English	\N	\N	The {field} field must be an array	\N	2026-03-31 14:08:33.971551	system
+1378	691	German	\N	\N	Filter löschen	\N	2026-03-31 14:08:33.974371	system
+1379	691	English	\N	\N	Clear filter	\N	2026-03-31 14:08:33.97558	system
+1380	692	German	\N	\N	Filter	\N	2026-03-31 14:08:33.97973	system
+1381	692	English	\N	\N	Filter	\N	2026-03-31 14:08:33.980952	system
+1382	693	German	\N	\N	Filter zurücksetzen	\N	2026-03-31 14:08:33.990395	system
+1383	693	English	\N	\N	delete filter	\N	2026-03-31 14:08:33.991606	system
+1384	694	German	\N	\N	Filter aktiv	\N	2026-03-31 14:08:33.99439	system
+1385	694	English	\N	\N	filter active	\N	2026-03-31 14:08:33.995616	system
+1386	695	German	\N	\N	Person ID	\N	2026-03-31 14:08:33.998532	system
+1387	695	English	\N	\N	Person ID	\N	2026-03-31 14:08:33.999752	system
+1388	696	German	\N	\N	EMail (Privat)	\N	2026-03-31 14:08:34.025074	system
+1389	696	English	\N	\N	email (private)	\N	2026-03-31 14:08:34.026289	system
+1390	697	German	\N	\N	EMail (Intern)	\N	2026-03-31 14:08:34.029086	system
+1391	697	English	\N	\N	email (intern)	\N	2026-03-31 14:08:34.030343	system
+1392	698	German	\N	\N	Adressen	\N	2026-03-31 14:08:34.035795	system
+1393	698	English	\N	\N	addresses	\N	2026-03-31 14:08:34.037033	system
+1394	699	German	\N	\N	Bankverbindungen	\N	2026-03-31 14:08:34.03983	system
+1395	699	English	\N	\N	bank details	\N	2026-03-31 14:08:34.041034	system
+1396	700	German	\N	\N	Rechnungsadresse	\N	2026-03-31 14:08:34.043905	system
+1397	700	English	\N	\N	billing address	\N	2026-03-31 14:08:34.045135	system
+1398	701	German	\N	\N	Heimatadresse	\N	2026-03-31 14:08:34.047966	system
+1399	701	English	\N	\N	home address	\N	2026-03-31 14:08:34.049146	system
+1400	702	German	\N	\N	abweichender Empfänger	\N	2026-03-31 14:08:34.051947	system
+1401	702	English	\N	\N	c/o	\N	2026-03-31 14:08:34.053171	system
+1402	703	German	\N	\N	Gemeinde	\N	2026-03-31 14:08:34.056056	system
+1403	703	English	\N	\N	municipality	\N	2026-03-31 14:08:34.057255	system
+1404	704	German	\N	\N	Bitte gültige Gemeinde wählen	\N	2026-03-31 14:08:34.060024	system
+1405	704	English	\N	\N	Please select a valid municipality	\N	2026-03-31 14:08:34.061248	system
+1406	705	German	\N	\N	Bitte gültige PLZ wählen	\N	2026-03-31 14:08:34.064057	system
+1407	705	English	\N	\N	Please select a valid zip code	\N	2026-03-31 14:08:34.065256	system
+1408	706	German	\N	\N	PLZ	\N	2026-03-31 14:08:34.072029	system
+1409	706	English	\N	\N	zip	\N	2026-03-31 14:08:34.073275	system
+1410	707	German	\N	\N	Zustellung	\N	2026-03-31 14:08:34.076037	system
+1411	707	English	\N	\N	delivery	\N	2026-03-31 14:08:34.077288	system
+1412	708	German	\N	\N	Die angegebene UID passt nicht zu der angegebenen Person	\N	2026-03-31 14:08:34.085368	system
+1413	708	English	\N	\N	Given UID is not assigned to the given Person	\N	2026-03-31 14:08:34.086579	system
+1414	709	German	\N	\N	Unruly	\N	2026-03-31 14:08:34.089309	system
+1415	709	English	\N	\N	Unruly	\N	2026-03-31 14:08:34.090516	system
+1416	710	German	\N	\N	Kein Benutzer gefunden	\N	2026-03-31 14:08:34.093272	system
+1417	710	English	\N	\N	No User found	\N	2026-03-31 14:08:34.09448	system
+1418	711	German	\N	\N	Lehrveranstaltungsoptionen	\N	2026-03-31 14:08:34.097221	system
+1419	711	English	\N	\N	Course options	\N	2026-03-31 14:08:34.098428	system
+1420	712	German	\N	\N	Unbewertet	\N	2026-03-31 14:08:34.101176	system
+1421	712	English	\N	\N	Not Graded	\N	2026-03-31 14:08:34.102393	system
+1422	713	German	\N	\N	Vertrag stornieren	\N	2026-03-31 14:08:34.106666	system
+1423	713	English	\N	\N	Cancel Contract	\N	2026-03-31 14:08:34.107882	system
+1424	714	German	\N	\N	Möchten Sie den Vertrag wirklich stornieren?	\N	2026-03-31 14:08:34.110699	system
+1425	714	English	\N	\N	Do you really want to cancel the contract?	\N	2026-03-31 14:08:34.111936	system
+1426	715	German	\N	\N	OrgForm	\N	2026-03-31 14:08:34.117814	system
+1427	715	English	\N	\N	orgform	\N	2026-03-31 14:08:34.119027	system
+1428	716	German	\N	\N	Grp.	\N	2026-03-31 14:08:34.124469	system
+1429	716	English	\N	\N	grp.	\N	2026-03-31 14:08:34.125712	system
+1430	717	German	\N	\N	...und {0} weitere Lektoren	\N	2026-03-31 14:08:34.12853	system
+1431	717	English	\N	\N	group	...and {0} more lecturers	2026-03-31 14:08:34.129781	system
+1432	718	German	\N	\N	Lehrveranstaltung ID	\N	2026-03-31 14:08:34.148754	system
+1433	718	English	\N	\N	Course ID	\N	2026-03-31 14:08:34.14992	system
+1434	719	German	\N	\N	Sem.	\N	2026-03-31 14:08:34.156632	system
+1435	719	English	\N	\N	sem.	\N	2026-03-31 14:08:34.157787	system
+1436	720	German	\N	\N	Lektor bereits zugewiesen	\N	2026-03-31 14:08:34.163162	system
+1437	720	English	\N	\N	Lektor already assigned	\N	2026-03-31 14:08:34.164418	system
+1438	721	German	\N	\N	Gruppe bereits zugewiesen	\N	2026-03-31 14:08:34.167183	system
+1439	721	English	\N	\N	Group already assigned	\N	2026-03-31 14:08:34.16846	system
+1440	722	German	\N	\N	Gruppe ist bereits verplant	\N	2026-03-31 14:08:34.171341	system
+1441	722	English	\N	\N	Group is already scheduled	\N	2026-03-31 14:08:34.172574	system
+1442	723	German	\N	\N	Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist.	\N	2026-03-31 14:08:34.175362	system
+1443	723	English	\N	\N	Changing the employee is not possible because they are already scheduled.	\N	2026-03-31 14:08:34.176585	system
+1444	724	German	\N	\N	Noch kein Vertrag	\N	2026-03-31 14:08:34.179346	system
+1445	724	English	\N	\N	No contract yet	\N	2026-03-31 14:08:34.180594	system
+1446	736	German	\N	\N	Studiengangskennzahl	\N	2026-03-31 14:08:34.210207	system
+1447	736	English	\N	\N	Study program number	\N	2026-03-31 14:08:34.211417	system
+1448	737	German	\N	\N	Studiengang KZ	\N	2026-03-31 14:08:34.214286	system
+1449	737	English	\N	\N	Study program no	\N	2026-03-31 14:08:34.215526	system
+1450	738	German	\N	\N	Verb.	\N	2026-03-31 14:08:34.218233	system
+1451	738	English	\N	\N	assoc.	\N	2026-03-31 14:08:34.21941	system
+1452	739	German	\N	\N	Dual	\N	2026-03-31 14:08:34.222209	system
+1453	739	English	\N	\N	dual	\N	2026-03-31 14:08:34.223471	system
+1454	740	German	\N	\N	rückstelldatum	\N	2026-03-31 14:08:34.292616	system
+1455	740	English	\N	\N	onHold date	\N	2026-03-31 14:08:34.293832	system
+1456	741	German	\N	\N	Rückstellgrund	\N	2026-03-31 14:08:34.296542	system
+1457	741	English	\N	\N	onHold reason	\N	2026-03-31 14:08:34.297744	system
+1458	742	German	\N	\N	Kaution	\N	2026-03-31 14:08:34.32214	system
+1459	742	English	\N	\N	Deposit	\N	2026-03-31 14:08:34.323336	system
+1460	743	German	\N	\N	Rechnungsnummer	\N	2026-03-31 14:08:34.325939	system
+1461	743	English	\N	\N	Invoice Number	\N	2026-03-31 14:08:34.32709	system
+1462	744	German	\N	\N	Rechnungsnummer	\N	2026-03-31 14:08:34.329764	system
+1463	744	English	\N	\N	Invoice Number	\N	2026-03-31 14:08:34.330937	system
+1464	745	German	\N	\N	Fällig am	\N	2026-03-31 14:08:34.333593	system
+1465	745	English	\N	\N	Due on	\N	2026-03-31 14:08:34.334796	system
+1466	746	German	\N	\N	Gesamtbetrag	\N	2026-03-31 14:08:34.33748	system
+1467	746	English	\N	\N	Total amount	\N	2026-03-31 14:08:34.338585	system
+1468	747	German	\N	\N	Rechnungsempfänger	\N	2026-03-31 14:08:34.341125	system
+1469	747	English	\N	\N	Invoice recipient	\N	2026-03-31 14:08:34.34223	system
+1470	748	German	\N	\N	Rechnungsempfänger	\N	2026-03-31 14:08:34.344747	system
+1471	748	English	\N	\N	Invoice	\N	2026-03-31 14:08:34.345839	system
+1472	749	German	\N	\N	Semester	\N	2026-03-31 14:08:34.348381	system
+1473	749	English	\N	\N	Semester	\N	2026-03-31 14:08:34.349543	system
+1474	750	German	\N	\N	Bezeichnung	\N	2026-03-31 14:08:34.352147	system
+1475	750	English	\N	\N	Title	\N	2026-03-31 14:08:34.353323	system
+1476	751	German	\N	\N	Datum	\N	2026-03-31 14:08:34.355999	system
+1477	751	English	\N	\N	Date	\N	2026-03-31 14:08:34.357204	system
+1478	752	German	\N	\N	Zahlungsbestätigung	\N	2026-03-31 14:08:34.359841	system
+1479	752	English	\N	\N	Payment confirmation	\N	2026-03-31 14:08:34.360965	system
+1480	753	German	\N	\N	Ablauf und Zahlungsbedingungen	\N	2026-03-31 14:08:34.363525	system
+1481	753	English	\N	\N	Procedure and terms of payment	\N	2026-03-31 14:08:34.364715	system
+1482	754	German	\N	\N	Wir möchten Sie darauf aufmerksam machen, dass bei der Überweisung *immer* die Rechnungsnummer als Zahlungsreferenz anzuführen ist.\n\t\t\t\t\t\tAndernfalls erfolgt keine automatische Zahlungszuordnung und es kann zu einer Verzögerung der Darstellung des aktuellen Zahlungsstatus\n\t\t\t\t\t\tder Rechnung im Campus Informations-System kommen.\n\t\t\t\t\t\t<br/>\n\t\t\t\t\t\t<br/>\n\t\t\t\t\t\tIm Falle dass der Betrag an ein falsches Konto überwiesen wurde, bitten wir Sie höflichst sich an Ihre Bank zu wenden.\n\t\t\t\t\t\t<br/>\n\t\t\t\t\t\t<br/>\n\t\t\t\t\t\tJede Rechnung gilt als "Bezahlt", wenn der Gesamtbetrag vollständig auf unser Konto eingelangt ist.\n\t\t\t\t\t\t<br/>\n\t\t\t\t\t\t<br/>	\N	2026-03-31 14:08:34.367514	system
+1483	754	English	\N	\N	We would like to draw your attention to the fact that the invoice number must *always* be quoted as the payment reference when making a bank transfer.\n\t\t\t\t\t\t\tOtherwise, no automatic payment allocation will take place and there may be a delay in displaying the current payment status of the invoice in Campus Informations-System.\n\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\tIn the event that the amount has been transferred to an incorrect account, we kindly ask you to contact your bank.\n\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\tEach invoice is considered "paid" when the total amount has been credited to our account in full.\n\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\t<br />	\N	2026-03-31 14:08:34.368712	system
+1484	755	German	\N	\N	Kontoinformationen der FHTW	\N	2026-03-31 14:08:34.371397	system
+1485	755	English	\N	\N	FHTW account information	\N	2026-03-31 14:08:34.372617	system
+1486	756	German	\N	\N	Sämtliche Zahlungen sind an die nachstehende Kontonummer zu leisten und die Rechnungsnummer muss als Zahlungsreferenz eingegeben werden.	\N	2026-03-31 14:08:34.37539	system
+1487	756	English	\N	\N	All payments must be made to the following account number and the invoice number must be entered as the payment reference.	\N	2026-03-31 14:08:34.376604	system
+1488	757	German	\N	\N	Auslandsüberweisungen:\n\t\t\t\t\t\t\t\t\t\t\t<br/>\n\t\t\t\t\t\t\t\t\t\t\tBei Auslandsüberweisungen sind die Spesenkosten von den\n\t\t\t\t\t\t\t\t\t\t\t<br/>\n\t\t\t\t\t\t\t\t\t\t\tZahlenden zusätzlich zu den Rechnungsbeträgen zu zahlen.	\N	2026-03-31 14:08:34.379359	system
+1489	757	English	\N	\N	Foreign bank transfers:\n\t\t\t\t\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\t\t\t\t\tIn the case of foreign bank transfers, the charges are to be paid by\n\t\t\t\t\t\t\t\t\t\t\t<br />\n\t\t\t\t\t\t\t\t\t\t\tthe payer in addition to the invoice amounts.	\N	2026-03-31 14:08:34.380569	system
+1490	758	German	\N	\N	Rechnungen & Zahlungsbestätigungen	\N	2026-03-31 14:08:34.383317	system
+1491	758	English	\N	\N	Invoices & payment confirmations	\N	2026-03-31 14:08:34.384555	system
+1492	759	German	\N	\N	Warum ist die Einzahlung trotz Einzahlung noch offen?	\N	2026-03-31 14:08:34.387341	system
+1493	759	English	\N	\N	Why is the deposit still outstanding despite payment?	\N	2026-03-31 14:08:34.388544	system
+1494	760	German	\N	\N	Der häufigste Grund für diesen Fall ist, dass bei der Überweisung nicht die Rechnungsnummer als Zahlungsreferenz eingegeben wird.\nWir bitten Sie höflichst in diesem Fall eine Mail an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> mit Zahlungsbestätigung zu senden.\nDie Transaktion und die Bearbeitung der Zahlung, kann bis zu sechs Werktage dauern.	\N	2026-03-31 14:08:34.391339	system
+1495	760	English	\N	\N	The most common reason for this is that the invoice number is not entered as the payment reference in the bank transfer.\nIn this case, we kindly ask you to send an e-mail to <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> with a payment confirmation.\nThe transaction and processing of the payment can take up to six working days.	\N	2026-03-31 14:08:34.392572	system
+1496	761	German	\N	\N	Ich habe keine Rechnung erhalten, was tun?	\N	2026-03-31 14:08:34.395355	system
+1497	761	English	\N	\N	I have not received an invoice, what should I do?	\N	2026-03-31 14:08:34.396577	system
+1498	762	German	\N	\N	In diesem Fall ist der Spam-Ordner zu kontrollieren. Falls die Rechnung nicht übermittelt wurde ersuchen wir um Information an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>.\nDie Rechnung wird Ihnen erneut zugesendet. <u><strong>Erst nach Erhalt der Rechnung ist der Betrag zu überweisen</strong></u>	\N	2026-03-31 14:08:34.399301	system
+1543	784	English	\N	\N	The plagiarism check has been carried out and confirms that the central content of the thesis has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).	\N	2026-03-31 14:08:34.773311	system
+1499	762	English	\N	\N	In this case, please check your spam folder. If the invoice has not been sent, please inform us at <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>.\nThe invoice will be sent to you again. <u><strong>The amount is only to be transferred after receipt of the invoice!</strong></u>	\N	2026-03-31 14:08:34.400547	system
+1500	763	German	\N	\N	Refundierung des Studienbeitrags	\N	2026-03-31 14:08:34.403322	system
+1501	763	English	\N	\N	Refund of the tuition fee	\N	2026-03-31 14:08:34.40453	system
+1502	764	German	\N	\N	Der Studienbeitrag wird nicht rückerstattet, wenn…\n-Anfänger*innen, die ihren Studienplatz nach Semesterbeginn (1. September / 16. Februar) nicht in Anspruch nehmen\n-Studierende, die ihr Studium nach Semesterbeginn (1. September / 16. Februar) abbrechen.\n\n-Unterbrechung vor dem 15.10. bzw. 15.3.: Studienbeitrag wird rückerstattet\n-Unterbrechung nach dem 15.10. bzw. 15.3.: Studienbeitrag wird nicht rückerstattet\n-in den Folgesemestern der Unterbrechung sind keine Studienbeiträge zu zahlen; der ÖHBeitrag ist jedoch in jedem Semester der Unterbrechung zu zahlen	\N	2026-03-31 14:08:34.407295	system
+1503	764	English	\N	\N	The tuition fee will not be refunded if...\n-Freshmen who do not take up their study place after the start of the semester (September 1 / February 16)\n-Students who discontinue their studies after the start of the semester (September 1 / February 16).\n\n-Interruption before 15.10. or 15.3.: tuition fees will be refunded\n-Interruption after 15.10. or 15.3.: Tuition fee will not be refunded\n-No tuition fees are payable in the semesters following the interruption; however, the ÖH fee must be paid in each semester of the interruption	\N	2026-03-31 14:08:34.408551	system
+1504	765	German	\N	\N	Sie sind vom Studienbeitrag befreit und haben eine Rechnung für den Studienbeitrag bekommen?	\N	2026-03-31 14:08:34.411322	system
+1505	765	English	\N	\N	You are exempt from paying tuition fees and have received an invoice for tuition fees?	\N	2026-03-31 14:08:34.412537	system
+1506	766	German	\N	\N	Treten Sie bitte in Kontakt mit Ihrer Studiengangsassistenz. Die offene Rechnung wird storniert.	\N	2026-03-31 14:08:34.415236	system
+1507	766	English	\N	\N	Please contact your degree program assistant. The outstanding invoice will be canceled.	\N	2026-03-31 14:08:34.416465	system
+1508	767	German	\N	\N	Mir ist ein Fehler bei der Überweisung unterlaufen, was tun?	\N	2026-03-31 14:08:34.419135	system
+1509	767	English	\N	\N	I made a mistake with the transfer, what should I do?	\N	2026-03-31 14:08:34.42031	system
+1510	768	German	\N	\N	Bitte den Fehler an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> melden.	\N	2026-03-31 14:08:34.422897	system
+1511	768	English	\N	\N	Please report the error to <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>.	\N	2026-03-31 14:08:34.424033	system
+1512	769	German	\N	\N	Eine Rechnung wurde zwei Mal überwiesen, was tun?	\N	2026-03-31 14:08:34.426659	system
+1513	769	English	\N	\N	An invoice has been transferred twice, what should I do?	\N	2026-03-31 14:08:34.427846	system
+1514	770	German	\N	\N	Falls eine Rechnung doppelt überwiesen wurde, bitten wir Sie dies an <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a> zu melden. Wir werden Ihnen eine Zahlung refundieren.	\N	2026-03-31 14:08:34.430587	system
+1515	770	English	\N	\N	If an invoice has been transferred twice, please report this to <a href="mailto:billing@technikum-wien.at">billing@technikum-wien.at</a>. We will refund you one payment.	\N	2026-03-31 14:08:34.431795	system
+1516	771	German	\N	\N	Es stehen mehrere Positionen auf der Rechnung – soll für jede Position eine Überweisung durchgeführt werden?	\N	2026-03-31 14:08:34.434614	system
+1517	771	English	\N	\N	There are several items on the invoice - should a transfer be made for each item?	\N	2026-03-31 14:08:34.435797	system
+1518	772	German	\N	\N	Nein, es ist immer der auf der Rechnung ausgewiesene Gesamtbetrag zu überweisen.	\N	2026-03-31 14:08:34.438517	system
+1519	772	English	\N	\N	No, the total amount shown on the invoice must always be transferred.	\N	2026-03-31 14:08:34.439711	system
+1520	773	German	\N	\N	Wann kann der Betrag überwiesen werden?	\N	2026-03-31 14:08:34.442408	system
+1521	773	English	\N	\N	When can the amount be transferred?	\N	2026-03-31 14:08:34.443608	system
+1522	774	German	\N	\N	Wir möchten Sie darauf hinweisen, dass Überweisungen erst bei Erhalt der Rechnung durchzuführen sind. Bitte um Angabe der Rechnungsnummer als Zahlungsreferenz.	\N	2026-03-31 14:08:34.446483	system
+1523	774	English	\N	\N	We would like to point out that bank transfers should only be made on receipt of the invoice. Please state the invoice number as the payment reference.	\N	2026-03-31 14:08:34.447652	system
+1524	775	German	\N	\N	Fachhochschule Technikum Wien	\N	2026-03-31 14:08:34.450335	system
+1525	775	English	\N	\N	University of Applied Sciences Technikum Wien	\N	2026-03-31 14:08:34.451541	system
+1526	776	German	\N	\N	Person mit Markierung „unruly“ gefunden	\N	2026-03-31 14:08:34.454289	system
+1527	776	English	\N	\N	Person flagged as "unruly" detected	\N	2026-03-31 14:08:34.455474	system
+1528	777	German	\N	\N	Status Bestätigung	\N	2026-03-31 14:08:34.492238	system
+1529	777	English	\N	\N	Status confirmation	\N	2026-03-31 14:08:34.493481	system
+1530	778	German	\N	\N	Neue und geänderte anzeigen	\N	2026-03-31 14:08:34.528288	system
+1531	778	English	\N	\N	Show new and changed	\N	2026-03-31 14:08:34.529448	system
+1532	779	German	\N	\N	Das Datumsformat ist ungültig oder liegt außerhalb des gültigen Bereichs.	\N	2026-03-31 14:08:34.571457	system
+1533	779	English	\N	\N	The date format is invalid or out of range.	\N	2026-03-31 14:08:34.572715	system
+1534	780	German	\N	\N	Alle Semester	\N	2026-03-31 14:08:34.7277	system
+1535	780	English	\N	\N	All semester	\N	2026-03-31 14:08:34.728906	system
+1536	781	German	\N	\N	Aktuelles Semester	\N	2026-03-31 14:08:34.731701	system
+1537	781	English	\N	\N	Current semester	\N	2026-03-31 14:08:34.732955	system
+1538	782	German	\N	\N	Titel	\N	2026-03-31 14:08:34.764146	system
+1539	782	English	\N	\N	Title of 	\N	2026-03-31 14:08:34.765401	system
+1540	783	German	\N	\N	Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).	\N	2026-03-31 14:08:34.76811	system
+1541	783	English	\N	\N	The plagiarism check has been carried out and confirms that the central content of the paper has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).	\N	2026-03-31 14:08:34.769347	system
+1542	784	German	\N	\N	Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).	\N	2026-03-31 14:08:34.772124	system
+1703	864	English	\N	\N	Organisational Unit	\N	2026-03-31 14:08:35.4006	system
+1544	785	German	\N	\N	Das Vorgehen ist in Bezug auf die fachspezifische Ausrichtung der Arbeit angemessen, anhand der Fachliteratur begründet und korrekt umgesetzt.	\N	2026-03-31 14:08:34.787432	system
+1545	785	English	\N	\N	The procedure is appropriate in relation to the subject-specific orientation of the thesis, justified on the basis of the specialist literature and correctly implemented.	\N	2026-03-31 14:08:34.788719	system
+1546	786	German	\N	\N	Die Arbeit wurde in selbständiger Arbeitsweise (z.B. eigenständige Lösung der Fragestellungen und aufgetretener Probleme) verfasst.	\N	2026-03-31 14:08:34.797171	system
+1547	786	English	\N	\N	The thesis was written in an independent way (e.g. independent solutions to the questions and problems that occurred)	\N	2026-03-31 14:08:34.798538	system
+1548	787	German	\N	\N	Die Arbeit ist schlüssig strukturiert.	\N	2026-03-31 14:08:34.804073	system
+1549	787	English	\N	\N	The thesis is structured coherently.	\N	2026-03-31 14:08:34.805429	system
+1550	788	German	\N	\N	Quellen und Literatur sind für die wissenschaftliche Auseinandersetzung mit dem Thema der Arbeit relevant, geben den aktuellen Stand der Forschung wieder und decken das Thema ab.	\N	2026-03-31 14:08:34.815907	system
+1551	788	English	\N	\N	Sources and literature are relevant for the scientific discussion of the topic of the thesis, reflect the current state of the art and cover the topic.	\N	2026-03-31 14:08:34.817125	system
+1552	789	German	\N	\N	Falls ein Kriterium mit 0 Punkten bewertet wird, ist die {0} insgesamt als negativ zu beurteilen.	\N	2026-03-31 14:08:34.834061	system
+1553	789	English	\N	\N	If a criterion is assessed with 0 points, the {0} is to be assessed as negative overall.	\N	2026-03-31 14:08:34.835416	system
+1554	790	German	\N	\N	Begutachter*in	\N	2026-03-31 14:08:34.839607	system
+1555	790	English	\N	\N	Reviewer	\N	2026-03-31 14:08:34.840784	system
+1556	791	German	\N	\N	Projektarbeitsbeurteilungsübersicht	\N	2026-03-31 14:08:34.869058	system
+1557	791	English	\N	\N	Projekt Work Assessment Overview	\N	2026-03-31 14:08:34.870389	system
+1558	792	German	\N	\N	Abgabe - Datum	\N	2026-03-31 14:08:34.873148	system
+1559	792	English	\N	\N	Upload - Date	\N	2026-03-31 14:08:34.874392	system
+1560	793	German	\N	\N	Freischaltung	\N	2026-03-31 14:08:34.877165	system
+1561	793	English	\N	\N	Activation	\N	2026-03-31 14:08:34.878361	system
+1562	794	German	\N	\N	Token an Zweit-Begutachter*in senden	\N	2026-03-31 14:08:34.881075	system
+1563	794	English	\N	\N	Send token to Second Reviewer	\N	2026-03-31 14:08:34.882349	system
+1564	795	German	\N	\N	Freischalten	\N	2026-03-31 14:08:34.885108	system
+1565	795	English	\N	\N	Unlock	\N	2026-03-31 14:08:34.886318	system
+1566	796	German	\N	\N	Dies ist eine im Rahmen einer kommissionellen Wiederholungsprüfung vorgelegte Bachelorarbeit. Die Beurteilung erfolgt erst im Anschluss an eine Abstimmung der Mitglieder des Prüfungssenats.	\N	2026-03-31 14:08:34.889251	\N
+1567	796	English	\N	\N	This is a Bachelor's thesis submitted within the frame of a committee re-sit examination. The assessment only takes place after a vote of the members of the examination commission.	\N	2026-03-31 14:08:34.890437	\N
+1568	797	German	\N	\N	Infomail an Mitglieder des Prüfungssenats senden	\N	2026-03-31 14:08:34.893322	system
+1569	797	English	\N	\N	Send infomail to members of the examination committee	\N	2026-03-31 14:08:34.894565	system
+1570	798	German	\N	\N	Mail an Mitglieder des Prüfungssenats gesendet	\N	2026-03-31 14:08:34.897399	system
+1571	798	English	\N	\N	Sent mail to members of the examination committee	\N	2026-03-31 14:08:34.898618	system
+1572	799	German	\N	\N	Fehler beim Senden der Mail an Prüfungssenat	\N	2026-03-31 14:08:34.901365	system
+1573	799	English	\N	\N	Error when sending mail to commission members	\N	2026-03-31 14:08:34.902598	system
+1574	800	German	\N	\N	Absenden erst nach Abschluss der Bewertung durch Zweitbegutachter*in möglich	\N	2026-03-31 14:08:34.905474	system
+1575	800	English	\N	\N	Sending only possible after completion of assessment by Second Reviewer	\N	2026-03-31 14:08:34.906698	system
+1576	801	German	\N	\N	nicht erfüllt	\N	2026-03-31 14:08:34.909489	system
+1577	801	English	\N	\N	not fulfilled	\N	2026-03-31 14:08:34.910692	system
+1578	802	German	\N	\N	Mindestanforderung erfüllt	\N	2026-03-31 14:08:34.913482	system
+1579	802	English	\N	\N	minimum requirement fulfilled	\N	2026-03-31 14:08:34.914647	system
+1580	803	German	\N	\N	in weiten Teilen erfüllt	\N	2026-03-31 14:08:34.917345	system
+1581	803	English	\N	\N	fulfilled for the most part	\N	2026-03-31 14:08:34.918526	system
+1582	804	German	\N	\N	vollständig erfüllt	\N	2026-03-31 14:08:34.921199	system
+1583	804	English	\N	\N	fully fulfilled	\N	2026-03-31 14:08:34.922352	system
+1584	805	German	\N	\N	Mitglieder Prüfungssenat	\N	2026-03-31 14:08:34.925086	system
+1585	805	English	\N	\N	Members of the examination commission	\N	2026-03-31 14:08:34.926286	system
+1586	806	German	\N	\N	Plagiatscheck auffällig, negative Beurteilung	\N	2026-03-31 14:08:34.92896	system
+1587	806	English	\N	\N	Plagiarism check not passed, negative assessment	\N	2026-03-31 14:08:34.9301	system
+1588	807	German	\N	\N	Titel bearbeiten	\N	2026-03-31 14:08:34.932743	system
+1589	807	English	\N	\N	Edit title	\N	2026-03-31 14:08:34.933898	system
+1590	808	German	\N	\N	Titel gespeichert	\N	2026-03-31 14:08:34.93662	system
+1591	808	English	\N	\N	Title saved	\N	2026-03-31 14:08:34.937824	system
+1592	809	German	\N	\N	Fehler beim Speichern des Titels	\N	2026-03-31 14:08:34.94062	system
+1593	809	English	\N	\N	Error when saving title	\N	2026-03-31 14:08:34.941847	system
+1594	810	German	\N	\N	(Bei Plagiat wird die Arbeit negativ bewertet.)	\N	2026-03-31 14:08:34.944647	system
+1595	810	English	\N	\N	(Plagiarism leads to a negative grade.)	\N	2026-03-31 14:08:34.945856	system
+1596	811	German	\N	\N	Plagiatscheck	\N	2026-03-31 14:08:34.948693	system
+1597	811	English	\N	\N	Plagiarism check	\N	2026-03-31 14:08:34.949921	system
+1598	812	German	\N	\N	Betreuernote	\N	2026-03-31 14:08:34.952758	system
+1599	812	English	\N	\N	Reviewer grade	\N	2026-03-31 14:08:34.95398	system
+1600	813	German	\N	\N	Vorsitz Prüfungssenat	\N	2026-03-31 14:08:34.956849	system
+1601	813	English	\N	\N	Reviewer	\N	2026-03-31 14:08:34.958074	system
+1602	814	German	\N	\N	Download Projektarbeit	\N	2026-03-31 14:08:34.960795	system
+1603	814	English	\N	\N	Download thesis	\N	2026-03-31 14:08:34.961971	system
+1604	815	German	\N	\N	Betreuerart	\N	2026-03-31 14:08:34.964826	system
+1605	815	English	\N	\N	Reviewer type	\N	2026-03-31 14:08:34.966022	system
+1606	816	German	\N	\N	Nebenbegutachter*in	\N	2026-03-31 14:08:34.968859	system
+1607	816	English	\N	\N	secondary reviewer	\N	2026-03-31 14:08:34.970028	system
+1704	865	German	\N	\N	Funktion	\N	2026-03-31 14:08:35.403089	system
+1608	817	German	\N	\N	Die Punkteanzahl der Kriterien "1 - 5" wird mit 70%; die Punkteanzahl der Kriterien "6 - 10" mit 30% gewichtet.	\N	2026-03-31 14:08:34.972756	system
+1609	817	English	\N	\N	The number of points for criteria "1 - 5" is weighted with 70%; the number of points for criteria "6 - 10" is weighted with 30%.	\N	2026-03-31 14:08:34.973933	system
+1610	818	German	\N	\N	gewichtete	\N	2026-03-31 14:08:34.976715	system
+1611	818	English	\N	\N	weightened	\N	2026-03-31 14:08:34.97793	system
+1612	819	German	\N	\N	Sprache	\N	2026-03-31 14:08:34.980765	system
+1613	819	English	\N	\N	language	\N	2026-03-31 14:08:34.981977	system
+1614	820	German	\N	\N	Fehler beim Ändern der Sprache	\N	2026-03-31 14:08:34.984767	system
+1615	820	English	\N	\N	Error when changing language	\N	2026-03-31 14:08:34.985948	system
+1616	821	German	\N	\N	Anrechnung	\N	2026-03-31 14:08:34.991483	system
+1617	821	English	\N	\N	Exemption	\N	2026-03-31 14:08:34.99269	system
+1618	822	German	\N	\N	eines Hochschulzeugnisses (vgl. § 4 Abs. 8 Satzung „Studienrechtliche Bestimmungen / Prüfungsordnung)	\N	2026-03-31 14:08:35.004967	system
+1619	822	English	\N	\N	a university certificate (see § 4 para. 8, Statute on Studies Act Provisions / Examination Regulations of the UASTW)	\N	2026-03-31 14:08:35.00629	system
+1620	823	German	\N	\N	Bisher angerechnete ECTS	\N	2026-03-31 14:08:35.010604	system
+1621	823	English	\N	\N	All previous recognized ECTS	\N	2026-03-31 14:08:35.011781	system
+1622	824	German	\N	\N	Anzeige der Summe der bisher angerechneten ECTS. Für Quereinsteiger in ein höheres Semester werden die ECTS der angerechneten Semester berücksichtigt.<br><br>Seit Oktober 2021 gelten Höchstgrenzen für Anrechnungen:<br>max. 60 ECTS für schulische Zeugnisse (anrechenbar sind nur BHS- und AHS-Zeugnisse!)<br>max. 60 ECTS für berufliche Qualifikationen<br>max. 90 ECTS INSGESAMT für schulische und berufliche Qualifikationen	\N	2026-03-31 14:08:35.014485	system
+1623	824	English	\N	\N	Sum of previous recognized ECTS. Lateral Entries are considered with ECTS of the recognized semester.<br><br>Maximum ECTS limits are applied since Octobre 2021:<br><br>max. 60 ECTS school qualification (BHS and AHS only)<br>max. 60 ECTS professional qualification<br>max. 90 ECTS OVERALL for school and professional qualification	\N	2026-03-31 14:08:35.015712	system
+1624	825	German	\N	\N	Seit Oktober 2021 gelten Höchstgrenzen für Anrechnungen:<br>max. 60 ECTS für schulische Zeugnisse (anrechenbar sind nur BHS- und AHS-Zeugnisse!)<br>max. 60 ECTS für berufliche Qualifikationen<br>max. 90 ECTS INSGESAMT für schulische Zeugnisse und berufliche Qualifikationen	\N	2026-03-31 14:08:35.018725	system
+1625	825	English	\N	\N	Maximum ECTS limits are applied since Octobre 2021:<br>max. 60 ECTS school qualification (BHS and AHS only)<br>max. 60 ECTS professional qualification<br>max. 90 ECTS OVERALL for school and professional qualification	\N	2026-03-31 14:08:35.019978	system
+1626	826	German	\N	\N	Die Höchstgrenze für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz wird überschritten.<span class="fw-bold">Bisherige ECTS + ECTS dieser LV: Total: {0} [ Schulisch: {1}  | Beruflich: {2}  ]</span>	\N	2026-03-31 14:08:35.022866	system
+1627	826	English	\N	\N	<br>Exceedance of maximum limit for exemption (see § 12 para. 3, Regulations of the UASTW).<br><b>Former ECTS + ECTS of this course: Total: {0} [ School  qualification: {1} | Professional qualification: {2} ]</b> 	\N	2026-03-31 14:08:35.024101	system
+1628	827	German	\N	\N	Begründungstext aus Liste übernehmen oder eigene Begründung angeben	\N	2026-03-31 14:08:35.027049	system
+1629	827	English	\N	\N	Copy reason from list above or write your own reason	\N	2026-03-31 14:08:35.028307	system
+1630	828	German	\N	\N	Erläutern Sie die Gleichwertigkeit der ECTS	\N	2026-03-31 14:08:35.031005	system
+1631	828	English	\N	\N	Explain ECTS equivalencies	\N	2026-03-31 14:08:35.032226	system
+1632	829	German	\N	\N	Erläutern Sie die Gleichwertigkeit der Lehrveranstaltungsinhalte	\N	2026-03-31 14:08:35.034902	system
+1633	829	English	\N	\N	Explain the equivalence of course content	\N	2026-03-31 14:08:35.036131	system
+1634	830	German	\N	\N	Hinsichtlich des Umfangs der LV, die Sie anrechnen lassen wollen: Bitte erläutern Sie, warum Ihr Zeugnis bzw. Ihre berufliche Praxis mit dem Umfang der LV gleichwertig ist.<br><br>Referenzbeispiele für die ECTS-Berechnung finden Sie rechts in der Infobox.	\N	2026-03-31 14:08:35.038831	system
+1635	830	English	\N	\N	Regarding the scope of the course you want to have credited: Please explain why your certificate or your professional practice is equivalent to the scope of the course.<br><br>Reference examples for the ECTS calculation can be found in the info box on the right.	\N	2026-03-31 14:08:35.039996	system
+1636	831	German	\N	\N	Hinsichtlich der Lernergebnisse der LV (vgl. CIS), die Sie anrechnen lassen wollen: Bitte erläutern Sie, warum die von Ihnen erworbenen Kompetenzen mit diesen Lernergebnissen gleichwertig sind.	\N	2026-03-31 14:08:35.042808	system
+1637	831	English	\N	\N	With regard to the learning outcomes of the course (cf. CIS) for which you want to receive credit: Please explain why the competences you have acquired are equivalent to these learning outcomes.	\N	2026-03-31 14:08:35.043982	system
+1638	832	German	\N	\N	Referenzbeispiele ECTS-Berechnung	\N	2026-03-31 14:08:35.046752	system
+1639	832	English	\N	\N	Reference examples of ECTS calculation	\N	2026-03-31 14:08:35.047938	system
+1640	833	German	\N	\N	<b>1 ECTS an der FH Technikum Wien entspricht einem Arbeitsaufwand von 25 Stunden.</b>\n\t\t\t\t\t<br><br><u>Schulisches Zeugnis:</u>\n\t\t\t\t\t<br>Bitte die Unterrichtsstunden nachvollziehbar in ECTS umrechnen (ein Schuljahr besteht aus ca. 40 Wochen; d.h., eine Unterrichtsstunde pro Woche sind insgesamt ca. 40 Stunden Jahresaufwand.)\n\t\t\t\t\t<br><br><u>Hochschulzeugnis:</u>\n\t\t\t\t\t<br>Bitte die ECTS angeben.\n\t\t\t\t\t<br><br><u>Berufliche Praxis:</u>\n\t\t\t\t\t<br>Bitte die Dauer der einschlägigen beruflichen Praxis nachvollziehbar in ECTS umrechnen (1,5 ECTS sind ungefähr eine Arbeitswoche im Umfang von 37,5 Stunden).	\N	2026-03-31 14:08:35.050829	system
+1641	833	English	\N	\N	<br>1 ECTS at the FH Technikum Wien corresponds to a workload of 25 hours.</b>\n\t\t\t\t\t<br><br><u>School certificate:</u>\n\t\t\t\t\t<br>Please convert the teaching hours into ECTS in a comprehensible way (a school year consists of approx. 40 weeks; i.e. one teaching hour per week is a total of approx. 40 hours of annual work).\n\t\t\t\t\t<br><br><u>University certificate:</u>\n\t\t\t\t\t<br>Please indicate the ECTS.\n\t\t\t\t\t<br><br><u>Professional practice:</u>\n\t\t\t\t\t<br>Please convert the duration of the relevant professional practice into ECTS in a comprehensible way (1.5 ECTS are approximately one working week of 37.5 hours).	\N	2026-03-31 14:08:35.051981	system
+1642	834	German	\N	\N	Begründung Gleichwertigkeit ECTS	\N	2026-03-31 14:08:35.054605	system
+1643	834	English	\N	\N	Reason Equivalency of ECTS	\N	2026-03-31 14:08:35.055701	system
+1644	835	German	\N	\N	Begründung Gleichwertigkeit LV-Inhalt	\N	2026-03-31 14:08:35.058308	system
+1645	835	English	\N	\N	Reason Equivalency of Course content	\N	2026-03-31 14:08:35.059448	system
+1705	865	English	\N	\N	Function	\N	2026-03-31 14:08:35.404217	system
+1646	836	German	\N	\N	Die anzurechnenden Kenntnisse sind umfangmäßig und/oder inhaltlich nicht gleichwertig, weil<span id="helpTxtBegruendungErgaenzen">...[Erläuterung: Bitte Begründung ergänzen.]</span>	\N	2026-03-31 14:08:35.104276	system
+1647	836	English	\N	\N	The equivalence in terms of learning objectives and the length of the course can not be determined because of<span id="helpTxtBegruendungErgaenzen">...[Explanation: Please add reason.]</span>	\N	2026-03-31 14:08:35.105487	system
+1648	837	German	\N	\N	Die anzurechnenden Kenntnisse sind umfangmäßig und/oder inhaltlich nicht gleichwertig, weil... <span class="text-danger"><b>Bei einer Ablehnung ist eine individuelle Begründung erforderlich. Dies kann nur über die Detailseite erfolgen.</b></span>	\N	2026-03-31 14:08:35.108136	system
+1649	837	English	\N	\N	The equivalence in terms of learning objectives and the length of the course can not be determined because of... <span class="text-danger"><b>If the application is rejected, an individual reason is required. This can only be done from the detail page.</b></span>	\N	2026-03-31 14:08:35.109367	system
+1650	838	German	\N	\N	Die anzurechnenden Kenntnisse sind umfangmäßig und/oder inhaltlich nicht gleichwertig, weil<span id="helpTxtBegruendungErgaenzen">...[Erläuterung: Bitte ergänzen oder Empfehlungstext des Lektors übernehmen und ggf. redigieren.]</span>	\N	2026-03-31 14:08:35.11194	system
+1651	838	English	\N	\N	The equivalence in terms of learning objectives and the length of the course can not be determined because of<span id="helpTxtBegruendungErgaenzen">...[Explanation: Please complete or adopt the text of the lectors recommendation and edit it if necessary]</span>	\N	2026-03-31 14:08:35.113065	system
+1652	839	German	\N	\N	Die anzurechnenden Kenntnisse sind umfangmäßig und/oder inhaltlich nicht gleichwertig, weil... <span class="text-danger"><b>Bei einer Ablehnung ist eine individuelle Begründung erforderlich. Dies kann nur über die Detailseite erfolgen.</b></span>	\N	2026-03-31 14:08:35.115717	system
+1653	839	English	\N	\N	The equivalence in terms of learning objectives and the length of the course can not be determined because of... <span class="text-danger"><b>If the application is rejected, an individual reason is required. This can only be done from the detail page.</b></span>	\N	2026-03-31 14:08:35.116898	system
+1654	840	German	\N	\N	Bitte vervollständigen Sie die Begründung.	\N	2026-03-31 14:08:35.123669	system
+1655	840	English	\N	\N	Please complete the reason.	\N	2026-03-31 14:08:35.124827	system
+1656	841	German	\N	\N	Anrechnung wird nicht genehmigt aufgrund einer Überschreitung der Höchstgrenzen für Anrechnungen gem. § 12 Abs. 3 Fachhochschulgesetz.	\N	2026-03-31 14:08:35.146513	system
+1657	841	English	\N	\N	Recognition and exemption is rejected because of exceedance of maximum limit for exemption (see § 12 para. 3, Regulations of the UASTW).	\N	2026-03-31 14:08:35.147655	system
+1658	842	German	\N	\N	Anrechnungen verwalten	\N	2026-03-31 14:08:35.164277	system
+1659	842	English	\N	\N	Administration of applications.	\N	2026-03-31 14:08:35.16553	system
+1660	843	German	\N	\N	Anrechnungszeitraum festlegen	\N	2026-03-31 14:08:35.168373	system
+1661	843	English	\N	\N	Set appplication period	\N	2026-03-31 14:08:35.169557	system
+1662	844	German	\N	\N	Anrechnungszeitraum hinzufügen	\N	2026-03-31 14:08:35.172295	system
+1663	844	English	\N	\N	Add appplication period	\N	2026-03-31 14:08:35.173495	system
+1664	845	German	\N	\N	Anrechnungszeitraum speichern	\N	2026-03-31 14:08:35.176136	system
+1665	845	English	\N	\N	Save application period	\N	2026-03-31 14:08:35.177314	system
+1666	846	German	\N	\N	Anrechnungszeitraum Start	\N	2026-03-31 14:08:35.179879	system
+1667	846	English	\N	\N	Startdate application	\N	2026-03-31 14:08:35.181049	system
+1668	847	German	\N	\N	Anrechnungszeitraum Ende	\N	2026-03-31 14:08:35.183718	system
+1669	847	English	\N	\N	Enddate application	\N	2026-03-31 14:08:35.184858	system
+1670	848	German	\N	\N	Das Startdatum liegt außerhalb des gewählten Studiensemesters.	\N	2026-03-31 14:08:35.187511	system
+1671	848	English	\N	\N	The startdate is not within the selected study semester.	\N	2026-03-31 14:08:35.188688	system
+1672	849	German	\N	\N	Das Endedatum liegt außerhalb des gewählten Studiensemesters.	\N	2026-03-31 14:08:35.191312	system
+1673	849	English	\N	\N	The enddate is not within the selected study semester.	\N	2026-03-31 14:08:35.192471	system
+1674	850	German	\N	\N	Das Startdatum muss VOR dem Endedatum liegen.	\N	2026-03-31 14:08:35.195055	system
+1675	850	English	\N	\N	The startdate must be BEFORE the enddate.	\N	2026-03-31 14:08:35.196233	system
+1676	851	German	\N	\N	Sicher löschen?	\N	2026-03-31 14:08:35.198974	system
+1677	851	English	\N	\N	Definitely delete?	\N	2026-03-31 14:08:35.200204	system
+1678	852	German	\N	\N	Der Antrag kann nicht für vergangene Semester gestellt werden	\N	2026-03-31 14:08:35.258706	system
+1679	852	English	\N	\N	You can not apply for the past study semester	\N	2026-03-31 14:08:35.259882	system
+1680	853	German	\N	\N	bearbeitet von	\N	2026-03-31 14:08:35.265011	system
+1681	853	English	\N	\N	edited by	\N	2026-03-31 14:08:35.266208	system
+1682	854	German	\N	\N	bearbeitet am	\N	2026-03-31 14:08:35.26877	system
+1683	854	English	\N	\N	edited on	\N	2026-03-31 14:08:35.269906	system
+1684	855	German	\N	\N	Bitte füllen Sie alle Formularfelder aus	\N	2026-03-31 14:08:35.277655	system
+1685	855	English	\N	\N	Please fill in all form fields	\N	2026-03-31 14:08:35.278804	system
+1686	856	German	\N	\N	Dokument zu groß	\N	2026-03-31 14:08:35.282855	system
+1687	856	English	\N	\N	Document maximum size exceeded	\N	2026-03-31 14:08:35.284012	system
+1688	857	German	\N	\N	Dokument fehlt oder zu groß	\N	2026-03-31 14:08:35.28662	system
+1689	857	English	\N	\N	Document missing or maximum size exceeded	\N	2026-03-31 14:08:35.287752	system
+1690	858	German	\N	\N	Fehlende min. Zeichen	\N	2026-03-31 14:08:35.295814	system
+1691	858	English	\N	\N	Missing min. Characters	\N	2026-03-31 14:08:35.296934	system
+1692	859	German	\N	\N	ACHTUNG seit Februar 2022 werden Zutrittskarten für maximal 60 Tage freigeschalten.	\N	2026-03-31 14:08:35.329348	system
+1693	859	English	\N	\N	ATTENTION since February 2022 a maximum of 60 days validity is granted for accesscards	\N	2026-03-31 14:08:35.330516	system
+1694	860	German	\N	\N	Schließen	\N	2026-03-31 14:08:35.347074	system
+1695	860	English	\N	\N	Close	\N	2026-03-31 14:08:35.34836	system
+1696	861	German	\N	\N	Fehler Zuständigkeiten	\N	2026-03-31 14:08:35.387872	system
+1697	861	English	\N	\N	Error Responsibilities	\N	2026-03-31 14:08:35.389052	system
+1698	862	German	\N	\N	Mitarbeiter	\N	2026-03-31 14:08:35.391859	system
+1699	862	English	\N	\N	Employee	\N	2026-03-31 14:08:35.393034	system
+1700	863	German	\N	\N	oder	\N	2026-03-31 14:08:35.395749	system
+1701	863	English	\N	\N	or	\N	2026-03-31 14:08:35.396873	system
+1702	864	German	\N	\N	Organisationseinheit	\N	2026-03-31 14:08:35.39948	system
+1706	866	German	\N	\N	Zuständigkeit zuweisen	\N	2026-03-31 14:08:35.40694	system
+1707	866	English	\N	\N	Assign Responsibility	\N	2026-03-31 14:08:35.408078	system
+1708	867	German	\N	\N	Fehler Kurzbezeichnung	\N	2026-03-31 14:08:35.410669	system
+1709	867	English	\N	\N	Error short name	\N	2026-03-31 14:08:35.411807	system
+1710	868	German	\N	\N	Fehlertext	\N	2026-03-31 14:08:35.414346	system
+1711	868	English	\N	\N	Error text	\N	2026-03-31 14:08:35.415465	system
+1712	869	German	\N	\N	Organisationseinheit Kurzbezeichung	\N	2026-03-31 14:08:35.418069	system
+1713	869	English	\N	\N	Organisational Unit Short Name	\N	2026-03-31 14:08:35.419218	system
+1714	870	German	\N	\N	Organisationseinheit	\N	2026-03-31 14:08:35.421907	system
+1715	870	English	\N	\N	Organisational Unit	\N	2026-03-31 14:08:35.423071	system
+1716	871	German	\N	\N	Funktion Kurzbezeichnung	\N	2026-03-31 14:08:35.425792	system
+1717	871	English	\N	\N	Function Short Name	\N	2026-03-31 14:08:35.426962	system
+1718	872	German	\N	\N	Funktion Beschreibung	\N	2026-03-31 14:08:35.429733	system
+1719	872	English	\N	\N	Function Description	\N	2026-03-31 14:08:35.430915	system
+1720	873	German	\N	\N	Fehlercode fehlt	\N	2026-03-31 14:08:35.433819	system
+1721	873	English	\N	\N	Error code missing	\N	2026-03-31 14:08:35.434982	system
+1722	874	German	\N	\N	Mitarbeiter oder Organisationseinheit müssen gesetzt sein	\N	2026-03-31 14:08:35.437816	system
+1723	874	English	\N	\N	Employee or organisational unit must be set	\N	2026-03-31 14:08:35.439012	system
+1724	875	German	\N	\N	Mitarbeiter und Organisationseinheit dürfen nicht gleichzeitig gesetzt sein	\N	2026-03-31 14:08:35.441751	system
+1725	875	English	\N	\N	Employee and organisational unit cannot be both set	\N	2026-03-31 14:08:35.44293	system
+1726	876	German	\N	\N	Mitarbeiter person Id ist ungültig	\N	2026-03-31 14:08:35.445656	system
+1727	876	English	\N	\N	Employee Id is invalid	\N	2026-03-31 14:08:35.446827	system
+1728	877	German	\N	\N	Zuständigkeit existiert bereits	\N	2026-03-31 14:08:35.449565	system
+1729	877	English	\N	\N	Assignment already exists	\N	2026-03-31 14:08:35.450773	system
+1730	878	German	\N	\N	Ungültige Zuständigkeiten Id	\N	2026-03-31 14:08:35.453536	system
+1731	878	English	\N	\N	Invalid assignement id	\N	2026-03-31 14:08:35.454725	system
+1732	879	German	\N	\N	Zuständigkeit gespeichert	\N	2026-03-31 14:08:35.457575	system
+1733	879	English	\N	\N	Assignment saved	\N	2026-03-31 14:08:35.458765	system
+1734	880	German	\N	\N	Fehler beim Speichern der Zuständigkeit	\N	2026-03-31 14:08:35.461925	system
+1735	880	English	\N	\N	Error when saving assignment	\N	2026-03-31 14:08:35.463354	system
+1736	881	German	\N	\N	Zuständigkeit gelöscht	\N	2026-03-31 14:08:35.466051	system
+1737	881	English	\N	\N	Assignment deleted	\N	2026-03-31 14:08:35.467214	system
+1738	882	German	\N	\N	Fehler beim Löschen der Zuständigkeit	\N	2026-03-31 14:08:35.469786	system
+1739	882	English	\N	\N	Assignment deleted	\N	2026-03-31 14:08:35.470892	system
+1740	883	German	\N	\N	keine Auswahl	\N	2026-03-31 14:08:35.473613	system
+1741	883	English	\N	\N	no selection	\N	2026-03-31 14:08:35.474763	system
+1742	884	German	\N	\N	zuständige Personen	\N	2026-03-31 14:08:35.477407	system
+1743	884	English	\N	\N	responsible persons	\N	2026-03-31 14:08:35.478549	system
+1744	885	German	\N	\N	zuständige Organisationseinheiten	\N	2026-03-31 14:08:35.481195	system
+1745	885	English	\N	\N	responsible organisation units	\N	2026-03-31 14:08:35.482409	system
+1746	886	German	\N	\N	Zugehörigkeit	\N	2026-03-31 14:08:35.485051	system
+1747	886	English	\N	\N	belonging	\N	2026-03-31 14:08:35.486187	system
+1748	887	German	\N	\N	Nur Leseberechtigung	\N	2026-03-31 14:08:35.488796	system
+1749	887	English	\N	\N	Read-Only Access	\N	2026-03-31 14:08:35.489944	system
+1750	888	German	\N	\N	Art der Einmeldung	\N	2026-03-31 14:08:35.492567	system
+1751	888	English	\N	\N	Art der Einmeldung	\N	2026-03-31 14:08:35.493713	system
+1752	889	German	\N	\N	Einreichende*r	\N	2026-03-31 14:08:35.496339	system
+1753	889	English	\N	\N	Einreichende*r	\N	2026-03-31 14:08:35.497483	system
+1754	890	German	\N	\N	Email	\N	2026-03-31 14:08:35.500174	system
+1755	890	English	\N	\N	Email	\N	2026-03-31 14:08:35.501356	system
+1756	891	German	\N	\N	DW	\N	2026-03-31 14:08:35.50396	system
+1757	891	English	\N	\N	DW	\N	2026-03-31 14:08:35.505098	system
+1758	892	German	\N	\N	bereits umgesetzt?	\N	2026-03-31 14:08:35.507931	system
+1759	892	English	\N	\N	bereits umgesetzt?	\N	2026-03-31 14:08:35.509091	system
+1760	893	German	\N	\N	Betroffene items	\N	2026-03-31 14:08:35.511711	system
+1761	893	English	\N	\N	Betroffene items	\N	2026-03-31 14:08:35.512938	system
+1762	894	German	\N	\N	Neuer Eintrag	\N	2026-03-31 14:08:35.515649	system
+1763	894	English	\N	\N	New entry	\N	2026-03-31 14:08:35.516848	system
+1764	895	German	\N	\N	Im Rahmen der Weiterentwicklung von Lehrveranstaltungen können Sie hier wichtige Ideen für die Weiterentwicklung und/oder Verbesserungen einmelden. Diese können sich auf technische, inhaltliche, medien-didaktische oder test- und prüfungsrelevante Aspekte beziehen. Eine mögliche Umsetzung Ihrer Einmeldungen für das folgende Studienjahr wird im Weiteren Ablauf geprüft und priorisiert, und ggf. im Anschluss vom Teamlead im Quellkurs entsprechend eingearbeitet.	\N	2026-03-31 14:08:35.519645	system
+1765	895	English	\N	\N	Im Rahmen der Weiterentwicklung von Lehrveranstaltungen können Sie hier wichtige Ideen für die Weiterentwicklung und/oder Verbesserungen einmelden. Diese können sich auf technische, inhaltliche, medien-didaktische oder test- und prüfungsrelevante Aspekte beziehen. Eine mögliche Umsetzung Ihrer Einmeldungen für das folgende Studienjahr wird im Weiteren Ablauf geprüft und priorisiert, und ggf. im Anschluss vom Teamlead im Quellkurs entsprechend eingearbeitet.	\N	2026-03-31 14:08:35.52082	system
+1766	896	German	\N	\N	Bitte füllen Sie pro Verbesserungspotential einen eigenen Eintrag aus!	\N	2026-03-31 14:08:35.523478	system
+1767	896	English	\N	\N	Bitte füllen Sie pro Verbesserungspotential einen eigenen Eintrag aus!	\N	2026-03-31 14:08:35.524673	system
+1768	897	German	\N	\N	Vorhandene Einmeldungen	\N	2026-03-31 14:08:35.52733	system
+1769	897	English	\N	\N	Vorhandene Einmeldungen	\N	2026-03-31 14:08:35.528475	system
+1770	898	German	\N	\N	Keine Einmeldungen vorhanden	\N	2026-03-31 14:08:35.531153	system
+1771	898	English	\N	\N	Keine Einmeldungen vorhanden	\N	2026-03-31 14:08:35.532378	system
+1772	899	German	\N	\N	Die Einmeldung würde erfolgreich versandt.	\N	2026-03-31 14:08:35.535092	system
+1773	899	English	\N	\N	Die Einmeldung würde erfolgreich versandt.	\N	2026-03-31 14:08:35.536248	system
+1774	900	German	\N	\N	Pflichtfeld	\N	2026-03-31 14:08:35.538949	system
+1775	900	English	\N	\N	Required field	\N	2026-03-31 14:08:35.540119	system
+1776	901	German	\N	\N	Sie müssen hier einen Wert eintragen.	\N	2026-03-31 14:08:35.542783	system
+1777	901	English	\N	\N	You must supply a value here.	\N	2026-03-31 14:08:35.544004	system
+1778	902	German	\N	\N	Bitte geben Sie Ihre Kurs ID (i.e. 5 Zahlen in der URL im Browser oben) an.	\N	2026-03-31 14:08:35.54669	system
+1779	902	English	\N	\N	Bitte geben Sie Ihre Kurs ID (i.e. 5 Zahlen in der URL im Browser oben) an.	\N	2026-03-31 14:08:35.547842	system
+1780	903	German	\N	\N	Kurs Url	\N	2026-03-31 14:08:35.550662	system
+1781	903	English	\N	\N	Kurs Url	\N	2026-03-31 14:08:35.551826	system
+1782	904	German	\N	\N	Bitte geben Sie die Kurzbezeichnug Ihres Kurses an (zb. TEZEI).	\N	2026-03-31 14:08:35.554609	system
+1783	904	English	\N	\N	Bitte geben Sie die Kurzbezeichnug Ihres Kurses an (zb. TEZEI).	\N	2026-03-31 14:08:35.555771	system
+1784	905	German	\N	\N	Kurskrzl	\N	2026-03-31 14:08:35.558451	system
+1785	905	English	\N	\N	Kurskrzl	\N	2026-03-31 14:08:35.559593	system
+1786	906	German	\N	\N	Art der Einmeldung:	\N	2026-03-31 14:08:35.562337	system
+1787	906	English	\N	\N	Art der Einmeldung:	\N	2026-03-31 14:08:35.563485	system
+1788	907	German	\N	\N	Art der Einmeldung	\N	2026-03-31 14:08:35.566154	system
+1789	907	English	\N	\N	Art der Einmeldung	\N	2026-03-31 14:08:35.567425	system
+1790	908	German	\N	\N	Bitte geben Sie einen aussagekräftigen Titel der Einmeldung an	\N	2026-03-31 14:08:35.570211	system
+1791	908	English	\N	\N	Bitte geben Sie einen aussagekräftigen Titel der Einmeldung an	\N	2026-03-31 14:08:35.571412	system
+1792	909	German	\N	\N	Titel der Einmeldung	\N	2026-03-31 14:08:35.574179	system
+1793	909	English	\N	\N	Titel der Einmeldung	\N	2026-03-31 14:08:35.575381	system
+1794	910	German	\N	\N	Bitte geben Sie an, wie hoch Sie den Aufwand für die Umsetzung einschätzen	\N	2026-03-31 14:08:35.578147	system
+1795	910	English	\N	\N	Bitte geben Sie an, wie hoch Sie den Aufwand für die Umsetzung einschätzen	\N	2026-03-31 14:08:35.579316	system
+1796	911	German	\N	\N	Aufwand der Umsetzung	\N	2026-03-31 14:08:35.582108	system
+1797	911	English	\N	\N	Aufwand der Umsetzung	\N	2026-03-31 14:08:35.583334	system
+1798	912	German	\N	\N	 Beschreiben Sie das Verbesserungspotential:<br><br>Geben Sie so konkret wie möglich an, auf welche Stelle im Kurs Sie sich beziehen (z.B. Eigenstudium C Test).	\N	2026-03-31 14:08:35.586109	system
+1799	912	English	\N	\N	 Beschreiben Sie das Verbesserungspotential:<br><br>Geben Sie so konkret wie möglich an, auf welche Stelle im Kurs Sie sich beziehen (z.B. Eigenstudium C Test).	\N	2026-03-31 14:08:35.587384	system
+1800	913	German	\N	\N	Beschreiben Sie das Verbesserungspotenzial.	\N	2026-03-31 14:08:35.590175	system
+1801	913	English	\N	\N	Beschreiben Sie das Verbesserungspotenzial.	\N	2026-03-31 14:08:35.591376	system
+1802	914	German	\N	\N	Bitte spezifizieren Sie, welche Items (Aufgaben, Materialien...) von dem Verbesserungspotential betroffen sind.	\N	2026-03-31 14:08:35.59415	system
+1803	914	English	\N	\N	Bitte spezifizieren Sie, welche Items (Aufgaben, Materialien...) von dem Verbesserungspotential betroffen sind.	\N	2026-03-31 14:08:35.595337	system
+1804	915	German	\N	\N	betroffene items	\N	2026-03-31 14:08:35.598092	system
+1805	915	English	\N	\N	betroffene items	\N	2026-03-31 14:08:35.599292	system
+1806	916	German	\N	\N	Attachments	\N	2026-03-31 14:08:35.602005	system
+1807	916	English	\N	\N	Attachments	\N	2026-03-31 14:08:35.603231	system
+1808	917	German	\N	\N	Wurde das Verbesserungspotential im Quellkurs bereits umgesetzt?	\N	2026-03-31 14:08:35.606056	system
+1809	917	English	\N	\N	Wurde das Verbesserungspotential im Quellkurs bereits umgesetzt?	\N	2026-03-31 14:08:35.607255	system
+1810	918	German	\N	\N	bereits umgesetzt?	\N	2026-03-31 14:08:35.610016	system
+1811	918	English	\N	\N	bereits umgesetzt?	\N	2026-03-31 14:08:35.611197	system
+1812	919	German	\N	\N	Speichern	\N	2026-03-31 14:08:35.614046	system
+1813	919	English	\N	\N	Save	\N	2026-03-31 14:08:35.615278	system
+1814	920	German	\N	\N	Fehler	\N	2026-03-31 14:08:35.617993	system
+1815	920	English	\N	\N	Error	\N	2026-03-31 14:08:35.619155	system
+1816	921	German	\N	\N	Dieser Moodle Kurs ist keinem Quellkurs zugeordnet	\N	2026-03-31 14:08:35.622004	system
+1817	921	English	\N	\N	This Moodle Course doesn't have a Source Course	\N	2026-03-31 14:08:35.623185	system
+1818	922	German	\N	\N	Fehler	\N	2026-03-31 14:08:35.625932	system
+1819	922	English	\N	\N	Error	\N	2026-03-31 14:08:35.627083	system
+1820	923	German	\N	\N	Dieser Moodle Kurs ist keinem standardisierten Quellkurs zugeordnet	\N	2026-03-31 14:08:35.629854	system
+1821	923	English	\N	\N	This Moodle Course is not derived from a standardized Source Course	\N	2026-03-31 14:08:35.631045	system
+1822	924	German	\N	\N	Organisations Einheiten	\N	2026-03-31 14:08:35.633806	system
+1823	924	English	\N	\N	Organisations Einheiten	\N	2026-03-31 14:08:35.635072	system
+1824	925	German	\N	\N	OpenProject Projekte	\N	2026-03-31 14:08:35.637913	system
+1825	925	English	\N	\N	OpenProject Projects	\N	2026-03-31 14:08:35.639099	system
+1826	926	German	\N	\N	%s (%s) ändern	\N	2026-03-31 14:08:35.641879	system
+1827	926	English	\N	\N	Edit %s (%s)	\N	2026-03-31 14:08:35.643071	system
+1828	927	German	\N	\N	Löschen?	\N	2026-03-31 14:08:35.645786	system
+1829	927	English	\N	\N	Delete?	\N	2026-03-31 14:08:35.646937	system
+1830	928	German	\N	\N	Link auflösen?	\N	2026-03-31 14:08:35.649576	system
+1831	928	English	\N	\N	Remove link?	\N	2026-03-31 14:08:35.650776	system
+1832	929	German	\N	\N	Link auflösen?	\N	2026-03-31 14:08:35.653497	system
+1833	929	English	\N	\N	Remove link?	\N	2026-03-31 14:08:35.654657	system
+1834	930	German	\N	\N	Soll diese Verknüpfung wirklich entfernt werden?	\N	2026-03-31 14:08:35.657422	system
+1835	930	English	\N	\N	Do you really want to remove this link?	\N	2026-03-31 14:08:35.658606	system
+1836	931	German	\N	\N	Das Objekt ist noch mit einem anderen Objekt verknüpft. Diese Verknüpfung wird entfernt!	\N	2026-03-31 14:08:35.661364	system
+1837	931	English	\N	\N	Your Source is already linked to another item. This connection will be removed!	\N	2026-03-31 14:08:35.662577	system
+1838	932	German	\N	\N	Das Zielobjekt ist bereits mit einem anderen Objekt verknüpft. Diese Verknüpfung wird entfernt!	\N	2026-03-31 14:08:35.665313	system
+1839	932	English	\N	\N	Your Target is already linked to another item. This connection will be removed!	\N	2026-03-31 14:08:35.666491	system
+1840	933	German	\N	\N	Suchen	\N	2026-03-31 14:08:35.669317	system
+1841	933	English	\N	\N	Search	\N	2026-03-31 14:08:35.670509	system
+1842	934	German	\N	\N	-Keine-	\N	2026-03-31 14:08:35.673311	system
+1843	934	English	\N	\N	-None-	\N	2026-03-31 14:08:35.674475	system
+1844	935	German	\N	\N	OK	\N	2026-03-31 14:08:35.677095	system
+1845	935	English	\N	\N	OK	\N	2026-03-31 14:08:35.678276	system
+1846	936	German	\N	\N	Abbrechen	\N	2026-03-31 14:08:35.680963	system
+1847	936	English	\N	\N	Cancel	\N	2026-03-31 14:08:35.682136	system
+1848	937	German	\N	\N	Keine Einträge gefunden	\N	2026-03-31 14:08:35.68495	system
+1849	937	English	\N	\N	No entries found	\N	2026-03-31 14:08:35.686122	system
+1850	938	German	\N	\N	Template	\N	2026-03-31 14:08:35.68883	system
+1851	938	English	\N	\N	Template	\N	2026-03-31 14:08:35.690043	system
+1852	939	German	\N	\N	Organisationseinheit	\N	2026-03-31 14:08:35.69268	system
+1853	939	English	\N	\N	Organisation unit	\N	2026-03-31 14:08:35.693788	system
+1854	940	German	\N	\N	Sprache	\N	2026-03-31 14:08:35.696366	system
+1855	940	English	\N	\N	Language	\N	2026-03-31 14:08:35.697461	system
+1856	941	German	\N	\N	Moodle Kurs	\N	2026-03-31 14:08:35.700139	system
+1857	941	English	\N	\N	Moodle Course	\N	2026-03-31 14:08:35.701256	system
+1858	942	German	\N	\N	OP Projekt	\N	2026-03-31 14:08:35.703793	system
+1859	942	English	\N	\N	OP Project	\N	2026-03-31 14:08:35.705007	system
+1860	943	German	\N	\N	OP Version	\N	2026-03-31 14:08:35.707706	system
+1861	943	English	\N	\N	OP Version	\N	2026-03-31 14:08:35.708879	system
+1862	944	German	\N	\N	Es ist kein Openproject Projekt verknüpft.	\N	2026-03-31 14:08:35.711563	system
+1863	944	English	\N	\N	No Openproject project is linked.	\N	2026-03-31 14:08:35.712763	system
+1864	945	German	\N	\N	Studiensemester geplant	\N	2026-03-31 14:08:35.715412	system
+1865	945	English	\N	\N	Semester planned	\N	2026-03-31 14:08:35.71659	system
+1866	946	German	\N	\N	International Credits	\N	2026-03-31 14:08:35.719239	system
+1867	946	English	\N	\N	International Credits	\N	2026-03-31 14:08:35.720458	system
+1868	947	German	\N	\N	Studentstatus	\N	2026-03-31 14:08:35.723084	system
+1869	947	English	\N	\N	Student status	\N	2026-03-31 14:08:35.724245	system
+1870	948	German	\N	\N	Alle durchgeführten anzeigen	\N	2026-03-31 14:08:35.726956	system
+1871	948	English	\N	\N	Show all performed	\N	2026-03-31 14:08:35.728108	system
+1872	949	German	\N	\N	Bestätigung hochladen	\N	2026-03-31 14:08:35.730792	system
+1873	949	English	\N	\N	Upload confirmation	\N	2026-03-31 14:08:35.731948	system
+1874	950	German	\N	\N	Maßnahme löschen	\N	2026-03-31 14:08:35.734558	system
+1875	950	English	\N	\N	Delete measure	\N	2026-03-31 14:08:35.735682	system
+1876	951	German	\N	\N	Maßnahmen	\N	2026-03-31 14:08:35.738336	system
+1877	951	English	\N	\N	Measures	\N	2026-03-31 14:08:35.739477	system
+1878	952	German	\N	\N	International skills	\N	2026-03-31 14:08:35.742148	system
+1879	952	English	\N	\N	International skills	\N	2026-03-31 14:08:35.743276	system
+1880	953	German	\N	\N	Ab dem Studienjahr 2022/23 ist der Erwerb von internationalen und interkulturellen Kompetenzen Teil des Curriculums. <br />\n\t\t\t\t\t\t\tAuf der Grundlage der vorliegenden Maßnahmen absolvieren Sie im Laufe ihres Studiums Internationalisierungsaktivitäten, die mit unterschiedlichen International Credits hinterlegt sind. <br />\n\t\t\t\t\t\t\tIn Summe müssen 5 International Credits erworben werden, die im 6. Semester wirksam werden. <br/>\n\t\t\t\t\t\t\tDas Modul „International skills“ wird mit der Beurteilung „Mit Erfolg teilgenommen“ abgeschlossen. <br />\n\t\t\t\t\t\t\tBitte wählen Sie die für Sie in Frage kommenden Maßnahmen aus und planen Sie das entsprechende Semester. <br />\n\t\t\t\t\t\t\tSobald die 5 International Credits erreicht wurden, überprüft der Studiengang die von Ihnen hochgeladenen Dokumente. <br /><br />\n\t\t\t\t\t\t\tFragen zum Status Ihrer Maßnahme u.ä. richten Sie bitte an den Studiengang. <br />\n\t\t\t\t\t\t\tBei allen weiteren Fragen zum Thema Organisation und Finanzierung des Auslandsaufenthalts und/oder Sprachkurs gibt Ihnen das International Office der FH Technikum Wien unter <a href="mailto:international.office@technikum-wien.at">international.office@technikum-wien.at</a> gerne Auskunft.	\N	2026-03-31 14:08:35.747322	system
+1881	953	English	\N	\N	Starting with the study year 2022/23, the acquisition of international and intercultural competencies is part of the curriculum.<br />\n\t\t\t\t\t\t\tOn the basis of the measures at-hand, you will complete internationalization activities during the course of your studies, which are assigned different International Credits.<br />\n\t\t\t\t\t\t\tIn total, 5 International Credits must be acquired, which become effective in the 6th semester.<br />\n\t\t\t\t\t\t\tThe module “International skills” is completed with the assessment "Successfully participated". <br />\n\t\t\t\t\t\t\tPlease select the measures that apply to you and schedule the appropriate semester. <br />\n\t\t\t\t\t\t\tOnce the 5 International Credits have been achieved, the degree program will review the documents you have uploaded. <br /><br />\n\t\t\t\t\t\t\tPlease direct questions regarding the status of your measure and the like should be directed to the study program. <br />\n\t\t\t\t\t\t\tFor all further questions regarding the organization and financing of your stay abroad and/or language course, please contact the International Office of the UAS Technikum Wien at <a href="mailto:international.office@technikum-wien.at">international.office@technikum-wien.at</a>.\n\t\t\t\t\t\t\t	\N	2026-03-31 14:08:35.748604	system
+1882	954	German	\N	\N	Nur für Bachelorstudiengänge.	\N	2026-03-31 14:08:35.751254	system
+1883	954	English	\N	\N	Only for bachelor programmes.	\N	2026-03-31 14:08:35.752461	system
+1884	955	German	\N	\N	Bezeichnung Deutsch	\N	2026-03-31 14:08:35.755175	system
+1885	955	English	\N	\N	title german	\N	2026-03-31 14:08:35.756367	system
+1886	956	German	\N	\N	Bezeichnung Englisch	\N	2026-03-31 14:08:35.759012	system
+1887	956	English	\N	\N	title english	\N	2026-03-31 14:08:35.760197	system
+1888	957	German	\N	\N	Beschreibung Deutsch	\N	2026-03-31 14:08:35.762885	system
+1889	957	English	\N	\N	description german	\N	2026-03-31 14:08:35.764153	system
+1890	958	German	\N	\N	Beschreibung Englisch	\N	2026-03-31 14:08:35.766891	system
+1891	958	English	\N	\N	description english	\N	2026-03-31 14:08:35.768063	system
+1892	959	German	\N	\N	Massnahme bearbeiten	\N	2026-03-31 14:08:35.770754	system
+1893	959	English	\N	\N	Edit measure	\N	2026-03-31 14:08:35.77194	system
+1894	960	German	\N	\N	Wollen Sie die ausgewählte Maßnahme wirklich löschen?	\N	2026-03-31 14:08:35.774677	system
+1895	960	English	\N	\N	Do you really want to delete the measure?	\N	2026-03-31 14:08:35.775821	system
+1896	961	German	\N	\N	Wollen Sie die ausgewählte Bestätigung wirklich löschen?	\N	2026-03-31 14:08:35.778504	system
+1897	961	English	\N	\N	Do you really want to delete the confirmation?	\N	2026-03-31 14:08:35.779673	system
+1898	962	German	\N	\N	Plan ablehnen	\N	2026-03-31 14:08:35.782337	system
+1899	962	English	\N	\N	Reject plan	\N	2026-03-31 14:08:35.783506	system
+1900	963	German	\N	\N	Bestätigung widerrufen	\N	2026-03-31 14:08:35.786232	system
+1901	963	English	\N	\N	Revoke confirmation	\N	2026-03-31 14:08:35.787401	system
+1902	964	German	\N	\N	Wollen Sie die Planbestätigung wirklich widerrufen?	\N	2026-03-31 14:08:35.789993	system
+1903	964	English	\N	\N	Do you really want to cancel the plan confirmation?	\N	2026-03-31 14:08:35.791135	system
+1904	965	German	\N	\N	Alle geplanten	\N	2026-03-31 14:08:35.793857	system
+1905	965	English	\N	\N	All planned	\N	2026-03-31 14:08:35.795012	system
+1906	966	German	\N	\N	Alle geplanten markieren	\N	2026-03-31 14:08:35.797748	system
+1907	966	English	\N	\N	Mark all planned	\N	2026-03-31 14:08:35.798953	system
+1908	967	German	\N	\N	Alle Maßnahmen anzeigen die im jetzigen Studiensemester geplant sind	\N	2026-03-31 14:08:35.801653	system
+1909	967	English	\N	\N	Show all measures that are planned for the current study semester	\N	2026-03-31 14:08:35.802835	system
+1910	968	German	\N	\N	Alle Studierende anzeigen aus dem jetzigen Studiensemester	\N	2026-03-31 14:08:35.805547	system
+1911	968	English	\N	\N	Show all students from the current study semester	\N	2026-03-31 14:08:35.806755	system
+1912	969	German	\N	\N	Alle Studierende anzeigen aus dem letzten Semester	\N	2026-03-31 14:08:35.809523	system
+1913	969	English	\N	\N	Show all students from the last semester"	\N	2026-03-31 14:08:35.810701	system
+1914	970	German	\N	\N	Mein Maßnahmenplan	\N	2026-03-31 14:08:35.813433	system
+1915	970	English	\N	\N	My action plan	\N	2026-03-31 14:08:35.81465	system
+1916	971	German	\N	\N	International Credits bestätigt	\N	2026-03-31 14:08:35.817471	system
+1917	971	English	\N	\N	International Credits confirmed	\N	2026-03-31 14:08:35.818667	system
+1918	972	German	\N	\N	International Credits - Maßnahme	\N	2026-03-31 14:08:35.821532	system
+1919	972	English	\N	\N	International Credits - Measures	\N	2026-03-31 14:08:35.822699	system
+1920	973	German	\N	\N	geplant	\N	2026-03-31 14:08:35.825433	system
+1921	973	English	\N	\N	planned	\N	2026-03-31 14:08:35.826601	system
+1922	974	German	\N	\N	Studierende hat die Maßnahme geplant.	\N	2026-03-31 14:08:35.829355	system
+1923	974	English	\N	\N	The student has planned the measure.	\N	2026-03-31 14:08:35.830558	system
+1924	975	German	\N	\N	akzeptiert	\N	2026-03-31 14:08:35.833311	system
+1925	975	English	\N	\N	accepted	\N	2026-03-31 14:08:35.834496	system
+1926	976	German	\N	\N	Die geplante Maßnahme wurde akzeptiert.	\N	2026-03-31 14:08:35.837206	system
+1927	976	English	\N	\N	The planned measure has been accepted.	\N	2026-03-31 14:08:35.838444	system
+1928	977	German	\N	\N	durchgeführt	\N	2026-03-31 14:08:35.841069	system
+1929	977	English	\N	\N	performed	\N	2026-03-31 14:08:35.842239	system
+1930	978	German	\N	\N	Eine Bestätigung wurde hochgeladen.	\N	2026-03-31 14:08:35.84485	system
+1931	978	English	\N	\N	A confirmation has been uploaded.	\N	2026-03-31 14:08:35.845927	system
+1932	979	German	\N	\N	bestätigt	\N	2026-03-31 14:08:35.848566	system
+1933	979	English	\N	\N	confirmed	\N	2026-03-31 14:08:35.849704	system
+1934	980	German	\N	\N	Die hochgeladene Bestätigung wurde akzeptiert.	\N	2026-03-31 14:08:35.852346	system
+1935	980	English	\N	\N	The uploaded confirmation has been accepted.	\N	2026-03-31 14:08:35.853541	system
+1936	981	German	\N	\N	abgelehnt	\N	2026-03-31 14:08:35.856316	system
+1937	981	English	\N	\N	declined	\N	2026-03-31 14:08:35.857531	system
+1938	982	German	\N	\N	Die Maßnahme wurde abgelehnt.	\N	2026-03-31 14:08:35.860286	system
+1939	982	English	\N	\N	The measure was rejected.	\N	2026-03-31 14:08:35.86145	system
+1940	983	German	\N	\N	Es wurden keine Maßnahmen geplant oder alle wurden abgelehnt.	\N	2026-03-31 14:08:35.864142	system
+1941	983	English	\N	\N	No measures have been planned, or all have been rejected.	\N	2026-03-31 14:08:35.865377	system
+1942	984	German	\N	\N	Mindestens eine Maßnahme wurde akzeptiert.	\N	2026-03-31 14:08:35.868151	system
+1943	984	English	\N	\N	At least one measure has been accepted.	\N	2026-03-31 14:08:35.869337	system
+1944	985	German	\N	\N	Es gibt mindestens eine geplante oder durchgeführte Maßnahme.	\N	2026-03-31 14:08:35.871959	system
+1945	985	English	\N	\N	There is at least one planned or performed measure.	\N	2026-03-31 14:08:35.873139	system
+1946	986	German	\N	\N	Nur bestätigte Maßnahmen vorhanden, aber weniger als 5 International Credits.	\N	2026-03-31 14:08:35.875835	system
+1947	986	English	\N	\N	Only confirmed measures, but fewer than 5 International Credits.	\N	2026-03-31 14:08:35.877012	system
+1948	987	German	\N	\N	Es wurden 5 International Credits erreicht.	\N	2026-03-31 14:08:35.879702	system
+1949	987	English	\N	\N	5 International Credits have been achieved.	\N	2026-03-31 14:08:35.880861	system
+1950	988	German	\N	\N	Die Anzahl der Empfänger überschreitet 50. Bitte verwenden Sie einen Filter (z.B. Semester), um die Empfängeranzahl zu reduzieren.	\N	2026-03-31 14:08:35.883627	system
+1951	988	English	\N	\N	The number of recipients exceeds 50. Please use a filter (e.g., semester) to reduce the number of recipients.	\N	2026-03-31 14:08:35.884791	system
+1952	989	German	\N	\N	Keine Studierenden ohne geplante Maßnahmen gefunden.	\N	2026-03-31 14:08:35.887508	system
+1953	989	English	\N	\N	No students without planned measures were found.	\N	2026-03-31 14:08:35.888694	system
+1954	990	German	\N	\N	E-Mail nur an Studierende, die keine Maßnahmen geplant haben.	\N	2026-03-31 14:08:35.891706	system
+1955	990	English	\N	\N	Send email only to students who have no planned measures.	\N	2026-03-31 14:08:35.892924	system
+1956	991	German	\N	\N	Maßnahme - geplant	\N	2026-03-31 14:08:35.895629	system
+1957	991	English	\N	\N	Measure - planned	\N	2026-03-31 14:08:35.896819	system
+1958	992	German	\N	\N	Die Maßhname wurde geplant.	\N	2026-03-31 14:08:35.899542	system
+1959	992	English	\N	\N	The measure was planned.	\N	2026-03-31 14:08:35.900715	system
+1960	993	German	\N	\N	Plan - akzeptiert	\N	2026-03-31 14:08:35.903436	system
+1961	993	English	\N	\N	Plan - accepted	\N	2026-03-31 14:08:35.904639	system
+1962	994	German	\N	\N	Mail versenden	\N	2026-03-31 14:08:35.907318	system
+1963	994	English	\N	\N	Send mail	\N	2026-03-31 14:08:35.90849	system
+1964	995	German	\N	\N	Maßnahme - durchgeführt	\N	2026-03-31 14:08:35.911194	system
+1965	995	English	\N	\N	Measure - performed	\N	2026-03-31 14:08:35.91236	system
+1966	996	German	\N	\N	International Credits - bestätigt	\N	2026-03-31 14:08:35.91502	system
+1967	996	English	\N	\N	International Credits - confirmed	\N	2026-03-31 14:08:35.916202	system
+1968	997	German	\N	\N	Maßnahme - abgelehnt	\N	2026-03-31 14:08:35.918866	system
+1969	997	English	\N	\N	Measure - declined	\N	2026-03-31 14:08:35.919983	system
+1970	998	German	\N	\N	Plan akzeptieren	\N	2026-03-31 14:08:35.9226	system
+1971	998	English	\N	\N	Accept plan	\N	2026-03-31 14:08:35.923731	system
+1972	999	German	\N	\N	Bestätigung akzeptieren	\N	2026-03-31 14:08:35.926361	system
+1973	999	English	\N	\N	Accept confirmation	\N	2026-03-31 14:08:35.927475	system
+1974	1000	German	\N	\N	Bestätigung ablehnen	\N	2026-03-31 14:08:35.930146	system
+1975	1000	English	\N	\N	Reject confirmation	\N	2026-03-31 14:08:35.93132	system
+1976	1001	German	\N	\N	Grund	\N	2026-03-31 14:08:35.93394	system
+1977	1001	English	\N	\N	Reason	\N	2026-03-31 14:08:35.935094	system
+1978	1002	German	\N	\N	Begründung - Studiengangsleitung	\N	2026-03-31 14:08:35.937811	system
+1979	1002	English	\N	\N	Reason - Study course Director	\N	2026-03-31 14:08:35.93893	system
+1980	1003	German	\N	\N	>=5 International Credits verplant	\N	2026-03-31 14:08:35.941616	system
+1981	1003	English	\N	\N	>=5 international credits planned	\N	2026-03-31 14:08:35.942758	system
+1982	1004	German	\N	\N	Nur offene Massnahmen	\N	2026-03-31 14:08:35.945603	system
+1983	1004	English	\N	\N	only open measures	\N	2026-03-31 14:08:35.94675	system
+1984	1005	German	\N	\N	<5 International Credits verplant	\N	2026-03-31 14:08:35.949465	system
+1985	1005	English	\N	\N	<5 International Credits planned	\N	2026-03-31 14:08:35.950611	system
+1986	1006	German	\N	\N	>=5 International Credits bestätigt	\N	2026-03-31 14:08:35.953201	system
+1987	1006	English	\N	\N	>=5 International Credits confirmed	\N	2026-03-31 14:08:35.954359	system
+1988	1007	German	\N	\N	<5 International Credits bestätigt	\N	2026-03-31 14:08:35.957036	system
+1989	1007	English	\N	\N	<5 International Credits confirmed	\N	2026-03-31 14:08:35.958156	system
+1990	1008	German	\N	\N	Alle markierten Pläne akzeptieren	\N	2026-03-31 14:08:35.960787	system
+1991	1008	English	\N	\N	Accept all marked plans	\N	2026-03-31 14:08:35.96192	system
+1992	1009	German	\N	\N	Bestätigung herunterladen	\N	2026-03-31 14:08:35.964583	system
+1993	1009	English	\N	\N	Download confirmation	\N	2026-03-31 14:08:35.965699	system
+1994	1010	German	\N	\N	Maßnahme hinzufügen	\N	2026-03-31 14:08:35.968289	system
+1995	1010	English	\N	\N	Add measure	\N	2026-03-31 14:08:35.969477	system
+1996	1011	German	\N	\N	Benutzer ist bereits der Gruppe zugewiesen	\N	2026-03-31 14:08:35.972116	system
+1997	1011	English	\N	\N	User is already assigned to the group	\N	2026-03-31 14:08:35.973322	system
+1998	1012	German	\N	\N	Gruppenmanagement	\N	2026-03-31 14:08:35.976026	system
+1999	1012	English	\N	\N	Group management	\N	2026-03-31 14:08:35.977185	system
+2000	1013	German	\N	\N	Kurzbezeichnung	\N	2026-03-31 14:08:35.979791	system
+2001	1013	English	\N	\N	Short description	\N	2026-03-31 14:08:35.980868	system
+2002	1014	German	\N	\N	Bezeichnung	\N	2026-03-31 14:08:35.98344	system
+2003	1014	English	\N	\N	Name	\N	2026-03-31 14:08:35.984584	system
+2004	1015	German	\N	\N	Beschreibung	\N	2026-03-31 14:08:35.98718	system
+2005	1015	English	\N	\N	Description	\N	2026-03-31 14:08:35.988342	system
+2006	1016	German	\N	\N	Zuweisen/Entfernen	\N	2026-03-31 14:08:35.991015	system
+2007	1016	English	\N	\N	Assign/Remove	\N	2026-03-31 14:08:35.99214	system
+2008	1017	German	\N	\N	Benutzergruppe	\N	2026-03-31 14:08:35.994646	system
+2009	1017	English	\N	\N	User group	\N	2026-03-31 14:08:35.995728	system
+2010	1018	German	\N	\N	Benutzer hinzufügen	\N	2026-03-31 14:08:35.998371	system
+2011	1018	English	\N	\N	Add user	\N	2026-03-31 14:08:35.999549	system
+2012	1019	German	\N	\N	aktiv	\N	2026-03-31 14:08:36.00212	system
+2013	1019	English	\N	\N	active	\N	2026-03-31 14:08:36.003273	system
+2014	1020	German	\N	\N	Bitte Nachname, Geschlecht und Geburtsdatum ausfüllen.	\N	2026-03-31 14:08:36.005891	system
+2015	1020	English	\N	\N	Please fill out the last name, gender and date of birth.	\N	2026-03-31 14:08:36.007028	system
+2016	1021	German	\N	\N	Status setzen	\N	2026-03-31 14:08:36.009699	system
+2017	1021	English	\N	\N	Set state	\N	2026-03-31 14:08:36.010847	system
+2018	1022	German	\N	\N	Abgewiesen am	\N	2026-03-31 14:08:36.013568	system
+2019	1022	English	\N	\N	Rejected on	\N	2026-03-31 14:08:36.014708	system
+2020	1023	German	\N	\N	Status ausw&auml;hlen	\N	2026-03-31 14:08:36.017336	system
+2021	1023	English	\N	\N	Select status	\N	2026-03-31 14:08:36.018526	system
+2022	1024	German	\N	\N	Status zur&uuml;cksetzen	\N	2026-03-31 14:08:36.021388	system
+2023	1024	English	\N	\N	Reset status	\N	2026-03-31 14:08:36.022547	system
+2024	1025	German	\N	\N	Fehler beim Laden der Fehlerkonfiguration	\N	2026-03-31 14:08:36.025226	system
+2025	1025	English	\N	\N	Error when loading error configuration	\N	2026-03-31 14:08:36.026395	system
+2026	1026	German	\N	\N	Fehler beim Laden der Fehler	\N	2026-03-31 14:08:36.029091	system
+2027	1026	English	\N	\N	Error when loading errors	\N	2026-03-31 14:08:36.030252	system
+2028	1027	German	\N	\N	Ungültiger Konfigurationstyp	\N	2026-03-31 14:08:36.032973	system
+2029	1027	English	\N	\N	Invalid configuration type	\N	2026-03-31 14:08:36.034124	system
+2030	1028	German	\N	\N	Ungültiger Konfigurationswert für Datentyp {0}, Sonderzeichen nicht erlaubt	\N	2026-03-31 14:08:36.036819	system
+2031	1028	English	\N	\N	Invalid configuration value for data type {0}, special characters not allowed	\N	2026-03-31 14:08:36.037977	system
+2032	1029	German	\N	\N	Fehler Konfiguration	\N	2026-03-31 14:08:36.040688	system
+2033	1029	English	\N	\N	Error configuration	\N	2026-03-31 14:08:36.04186	system
+2034	1030	German	\N	\N	Konfigurationstyp	\N	2026-03-31 14:08:36.044577	system
+2035	1030	English	\N	\N	configuration type	\N	2026-03-31 14:08:36.045746	system
+2036	1031	German	\N	\N	Konfigurationswert	\N	2026-03-31 14:08:36.048419	system
+2037	1031	English	\N	\N	configuration value	\N	2026-03-31 14:08:36.049577	system
+2038	1032	German	\N	\N	wert1;wert2;wert3	\N	2026-03-31 14:08:36.052217	system
+2039	1032	English	\N	\N	value1;value2;value3	\N	2026-03-31 14:08:36.053379	system
+2040	1033	German	\N	\N	Konfigurationswert(e) zuweisen	\N	2026-03-31 14:08:36.056049	system
+2041	1033	English	\N	\N	Assign configuration value(s)	\N	2026-03-31 14:08:36.057205	system
+2042	1034	German	\N	\N	Konfigurationsbeschreibung	\N	2026-03-31 14:08:36.059941	system
+2043	1034	English	\N	\N	Configuration description	\N	2026-03-31 14:08:36.0611	system
+2044	1035	German	\N	\N	Konfigurationsdatentyp	\N	2026-03-31 14:08:36.063896	system
+2045	1035	English	\N	\N	Configuration data type	\N	2026-03-31 14:08:36.065056	system
+2046	1036	German	\N	\N	Konfiguration gespeichert	\N	2026-03-31 14:08:36.067757	system
+2047	1036	English	\N	\N	Configuration saved	\N	2026-03-31 14:08:36.068917	system
+2048	1037	German	\N	\N	Fehler beim Speichern der Konfiguration	\N	2026-03-31 14:08:36.071632	system
+2049	1037	English	\N	\N	Error when saving configuration	\N	2026-03-31 14:08:36.072795	system
+2050	1038	German	\N	\N	Konfiguration gelöscht	\N	2026-03-31 14:08:36.075468	system
+2051	1038	English	\N	\N	Deleted configuration	\N	2026-03-31 14:08:36.076669	system
+2052	1039	German	\N	\N	Fehler beim Löschen der Konfiguration	\N	2026-03-31 14:08:36.079329	system
+2053	1039	English	\N	\N	Error when deleting configuration	\N	2026-03-31 14:08:36.080604	system
+2054	1040	German	\N	\N	Konfigurationswert(e) löschen	\N	2026-03-31 14:08:36.083147	system
+2055	1040	English	\N	\N	Delete configuration value(s)	\N	2026-03-31 14:08:36.084269	system
+2056	1041	German	\N	\N	Angabe fehlt	\N	2026-03-31 14:08:36.086854	system
+2057	1041	English	\N	\N	Value is missing	\N	2026-03-31 14:08:36.087952	system
+2058	1042	German	\N	\N	Lehrveranstaltungsinformationen	\N	2026-03-31 14:08:36.090561	system
+2059	1042	English	\N	\N	Course Information	\N	2026-03-31 14:08:36.091672	system
+2060	1043	German	\N	\N	Moodle Informationen	\N	2026-03-31 14:08:36.094397	system
+2061	1043	English	\N	\N	Moodle Information	\N	2026-03-31 14:08:36.0956	system
+2062	1044	German	\N	\N	Aktion	\N	2026-03-31 14:08:36.098349	system
+2063	1044	English	\N	\N	Action	\N	2026-03-31 14:08:36.099534	system
+2064	1045	German	\N	\N	überfällig	\N	2026-03-31 14:08:36.102282	system
+2065	1045	English	\N	\N	overdue	\N	2026-03-31 14:08:36.103471	system
+2066	1046	German	\N	\N	Event ist überfällig	\N	2026-03-31 14:08:36.106242	system
+2067	1046	English	\N	\N	Event is overdue	\N	2026-03-31 14:08:36.107462	system
+2068	1047	German	\N	\N	Moodle Link	\N	2026-03-31 14:08:36.1102	system
+2069	1047	English	\N	\N	Moodle link	\N	2026-03-31 14:08:36.111409	system
+2070	1048	German	\N	\N	Raum Kurzbezeichnung	\N	2026-03-31 14:08:36.114183	system
+2071	1048	English	\N	\N	Room Shortname	\N	2026-03-31 14:08:36.115433	system
+2072	1049	German	\N	\N	Raum Informationen	\N	2026-03-31 14:08:36.118213	system
+2073	1049	English	\N	\N	Room Information	\N	2026-03-31 14:08:36.119454	system
+2074	1050	German	\N	\N	Räume Suchen	\N	2026-03-31 14:08:36.122207	system
+2075	1050	English	\N	\N	Search Rooms	\N	2026-03-31 14:08:36.123701	system
+2076	1051	German	\N	\N	Mindestpersonenkapazität	\N	2026-03-31 14:08:36.126475	system
+2077	1051	English	\N	\N	Minimum person capacity	\N	2026-03-31 14:08:36.127649	system
+2078	1052	German	\N	\N	Raum Reservierungen	\N	2026-03-31 14:08:36.130379	system
+2079	1052	English	\N	\N	Room Reservations	\N	2026-03-31 14:08:36.131588	system
+2080	1053	German	\N	\N	Personen Kapazität	\N	2026-03-31 14:08:36.134289	system
+2081	1053	English	\N	\N	Person Capacity	\N	2026-03-31 14:08:36.135471	system
+2082	1054	German	\N	\N	Raumnummer	\N	2026-03-31 14:08:36.138189	system
+2083	1054	English	\N	\N	Room Number	\N	2026-03-31 14:08:36.139358	system
+2084	1055	German	\N	\N	Keine Raum Reservierungen gefunden	\N	2026-03-31 14:08:36.142069	system
+2085	1055	English	\N	\N	No Room Reservations found	\N	2026-03-31 14:08:36.143276	system
+2086	1056	German	\N	\N	Aktuell ist dieser Lehrveranstaltung noch kein Lektor zugeordnet	\N	2026-03-31 14:08:36.145963	system
+2087	1056	English	\N	\N	ENG Aktuell ist dieser Lehrveranstaltung noch kein Lektor zugeordnet	\N	2026-03-31 14:08:36.14733	system
+2088	1057	German	\N	\N	Incomingplätze	\N	2026-03-31 14:08:36.150035	system
+2089	1057	English	\N	\N	Places Available for Incoming Students	\N	2026-03-31 14:08:36.151251	system
+2090	1058	German	\N	\N	Lehrbeauftragte*r	\N	2026-03-31 14:08:36.153988	system
+2091	1058	English	\N	\N	Lecturer(s)	\N	2026-03-31 14:08:36.155182	system
+2092	1059	German	\N	\N	LV-Leiter*in	\N	2026-03-31 14:08:36.157934	system
+2093	1059	English	\N	\N	Head of Course	\N	2026-03-31 14:08:36.159119	system
+2094	1060	German	\N	\N	Keine Lehrveranstaltungen gefunden	\N	2026-03-31 14:08:36.161876	system
+2095	1060	English	\N	\N	No LVs found	\N	2026-03-31 14:08:36.163034	system
+2096	1061	German	\N	\N	Leitung	\N	2026-03-31 14:08:36.16585	system
+2097	1061	English	\N	\N	Head	\N	2026-03-31 14:08:36.167022	system
+2098	1062	German	\N	\N	Koordination	\N	2026-03-31 14:08:36.169766	system
+2099	1062	English	\N	\N	Coordination	\N	2026-03-31 14:08:36.170961	system
+2100	1063	German	\N	\N	Sprache	\N	2026-03-31 14:08:36.173693	system
+2101	1063	English	\N	\N	Language	\N	2026-03-31 14:08:36.174836	system
+2102	1064	German	\N	\N	Englisch	\N	2026-03-31 14:08:36.177581	system
+2103	1064	English	\N	\N	English	\N	2026-03-31 14:08:36.178767	system
+2104	1065	German	\N	\N	Deutsch	\N	2026-03-31 14:08:36.181539	system
+2105	1065	English	\N	\N	German	\N	2026-03-31 14:08:36.182711	system
+2106	1066	German	\N	\N	Verfügbare Sprachen	\N	2026-03-31 14:08:36.185464	system
+2107	1066	English	\N	\N	Available languages	\N	2026-03-31 14:08:36.186634	system
+2108	1067	German	\N	\N	Dokumente	\N	2026-03-31 14:08:36.18934	system
+2109	1067	English	\N	\N	Documents	\N	2026-03-31 14:08:36.190552	system
+2110	1068	German	\N	\N	Dokument	\N	2026-03-31 14:08:36.193345	system
+2111	1068	English	\N	\N	Document	\N	2026-03-31 14:08:36.194552	system
+2112	1069	German	\N	\N	Erstelldatum	\N	2026-03-31 14:08:36.197249	system
+2113	1069	English	\N	\N	Creation date	\N	2026-03-31 14:08:36.198405	system
+2114	1070	German	\N	\N	Bestätigungen/Zeugnisse	\N	2026-03-31 14:08:36.201194	system
+2115	1070	English	\N	\N	Certificates/Transcripts	\N	2026-03-31 14:08:36.202439	system
+2116	1071	German	\N	\N	Studienbestätigung	\N	2026-03-31 14:08:36.205284	system
+2117	1071	English	\N	\N	Enrollment Confirmation	\N	2026-03-31 14:08:36.206523	system
+2118	1072	German	\N	\N	Studienbeitrag für das %1$s bezahlt	\N	2026-03-31 14:08:36.209317	system
+2119	1072	English	\N	\N	tuition fee for semester %1$s paid	\N	2026-03-31 14:08:36.210503	system
+2120	1073	German	\N	\N	Studienbeitrag für das %1$s noch nicht bezahlt	\N	2026-03-31 14:08:36.213245	system
+2121	1073	English	\N	\N	tuition fee for semester %1$s not yet paid	\N	2026-03-31 14:08:36.21446	system
+2122	1074	German	\N	\N	Studienbeitrag für %1$s noch nicht bezahlt	\N	2026-03-31 14:08:36.21715	system
+2123	1074	English	\N	\N	tuition fee for %1$s not yet paid	\N	2026-03-31 14:08:36.218336	system
+2124	1075	German	\N	\N	Studienbeitrag noch nicht bezahlt	\N	2026-03-31 14:08:36.221115	system
+2125	1075	English	\N	\N	tuition fee not yet paid	\N	2026-03-31 14:08:36.222352	system
+2126	1076	German	\N	\N	Studienerfolgsbestätigung	\N	2026-03-31 14:08:36.225116	system
+2127	1076	English	\N	\N	Student progress report	\N	2026-03-31 14:08:36.226347	system
+2128	1077	German	\N	\N	Bitte wählen Sie das entsprechende Studiensemester aus	\N	2026-03-31 14:08:36.229105	system
+2129	1077	English	\N	\N	Please select the corresponding semester	\N	2026-03-31 14:08:36.230319	system
+2130	1078	German	\N	\N	zur Vorlage beim Wohnsitzfinanzamt	\N	2026-03-31 14:08:36.233059	system
+2131	1078	English	\N	\N	for submission to local tax office	\N	2026-03-31 14:08:36.234257	system
+2132	1079	German	\N	\N	Studienbuchblatt	\N	2026-03-31 14:08:36.23702	system
+2133	1079	English	\N	\N	Student Record	\N	2026-03-31 14:08:36.238251	system
+2134	1080	German	\N	\N	Alle Studiensemester	\N	2026-03-31 14:08:36.240955	system
+2135	1080	English	\N	\N	All semester	\N	2026-03-31 14:08:36.242294	system
+2136	1081	German	\N	\N	Abschlussdokumente/Zeugnisse	\N	2026-03-31 14:08:36.245331	system
+2137	1081	English	\N	\N	Final documents/Transcripts	\N	2026-03-31 14:08:36.246524	system
+2138	1082	German	\N	\N	Noch keine Abschlussdokumente vorhanden	\N	2026-03-31 14:08:36.249276	system
+2139	1082	English	\N	\N	No final documents available yet	\N	2026-03-31 14:08:36.250468	system
+2140	1083	German	\N	\N	Für das übergebene Studiensemester %1$s existiert kein Status. Bitte wählen Sie ein gültiges Studiensemester aus dem DropDown.	\N	2026-03-31 14:08:36.253237	system
+2141	1083	English	\N	\N	No status found for %1$s. Please select a valid semester from the dropdown.	\N	2026-03-31 14:08:36.254538	system
+2142	1084	German	\N	\N	<b>Hinweis!</b> Digital signierte Dokumente werden in manchen Browsern und PDF-Readern nicht korrekt angezeigt. <br/>Bitte verwenden Sie den <a href="https://get.adobe.com/de/reader/" target="_blank">Adobe Acrobat Reader</a>, wenn Sie das Dokument ausdrucken möchten.	\N	2026-03-31 14:08:36.257235	system
+2143	1084	English	\N	\N	<b>Note!</b> Digitally signed documents are not displayed correctly in some browsers and PDF readers. <br/>Please use the <a href="https://get.adobe.com/de/reader/" target="_blank">Adobe Acrobat Reader</a> if you want to print the document.	\N	2026-03-31 14:08:36.258456	system
+2144	1085	German	\N	\N	Höchster Abschluss (unterteilt in Österreich oder im Ausland/unbekannt) passt nicht zum Staat des höchsten Abschlusses.	\N	2026-03-31 14:08:36.261182	system
+2145	1085	English	\N	\N	Highest completed level of education (divided into those acquired in Austria and those abroad/unknown) does not match country of the highest completed level of education	\N	2026-03-31 14:08:36.262391	system
+2146	1086	German	\N	\N	Erfolgreich gespeichert	\N	2026-03-31 14:08:36.265132	system
+2147	1086	English	\N	\N	Saved successfully	\N	2026-03-31 14:08:36.266342	system
+2148	1087	German	\N	\N	Fehler beim Speichern	\N	2026-03-31 14:08:36.269078	system
+2149	1087	English	\N	\N	Error when saving	\N	2026-03-31 14:08:36.270269	system
+2150	1088	German	\N	\N	Erhebung bei der Anmeldung zu einem Studium oder bei Studienbeginn	\N	2026-03-31 14:08:36.273057	system
+2151	1088	English	\N	\N	Survey when applying for a study or at the start of studies	\N	2026-03-31 14:08:36.274225	system
+2152	1089	German	\N	\N	gemäß § 18 Absätzen 6 und 7 Bildungsdokumentationsgesetz 2020, BGBl. I  Nr. 20/2021, in der gültigen Fassung, sowie § 141 Absatz 3 Universitätsgesetz 2002, BGBl. I  Nr. 120/2002, in der gültigen Fassung.	\N	2026-03-31 14:08:36.27708	system
+2153	1089	English	\N	\N	according to section 18 subsections 6 and 7 of the Bildungsdokumentationsgesetz 2020, Federal Law Gazette I  No. 20/2021, in the current version, and section 141 subsection 3 of the Universitätsgesetz 2002, Federal Law Gazette I  No. 120/2002, in the current version.	\N	2026-03-31 14:08:36.278327	system
+2154	1090	German	\N	\N	Das Senden der Daten ist nur möglich, wenn die Sozialversicherungsnummer (bzw. das Ersatzkennzeichen) gültig ist und alle Fragen beantwortet worden sind. Wenn Sie etwas nicht wissen, wählen Sie die Antwortmöglichkeit „unbekannt“, aber beantworten Sie bitte alle Fragen.	\N	2026-03-31 14:08:36.281035	system
+2155	1090	English	\N	\N	Sending the data is only possible if the social security number (or the substitute code) is valid and all questions have been answered. If you don't know something, choose the answer option “unknown”, but please answer all questions.	\N	2026-03-31 14:08:36.282277	system
+2156	1091	German	\N	\N	Laut Bildungsdokumentationsgesetz sind wir verpflichtet die Sozialversicherungsnummer zu erheben bzw. zu registrieren. Falls Sie über keine Sozialversicherungsnummer verfügen, fordert die FH Technikum Wien in Ihrem Namen ein Ersatzkenneichen an.	\N	2026-03-31 14:08:36.285059	system
+2157	1091	English	\N	\N	According to the General Social Insurance Act, we are obliged to collect and register your national insurance number. If you do not have a national insurance number, UAS Technikum Wien will request a social insurance substitute code on your behalf.	\N	2026-03-31 14:08:36.286273	system
+2158	1092	German	\N	\N	Angaben zu Ihren Erziehungsberechtigten	\N	2026-03-31 14:08:36.289007	system
+2159	1092	English	\N	\N	Information about your legal guardians	\N	2026-03-31 14:08:36.290194	system
+2160	1093	German	\N	\N	Die folgenden Fragen beziehen sich auf Personen, welche für Sie erziehungsberechtigt waren oder sind (Eltern oder jene Personen, die für Sie eine entsprechende Rolle übernommen haben, wie z.B. Stief- oder Pflegeeltern).	\N	2026-03-31 14:08:36.292982	system
+2161	1093	English	\N	\N	The following issues refer to your legal guardians (parents or persons who were in the role of the parents, e.g. stepparents or foster parents).	\N	2026-03-31 14:08:36.294209	system
+2162	1094	German	\N	\N	Bitte auswählen...	\N	2026-03-31 14:08:36.296972	system
+2163	1094	English	\N	\N	please select...	\N	2026-03-31 14:08:36.298154	system
+2164	1095	German	\N	\N	Erziehungsberechtigte Person 1/Mutter	\N	2026-03-31 14:08:36.300915	system
+2165	1095	English	\N	\N	Legal guardian 1/mother	\N	2026-03-31 14:08:36.302116	system
+2166	1096	German	\N	\N	Geburtsjahr	\N	2026-03-31 14:08:36.304923	system
+2167	1096	English	\N	\N	year of birth	\N	2026-03-31 14:08:36.306128	system
+2168	1097	German	\N	\N	Geburtsstaat	\N	2026-03-31 14:08:36.308858	system
+2169	1097	English	\N	\N	country of birth	\N	2026-03-31 14:08:36.310053	system
+2170	1098	German	\N	\N	in den heutigen Grenzen	\N	2026-03-31 14:08:36.312794	system
+2171	1098	English	\N	\N	in today's borders	\N	2026-03-31 14:08:36.313977	system
+2172	1099	German	\N	\N	Staat des höchsten Abschlusses	\N	2026-03-31 14:08:36.316736	system
+2173	1099	English	\N	\N	Country of the highest completed level of education	\N	2026-03-31 14:08:36.317927	system
+2174	1100	German	\N	\N	Höchster Abschluss	\N	2026-03-31 14:08:36.320743	system
+2175	1100	English	\N	\N	Highest completed level of education	\N	2026-03-31 14:08:36.321929	system
+2176	1101	German	\N	\N	Falls der höchste Bildungsabschluss in Österreich erworben wurde	\N	2026-03-31 14:08:36.324707	system
+2177	1101	English	\N	\N	If the highest level of education was completed in Austria:	\N	2026-03-31 14:08:36.325894	system
+2178	1102	German	\N	\N	Falls das Land des höchsten erworbenen Bildungsabschlusses unbekannt oder nicht Österreich ist	\N	2026-03-31 14:08:36.328659	system
+2179	1102	English	\N	\N	If the country of the highest completed level of education is unknown or not Austria:	\N	2026-03-31 14:08:36.329834	system
+2180	1103	German	\N	\N	Erziehungsberechtigte Person 2/Vater	\N	2026-03-31 14:08:36.332557	system
+2181	1103	English	\N	\N	Legal guardian 2/father	\N	2026-03-31 14:08:36.333761	system
+2182	1104	German	\N	\N	Prüfen und Speichern	\N	2026-03-31 14:08:36.336438	system
+2183	1104	English	\N	\N	Check and submit	\N	2026-03-31 14:08:36.337612	system
+2184	1105	German	\N	\N	Daten löschen	\N	2026-03-31 14:08:36.340285	system
+2185	1105	English	\N	\N	Delete data	\N	2026-03-31 14:08:36.341462	system
+2186	1106	German	\N	\N	Erfolgreich gelöscht	\N	2026-03-31 14:08:36.344122	system
+2187	1106	English	\N	\N	Deleted successfully	\N	2026-03-31 14:08:36.345312	system
+2188	1107	German	\N	\N	Gemäß § 16 Abs. 1 FHG steht Studierenden einmalig das Recht auf Wiederholung eines Studienjahres in Folge einer negativ beurteilten kommissionellen Prüfung zu.	\N	2026-03-31 14:08:36.349354	system
+2189	1107	English	\N	\N	According to § 16 paragraph 1 FHG, students have the right to repeat an academic year as a result of a negative examination before a committee.	\N	2026-03-31 14:08:36.350523	system
+2190	1108	German	\N	\N	Die Wiederholung ist bei der Studiengangsleitung binnen eines Monats ab Mitteilung des negativen Prüfungsergebnisses bekannt zu geben.	\N	2026-03-31 14:08:36.35329	system
+2191	1108	English	\N	\N	The head of the degree program must be notified of the repetition within one month of notification of the negative examination result.	\N	2026-03-31 14:08:36.354448	system
+2192	1109	German	\N	\N	Infolge der Weiterentwicklung der Qualität des Studienganges kann es zu Änderungen der Studienbedingungen im Zuge der Wiederholung eines Studienjahres kommen (z.B. Studienplan, Prüfungsordnung etc.).	\N	2026-03-31 14:08:36.357167	system
+2193	1109	English	\N	\N	As a result of the further development of the quality of the course, there may be changes to the study conditions in the course of repeating an academic year (e.g. study plan, examination regulations, etc.).	\N	2026-03-31 14:08:36.358364	system
+2194	1110	German	\N	\N	Die Studiengangsleitung legt Prüfungen und Lehrveranstaltungen für die Wiederholung des Studienjahres fest.	\N	2026-03-31 14:08:36.361047	system
+2195	1110	English	\N	\N	The head of the degree program determines examinations and courses for the repetition of the academic year.	\N	2026-03-31 14:08:36.362275	system
+2196	1111	German	\N	\N	Nicht bestandene Prüfungen und Lehrveranstaltungen sind jedenfalls, bestandene Prüfungen und Lehrveranstaltungen nur, sofern es der Zweck des Studiums erforderlich macht, zu wiederholen oder erneut zu besuchen. Wird eine Lehrveranstaltung nach der letzten Wiederholungsmöglichkeit negativ beurteilt, darf dieder Studierende an keiner kommissionellen Wiederholungsprüfung im Semester der negativ beurteilen Lehrveranstaltung und im Folgesemester mehr teilnehmen (nicht-kommissionelle Wiederholungsprüfungen können wahrgenommen werden)	\N	2026-03-31 14:08:36.365024	system
+2197	1111	English	\N	\N	In any case, failed examinations and courses are to be repeated or attended again only if the purpose of the course makes it necessary. If a course is assessed negatively after the last opportunity to repeat it, the student may no longer take part in a board re-examination in the semester in which the course was assessed as negative and in the following semester (non-board re-examinations can be taken).	\N	2026-03-31 14:08:36.366226	system
+2198	1112	German	\N	\N	Negativ beurteilte kommissionelle Prüfung	\N	2026-03-31 14:08:36.368907	system
+2199	1112	English	\N	\N	Negative assessment by a committee	\N	2026-03-31 14:08:36.370038	system
+2200	1113	German	\N	\N	Datum der Beurteilung	\N	2026-03-31 14:08:36.372732	system
+2201	1113	English	\N	\N	date of assessment	\N	2026-03-31 14:08:36.373889	system
+2202	1114	German	\N	\N	Ich gebe hiermit die Wiederholung des Studienjahres bekannt	\N	2026-03-31 14:08:36.376589	system
+2203	1114	English	\N	\N	I hereby announce the repetition of the academic year	\N	2026-03-31 14:08:36.377754	system
+2204	1115	German	\N	\N	Ich werde das Studienjahr nicht wiederholen und Abbrechen	\N	2026-03-31 14:08:36.380423	system
+2205	1115	English	\N	\N	I will not repeat the academic year and will drop out	\N	2026-03-31 14:08:36.381586	system
+2206	1116	German	\N	\N	Verwaltung des Studierendenstatus	\N	2026-03-31 14:08:36.384239	system
+2207	1116	English	\N	\N	Management of student status	\N	2026-03-31 14:08:36.385419	system
+2208	1117	German	\N	\N	Neu Anlegen	\N	2026-03-31 14:08:36.388332	system
+2209	1117	English	\N	\N	Create new	\N	2026-03-31 14:08:36.38958	system
+2210	1118	German	\N	\N	Abbrechen	\N	2026-03-31 14:08:36.392334	system
+2211	1118	English	\N	\N	Cancel	\N	2026-03-31 14:08:36.393521	system
+2212	1119	German	\N	\N	Ok	\N	2026-03-31 14:08:36.396244	system
+2213	1119	English	\N	\N	Ok	\N	2026-03-31 14:08:36.397467	system
+2214	1120	German	\N	\N	Suche	\N	2026-03-31 14:08:36.400407	system
+2215	1120	English	\N	\N	Search	\N	2026-03-31 14:08:36.401542	system
+2216	1121	German	\N	\N	Anlegen	\N	2026-03-31 14:08:36.404189	system
+2217	1121	English	\N	\N	Create	\N	2026-03-31 14:08:36.40541	system
+2218	1122	German	\N	\N	Vom Studium abmelden	\N	2026-03-31 14:08:36.408152	system
+2219	1122	English	\N	\N	Deregister from your studies	\N	2026-03-31 14:08:36.409373	system
+2220	1123	German	\N	\N	Das Studium unterbrechen	\N	2026-03-31 14:08:36.412148	system
+2221	1123	English	\N	\N	Interrupt your studies	\N	2026-03-31 14:08:36.413331	system
+2222	1124	German	\N	\N	Bekanntgabe zurückziehen	\N	2026-03-31 14:08:36.416057	system
+2223	1124	English	\N	\N	Cancel announcement	\N	2026-03-31 14:08:36.417276	system
+2224	1125	German	\N	\N	alle anzeigen	\N	2026-03-31 14:08:36.420005	system
+2225	1125	English	\N	\N	show all	\N	2026-03-31 14:08:36.421185	system
+2226	1126	German	\N	\N	nur offene anzeigen	\N	2026-03-31 14:08:36.423938	system
+2227	1126	English	\N	\N	only show open	\N	2026-03-31 14:08:36.425136	system
+2228	1127	German	\N	\N	Ihr CIS-Account ist noch 21 Tage aktiv. Wir bitten Sie, alle benötigten Dateien (Zeugnisse, Studienerfolgsbestätigungen, Studienbestätigungen, etc.) innerhalb dieses Zeitraums herunterzuladen. Für die Ausstellung von Duplikaten fallen nach Inaktivsetzung des CIS-Accounts Kosten an.<br>\nBitte retournieren Sie baldmöglichst entlehnte Bücher an die Bibliothek.	\N	2026-03-31 14:08:36.427893	system
+2229	1127	English	\N	\N	Your CIS account is still active for 21 days. We ask you to download all required files (certificates, confirmations of academic success, confirmation of studies, etc.) within this period. There is a charge for issuing duplicates after the CIS account has been deactivated.<br>\nPlease return borrowed books to the library as soon as possible.	\N	2026-03-31 14:08:36.4291	system
+2230	1128	German	\N	\N	Bitte beachten Sie die Einspruchsfrist von 2 Wochen nach Bestätigung durch die Studiengangsleitung!	\N	2026-03-31 14:08:36.431831	system
+2231	1128	English	\N	\N	Please note the objection period of 2 weeks after confirmation by the head of the degree program!	\N	2026-03-31 14:08:36.432997	system
+2232	1129	German	\N	\N	Abmeldung	\N	2026-03-31 14:08:36.435761	system
+2233	1129	English	\N	\N	De-registration	\N	2026-03-31 14:08:36.436948	system
+2234	1130	German	\N	\N	Abmeldung	\N	2026-03-31 14:08:36.439697	system
+2235	1130	English	\N	\N	De-registration	\N	2026-03-31 14:08:36.440827	system
+2236	1131	German	\N	\N	Unterbrechung	\N	2026-03-31 14:08:36.443466	system
+2237	1131	English	\N	\N	Interruption	\N	2026-03-31 14:08:36.444646	system
+2238	1132	German	\N	\N	Wiederholung	\N	2026-03-31 14:08:36.447279	system
+2239	1132	English	\N	\N	Repetition	\N	2026-03-31 14:08:36.448491	system
+2240	1133	German	\N	\N	Neue Abmeldung	\N	2026-03-31 14:08:36.451132	system
+2241	1133	English	\N	\N	New de-registration	\N	2026-03-31 14:08:36.452288	system
+2242	1134	German	\N	\N	Typ	\N	2026-03-31 14:08:36.45492	system
+2243	1134	English	\N	\N	Type	\N	2026-03-31 14:08:36.456043	system
+2244	1135	German	\N	\N	Status	\N	2026-03-31 14:08:36.458669	system
+2245	1135	English	\N	\N	Status	\N	2026-03-31 14:08:36.459801	system
+2246	1136	German	\N	\N	Studiensemester	\N	2026-03-31 14:08:36.462599	system
+2247	1136	English	\N	\N	Semester	\N	2026-03-31 14:08:36.463799	system
+2248	1137	German	\N	\N	Erstelldatum	\N	2026-03-31 14:08:36.466555	system
+2249	1137	English	\N	\N	Createdate	\N	2026-03-31 14:08:36.467758	system
+2250	1138	German	\N	\N	Studierendenanträge	\N	2026-03-31 14:08:36.470506	system
+2251	1138	English	\N	\N	Applications	\N	2026-03-31 14:08:36.471693	system
+2252	1139	German	\N	\N	Wiedereinstieg	\N	2026-03-31 14:08:36.474379	system
+2253	1139	English	\N	\N	Re-Entry	\N	2026-03-31 14:08:36.475752	system
+2254	1140	German	\N	\N	Grund	\N	2026-03-31 14:08:36.47851	system
+2255	1140	English	\N	\N	Reason	\N	2026-03-31 14:08:36.479717	system
+2256	1141	German	\N	\N	Unruly	\N	2026-03-31 14:08:36.482368	system
+2257	1141	English	\N	\N	Unruly	\N	2026-03-31 14:08:36.48351	system
+2258	1142	German	\N	\N	Unruly Person Status wurde aktualisiert.	\N	2026-03-31 14:08:36.48611	system
+2259	1142	English	\N	\N	Unruly person status has been updated.	\N	2026-03-31 14:08:36.487238	system
+2260	1143	German	\N	\N	Dateianhänge	\N	2026-03-31 14:08:36.489873	system
+2261	1143	English	\N	\N	Attachments	\N	2026-03-31 14:08:36.490991	system
+2262	1144	German	\N	\N	Anhang	\N	2026-03-31 14:08:36.493681	system
+2263	1144	English	\N	\N	Attachment	\N	2026-03-31 14:08:36.494839	system
+2264	1145	German	\N	\N	Abmeldung	\N	2026-03-31 14:08:36.4976	system
+2265	1145	English	\N	\N	Deregistration	\N	2026-03-31 14:08:36.498809	system
+2266	1146	German	\N	\N	Abmeldung (durch Studiengangsleitung)	\N	2026-03-31 14:08:36.50153	system
+2267	1146	English	\N	\N	Cancellation (by course director)	\N	2026-03-31 14:08:36.502721	system
+2268	1147	German	\N	\N	Unterbrechung	\N	2026-03-31 14:08:36.505471	system
+2269	1147	English	\N	\N	Break	\N	2026-03-31 14:08:36.506663	system
+2270	1148	German	\N	\N	Wiederholung	\N	2026-03-31 14:08:36.509396	system
+2271	1148	English	\N	\N	Repetition	\N	2026-03-31 14:08:36.510582	system
+2272	1149	German	\N	\N	LVs anzeigen	\N	2026-03-31 14:08:36.513231	system
+2273	1149	English	\N	\N	Show LVs	\N	2026-03-31 14:08:36.514415	system
+2274	1150	German	\N	\N	Bearbeiten	\N	2026-03-31 14:08:36.517147	system
+2275	1150	English	\N	\N	Edit	\N	2026-03-31 14:08:36.518345	system
+2276	1151	German	\N	\N	Erneut Freischalten	\N	2026-03-31 14:08:36.521128	system
+2277	1151	English	\N	\N	Reopen	\N	2026-03-31 14:08:36.522325	system
+2278	1152	German	\N	\N	Pausieren	\N	2026-03-31 14:08:36.525035	system
+2279	1152	English	\N	\N	Pause	\N	2026-03-31 14:08:36.526278	system
+2280	1153	German	\N	\N	Fortsetzen	\N	2026-03-31 14:08:36.529016	system
+2281	1153	English	\N	\N	Resume	\N	2026-03-31 14:08:36.530167	system
+2282	1154	German	\N	\N	Beeinspruchen	\N	2026-03-31 14:08:36.532866	system
+2283	1154	English	\N	\N	Object	\N	2026-03-31 14:08:36.53404	system
+2284	1155	German	\N	\N	Einspruch abgelehnt	\N	2026-03-31 14:08:36.536851	system
+2285	1155	English	\N	\N	Objection rejected	\N	2026-03-31 14:08:36.538027	system
+2286	1156	German	\N	\N	Einspruch stattgegeben	\N	2026-03-31 14:08:36.540853	system
+2287	1156	English	\N	\N	Objection granted	\N	2026-03-31 14:08:36.542001	system
+2288	1157	German	\N	\N	LVs zuweisen	\N	2026-03-31 14:08:36.544693	system
+2289	1157	English	\N	\N	Assign Lvs	\N	2026-03-31 14:08:36.545853	system
+2290	1158	German	\N	\N	Bestätigen	\N	2026-03-31 14:08:36.5486	system
+2291	1158	English	\N	\N	Confirm	\N	2026-03-31 14:08:36.549794	system
+2292	1159	German	\N	\N	Ablehnen	\N	2026-03-31 14:08:36.552525	system
+2293	1159	English	\N	\N	Reject	\N	2026-03-31 14:08:36.553723	system
+2294	1160	German	\N	\N	Überspringen	\N	2026-03-31 14:08:36.556461	system
+2295	1160	English	\N	\N	Skip	\N	2026-03-31 14:08:36.557666	system
+2296	1161	German	\N	\N	Studiensemester auswählen	\N	2026-03-31 14:08:36.560389	system
+2297	1161	English	\N	\N	Select a semester	\N	2026-03-31 14:08:36.561575	system
+2298	1162	German	\N	\N	Keine Berechtigung	\N	2026-03-31 14:08:36.564371	system
+2299	1162	English	\N	\N	No authority	\N	2026-03-31 14:08:36.565567	system
+2300	1163	German	\N	\N	Zuweisungen speichern	\N	2026-03-31 14:08:36.568252	system
+2301	1163	English	\N	\N	Save assignments	\N	2026-03-31 14:08:36.569423	system
+2302	1164	German	\N	\N	PDF herunterladen	\N	2026-03-31 14:08:36.572169	system
+2303	1164	English	\N	\N	Download PDF	\N	2026-03-31 14:08:36.573382	system
+2304	1165	German	\N	\N	Download	\N	2026-03-31 14:08:36.576111	system
+2305	1165	English	\N	\N	Download	\N	2026-03-31 14:08:36.577318	system
+2306	1166	German	\N	\N	Tabelle neu laden	\N	2026-03-31 14:08:36.580118	system
+2307	1166	English	\N	\N	Reload table	\N	2026-03-31 14:08:36.581315	system
+2308	1167	German	\N	\N	Sie sind derzeit in keinem Studium	\N	2026-03-31 14:08:36.584075	system
+2309	1167	English	\N	\N	You are currently not enrolled	\N	2026-03-31 14:08:36.585275	system
+2310	1168	German	\N	\N	Kein Student gefunden für Prestudent #{prestudent_id}	\N	2026-03-31 14:08:36.588165	system
+2311	1168	English	\N	\N	No student found for prestudent #{prestudent_id}	\N	2026-03-31 14:08:36.589381	system
+2312	1169	German	\N	\N	Sie sind derzeit in keinem Studium oder haben keine negativ beurteilte kommissionelle Prüfung	\N	2026-03-31 14:08:36.592114	system
+2313	1169	English	\N	\N	You are not currently studying or have not passed a board examination with negative reasons	\N	2026-03-31 14:08:36.593334	system
+2314	1170	German	\N	\N	Keine Dateianhänge	\N	2026-03-31 14:08:36.59606	system
+2315	1170	English	\N	\N	No Attachments	\N	2026-03-31 14:08:36.597275	system
+2316	1171	German	\N	\N	Prestudent	\N	2026-03-31 14:08:36.600032	system
+2317	1171	English	\N	\N	Prestudent	\N	2026-03-31 14:08:36.60124	system
+2318	1172	German	\N	\N	Studienjahr	\N	2026-03-31 14:08:36.603941	system
+2319	1172	English	\N	\N	Academic year	\N	2026-03-31 14:08:36.605078	system
+2320	1173	German	\N	\N	Lehrveranstaltungen zuweisen für {name}	\N	2026-03-31 14:08:36.607719	system
+2321	1173	English	\N	\N	Assign Courses for {name}	\N	2026-03-31 14:08:36.608949	system
+2322	1174	German	\N	\N	Angabe aller Lehrveranstaltungen, zu denen die Person nicht zugelassen ist	\N	2026-03-31 14:08:36.611715	system
+2323	1174	English	\N	\N	Details of all courses to which the person is not admitted	\N	2026-03-31 14:08:36.612895	system
+2324	1175	German	\N	\N	Angabe aller zu wiederholenden bzw. erneut zu besuchenden Lehrveranstaltungen	\N	2026-03-31 14:08:36.615654	system
+2325	1175	English	\N	\N	Specification of all courses to be repeated or attended again	\N	2026-03-31 14:08:36.616926	system
+2326	1176	German	\N	\N	Lehrveranstaltungen für {name}	\N	2026-03-31 14:08:36.619708	system
+2327	1176	English	\N	\N	Courses for {name}	\N	2026-03-31 14:08:36.620912	system
+2328	1177	German	\N	\N	Meine Lehrveranstaltungen	\N	2026-03-31 14:08:36.623652	system
+2329	1177	English	\N	\N	My Courses	\N	2026-03-31 14:08:36.624834	system
+2330	1178	German	\N	\N	Mit {count} ausgewählten: 	\N	2026-03-31 14:08:36.627562	system
+2331	1178	English	\N	\N	With {count} selected: 	\N	2026-03-31 14:08:36.628777	system
+2332	1179	German	\N	\N	Nicht zulassen	\N	2026-03-31 14:08:36.631532	system
+2333	1179	English	\N	\N	Don't allow 	\N	2026-03-31 14:08:36.632722	system
+2334	1180	German	\N	\N	Wiederholen	\N	2026-03-31 14:08:36.63545	system
+2335	1180	English	\N	\N	Repeat	\N	2026-03-31 14:08:36.636672	system
+2336	1181	German	\N	\N	Statusverlauf für #{id} 	\N	2026-03-31 14:08:36.639381	system
+2337	1181	English	\N	\N	History for #{id}	\N	2026-03-31 14:08:36.640546	system
+2338	1182	German	\N	\N	Die Spalte Anmerkung kann verwendet werden, um Besonderheiten z.B. bei einem Studienplanwechsel zu dokumentieren (Änderung von LV-Titel, ECTS…) 	\N	2026-03-31 14:08:36.643315	system
+2339	1182	English	\N	\N	The Comment column can be used to document special features, e.g. when changing the curriculum (change of course title, ECTS...)	\N	2026-03-31 14:08:36.644511	system
+2340	1183	German	\N	\N	für alle übernehmen	\N	2026-03-31 14:08:36.647198	system
+2341	1183	English	\N	\N	apply for all	\N	2026-03-31 14:08:36.648421	system
+2342	1184	German	\N	\N	Auswahl für {count} weitere(n) Wiederholungsanträge übernehmen	\N	2026-03-31 14:08:36.651155	system
+2343	1184	English	\N	\N	Adopt selection for {count} further repeat applications	\N	2026-03-31 14:08:36.652427	system
+2344	1185	German	\N	\N	Grund für Ablehnung von #{id}	\N	2026-03-31 14:08:36.655158	system
+2345	1185	English	\N	\N	Reason for rejection of #{id}	\N	2026-03-31 14:08:36.656318	system
+2346	1186	German	\N	\N	Keine Lehrveranstaltungen zugewiesen	\N	2026-03-31 14:08:36.65906	system
+2347	1186	English	\N	\N	No courses assigned	\N	2026-03-31 14:08:36.660289	system
+2348	1187	German	\N	\N	<b>Status:</b> {status}	\N	2026-03-31 14:08:36.662979	system
+2349	1187	English	\N	\N	<b>Status:</b> {status}	\N	2026-03-31 14:08:36.664148	system
+2350	1188	German	\N	\N	Daten werden gespeichert...	\N	2026-03-31 14:08:36.666825	system
+2351	1188	English	\N	\N	Saving...	\N	2026-03-31 14:08:36.667981	system
+2352	1189	German	\N	\N	Fehler	\N	2026-03-31 14:08:36.670681	system
+2353	1189	English	\N	\N	Error	\N	2026-03-31 14:08:36.67184	system
+2354	1190	German	\N	\N	Offen	\N	2026-03-31 14:08:36.674499	system
+2355	1190	English	\N	\N	Open	\N	2026-03-31 14:08:36.67566	system
+2356	1191	German	\N	\N	Erstellt	\N	2026-03-31 14:08:36.678337	system
+2357	1191	English	\N	\N	Created	\N	2026-03-31 14:08:36.679511	system
+2358	1192	German	\N	\N	Zurückziehen...	\N	2026-03-31 14:08:36.682202	system
+2359	1192	English	\N	\N	Cancelling...	\N	2026-03-31 14:08:36.683404	system
+2360	1193	German	\N	\N	Zurückgezogen	\N	2026-03-31 14:08:36.68626	system
+2361	1193	English	\N	\N	Cancelled	\N	2026-03-31 14:08:36.687625	system
+2362	1194	German	\N	\N	Fortgesetzt	\N	2026-03-31 14:08:36.690487	system
+2363	1194	English	\N	\N	Resumed	\N	2026-03-31 14:08:36.691748	system
+2364	1195	German	\N	\N	Gestoppt	\N	2026-03-31 14:08:36.694612	system
+2365	1195	English	\N	\N	Stopped	\N	2026-03-31 14:08:36.695876	system
+2366	1196	German	\N	\N	Für diesen Studiengang sind keine Bekanntgaben möglich	\N	2026-03-31 14:08:36.698701	system
+2367	1196	English	\N	\N	No announcements are accepted for this course	\N	2026-03-31 14:08:36.699943	system
+2368	1197	German	\N	\N	Es gibt bereits eine bestehende Bekanntgabe	\N	2026-03-31 14:08:36.702657	system
+2369	1197	English	\N	\N	There is already an existing announcement	\N	2026-03-31 14:08:36.703808	system
+2370	1198	German	\N	\N	Es gibt bereits eine bestehende Bekanntgabe vom Typ {typ}	\N	2026-03-31 14:08:36.706806	system
+2371	1198	English	\N	\N	There is already an existing announcement of type {typ}	\N	2026-03-31 14:08:36.707973	system
+2372	1199	German	\N	\N	Keine Bekanntgabe mit Id {id} gefunden	\N	2026-03-31 14:08:36.710696	system
+2373	1199	English	\N	\N	No announcement found with Id {id}	\N	2026-03-31 14:08:36.711908	system
+2374	1200	German	\N	\N	Keine {typ} Bekanntgabe gefunden für Prestudent {prestudent_id}	\N	2026-03-31 14:08:36.714583	system
+2375	1200	English	\N	\N	No {typ} announcement found for prestudent {prestudent_id}	\N	2026-03-31 14:08:36.715733	system
+2376	1201	German	\N	\N	Kein Studiengang und Ausbildungssemester gefunden für Bekanntgabe mit Id {id}	\N	2026-03-31 14:08:36.718583	system
+2377	1201	English	\N	\N	No studiengang and ausbildungssemester found for announcement with id: {id}	\N	2026-03-31 14:08:36.719703	system
+2378	1202	German	\N	\N	Kein Studiengang gefunden: {studiengang_kz}	\N	2026-03-31 14:08:36.722366	system
+2379	1202	English	\N	\N	No studiengang found: {studiengang_kz}	\N	2026-03-31 14:08:36.723792	system
+2380	1203	German	\N	\N	Kein Studiengang gefunden für Bekanntgabe #{id}	\N	2026-03-31 14:08:36.726463	system
+2381	1203	English	\N	\N	No studiengang found for announcement #{id}	\N	2026-03-31 14:08:36.727638	system
+2382	1204	German	\N	\N	Keine Studiengang-Email gefunden für Bekanntgabe #{id}	\N	2026-03-31 14:08:36.730315	system
+2383	1204	English	\N	\N	No studiengang-email found for announcement #{id}	\N	2026-03-31 14:08:36.731508	system
+2384	1205	German	\N	\N	Kein Studienplan gefunden für Studiengang: {studiengang_kz}, Studiensemester: {studiensemester_kurzbz}, Ausbildungssemester: {semester}	\N	2026-03-31 14:08:36.734179	system
+2385	1205	English	\N	\N	No studienplan found for stg: {studiengang_kz}, studiensemester: {studiensemester_kurzbz}, ausbildungssemester: {semester}	\N	2026-03-31 14:08:36.735355	system
+2386	1206	German	\N	\N	Kein Status für Bekanntgabe #{id} gefunden	\N	2026-03-31 14:08:36.738019	system
+2387	1206	English	\N	\N	No status found announcement #{id}	\N	2026-03-31 14:08:36.7394	system
+2450	1238	German	\N	\N	Ihr Einspruch wurde Abgelehnt	\N	2026-03-31 14:08:36.861626	system
+2388	1207	German	\N	\N	Mehrere Studienpläne gefunden für Studiengang: {studiengang_kz}, Studiensemester: {studiensemester_kurzbz}, Ausbildungssemester: {semester}	\N	2026-03-31 14:08:36.742111	system
+2389	1207	English	\N	\N	Multiple studienplans found for stg: {studiengang_kz}, studiensemester: {studiensemester_kurzbz}, ausbildungssemester: {semester}	\N	2026-03-31 14:08:36.743301	system
+2390	1208	German	\N	\N	Kein Studiensemester nach {semester} gefunden	\N	2026-03-31 14:08:36.745944	system
+2391	1208	English	\N	\N	No studiensemester found after: {semester}	\N	2026-03-31 14:08:36.747097	system
+2392	1209	German	\N	\N	Das Studiensemester {studiensemester_kurzbz} existiert nicht	\N	2026-03-31 14:08:36.749783	system
+2393	1209	English	\N	\N	Semester {studiensemester_kurzbz} does not exist	\N	2026-03-31 14:08:36.750923	system
+2394	1210	German	\N	\N	Kein Status im letzten Semester gefunden	\N	2026-03-31 14:08:36.753634	system
+2395	1210	English	\N	\N	No status found in previous semester	\N	2026-03-31 14:08:36.754804	system
+2396	1211	German	\N	\N	Diese Bekanntgabe ist gesperrt	\N	2026-03-31 14:08:36.757449	system
+2397	1211	English	\N	\N	This request is locked	\N	2026-03-31 14:08:36.758592	system
+2398	1212	German	\N	\N	Keine Lehrveranstaltung ausgewählt	\N	2026-03-31 14:08:36.761469	system
+2399	1212	English	\N	\N	No course selected	\N	2026-03-31 14:08:36.762631	system
+2400	1213	German	\N	\N	Keine Lehrveranstaltung in Bekanntgabe gefunden	\N	2026-03-31 14:08:36.765412	system
+2401	1213	English	\N	\N	No course found in announcement	\N	2026-03-31 14:08:36.766571	system
+2402	1214	German	\N	\N	Keine Berechtigung, die Bekanntgabe zu bearbeiten	\N	2026-03-31 14:08:36.769277	system
+2403	1214	English	\N	\N	No authorization to edit the announcement	\N	2026-03-31 14:08:36.770452	system
+2404	1215	German	\N	\N	Keine Berechtigung, die Bekanntgabe zu beeinspruchen	\N	2026-03-31 14:08:36.773155	system
+2405	1215	English	\N	\N	No authorization to object the announcement	\N	2026-03-31 14:08:36.774335	system
+2406	1216	German	\N	\N	Bekanntgabe ist nicht beeinsprucht	\N	2026-03-31 14:08:36.777009	system
+2407	1216	English	\N	\N	Announcement is not objected	\N	2026-03-31 14:08:36.778174	system
+2408	1217	German	\N	\N	Bakanntgabe ist nicht bestätigt worden	\N	2026-03-31 14:08:36.780818	system
+2409	1217	English	\N	\N	Announcement is not approved	\N	2026-03-31 14:08:36.781969	system
+2410	1218	German	\N	\N	Bekanntgabe mit Id {id} kann nicht pausiert werden	\N	2026-03-31 14:08:36.784615	system
+2411	1218	English	\N	\N	Announcement with Id {id} cannot be not paused	\N	2026-03-31 14:08:36.785731	system
+2412	1219	German	\N	\N	Bekanntgabe mit Id {id} ist nicht pausiert	\N	2026-03-31 14:08:36.788352	system
+2413	1219	English	\N	\N	Announcement with Id {id} is not paused	\N	2026-03-31 14:08:36.789459	system
+2414	1220	German	\N	\N	Der Studiengang hat nicht genügend Semester	\N	2026-03-31 14:08:36.792009	system
+2415	1220	English	\N	\N	The course does not have enough semesters	\N	2026-03-31 14:08:36.793182	system
+2416	1221	German	\N	\N	Keine Person gefunden mit id {person_id}	\N	2026-03-31 14:08:36.795857	system
+2417	1221	English	\N	\N	No Person found with id {person_id}	\N	2026-03-31 14:08:36.797035	system
+2418	1222	German	\N	\N	Keine Person gefunden für Prestudent #{prestudent_id}	\N	2026-03-31 14:08:36.799738	system
+2419	1222	English	\N	\N	No Person found for prestudent #{prestudent_id}	\N	2026-03-31 14:08:36.800881	system
+2420	1223	German	\N	\N	Kein Email kontakt gefunden für Person mit id {person_id}	\N	2026-03-31 14:08:36.803513	system
+2421	1223	English	\N	\N	No email contact found for Person with id {person_id}	\N	2026-03-31 14:08:36.804687	system
+2422	1224	German	\N	\N	Kein Prestudent gefunden: {prestudent_id}	\N	2026-03-31 14:08:36.807329	system
+2423	1224	English	\N	\N	No Prestudent found: {prestudent_id}	\N	2026-03-31 14:08:36.808464	system
+2424	1225	German	\N	\N	Kein Status für Prestudent #{prestudent_id} in Semester {studiensemester_kurzbz} gefunden	\N	2026-03-31 14:08:36.811042	system
+2425	1225	English	\N	\N	No status found for prestudent #{prestudent_id} in semester {studiensemester_kurzbz}	\N	2026-03-31 14:08:36.812138	system
+2426	1226	German	\N	\N	Kein Studiengang für Prestudent #{prestudent_id} gefunden	\N	2026-03-31 14:08:36.814854	system
+2427	1226	English	\N	\N	No course found for prestudent #{prestudent_id}	\N	2026-03-31 14:08:36.815988	system
+2428	1227	German	\N	\N	Kein Status gefunden für Prestudent: {prestudent_id}	\N	2026-03-31 14:08:36.818912	system
+2429	1227	English	\N	\N	No status found for Prestudent: {prestudent_id}	\N	2026-03-31 14:08:36.820087	system
+2430	1228	German	\N	\N	Email an {email} konnte nicht versandt werden	\N	2026-03-31 14:08:36.822764	system
+2431	1228	English	\N	\N	Failed to send email to {email}	\N	2026-03-31 14:08:36.823931	system
+2432	1229	German	\N	\N	Die Email wurde nicht an den Studenten versendet<br>Details:<br>{message}	\N	2026-03-31 14:08:36.826663	system
+2433	1229	English	\N	\N	Mail to student not sent<br>Details:<br>{message}	\N	2026-03-31 14:08:36.827809	system
+2434	1230	German	\N	\N	Name des Studenten nicht gefunden<br>Details:<br>{message}	\N	2026-03-31 14:08:36.830485	system
+2435	1230	English	\N	\N	Name of student not found<br>Details:<br>{message}	\N	2026-03-31 14:08:36.831697	system
+2436	1231	German	\N	\N	Die Email wurde nicht an den Studenten versendet da kein Name gefunden wurde<br>Details:<br>{message}	\N	2026-03-31 14:08:36.834382	system
+2437	1231	English	\N	\N	Mail to student not sent and student name not found<br>Details:<br>{message}	\N	2026-03-31 14:08:36.835589	system
+2438	1232	German	\N	\N	StudentIn ({prestudent_id})	\N	2026-03-31 14:08:36.83831	system
+2439	1232	English	\N	\N	Student ({prestudent_id})	\N	2026-03-31 14:08:36.839508	system
+2440	1233	German	\N	\N	Unterbrechung mit id {studierendenantrag_id} konnte nicht genehmigt werden.<br>Details:<br>{message}	\N	2026-03-31 14:08:36.842237	system
+2441	1233	English	\N	\N	Could not approve Unterbrechung for studierendenantrag_id: {studierendenantrag_id}<br>Details:<br>{message}	\N	2026-03-31 14:08:36.843392	system
+2442	1234	German	\N	\N	Unterbrechung mit id {studierendenantrag_id} konnte nicht abgelehnt werden.<br>Details:<br>{message}	\N	2026-03-31 14:08:36.846119	system
+2443	1234	English	\N	\N	Could not reject Unterbrechung for studierendenantrag_id: {studierendenantrag_id}<br>Details:<br>{message}	\N	2026-03-31 14:08:36.847295	system
+2444	1235	German	\N	\N	Abmeldung freigegeben	\N	2026-03-31 14:08:36.850028	system
+2445	1235	English	\N	\N	Unsubscribe released	\N	2026-03-31 14:08:36.851197	system
+2446	1236	German	\N	\N	Abmeldung freigegeben	\N	2026-03-31 14:08:36.853935	system
+2447	1236	English	\N	\N	Unsubscribe released	\N	2026-03-31 14:08:36.85511	system
+2448	1237	German	\N	\N	Abmeldung durch Studiengangsleitung	\N	2026-03-31 14:08:36.857794	system
+2449	1237	English	\N	\N	De-registration by the course director	\N	2026-03-31 14:08:36.858948	system
+2451	1238	English	\N	\N	Your objection was denied	\N	2026-03-31 14:08:36.862768	system
+2452	1239	German	\N	\N	Unterbrechung freigegeben	\N	2026-03-31 14:08:36.865512	system
+2453	1239	English	\N	\N	Interruption enabled	\N	2026-03-31 14:08:36.866667	system
+2454	1240	German	\N	\N	Unterbrechung abgelehnt	\N	2026-03-31 14:08:36.869332	system
+2455	1240	English	\N	\N	Interruption rejected	\N	2026-03-31 14:08:36.870493	system
+2456	1241	German	\N	\N	Neue*r Wiederholer*in	\N	2026-03-31 14:08:36.873217	system
+2457	1241	English	\N	\N	New Repeater	\N	2026-03-31 14:08:36.874433	system
+2458	1242	German	\N	\N	Wiederholung von Studiengangsleitung freigegeben	\N	2026-03-31 14:08:36.877168	system
+2459	1242	English	\N	\N	Repetition approved by course director	\N	2026-03-31 14:08:36.878287	system
+2460	1243	German	\N	\N	Wiederholung von Studiengangsleitung freigegeben	\N	2026-03-31 14:08:36.880818	system
+2461	1243	English	\N	\N	Repetition approved by course director	\N	2026-03-31 14:08:36.881923	system
+2462	1244	German	\N	\N	<table><tr><th>{stg_bezeichnung} ({stg_orgform_kurzbz})</th></tr>{rows}</table>	\N	2026-03-31 14:08:36.88452	system
+2463	1244	English	\N	\N	<table><tr><th>{stg_bezeichnung} ({stg_orgform_kurzbz})</th></tr>{rows}</table>	\N	2026-03-31 14:08:36.885663	system
+2464	1245	German	\N	\N	<tr><td>{count} neue Abmeldung(en)</td></tr>	\N	2026-03-31 14:08:36.888285	system
+2465	1245	English	\N	\N	<tr><td>{count} new De-registration(s)</td></tr>	\N	2026-03-31 14:08:36.889445	system
+2466	1246	German	\N	\N	<tr><td>{count} neue(r) Antrag/Anträge auf Unterbrechung</td></tr>	\N	2026-03-31 14:08:36.892287	system
+2467	1246	English	\N	\N	<tr><td>{count} new application(s) for Interruption</td></tr>	\N	2026-03-31 14:08:36.893453	system
+2468	1247	German	\N	\N	<tr><td>{count} neue LV Zuweisung(en) für Wiederholer</td></tr>	\N	2026-03-31 14:08:36.896097	system
+2469	1247	English	\N	\N	<tr><td>{count} new LV assignment(s) for repeaters</td></tr>	\N	2026-03-31 14:08:36.897253	system
+2470	1248	German	\N	\N	<h4>Grund:</h4><p>{grund}</p>	\N	2026-03-31 14:08:36.899999	system
+2471	1248	English	\N	\N	<h4>Reason:</h4><p>{grund}</p>	\N	2026-03-31 14:08:36.901171	system
+2472	1249	German	\N	\N	Keine Lehrveranstaltungen gefunden	\N	2026-03-31 14:08:36.903822	system
+2473	1249	English	\N	\N	No courses found	\N	2026-03-31 14:08:36.90499	system
+2474	1250	German	\N	\N	Die Abmeldung vom Studium kann hier durchgeführt werden.	\N	2026-03-31 14:08:36.907778	system
+2475	1250	English	\N	\N	You can deregister from your studies here.	\N	2026-03-31 14:08:36.90895	system
+2476	1251	German	\N	\N	Eine Unterbrechung des Studiums ist hier zu beantragen. Die Gründe der Unterbrechung und die beabsichtigte Fortsetzung des Studiums sind nachzuweisen oder glaubhaft zu machen. In der Entscheidung über den Antrag sind zwingende persönliche, gesundheitliche oder berufliche Gründe zu berücksichtigen. Während der Unterbrechung können keine Prüfungen abgelegt werden.	\N	2026-03-31 14:08:36.911713	system
+2477	1251	English	\N	\N	You can apply for an interruption of your studies here. The reasons for the interruption and the intended continuation of the course must be proven or made credible. Compelling personal, health or professional reasons must be taken into account when deciding on the application. No exams can be taken during the interruption.	\N	2026-03-31 14:08:36.912876	system
+2478	1252	German	\N	\N	Studierenden steht einmalig das Recht auf Wiederholung eines Studienjahres in Folge einer negativ beurteilten kommissionellen Prüfung zu. Die Wiederholung ist bei der Studiengangsleitung binnen eines Monats ab Mitteilung des Prüfungsergebnisses bekannt zu geben. Die Studiengangsleitung hat Prüfungen und Lehrveranstaltungen für die Wiederholung des Studienjahres festzulegen, wobei nicht bestandene Prüfungen und Lehrveranstaltungen jedenfalls, bestandene Prüfungen und Lehrveranstaltungen nur, sofern es der Zweck des Studiums erforderlich macht, zu wiederholen oder erneut zu besuchen sind.	\N	2026-03-31 14:08:36.91561	system
+2479	1252	English	\N	\N	Students have the one-time right to repeat an academic year as a result of a negative examination by a committee. The head of the degree program must be notified of the repetition within one month of notification of the examination result. The head of the degree program must determine examinations and courses for the repetition of the academic year, whereby failed examinations and courses are to be repeated or attended again, in any case, passed examinations and courses only if the purpose of the course makes it necessary.	\N	2026-03-31 14:08:36.916807	system
+2480	1253	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)	\N	2026-03-31 14:08:36.919507	system
+2481	1253	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): Failure to meet financial obligations despite a reminder (tuition fees)	\N	2026-03-31 14:08:36.92067	system
+2482	1254	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): mehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht	\N	2026-03-31 14:08:36.923321	system
+2483	1254	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): multiple unexcused breaches of attendance requirements	\N	2026-03-31 14:08:36.924548	system
+2484	1255	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): wiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten	\N	2026-03-31 14:08:36.927253	system
+2485	1255	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): repeated non-compliance with examination dates or deadlines for seminar papers or project work	\N	2026-03-31 14:08:36.928474	system
+2486	1256	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Plagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen	\N	2026-03-31 14:08:36.931152	system
+2487	1256	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): Plagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources	\N	2026-03-31 14:08:36.932344	system
+2488	1257	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): nicht genügende Leistung im Sinne der Prüfungsordnung	\N	2026-03-31 14:08:36.935016	system
+2489	1257	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): insufficient performance in terms of the examination regulations	\N	2026-03-31 14:08:36.936191	system
+2490	1258	German	\N	\N	Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)	\N	2026-03-31 14:08:36.938879	system
+2491	1258	English	\N	\N	Reason for exclusion according to the training contract (point 7.4): Failure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)	\N	2026-03-31 14:08:36.940026	system
+2492	1259	German	\N	\N	Die Zugangsvoraussetzung zum Studium wurde nicht erfüllt.	\N	2026-03-31 14:08:36.942693	system
+2493	1259	English	\N	\N	The entry requirements for the course were not met.	\N	2026-03-31 14:08:36.943832	system
+2494	1260	German	\N	\N	Person ist unruly	\N	2026-03-31 14:08:36.946557	system
+2495	1260	English	\N	\N	Person is unruly	\N	2026-03-31 14:08:36.947727	system
+2496	1261	German	\N	\N	Studierende*r hat Studienbeitrag nicht bezahlt	\N	2026-03-31 14:08:36.95043	system
+2497	1261	English	\N	\N	Student has not paid their tuition fees.	\N	2026-03-31 14:08:36.951577	system
+2498	1262	German	\N	\N	Student*in war mehrmals unentschuldigt abwesend	\N	2026-03-31 14:08:36.954252	system
+2499	1262	English	\N	\N	Student was absent without excuse several times	\N	2026-03-31 14:08:36.955415	system
+2500	1263	German	\N	\N	Nichteinhalten von Prüfungsterminen bzw. Abgabeterminen	\N	2026-03-31 14:08:36.958133	system
+2501	1263	English	\N	\N	Failure to meet exam or submission deadlines	\N	2026-03-31 14:08:36.959374	system
+2502	1264	German	\N	\N	Student*in hat plagiiert	\N	2026-03-31 14:08:36.962034	system
+2503	1264	English	\N	\N	Student failed to meet exam dates	\N	2026-03-31 14:08:36.963172	system
+2504	1265	German	\N	\N	Leistung ungenügend	\N	2026-03-31 14:08:36.965902	system
+2505	1265	English	\N	\N	performance insufficient	\N	2026-03-31 14:08:36.967071	system
+2506	1266	German	\N	\N	Nichtantritt des Studiums	\N	2026-03-31 14:08:36.969802	system
+2507	1266	English	\N	\N	non-commencement of the course	\N	2026-03-31 14:08:36.970937	system
+2508	1267	German	\N	\N	Zugangsvoraussetzungen	\N	2026-03-31 14:08:36.973662	system
+2509	1267	English	\N	\N	Entry requirements	\N	2026-03-31 14:08:36.974822	system
+2510	1268	German	\N	\N	bitte auswählen, sofern zutreffend	\N	2026-03-31 14:08:36.977521	system
+2511	1268	English	\N	\N	please select if applicable	\N	2026-03-31 14:08:36.978723	system
+2512	1269	German	\N	\N	negative kommissionelle Beurteilung und keine fristgerechte Bekanntgabe der Wiederholung des Studienjahres	\N	2026-03-31 14:08:36.981416	system
+2513	1269	English	\N	\N	negative assessment by the committee and no timely announcement of the repetition of the academic year	\N	2026-03-31 14:08:36.982585	system
+2514	1270	German	\N	\N	Person ist unruly.	\N	2026-03-31 14:08:36.985341	system
+2515	1270	English	\N	\N	Person is unruly.	\N	2026-03-31 14:08:36.9865	system
+2516	1271	German	\N	\N	Person ist unruly.	\N	2026-03-31 14:08:36.989156	system
+2517	1271	English	\N	\N	Person is unruly.	\N	2026-03-31 14:08:36.990354	system
+2518	1272	German	\N	\N	Studienwechsel	\N	2026-03-31 14:08:36.99315	system
+2519	1272	English	\N	\N	Change of studies	\N	2026-03-31 14:08:36.994328	system
+2520	1273	German	\N	\N	Studienwechsel: Der*Die Studierende hat uns mitgeteilt, dass er*sie das Studium wechseln wird und bittet um Abmeldung vom Studium.	\N	2026-03-31 14:08:36.99705	system
+2521	1273	English	\N	\N	Change of studies: The student has informed us that he/she will be changing his/her studies and requests to be deregistered from his/her studies.	\N	2026-03-31 14:08:36.998388	system
+2522	1274	German	\N	\N	Allgemeiner Studienabbruch	\N	2026-03-31 14:08:37.001088	system
+2523	1274	English	\N	\N	General withdrawal from studies	\N	2026-03-31 14:08:37.002276	system
+2524	1275	German	\N	\N	Allgemeiner Studienabbruch: Der*Die Studierende hat uns mitgeteilt, dass er*sie das Studium abbrechen wird und bittet um Abmeldung vom Studium.	\N	2026-03-31 14:08:37.004945	system
+2525	1275	English	\N	\N	General withdrawal from studies: The student has informed us that he/she will be dropping out of his/her studies and requests to be deregistered from the program.	\N	2026-03-31 14:08:37.006246	system
+2526	1276	German	\N	\N	Verstoß gegen Code of Conduct	\N	2026-03-31 14:08:37.009141	system
+2527	1276	English	\N	\N	Violation of the Code of Conduct	\N	2026-03-31 14:08:37.010347	system
+2528	1277	German	\N	\N	Verstoß gegen Code of Conduct	\N	2026-03-31 14:08:37.01306	system
+2529	1277	English	\N	\N	Violation of the Code of Conduct	\N	2026-03-31 14:08:37.014224	system
+2530	1278	German	\N	\N	Kein Grund zutreffend, Details:	\N	2026-03-31 14:08:37.017007	system
+2531	1278	English	\N	\N	No reason applies, details:	\N	2026-03-31 14:08:37.018245	system
+2532	1279	German	\N	\N	Kein Grund zutreffend, Details:	\N	2026-03-31 14:08:37.021072	system
+2533	1279	English	\N	\N	No reason applies, details:	\N	2026-03-31 14:08:37.022284	system
+2534	1280	German	\N	\N	Anhänge	\N	2026-03-31 14:08:37.024989	system
+2535	1280	English	\N	\N	Attachments	\N	2026-03-31 14:08:37.026158	system
+2536	1281	German	\N	\N	Neue Notiz	\N	2026-03-31 14:08:37.028816	system
+2537	1281	English	\N	\N	New Note	\N	2026-03-31 14:08:37.02999	system
+2538	1282	German	\N	\N	Notiz bearbeiten	\N	2026-03-31 14:08:37.032719	system
+2539	1282	English	\N	\N	Edit Note	\N	2026-03-31 14:08:37.033853	system
+2540	1283	German	\N	\N	Notiz löschen	\N	2026-03-31 14:08:37.036585	system
+2541	1283	English	\N	\N	Delete Note	\N	2026-03-31 14:08:37.037752	system
+2542	1284	German	\N	\N	Verfasser*in	\N	2026-03-31 14:08:37.040428	system
+2543	1284	English	\N	\N	author	\N	2026-03-31 14:08:37.041571	system
+2544	1285	German	\N	\N	Bearbeiter*in	\N	2026-03-31 14:08:37.044292	system
+2545	1285	English	\N	\N	editor	\N	2026-03-31 14:08:37.045469	system
+2546	1286	German	\N	\N	Verfasser*in UID	\N	2026-03-31 14:08:37.048241	system
+2547	1286	English	\N	\N	author UID	\N	2026-03-31 14:08:37.049423	system
+2548	1287	German	\N	\N	Bearbeiter*in UID	\N	2026-03-31 14:08:37.05233	system
+2549	1287	English	\N	\N	editor UID	\N	2026-03-31 14:08:37.053462	system
+2550	1288	German	\N	\N	erledigt	\N	2026-03-31 14:08:37.056138	system
+2551	1288	English	\N	\N	completed	\N	2026-03-31 14:08:37.057315	system
+2552	1289	German	\N	\N	Letzte Änderung	\N	2026-03-31 14:08:37.06034	system
+2553	1289	English	\N	\N	Last updated	\N	2026-03-31 14:08:37.061507	system
+2554	1290	German	\N	\N	Das Eingabefeld {field} ist erforderlich	\N	2026-03-31 14:08:37.064167	system
+2555	1290	English	\N	\N	The Input Field {field} is required	\N	2026-03-31 14:08:37.065529	system
+2556	1291	German	\N	\N	Das Eingabefeld {field} muss eine Ganzzahl enthalten	\N	2026-03-31 14:08:37.068243	system
+2557	1291	English	\N	\N	The Field {field} must contain an integer	\N	2026-03-31 14:08:37.069438	system
+2558	1292	German	\N	\N	Id-Typ der Notiz ist nicht korrekt	\N	2026-03-31 14:08:37.072074	system
+2559	1292	English	\N	\N	Id type of note is incorrect	\N	2026-03-31 14:08:37.073245	system
+2560	1293	German	\N	\N	{field} nicht gefunden	\N	2026-03-31 14:08:37.075902	system
+2561	1293	English	\N	\N	{field} not found	\N	2026-03-31 14:08:37.077102	system
+2562	1294	German	\N	\N	Rückgängig	\N	2026-03-31 14:08:37.079812	system
+2563	1294	English	\N	\N	Undo	\N	2026-03-31 14:08:37.08098	system
+2564	1295	German	\N	\N	Erledigt	\N	2026-03-31 14:08:37.083639	system
+2565	1295	English	\N	\N	Done	\N	2026-03-31 14:08:37.084792	system
+2566	1296	German	\N	\N	angelegt von {0} am {1}	\N	2026-03-31 14:08:37.087473	system
+2567	1296	English	\N	\N	Created by {0} on {1}	\N	2026-03-31 14:08:37.088673	system
+2568	1297	German	\N	\N	bearbeitet von {0} am {1}	\N	2026-03-31 14:08:37.091313	system
+2569	1297	English	\N	\N	Edited by {0} on {1}	\N	2026-03-31 14:08:37.092509	system
+2570	1298	German	\N	\N	Das Eingabefeld {field} darf nur Zahlen enthalten.	\N	2026-03-31 14:08:37.095293	system
+2571	1298	English	\N	\N	The Field {Field} must contain only numbers.	\N	2026-03-31 14:08:37.096467	system
+2572	1299	German	\N	\N	Das Eingabefeld {field} muss eine gültige Email-Adresse enthalten.	\N	2026-03-31 14:08:37.099175	system
+2573	1299	English	\N	\N	The field {field} must contain a valid email address.	\N	2026-03-31 14:08:37.100351	system
+2574	1300	German	\N	\N	Warnung	\N	2026-03-31 14:08:37.1031	system
+2575	1300	English	\N	\N	Warning	\N	2026-03-31 14:08:37.104272	system
+2576	1301	German	\N	\N	Vornamen	\N	2026-03-31 14:08:37.106909	system
+2577	1301	English	\N	\N	middle names	\N	2026-03-31 14:08:37.108062	system
+2578	1302	German	\N	\N	Männlich	\N	2026-03-31 14:08:37.110853	system
+2579	1302	English	\N	\N	Male	\N	2026-03-31 14:08:37.112026	system
+2580	1303	German	\N	\N	Weiblich	\N	2026-03-31 14:08:37.114764	system
+2581	1303	English	\N	\N	Female	\N	2026-03-31 14:08:37.115946	system
+2582	1304	German	\N	\N	Sprache	\N	2026-03-31 14:08:37.118641	system
+2583	1304	English	\N	\N	language	\N	2026-03-31 14:08:37.119786	system
+2584	1305	German	\N	\N	Zustelladresse	\N	2026-03-31 14:08:37.12518	system
+2585	1305	English	\N	\N	postal address	\N	2026-03-31 14:08:37.126337	system
+2586	1306	German	\N	\N	Kontaktinformation	\N	2026-03-31 14:08:37.129053	system
+2587	1306	English	\N	\N	contact information	\N	2026-03-31 14:08:37.130218	system
+2588	1307	German	\N	\N	Abweich.Empf. (c/o)	\N	2026-03-31 14:08:37.134392	system
+2589	1307	English	\N	\N	dissenting recipient (c/o)	\N	2026-03-31 14:08:37.135553	system
+2590	1389	German	\N	\N	Meldestichtag hinzufügen	\N	2026-03-31 14:08:37.306174	system
+2591	1389	English	\N	\N	Add report target date	\N	2026-03-31 14:08:37.307395	system
+2592	1390	German	\N	\N	BIS-Meldestichtage verwalten	\N	2026-03-31 14:08:37.310105	system
+2593	1390	English	\N	\N	Manage report target dates	\N	2026-03-31 14:08:37.311337	system
+2594	1391	German	\N	\N	Meldestichtag löschen	\N	2026-03-31 14:08:37.314033	system
+2595	1391	English	\N	\N	Delete report target date	\N	2026-03-31 14:08:37.315221	system
+2596	1392	German	\N	\N	<strong>Hinweis:</strong> Das Akzeptieren von Lehraufträgen ersetzt alle vorhergehenden Lehraufträge dieses Studiensemesters.	\N	2026-03-31 14:08:37.317912	system
+2597	1392	English	\N	\N	<strong>Note:</strong> Accepting teaching assignments replaces all previous teaching assignments for this study semester.	\N	2026-03-31 14:08:37.319081	system
+2598	1393	German	\N	\N	Notfallkontakt	\N	2026-03-31 14:08:37.321684	system
+2599	1393	English	\N	\N	Emergency contact	\N	2026-03-31 14:08:37.322802	system
+2600	1394	German	\N	\N	Profilbild sperren	\N	2026-03-31 14:08:37.325473	system
+2601	1394	English	\N	\N	lock profile picture	\N	2026-03-31 14:08:37.326613	system
+2602	1395	German	\N	\N	Profilbild entsperren	\N	2026-03-31 14:08:37.329226	system
+2603	1395	English	\N	\N	unlock profile picture	\N	2026-03-31 14:08:37.330393	system
+2604	1396	German	\N	\N	Profilbild hochladen	\N	2026-03-31 14:08:37.333024	system
+2605	1396	English	\N	\N	upload profile picture	\N	2026-03-31 14:08:37.33421	system
+2606	1397	German	\N	\N	Profil	\N	2026-03-31 14:08:37.336792	system
+2607	1397	English	\N	\N	Profile	\N	2026-03-31 14:08:37.337891	system
+2608	1398	German	\N	\N	Gruppen Link	\N	2026-03-31 14:08:37.340416	system
+2609	1398	English	\N	\N	group link	\N	2026-03-31 14:08:37.34152	system
+2610	1399	German	\N	\N	Verband Link	\N	2026-03-31 14:08:37.344104	system
+2611	1399	English	\N	\N	Verband link	\N	2026-03-31 14:08:37.345198	system
+2612	1400	German	\N	\N	Semester Link	\N	2026-03-31 14:08:37.34912	system
+2613	1400	English	\N	\N	Semester link	\N	2026-03-31 14:08:37.350278	system
+2614	1401	German	\N	\N	Telefon	\N	2026-03-31 14:08:37.35283	system
+2615	1401	English	\N	\N	Telephone	\N	2026-03-31 14:08:37.353951	system
+2616	1402	German	\N	\N	Mobiltelefonnummer	\N	2026-03-31 14:08:37.356576	system
+2617	1402	English	\N	\N	Cell phone number	\N	2026-03-31 14:08:37.357715	system
+2618	1403	German	\N	\N	E-Mail	\N	2026-03-31 14:08:37.360318	system
+2619	1403	English	\N	\N	E-Mail	\N	2026-03-31 14:08:37.361453	system
+2620	1404	German	\N	\N	Personen Informationen	\N	2026-03-31 14:08:37.364174	system
+2621	1404	English	\N	\N	Person Information	\N	2026-03-31 14:08:37.365328	system
+2622	1405	German	\N	\N	Postnomen	\N	2026-03-31 14:08:37.367911	system
+2623	1405	English	\N	\N	post-nominals	\N	2026-03-31 14:08:37.369048	system
+2624	1406	German	\N	\N	Benutzername	\N	2026-03-31 14:08:37.371622	system
+2625	1406	English	\N	\N	Username	\N	2026-03-31 14:08:37.372757	system
+2626	1407	German	\N	\N	Anrede	\N	2026-03-31 14:08:37.375356	system
+2627	1407	English	\N	\N	Salutation	\N	2026-03-31 14:08:37.376492	system
+2628	1408	German	\N	\N	Titel	\N	2026-03-31 14:08:37.37915	system
+2629	1408	English	\N	\N	Title	\N	2026-03-31 14:08:37.380307	system
+2630	1409	German	\N	\N	Postnomen	\N	2026-03-31 14:08:37.382909	system
+2631	1409	English	\N	\N	Postnominal	\N	2026-03-31 14:08:37.384052	system
+2632	1410	German	\N	\N	Geburtsdatum	\N	2026-03-31 14:08:37.386697	system
+2633	1410	English	\N	\N	Birthdate	\N	2026-03-31 14:08:37.387841	system
+2634	1411	German	\N	\N	Geburtsort	\N	2026-03-31 14:08:37.390451	system
+2635	1411	English	\N	\N	Birthplace	\N	2026-03-31 14:08:37.391608	system
+2636	1412	German	\N	\N	Büro	\N	2026-03-31 14:08:37.394234	system
+2637	1412	English	\N	\N	Office	\N	2026-03-31 14:08:37.395369	system
+2638	1413	German	\N	\N	Kurzzeichen	\N	2026-03-31 14:08:37.398014	system
+2639	1413	English	\N	\N	Abbreviation	\N	2026-03-31 14:08:37.39915	system
+2640	1414	German	\N	\N	Telefon	\N	2026-03-31 14:08:37.401806	system
+2641	1414	English	\N	\N	Telephone	\N	2026-03-31 14:08:37.402927	system
+2642	1415	German	\N	\N	Telefon	\N	2026-03-31 14:08:37.405586	system
+2643	1415	English	\N	\N	Telephone	\N	2026-03-31 14:08:37.40673	system
+2644	1416	German	\N	\N	Intern	\N	2026-03-31 14:08:37.409395	system
+2645	1416	English	\N	\N	Internal	\N	2026-03-31 14:08:37.410554	system
+2646	1417	German	\N	\N	Alias	\N	2026-03-31 14:08:37.413199	system
+2647	1417	English	\N	\N	Alias	\N	2026-03-31 14:08:37.414369	system
+2648	1418	German	\N	\N	E-Mail	\N	2026-03-31 14:08:37.417072	system
+2649	1418	English	\N	\N	E-Mail	\N	2026-03-31 14:08:37.418235	system
+2650	1419	German	\N	\N	Anmerkung	\N	2026-03-31 14:08:37.420904	system
+2651	1419	English	\N	\N	Remark	\N	2026-03-31 14:08:37.422159	system
+2652	1420	German	\N	\N	Notfallkontakt	\N	2026-03-31 14:08:37.42482	system
+2653	1420	English	\N	\N	Emergency contact	\N	2026-03-31 14:08:37.425991	system
+2654	1421	German	\N	\N	Straße	\N	2026-03-31 14:08:37.428665	system
+2655	1421	English	\N	\N	Street	\N	2026-03-31 14:08:37.429812	system
+2656	1422	German	\N	\N	Straße	\N	2026-03-31 14:08:37.432491	system
+2657	1422	English	\N	\N	Street	\N	2026-03-31 14:08:37.43369	system
+2658	1423	German	\N	\N	PLZ	\N	2026-03-31 14:08:37.436368	system
+2659	1423	English	\N	\N	PLZ	\N	2026-03-31 14:08:37.437567	system
+2660	1424	German	\N	\N	Ort	\N	2026-03-31 14:08:37.44014	system
+2661	1424	English	\N	\N	Locality	\N	2026-03-31 14:08:37.4413	system
+2662	1425	German	\N	\N	Typ	\N	2026-03-31 14:08:37.443876	system
+2663	1425	English	\N	\N	Type	\N	2026-03-31 14:08:37.445002	system
+2664	1426	German	\N	\N	Private Kontakte	Profil Kategorie in der die ganzen privaten Kontakte einer Person aufgelistet werden	2026-03-31 14:08:37.447624	system
+2665	1426	English	\N	\N	Private Contacts	Profile category in which all private contacts of a person are listed	2026-03-31 14:08:37.448775	system
+2666	1427	German	\N	\N	Private Adressen	Profil Kategorie in der die ganzen privaten Adressen einer Person aufgelistet werden	2026-03-31 14:08:37.451469	system
+2667	1427	English	\N	\N	Private Addresses	Profile category in which all private addresses of a person are listed	2026-03-31 14:08:37.452674	system
+2668	1428	German	\N	\N	Profil bearbeiten	\N	2026-03-31 14:08:37.455362	system
+2669	1428	English	\N	\N	edit profil	\N	2026-03-31 14:08:37.456474	system
+2670	1429	German	\N	\N	MitarbeiterIn	\N	2026-03-31 14:08:37.459062	system
+2671	1429	English	\N	\N	Employee	\N	2026-03-31 14:08:37.460249	system
+2672	1430	German	\N	\N	Entlehnte Betriebsmittel	\N	2026-03-31 14:08:37.462862	system
+2673	1430	English	\N	\N	Borrowed Company Resources	\N	2026-03-31 14:08:37.463993	system
+2674	1431	German	\N	\N	Mitarbeiter Information	\N	2026-03-31 14:08:37.466636	system
+2675	1431	English	\N	\N	Employee Information	\N	2026-03-31 14:08:37.467732	system
+2676	1432	German	\N	\N	StudentIn	\N	2026-03-31 14:08:37.470313	system
+2677	1432	English	\N	\N	Student	\N	2026-03-31 14:08:37.47143	system
+2678	1433	German	\N	\N	Student Information	\N	2026-03-31 14:08:37.473974	system
+2679	1433	English	\N	\N	Student Information	\N	2026-03-31 14:08:37.475099	system
+2680	1434	German	\N	\N	Zutrittsgruppen	\N	2026-03-31 14:08:37.477655	system
+2681	1434	English	\N	\N	Access groups	\N	2026-03-31 14:08:37.478722	system
+2682	1435	German	\N	\N	Der FH Ausweis ist am {0} ausgegeben worden.	\N	2026-03-31 14:08:37.481273	system
+2683	1435	English	\N	\N	The FH ID card was issued on {0}	\N	2026-03-31 14:08:37.482396	system
+2684	1436	German	\N	\N	Mailverteiler	\N	2026-03-31 14:08:37.485	system
+2685	1436	English	\N	\N	Mailing list	\N	2026-03-31 14:08:37.486135	system
+2686	1437	German	\N	\N	Sie sind Mitglied in folgenden Mailverteilern:	\N	2026-03-31 14:08:37.488798	system
+2687	1437	English	\N	\N	You are a member of the following mailing lists:	\N	2026-03-31 14:08:37.489949	system
+2688	1438	German	\N	\N	Quick Links	\N	2026-03-31 14:08:37.492621	system
+2689	1438	English	\N	\N	Quick Links	\N	2026-03-31 14:08:37.493753	system
+2690	1439	German	\N	\N	Zeitwünsche	\N	2026-03-31 14:08:37.496366	system
+2691	1439	English	\N	\N	Time wishes	\N	2026-03-31 14:08:37.497487	system
+2692	1440	German	\N	\N	Lehrveranstaltungen	\N	2026-03-31 14:08:37.500087	system
+2693	1440	English	\N	\N	Courses	\N	2026-03-31 14:08:37.501258	system
+2694	1441	German	\N	\N	Zeitsperren	\N	2026-03-31 14:08:37.503897	system
+2695	1441	English	\N	\N	Time locks	\N	2026-03-31 14:08:37.505026	system
+2696	1442	German	\N	\N	Inventarnummer	\N	2026-03-31 14:08:37.507623	system
+2697	1442	English	\N	\N	inventory number	\N	2026-03-31 14:08:37.50874	system
+2698	1443	German	\N	\N	Ausgabedatum	\N	2026-03-31 14:08:37.51132	system
+2699	1443	English	\N	\N	issue date	\N	2026-03-31 14:08:37.512483	system
+2700	1444	German	\N	\N	Wochenstunden	\N	2026-03-31 14:08:37.515101	system
+2701	1444	English	\N	\N	working hours	\N	2026-03-31 14:08:37.516237	system
+2702	1445	German	\N	\N	StG	\N	2026-03-31 14:08:37.518862	system
+2703	1445	English	\N	\N	degree Progr	\N	2026-03-31 14:08:37.519976	system
+2704	1446	German	\N	\N	OrgForm	\N	2026-03-31 14:08:37.522599	system
+2705	1446	English	\N	\N	org Form	\N	2026-03-31 14:08:37.523739	system
+2706	1447	German	\N	\N	OrgEH	\N	2026-03-31 14:08:37.526347	system
+2707	1447	English	\N	\N	org Unit	\N	2026-03-31 14:08:37.527518	system
+2708	1448	German	\N	\N	Sem	\N	2026-03-31 14:08:37.530141	system
+2709	1448	English	\N	\N	sem	\N	2026-03-31 14:08:37.531295	system
+2710	1449	German	\N	\N	Vorherige Woche	\N	2026-03-31 14:08:37.533897	system
+2711	1449	English	\N	\N	Previous week	\N	2026-03-31 14:08:37.535063	system
+2712	1450	German	\N	\N	Vorheriges Jahr	\N	2026-03-31 14:08:37.53781	system
+2713	1450	English	\N	\N	Previous year	\N	2026-03-31 14:08:37.538953	system
+2714	1451	German	\N	\N	Vorheriges Monat	\N	2026-03-31 14:08:37.541638	system
+2715	1451	English	\N	\N	Previous month	\N	2026-03-31 14:08:37.542752	system
+2716	1452	German	\N	\N	Vorheriger Tag	\N	2026-03-31 14:08:37.545378	system
+2717	1452	English	\N	\N	Previous day	\N	2026-03-31 14:08:37.546509	system
+2718	1453	German	\N	\N	Nächster Tag	\N	2026-03-31 14:08:37.549116	system
+2719	1453	English	\N	\N	Next day	\N	2026-03-31 14:08:37.550299	system
+2720	1454	German	\N	\N	Nächste Woche	\N	2026-03-31 14:08:37.553019	system
+2721	1454	English	\N	\N	Next week	\N	2026-03-31 14:08:37.554161	system
+2722	1455	German	\N	\N	Nächster Monat	\N	2026-03-31 14:08:37.55681	system
+2723	1455	English	\N	\N	Next month	\N	2026-03-31 14:08:37.558061	system
+2724	1456	German	\N	\N	Nächstes Jahr	\N	2026-03-31 14:08:37.560692	system
+2725	1456	English	\N	\N	Next year	\N	2026-03-31 14:08:37.561802	system
+2726	1457	German	\N	\N	Tages Ansicht	\N	2026-03-31 14:08:37.564642	system
+2727	1457	English	\N	\N	Daily view	\N	2026-03-31 14:08:37.565848	system
+2728	1458	German	\N	\N	Wochen Ansicht	\N	2026-03-31 14:08:37.568597	system
+2729	1458	English	\N	\N	Week view	\N	2026-03-31 14:08:37.569806	system
+2730	1459	German	\N	\N	Monats Ansicht	\N	2026-03-31 14:08:37.57278	system
+2731	1459	English	\N	\N	Month view	\N	2026-03-31 14:08:37.573965	system
+2732	1460	German	\N	\N	Profilbild	\N	2026-03-31 14:08:37.576781	system
+2733	1460	English	\N	\N	Profile picture	\N	2026-03-31 14:08:37.577966	system
+2734	1461	German	\N	\N	Anhang löschen	\N	2026-03-31 14:08:37.580816	system
+2735	1461	English	\N	\N	Delete attachment	\N	2026-03-31 14:08:37.58203	system
+2736	1462	German	\N	\N	Dokument hochladen	\N	2026-03-31 14:08:37.584759	system
+2737	1462	English	\N	\N	Upload document	\N	2026-03-31 14:08:37.585902	system
+2738	1463	German	\N	\N	Profil Updates	\N	2026-03-31 14:08:37.588519	system
+2739	1463	English	\N	\N	Profile Updates	\N	2026-03-31 14:08:37.589668	system
+2740	1464	German	\N	\N	Thema	\N	2026-03-31 14:08:37.592313	system
+2741	1464	English	\N	\N	topic	\N	2026-03-31 14:08:37.593447	system
+2742	1465	German	\N	\N	Eine andere Adresse wird aktuell zur Zustellung verwendet, in Zukunft würde diese Adresse als Zustellungsadresse verwendet werden!	\N	2026-03-31 14:08:37.596139	system
+2743	1465	English	\N	\N	Another address is currently used as contact address, in the future this address would be used as contact address!	\N	2026-03-31 14:08:37.597514	system
+2744	1466	German	\N	\N	Ein anderer Kontakt wird aktuell zur Zustellung verwendet, in Zukunft würde dieser Kontakt als Zustellungskontakt verwendet werden!	\N	2026-03-31 14:08:37.60015	system
+2745	1466	English	\N	\N	Another contact is currently used for communication, in the future this contact would be used for communication!	\N	2026-03-31 14:08:37.601296	system
+2746	1467	German	\N	\N	Kontakttyp	\N	2026-03-31 14:08:37.603935	system
+2747	1467	English	\N	\N	contact type	\N	2026-03-31 14:08:37.605125	system
+2748	1468	German	\N	\N	Nebenwohnsitz	\N	2026-03-31 14:08:37.607751	system
+2749	1468	English	\N	\N	secondary residence	\N	2026-03-31 14:08:37.608901	system
+2750	1469	German	\N	\N	Hauptwohnsitz	\N	2026-03-31 14:08:37.611518	system
+2751	1469	English	\N	\N	main residence	\N	2026-03-31 14:08:37.612648	system
+2752	1470	German	\N	\N	Homeoffice	\N	2026-03-31 14:08:37.615284	system
+2753	1470	English	\N	\N	Homeoffice	\N	2026-03-31 14:08:37.616472	system
+2754	1471	German	\N	\N	Rechnungsadresse	\N	2026-03-31 14:08:37.619335	system
+2755	1471	English	\N	\N	Billing address	\N	2026-03-31 14:08:37.620529	system
+2756	1472	German	\N	\N	Notfallkontakt	\N	2026-03-31 14:08:37.623162	system
+2757	1472	English	\N	\N	Emergency contact	\N	2026-03-31 14:08:37.624327	system
+2758	1473	German	\N	\N	Mobiltelefonnummer	\N	2026-03-31 14:08:37.62698	system
+2759	1473	English	\N	\N	Cell phone number	\N	2026-03-31 14:08:37.62812	system
+2760	1474	German	\N	\N	Homepage	\N	2026-03-31 14:08:37.631003	system
+2761	1474	English	\N	\N	Homepage	\N	2026-03-31 14:08:37.632155	system
+2762	1475	German	\N	\N	Faxnummer	\N	2026-03-31 14:08:37.634788	system
+2763	1475	English	\N	\N	Fax number	\N	2026-03-31 14:08:37.635944	system
+2764	1476	German	\N	\N	Zustellungs Kontakt	\N	2026-03-31 14:08:37.638548	system
+2765	1476	English	\N	\N	Delivery contact	\N	2026-03-31 14:08:37.63965	system
+2766	1477	German	\N	\N	Status Mitteilung	\N	2026-03-31 14:08:37.642456	system
+2767	1477	English	\N	\N	Status message	\N	2026-03-31 14:08:37.643592	system
+2768	1478	German	\N	\N	Aktualisieren Sie ihren {0} und laden Sie die passenden Nachweisdokumente hoch	\N	2026-03-31 14:08:37.64624	system
+2769	1478	English	\N	\N	Please update your {0} and upload the corresponding Document of proof	\N	2026-03-31 14:08:37.647394	system
+2770	1479	German	\N	\N	Bitte laden Sie ihr {0} hoch	\N	2026-03-31 14:08:37.650077	system
+2771	1479	English	\N	\N	Please upload your {0}	\N	2026-03-31 14:08:37.651169	system
+2772	1480	German	\N	\N	Profil Änderungs Anfrage	Eine Änderungs Anfrage	2026-03-31 14:08:37.653985	system
+2773	1480	English	\N	\N	Profil Update Request	One profil update request	2026-03-31 14:08:37.655072	system
+2774	1481	German	\N	\N	Profil Änderungs Anfragen	Mehrere Änderungs Anfragen	2026-03-31 14:08:37.657605	system
+2775	1481	English	\N	\N	Profil Update Requests	Multiple update requests	2026-03-31 14:08:37.658694	system
+2776	1482	German	\N	\N	Status Datum	\N	2026-03-31 14:08:37.661285	system
+2777	1482	English	\N	\N	Date of Status	\N	2026-03-31 14:08:37.66238	system
+2778	1483	German	\N	\N	UserID	\N	2026-03-31 14:08:37.665028	system
+2779	1483	English	\N	\N	UserID	\N	2026-03-31 14:08:37.666188	system
+2780	1484	German	\N	\N	Thema der Anfrage	\N	2026-03-31 14:08:37.668809	system
+2781	1484	English	\N	\N	Topic of Request	\N	2026-03-31 14:08:37.669957	system
+2782	1485	German	\N	\N	Datum der Anfrage	\N	2026-03-31 14:08:37.672651	system
+2783	1485	English	\N	\N	Date of Request	\N	2026-03-31 14:08:37.673775	system
+2784	1486	German	\N	\N	Aktualisierung	\N	2026-03-31 14:08:37.676413	system
+2785	1486	English	\N	\N	update	\N	2026-03-31 14:08:37.677586	system
+2786	1487	German	\N	\N	Annehmen	\N	2026-03-31 14:08:37.680216	system
+2787	1487	English	\N	\N	accept	\N	2026-03-31 14:08:37.681387	system
+2788	1488	German	\N	\N	Ablehnen	\N	2026-03-31 14:08:37.683992	system
+2789	1488	English	\N	\N	deny	\N	2026-03-31 14:08:37.685118	system
+2790	1489	German	\N	\N	Benutzer	\N	2026-03-31 14:08:37.687793	system
+2791	1489	English	\N	\N	User	\N	2026-03-31 14:08:37.688948	system
+2792	1490	German	\N	\N	Ausstehende Anfragen	\N	2026-03-31 14:08:37.691534	system
+2793	1490	English	\N	\N	Pending Requests	\N	2026-03-31 14:08:37.692686	system
+2794	1491	German	\N	\N	Angenommene Anfragen	\N	2026-03-31 14:08:37.695338	system
+2795	1491	English	\N	\N	Accepted Requests	\N	2026-03-31 14:08:37.696479	system
+2796	1492	German	\N	\N	Abgelehnte Anfragen	\N	2026-03-31 14:08:37.699086	system
+2797	1492	English	\N	\N	Rejected Requests	\N	2026-03-31 14:08:37.700234	system
+2798	1493	German	\N	\N	Alle Anfragen	\N	2026-03-31 14:08:37.702847	system
+2799	1493	English	\N	\N	All Requests	\N	2026-03-31 14:08:37.703978	system
+2800	1494	German	\N	\N	Kontakt löschen	\N	2026-03-31 14:08:37.706623	system
+2801	1494	English	\N	\N	Delete contact	\N	2026-03-31 14:08:37.707747	system
+2802	1495	German	\N	\N	Item löschen	\N	2026-03-31 14:08:37.710281	system
+2803	1495	English	\N	\N	Delete item	\N	2026-03-31 14:08:37.711401	system
+2804	1496	German	\N	\N	Item hinzufügen	\N	2026-03-31 14:08:37.71403	system
+2805	1496	English	\N	\N	Add item	\N	2026-03-31 14:08:37.715232	system
+2806	1497	German	\N	\N	Adresse löschen	\N	2026-03-31 14:08:37.717906	system
+2807	1497	English	\N	\N	Delete address	\N	2026-03-31 14:08:37.719006	system
+2808	1498	German	\N	\N	Kontakt hinzufügen	\N	2026-03-31 14:08:37.721672	system
+2809	1498	English	\N	\N	Add contact	\N	2026-03-31 14:08:37.722801	system
+2810	1499	German	\N	\N	Vorname	\N	2026-03-31 14:08:37.726748	system
+2811	1499	English	\N	\N	First name	\N	2026-03-31 14:08:37.727896	system
+2812	1500	German	\N	\N	Nachname	\N	2026-03-31 14:08:37.730528	system
+2813	1500	English	\N	\N	Last name	\N	2026-03-31 14:08:37.731697	system
+2814	1501	German	\N	\N	Titel	\N	2026-03-31 14:08:37.734329	system
+2815	1501	English	\N	\N	Title	\N	2026-03-31 14:08:37.735454	system
+2816	1502	German	\N	\N	Ausstehend	\N	2026-03-31 14:08:37.738105	system
+2817	1502	English	\N	\N	Pending	\N	2026-03-31 14:08:37.739241	system
+2818	1503	German	\N	\N	Akzeptiert	Profil Änderungen die akzeptiert wurden	2026-03-31 14:08:37.742081	system
+2819	1503	English	\N	\N	Accepted	Profil updates that were accepted	2026-03-31 14:08:37.743204	system
+2820	1504	German	\N	\N	Abgelehnt	Profil Änderungen die abgelehnt wurden	2026-03-31 14:08:37.745795	system
+2821	1504	English	\N	\N	Rejected	Profil updates that were rejected	2026-03-31 14:08:37.746927	system
+2822	1505	German	\N	\N	Nicht möglich adressenID {0} für profil Änderung {1} hinzuzufügen	Fehlermeldung wenn die AdressenID bereits in einer Profil Änderung verwendet wurde	2026-03-31 14:08:37.749583	system
+2823	1505	English	\N	\N	was not able to add addressID {0} to profilRequest {1}	Error message when the addressID was already used for another profil update	2026-03-31 14:08:37.750743	system
+2824	1506	German	\N	\N	Notwendinge Berechtigungen fehlen	Fehlermeldung wenn notwendige Berechtigungen für Aktionen fehlen	2026-03-31 14:08:37.753444	system
+2825	1506	English	\N	\N	Missing necessary permission	Error message if necessary permissions are missing	2026-03-31 14:08:37.754571	system
+2826	1507	German	\N	\N	Das angeforderte Dokument ist kein Anhang einer Profil Änderung	Fehlermeldung wenn ein Dokument angefordert wird, das nicht im zusammenhang mit einer Profil Änderung ist	2026-03-31 14:08:37.757157	system
+2827	1507	English	\N	\N	The requested document is not an attachment for any profil update	Error message if a document is requested that is not connected with a profil update	2026-03-31 14:08:37.75831	system
+2828	1508	German	\N	\N	Ein Fehler ist aufgetreten beim sender der Email	Fehlermeldung wenn ein Fehler beim senden einer Email auftritt	2026-03-31 14:08:37.760948	system
+2829	1508	English	\N	\N	An error occurred when sending an email	Error message if an error occurred while sending emails	2026-03-31 14:08:37.762078	system
+2830	1509	German	\N	\N	Ein Fehler ist aufgetreten beim Überprüfen ob die Person ein Student ist	Fehlermeldung wenn ein Fehler beim überprüfen eines Studenten auftritt	2026-03-31 14:08:37.764736	system
+2831	1509	English	\N	\N	An error occurred while checking if the person is a student	Error message if an error occurred when checking if a person is a student	2026-03-31 14:08:37.765861	system
+2832	1510	German	\N	\N	Ein Fehler ist aufgetreten, es wurde kein Mitarbeiter mit der gleichen uid gefunden	Fehlermeldung wenn ein Fehler beim überprüfen eines Mitarbeiter auftritt	2026-03-31 14:08:37.76858	system
+2833	1510	English	\N	\N	An error occurred while checking if the person is a mitarbeiter	Error message if an error occurred when checking if a person is a mitarbeiter	2026-03-31 14:08:37.769745	system
+2834	1511	German	\N	\N	Ein Fehler beim laden der Profil Änderung ist aufgetreten	Fehlermeldung wenn ein Fehler beim laden einer Profil Änderung auftritt	2026-03-31 14:08:37.77238	system
+2835	1511	English	\N	\N	An error occurred while loading the profil update	Error message if an error occurred when loading a profil update	2026-03-31 14:08:37.773546	system
+2836	1512	German	\N	\N	Ein Fehler beim laden der Dms Version ist aufgetreten	Fehlermeldung wenn ein Fehler beim laden einer Dms Version auftritt	2026-03-31 14:08:37.776192	system
+2837	1512	English	\N	\N	An error occurred while loading the dms version	Error message if an error occurred when loading a dms version	2026-03-31 14:08:37.777354	system
+2838	1513	German	\N	\N	Ein Fehler ist aufgetretten, man kann keine Zustellung löschen	Fehlermeldung wenn versucht wird eine Zustellungsresource zu löschen	2026-03-31 14:08:37.779993	system
+2839	1513	English	\N	\N	An error occurred, it is not possible to delete a resource marked as zustellung	Error message if someone tried to delete a resource that is marked as zustellung	2026-03-31 14:08:37.781148	system
+2840	1514	German	\N	\N	Ein Fehler ist aufgetretten, man kann die gleiche Profil Information nicht zweimal ändern	Fehlermeldung wenn versucht wird eine Information zweimal zu ändern	2026-03-31 14:08:37.78378	system
+2841	1514	English	\N	\N	An error occurred, it is not possible to change the same profil information twice	Error message if someone tried to change the same profil information twice	2026-03-31 14:08:37.784944	system
+2842	1515	German	\N	\N	Eine Anfrage {0} ist bereits geöffnet worden	Wenn die Profil Änderung nicht über Kontakte oder Adressen ist dann darf das Topic nur einmalig verändert werden	2026-03-31 14:08:37.787621	system
+2843	1515	English	\N	\N	A request to change {0} is already open	if the profil update is not about contacts or addresses then the topic has to be unique	2026-03-31 14:08:37.788775	system
+2844	1516	German	\N	\N	Ein Fehler beim laden der oe_einheit ist aufgetreten	\N	2026-03-31 14:08:37.79138	system
+2845	1516	English	\N	\N	An error occurred, when loading the oe_einheit	\N	2026-03-31 14:08:37.792514	system
+2846	1517	German	\N	\N	Ein Fehler ist aufgetreten, notwendige Informationen fehlen	\N	2026-03-31 14:08:37.795195	system
+2847	1517	English	\N	\N	An error occurred, required informations are missing	\N	2026-03-31 14:08:37.796348	system
+2848	1518	German	\N	\N	Ein Fehler ist beim hinzufügen der Profil Änderung aufgetreten	\N	2026-03-31 14:08:37.798997	system
+2849	1518	English	\N	\N	An error occurred during the insertion of the profil update	\N	2026-03-31 14:08:37.80015	system
+2850	1519	German	\N	\N	Ein Fehler ist beim hinzufügen des Kontaktes aufgetreten	\N	2026-03-31 14:08:37.802795	system
+2851	1519	English	\N	\N	An error occurred during the insertion of the contact	\N	2026-03-31 14:08:37.803947	system
+2852	1520	German	\N	\N	Ein Fehler ist beim hinzufügen der Adresse aufgetreten	\N	2026-03-31 14:08:37.80656	system
+2853	1520	English	\N	\N	An error occurred during the insertion of the address	\N	2026-03-31 14:08:37.807729	system
+2854	1521	German	\N	\N	Ein Fehler ist beim ändern eines Kontaktes aufgetreten	\N	2026-03-31 14:08:37.810398	system
+2855	1521	English	\N	\N	An error occurred while updating a profil update contact	\N	2026-03-31 14:08:37.811566	system
+2856	1522	German	\N	\N	Ein Fehler ist beim ändern einer Adresse aufgetreten	\N	2026-03-31 14:08:37.814194	system
+2857	1522	English	\N	\N	An error occurred while updating a profil update address	\N	2026-03-31 14:08:37.815352	system
+2858	1523	German	\N	\N	Ein Fehler ist während dem laden der Zustellkontakte aufgetreten	\N	2026-03-31 14:08:37.818243	system
+2859	1523	English	\N	\N	An error occurred when querying zustellkontakte	\N	2026-03-31 14:08:37.819408	system
+2860	1524	German	\N	\N	Ein Fehler ist während dem laden der Zustelladressen aufgetreten	\N	2026-03-31 14:08:37.822076	system
+2861	1524	English	\N	\N	An error occurred when querying zustelladressen	\N	2026-03-31 14:08:37.823239	system
+2862	1525	German	\N	\N	Änderung annehmen	\N	2026-03-31 14:08:37.825834	system
+2863	1525	English	\N	\N	Accept Request	\N	2026-03-31 14:08:37.826934	system
+2864	1526	German	\N	\N	Änderung ablehnen	\N	2026-03-31 14:08:37.829459	system
+2865	1526	English	\N	\N	Deny Request	\N	2026-03-31 14:08:37.830564	system
+2866	1527	German	\N	\N	Änderung anzeigen	\N	2026-03-31 14:08:37.833161	system
+2867	1527	English	\N	\N	Show request	\N	2026-03-31 14:08:37.834306	system
+2868	1528	German	\N	\N	Ein Fehler ist aufgetreten, der Status "{0}" ist unbekannt	Fehler der auftritt wenn es den Status nicht in der Datenbank gibt	2026-03-31 14:08:37.836869	system
+2869	1528	English	\N	\N	An error occurred, the status "{0}" is not known	error that occurrs when the used status is not present in the database	2026-03-31 14:08:37.838013	system
+2870	1529	German	\N	\N	Ein Fehler ist aufgetreten, das Topic "{0}" existiert nicht	Fehler der auftritt wenn es das Topic nicht in der Datenbank gibt	2026-03-31 14:08:37.840689	system
+2871	1529	English	\N	\N	An error occurred, the topic "{0}" is not known	error that occurrs when the used topic is not present in the database	2026-03-31 14:08:37.841883	system
+2872	1530	German	\N	\N	Ein Fehler ist aufgetreten, Es war nicht möglich die Adresse mit ID {0} in der Datenbank anzulegen	Fehler der auftritt wenn es nicht möglich war eine neue Adresse anzulegen	2026-03-31 14:08:37.844638	system
+2873	1530	English	\N	\N	An error occurred, it wasn't possible to add new address with ID {0} to the database	error that occurrs when it wasn't possible to add new address in db	2026-03-31 14:08:37.845837	system
+2874	1531	German	\N	\N	Ein Fehler ist aufgetreten, Es war nicht möglich den Kontakt mit ID {0} in der Datenbank anzulegen	Fehler der auftritt wenn es nicht möglich war einen neuen Kontakt anzulegen	2026-03-31 14:08:37.848557	system
+2875	1531	English	\N	\N	An error occurred, it wasn't possible to add new contact with ID {0} to the database	error that occurrs when it wasn't possible to add new contact in db	2026-03-31 14:08:37.849759	system
+2876	1532	German	\N	\N	Name	\N	2026-03-31 14:08:37.852493	system
+2877	1532	English	\N	\N	Name	\N	2026-03-31 14:08:37.853665	system
+2878	1533	German	\N	\N	Thema	\N	2026-03-31 14:08:37.856368	system
+2879	1533	English	\N	\N	Topic	\N	2026-03-31 14:08:37.857548	system
+2880	1534	German	\N	\N	Einfüge Datum	\N	2026-03-31 14:08:37.86025	system
+2881	1534	English	\N	\N	Insert Date	\N	2026-03-31 14:08:37.861598	system
+2882	1535	German	\N	\N	Aktionen	\N	2026-03-31 14:08:37.864342	system
+2883	1535	English	\N	\N	Actions	\N	2026-03-31 14:08:37.865543	system
+2884	1536	German	\N	\N	Status	\N	2026-03-31 14:08:37.868334	system
+2885	1536	English	\N	\N	Status	\N	2026-03-31 14:08:37.86956	system
+2886	1537	German	\N	\N	Die initiale Meldeadresse kann aufgrund von Berichtspflichten nicht verändert oder gelöscht werden.	\N	2026-03-31 14:08:37.872292	system
+2887	1537	English	\N	\N	The initial official address can not be changed or deleted due to reporting obligations.	\N	2026-03-31 14:08:37.873489	system
+2888	1538	German	\N	\N	(Soll etwaige Post an diese Adresse geschickt werden?)	\N	2026-03-31 14:08:37.876186	system
+2889	1538	English	\N	\N	(Should any paper mail be sent to this address?)	\N	2026-03-31 14:08:37.877461	system
+2890	1539	German	\N	\N	Gelöscht	\N	2026-03-31 14:08:37.880149	system
+2891	1539	English	\N	\N	Deleted	\N	2026-03-31 14:08:37.881372	system
+2892	1540	German	\N	\N	vorherige	\N	2026-03-31 14:08:37.884129	system
+2893	1540	English	\N	\N	previous	\N	2026-03-31 14:08:37.885301	system
+2894	1541	German	\N	\N	nächste	\N	2026-03-31 14:08:37.887981	system
+2895	1541	English	\N	\N	next	\N	2026-03-31 14:08:37.88916	system
+2896	1542	German	\N	\N	Zum {0} Theme wechseln	\N	2026-03-31 14:08:37.891872	system
+2897	1542	English	\N	\N	Switch to {0} theme	\N	2026-03-31 14:08:37.893323	system
+2898	1543	German	\N	\N	Änderung gespeichert	\N	2026-03-31 14:08:37.895993	system
+2899	1543	English	\N	\N	Saved changes	\N	2026-03-31 14:08:37.897168	system
+2900	1549	German	\N	\N	Alle genehmigt	\N	2026-03-31 14:08:37.910332	system
+2901	1549	English	\N	\N	All accepted	\N	2026-03-31 14:08:37.911503	system
+2902	1550	German	\N	\N	Alle abgelehnt	\N	2026-03-31 14:08:37.914083	system
+2903	1550	English	\N	\N	All rejected	\N	2026-03-31 14:08:37.915189	system
+2904	1551	German	\N	\N	Dokument	\N	2026-03-31 14:08:37.917889	system
+2905	1551	English	\N	\N	Document	\N	2026-03-31 14:08:37.919022	system
+2906	1552	German	\N	\N	Aktionen	\N	2026-03-31 14:08:37.921635	system
+2907	1552	English	\N	\N	Actions	\N	2026-03-31 14:08:37.92275	system
+2908	1667	German	\N	\N	Digitale Anwesenheiten	\N	2026-03-31 14:08:38.154133	system
+2909	1667	English	\N	\N	Digital Attendances	\N	2026-03-31 14:08:38.155365	system
+2910	1732	German	\N	\N	Neuer Link	\N	2026-03-31 14:08:38.282497	system
+2911	1732	English	\N	\N	New Link	\N	2026-03-31 14:08:38.283593	system
+2912	1733	German	\N	\N	Link speichern	\N	2026-03-31 14:08:38.28617	system
+2913	1733	English	\N	\N	Save link	\N	2026-03-31 14:08:38.287359	system
+2914	1734	German	\N	\N	Link bearbeiten	\N	2026-03-31 14:08:38.290017	system
+2915	1734	English	\N	\N	Edit link	\N	2026-03-31 14:08:38.291209	system
+2916	1735	German	\N	\N	Link gelöscht	\N	2026-03-31 14:08:38.293919	system
+2917	1735	English	\N	\N	Link deleted	\N	2026-03-31 14:08:38.295102	system
+2918	1736	German	\N	\N	Link hinzugefügt	\N	2026-03-31 14:08:38.297853	system
+2919	1736	English	\N	\N	Link added	\N	2026-03-31 14:08:38.299045	system
+2920	1737	German	\N	\N	Link geändert	\N	2026-03-31 14:08:38.303045	system
+2921	1737	English	\N	\N	Link updated	\N	2026-03-31 14:08:38.30422	system
+2922	1738	German	\N	\N	Meine Urls	\N	2026-03-31 14:08:38.30692	system
+2923	1738	English	\N	\N	My Urls	\N	2026-03-31 14:08:38.308108	system
+2924	1739	German	\N	\N	Du hast noch keine Bookmarks gesetzt	\N	2026-03-31 14:08:38.310836	system
+2925	1739	English	\N	\N	You have not set any bookmarks yet	\N	2026-03-31 14:08:38.312021	system
+2926	1740	German	\N	\N	Ungültiger Link	\N	2026-03-31 14:08:38.314741	system
+2927	1740	English	\N	\N	Invalid link	\N	2026-03-31 14:08:38.315893	system
+2928	1741	German	\N	\N	Ungültiger Titel	\N	2026-03-31 14:08:38.318574	system
+2929	1741	English	\N	\N	Invalid title	\N	2026-03-31 14:08:38.319763	system
+2930	1742	German	\N	\N	Gespeichert	\N	2026-03-31 14:08:38.322463	system
+2931	1742	English	\N	\N	Saved	\N	2026-03-31 14:08:38.323686	system
+2932	1744	German	\N	\N	Raumzuordnung	\N	2026-03-31 14:08:38.328352	system
+2933	1744	English	\N	\N	Location Assignment	\N	2026-03-31 14:08:38.329567	system
+2934	1745	German	\N	\N	Status setzen	\N	2026-03-31 14:08:38.333509	system
+2935	1745	English	\N	\N	Set status	\N	2026-03-31 14:08:38.334666	system
+2936	1746	German	\N	\N	Hierarchie-Ansicht	\N	2026-03-31 14:08:38.337321	system
+2937	1746	English	\N	\N	Hierarchy view	\N	2026-03-31 14:08:38.338502	system
+2938	1747	German	\N	\N	aufgeklappt	\N	2026-03-31 14:08:38.341034	system
+2939	1747	English	\N	\N	unfolded	\N	2026-03-31 14:08:38.342293	system
+2940	1748	German	\N	\N	zugeklappt	\N	2026-03-31 14:08:38.344922	system
+2941	1748	English	\N	\N	folded	\N	2026-03-31 14:08:38.346211	system
+2942	1753	German	\N	\N	Verfügbarkeit bearbeiten	\N	2026-03-31 14:08:38.356479	system
+2943	1753	English	\N	\N	Edit availability	\N	2026-03-31 14:08:38.357663	system
+2944	1765	German	\N	\N	Bezeichnung	\N	2026-03-31 14:08:38.381881	system
+2945	1765	English	\N	\N	Name	\N	2026-03-31 14:08:38.383096	system
+2946	1767	German	\N	\N	Verfügbarkeit Start	\N	2026-03-31 14:08:38.388184	system
+2947	1767	English	\N	\N	Availability start	\N	2026-03-31 14:08:38.389441	system
+2948	1768	German	\N	\N	Verfügbarkeit Ende	\N	2026-03-31 14:08:38.392295	system
+2949	1768	English	\N	\N	Availability end	\N	2026-03-31 14:08:38.393525	system
+2950	1772	German	\N	\N	Hersteller	\N	2026-03-31 14:08:38.402528	system
+2951	1772	English	\N	\N	Producer	\N	2026-03-31 14:08:38.403698	system
+2952	1773	German	\N	\N	Verantwortliche	\N	2026-03-31 14:08:38.406327	system
+2953	1773	English	\N	\N	Responsible	\N	2026-03-31 14:08:38.407533	system
+2954	1775	German	\N	\N	Ansprechpartner	\N	2026-03-31 14:08:38.412336	system
+2955	1775	English	\N	\N	Contact person	\N	2026-03-31 14:08:38.413544	system
+2956	1776	German	\N	\N	Ansprechpartner intern	\N	2026-03-31 14:08:38.416175	system
+2957	1776	English	\N	\N	Contact person internal	\N	2026-03-31 14:08:38.417398	system
+2958	1777	German	\N	\N	Ansprechpartner extern	\N	2026-03-31 14:08:38.420142	system
+2959	1777	English	\N	\N	Contact person external	\N	2026-03-31 14:08:38.421373	system
+2960	1778	German	\N	\N	Anmerkung intern	\N	2026-03-31 14:08:38.423966	system
+2961	1778	English	\N	\N	Internal note	\N	2026-03-31 14:08:38.425083	system
+2962	1786	German	\N	\N	Kostenträger-OE	\N	2026-03-31 14:08:38.441668	system
+2963	1786	English	\N	\N	Cost unit	\N	2026-03-31 14:08:38.442878	system
+2964	1788	German	\N	\N	€/Jahr	\N	2026-03-31 14:08:38.447763	system
+2965	1788	English	\N	\N	€/year	\N	2026-03-31 14:08:38.448963	system
+2966	1789	German	\N	\N	Alle wählen	\N	2026-03-31 14:08:38.451761	system
+2967	1789	English	\N	\N	Select all	\N	2026-03-31 14:08:38.452944	system
+2968	1794	German	\N	\N	Existiert bereits	\N	2026-03-31 14:08:38.463602	system
+2969	1794	English	\N	\N	Already exists	\N	2026-03-31 14:08:38.464875	system
+2970	1795	German	\N	\N	Datumende vor Datumstart	\N	2026-03-31 14:08:38.467506	system
+2971	1795	English	\N	\N	Enddate after startdate	\N	2026-03-31 14:08:38.46868	system
+2972	1800	German	\N	\N	Zeilen auswählen	\N	2026-03-31 14:08:38.478975	system
+2973	1800	English	\N	\N	Select rows	\N	2026-03-31 14:08:38.480082	system
+2974	1805	German	\N	\N	Firmenzusatz	\N	2026-03-31 14:08:38.490665	system
+2975	1805	English	\N	\N	add.company info	\N	2026-03-31 14:08:38.491899	system
+2976	1806	German	\N	\N	Firma	\N	2026-03-31 14:08:38.494663	system
+2977	1806	English	\N	\N	company	\N	2026-03-31 14:08:38.495793	system
+2978	1807	German	\N	\N	Adresse anlegen	\N	2026-03-31 14:08:38.498355	system
+2979	1807	English	\N	\N	create address	\N	2026-03-31 14:08:38.499524	system
+2980	1808	German	\N	\N	Adresse bearbeiten	\N	2026-03-31 14:08:38.502144	system
+2981	1808	English	\N	\N	edit address	\N	2026-03-31 14:08:38.503281	system
+2982	1809	German	\N	\N	Adresse löschen	\N	2026-03-31 14:08:38.505881	system
+2983	1809	English	\N	\N	delete address	\N	2026-03-31 14:08:38.507029	system
+2984	1810	German	\N	\N	Adresse wirklich löschen?	\N	2026-03-31 14:08:38.509649	system
+2985	1810	English	\N	\N	Really delete address?	\N	2026-03-31 14:08:38.510753	system
+2986	1811	German	\N	\N	Kontakt anlegen	\N	2026-03-31 14:08:38.513362	system
+2987	1811	English	\N	\N	create contact data	\N	2026-03-31 14:08:38.514477	system
+2988	1812	German	\N	\N	Kontakt bearbeiten	\N	2026-03-31 14:08:38.517058	system
+2989	1812	English	\N	\N	edit contact data	\N	2026-03-31 14:08:38.518198	system
+2990	1813	German	\N	\N	Kontakt löschen	\N	2026-03-31 14:08:38.520798	system
+2991	1813	English	\N	\N	delete contact data	\N	2026-03-31 14:08:38.521907	system
+2992	1814	German	\N	\N	Kontakt wirklich löschen?	\N	2026-03-31 14:08:38.524505	system
+2993	1814	English	\N	\N	Really delete contact data?	\N	2026-03-31 14:08:38.525632	system
+2994	1815	German	\N	\N	Privatkonto	\N	2026-03-31 14:08:38.528216	system
+2995	1815	English	\N	\N	Private account	\N	2026-03-31 14:08:38.529379	system
+2996	1816	German	\N	\N	Firmenkonto	\N	2026-03-31 14:08:38.531918	system
+2997	1816	English	\N	\N	Company Account	\N	2026-03-31 14:08:38.533049	system
+2998	1817	German	\N	\N	Bankverbindung anlegen	\N	2026-03-31 14:08:38.53563	system
+2999	1817	English	\N	\N	create bank details	\N	2026-03-31 14:08:38.536755	system
+3000	1818	German	\N	\N	Bankverbindung bearbeiten	\N	2026-03-31 14:08:38.539312	system
+3001	1818	English	\N	\N	edit bank details	\N	2026-03-31 14:08:38.540431	system
+3002	1819	German	\N	\N	Bankverbindung löschen	\N	2026-03-31 14:08:38.543	system
+3003	1819	English	\N	\N	delete bank details	\N	2026-03-31 14:08:38.544133	system
+3004	1820	German	\N	\N	Bankverbindung wirklich löschen?	\N	2026-03-31 14:08:38.546696	system
+3005	1820	English	\N	\N	Really delete bank details?	\N	2026-03-31 14:08:38.547805	system
+3006	1821	German	\N	\N	Rolle	\N	2026-03-31 14:08:38.550462	system
+3007	1821	English	\N	\N	role	\N	2026-03-31 14:08:38.551596	system
+3008	1822	German	\N	\N	Neuen Status hinzufügen ({vorname} {nachname})	\N	2026-03-31 14:08:38.55415	system
+3009	1822	English	\N	\N	add new status ({vorname} {nachname})	\N	2026-03-31 14:08:38.555301	system
+3010	1823	German	\N	\N	Status bearbeiten ({vorname} {nachname})	\N	2026-03-31 14:08:38.557735	system
+3011	1823	English	\N	\N	edit status ({vorname} {nachname})	\N	2026-03-31 14:08:38.558801	system
+3012	1824	German	\N	\N	Status löschen	\N	2026-03-31 14:08:38.561385	system
+3013	1824	English	\N	\N	delete status	\N	2026-03-31 14:08:38.56251	system
+3014	1825	German	\N	\N	Bestätigt am	\N	2026-03-31 14:08:38.56509	system
+3015	1825	English	\N	\N	confirmed on	\N	2026-03-31 14:08:38.566286	system
+3016	1826	German	\N	\N	Bestätigt von	\N	2026-03-31 14:08:38.568808	system
+3017	1826	English	\N	\N	confirmed by	\N	2026-03-31 14:08:38.569941	system
+3018	1827	German	\N	\N	InsertAmUm	\N	2026-03-31 14:08:38.572628	system
+3019	1827	English	\N	\N	inserted on	\N	2026-03-31 14:08:38.573741	system
+3020	1828	German	\N	\N	InsertVon	\N	2026-03-31 14:08:38.577018	system
+3021	1828	English	\N	\N	inserted by	\N	2026-03-31 14:08:38.578241	system
+3022	1829	German	\N	\N	Bewerbung abgeschickt am	\N	2026-03-31 14:08:38.58091	system
+3023	1829	English	\N	\N	application sent on	\N	2026-03-31 14:08:38.58208	system
+3024	1830	German	\N	\N	Aufnahmestufe	\N	2026-03-31 14:08:38.5848	system
+3025	1830	English	\N	\N	entrance level	\N	2026-03-31 14:08:38.585916	system
+3026	1831	German	\N	\N	Meldestichtag erreicht - Bearbeiten nicht mehr möglich	\N	2026-03-31 14:08:38.588574	system
+3027	1831	English	\N	\N	report target date reached - editing no longer possible	\N	2026-03-31 14:08:38.589732	system
+3028	1832	German	\N	\N	Prestudentstatus wirklich löschen?	\N	2026-03-31 14:08:38.592346	system
+3029	1832	English	\N	\N	Really delete prestudent status?	\N	2026-03-31 14:08:38.593481	system
+3030	1833	German	\N	\N	Das Löschen der letzten Rolle löscht auch den gesamten Prestudent-Datensatz! Möchten Sie fortfahren?	\N	2026-03-31 14:08:38.596126	system
+3031	1833	English	\N	\N	Deleting the last role also deletes the entire Prestudent record! Do you want to continue?	\N	2026-03-31 14:08:38.5973	system
+3032	1834	German	\N	\N	In welches Ausbildungssemester soll dieser {status} verschoben werden?	\N	2026-03-31 14:08:38.599894	system
+3033	1834	English	\N	\N	To which education semester should this {status} be moved?	\N	2026-03-31 14:08:38.600993	system
+3034	1835	German	\N	\N	In welches Semester sollen diese {count} PrestudentInnen ({status})verschoben werden?	\N	2026-03-31 14:08:38.603558	system
+3035	1835	English	\N	\N	To which education semester should these {count} prestudents ({status}) be moved?	\N	2026-03-31 14:08:38.604689	system
+3036	1836	German	\N	\N	Zugangsvoraussetzungen für 	\N	2026-03-31 14:08:38.607205	system
+3037	1836	English	\N	\N	Access requirements for 	\N	2026-03-31 14:08:38.608306	system
+3038	1837	German	\N	\N	ZGV Master	\N	2026-03-31 14:08:38.610824	system
+3039	1837	English	\N	\N	ZGV master	\N	2026-03-31 14:08:38.611934	system
+3040	1838	German	\N	\N	ZGV Master Ort	\N	2026-03-31 14:08:38.614528	system
+3041	1838	English	\N	\N	ZGV master place	\N	2026-03-31 14:08:38.615733	system
+3042	1839	German	\N	\N	ZGV Master Datum	\N	2026-03-31 14:08:38.618374	system
+3043	1839	English	\N	\N	ZGV master date	\N	2026-03-31 14:08:38.619517	system
+3044	1840	German	\N	\N	ZGV Master Nation	\N	2026-03-31 14:08:38.622176	system
+3045	1840	English	\N	\N	ZGV master nation	\N	2026-03-31 14:08:38.623764	system
+3046	1841	German	\N	\N	ZGV Master erfüllt	\N	2026-03-31 14:08:38.626406	system
+3047	1841	English	\N	\N	ZGV master fulfilled	\N	2026-03-31 14:08:38.627579	system
+3048	1842	German	\N	\N	ZGV Doktor	\N	2026-03-31 14:08:38.630222	system
+3049	1842	English	\N	\N	ZGV doctor	\N	2026-03-31 14:08:38.63146	system
+3050	1843	German	\N	\N	ZGV Doktor Ort	\N	2026-03-31 14:08:38.634119	system
+3051	1843	English	\N	\N	ZGV doctor place	\N	2026-03-31 14:08:38.635316	system
+3052	1844	German	\N	\N	ZGV Doktor Datum	\N	2026-03-31 14:08:38.63797	system
+3053	1844	English	\N	\N	ZGV doctor date	\N	2026-03-31 14:08:38.63915	system
+3054	1845	German	\N	\N	ZGV Doktor Nation	\N	2026-03-31 14:08:38.6419	system
+3055	1845	English	\N	\N	ZGV doctor nation	\N	2026-03-31 14:08:38.64305	system
+3056	1846	German	\N	\N	ZGV Doktor erfüllt	\N	2026-03-31 14:08:38.645751	system
+3057	1846	English	\N	\N	ZGV doctor fulfilled	\N	2026-03-31 14:08:38.64692	system
+3058	1847	German	\N	\N	Aufmerksam durch	\N	2026-03-31 14:08:38.649522	system
+3059	1847	English	\N	\N	been brought to attention by	\N	2026-03-31 14:08:38.65065	system
+3060	1848	German	\N	\N	Berufstätigkeit	\N	2026-03-31 14:08:38.653272	system
+3061	1848	English	\N	\N	professional activity	\N	2026-03-31 14:08:38.654484	system
+3062	1849	German	\N	\N	Facheinschlägig berufstätig	\N	2026-03-31 14:08:38.657147	system
+3063	1849	English	\N	\N	employed in a relevant field	\N	2026-03-31 14:08:38.658369	system
+3064	1850	German	\N	\N	Bisstandort	\N	2026-03-31 14:08:38.660954	system
+3065	1850	English	\N	\N	bis location	\N	2026-03-31 14:08:38.662066	system
+3066	1851	German	\N	\N	Studientyp	\N	2026-03-31 14:08:38.66466	system
+3067	1851	English	\N	\N	study type	\N	2026-03-31 14:08:38.665753	system
+3068	1852	German	\N	\N	Duales Studium	\N	2026-03-31 14:08:38.668242	system
+3069	1852	English	\N	\N	dual study	\N	2026-03-31 14:08:38.669397	system
+3070	1853	German	\N	\N	förderrelevant	\N	2026-03-31 14:08:38.671952	system
+3071	1853	English	\N	\N	relevant for funding	\N	2026-03-31 14:08:38.67305	system
+3072	1854	German	\N	\N	Priorität	\N	2026-03-31 14:08:38.675589	system
+3073	1854	English	\N	\N	priority	\N	2026-03-31 14:08:38.67669	system
+3074	1855	German	\N	\N	Gesamthistorie	\N	2026-03-31 14:08:38.679226	system
+3075	1855	English	\N	\N	Overall history	\N	2026-03-31 14:08:38.680356	system
+3076	1856	German	\N	\N	Sie haben keine Schreibrechte für diesen Studiengang!	\N	2026-03-31 14:08:38.682986	system
+3077	1856	English	\N	\N	You do not have writing rights for this course!	\N	2026-03-31 14:08:38.684153	system
+3078	1857	German	\N	\N	Diese Rolle ist bereits vorhanden!	\N	2026-03-31 14:08:38.686813	system
+3079	1857	English	\N	\N	This role already exists!	\N	2026-03-31 14:08:38.687971	system
+3080	1858	German	\N	\N	{name}: Diese Rolle ist bereits vorhanden!	\N	2026-03-31 14:08:38.690589	system
+3081	1858	English	\N	\N	{name}: This role already exists!	\N	2026-03-31 14:08:38.691733	system
+3082	1859	German	\N	\N	{name}: Diese Person ist bereits Student!	\N	2026-03-31 14:08:38.694394	system
+3083	1859	English	\N	\N	{name}: This person already is student!	\N	2026-03-31 14:08:38.695561	system
+3084	1860	German	\N	\N	{name}: Um einen Interessenten zum Bewerber zu machen, muss die Person das Reihungstestverfahren abgeschlossen haben!	\N	2026-03-31 14:08:38.698188	system
+3085	1860	English	\N	\N	{name}: In order to turn an interested party into an applicant the person must have completed the ranking test process!	\N	2026-03-31 14:08:38.699476	system
+3086	1861	German	\N	\N	{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung eingetragen sein!	\N	2026-03-31 14:08:38.702194	system
+3087	1861	English	\N	\N	{name}: In order to turn an interested party into an applicant, the entry requirements must be entered!	\N	2026-03-31 14:08:38.703406	system
+3088	1862	German	\N	\N	{name}: Um einen Interessenten zum Bewerber zu machen, muss die Zugangsvoraussetzung Master eingetragen sein!	\N	2026-03-31 14:08:38.706078	system
+3089	1862	English	\N	\N	{name}: In order to turn an interested party into an applicant, the entry requirements for master studies must be entered!	\N	2026-03-31 14:08:38.70725	system
+3090	1863	German	\N	\N	{name} muss zuerst zum Bewerber gemacht werden!	\N	2026-03-31 14:08:38.709904	system
+3091	1863	English	\N	\N	{name} must be made an applicant first!	\N	2026-03-31 14:08:38.711055	system
+3092	1864	German	\N	\N	{name} muss zuerst Aufgenommener sein, um zum Studenten gemacht werden zu können!	\N	2026-03-31 14:08:38.71381	system
+3093	1864	English	\N	\N	{name} must first be admitted in order to be made a student!	\N	2026-03-31 14:08:38.714956	system
+3094	1865	German	\N	\N	Das Studiensemester oder Ausbildungsemester des Berwerberstatus und des Aufgenommenenstatus passen nicht überein	\N	2026-03-31 14:08:38.717594	system
+3095	1865	English	\N	\N	The study semester or training semester of the applicant status and the accepted status do not match	\N	2026-03-31 14:08:38.718755	system
+3096	1866	German	\N	\N	Ein Studentenstatus kann hier nur hinzugefuegt werden wenn die Person bereits Student ist. Um einen Bewerber zum Studenten zu machen waehlen Sie bitte unter "Status aendern" den Punkt "Student"	\N	2026-03-31 14:08:38.721364	system
+3097	1866	English	\N	\N	Student status can only be added here if the person is already a student. To turn an applicant into a student, please select "Student" under "Change status".	\N	2026-03-31 14:08:38.722541	system
+3098	1867	German	\N	\N	Studentstatus mit Datum oder Semesterende vor erreichtem Meldestichtag kann nicht hinzugefügt werden	\N	2026-03-31 14:08:38.725344	system
+3099	1867	English	\N	\N	Student status with a date or end of semester before the reporting deadline cannot be added	\N	2026-03-31 14:08:38.726545	system
+3100	1868	German	\N	\N	Fehler beim Ermitteln bzw Aktualisieren des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert	\N	2026-03-31 14:08:38.729197	system
+3101	1868	English	\N	\N	Error during insert or update of Lehrverband: no changes were saved in the database	\N	2026-03-31 14:08:38.730397	system
+3102	1869	German	\N	\N	Fehler beim Löschen des Lehrverbands: es wurden keine Änderungen in der Datenbank gespeichert	\N	2026-03-31 14:08:38.733049	system
+3103	1869	English	\N	\N	Error during deletion of Lehrverband: no changes were saved in the database	\N	2026-03-31 14:08:38.734241	system
+3104	1870	German	\N	\N	Studentenrolle kann nur durch den Administrator geloescht werden	\N	2026-03-31 14:08:38.73683	system
+3105	1870	English	\N	\N	Error during insert or update of Lehrverband: no changes were saved in the database	\N	2026-03-31 14:08:38.737978	system
+3106	1871	German	\N	\N	Die letzte Rolle kann nur durch den Administrator geloescht werden	\N	2026-03-31 14:08:38.740739	system
+3107	1871	English	\N	\N	The last role can only be deleted by the administrator	\N	2026-03-31 14:08:38.741896	system
+3108	1872	German	\N	\N	Fehler: Status nicht gefunden	\N	2026-03-31 14:08:38.744531	system
+3109	1872	English	\N	\N	Error: Status not found	\N	2026-03-31 14:08:38.745639	system
+3110	1873	German	\N	\N	Der Status ist bereits bestätigt!	\N	2026-03-31 14:08:38.748183	system
+3111	1873	English	\N	\N	The status is already confirmed!	\N	2026-03-31 14:08:38.749349	system
+3112	1874	German	\N	\N	Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!	\N	2026-03-31 14:08:38.751878	system
+3113	1874	English	\N	\N	The application has not yet been sent and therefore cannot be confirmed!	\N	2026-03-31 14:08:38.752996	system
+3114	1875	German	\N	\N	Id {id} nicht gefunden	\N	2026-03-31 14:08:38.755532	system
+3115	1875	English	\N	\N	Missing Id {id}	\N	2026-03-31 14:08:38.756679	system
+3116	1876	German	\N	\N	Heimatadressen dürfen nicht gelöscht werden, da diese für die BIS-Meldung relevant sind. Um die Adresse dennoch zu löschen, entfernen sie das Häkchen bei Heimatadresse!	\N	2026-03-31 14:08:38.759305	system
+3117	1876	English	\N	\N	Home addresses may not be deleted as they are relevant for the BIS report. To delete the address anyway, uncheck the home address box!	\N	2026-03-31 14:08:38.760427	system
+3118	1877	German	\N	\N	Status vorrücken	\N	2026-03-31 14:08:38.762949	system
+3119	1877	English	\N	\N	advance status	\N	2026-03-31 14:08:38.764083	system
+3120	1878	German	\N	\N	Status bestätigen	\N	2026-03-31 14:08:38.76679	system
+3121	1878	English	\N	\N	confirm status	\N	2026-03-31 14:08:38.767939	system
+3122	1879	German	\N	\N	Status bearbeiten	\N	2026-03-31 14:08:38.770634	system
+3123	1879	English	\N	\N	edit status	\N	2026-03-31 14:08:38.771793	system
+3124	1880	German	\N	\N	Status löschen	\N	2026-03-31 14:08:38.774462	system
+3125	1880	English	\N	\N	delete status	\N	2026-03-31 14:08:38.775596	system
+3126	1881	German	\N	\N	Speichern erfolgreich	\N	2026-03-31 14:08:38.778206	system
+3127	1881	English	\N	\N	Successfully saved	\N	2026-03-31 14:08:38.779372	system
+3128	1882	German	\N	\N	Löschen erfolgreich	\N	2026-03-31 14:08:38.782128	system
+3129	1882	English	\N	\N	Delete successful	\N	2026-03-31 14:08:38.783301	system
+3130	1883	German	\N	\N	Vorrückung Status erfolgreich	\N	2026-03-31 14:08:38.785959	system
+3131	1883	English	\N	\N	Advance status successful	\N	2026-03-31 14:08:38.78712	system
+3132	1884	German	\N	\N	Bestätigung Status erfolgreich	\N	2026-03-31 14:08:38.789778	system
+3133	1884	English	\N	\N	Confirmation status successful	\N	2026-03-31 14:08:38.790919	system
+3134	1885	German	\N	\N	Betriebsmittel	\N	2026-03-31 14:08:38.793678	system
+3135	1885	English	\N	\N	Resources	\N	2026-03-31 14:08:38.794828	system
+3136	1886	German	\N	\N	Betriebsmittel löschen	\N	2026-03-31 14:08:38.797485	system
+3137	1886	English	\N	\N	delete operating resource	\N	2026-03-31 14:08:38.798642	system
+3138	1887	German	\N	\N	Betriebsmittel wirklich löschen?	\N	2026-03-31 14:08:38.801309	system
+3139	1887	English	\N	\N	Really delete operating resource?	\N	2026-03-31 14:08:38.802486	system
+3140	1888	German	\N	\N	Betriebsmittel anlegen	\N	2026-03-31 14:08:38.805133	system
+3141	1888	English	\N	\N	create operating resource	\N	2026-03-31 14:08:38.806306	system
+3142	1889	German	\N	\N	Betriebsmittel bearbeiten	\N	2026-03-31 14:08:38.809061	system
+3143	1889	English	\N	\N	edit operating resource	\N	2026-03-31 14:08:38.810239	system
+3144	1890	German	\N	\N	Inventarnummer	\N	2026-03-31 14:08:38.81294	system
+3145	1890	English	\N	\N	inventory number	\N	2026-03-31 14:08:38.814085	system
+3146	1891	German	\N	\N	Nummer	\N	2026-03-31 14:08:38.816905	system
+3147	1891	English	\N	\N	number	\N	2026-03-31 14:08:38.818053	system
+3148	1892	German	\N	\N	Ausgegeben am	\N	2026-03-31 14:08:38.820782	system
+3149	1892	English	\N	\N	issued on	\N	2026-03-31 14:08:38.821978	system
+3150	1893	German	\N	\N	Retour am	\N	2026-03-31 14:08:38.824687	system
+3151	1893	English	\N	\N	returned on	\N	2026-03-31 14:08:38.82585	system
+3152	1894	German	\N	\N	Retourdatum	\N	2026-03-31 14:08:38.828574	system
+3153	1894	English	\N	\N	return date	\N	2026-03-31 14:08:38.829855	system
+3154	1895	German	\N	\N	Ausgabedatum	\N	2026-03-31 14:08:38.832539	system
+3155	1895	English	\N	\N	issue date	\N	2026-03-31 14:08:38.833694	system
+3156	1896	German	\N	\N	Eine Zutrittskarte muss eine Nummer haben. Um die Zuordnung zu dieser Karte zu löschen entfernen Sie bitte den ganzen Datensatz!	\N	2026-03-31 14:08:38.836336	system
+3157	1896	English	\N	\N	An access card must have a number. To delete the assignment to this card, please remove the entire data record!	\N	2026-03-31 14:08:38.837696	system
+3158	1897	German	\N	\N	Diese Zutrittskarte ist bereits ausgegeben an: {vorname} {nachname} ({uid})	\N	2026-03-31 14:08:38.840358	system
+3159	1897	English	\N	\N	This access card has already been issued to: {vorname} {nachname} ({uid})	\N	2026-03-31 14:08:38.841528	system
+3160	1898	German	\N	\N	Bitte wählen Sie das entsprechende Inventar aus dem Drop Down Menü Inventarnummer aus!	\N	2026-03-31 14:08:38.844299	system
+3161	1898	English	\N	\N	Please select the appropriate inventory from the inventory number drop down menu!	\N	2026-03-31 14:08:38.845516	system
+3162	1899	German	\N	\N	Retourdatum darf nicht vor Datum der Ausgabe liegen!	\N	2026-03-31 14:08:38.848163	system
+3163	1899	English	\N	\N	The return date must not be before the issue date!	\N	2026-03-31 14:08:38.84937	system
+3164	1914	German	\N	\N	Eingabe fehlt	\N	2026-03-31 14:08:38.88011	system
+3165	1914	English	\N	\N	Input missing	\N	2026-03-31 14:08:38.88133	system
+3166	1915	German	\N	\N	Unverändert	\N	2026-03-31 14:08:38.883972	system
+3167	1915	English	\N	\N	Unchanged	\N	2026-03-31 14:08:38.885124	system
+3168	1919	German	\N	\N	Verwalten	\N	2026-03-31 14:08:38.893825	system
+3169	1919	English	\N	\N	Administrate	\N	2026-03-31 14:08:38.894989	system
+3170	1920	German	\N	\N	LV Templates verwalten	\N	2026-03-31 14:08:38.897695	system
+3171	1920	English	\N	\N	Administrate Course Templates	\N	2026-03-31 14:08:38.898823	system
+3172	1921	German	\N	\N	LV Templates Übersicht	\N	2026-03-31 14:08:38.901559	system
+3173	1921	English	\N	\N	Course Templates Overview	\N	2026-03-31 14:08:38.902716	system
+3174	1922	German	\N	\N	Buchung	\N	2026-03-31 14:08:38.905362	system
+3175	1922	English	\N	\N	Booking	\N	2026-03-31 14:08:38.906522	system
+3176	1923	German	\N	\N	Buchungsdatum	\N	2026-03-31 14:08:38.909192	system
+3177	1923	English	\N	\N	Booking date	\N	2026-03-31 14:08:38.910384	system
+3178	1924	German	\N	\N	Buchungstext	\N	2026-03-31 14:08:38.913029	system
+3179	1924	English	\N	\N	Booking text	\N	2026-03-31 14:08:38.914191	system
+3180	1925	German	\N	\N	Betrag	\N	2026-03-31 14:08:38.916814	system
+3181	1925	English	\N	\N	Amount	\N	2026-03-31 14:08:38.917933	system
+3182	1926	German	\N	\N	Buchungstyp	\N	2026-03-31 14:08:38.920584	system
+3183	1926	English	\N	\N	Booking type	\N	2026-03-31 14:08:38.921742	system
+3184	1927	German	\N	\N	Buchungs Nummer	\N	2026-03-31 14:08:38.924335	system
+3185	1927	English	\N	\N	Booking number	\N	2026-03-31 14:08:38.925482	system
+3186	1928	German	\N	\N	Mahnspanne	\N	2026-03-31 14:08:38.928129	system
+3187	1928	English	\N	\N	Dunning margin	\N	2026-03-31 14:08:38.92928	system
+3188	1929	German	\N	\N	Credit Points	\N	2026-03-31 14:08:38.931875	system
+3189	1929	English	\N	\N	Credit Points	\N	2026-03-31 14:08:38.933053	system
+3190	1930	German	\N	\N	Zahlungsreferenz	\N	2026-03-31 14:08:38.935719	system
+3191	1930	English	\N	\N	Payment reference	\N	2026-03-31 14:08:38.936835	system
+3192	1931	German	\N	\N	Es ist bereits eine Buchung vorhanden:	\N	2026-03-31 14:08:38.93957	system
+3193	1931	English	\N	\N	A booking already exists:	\N	2026-03-31 14:08:38.940697	system
+3194	1932	German	\N	\N	und einer weiteren Person.	\N	2026-03-31 14:08:38.943318	system
+3195	1932	English	\N	\N	and one additional person.	\N	2026-03-31 14:08:38.94446	system
+3196	1933	German	\N	\N	und {x} weiteren Personen.	\N	2026-03-31 14:08:38.947318	system
+3197	1933	English	\N	\N	and {x} additional persons.	\N	2026-03-31 14:08:38.948496	system
+3198	1934	German	\N	\N	Trotzdem fortfahren?	\N	2026-03-31 14:08:38.951133	system
+3199	1934	English	\N	\N	Proceed anyway?	\N	2026-03-31 14:08:38.952317	system
+3200	1935	German	\N	\N	Buchung #{buchungsnr} existiert nicht	\N	2026-03-31 14:08:38.955071	system
+3201	1935	English	\N	\N	Booking #{buchungsnr} does not exist	\N	2026-03-31 14:08:38.956245	system
+3202	1936	German	\N	\N	Gegenbuchungen koennen nur auf die obersten Buchungen getaetigt werden	\N	2026-03-31 14:08:38.958883	system
+3203	1936	English	\N	\N	Offsetting bookings can only be made on the top bookings	\N	2026-03-31 14:08:38.960026	system
+3204	1937	German	\N	\N	Bitte zuerst die zugeordneten Buchungen löschen	\N	2026-03-31 14:08:38.96266	system
+3205	1937	English	\N	\N	Please delete the assigned bookings first	\N	2026-03-31 14:08:38.963825	system
+3206	1938	German	\N	\N	Anzahl angezeigter vergangener Studiensemester	\N	2026-03-31 14:08:38.966345	system
+3207	1938	English	\N	\N	Number of past semesters of study displayed	\N	2026-03-31 14:08:38.967436	system
+3208	1939	German	\N	\N	Zoom	\N	2026-03-31 14:08:38.970072	system
+3209	1939	English	\N	\N	Zoom	\N	2026-03-31 14:08:38.971213	system
+3210	1940	German	\N	\N	Sehr Klein	\N	2026-03-31 14:08:38.973859	system
+3211	1940	English	\N	\N	Very Small	\N	2026-03-31 14:08:38.974984	system
+3212	1941	German	\N	\N	Kleiner	\N	2026-03-31 14:08:38.977642	system
+3213	1941	English	\N	\N	Smaller	\N	2026-03-31 14:08:38.978756	system
+3214	1942	German	\N	\N	Klein	\N	2026-03-31 14:08:38.981476	system
+3215	1942	English	\N	\N	Small	\N	2026-03-31 14:08:38.982597	system
+3216	1943	German	\N	\N	Normal	\N	2026-03-31 14:08:38.985158	system
+3217	1943	English	\N	\N	Normal	\N	2026-03-31 14:08:38.986296	system
+3218	1944	German	\N	\N	Groß	\N	2026-03-31 14:08:38.989232	system
+3219	1944	English	\N	\N	Big	\N	2026-03-31 14:08:38.990444	system
+3220	1945	German	\N	\N	Sehr groß	\N	2026-03-31 14:08:38.993048	system
+3221	1945	English	\N	\N	Very big	\N	2026-03-31 14:08:38.994282	system
+3222	1946	German	\N	\N	InteressentIn	\N	2026-03-31 14:08:38.997069	system
+3223	1946	English	\N	\N	Candidate	\N	2026-03-31 14:08:38.998217	system
+3224	1947	German	\N	\N	Zu viele Favoriten! Die folgenden Einträge wurden entfernt: {items}	\N	2026-03-31 14:08:39.000823	system
+3225	1947	English	\N	\N	Too many favorites! The following entries were removed: {items}	\N	2026-03-31 14:08:39.001944	system
+3226	1948	German	\N	\N	Anmerkungen	\N	2026-03-31 14:08:39.004696	system
+3227	1948	English	\N	\N	notes	\N	2026-03-31 14:08:39.005826	system
+3228	1949	German	\N	\N	Anmerkung Pre	\N	2026-03-31 14:08:39.008417	system
+3229	1949	English	\N	\N	note Pre	\N	2026-03-31 14:08:39.009566	system
+3230	1950	German	\N	\N	Aufnahmegruppe	\N	2026-03-31 14:08:39.012281	system
+3231	1950	English	\N	\N	admission group	\N	2026-03-31 14:08:39.013429	system
+3232	1951	German	\N	\N	Mentor	\N	2026-03-31 14:08:39.015985	system
+3233	1951	English	\N	\N	mentor	\N	2026-03-31 14:08:39.01714	system
+3234	1952	German	\N	\N	Details	\N	2026-03-31 14:08:39.020018	system
+3235	1952	English	\N	\N	Details	\N	2026-03-31 14:08:39.021141	system
+3236	1953	German	\N	\N	Notizen	\N	2026-03-31 14:08:39.023691	system
+3237	1953	English	\N	\N	Notes	\N	2026-03-31 14:08:39.024794	system
+3238	1954	German	\N	\N	Kontakt	\N	2026-03-31 14:08:39.027431	system
+3239	1954	English	\N	\N	Contact	\N	2026-03-31 14:08:39.028574	system
+3240	1955	German	\N	\N	PreStudentIn	\N	2026-03-31 14:08:39.031199	system
+3241	1955	English	\N	\N	Prestudent	\N	2026-03-31 14:08:39.032341	system
+3242	1956	German	\N	\N	Status	\N	2026-03-31 14:08:39.034934	system
+3243	1956	English	\N	\N	State	\N	2026-03-31 14:08:39.036342	system
+3244	1957	German	\N	\N	Konto	\N	2026-03-31 14:08:39.038912	system
+3245	1957	English	\N	\N	Banking	\N	2026-03-31 14:08:39.040036	system
+3246	1958	German	\N	\N	Betriebsmittel	\N	2026-03-31 14:08:39.042678	system
+3247	1958	English	\N	\N	Resources	\N	2026-03-31 14:08:39.043809	system
+3248	1959	German	\N	\N	Noten	\N	2026-03-31 14:08:39.046379	system
+3249	1959	English	\N	\N	Grades	\N	2026-03-31 14:08:39.047541	system
+3250	1960	German	\N	\N	Prüfung	\N	2026-03-31 14:08:39.050109	system
+3251	1960	English	\N	\N	Exam	\N	2026-03-31 14:08:39.051235	system
+3252	1961	German	\N	\N	Notenspiegel	\N	2026-03-31 14:08:39.053945	system
+3253	1961	English	\N	\N	Grade report	\N	2026-03-31 14:08:39.055064	system
+3254	1962	German	\N	\N	Notenspiegel EXCEL	\N	2026-03-31 14:08:39.057691	system
+3255	1962	English	\N	\N	Grade report EXCEL	\N	2026-03-31 14:08:39.058796	system
+3256	1963	German	\N	\N	Notenspiegel erweitert EXCEL	\N	2026-03-31 14:08:39.061396	system
+3257	1963	English	\N	\N	Grade report extended EXCEL	\N	2026-03-31 14:08:39.062543	system
+3258	1964	German	\N	\N	Notenspiegel HTML	\N	2026-03-31 14:08:39.065293	system
+3259	1964	English	\N	\N	Grade report HTML	\N	2026-03-31 14:08:39.066429	system
+3260	1965	German	\N	\N	Liste Filtern auf	\N	2026-03-31 14:08:39.068956	system
+3261	1965	English	\N	\N	Filter list for	\N	2026-03-31 14:08:39.070126	system
+3262	1966	German	\N	\N	nicht belastet	\N	2026-03-31 14:08:39.072724	system
+3263	1966	English	\N	\N	not charged	\N	2026-03-31 14:08:39.073846	system
+3264	1967	German	\N	\N	fehlende Gegenbuchungen	\N	2026-03-31 14:08:39.076474	system
+3265	1967	English	\N	\N	missing offsetting entries	\N	2026-03-31 14:08:39.077643	system
+3266	1968	German	\N	\N	fehlende Dokumente	\N	2026-03-31 14:08:39.08016	system
+3267	1968	English	\N	\N	missing documents	\N	2026-03-31 14:08:39.081302	system
+3268	1969	German	\N	\N	überfällige Buchungen	\N	2026-03-31 14:08:39.083848	system
+3269	1969	English	\N	\N	overdue payments	\N	2026-03-31 14:08:39.084984	system
+3270	1970	German	\N	\N	nicht gebuchte Studiengebühr	\N	2026-03-31 14:08:39.087666	system
+3271	1970	English	\N	\N	outstanding tuition fee	\N	2026-03-31 14:08:39.088772	system
+3272	1971	German	\N	\N	erhöhten Studienbeitrag	\N	2026-03-31 14:08:39.091324	system
+3273	1971	English	\N	\N	higher tuition fee	\N	2026-03-31 14:08:39.092464	system
+3274	1972	German	\N	\N	ZGV eingetragen ohne Datum	\N	2026-03-31 14:08:39.095086	system
+3275	1972	English	\N	\N	ZGV set without date	\N	2026-03-31 14:08:39.096248	system
+3276	1973	German	\N	\N	Statusgrund	\N	2026-03-31 14:08:39.098939	system
+3277	1973	English	\N	\N	Status reason	\N	2026-03-31 14:08:39.100093	system
+3278	1974	German	\N	\N	Nur im aktuellen Studiengang	\N	2026-03-31 14:08:39.102752	system
+3279	1974	English	\N	\N	Only in the selected study program	\N	2026-03-31 14:08:39.103872	system
+3280	1975	German	\N	\N	Ausbildungsvertrag akzeptiert	\N	2026-03-31 14:08:39.10657	system
+3281	1975	English	\N	\N	Training contract accepted	\N	2026-03-31 14:08:39.107736	system
+3282	1976	German	\N	\N	Neue Buchung	\N	2026-03-31 14:08:39.110366	system
+3283	1976	English	\N	\N	New Booking	\N	2026-03-31 14:08:39.111527	system
+3284	1977	German	\N	\N	Neue Buchung ({x} Studenten)	\N	2026-03-31 14:08:39.114168	system
+3285	1977	English	\N	\N	New Booking ({x} Students)	\N	2026-03-31 14:08:39.115351	system
+3286	1978	German	\N	\N	Buchung #{buchungsnr} bearbeiten	\N	2026-03-31 14:08:39.11803	system
+3287	1978	English	\N	\N	Edit Booking #{buchungsnr}	\N	2026-03-31 14:08:39.119213	system
+3288	1979	German	\N	\N	Gegenbuchen	\N	2026-03-31 14:08:39.121841	system
+3289	1979	English	\N	\N	Counter-book	\N	2026-03-31 14:08:39.122981	system
+3290	1980	German	\N	\N	Zahlungsbestaetigung	\N	2026-03-31 14:08:39.125656	system
+3291	1980	English	\N	\N	Payment confirmation	\N	2026-03-31 14:08:39.126783	system
+3292	1981	German	\N	\N	alle Buchungstypen	\N	2026-03-31 14:08:39.129436	system
+3293	1981	English	\N	\N	all booking types	\N	2026-03-31 14:08:39.130611	system
+3294	1982	German	\N	\N	Nur offene anzeigen	\N	2026-03-31 14:08:39.133284	system
+3295	1982	English	\N	\N	Display only open	\N	2026-03-31 14:08:39.134474	system
+3296	1983	German	\N	\N	Nur aktuellen Studiengang anzeigen	\N	2026-03-31 14:08:39.137165	system
+3297	1983	English	\N	\N	Display only current Degree Program	\N	2026-03-31 14:08:39.138384	system
+3298	1984	German	\N	\N	Diesen Status bestaetigen?	\N	2026-03-31 14:08:39.141045	system
+3299	1984	English	\N	\N	Confirm this status?	\N	2026-03-31 14:08:39.142221	system
+3300	1985	German	\N	\N	Zertifikat	\N	2026-03-31 14:08:39.144899	system
+3301	1985	English	\N	\N	Certificate	\N	2026-03-31 14:08:39.146058	system
+3302	1986	German	\N	\N	LV Zeugnis	\N	2026-03-31 14:08:39.148674	system
+3303	1986	English	\N	\N	Course certificate	\N	2026-03-31 14:08:39.149805	system
+3304	1987	German	\N	\N	Download	\N	2026-03-31 14:08:39.152459	system
+3305	1987	English	\N	\N	Download	\N	2026-03-31 14:08:39.153642	system
+3306	1988	German	\N	\N	Archivieren	\N	2026-03-31 14:08:39.15622	system
+3307	1988	English	\N	\N	Archive	\N	2026-03-31 14:08:39.157429	system
+3308	1989	German	\N	\N	Dokument signiert und archiviert	\N	2026-03-31 14:08:39.160072	system
+3309	1989	English	\N	\N	Document signed and archived	\N	2026-03-31 14:08:39.161253	system
+3310	1990	German	\N	\N	Zeugnis	\N	2026-03-31 14:08:39.163845	system
+3311	1990	English	\N	\N	Certificate	\N	2026-03-31 14:08:39.164982	system
+3312	1991	German	\N	\N	Übernahmedatum	\N	2026-03-31 14:08:39.167602	system
+3313	1991	English	\N	\N	Takeover date	\N	2026-03-31 14:08:39.168714	system
+3314	1992	German	\N	\N	Benotungsdatum	\N	2026-03-31 14:08:39.171255	system
+3315	1992	English	\N	\N	Grading date	\N	2026-03-31 14:08:39.17248	system
+3316	1993	German	\N	\N	Freigabedatum	\N	2026-03-31 14:08:39.175127	system
+3317	1993	English	\N	\N	Approval date	\N	2026-03-31 14:08:39.176316	system
+3318	1994	German	\N	\N	Note (Numerisch)	\N	2026-03-31 14:08:39.178922	system
+3319	1994	English	\N	\N	Grade (numeric)	\N	2026-03-31 14:08:39.180054	system
+3320	1995	German	\N	\N	Studiengang (Lehrveranstaltung)	\N	2026-03-31 14:08:39.182694	system
+3321	1995	English	\N	\N	Degree-program (Course)	\N	2026-03-31 14:08:39.183823	system
+3322	1996	German	\N	\N	Studiengangskennzahl (Lehrveranstaltung)	\N	2026-03-31 14:08:39.18651	system
+3323	1996	English	\N	\N	Study program number (Course)	\N	2026-03-31 14:08:39.187638	system
+3324	1997	German	\N	\N	Semester (Lehrveranstaltung)	\N	2026-03-31 14:08:39.190311	system
+3325	1997	English	\N	\N	Semester (Course)	\N	2026-03-31 14:08:39.191421	system
+3326	1998	German	\N	\N	Punkte	\N	2026-03-31 14:08:39.193991	system
+3327	1998	English	\N	\N	Points	\N	2026-03-31 14:08:39.195117	system
+3328	1999	German	\N	\N	Lehrveranstaltungsname Englisch	\N	2026-03-31 14:08:39.197695	system
+3329	1999	English	\N	\N	Coursename english	\N	2026-03-31 14:08:39.198796	system
+3330	2000	German	\N	\N	Note setzen	\N	2026-03-31 14:08:39.201311	system
+3331	2000	English	\N	\N	Set grade	\N	2026-03-31 14:08:39.202421	system
+3332	2001	German	\N	\N	Note gesetzt	\N	2026-03-31 14:08:39.205013	system
+3333	2001	English	\N	\N	Grade set	\N	2026-03-31 14:08:39.206183	system
+3334	2002	German	\N	\N	Zeugnis	\N	2026-03-31 14:08:39.20885	system
+3335	2002	English	\N	\N	Certificate	\N	2026-03-31 14:08:39.210016	system
+3336	2003	German	\N	\N	LektorIn	\N	2026-03-31 14:08:39.21271	system
+3337	2003	English	\N	\N	Lector	\N	2026-03-31 14:08:39.21387	system
+3338	2004	German	\N	\N	Wiederholer	\N	2026-03-31 14:08:39.216423	system
+3339	2004	English	\N	\N	Repeater	\N	2026-03-31 14:08:39.217549	system
+3340	2005	German	\N	\N	Übernehmen	\N	2026-03-31 14:08:39.220093	system
+3341	2005	English	\N	\N	Transfer	\N	2026-03-31 14:08:39.221224	system
+3342	2006	German	\N	\N	Diese Vorlage darf nicht signiert werden	\N	2026-03-31 14:08:39.223767	system
+3343	2006	English	\N	\N	This template must not be signed	\N	2026-03-31 14:08:39.224869	system
+3344	2007	German	\N	\N	Dieses Dokument ist nicht archivierbar	\N	2026-03-31 14:08:39.227402	system
+3345	2007	English	\N	\N	This document cannot be archived	\N	2026-03-31 14:08:39.228552	system
+3346	2008	German	\N	\N	Nicht überschreibbar	\N	2026-03-31 14:08:39.231129	system
+3347	2008	English	\N	\N	Not overwritable	\N	2026-03-31 14:08:39.232305	system
+3348	2009	German	\N	\N	Fehler beim Ermitteln der Lehreinheit ID	\N	2026-03-31 14:08:39.234945	system
+3349	2009	English	\N	\N	Error determining the Teaching Unit ID	\N	2026-03-31 14:08:39.236086	system
+3350	2010	German	\N	\N	StudentIn hat keinen Status in diesem Semester	\N	2026-03-31 14:08:39.238872	system
+3351	2010	English	\N	\N	Student has no status this semester	\N	2026-03-31 14:08:39.240022	system
+3352	2011	German	\N	\N	Fehler: Es können nur Studierende mit UID verschoben werden.	\N	2026-03-31 14:08:39.242726	system
+3353	2011	English	\N	\N	Error: Only students with UID can be moved.	\N	2026-03-31 14:08:39.24387	system
+3354	2012	German	\N	\N	Fehler: Alle Studierenden müssen im selben Studiengang sein.	\N	2026-03-31 14:08:39.246607	system
+3355	2012	English	\N	\N	Error: All students must be in the same program.	\N	2026-03-31 14:08:39.247785	system
+3356	2013	German	\N	\N	Unoconv nicht gefunden - Bitte installieren sie Unoconv	\N	2026-03-31 14:08:39.250422	system
+3357	2013	English	\N	\N	Unoconv not found - Please install Unoconv	\N	2026-03-31 14:08:39.251614	system
+3358	2014	German	\N	\N	Unoconv Version konnte nicht ermittelt werden	\N	2026-03-31 14:08:39.254224	system
+3359	2014	English	\N	\N	Could not get Unoconv Version	\N	2026-03-31 14:08:39.255459	system
+3360	2015	German	\N	\N	Dokumentenkonvertierung ist derzeit nicht möglich. Bitte versuchen Sie es in einer Minute erneut oder kontaktieren Sie einen Administrator	\N	2026-03-31 14:08:39.258106	system
+3361	2015	English	\N	\N	Document conversion is currently not possible. Please try again in a minute or contact an administrator	\N	2026-03-31 14:08:39.259307	system
+3362	2016	German	\N	\N	Signaturserver ist derzeit nicht erreichbar	\N	2026-03-31 14:08:39.261948	system
+3363	2016	English	\N	\N	Signature server is currently unavailable	\N	2026-03-31 14:08:39.26309	system
+3364	2017	German	\N	\N	Derzeit können nur PDFs signiert werden	\N	2026-03-31 14:08:39.265755	system
+3365	2017	English	\N	\N	Currently only PDFs can be signed	\N	2026-03-31 14:08:39.266884	system
+3366	2018	German	\N	\N	Ausgabeformat fehlt	\N	2026-03-31 14:08:39.269542	system
+3367	2018	English	\N	\N	Outputformat is not defined	\N	2026-03-31 14:08:39.270672	system
+3368	2019	German	\N	\N	Keine Vorlage gefunden	\N	2026-03-31 14:08:39.273298	system
+3369	2019	English	\N	\N	No template found	\N	2026-03-31 14:08:39.27446	system
+3370	2020	German	\N	\N	Header wurden bereits gesendet -> Abbruch	\N	2026-03-31 14:08:39.277109	system
+3371	2020	English	\N	\N	Header already sent -> Abort	\N	2026-03-31 14:08:39.27828	system
+3372	2021	German	\N	\N	Kopieren fehlgeschlagen	\N	2026-03-31 14:08:39.280951	system
+3373	2021	English	\N	\N	Copy failed	\N	2026-03-31 14:08:39.282083	system
+3374	2022	German	\N	\N	Datei konnte nicht geladen werden	\N	2026-03-31 14:08:39.285025	system
+3375	2022	English	\N	\N	Unable to load file	\N	2026-03-31 14:08:39.28622	system
+3376	2023	German	\N	\N	XML konnte nicht geladen werden: {url} XML: {xml} PARAMETER: {params}	\N	2026-03-31 14:08:39.288835	system
+3377	2023	English	\N	\N	Unable to load xml: {url} XML: {xml} PARAMS: {params}	\N	2026-03-31 14:08:39.289975	system
+3378	2024	German	\N	\N	XSL konnte nicht geladen werden	\N	2026-03-31 14:08:39.292713	system
+3379	2024	English	\N	\N	Unable to load xsl	\N	2026-03-31 14:08:39.293895	system
+3380	2025	German	\N	\N	Styles XSL konnte nicht geladen werden	\N	2026-03-31 14:08:39.29663	system
+3381	2025	English	\N	\N	Unable to load styles xsl	\N	2026-03-31 14:08:39.297773	system
+3382	2026	German	\N	\N	Manifest ungültig	\N	2026-03-31 14:08:39.300406	system
+3383	2026	English	\N	\N	Manifest file invalid	\N	2026-03-31 14:08:39.301564	system
+3384	2027	German	\N	\N	W	\N	2026-03-31 14:08:39.304208	system
+3385	2027	English	\N	\N	W	\N	2026-03-31 14:08:39.305415	system
+3386	2028	German	\N	\N	{year} KW {week}	\N	2026-03-31 14:08:39.308054	system
+3387	2028	English	\N	\N	{year} W {week}	\N	2026-03-31 14:08:39.309212	system
+3388	2029	German	\N	\N	Heute	\N	2026-03-31 14:08:39.311819	system
+3389	2029	English	\N	\N	today	\N	2026-03-31 14:08:39.312967	system
+3390	2030	German	\N	\N	Die Buchungsnr #{buchungsnr} is ungültig	\N	2026-03-31 14:08:39.315595	system
+3391	2030	English	\N	\N	The Buchungnr #{buchungsnr} is not valid	\N	2026-03-31 14:08:39.316733	system
+3529	2112	English	\N	\N	Super!	\N	2026-03-31 14:08:39.609955	system
+3392	2031	German	\N	\N	Die Buchung wurde bereits übertragen und darf nicht geändert werden	\N	2026-03-31 14:08:39.319361	system
+3393	2031	English	\N	\N	The Buchung was already submitted and can not be changed	\N	2026-03-31 14:08:39.320564	system
+3394	2032	German	\N	\N	Buchungszuordnung SAP geloescht: SalesOrder: {sap_sales_order_id}	\N	2026-03-31 14:08:39.323186	system
+3395	2032	English	\N	\N	Buchungszuordnung SAP deleted: SalesOrder: {sap_sales_order_id}	\N	2026-03-31 14:08:39.324448	system
+3396	2033	German	\N	\N	Lehrverband	\N	2026-03-31 14:08:39.327111	system
+3397	2033	English	\N	\N	Teaching Association	\N	2026-03-31 14:08:39.3283	system
+3398	2034	German	\N	\N	{countSuccess} erfolgreiche Statusänderung(en) auf {status}, {countError} Fehler	\N	2026-03-31 14:08:39.330953	system
+3399	2034	English	\N	\N	{countSuccess} successful status changes to {status}, {countError} errors	\N	2026-03-31 14:08:39.332101	system
+3400	2035	German	\N	\N	Fehler bei Aktualisierung Lehrverband	\N	2026-03-31 14:08:39.334818	system
+3401	2035	English	\N	\N	Error during insert/update lehrverband	\N	2026-03-31 14:08:39.335938	system
+3402	2036	German	\N	\N	Kein Lehrverband vorhanden	\N	2026-03-31 14:08:39.338603	system
+3403	2036	English	\N	\N	Error: no existing Lehrverband	\N	2026-03-31 14:08:39.339719	system
+3404	2037	German	\N	\N	Fehler bei Aktualisierung Studentlehrverband	\N	2026-03-31 14:08:39.342338	system
+3405	2037	English	\N	\N	Error during insert/update Studentlehrverband	\N	2026-03-31 14:08:39.343453	system
+3406	2038	German	\N	\N	Kein Studentlehrverband vorhanden	\N	2026-03-31 14:08:39.346119	system
+3407	2038	English	\N	\N	Error: no existing Studentlehrverband	\N	2026-03-31 14:08:39.347327	system
+3408	2039	German	\N	\N	Ungültige Zeitabfolge der Statuseinträge (Statusdatum oder Semester)	\N	2026-03-31 14:08:39.349999	system
+3409	2039	English	\N	\N	Error: Invalid date order of statuses (date or semester)	\N	2026-03-31 14:08:39.35116	system
+3410	2040	German	\N	\N	Nach Abbrecher- und Absolventenstatus darf kein anderer Status mehr eingetragen werden	\N	2026-03-31 14:08:39.35382	system
+3411	2040	English	\N	\N	Error: No other status may be entered after the dropout and graduate status	\N	2026-03-31 14:08:39.354975	system
+3412	2041	German	\N	\N	Aufeinanderfolgende Unterbrecher müssen gleiches Ausbildungssemester haben	\N	2026-03-31 14:08:39.357639	system
+3413	2041	English	\N	\N	Error: Successive interrupters must have the same education semester	\N	2026-03-31 14:08:39.358783	system
+3414	2042	German	\N	\N	Unterbrecher und folgender Abbrecher müssen gleiches Ausbildungssemester haben	\N	2026-03-31 14:08:39.361464	system
+3415	2042	English	\N	\N	Error: interrupter and following dropout must have the same education semester	\N	2026-03-31 14:08:39.362616	system
+3416	2043	German	\N	\N	Nach Diplomandenstatus darf kein Studentenstatus mehr eingetragen werden	\N	2026-03-31 14:08:39.365275	system
+3417	2043	English	\N	\N	Error: Student status may not be entered after graduate status	\N	2026-03-31 14:08:39.366484	system
+3418	2044	German	\N	\N	Kein Eintrag für Studiensemester vorhanden	\N	2026-03-31 14:08:39.369158	system
+3419	2044	English	\N	\N	Error: no entry for study semester	\N	2026-03-31 14:08:39.370316	system
+3420	2045	German	\N	\N	{anzahl} Rollen vorhanden	\N	2026-03-31 14:08:39.372985	system
+3421	2045	English	\N	\N	{anzahl} existing roles	\N	2026-03-31 14:08:39.374145	system
+3422	2046	German	\N	\N	Datum eines neuen Statuseintrags darf nicht in der Vergangenheit liegen	\N	2026-03-31 14:08:39.376754	system
+3423	2046	English	\N	\N	Error: The date of a new status entry cannot be in the past	\N	2026-03-31 14:08:39.377991	system
+3424	2047	German	\N	\N	Status ändern	\N	2026-03-31 14:08:39.380685	system
+3425	2047	English	\N	\N	Change status	\N	2026-03-31 14:08:39.381817	system
+3426	2048	German	\N	\N	Neuer Termin Bachelor-/Masterarbeitsbetreuung	\N	2026-03-31 14:08:39.384484	system
+3427	2048	English	\N	\N	New date for Bachelor/Master thesis supervision	\N	2026-03-31 14:08:39.385645	system
+3428	2049	German	\N	\N	Terminserie anlegen	\N	2026-03-31 14:08:39.388292	system
+3429	2049	English	\N	\N	Create recurring deadline	\N	2026-03-31 14:08:39.389496	system
+3430	2050	German	\N	\N	Sprache	\N	2026-03-31 14:08:39.39211	system
+3431	2050	English	\N	\N	Language	\N	2026-03-31 14:08:39.39334	system
+3432	2051	German	\N	\N	Projektarbeit ist nichtmehr aktuell	\N	2026-03-31 14:08:39.395959	system
+3433	2051	English	\N	\N	Project work is not current anymore	\N	2026-03-31 14:08:39.397129	system
+3434	2052	German	\N	\N	Email über neuen Abgabetermin versendet an: {0}	\N	2026-03-31 14:08:39.399791	system
+3435	2052	English	\N	\N	Email about new deadline sent to: {0}	\N	2026-03-31 14:08:39.400954	system
+3436	2053	German	\N	\N	Serientermin wurde erfolgreich eingetragen!	\N	2026-03-31 14:08:39.403654	system
+3437	2053	English	\N	\N	Series dates were successfully entered!	\N	2026-03-31 14:08:39.404857	system
+3438	2054	German	\N	\N	Fehler beim speichern des Serientermins!	\N	2026-03-31 14:08:39.40754	system
+3439	2054	English	\N	\N	Error saving Series dates!	\N	2026-03-31 14:08:39.408706	system
+3440	2055	German	\N	\N	Dokumentabgabe - MitarbeiterInbereich	\N	2026-03-31 14:08:39.411381	system
+3441	2055	English	\N	\N	File submission - Employee area	\N	2026-03-31 14:08:39.41253	system
+3442	2056	German	\N	\N	Alle	\N	2026-03-31 14:08:39.41515	system
+3443	2056	English	\N	\N	All	\N	2026-03-31 14:08:39.416345	system
+3444	2057	German	\N	\N	Abgabe	\N	2026-03-31 14:08:39.418996	system
+3445	2057	English	\N	\N	Submission	\N	2026-03-31 14:08:39.420142	system
+3446	2058	German	\N	\N	{0} gelöscht	\N	2026-03-31 14:08:39.422896	system
+3447	2058	English	\N	\N	{0} deleted	\N	2026-03-31 14:08:39.424042	system
+3448	2059	German	\N	\N	Die letzte Rolle kann nur durch den Administrator gelöscht werden	\N	2026-03-31 14:08:39.426754	system
+3449	2059	English	\N	\N	Error: The last role can only be deleted by the administrator	\N	2026-03-31 14:08:39.427859	system
+3450	2060	German	\N	\N	Meldestichtag erreicht - ausschließlich Bearbeiten Statusgrund und Anmerkung möglich	\N	2026-03-31 14:08:39.430448	system
+3451	2060	English	\N	\N	Reporting deadline reached - only editing status reason and note possible	\N	2026-03-31 14:08:39.431585	system
+3452	2061	German	\N	\N	Meldestichtag erreicht - Bearbeiten Ausbildungssemester, Statusgrund und Anmerkung möglich	\N	2026-03-31 14:08:39.43418	system
+3453	2061	English	\N	\N	Edit education semester, status reason and note possible	\N	2026-03-31 14:08:39.435314	system
+3454	2062	German	\N	\N	Ort, Gemeinde und Postleitzahl passen nicht zusammen	\N	2026-03-31 14:08:39.437888	system
+3455	2062	English	\N	\N	City, municipality and postcode do not match	\N	2026-03-31 14:08:39.438986	system
+3456	2063	German	\N	\N	Bitte gültige PLZ wählen	\N	2026-03-31 14:08:39.441683	system
+3457	2063	English	\N	\N	Please select valid postcode	\N	2026-03-31 14:08:39.442809	system
+3458	2064	German	\N	\N	Bitte gültige Gemeinde wählen	\N	2026-03-31 14:08:39.445471	system
+3459	2064	English	\N	\N	Please select valid municipality	\N	2026-03-31 14:08:39.446646	system
+3460	2065	German	\N	\N	Bitte Standort wählen	\N	2026-03-31 14:08:39.44939	system
+3461	2065	English	\N	\N	Please select location	\N	2026-03-31 14:08:39.450521	system
+3462	2066	German	\N	\N	Vor dem Studentenstatus müssen folgende Status eingetragen werden: {0}	\N	2026-03-31 14:08:39.453191	system
+3463	2066	English	\N	\N	Error: Following status should be present before student status: {0}	\N	2026-03-31 14:08:39.454427	system
+3464	2067	German	\N	\N	Personenkennzeichen passt nicht zu Studiensemester des ersten Studentstatus	\N	2026-03-31 14:08:39.457131	system
+3465	2067	English	\N	\N	Error: Personenkennzeichen does not fit with semester of first student status	\N	2026-03-31 14:08:39.458321	system
+3466	2068	German	\N	\N	Erster Studentstatus muss gleiche Organisationsform haben wie Bewerberstatus (Studienplan Orgform)	\N	2026-03-31 14:08:39.461082	system
+3467	2068	English	\N	\N	Error: first student status should have same organisational form as bewerber status (Studienplan)	\N	2026-03-31 14:08:39.46229	system
+3468	2069	German	\N	\N	Benutzer für uid {uid} bereits vorhanden	\N	2026-03-31 14:08:39.464838	system
+3469	2069	English	\N	\N	Error: User for uid {uid} already exists	\N	2026-03-31 14:08:39.465958	system
+3470	2070	German	\N	\N	Statusgrund {statusgrundkurzbz} nicht gefunden	\N	2026-03-31 14:08:39.46856	system
+3471	2070	English	\N	\N	Statusgrund {statusgrundkurzbz} not found	\N	2026-03-31 14:08:39.469668	system
+3472	2071	German	\N	\N	Den Status dieser Person wirklich auf {status} setzen?	\N	2026-03-31 14:08:39.472252	system
+3473	2071	English	\N	\N	Really set this person's status to {status}?	\N	2026-03-31 14:08:39.473406	system
+3474	2072	German	\N	\N	Den Status dieser {count} Personen wirklich auf {status} setzen?	\N	2026-03-31 14:08:39.476031	system
+3475	2072	English	\N	\N	Really set the status of these {count} people to {status}?	\N	2026-03-31 14:08:39.477232	system
+3476	2080	German	\N	\N	Prüfung hinzufügen	\N	2026-03-31 14:08:39.495308	system
+3477	2080	English	\N	\N	Add exam	\N	2026-03-31 14:08:39.496463	system
+3478	2081	German	\N	\N	Prüfung bearbeiten	\N	2026-03-31 14:08:39.499022	system
+3479	2081	English	\N	\N	Edit exam	\N	2026-03-31 14:08:39.500155	system
+3480	2082	German	\N	\N	Prüfung löschen	\N	2026-03-31 14:08:39.502748	system
+3481	2082	English	\N	\N	Delete exam	\N	2026-03-31 14:08:39.503878	system
+3482	2083	German	\N	\N	Prüfungskopie für neue Prüfung erstellen	\N	2026-03-31 14:08:39.506467	system
+3483	2083	English	\N	\N	Copy exam	\N	2026-03-31 14:08:39.507752	system
+3484	2084	German	\N	\N	Bitte bei Neuanlage einer kommissionellen Prüfung das Datum der Noteneintragung (i. d. R. heute) eintragen, um den korrekten Fristenablauf der Wiederholung zu ermöglichen.	\N	2026-03-31 14:08:39.510339	system
+3485	2084	English	\N	\N	When creating a new examination before a committee, please enter the date of the grade entry (usually today) to ensure that the deadline for repeating the exam is met correctly.	\N	2026-03-31 14:08:39.511622	system
+3486	2085	German	\N	\N	keine Auswahl	\N	2026-03-31 14:08:39.514226	system
+3487	2085	English	\N	\N	no selection	\N	2026-03-31 14:08:39.515371	system
+3488	2086	German	\N	\N	ACHTUNG! Diese Prüfungsnote wurde nicht ins Zeugnis übernommen da die Zeugnisnote nach dem Prüfungsdatum verändert wurde	\N	2026-03-31 14:08:39.518029	system
+3489	2086	English	\N	\N	ATTENTION! This exam grade was not included in the certificate because the certificate grade was changed after the exam date	\N	2026-03-31 14:08:39.519175	system
+3490	2087	German	\N	\N	Bitte Lv_Teil wählen	\N	2026-03-31 14:08:39.521895	system
+3491	2087	English	\N	\N	Please select teaching unit	\N	2026-03-31 14:08:39.523	system
+3492	2088	German	\N	\N	Punkte	\N	2026-03-31 14:08:39.525812	system
+3493	2088	English	\N	\N	Points	\N	2026-03-31 14:08:39.526964	system
+3494	2089	German	\N	\N	Nur aktuelles Studiensemester anzeigen	\N	2026-03-31 14:08:39.529609	system
+3495	2089	English	\N	\N	Display only current Semester	\N	2026-03-31 14:08:39.530748	system
+3496	2090	German	\N	\N	Student UID	\N	2026-03-31 14:08:39.533405	system
+3497	2090	English	\N	\N	student UID	\N	2026-03-31 14:08:39.534647	system
+3498	2091	German	\N	\N	Übernahmebestätigung drucken	\N	2026-03-31 14:08:39.537313	system
+3499	2091	English	\N	\N	Print acceptance confirmation	\N	2026-03-31 14:08:39.538454	system
+3500	2092	German	\N	\N	Betriebsmittel bearbeiten	\N	2026-03-31 14:08:39.541221	system
+3501	2092	English	\N	\N	Edit Resource	\N	2026-03-31 14:08:39.542399	system
+3502	2093	German	\N	\N	Betriebsmittel löschen	\N	2026-03-31 14:08:39.545113	system
+3503	2093	English	\N	\N	Delete Resource	\N	2026-03-31 14:08:39.546259	system
+3504	2094	German	\N	\N	unbekannt	\N	2026-03-31 14:08:39.548982	system
+3505	2094	English	\N	\N	unknown	\N	2026-03-31 14:08:39.55023	system
+3506	2095	German	\N	\N	Config-Eintrag fehlt	\N	2026-03-31 14:08:39.553063	system
+3507	2095	English	\N	\N	Missing config entry	\N	2026-03-31 14:08:39.554209	system
+3508	2096	German	\N	\N	Unbekannte URL. Seite bzw. Link kann nicht geöffnet werden.	\N	2026-03-31 14:08:39.556837	system
+3509	2096	English	\N	\N	Unknown URL. Cannot open to site or link	\N	2026-03-31 14:08:39.557967	system
+3510	2103	German	\N	\N	Neueste Ampeln	\N	2026-03-31 14:08:39.573668	system
+3511	2103	English	\N	\N	Newest Ampeln	\N	2026-03-31 14:08:39.574893	system
+3512	2104	German	\N	\N	Alle Ampeln	\N	2026-03-31 14:08:39.577582	system
+3513	2104	English	\N	\N	All Ampeln	\N	2026-03-31 14:08:39.578766	system
+3514	2105	German	\N	\N	Überfällig: {count}	\N	2026-03-31 14:08:39.581489	system
+3515	2105	English	\N	\N	Overdue: {count}	\N	2026-03-31 14:08:39.582663	system
+3516	2106	German	\N	\N	Stichtag: {value}	\N	2026-03-31 14:08:39.585364	system
+3517	2106	English	\N	\N	Deadline: {value}	\N	2026-03-31 14:08:39.586519	system
+3518	2107	German	\N	\N	Keine offenen Ampeln.	\N	2026-03-31 14:08:39.589295	system
+3519	2107	English	\N	\N	No open Ampeln.	\N	2026-03-31 14:08:39.590448	system
+3520	2108	German	\N	\N	Offene Ampeln	\N	2026-03-31 14:08:39.593229	system
+3521	2108	English	\N	\N	Open Ampeln	\N	2026-03-31 14:08:39.594453	system
+3522	2109	German	\N	\N	Alle meine Ampeln	\N	2026-03-31 14:08:39.597172	system
+3523	2109	English	\N	\N	All my Ampeln	\N	2026-03-31 14:08:39.598344	system
+3524	2110	German	\N	\N	Pflicht	\N	2026-03-31 14:08:39.601034	system
+3525	2110	English	\N	\N	Mandatory	\N	2026-03-31 14:08:39.602199	system
+3526	2111	German	\N	\N	Ampel bestätigt	\N	2026-03-31 14:08:39.604948	system
+3527	2111	English	\N	\N	Ampel confirmed	\N	2026-03-31 14:08:39.606102	system
+3528	2112	German	\N	\N	Super!	\N	2026-03-31 14:08:39.608783	system
+3530	2113	German	\N	\N	Alle News	\N	2026-03-31 14:08:39.612612	system
+3531	2113	English	\N	\N	All News	\N	2026-03-31 14:08:39.613787	system
+3532	2114	German	\N	\N	Top Nachrichten	\N	2026-03-31 14:08:39.616441	system
+3533	2114	English	\N	\N	Top News	\N	2026-03-31 14:08:39.617604	system
+3534	2115	German	\N	\N	Kein Betreff vorhanden	\N	2026-03-31 14:08:39.620314	system
+3535	2115	English	\N	\N	No Subject available	\N	2026-03-31 14:08:39.621567	system
+3536	2116	German	\N	\N	Studiengangsleitung	\N	2026-03-31 14:08:39.624257	system
+3537	2116	English	\N	\N	Program Director	\N	2026-03-31 14:08:39.625441	system
+3538	2117	German	\N	\N	Stellvertretung	\N	2026-03-31 14:08:39.628065	system
+3539	2117	English	\N	\N	Deputy Program Director	\N	2026-03-31 14:08:39.629289	system
+3540	2118	German	\N	\N	Sekretariat	\N	2026-03-31 14:08:39.632161	system
+3541	2118	English	\N	\N	Administrative Assistant	\N	2026-03-31 14:08:39.633345	system
+3542	2119	German	\N	\N	Hochschulvertretung	\N	2026-03-31 14:08:39.636017	system
+3543	2119	English	\N	\N	UAS Representative	\N	2026-03-31 14:08:39.637181	system
+3544	2120	German	\N	\N	Studienvertretung	\N	2026-03-31 14:08:39.639828	system
+3545	2120	English	\N	\N	Degree Program Representative	\N	2026-03-31 14:08:39.640975	system
+3546	2121	German	\N	\N	Allgemeiner Download	\N	2026-03-31 14:08:39.643633	system
+3547	2121	English	\N	\N	Global Download	\N	2026-03-31 14:08:39.64478	system
+3548	2122	German	\N	\N	Sie sind nicht angemeldet. Es wurde keine Benutzer UID gefunden	\N	2026-03-31 14:08:39.647423	system
+3549	2122	English	\N	\N	You are not logged in. No UID found	\N	2026-03-31 14:08:39.648644	system
+3550	2123	German	\N	\N	Bearbeiten	\N	2026-03-31 14:08:39.651285	system
+3551	2123	English	\N	\N	Edit	\N	2026-03-31 14:08:39.652482	system
+3552	2124	German	\N	\N	Lehrveranstaltungsinformation	\N	2026-03-31 14:08:39.655192	system
+3553	2124	English	\N	\N	Course Information	\N	2026-03-31 14:08:39.656355	system
+3554	2125	German	\N	\N	Lehrveranstaltungsmenü	\N	2026-03-31 14:08:39.659173	system
+3555	2125	English	\N	\N	Course Menu	\N	2026-03-31 14:08:39.660338	system
+3556	2126	German	\N	\N	Kein Lehrveranstaltungsmenü verfügbar	\N	2026-03-31 14:08:39.663056	system
+3557	2126	English	\N	\N	No Course Menu available	\N	2026-03-31 14:08:39.664238	system
+3558	2127	German	\N	\N	Gesamtnote	\N	2026-03-31 14:08:39.666917	system
+3559	2127	English	\N	\N	Final Grade	\N	2026-03-31 14:08:39.668079	system
+3560	2128	German	\N	\N	Noteneingabe deaktiviert	\N	2026-03-31 14:08:39.670814	system
+3561	2128	English	\N	\N	Grading disabled	\N	2026-03-31 14:08:39.671959	system
+3562	2129	German	\N	\N	Für die Gruppe(n) {nomail} existiert kein Verteiler! Die Studierenden in diesen Gruppen bekommen kein Mail.	\N	2026-03-31 14:08:39.674604	system
+3563	2129	English	\N	\N	There is no e-mail distribution list for the group(s) {nomail}! The students in these groups will not receive an e-mail.	\N	2026-03-31 14:08:39.675782	system
+3564	2130	German	\N	\N	E-Mail an Studierende	\N	2026-03-31 14:08:39.678438	system
+3565	2130	English	\N	\N	E-Mail to students	\N	2026-03-31 14:08:39.679576	system
+3566	2131	German	\N	\N	Abmelden	\N	2026-03-31 14:08:39.682165	system
+3567	2131	English	\N	\N	Unsubscribe	\N	2026-03-31 14:08:39.683314	system
+3568	2132	German	\N	\N	Anrechnung	\N	2026-03-31 14:08:39.685942	system
+3569	2132	English	\N	\N	Exemption	\N	2026-03-31 14:08:39.687078	system
+3570	2133	German	\N	\N	Anrechnungen	\N	2026-03-31 14:08:39.689762	system
+3571	2133	English	\N	\N	Exemptions	\N	2026-03-31 14:08:39.690905	system
+3572	2134	German	\N	\N	LV-Plan	\N	2026-03-31 14:08:39.693812	system
+3573	2134	English	\N	\N	Timetable	\N	2026-03-31 14:08:39.694939	system
+3574	2135	German	\N	\N	{0}'s persönliches Dashboard	\N	2026-03-31 14:08:39.697608	system
+3575	2135	English	\N	\N	{0}'s personal Dashboard	\N	2026-03-31 14:08:39.698754	system
+3576	2136	German	\N	\N	Meine Lehrveranstaltungen	\N	2026-03-31 14:08:39.701407	system
+3577	2136	English	\N	\N	My Courses	\N	2026-03-31 14:08:39.702554	system
+3578	2137	German	\N	\N	Vorheriges Studiensemester	\N	2026-03-31 14:08:39.705184	system
+3579	2137	English	\N	\N	Previous study semester	\N	2026-03-31 14:08:39.706334	system
+3580	2138	German	\N	\N	Nächstes Studiensemester	\N	2026-03-31 14:08:39.708982	system
+3581	2138	English	\N	\N	Next study semester	\N	2026-03-31 14:08:39.710139	system
+3582	2139	German	\N	\N	Bachelor-/Masterarbeiten	\N	2026-03-31 14:08:39.712779	system
+3583	2139	English	\N	\N	Bachelor's/Master's theses	\N	2026-03-31 14:08:39.7139	system
+3584	2140	German	\N	\N	Kein Titel	\N	2026-03-31 14:08:39.716568	system
+3585	2140	English	\N	\N	No Title	\N	2026-03-31 14:08:39.717718	system
+3586	2141	German	\N	\N	Details	\N	2026-03-31 14:08:39.720298	system
+3587	2141	English	\N	\N	Details	\N	2026-03-31 14:08:39.72144	system
+3588	2142	German	\N	\N	Semester	\N	2026-03-31 14:08:39.724053	system
+3589	2142	English	\N	\N	Semester	\N	2026-03-31 14:08:39.725217	system
+3590	2143	German	\N	\N	Studiengang	\N	2026-03-31 14:08:39.727836	system
+3591	2143	English	\N	\N	Degree program	\N	2026-03-31 14:08:39.728976	system
+3592	2144	German	\N	\N	Kontakt	\N	2026-03-31 14:08:39.73167	system
+3593	2144	English	\N	\N	Contact	\N	2026-03-31 14:08:39.732803	system
+3594	2145	German	\N	\N	BetreuerIn	\N	2026-03-31 14:08:39.735411	system
+3595	2145	English	\N	\N	Reviewer	\N	2026-03-31 14:08:39.736569	system
+3596	2146	German	\N	\N	Projekttyp	\N	2026-03-31 14:08:39.739161	system
+3597	2146	English	\N	\N	Project type	\N	2026-03-31 14:08:39.740305	system
+3598	2147	German	\N	\N	Titel	\N	2026-03-31 14:08:39.742937	system
+3599	2147	English	\N	\N	Title	\N	2026-03-31 14:08:39.744091	system
+3600	2148	German	\N	\N	Abgabe bis 23:59	\N	2026-03-31 14:08:39.746684	system
+3601	2148	English	\N	\N	Submission until 23:59	\N	2026-03-31 14:08:39.747798	system
+3602	2149	German	\N	\N	Dokumentabgabe - Studierendenbereich	\N	2026-03-31 14:08:39.75044	system
+3603	2149	English	\N	\N	File submission - Student area	\N	2026-03-31 14:08:39.751559	system
+3604	2150	German	\N	\N	Nachreichen möglich	\N	2026-03-31 14:08:39.754223	system
+3605	2150	English	\N	\N	late submission possible	\N	2026-03-31 14:08:39.755372	system
+3606	2151	German	\N	\N	Organisationseinheit	\N	2026-03-31 14:08:39.757945	system
+3607	2151	English	\N	\N	organization unit	\N	2026-03-31 14:08:39.759091	system
+3608	2152	German	\N	\N	Studierendenstatus	\N	2026-03-31 14:08:39.761716	system
+3609	2152	English	\N	\N	student status	\N	2026-03-31 14:08:39.762908	system
+3610	2153	German	\N	\N	Digitale Signatur gefunden	\N	2026-03-31 14:08:39.765543	system
+3611	2153	English	\N	\N	digital signature found	\N	2026-03-31 14:08:39.766678	system
+3612	2154	German	\N	\N	Keine Digitale Signatur gefunden	\N	2026-03-31 14:08:39.769285	system
+3613	2154	English	\N	\N	no digital signature found	\N	2026-03-31 14:08:39.770442	system
+3614	2155	German	\N	\N	Signatur Server Error	\N	2026-03-31 14:08:39.773055	system
+3615	2155	English	\N	\N	signature server error	\N	2026-03-31 14:08:39.77419	system
+3616	2156	German	\N	\N	Datei wurde nicht gefunden	\N	2026-03-31 14:08:39.776804	system
+3617	2156	English	\N	\N	file not found	\N	2026-03-31 14:08:39.777957	system
+3618	2157	German	\N	\N	Datei hochgeladen	\N	2026-03-31 14:08:39.780567	system
+3619	2157	English	\N	\N	file uploaded	\N	2026-03-31 14:08:39.781667	system
+3620	2158	German	\N	\N	Aktionen	\N	2026-03-31 14:08:39.784171	system
+3621	2158	English	\N	\N	actions	\N	2026-03-31 14:08:39.785315	system
+3622	2159	German	\N	\N	Zieldatum	\N	2026-03-31 14:08:39.787911	system
+3623	2159	English	\N	\N	Deadline	\N	2026-03-31 14:08:39.789061	system
+3624	2160	German	\N	\N	Abgabetyp	\N	2026-03-31 14:08:39.791702	system
+3625	2160	English	\N	\N	Type of document submitted	\N	2026-03-31 14:08:39.792827	system
+3626	2161	German	\N	\N	Kurzbeschreibung der Abgabe	\N	2026-03-31 14:08:39.795512	system
+3627	2161	English	\N	\N	Short description of the submitted document	\N	2026-03-31 14:08:39.796658	system
+3628	2162	German	\N	\N	Abgabedatum	\N	2026-03-31 14:08:39.799235	system
+3629	2162	English	\N	\N	Submission date	\N	2026-03-31 14:08:39.800369	system
+3630	2163	German	\N	\N	Projektarbeit für älteres Semester, bitte Word-Formular in Moodle zur Benotung verwenden!	\N	2026-03-31 14:08:39.802997	system
+3631	2163	English	\N	\N	Thesis handed in for older semester, please use word form in moodle for assessment!	\N	2026-03-31 14:08:39.80423	system
+3632	2164	German	\N	\N	Endupload ist noch nicht erfolgt	\N	2026-03-31 14:08:39.806829	system
+3633	2164	English	\N	\N	Final version not uploaded yet	\N	2026-03-31 14:08:39.80794	system
+3634	2165	German	\N	\N	Fileupload PDF max. 30 MB	\N	2026-03-31 14:08:39.810588	system
+3635	2165	English	\N	\N	Fileupload PDF max. 30 MB	\N	2026-03-31 14:08:39.811716	system
+3636	2166	German	\N	\N	Benoten	\N	2026-03-31 14:08:39.814287	system
+3637	2166	English	\N	\N	Grade	\N	2026-03-31 14:08:39.815453	system
+3638	2167	German	\N	\N	Upload-File ist kein PDF!	\N	2026-03-31 14:08:39.818258	system
+3639	2167	English	\N	\N	Upload-File is not a PDF!	\N	2026-03-31 14:08:39.819386	system
+3640	2168	German	\N	\N	Speichern	\N	2026-03-31 14:08:39.822029	system
+3641	2168	English	\N	\N	Save	\N	2026-03-31 14:08:39.823157	system
+3642	2169	German	\N	\N	Löschen	\N	2026-03-31 14:08:39.825781	system
+3643	2169	English	\N	\N	Delete	\N	2026-03-31 14:08:39.826889	system
+3644	2170	German	\N	\N	Endupload Zusatzdaten	\N	2026-03-31 14:08:39.829482	system
+3645	2170	English	\N	\N	Final submission additional data	\N	2026-03-31 14:08:39.830629	system
+3646	2171	German	\N	\N	Beurteilung	\N	2026-03-31 14:08:39.833225	system
+3647	2171	English	\N	\N	Evaluation	\N	2026-03-31 14:08:39.834337	system
+3648	2172	German	\N	\N	Deutsche Schlagwörter	\N	2026-03-31 14:08:39.836922	system
+3649	2172	English	\N	\N	German Keywords	\N	2026-03-31 14:08:39.838075	system
+3650	2173	German	\N	\N	Englische Schlagwörter	\N	2026-03-31 14:08:39.840789	system
+3651	2173	English	\N	\N	English Keywords	\N	2026-03-31 14:08:39.841902	system
+3652	2174	German	\N	\N	Abstract max 5000 Zeichen	\N	2026-03-31 14:08:39.844562	system
+3653	2174	English	\N	\N	Abstract max 5000 characters	\N	2026-03-31 14:08:39.845726	system
+3654	2175	German	\N	\N	Abstract englisch max 5000 Zeichen	\N	2026-03-31 14:08:39.848316	system
+3655	2175	English	\N	\N	Abstract english max 5000 characters	\N	2026-03-31 14:08:39.849461	system
+3656	2176	German	\N	\N	Seitenanzahl	\N	2026-03-31 14:08:39.852078	system
+3657	2176	English	\N	\N	Number of pages	\N	2026-03-31 14:08:39.853249	system
+3658	2177	German	\N	\N	Terminübersicht	\N	2026-03-31 14:08:39.855847	system
+3659	2177	English	\N	\N	Deadline Overview	\N	2026-03-31 14:08:39.856951	system
+3660	2178	German	\N	\N	Ja	\N	2026-03-31 14:08:39.859577	system
+3661	2178	English	\N	\N	Yes	\N	2026-03-31 14:08:39.860711	system
+3662	2179	German	\N	\N	Nein	\N	2026-03-31 14:08:39.863312	system
+3663	2179	English	\N	\N	No	\N	2026-03-31 14:08:39.864454	system
+3664	2180	German	\N	\N	Gelesen und akzeptiert	\N	2026-03-31 14:08:39.867078	system
+3665	2180	English	\N	\N	Read and accepted	\N	2026-03-31 14:08:39.868234	system
+3666	2181	German	\N	\N	Personenkennzeichen	\N	2026-03-31 14:08:39.870816	system
+3667	2181	English	\N	\N	Personal identity number	\N	2026-03-31 14:08:39.871962	system
+3668	2182	German	\N	\N	Vorname	\N	2026-03-31 14:08:39.874621	system
+3669	2182	English	\N	\N	First Name	\N	2026-03-31 14:08:39.875811	system
+3670	2183	German	\N	\N	Nachname	\N	2026-03-31 14:08:39.878333	system
+3671	2183	English	\N	\N	Last Name	\N	2026-03-31 14:08:39.879472	system
+3672	2184	German	\N	\N	Speichern... 	\N	2026-03-31 14:08:39.882084	system
+3673	2184	English	\N	\N	Saving... 	\N	2026-03-31 14:08:39.883216	system
+3674	2185	German	\N	\N	Laden... 	\N	2026-03-31 14:08:39.885761	system
+3675	2185	English	\N	\N	Loading... 	\N	2026-03-31 14:08:39.886851	system
+3676	2186	German	\N	\N	Betreuerart	\N	2026-03-31 14:08:39.889446	system
+3677	2186	English	\N	\N	Reviewer type	\N	2026-03-31 14:08:39.890569	system
+3678	2187	German	\N	\N	Alle betreuten Projektarbeiten anzeigen	\N	2026-03-31 14:08:39.89323	system
+3679	2187	English	\N	\N	Show all supervised project work	\N	2026-03-31 14:08:39.894425	system
+3680	2188	German	\N	\N	Deadline Übersicht anzeigen 	\N	2026-03-31 14:08:39.897019	system
+3681	2188	English	\N	\N	Show Deadline Overview	\N	2026-03-31 14:08:39.898156	system
+3682	2189	German	\N	\N	Bitte beachten Sie gegebenenfalls existierende studiengangsspezifische Richtlinien und informieren Sie sich diesbezüglich. Vielen Dank.	\N	2026-03-31 14:08:39.900792	system
+3683	2189	English	\N	\N	Please note any existing program-specific guidelines and inform yourself about them. Thank you.	\N	2026-03-31 14:08:39.901932	system
+3684	2190	German	\N	\N	Note	\N	2026-03-31 14:08:39.904634	system
+3685	2190	English	\N	\N	Grade	\N	2026-03-31 14:08:39.905777	system
+3686	2191	German	\N	\N	Upload erlaubt	\N	2026-03-31 14:08:39.908444	system
+3687	2191	English	\N	\N	Upload allowed	\N	2026-03-31 14:08:39.909602	system
+3688	2192	German	\N	\N	Studierendenansicht	\N	2026-03-31 14:08:39.912218	system
+3689	2192	English	\N	\N	Student perspective	\N	2026-03-31 14:08:39.913381	system
+3690	2193	German	\N	\N	Hochladen	\N	2026-03-31 14:08:39.91605	system
+3691	2193	English	\N	\N	Upload	\N	2026-03-31 14:08:39.917238	system
+3692	2194	German	\N	\N	zur Plagiatsprüfung	\N	2026-03-31 14:08:39.920143	system
+3693	2194	English	\N	\N	Plagiarism check	\N	2026-03-31 14:08:39.921328	system
+3694	2195	German	\N	\N	Kein Endupload vorhanden!	\N	2026-03-31 14:08:39.923955	system
+3695	2195	English	\N	\N	No final submission found!	\N	2026-03-31 14:08:39.9251	system
+3696	2196	German	\N	\N	Beurteilungsnotizen	\N	2026-03-31 14:08:39.927817	system
+3697	2196	English	\N	\N	Evaluation notes	\N	2026-03-31 14:08:39.928955	system
+3698	2197	German	\N	\N	Projektarbeit Detailansicht MitarbeiterIn	\N	2026-03-31 14:08:39.931694	system
+3699	2197	English	\N	\N	Project work Detailed view Employees	\N	2026-03-31 14:08:39.932833	system
+3700	2198	German	\N	\N	Projektarbeit Detailansicht Studierende	\N	2026-03-31 14:08:39.935443	system
+3701	2198	English	\N	\N	Project work Detailed view Students	\N	2026-03-31 14:08:39.936632	system
+3702	2199	German	\N	\N	Verspätet abgegeben	\N	2026-03-31 14:08:39.93927	system
+3703	2199	English	\N	\N	Submitted late	\N	2026-03-31 14:08:39.940444	system
+3704	2200	German	\N	\N	Beurteilung erforderlich	\N	2026-03-31 14:08:39.942959	system
+3705	2200	English	\N	\N	Grading necessary	\N	2026-03-31 14:08:39.944052	system
+3706	2201	German	\N	\N	Bestanden	\N	2026-03-31 14:08:39.946602	system
+3707	2201	English	\N	\N	passed	\N	2026-03-31 14:08:39.947723	system
+3708	2202	German	\N	\N	Nicht Bestanden	\N	2026-03-31 14:08:39.9503	system
+3709	2202	English	\N	\N	not passed	\N	2026-03-31 14:08:39.951406	system
+3710	2203	German	\N	\N	Termin überschritten	\N	2026-03-31 14:08:39.953951	system
+3711	2203	English	\N	\N	Deadline exceeded	\N	2026-03-31 14:08:39.955042	system
+3712	2204	German	\N	\N	Termin innerhalb von 12 Tagen	\N	2026-03-31 14:08:39.957554	system
+3713	2204	English	\N	\N	Deadline within 12 days	\N	2026-03-31 14:08:39.95865	system
+3714	2205	German	\N	\N	Termin mehr als 12 Tage entfernt	\N	2026-03-31 14:08:39.961172	system
+3715	2205	English	\N	\N	Deadline more than 12 days away	\N	2026-03-31 14:08:39.962255	system
+3716	2206	German	\N	\N	Rechtzeitig abgegeben	\N	2026-03-31 14:08:39.964832	system
+3717	2206	English	\N	\N	Delivered on time	\N	2026-03-31 14:08:39.96597	system
+3718	2207	German	\N	\N	Für den gesamten Studiengang verbindlicher Termin.\n\n\t\t\t\tLiegt ein Termin in der Vergangenheit, kann nichts mehr hochgeladen werden. Ist es dennoch erforderlich,\n\t\t\t\thaben Studierende bei der Studiengangsassistenz um eine Korrektur dieses Termins anzusuchen.	\N	2026-03-31 14:08:39.968761	system
+3719	2207	English	\N	\N	This deadline is binding for the entire program. If a deadline is in the past,\n\t\t\t\tnothing can be uploaded. If it is still necessary,\n\t\t\t\tstudents must request a correction of this deadline from the program assistant.	\N	2026-03-31 14:08:39.969908	system
+3720	2208	German	\N	\N	Zu diesem Abgabetermin wurde bereits eine Datei hochgeladen	\N	2026-03-31 14:08:39.972548	system
+3721	2208	English	\N	\N	a file has been uploaded for this deadline	\N	2026-03-31 14:08:39.973681	system
+3722	2209	German	\N	\N	Tippen Sie für Tooltip-Informationen	\N	2026-03-31 14:08:39.976337	system
+3723	2209	English	\N	\N	tap for tooltip information	\N	2026-03-31 14:08:39.977492	system
+3724	2210	German	\N	\N	Zeitstatus	\N	2026-03-31 14:08:39.980111	system
+3725	2210	English	\N	\N	time status	\N	2026-03-31 14:08:39.981275	system
+3726	2211	German	\N	\N	Sie sind nicht berechtigt diesen Abgabetermin zu bearbeiten.\n\t\t\t\t\t Es muss entweder eine Benotung vorgesehen sein oder sich um einen individuellen Termin handeln,\n\t\t\t\t\t welcher von Ihrem Benutzerkonto angelegt wurde.	\N	2026-03-31 14:08:39.984105	system
+3727	2211	English	\N	\N	You are not authorized to edit this deadline.\n\t\t\t\t\tIt must either be scheduled for grading or be a custom due date\n\t\t\t\t\tcreated by your user account.	\N	2026-03-31 14:08:39.985236	system
+3728	2212	German	\N	\N	Sie sind nicht berechtigt diesen Abgabetermin zu löschen.\n\t\t\t\t\t Sie benötigen mindestens die Berechtigung den Termin zu bearbeiten und es darf noch keine\n\t\t\t\t\t Dateiabgabe vorhanden sein.	\N	2026-03-31 14:08:39.98776	system
+3729	2212	English	\N	\N	You are not authorized to delete this deadline.\n\t\t\t\t\tYou need at least the permission to edit the deadline, and no file submissions must yet exist.	\N	2026-03-31 14:08:39.988917	system
+3730	2213	German	\N	\N	Zusatzdaten bearbeiten	\N	2026-03-31 14:08:39.991591	system
+3731	2213	English	\N	\N	Edit additional data	\N	2026-03-31 14:08:39.992751	system
+3732	2214	German	\N	\N	Keine Projektarbeiten gefunden!	\N	2026-03-31 14:08:39.995365	system
+3733	2214	English	\N	\N	No projects found!	\N	2026-03-31 14:08:39.996501	system
+3734	2215	German	\N	\N	Projektabgabe im Ansichtsmodus ist nicht erlaubt!	\N	2026-03-31 14:08:39.999105	system
+3735	2215	English	\N	\N	Project submission in view mode is not allowed!	\N	2026-03-31 14:08:40.000284	system
+3736	2216	German	\N	\N	Verspätete Projektabgabe ist bei Terminen, welche von der Studiengangsassistenz für den gesamten Studiengang fixiert wurden nicht erlaubt!\n\n\t\t\t\tUm einen Endupload durchführen zu können, müssen Sie ein positiv benotetes Quality Gate 1 & Quality Gate 2 in der relevanten Projektarbeit absolviert haben.	\N	2026-03-31 14:08:40.002926	system
+3737	2216	English	\N	\N	Late project submissions are not permitted for deadlines set by the program assistant for the entire program!\n\n\t\t\t\tTo be able to complete a final upload, you must have successfully completed Quality Gate 1 and Quality Gate 2 for the relevant project work.	\N	2026-03-31 14:08:40.00406	system
+3738	2217	German	\N	\N	Benotet	\N	2026-03-31 14:08:40.006792	system
+3739	2217	English	\N	\N	Graded	\N	2026-03-31 14:08:40.007929	system
+3740	2218	German	\N	\N	Möchten Sie wirklich Löschen?	\N	2026-03-31 14:08:40.010616	system
+3741	2218	English	\N	\N	Do you really want to delete?	\N	2026-03-31 14:08:40.011741	system
+3742	2219	German	\N	\N	Keine Abgabe vorhanden	\N	2026-03-31 14:08:40.014422	system
+3743	2219	English	\N	\N	No submission yet	\N	2026-03-31 14:08:40.015573	system
+3744	2220	German	\N	\N	Neuen Abgabetermin erstellen	\N	2026-03-31 14:08:40.018201	system
+3745	2220	English	\N	\N	Create new Deadline	\N	2026-03-31 14:08:40.019327	system
+3746	2221	German	\N	\N	Quality Gate negativ beurteilt	\N	2026-03-31 14:08:40.02196	system
+3747	2221	English	\N	\N	Quality Gate graded negative	\N	2026-03-31 14:08:40.023093	system
+3748	2222	German	\N	\N	Keine Note eingetragen	\N	2026-03-31 14:08:40.025731	system
+3749	2222	English	\N	\N	no grade assigned yet	\N	2026-03-31 14:08:40.0269	system
+3750	2223	German	\N	\N	Sie haben eine Abgabe vom Typ Quality Gate negativ benotet, bitte legen Sie zeitnah einen Nachfolgetermin an!	\N	2026-03-31 14:08:40.029803	system
+3751	2223	English	\N	\N	You have graded a submission of type Quality Gate negative, please schedule a follow-up appointment promptly!	\N	2026-03-31 14:08:40.030953	system
+3752	2224	German	\N	\N	E-Mail BetreuerIn	\N	2026-03-31 14:08:40.033644	system
+3753	2224	English	\N	\N	Email Reviewer	\N	2026-03-31 14:08:40.034796	system
+3754	2225	German	\N	\N	Projektdetails öffnen	\N	2026-03-31 14:08:40.037474	system
+3755	2225	English	\N	\N	open Project Details	\N	2026-03-31 14:08:40.038642	system
+3756	2226	German	\N	\N	ErstbetreuerIn Beurteilung herunterladen	\N	2026-03-31 14:08:40.04133	system
+3757	2226	English	\N	\N	Download evaluation of first reviewer	\N	2026-03-31 14:08:40.042468	system
+3758	2227	German	\N	\N	ZweitbetreuerIn Beurteilung herunterladen	\N	2026-03-31 14:08:40.045112	system
+3759	2227	English	\N	\N	Download evaluation of second reviewer	\N	2026-03-31 14:08:40.046245	system
+3760	2228	German	\N	\N	Keine Beurteilung vorhanden	\N	2026-03-31 14:08:40.048846	system
+3761	2228	English	\N	\N	No Project evaluation found	\N	2026-03-31 14:08:40.049998	system
+3762	2229	German	\N	\N	Akzeptieren und Fortfahren	\N	2026-03-31 14:08:40.052665	system
+3763	2229	English	\N	\N	Accept and proceed	\N	2026-03-31 14:08:40.053788	system
+3764	2230	German	\N	\N	Abbrechen	\N	2026-03-31 14:08:40.05644	system
+3765	2230	English	\N	\N	Cancel	\N	2026-03-31 14:08:40.057607	system
+3766	2231	German	\N	\N	Abgabe herunterladen	\N	2026-03-31 14:08:40.060195	system
+3767	2231	English	\N	\N	Download File	\N	2026-03-31 14:08:40.061346	system
+3768	2232	German	\N	\N	Zuletzt getätigte Abgabe herunterladen	\N	2026-03-31 14:08:40.064008	system
+3769	2232	English	\N	\N	Download latest uploaded File	\N	2026-03-31 14:08:40.065155	system
+3770	2233	German	\N	\N	Zeitstrahl Termine	\N	2026-03-31 14:08:40.067746	system
+3771	2233	English	\N	\N	Timeline Deadlines	\N	2026-03-31 14:08:40.068887	system
+3772	2234	German	\N	\N	Möchten Sie den Endupload durchführen?	\N	2026-03-31 14:08:40.071541	system
+3773	2234	English	\N	\N	Do you want to complete the final upload?	\N	2026-03-31 14:08:40.072689	system
+3774	2235	German	\N	\N	Möchten Sie die Zusatzdaten speichern?	\N	2026-03-31 14:08:40.075383	system
+3775	2235	English	\N	\N	Do you want to save the additional data?	\N	2026-03-31 14:08:40.076505	system
+3776	2236	German	\N	\N	Fehler beim Laden der Projektarbeit - StudentIn Zuordnung	\N	2026-03-31 14:08:40.079134	system
+3777	2236	English	\N	\N	Error loading student for project work	\N	2026-03-31 14:08:40.080299	system
+3778	2237	German	\N	\N	Kein zugeteilter StudentIn gefunden für Projektarbeit	\N	2026-03-31 14:08:40.082943	system
+3779	2237	English	\N	\N	No assigned student found for project work	\N	2026-03-31 14:08:40.084075	system
+3780	2238	German	\N	\N	Alle Zusatzdatenfelder benötigen Eingabewerte!	\N	2026-03-31 14:08:40.086765	system
+3781	2238	English	\N	\N	All additional data fields are required!	\N	2026-03-31 14:08:40.087862	system
+3782	2239	German	\N	\N	Ihr Abstract ist sehr kurz, möchten Sie den Endupload trotzdem durchführen?	\N	2026-03-31 14:08:40.090431	system
+3783	2239	English	\N	\N	Your abstract is very short. Would you still like to complete the final upload?	\N	2026-03-31 14:08:40.091544	system
+3784	2240	German	\N	\N	Ihr englisches Abstract ist sehr kurz, möchten Sie den Endupload trotzdem durchführen?	\N	2026-03-31 14:08:40.094085	system
+3785	2240	English	\N	\N	Your english abstract is very short. Would you still like to complete the final upload?	\N	2026-03-31 14:08:40.095183	system
+3786	2241	German	\N	\N	Ihre Schlagwörter sind sehr kurz, möchten Sie den Endupload trotzdem durchführen?	\N	2026-03-31 14:08:40.097762	system
+3787	2241	English	\N	\N	Your keywords are very short. Would you still like to complete the final upload?	\N	2026-03-31 14:08:40.098865	system
+3788	2242	German	\N	\N	Ihre englischen Schlagwörter sind sehr kurz, möchten Sie den Endupload trotzdem durchführen?	\N	2026-03-31 14:08:40.101444	system
+3789	2242	English	\N	\N	Your english keywords are very short. Would you still like to complete the final upload?	\N	2026-03-31 14:08:40.102589	system
+3790	2243	German	\N	\N	Ihre Seitenanzahl ist gering, möchten Sie den Endupload trotzdem durchführen?	\N	2026-03-31 14:08:40.105158	system
+3791	2243	English	\N	\N	Your number of pages is low. Would you still like to complete the final upload?	\N	2026-03-31 14:08:40.106232	system
+3792	2244	German	\N	\N	Neuen Abgabetermin speichern	\N	2026-03-31 14:08:40.108824	system
+3793	2244	English	\N	\N	Save new Deadline	\N	2026-03-31 14:08:40.109955	system
+3794	2245	German	\N	\N	Ich räume der Fachhochschule Technikum Wien das Recht ein, sämtliche übermittelte Dokumente elektronisch zu speichern und zum Zwecke der Langzeitarchivierung unter Beachtung der Bewahrung des Inhalts in andere Formate zu konvertieren.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tIm Falle einer Masterarbeit räume ich der FH Technikum Wien das Recht ein, sie in Datennetzen öffentlich zugänglich zu machen und stimme den bezughabenden <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284975">Nutzungsbedingungen des Publikationsservers ePub</a> zu.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tIch bestätige hiermit, dass ich die eidesstattliche Erklärung mittels digitaler Signatur unterzeichnet habe.\n\t\t\t\t\t<a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=214779">Link zum Leitfaden Digitale Signatur</a>.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tHiermit willige ich ein, dass meine Bachelor- oder Masterarbeit im Zuge der Beurteilung auch mittels (Online)-Tools auf die unerlaubte Verwendung von KI geprüft wird.\n\t\t\t\t\t	\N	2026-03-31 14:08:40.112675	system
+3795	2245	English	\N	\N	I grant UAS Technikum Wien the right to store all submitted documents electronically and to convert them into other formats for the purpose of long-term archiving, taking into account the preservation of the content.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tIn the case of a Master's thesis, I grant UAS Technikum Wien the right to make it publicly accessible in data networks and agree to the related <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284976">Terms of use for the publication server ePub</a>.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tI hereby confirm that I have signed the affidavit using a digital signature. <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=215614">Link to the Digital Signature Guide</a>.\n\t\t\t\t\t<br><br>\n\t\t\t\t\tI hereby agree that my bachelor's or master's thesis will also be checked for unauthorized use of AI using (online) tools as part of the assessment.\n\t\t\t\t\t	\N	2026-03-31 14:08:40.113865	system
+3796	2246	German	\N	\N	Datei erfolgreich hochgeladen!	\N	2026-03-31 14:08:40.116472	system
+3797	2246	English	\N	\N	File upload successful	\N	2026-03-31 14:08:40.117591	system
+3798	2247	German	\N	\N	Fehler beim hochladen der Datei!	\N	2026-03-31 14:08:40.12019	system
+3799	2247	English	\N	\N	File upload error!	\N	2026-03-31 14:08:40.121359	system
+3800	2248	German	\N	\N	Vorheriger Termin	\N	2026-03-31 14:08:40.123964	system
+3801	2248	English	\N	\N	Previous Deadline	\N	2026-03-31 14:08:40.125162	system
+3802	2249	German	\N	\N	Nächster Termin	\N	2026-03-31 14:08:40.127714	system
+3803	2249	English	\N	\N	Next Deadline	\N	2026-03-31 14:08:40.128807	system
+3804	2250	German	\N	\N	ErstbetreuerIn	\N	2026-03-31 14:08:40.131367	system
+3805	2250	English	\N	\N	First Reviewer	\N	2026-03-31 14:08:40.132461	system
+3806	2251	German	\N	\N	ZweitbetreuerIn	\N	2026-03-31 14:08:40.134978	system
+3807	2251	English	\N	\N	Second Reviewer	\N	2026-03-31 14:08:40.136084	system
+3808	2252	German	\N	\N	Projektarbeit Abgabetermine Zeitstrahl	\N	2026-03-31 14:08:40.138623	system
+3809	2252	English	\N	\N	Project Deadline Timeline	\N	2026-03-31 14:08:40.139714	system
+3810	2253	German	\N	\N	Email an {0} Studierende schicken	\N	2026-03-31 14:08:40.14232	system
+3811	2253	English	\N	\N	Send Email to {0} students	\N	2026-03-31 14:08:40.143432	system
+3812	2254	German	\N	\N	Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}	\N	2026-03-31 14:08:40.146008	system
+3813	2254	English	\N	\N	Supervision of Bachelor's thesis or Master's thesis for degree program {0}	\N	2026-03-31 14:08:40.147128	system
+3814	2255	German	\N	\N	Email an {0} Betreuende schicken	\N	2026-03-31 14:08:40.149739	system
+3815	2255	English	\N	\N	Send Email to {0} reviewers	\N	2026-03-31 14:08:40.150816	system
+3816	2256	German	\N	\N	Betreuungen Bachelorarbeit bzw. Master Thesis bei Studiengang {0}	\N	2026-03-31 14:08:40.153387	system
+3817	2256	English	\N	\N	Supervision of Bachelor's thesis or Master's thesis for degree program {0}	\N	2026-03-31 14:08:40.154471	system
+3818	2257	German	\N	\N	Die Projektarbeit hat keine zugeordneten Abgabetermine!	\N	2026-03-31 14:08:40.157146	system
+3819	2257	English	\N	\N	Project has no assigned Deadlines!	\N	2026-03-31 14:08:40.158237	system
+3820	2258	German	\N	\N	Studierende Details anzeigen	\N	2026-03-31 14:08:40.160754	system
+3821	2258	English	\N	\N	show student details	\N	2026-03-31 14:08:40.161861	system
+3822	2259	German	\N	\N	Keine Note eingetragen	\N	2026-03-31 14:08:40.164398	system
+3823	2259	English	\N	\N	Not graded yet	\N	2026-03-31 14:08:40.165515	system
+3824	2260	German	\N	\N	Fehler beim Versenden des Mails an den Erstbegutachter!	\N	2026-03-31 14:08:40.168081	system
+3825	2260	English	\N	\N	Error sending E-Mail to first Reviewer!	\N	2026-03-31 14:08:40.169182	system
+3826	2261	German	\N	\N	Fehler beim Versenden des Mails an den Zweitbegutachter!	\N	2026-03-31 14:08:40.171766	system
+3827	2261	English	\N	\N	Error sending E-Mail to second Reviewer!	\N	2026-03-31 14:08:40.172863	system
+3828	2262	German	\N	\N	Keine Projektarbeit gefunden.	\N	2026-03-31 14:08:40.175349	system
+3829	2262	English	\N	\N	No projekt work has been found.	\N	2026-03-31 14:08:40.176445	system
+3830	2263	German	\N	\N	Keine Projektabgabe gefunden.	\N	2026-03-31 14:08:40.180182	system
+3831	2263	English	\N	\N	No projekt deadline has been found.	\N	2026-03-31 14:08:40.181285	system
+3832	2264	German	\N	\N	User nicht gefunden.	\N	2026-03-31 14:08:40.183732	system
+3833	2264	English	\N	\N	User not found.	\N	2026-03-31 14:08:40.184827	system
+3834	2265	German	\N	\N	Updates: Abgabetermine Bachelor-/Masterarbeiten	\N	2026-03-31 14:08:40.187329	system
+3835	2265	English	\N	\N	Updates: Deadlines Bachelor's-/Master's Thesis	\N	2026-03-31 14:08:40.18838	system
+3836	2266	German	\N	\N	Quality Gate 1	\N	2026-03-31 14:08:40.190856	system
+3837	2266	English	\N	\N	Quality Gate 1	\N	2026-03-31 14:08:40.191982	system
+3838	2267	German	\N	\N	Quality Gate 2	\N	2026-03-31 14:08:40.194545	system
+3839	2267	English	\N	\N	Quality Gate 2	\N	2026-03-31 14:08:40.195673	system
+3840	2268	German	\N	\N	Zwischenabgabe	\N	2026-03-31 14:08:40.19824	system
+3841	2268	English	\N	\N	Interim submission	\N	2026-03-31 14:08:40.199355	system
+3842	2269	German	\N	\N	Benotung	\N	2026-03-31 14:08:40.201867	system
+3843	2269	English	\N	\N	Grading	\N	2026-03-31 14:08:40.202959	system
+3844	2270	German	\N	\N	Entwurf	\N	2026-03-31 14:08:40.205596	system
+3845	2270	English	\N	\N	Design	\N	2026-03-31 14:08:40.206721	system
+3846	2271	German	\N	\N	Endupload	\N	2026-03-31 14:08:40.2093	system
+3847	2271	English	\N	\N	Final submission	\N	2026-03-31 14:08:40.21039	system
+3848	2272	German	\N	\N	Endabgabe im Sekretariat	\N	2026-03-31 14:08:40.21299	system
+3849	2272	English	\N	\N	Final submission in the administrative office	\N	2026-03-31 14:08:40.214113	system
+3850	2273	German	\N	\N	Bachelorarbeit	\N	2026-03-31 14:08:40.216687	system
+3851	2273	English	\N	\N	Bachelor's thesis	\N	2026-03-31 14:08:40.217784	system
+3852	2274	German	\N	\N	Projektarbeit	\N	2026-03-31 14:08:40.220345	system
+3853	2274	English	\N	\N	Project work	\N	2026-03-31 14:08:40.22146	system
+3854	2275	German	\N	\N	Praktikum	\N	2026-03-31 14:08:40.22403	system
+3855	2275	English	\N	\N	Internship	\N	2026-03-31 14:08:40.225156	system
+3856	2276	German	\N	\N	Praxissemester	\N	2026-03-31 14:08:40.227681	system
+3857	2276	English	\N	\N	Practical semester	\N	2026-03-31 14:08:40.22878	system
+3858	2277	German	\N	\N	Masterarbeit	\N	2026-03-31 14:08:40.231338	system
+3859	2277	English	\N	\N	Master's thesis	\N	2026-03-31 14:08:40.232453	system
+3860	2278	German	\N	\N	BegutachterIn Bachelorarbeit	\N	2026-03-31 14:08:40.235045	system
+3861	2278	English	\N	\N	Reviewer bachelor's thesis	\N	2026-03-31 14:08:40.236199	system
+3862	2279	German	\N	\N	Erstbetreuer einer Diplomarbeit	\N	2026-03-31 14:08:40.238728	system
+3863	2279	English	\N	\N	First reviewer of a master's thesis	\N	2026-03-31 14:08:40.239837	system
+3864	2280	German	\N	\N	1. BegutachterIn Masterarbeit	\N	2026-03-31 14:08:40.242472	system
+3865	2280	English	\N	\N	1. reviewer master's thesis	\N	2026-03-31 14:08:40.24352	system
+3866	2281	German	\N	\N	2. BegutachterIn Masterarbeit	\N	2026-03-31 14:08:40.246119	system
+3867	2281	English	\N	\N	2. reviewer master's thesis	\N	2026-03-31 14:08:40.247234	system
+3868	2282	German	\N	\N	Zweitbetreuer einer Diplomarbeit	\N	2026-03-31 14:08:40.249754	system
+3869	2282	English	\N	\N	Second reviewer of a master's thesis	\N	2026-03-31 14:08:40.250893	system
+3870	2283	German	\N	\N	BetreuerIn Berufspraktikum oder Projektarbeit	\N	2026-03-31 14:08:40.253522	system
+3871	2283	English	\N	\N	Reviewer of an internship or project work	\N	2026-03-31 14:08:40.254622	system
+3872	2284	German	\N	\N	Vorsitz Prüfungssenat	\N	2026-03-31 14:08:40.25706	system
+3873	2284	English	\N	\N	Chair of examination board	\N	2026-03-31 14:08:40.258125	system
+3874	2285	German	\N	\N	Mitglied Prüfungssenat	\N	2026-03-31 14:08:40.260628	system
+3875	2285	English	\N	\N	Member of examination board	\N	2026-03-31 14:08:40.26168	system
+3876	2286	German	\N	\N	Status QG1	\N	2026-03-31 14:08:40.264118	system
+3877	2286	English	\N	\N	Status QG1	\N	2026-03-31 14:08:40.265188	system
+3878	2287	German	\N	\N	Status QG2	\N	2026-03-31 14:08:40.267622	system
+3879	2287	English	\N	\N	Status QG2	\N	2026-03-31 14:08:40.26876	system
+3880	2288	German	\N	\N	Kein Termin vorhanden	\N	2026-03-31 14:08:40.2712	system
+3881	2288	English	\N	\N	No Deadline found	\N	2026-03-31 14:08:40.272277	system
+3882	2289	German	\N	\N	Für weitere Information zu den Abgabemodalitäten Ihres Studienganges lesen Sie bitte die Unterlagen in Moodle: 	\N	2026-03-31 14:08:40.274747	system
+3883	2289	English	\N	\N	For further information on the submission procedures for your degree program, please refer to the documents in Moodle: 	\N	2026-03-31 14:08:40.275868	system
+3884	2290	German	\N	\N	Positiv Benotet!	\N	2026-03-31 14:08:40.278442	system
+3885	2290	English	\N	\N	Graded positive!	\N	2026-03-31 14:08:40.279561	system
+3886	2291	German	\N	\N	Negativ Benotet!	\N	2026-03-31 14:08:40.282128	system
+3887	2291	English	\N	\N	Graded negative!	\N	2026-03-31 14:08:40.283284	system
+3888	2292	German	\N	\N	Noch nicht beurteilt	\N	2026-03-31 14:08:40.286001	system
+3889	2292	English	\N	\N	Not graded yet	\N	2026-03-31 14:08:40.287112	system
+3890	2293	German	\N	\N	Noch nicht abgegeben	\N	2026-03-31 14:08:40.289643	system
+3891	2293	English	\N	\N	Not submitted yet	\N	2026-03-31 14:08:40.290728	system
+3892	2294	German	\N	\N	Noch nicht stattgefunden	\N	2026-03-31 14:08:40.2934	system
+3893	2294	English	\N	\N	Not happened yet	\N	2026-03-31 14:08:40.294501	system
+3894	2295	German	\N	\N	Nicht rechtzeitig abgegeben!	\N	2026-03-31 14:08:40.29708	system
+3895	2295	English	\N	\N	Deadline exceeded!	\N	2026-03-31 14:08:40.298205	system
+3896	2296	German	\N	\N	Abgabetool: Fehlende Signatur bei Endupload	\N	2026-03-31 14:08:40.300782	system
+3897	2296	English	\N	\N	Submission tool: Missing signature at final upload	\N	2026-03-31 14:08:40.301906	system
+3898	2297	German	\N	\N	ErstbetreuerIn Titel Pre	\N	2026-03-31 14:08:40.304465	system
+3899	2297	English	\N	\N	First Reviewer Title Pre	\N	2026-03-31 14:08:40.305566	system
+3900	2298	German	\N	\N	ErstbetreuerIn Vorname	\N	2026-03-31 14:08:40.308135	system
+3901	2298	English	\N	\N	First Reviewer First Name	\N	2026-03-31 14:08:40.309241	system
+3902	2299	German	\N	\N	ErstbetreuerIn Nachname	\N	2026-03-31 14:08:40.311806	system
+3903	2299	English	\N	\N	First Reviewer Last Name	\N	2026-03-31 14:08:40.312921	system
+3904	2300	German	\N	\N	ErstbetreuerIn Titel Post	\N	2026-03-31 14:08:40.315575	system
+3905	2300	English	\N	\N	First Reviewer Title Post	\N	2026-03-31 14:08:40.316721	system
+3906	2301	German	\N	\N	ZweitbetreuerIn Titel Pre	\N	2026-03-31 14:08:40.319343	system
+3907	2301	English	\N	\N	Second Reviewer Title Pre	\N	2026-03-31 14:08:40.320474	system
+3908	2302	German	\N	\N	ZweitbetreuerIn Vorname	\N	2026-03-31 14:08:40.323078	system
+3909	2302	English	\N	\N	Second Reviewer First Name	\N	2026-03-31 14:08:40.324222	system
+3910	2303	German	\N	\N	ZweitbetreuerIn Nachname	\N	2026-03-31 14:08:40.326839	system
+3911	2303	English	\N	\N	Second Reviewer Last Name	\N	2026-03-31 14:08:40.327962	system
+3912	2304	German	\N	\N	ZweitbetreuerIn Titel Post	\N	2026-03-31 14:08:40.330584	system
+3913	2304	English	\N	\N	Second Reviewer Title Post	\N	2026-03-31 14:08:40.331715	system
+3914	2305	German	\N	\N	Keine Zuordnung oder Berechtigung für die Projektarbeit gefunden!	\N	2026-03-31 14:08:40.334324	system
+3915	2305	English	\N	\N	No assignment or authorization found for the project!	\N	2026-03-31 14:08:40.335512	system
+3916	2306	German	\N	\N	Institut	\N	2026-03-31 14:08:40.338154	system
+3917	2306	English	\N	\N	Institute	\N	2026-03-31 14:08:40.339313	system
+3918	2307	German	\N	\N	Lehrtyp	\N	2026-03-31 14:08:40.341945	system
+3919	2307	English	\N	\N	Teaching type	\N	2026-03-31 14:08:40.343094	system
+3920	2308	German	\N	\N	Studiengangsassistenz	\N	2026-03-31 14:08:40.345721	system
+3921	2308	English	\N	\N	degree program assistant	\N	2026-03-31 14:08:40.346833	system
+3922	2309	German	\N	\N	Geschäftsführende Leitung	\N	2026-03-31 14:08:40.349477	system
+3923	2309	English	\N	\N	Managing director	\N	2026-03-31 14:08:40.350599	system
+3924	2310	German	\N	\N	Stellvertretende Leitung	\N	2026-03-31 14:08:40.353204	system
+3925	2310	English	\N	\N	Representative director	\N	2026-03-31 14:08:40.354368	system
+3926	2311	German	\N	\N	Geschäftsführende / Stellvertretende Leitung	\N	2026-03-31 14:08:40.357012	system
+3927	2311	English	\N	\N	Managing / Representative director	\N	2026-03-31 14:08:40.358151	system
+3928	2312	German	\N	\N	Jahrgangsvertretung	\N	2026-03-31 14:08:40.360804	system
+3929	2312	English	\N	\N	Study year representative	\N	2026-03-31 14:08:40.361927	system
+3930	2313	German	\N	\N	Studienvertretung	\N	2026-03-31 14:08:40.364541	system
+3931	2313	English	\N	\N	Study representative	\N	2026-03-31 14:08:40.365691	system
+3932	2314	German	\N	\N	Hochschulvertretung	\N	2026-03-31 14:08:40.36832	system
+3933	2314	English	\N	\N	University representative	\N	2026-03-31 14:08:40.369468	system
+3934	2315	German	\N	\N	Allgemein	\N	2026-03-31 14:08:40.372284	system
+3935	2315	English	\N	\N	General	\N	2026-03-31 14:08:40.373481	system
+3936	2316	German	\N	\N	Weitere Zeile hinzufügen	\N	2026-03-31 14:08:40.376176	system
+3937	2316	English	\N	\N	Add another line	\N	2026-03-31 14:08:40.377373	system
+3938	2317	German	\N	\N	Benutzerdefiniert	\N	2026-03-31 14:08:40.37999	system
+3939	2317	English	\N	\N	Custom	\N	2026-03-31 14:08:40.381179	system
+3940	2318	German	\N	\N	Hier befinden sich die vordefinierten Widgets	\N	2026-03-31 14:08:40.383904	system
+3941	2318	English	\N	\N	Here are the predefined widgets	\N	2026-03-31 14:08:40.38501	system
+3942	2319	German	\N	\N	Hier befinden sich die Widgets Ihrer persönlichen Anpassungen	\N	2026-03-31 14:08:40.387586	system
+3943	2319	English	\N	\N	Here are the widgets of your personal cutomizations	\N	2026-03-31 14:08:40.388683	system
+3944	2320	German	\N	\N	Hier befinden sich die Widgets der {0} Funktion	\N	2026-03-31 14:08:40.391421	system
+3945	2320	English	\N	\N	Here are the widgets of the {0} function	\N	2026-03-31 14:08:40.392515	system
+3946	2321	German	\N	\N	Abschlussprüfung	\N	2026-03-31 14:08:40.394987	system
+3947	2321	English	\N	\N	Final exam	\N	2026-03-31 14:08:40.396274	system
+3948	2322	German	\N	\N	Abschlussbeurteilung	\N	2026-03-31 14:08:40.399111	system
+3949	2322	English	\N	\N	Final assessment	\N	2026-03-31 14:08:40.400237	system
+3950	2323	German	\N	\N	PrüferIn 1	\N	2026-03-31 14:08:40.402745	system
+3951	2323	English	\N	\N	examiner 1	\N	2026-03-31 14:08:40.403851	system
+3952	2324	German	\N	\N	PrüferIn 2	\N	2026-03-31 14:08:40.406379	system
+3953	2324	English	\N	\N	examiner 2	\N	2026-03-31 14:08:40.407483	system
+3954	2325	German	\N	\N	PrüferIn 3	\N	2026-03-31 14:08:40.410113	system
+3955	2325	English	\N	\N	examiner 3	\N	2026-03-31 14:08:40.411228	system
+3956	2326	German	\N	\N	Uhrzeit	\N	2026-03-31 14:08:40.413834	system
+3957	2326	English	\N	\N	time	\N	2026-03-31 14:08:40.414936	system
+3958	2327	German	\N	\N	Freigabe	\N	2026-03-31 14:08:40.417723	system
+3959	2327	English	\N	\N	Approval	\N	2026-03-31 14:08:40.41882	system
+3960	2328	German	\N	\N	Sponsion	\N	2026-03-31 14:08:40.421429	system
+3961	2328	English	\N	\N	Graduation	\N	2026-03-31 14:08:40.42255	system
+3962	2329	German	\N	\N	Abschlussprüfung ID	\N	2026-03-31 14:08:40.42524	system
+3963	2329	English	\N	\N	Final Examination ID	\N	2026-03-31 14:08:40.426349	system
+3964	2330	German	\N	\N	Vorsitz	\N	2026-03-31 14:08:40.430197	system
+3965	2330	English	\N	\N	Chair	\N	2026-03-31 14:08:40.43134	system
+3966	2331	German	\N	\N	Zur Beurteilung	\N	2026-03-31 14:08:40.433907	system
+3967	2331	English	\N	\N	To the assessment	\N	2026-03-31 14:08:40.435002	system
+3968	2332	German	\N	\N	Akademischer Grad	\N	2026-03-31 14:08:40.437558	system
+3969	2332	English	\N	\N	Academic degree	\N	2026-03-31 14:08:40.438673	system
+3970	2333	German	\N	\N	Keine Abschlussprüfungen für Student_uid(s) {id} gefunden	\N	2026-03-31 14:08:40.441243	system
+3971	2333	English	\N	\N	No final exams found for Student_uid(s) {id}	\N	2026-03-31 14:08:40.442347	system
+3972	2334	German	\N	\N	Kontaktieren	\N	2026-03-31 14:08:40.444942	system
+3973	2334	English	\N	\N	Get in Contact	\N	2026-03-31 14:08:40.446212	system
+3974	2335	German	\N	\N	E-Mail senden (intern)	\N	2026-03-31 14:08:40.44883	system
+3975	2335	English	\N	\N	Send email (internal)	\N	2026-03-31 14:08:40.449938	system
+3976	2336	German	\N	\N	E-Mail senden (privat)	\N	2026-03-31 14:08:40.452492	system
+3977	2336	English	\N	\N	Send email (private)	\N	2026-03-31 14:08:40.453595	system
+3978	2337	German	\N	\N	STRG-Taste für BCC	\N	2026-03-31 14:08:40.456148	system
+3979	2337	English	\N	\N	CTRL-Key for BCC	\N	2026-03-31 14:08:40.457482	system
+3980	2338	German	\N	\N	Ein weiteres Fenster wird geöffnet. Fortfahren?	\N	2026-03-31 14:08:40.460065	system
+3981	2338	English	\N	\N	A new window will open. Continue?	\N	2026-03-31 14:08:40.461194	system
+3982	2339	German	\N	\N	Aufgrund der hohen Empfängerzahl muss die Nachricht auf mehrere E-Mails aufgeteilt werden.	\N	2026-03-31 14:08:40.463724	system
+3983	2339	English	\N	\N	Due to the large number of recipients, the message needs to be split across multiple emails.	\N	2026-03-31 14:08:40.46489	system
+3984	2340	German	\N	\N	Note komm. Prüfung	\N	2026-03-31 14:08:40.467737	system
+3985	2340	English	\N	\N	Grade committee exam	\N	2026-03-31 14:08:40.468932	system
+3986	2341	German	\N	\N	Abschlussprüfung anlegen	\N	2026-03-31 14:08:40.471577	system
+3987	2341	English	\N	\N	New Final Exam	\N	2026-03-31 14:08:40.472744	system
+3988	2342	German	\N	\N	Abschlussprüfung bearbeiten	\N	2026-03-31 14:08:40.475396	system
+3989	2342	English	\N	\N	Edit Final Exam	\N	2026-03-31 14:08:40.476592	system
+3990	2343	German	\N	\N	Nicht zum Editieren der Gruppe berechtigt	\N	2026-03-31 14:08:40.479225	system
+3991	2343	English	\N	\N	No authorization for editing the group	\N	2026-03-31 14:08:40.480395	system
+3992	2353	German	\N	\N	Gruppen	\N	2026-03-31 14:08:40.499301	system
+3993	2353	English	\N	\N	Groups	\N	2026-03-31 14:08:40.500462	system
+3994	2354	German	\N	\N	Gruppe	\N	2026-03-31 14:08:40.503115	system
+3995	2354	English	\N	\N	Group	\N	2026-03-31 14:08:40.504299	system
+3996	2355	German	\N	\N	Spezialgruppen	\N	2026-03-31 14:08:40.506911	system
+3997	2355	English	\N	\N	Special groups	\N	2026-03-31 14:08:40.508104	system
+3998	2356	German	\N	\N	Gruppe hinzufügen	\N	2026-03-31 14:08:40.51073	system
+3999	2356	English	\N	\N	Add group	\N	2026-03-31 14:08:40.511878	system
+4000	2357	German	\N	\N	{n} Gruppen hinzufügen	\N	2026-03-31 14:08:40.514518	system
+4001	2357	English	\N	\N	Added {n} groups	\N	2026-03-31 14:08:40.515671	system
+4002	2358	German	\N	\N	automatisch generiert	\N	2026-03-31 14:08:40.518287	system
+4003	2358	English	\N	\N	automatically generated	\N	2026-03-31 14:08:40.519431	system
+4004	2359	German	\N	\N	Automatisch generierte Gruppenzuordnungen können nicht gelöscht werden.	\N	2026-03-31 14:08:40.522069	system
+4005	2359	English	\N	\N	Automatically generated group assignments cannot be deleted.	\N	2026-03-31 14:08:40.523245	system
+4006	2360	German	\N	\N	Der Student {uid} ist bereits im {studiensemester_kurzbz} dieser Gruppe zugeteilt. Entfernen Sie vorher diese Zuteilung.	\N	2026-03-31 14:08:40.52592	system
+4007	2360	English	\N	\N	Student {uid} is already assigned to this group in {studiensemester_kurzbz}. Remove this assignment beforehand.	\N	2026-03-31 14:08:40.527093	system
+4008	2361	German	\N	\N	Wahlname	\N	2026-03-31 14:08:40.529797	system
+4009	2361	English	\N	\N	elective name	\N	2026-03-31 14:08:40.530907	system
+4010	2362	German	\N	\N	Familienstand	\N	2026-03-31 14:08:40.53384	system
+4011	2362	English	\N	\N	marital status	\N	2026-03-31 14:08:40.535034	system
+4012	2363	German	\N	\N	Foto	\N	2026-03-31 14:08:40.537883	system
+4013	2363	English	\N	\N	photo	\N	2026-03-31 14:08:40.539031	system
+4014	2364	German	\N	\N	Homepage	\N	2026-03-31 14:08:40.541824	system
+4015	2364	English	\N	\N	homepage	\N	2026-03-31 14:08:40.542993	system
+4016	2365	German	\N	\N	Verband	\N	2026-03-31 14:08:40.545893	system
+4017	2365	English	\N	\N	verband	\N	2026-03-31 14:08:40.547061	system
+4018	2366	German	\N	\N	Aktiv	\N	2026-03-31 14:08:40.549912	system
+4019	2366	English	\N	\N	active	\N	2026-03-31 14:08:40.55105	system
+4020	2367	German	\N	\N	Keine Person gefunden	\N	2026-03-31 14:08:40.553794	system
+4021	2367	English	\N	\N	No Person found	\N	2026-03-31 14:08:40.554992	system
+4022	2368	German	\N	\N	Kein/e Student/in gefunden	\N	2026-03-31 14:08:40.557753	system
+4023	2368	English	\N	\N	No Student found	\N	2026-03-31 14:08:40.558884	system
+4024	2369	German	\N	\N	geschieden	\N	2026-03-31 14:08:40.561519	system
+4025	2369	English	\N	\N	divorced	\N	2026-03-31 14:08:40.562856	system
+4026	2370	German	\N	\N	ledig	\N	2026-03-31 14:08:40.565509	system
+4027	2370	English	\N	\N	single	\N	2026-03-31 14:08:40.566652	system
+4028	2371	German	\N	\N	verheiratet	\N	2026-03-31 14:08:40.569375	system
+4029	2371	English	\N	\N	married	\N	2026-03-31 14:08:40.570489	system
+4030	2372	German	\N	\N	verwitwet	\N	2026-03-31 14:08:40.573102	system
+4031	2372	English	\N	\N	widowed	\N	2026-03-31 14:08:40.574285	system
+4032	2373	German	\N	\N	Firma ID	\N	2026-03-31 14:08:40.576939	system
+4033	2373	English	\N	\N	Company ID	\N	2026-03-31 14:08:40.578394	system
+4034	2374	German	\N	\N	Adresse ID	\N	2026-03-31 14:08:40.581058	system
+4035	2374	English	\N	\N	Address ID	\N	2026-03-31 14:08:40.582193	system
+4036	2375	German	\N	\N	Kontakt ID	\N	2026-03-31 14:08:40.584779	system
+4037	2375	English	\N	\N	Contact ID	\N	2026-03-31 14:08:40.585931	system
+4038	2376	German	\N	\N	Standort ID	\N	2026-03-31 14:08:40.588657	system
+4039	2376	English	\N	\N	Location ID	\N	2026-03-31 14:08:40.589739	system
+4040	2377	German	\N	\N	Bankverbindung ID	\N	2026-03-31 14:08:40.592333	system
+4041	2377	English	\N	\N	Bankdetails ID	\N	2026-03-31 14:08:40.593509	system
+4042	2378	German	\N	\N	Studienplan ID	\N	2026-03-31 14:08:40.596107	system
+4043	2378	English	\N	\N	Studyplan ID	\N	2026-03-31 14:08:40.59723	system
+4044	2379	German	\N	\N	PrestudentIn ID	\N	2026-03-31 14:08:40.599966	system
+4045	2379	English	\N	\N	Prestudent ID	\N	2026-03-31 14:08:40.601119	system
+4046	2380	German	\N	\N	Notiz ID	\N	2026-03-31 14:08:40.603796	system
+4047	2380	English	\N	\N	Notes ID	\N	2026-03-31 14:08:40.604943	system
+4048	2381	German	\N	\N	Notizzuordnung ID	\N	2026-03-31 14:08:40.607591	system
+4049	2381	English	\N	\N	Noteassignment ID	\N	2026-03-31 14:08:40.608725	system
+4050	2382	German	\N	\N	Extension ID	\N	2026-03-31 14:08:40.611586	system
+4051	2382	English	\N	\N	Extension ID	\N	2026-03-31 14:08:40.612751	system
+4052	2383	German	\N	\N	Type ID	\N	2026-03-31 14:08:40.615355	system
+4053	2383	English	\N	\N	Type ID	\N	2026-03-31 14:08:40.6165	system
+4054	2384	German	\N	\N	Betriebsmittel ID	\N	2026-03-31 14:08:40.61913	system
+4055	2384	English	\N	\N	Ressource ID	\N	2026-03-31 14:08:40.620296	system
+4056	2385	German	\N	\N	Betriebsmittelperson ID	\N	2026-03-31 14:08:40.622926	system
+4057	2385	English	\N	\N	Ressourceperson ID	\N	2026-03-31 14:08:40.62404	system
+4058	2386	German	\N	\N	Daten werden geladen	\N	2026-03-31 14:08:40.62667	system
+4059	2386	English	\N	\N	Loading	\N	2026-03-31 14:08:40.627889	system
+4060	2387	German	\N	\N	Nur Eingabe von ganzen Zahlen erlaubt	\N	2026-03-31 14:08:40.630514	system
+4061	2387	English	\N	\N	Error: Only input of whole numbers allowed	\N	2026-03-31 14:08:40.631644	system
+4062	2388	German	\N	\N	Ausbildungssemester nicht zulässig: größer als Höchstsemester	\N	2026-03-31 14:08:40.634239	system
+4063	2388	English	\N	\N	Error: Semester not allowed: higher than max Semester	\N	2026-03-31 14:08:40.635371	system
+4064	2389	German	\N	\N	Mobilität	\N	2026-03-31 14:08:40.638007	system
+4065	2389	English	\N	\N	Mobility	\N	2026-03-31 14:08:40.639152	system
+4066	2390	German	\N	\N	Mobilitätsprogramm	\N	2026-03-31 14:08:40.641797	system
+4067	2390	English	\N	\N	Mobility program	\N	2026-03-31 14:08:40.642914	system
+4068	2391	German	\N	\N	Gastnation	\N	2026-03-31 14:08:40.645544	system
+4069	2391	English	\N	\N	Host nation	\N	2026-03-31 14:08:40.646691	system
+4070	2392	German	\N	\N	Herkunftsland	\N	2026-03-31 14:08:40.649138	system
+4071	2392	English	\N	\N	Country of origin	\N	2026-03-31 14:08:40.650232	system
+4072	2393	German	\N	\N	Universität	\N	2026-03-31 14:08:40.652778	system
+4073	2393	English	\N	\N	University	\N	2026-03-31 14:08:40.653953	system
+4074	2394	German	\N	\N	Erworbene ECTS	\N	2026-03-31 14:08:40.656481	system
+4075	2394	English	\N	\N	ECTS acquired	\N	2026-03-31 14:08:40.657591	system
+4076	2395	German	\N	\N	Angerechnete ECTS	\N	2026-03-31 14:08:40.660111	system
+4077	2395	English	\N	\N	ECTS credited	\N	2026-03-31 14:08:40.661241	system
+4078	2396	German	\N	\N	Zweck	\N	2026-03-31 14:08:40.663825	system
+4079	2396	English	\N	\N	Purpose	\N	2026-03-31 14:08:40.664957	system
+4080	2397	German	\N	\N	Aufenthalt Förderung	\N	2026-03-31 14:08:40.667597	system
+4081	2397	English	\N	\N	Residency funding	\N	2026-03-31 14:08:40.668724	system
+4082	2398	German	\N	\N	Mobilitätszweck anlegen	\N	2026-03-31 14:08:40.671356	system
+4083	2398	English	\N	\N	Create motivation for mobility	\N	2026-03-31 14:08:40.672473	system
+4084	2399	German	\N	\N	Förderung für Aufenthalt anlegen	\N	2026-03-31 14:08:40.675095	system
+4085	2399	English	\N	\N	Create funding for mobility	\N	2026-03-31 14:08:40.676234	system
+4086	2400	German	\N	\N	Programmkurzbezeichnung	\N	2026-03-31 14:08:40.67903	system
+4087	2400	English	\N	\N	Program short description	\N	2026-03-31 14:08:40.680143	system
+4088	2401	German	\N	\N	Bisio ID	\N	2026-03-31 14:08:40.682805	system
+4089	2401	English	\N	\N	Bisio ID	\N	2026-03-31 14:08:40.683948	system
+4090	2402	German	\N	\N	Dokument archivieren	\N	2026-03-31 14:08:40.686623	system
+4091	2402	English	\N	\N	Archive document	\N	2026-03-31 14:08:40.68801	system
+4092	2403	German	\N	\N	Archiv	\N	2026-03-31 14:08:40.690615	system
+4093	2403	English	\N	\N	Archive	\N	2026-03-31 14:08:40.691719	system
+4094	2404	German	\N	\N	Titel	\N	2026-03-31 14:08:40.694338	system
+4095	2404	English	\N	\N	Title	\N	2026-03-31 14:08:40.695463	system
+4096	2405	German	\N	\N	Bezeichnung	\N	2026-03-31 14:08:40.698076	system
+4097	2405	English	\N	\N	Description	\N	2026-03-31 14:08:40.699201	system
+4098	2406	German	\N	\N	Erstelldatum	\N	2026-03-31 14:08:40.701821	system
+4099	2406	English	\N	\N	Creation date	\N	2026-03-31 14:08:40.702944	system
+4100	2407	German	\N	\N	AkzeptiertAmUm	\N	2026-03-31 14:08:40.705568	system
+4101	2407	English	\N	\N	AcceptionOnAt	\N	2026-03-31 14:08:40.706675	system
+4102	2408	German	\N	\N	Gedruckt	\N	2026-03-31 14:08:40.709242	system
+4103	2408	English	\N	\N	Printed	\N	2026-03-31 14:08:40.71043	system
+4104	2409	German	\N	\N	Signiert	\N	2026-03-31 14:08:40.713042	system
+4105	2409	English	\N	\N	Signed	\N	2026-03-31 14:08:40.714176	system
+4106	2410	German	\N	\N	Akte aktualisieren	\N	2026-03-31 14:08:40.716735	system
+4107	2410	English	\N	\N	Edit document	\N	2026-03-31 14:08:40.717809	system
+4108	2411	German	\N	\N	Akte	\N	2026-03-31 14:08:40.720356	system
+4109	2411	English	\N	\N	Document	\N	2026-03-31 14:08:40.721571	system
+4110	2412	German	\N	\N	Neue Datei	\N	2026-03-31 14:08:40.724192	system
+4111	2412	English	\N	\N	New file	\N	2026-03-31 14:08:40.725331	system
+4112	2413	German	\N	\N	Akte ID	\N	2026-03-31 14:08:40.727949	system
+4113	2413	English	\N	\N	Document ID	\N	2026-03-31 14:08:40.729076	system
+4114	2414	German	\N	\N	Signiert	\N	2026-03-31 14:08:40.731765	system
+4115	2414	English	\N	\N	Signed	\N	2026-03-31 14:08:40.732898	system
+4116	2415	German	\N	\N	Kurzbezeichnung	\N	2026-03-31 14:08:40.735535	system
+4117	2415	English	\N	\N	Short Name	\N	2026-03-31 14:08:40.736696	system
+4118	2416	German	\N	\N	Eintrag bereits vorhanden	\N	2026-03-31 14:08:40.739294	system
+4119	2416	English	\N	\N	Entry already existing	\N	2026-03-31 14:08:40.740396	system
+4120	2417	German	\N	\N	Dieser Datensatz wird von der Mobility Extension verwendet und muss zuerst dort gelöscht werden.	\N	2026-03-31 14:08:40.742961	system
+4121	2417	English	\N	\N	This record is used by the Mobility Extension and must first be deleted there.	\N	2026-03-31 14:08:40.744099	system
+4122	2418	German	\N	\N	Mobilität anlegen	\N	2026-03-31 14:08:40.746681	system
+4123	2418	English	\N	\N	Create mobility	\N	2026-03-31 14:08:40.747736	system
+4124	2419	German	\N	\N	Mobilität bearbeiten	\N	2026-03-31 14:08:40.750338	system
+4125	2419	English	\N	\N	Edit mobility	\N	2026-03-31 14:08:40.75153	system
+4126	2420	German	\N	\N	LV-Weiterentwicklung Übersichten	\N	2026-03-31 14:08:40.754098	system
+4127	2420	English	\N	\N	Course Development Overviews	\N	2026-03-31 14:08:40.755218	system
+4128	2421	German	\N	\N	Kompetenzfeld	\N	2026-03-31 14:08:40.757777	system
+4129	2421	English	\N	\N	competence field	\N	2026-03-31 14:08:40.758883	system
+4130	2422	German	\N	\N	alle ausklappen	\N	2026-03-31 14:08:40.761495	system
+4131	2422	English	\N	\N	expand all	\N	2026-03-31 14:08:40.762585	system
+4132	2423	German	\N	\N	alle einklappen	\N	2026-03-31 14:08:40.765148	system
+4133	2423	English	\N	\N	collapse all	\N	2026-03-31 14:08:40.766298	system
+4134	2424	German	\N	\N	Quellkurs	\N	2026-03-31 14:08:40.768945	system
+4135	2424	English	\N	\N	Source Course	\N	2026-03-31 14:08:40.770153	system
+4136	2431	German	\N	\N	Max. Punkte	\N	2026-03-31 14:08:40.783541	system
+4137	2431	English	\N	\N	Max. points	\N	2026-03-31 14:08:40.784707	system
+4138	2432	German	\N	\N	Erfüllungsgrad (Prozent) zum Ausfüllen	\N	2026-03-31 14:08:40.787247	system
+4139	2432	English	\N	\N	Degree of Fulfilment (Percentage) to Fill In	\N	2026-03-31 14:08:40.788375	system
+4140	2433	German	\N	\N	Details (angemessener und korrekter Einsatz von\nWerkzeugen und Technologien in jedem Schritt)	\N	2026-03-31 14:08:40.791022	system
+4141	2433	English	\N	\N	Details\n(appropriate and correct use of tools and technologies at each step)	\N	2026-03-31 14:08:40.792171	system
+4142	2434	German	\N	\N	Problemstellung und Zieldefinition	\N	2026-03-31 14:08:40.794765	system
+4143	2434	English	\N	\N	Problem Definition and Objective Setting	\N	2026-03-31 14:08:40.795945	system
+4144	2435	German	\N	\N	Die Problemstellung ist klar und präzise definiert und in einen wissenschaftlichen Kontext eingebettet.\nDie Zielsetzung sowie eventuelle Messgrößen sind eindeutig formuliert.	\N	2026-03-31 14:08:40.798587	system
+4145	2435	English	\N	\N	The problem is clearly and precisely defined and embedded in a scientific context.\nThe objective, along with any potential metrics, is clearly formulated.	\N	2026-03-31 14:08:40.799699	system
+4146	2436	German	\N	\N	Methodik und Lösungsansatz	\N	2026-03-31 14:08:40.802236	system
+4147	2436	English	\N	\N	Methodology and Approach	\N	2026-03-31 14:08:40.803457	system
+4148	2437	German	\N	\N	Das methodische Vorgehen ist logisch und nachvollziehbar strukturiert, passend zur Zielsetzung,\nund die angewandten Methoden sind korrekt und fundiert umgesetzt.\nDie Methodik ist fachspezifisch angemessen, literaturbasiert begründet und wissenschaftlich vertretbar.	\N	2026-03-31 14:08:40.806103	system
+4149	2437	English	\N	\N	The methodological approach is logically and comprehensively structured,\naligned with the objective, and the applied methods are implemented correctly and soundly.\nThe methodology is appropriate to the field, justified based on literature, and scientifically valid.	\N	2026-03-31 14:08:40.807225	system
+4150	2438	German	\N	\N	Ergebnisse und Diskussion	\N	2026-03-31 14:08:40.809846	system
+4151	2438	English	\N	\N	Results and Discussion	\N	2026-03-31 14:08:40.810959	system
+4152	2439	German	\N	\N	Die Qualität der Lösung ist bezogen auf die Zielsetzung ausreichend.\n\t\t\t\tDie Ergebnisse werden fundiert analysiert und in Bezug auf die Zielsetzung schlüssig interpretiert.\n\t\t\t\tDie Diskussion reflektiert die Relevanz und Grenzen der Ergebnisse kritisch und ist logisch strukturiert.	\N	2026-03-31 14:08:40.813614	system
+4153	2439	English	\N	\N	The quality of the solution sufficiently meets the objective.\nThe results are thoroughly analyzed and coherently interpreted with respect to the objective.\nThe discussion critically reflects on the relevance and limitations of the results and is logically structured.	\N	2026-03-31 14:08:40.814727	system
+4154	2440	German	\N	\N	Struktur und Aufbau	\N	2026-03-31 14:08:40.817329	system
+4155	2440	English	\N	\N	Structure and Organization	\N	2026-03-31 14:08:40.818458	system
+4156	2441	German	\N	\N	Die Arbeit folgt einer logischen, klaren Gliederung und einem konsistenten roten Faden.\nVerzeichnisse, Grafiken, Tabellen und der Text sind gemäß den aktuell gültigen wissenschaftlichen Richtlinien der FH Technikum Wien aufbereitet.	\N	2026-03-31 14:08:40.821049	system
+4157	2441	English	\N	\N	The work follows a logical and clear outline with a consistent narrative thread.\nDirectories, graphics, tables, and text are prepared in accordance with the currently valid scientific guidelines of FH Technikum Wien.	\N	2026-03-31 14:08:40.822223	system
+4158	2442	German	\N	\N	Stil und Ausdruck	\N	2026-03-31 14:08:40.82477	system
+4159	2442	English	\N	\N	Style and Expression	\N	2026-03-31 14:08:40.825884	system
+4160	2443	German	\N	\N	Der sprachliche Ausdruck ist präzise,\nfachlich korrekt und erfüllt die Anforderungen an gendergerechte Sprache gemäß den geltenden Richtlinien der FH Technikum Wien.	\N	2026-03-31 14:08:40.828444	system
+4161	2443	English	\N	\N	The linguistic expression is precise, professionally accurate,\nand meets the requirements of gender-sensitive language as per the applicable guidelines of FH Technikum Wien.	\N	2026-03-31 14:08:40.82959	system
+4162	2444	German	\N	\N	Zitierregeln und Quellenangaben	\N	2026-03-31 14:08:40.832144	system
+4163	2444	English	\N	\N	Citation Rules and References	\N	2026-03-31 14:08:40.833314	system
+4164	2445	German	\N	\N	Umfang, Qualität und Aktualität der verarbeiteten Quellen sind angemessen\nund repräsentieren den aktuellen Stand der Forschung zum Thema. Die Zitierregeln (IEEE oder Harvard) werden konsequent und korrekt angewendet.	\N	2026-03-31 14:08:40.835956	system
+4165	2445	English	\N	\N	The scope, quality, and timeliness of the sources processed are appropriate\nand represent the current state of research on the topic. The prescribed citation rules are consistently and correctly applied.	\N	2026-03-31 14:08:40.837092	system
+4166	2446	German	\N	\N	Jedes Kriterium muss mit mind. 50% bewertet werden, sonst ist die gesamte Arbeit negativ.	\N	2026-03-31 14:08:40.839652	system
+4167	2446	English	\N	\N	Each criterion must receive a minimum score of 50%; otherwise, the entire work is rated negatively.	\N	2026-03-31 14:08:40.840757	system
+4168	2447	German	\N	\N	Gesamtkommentar	\N	2026-03-31 14:08:40.843596	system
+4169	2447	English	\N	\N	Overall comment	\N	2026-03-31 14:08:40.844739	system
+4170	2448	German	\N	\N	Gesamtkommentar verpflichtend auszufüllen	\N	2026-03-31 14:08:40.847309	system
+4171	2448	English	\N	\N	An overall comment is mandatory and must be completed	\N	2026-03-31 14:08:40.848441	system
+4172	2449	German	\N	\N	Eingabefeld	\N	2026-03-31 14:08:40.851011	system
+4173	2449	English	\N	\N	Input field	\N	2026-03-31 14:08:40.852107	system
+4174	2450	German	\N	\N	Universitätslogo	\N	2026-03-31 14:08:40.854732	system
+4175	2450	English	\N	\N	University logo	\N	2026-03-31 14:08:40.855857	system
+4176	2451	German	\N	\N	Text-Eingabefeld zur Bewertung	\N	2026-03-31 14:08:40.858444	system
+4177	2451	English	\N	\N	Text inut field for assessment	\N	2026-03-31 14:08:40.859613	system
+4178	2452	German	\N	\N	Neuen Vertrag erstellen	\N	2026-03-31 14:08:40.862213	system
+4179	2452	English	\N	\N	Add new contract	\N	2026-03-31 14:08:40.863364	system
+4180	2453	German	\N	\N	Vertrag bearbeiten	\N	2026-03-31 14:08:40.866139	system
+4181	2453	English	\N	\N	Edit contract	\N	2026-03-31 14:08:40.867308	system
+4182	2454	German	\N	\N	Vertrag löschen	\N	2026-03-31 14:08:40.869872	system
+4183	2454	English	\N	\N	Delete contract	\N	2026-03-31 14:08:40.871016	system
+4184	2455	German	\N	\N	Vertragstatus hinzufügen	\N	2026-03-31 14:08:40.873574	system
+4185	2455	English	\N	\N	Add contract status	\N	2026-03-31 14:08:40.874685	system
+4186	2456	German	\N	\N	Vertragstatus bearbeiten	\N	2026-03-31 14:08:40.87732	system
+4187	2456	English	\N	\N	Edit contract status	\N	2026-03-31 14:08:40.878722	system
+4188	2457	German	\N	\N	Vertragstatus löschen	\N	2026-03-31 14:08:40.881457	system
+4189	2457	English	\N	\N	Delete contract status	\N	2026-03-31 14:08:40.882632	system
+4190	2458	German	\N	\N	Lehrauftrag löschen	\N	2026-03-31 14:08:40.885315	system
+4191	2458	English	\N	\N	Delete teaching assignment	\N	2026-03-31 14:08:40.886507	system
+4192	2459	German	\N	\N	Vertragsdatum	\N	2026-03-31 14:08:40.889145	system
+4193	2459	English	\N	\N	contract date	\N	2026-03-31 14:08:40.89031	system
+4194	2460	German	\N	\N	Vertrags-Urfassung	\N	2026-03-31 14:08:40.893006	system
+4195	2460	English	\N	\N	original version of the contract	\N	2026-03-31 14:08:40.894157	system
+4196	2461	German	\N	\N	Nur offene Verträge anzeigen	\N	2026-03-31 14:08:40.896837	system
+4197	2461	English	\N	\N	Show only open contracts	\N	2026-03-31 14:08:40.897982	system
+4198	2462	German	\N	\N	Fehler beim Hinzufügen bzw. Aktualisieren von Lehraufträgen	\N	2026-03-31 14:08:40.900639	system
+4199	2462	English	\N	\N	Error while adding or updating teaching assignments	\N	2026-03-31 14:08:40.901778	system
+4200	2463	German	\N	\N	Fehler beim Hinzufügen bzw. Aktualisieren des Vertragsstatus	\N	2026-03-31 14:08:40.904381	system
+4201	2463	English	\N	\N	Error while adding or updating the contract status	\N	2026-03-31 14:08:40.905559	system
+4202	2464	German	\N	\N	Status bereits vorhanden	\N	2026-03-31 14:08:40.908235	system
+4203	2464	English	\N	\N	Status already existing	\N	2026-03-31 14:08:40.909475	system
+4204	2465	German	\N	\N	Vertrag erstellen	\N	2026-03-31 14:08:40.912182	system
+4205	2465	English	\N	\N	Create contract	\N	2026-03-31 14:08:40.913339	system
+4206	2466	German	\N	\N	Vertragdetails	\N	2026-03-31 14:08:40.916082	system
+4207	2466	English	\N	\N	Contract Details	\N	2026-03-31 14:08:40.917334	system
+4208	2467	German	\N	\N	Vertragsstatus	\N	2026-03-31 14:08:40.920012	system
+4209	2467	English	\N	\N	Contract Status	\N	2026-03-31 14:08:40.921176	system
+4210	2468	German	\N	\N	Das Eingabefeld {field} hat kein gültiges Datumsformat	\N	2026-03-31 14:08:40.923846	system
+4211	2468	English	\N	\N	The input field {field} does not have a valid date format	\N	2026-03-31 14:08:40.924983	system
+4212	2469	German	\N	\N	Die folgenden Lehraufträge sind noch keinem Vertrag zugeordnet. Markieren Sie die Lehraufträge um diese dem Vertrag zuzuordnen:	\N	2026-03-31 14:08:40.927679	system
+4213	2469	English	\N	\N	The following teaching assignments have not yet been assigned to a contract. Mark the teaching assignments to assign them to the contract:	\N	2026-03-31 14:08:40.928825	system
+4214	2470	German	\N	\N	Folgende Lehraufträge werden hinzugefügt:	\N	2026-03-31 14:08:40.931564	system
+4215	2470	English	\N	\N	The following teaching assignments will be added:	\N	2026-03-31 14:08:40.932727	system
+4216	2471	German	\N	\N	Vertragsverwaltung	\N	2026-03-31 14:08:40.935377	system
+4217	2471	English	\N	\N	Contract management	\N	2026-03-31 14:08:40.936687	system
+4218	2472	German	\N	\N	Nur aktive Mitarbeiter:innen anzeigen	\N	2026-03-31 14:08:40.939362	system
+4219	2472	English	\N	\N	Show only active employees	\N	2026-03-31 14:08:40.940476	system
+4220	2473	German	\N	\N	Honorarvertrag drucken	\N	2026-03-31 14:08:40.94301	system
+4221	2473	English	\N	\N	Print fee agreement	\N	2026-03-31 14:08:40.944141	system
+4222	2474	German	\N	\N	Bitte mindestens 2 Verträge auswählen!	\N	2026-03-31 14:08:40.946656	system
+4223	2474	English	\N	\N	Please select at least 2 contracts!	\N	2026-03-31 14:08:40.947736	system
+4224	2475	German	\N	\N	Alle Verträge müssen genehmigt sein.	\N	2026-03-31 14:08:40.950292	system
+4225	2475	English	\N	\N	All contracts must be approved.	\N	2026-03-31 14:08:40.951372	system
+4226	2476	German	\N	\N	Vertragsarten	\N	2026-03-31 14:08:40.953936	system
+4227	2476	English	\N	\N	Types of Contracts	\N	2026-03-31 14:08:40.95507	system
+4228	2477	German	\N	\N	IDs Dienstverhältnis	\N	2026-03-31 14:08:40.957662	system
+4229	2477	English	\N	\N	IDs employment relationship	\N	2026-03-31 14:08:40.958734	system
+4230	2478	German	\N	\N	Vertragstyp	\N	2026-03-31 14:08:40.961288	system
+4231	2478	English	\N	\N	Contract Type	\N	2026-03-31 14:08:40.962385	system
+4232	2479	German	\N	\N	Vertragsdatum	\N	2026-03-31 14:08:40.964937	system
+4233	2479	English	\N	\N	Contract Date	\N	2026-03-31 14:08:40.966037	system
+4234	2480	German	\N	\N	Vertragsdatum Iso	\N	2026-03-31 14:08:40.96862	system
+4235	2480	English	\N	\N	Contract Date Iso	\N	2026-03-31 14:08:40.969741	system
+4236	2481	German	\N	\N	Vertrag ID	\N	2026-03-31 14:08:40.972289	system
+4237	2481	English	\N	\N	Contract ID	\N	2026-03-31 14:08:40.973404	system
+4238	2482	German	\N	\N	Vertragsstunden	\N	2026-03-31 14:08:40.97594	system
+4239	2482	English	\N	\N	Contract hours	\N	2026-03-31 14:08:40.977044	system
+4240	2483	German	\N	\N	vertragsstunden Studiensemester	\N	2026-03-31 14:08:40.97958	system
+4241	2483	English	\N	\N	Contract hours study semester	\N	2026-03-31 14:08:40.980686	system
+4242	2484	German	\N	\N	abgerechnet	\N	2026-03-31 14:08:40.983206	system
+4243	2484	English	\N	\N	billed	\N	2026-03-31 14:08:40.984317	system
+4244	2485	German	\N	\N	Gewicht	\N	2026-03-31 14:08:40.986833	system
+4245	2485	English	\N	\N	Weight	\N	2026-03-31 14:08:40.987934	system
+4246	2486	German	\N	\N	Neuer LV-Teil	\N	2026-03-31 14:08:40.990491	system
+4247	2486	English	\N	\N	New teaching unit	\N	2026-03-31 14:08:40.991578	system
+4248	2487	German	\N	\N	Bezeichnung Englisch	\N	2026-03-31 14:08:40.994098	system
+4249	2487	English	\N	\N	title english	\N	2026-03-31 14:08:40.995199	system
+4250	2488	German	\N	\N	Info an LV-Planung	\N	2026-03-31 14:08:40.99773	system
+4251	2488	English	\N	\N	Info to LV Planning	\N	2026-03-31 14:08:40.99882	system
+4252	2489	German	\N	\N	UNR	\N	2026-03-31 14:08:41.001383	system
+4253	2489	English	\N	\N	UNR	\N	2026-03-31 14:08:41.002488	system
+4254	2490	German	\N	\N	Lehrauftragsstunden (LAS)	\N	2026-03-31 14:08:41.005102	system
+4255	2490	English	\N	\N	Teaching hours (LAS)	\N	2026-03-31 14:08:41.006191	system
+4256	2491	German	\N	\N	Lehre	\N	2026-03-31 14:08:41.008755	system
+4257	2491	English	\N	\N	Teaching	\N	2026-03-31 14:08:41.009907	system
+4258	2492	German	\N	\N	Raumtyp	\N	2026-03-31 14:08:41.012468	system
+4259	2492	English	\N	\N	Room	\N	2026-03-31 14:08:41.013574	system
+4260	2493	German	\N	\N	Lehrende	\N	2026-03-31 14:08:41.016148	system
+4261	2493	English	\N	\N	lecturers	\N	2026-03-31 14:08:41.017235	system
+4262	2494	German	\N	\N	Raumtyp Alternativ	\N	2026-03-31 14:08:41.019764	system
+4263	2494	English	\N	\N	Room Alternative	\N	2026-03-31 14:08:41.020865	system
+4264	2495	German	\N	\N	Start KW	\N	2026-03-31 14:08:41.023372	system
+4265	2495	English	\N	\N	Start CW	\N	2026-03-31 14:08:41.02449	system
+4266	2496	German	\N	\N	Stunden Block	\N	2026-03-31 14:08:41.027021	system
+4267	2496	English	\N	\N	Hours Block	\N	2026-03-31 14:08:41.028143	system
+4268	2497	German	\N	\N	Wochenrhythmus	\N	2026-03-31 14:08:41.030707	system
+4269	2497	English	\N	\N	Weekly rhythm	\N	2026-03-31 14:08:41.031837	system
+4270	2498	German	\N	\N	Lehrfunktion	\N	2026-03-31 14:08:41.034367	system
+4271	2498	English	\N	\N	Teaching function	\N	2026-03-31 14:08:41.035472	system
+4272	2499	German	\N	\N	Info an DepL/KFL	\N	2026-03-31 14:08:41.038067	system
+4273	2499	English	\N	\N	Info to DepL/KFL	\N	2026-03-31 14:08:41.039128	system
+4274	2500	German	\N	\N	Aufklappen	\N	2026-03-31 14:08:41.041676	system
+4275	2500	English	\N	\N	Expand	\N	2026-03-31 14:08:41.042783	system
+4276	2501	German	\N	\N	Zuklappen	\N	2026-03-31 14:08:41.045247	system
+4277	2501	English	\N	\N	Collapse	\N	2026-03-31 14:08:41.046343	system
+4278	2502	German	\N	\N	LV-Plan Stunden	\N	2026-03-31 14:08:41.048697	system
+4279	2502	English	\N	\N	Course-Plan Hours	\N	2026-03-31 14:08:41.049756	system
+4280	2503	German	\N	\N	Planstunden	\N	2026-03-31 14:08:41.052139	system
+4281	2503	English	\N	\N	Plan Hours	\N	2026-03-31 14:08:41.053198	system
+4282	2504	German	\N	\N	Default	\N	2026-03-31 14:08:41.05567	system
+4283	2504	English	\N	\N	Default	\N	2026-03-31 14:08:41.056752	system
+4284	2505	German	\N	\N	Stundensatz	\N	2026-03-31 14:08:41.059235	system
+4285	2505	English	\N	\N	Hourly Rate	\N	2026-03-31 14:08:41.060362	system
+4286	2506	German	\N	\N	BIS-Melden	\N	2026-03-31 14:08:41.062864	system
+4287	2506	English	\N	\N	Report BIS	\N	2026-03-31 14:08:41.063959	system
+4288	2507	German	\N	\N	Gesamtkosten	\N	2026-03-31 14:08:41.06652	system
+4289	2507	English	\N	\N	Total costs	\N	2026-03-31 14:08:41.067589	system
+4290	2508	German	\N	\N	Daten	\N	2026-03-31 14:08:41.070093	system
+4291	2508	English	\N	\N	Data	\N	2026-03-31 14:08:41.07119	system
+4292	2509	German	\N	\N	Lehreinheit ID	\N	2026-03-31 14:08:41.0738	system
+4293	2509	English	\N	\N	Teaching Unit ID	\N	2026-03-31 14:08:41.074889	system
+4294	2510	German	\N	\N	Verplant	\N	2026-03-31 14:08:41.077485	system
+4295	2510	English	\N	\N	Planned	\N	2026-03-31 14:08:41.078561	system
+4296	2511	German	\N	\N	LektorIn hinzufügen	\N	2026-03-31 14:08:41.081192	system
+4297	2511	English	\N	\N	Add lector	\N	2026-03-31 14:08:41.08233	system
+4298	2512	German	\N	\N	Gruppen	\N	2026-03-31 14:08:41.084962	system
+4299	2512	English	\N	\N	Groups	\N	2026-03-31 14:08:41.086095	system
+4300	2513	German	\N	\N	Gruppe hinzufügen	\N	2026-03-31 14:08:41.08871	system
+4301	2513	English	\N	\N	Add group	\N	2026-03-31 14:08:41.089815	system
+4302	2514	German	\N	\N	Person zuordnen	\N	2026-03-31 14:08:41.092388	system
+4303	2514	English	\N	\N	Assign person	\N	2026-03-31 14:08:41.093502	system
+4304	2515	German	\N	\N	Direkt zugeordnete Personen	\N	2026-03-31 14:08:41.096086	system
+4305	2515	English	\N	\N	Directly assigned persons	\N	2026-03-31 14:08:41.097244	system
+4306	2516	German	\N	\N	<b>Geändert</b>	\N	2026-03-31 14:08:41.099829	system
+4307	2516	English	\N	\N	<b>Changed</b>	\N	2026-03-31 14:08:41.100997	system
+4308	2517	German	\N	\N	Vertragsdetails lt. Urfassung	\N	2026-03-31 14:08:41.103631	system
+4309	2517	English	\N	\N	Contract details as per original version	\N	2026-03-31 14:08:41.104744	system
+4310	2518	German	\N	\N	Vertragsdetails	\N	2026-03-31 14:08:41.107341	system
+4311	2518	English	\N	\N	Contract details	\N	2026-03-31 14:08:41.108488	system
+4312	2519	German	\N	\N	Semesterstunden	\N	2026-03-31 14:08:41.11112	system
+4313	2519	English	\N	\N	Semester hours	\N	2026-03-31 14:08:41.11229	system
+4314	2520	German	\N	\N	Vertragsstatus	\N	2026-03-31 14:08:41.114898	system
+4315	2520	English	\N	\N	Contract status	\N	2026-03-31 14:08:41.11604	system
+4316	2521	German	\N	\N	Stunden aus LV-Plan entfernen	\N	2026-03-31 14:08:41.118669	system
+4317	2521	English	\N	\N	Remove hours from course plan	\N	2026-03-31 14:08:41.119784	system
+4318	2522	German	\N	\N	Lehrfach	\N	2026-03-31 14:08:41.122389	system
+4319	2522	English	\N	\N	Course	\N	2026-03-31 14:08:41.123511	system
+4320	2523	German	\N	\N	Nachrichten	\N	2026-03-31 14:08:41.126173	system
+4321	2523	English	\N	\N	Messages	\N	2026-03-31 14:08:41.127328	system
+4322	2524	German	\N	\N	ungelesen	\N	2026-03-31 14:08:41.129966	system
+4323	2524	English	\N	\N	unread	\N	2026-03-31 14:08:41.131104	system
+4324	2525	German	\N	\N	gelesen	\N	2026-03-31 14:08:41.133733	system
+4325	2525	English	\N	\N	read	\N	2026-03-31 14:08:41.134877	system
+4326	2526	German	\N	\N	archiviert	\N	2026-03-31 14:08:41.137526	system
+4327	2526	English	\N	\N	archived	\N	2026-03-31 14:08:41.138669	system
+4328	2527	German	\N	\N	gelöscht	\N	2026-03-31 14:08:41.14133	system
+4329	2527	English	\N	\N	deleted	\N	2026-03-31 14:08:41.142492	system
+4330	2528	German	\N	\N	Nachrichtentext	\N	2026-03-31 14:08:41.145133	system
+4331	2528	English	\N	\N	Body	\N	2026-03-31 14:08:41.146274	system
+4332	2529	German	\N	\N	Message ID	\N	2026-03-31 14:08:41.148885	system
+4333	2529	English	\N	\N	Message ID	\N	2026-03-31 14:08:41.150019	system
+4334	2530	German	\N	\N	SenderIn	\N	2026-03-31 14:08:41.15268	system
+4335	2530	English	\N	\N	Sender	\N	2026-03-31 14:08:41.153793	system
+4336	2531	German	\N	\N	EmpfängerIn	\N	2026-03-31 14:08:41.156452	system
+4337	2531	English	\N	\N	Recipient	\N	2026-03-31 14:08:41.157548	system
+4338	2532	German	\N	\N	SenderIn ID	\N	2026-03-31 14:08:41.160136	system
+4339	2532	English	\N	\N	Sender ID	\N	2026-03-31 14:08:41.161287	system
+4340	2533	German	\N	\N	EmpfängerIn ID	\N	2026-03-31 14:08:41.163938	system
+4341	2533	English	\N	\N	Recipient ID	\N	2026-03-31 14:08:41.165072	system
+4342	2534	German	\N	\N	Nachricht erfolgreich versandt	\N	2026-03-31 14:08:41.16773	system
+4343	2534	English	\N	\N	Message sent successfully	\N	2026-03-31 14:08:41.168879	system
+4344	2535	German	\N	\N	Aktualisieren	\N	2026-03-31 14:08:41.171532	system
+4345	2535	English	\N	\N	Update	\N	2026-03-31 14:08:41.172677	system
+4346	2536	German	\N	\N	Neue Nachricht	\N	2026-03-31 14:08:41.175277	system
+4347	2536	English	\N	\N	New Message	\N	2026-03-31 14:08:41.176456	system
+4348	2537	German	\N	\N	Meine Felder	\N	2026-03-31 14:08:41.179047	system
+4349	2537	English	\N	\N	My fields	\N	2026-03-31 14:08:41.180202	system
+4350	2538	German	\N	\N	Zurücksetzen	\N	2026-03-31 14:08:41.182931	system
+4351	2538	English	\N	\N	Reset	\N	2026-03-31 14:08:41.184061	system
+4352	2539	German	\N	\N	Dokumente	\N	2026-03-31 14:08:41.186737	system
+4353	2539	English	\N	\N	Documents	\N	2026-03-31 14:08:41.187878	system
+4354	2540	German	\N	\N	Dokument hochladen	\N	2026-03-31 14:08:41.190558	system
+4355	2540	English	\N	\N	Upload document	\N	2026-03-31 14:08:41.191724	system
+4356	2541	German	\N	\N	Dokument löschen	\N	2026-03-31 14:08:41.194352	system
+4357	2541	English	\N	\N	Delete document	\N	2026-03-31 14:08:41.195544	system
+4358	2542	German	\N	\N	Dokument bearbeiten	\N	2026-03-31 14:08:41.198126	system
+4359	2542	English	\N	\N	Edit document	\N	2026-03-31 14:08:41.199276	system
+4360	2543	German	\N	\N	Titel	\N	2026-03-31 14:08:41.201866	system
+4361	2543	English	\N	\N	title	\N	2026-03-31 14:08:41.202985	system
+4362	2544	German	\N	\N	Dokumententyp	\N	2026-03-31 14:08:41.205616	system
+4363	2544	English	\N	\N	Document type	\N	2026-03-31 14:08:41.206753	system
+4364	2545	German	\N	\N	Nachreichung am	\N	2026-03-31 14:08:41.209347	system
+4365	2545	English	\N	\N	Submission on	\N	2026-03-31 14:08:41.210452	system
+4366	2546	German	\N	\N	Dokumentendetails	\N	2026-03-31 14:08:41.213013	system
+4367	2546	English	\N	\N	Document Details	\N	2026-03-31 14:08:41.214148	system
+4368	2547	German	\N	\N	Anmerkung der Person	\N	2026-03-31 14:08:41.216799	system
+4369	2547	English	\N	\N	Notes of the Person	\N	2026-03-31 14:08:41.217941	system
+4370	2548	German	\N	\N	Dokument erfolgreich hochgeladen	\N	2026-03-31 14:08:41.220552	system
+4371	2548	English	\N	\N	Dokumentupload successful	\N	2026-03-31 14:08:41.221688	system
+4372	2549	German	\N	\N	Akzeptieren	\N	2026-03-31 14:08:41.224296	system
+4373	2549	English	\N	\N	Accept	\N	2026-03-31 14:08:41.225463	system
+4374	2550	German	\N	\N	Entakzeptieren	\N	2026-03-31 14:08:41.228114	system
+4375	2550	English	\N	\N	Unaccept	\N	2026-03-31 14:08:41.229287	system
+4376	2551	German	\N	\N	Akzeptiert	\N	2026-03-31 14:08:41.231933	system
+4377	2551	English	\N	\N	Accepted	\N	2026-03-31 14:08:41.233188	system
+4378	2552	German	\N	\N	Nicht Akzeptiert	\N	2026-03-31 14:08:41.235826	system
+4379	2552	English	\N	\N	Not Accepted	\N	2026-03-31 14:08:41.236981	system
+4380	2553	German	\N	\N	Dieses Dokument darf hier nicht gelöscht werden	\N	2026-03-31 14:08:41.239634	system
+4381	2553	English	\N	\N	This document may not be deleted here	\N	2026-03-31 14:08:41.240797	system
+4382	2554	German	\N	\N	Es können nur Eintraege geändert werden zu denen Dokumente hochgeladen wurden	\N	2026-03-31 14:08:41.243461	system
+4383	2554	English	\N	\N	Only entries to which documents have been uploaded can be changed	\N	2026-03-31 14:08:41.244714	system
+4384	2555	German	\N	\N	Dokument herunterladen	\N	2026-03-31 14:08:41.247567	system
+4385	2555	English	\N	\N	Download Document	\N	2026-03-31 14:08:41.248777	system
+4386	2556	German	\N	\N	Akzeptieren erfolgreich	\N	2026-03-31 14:08:41.25162	system
+4387	2556	English	\N	\N	Successfully set to accepted	\N	2026-03-31 14:08:41.252753	system
+4388	2557	German	\N	\N	Entakzeptieren erfolgreich	\N	2026-03-31 14:08:41.255555	system
+4389	2557	English	\N	\N	Successfully set to unaccepted	\N	2026-03-31 14:08:41.256785	system
+4390	2558	German	\N	\N	Entakzeptieren von {count} Dokument(en) erfolgreich	\N	2026-03-31 14:08:41.259566	system
+4391	2558	English	\N	\N	{count} Document(s) successfully set to unaccepted	\N	2026-03-31 14:08:41.260779	system
+4392	2559	German	\N	\N	Akzeptieren von {count} Dokument(en) erfolgreich	\N	2026-03-31 14:08:41.263469	system
+4393	2559	English	\N	\N	{count} Document(s) successfully set to accepted	\N	2026-03-31 14:08:41.264662	system
+4394	2560	German	\N	\N	Fehler beim Entakzeptieren von Dokument {dokument_kurzbz}	\N	2026-03-31 14:08:41.267316	system
+4395	2560	English	\N	\N	Error unaccepting document {dokument_kurzbz}	\N	2026-03-31 14:08:41.268459	system
+4396	2561	German	\N	\N	Fehler beim Akzeptieren von Dokument {dokument_kurzbz}	\N	2026-03-31 14:08:41.271194	system
+4397	2561	English	\N	\N	Error Accepting document {dokument_kurzbz}	\N	2026-03-31 14:08:41.272426	system
+4398	2562	German	\N	\N	{value} fehlt	\N	2026-03-31 14:08:41.275076	system
+4399	2562	English	\N	\N	{value} missing	\N	2026-03-31 14:08:41.276237	system
+4400	2563	German	\N	\N	{value} darf nur Ziffern enthalten.	\N	2026-03-31 14:08:41.278884	system
+4401	2563	English	\N	\N	{value} must contain only numbers.	\N	2026-03-31 14:08:41.280049	system
+4402	2564	German	\N	\N	Nachgereicht	\N	2026-03-31 14:08:41.282746	system
+4403	2564	English	\N	\N	Submitted later	\N	2026-03-31 14:08:41.283925	system
+4404	2565	German	\N	\N	Vorhanden	\N	2026-03-31 14:08:41.286678	system
+4405	2565	English	\N	\N	Available	\N	2026-03-31 14:08:41.287819	system
+4406	2566	German	\N	\N	Akte ID	\N	2026-03-31 14:08:41.290473	system
+4407	2566	English	\N	\N	File ID	\N	2026-03-31 14:08:41.291576	system
+4408	2567	German	\N	\N	Nachgereicht am	\N	2026-03-31 14:08:41.294214	system
+4409	2567	English	\N	\N	Submitted on	\N	2026-03-31 14:08:41.295389	system
+4410	2568	German	\N	\N	Akzeptiertdatum	\N	2026-03-31 14:08:41.298059	system
+4411	2568	English	\N	\N	Accepted on	\N	2026-03-31 14:08:41.299202	system
+4412	2569	German	\N	\N	Akzeptiert von	\N	2026-03-31 14:08:41.301819	system
+4413	2569	English	\N	\N	Accepted by	\N	2026-03-31 14:08:41.302955	system
+4414	2570	German	\N	\N	DMS ID	\N	2026-03-31 14:08:41.305613	system
+4415	2570	English	\N	\N	DMS ID	\N	2026-03-31 14:08:41.30678	system
+4416	2571	German	\N	\N	Bitte eine Datei anhängen	\N	2026-03-31 14:08:41.309495	system
+4417	2571	English	\N	\N	Please attach a file	\N	2026-03-31 14:08:41.31069	system
+4418	2572	German	\N	\N	Nur Dateitypen JPEG, PNG oder PDF sind erlaubt	\N	2026-03-31 14:08:41.313329	system
+4419	2572	English	\N	\N	Only JPEG, PNG, or PDF files are allowed.	\N	2026-03-31 14:08:41.314497	system
+4420	2573	German	\N	\N	Akzeptieren / Entakzeptieren von mehr als einem Dokument pro Dokumenttyp nicht zulässig	\N	2026-03-31 14:08:41.317193	system
+4421	2573	English	\N	\N	Accepting / unaccepting more than one document per document type is not permitted	\N	2026-03-31 14:08:41.31838	system
+4422	2574	German	\N	\N	Begründung	\N	2026-03-31 14:08:41.321149	system
+4423	2574	English	\N	\N	Reason	\N	2026-03-31 14:08:41.322343	system
+4424	2575	German	\N	\N	genehmigt von	\N	2026-03-31 14:08:41.325184	system
+4425	2575	English	\N	\N	approved by	\N	2026-03-31 14:08:41.326389	system
+4426	2576	German	\N	\N	Anrechnung bearbeiten	\N	2026-03-31 14:08:41.329074	system
+4427	2576	English	\N	\N	Edit Exemption	\N	2026-03-31 14:08:41.330258	system
+4428	2577	German	\N	\N	 Notiz(en)	\N	2026-03-31 14:08:41.332993	system
+4429	2577	English	\N	\N	 note(s)	\N	2026-03-31 14:08:41.334171	system
+4430	2578	German	\N	\N	Anrechnung ID	\N	2026-03-31 14:08:41.336885	system
+4431	2578	English	\N	\N	Exemption ID	\N	2026-03-31 14:08:41.338029	system
+4432	2579	German	\N	\N	LV kompatibel ID	\N	2026-03-31 14:08:41.340749	system
+4433	2579	English	\N	\N	Course compatible ID	\N	2026-03-31 14:08:41.341925	system
+4434	2580	German	\N	\N	LV kompatibel	\N	2026-03-31 14:08:41.344668	system
+4435	2580	English	\N	\N	Course compatible	\N	2026-03-31 14:08:41.345866	system
+4436	2581	German	\N	\N	GS	\N	2026-03-31 14:08:41.348508	system
+4437	2581	English	\N	\N	Joint Studies	\N	2026-03-31 14:08:41.349682	system
+4438	2582	German	\N	\N	Gemeinsames Studium	\N	2026-03-31 14:08:41.352311	system
+4439	2582	English	\N	\N	Joint Study	\N	2026-03-31 14:08:41.353506	system
+4440	2583	German	\N	\N	Gemeinsame Studien	\N	2026-03-31 14:08:41.356163	system
+4441	2583	English	\N	\N	Joint Studies	\N	2026-03-31 14:08:41.357354	system
+4442	2584	German	\N	\N	Studienprogramm	\N	2026-03-31 14:08:41.360022	system
+4443	2584	English	\N	\N	Study Program	\N	2026-03-31 14:08:41.361209	system
+4444	2585	German	\N	\N	Gemeinsames Studium anlegen	\N	2026-03-31 14:08:41.363967	system
+4445	2585	English	\N	\N	Add Joint Study	\N	2026-03-31 14:08:41.365181	system
+4446	2586	German	\N	\N	Gemeinsames Studium bearbeiten	\N	2026-03-31 14:08:41.367948	system
+4447	2586	English	\N	\N	Edit Joint Study	\N	2026-03-31 14:08:41.369146	system
+4448	2587	German	\N	\N	Mobilität ID	\N	2026-03-31 14:08:41.371924	system
+4449	2587	English	\N	\N	Mobility Id	\N	2026-03-31 14:08:41.373094	system
+4450	2588	German	\N	\N	LV Termine	\N	2026-03-31 14:08:41.37586	system
+4451	2588	English	\N	\N	Course Dates	\N	2026-03-31 14:08:41.377075	system
+4452	2589	German	\N	\N	Exportieren	\N	2026-03-31 14:08:41.37985	system
+4453	2589	English	\N	\N	Export	\N	2026-03-31 14:08:41.381059	system
+4454	2590	German	\N	\N	Stundenplan DEV	\N	2026-03-31 14:08:41.383903	system
+4455	2590	English	\N	\N	Timetable DEV	\N	2026-03-31 14:08:41.385113	system
+4456	2591	German	\N	\N	Lehreinheit ID	\N	2026-03-31 14:08:41.3879	system
+4457	2591	English	\N	\N	Teaching Unit ID	\N	2026-03-31 14:08:41.389105	system
+4458	2592	German	\N	\N	von	\N	2026-03-31 14:08:41.391872	system
+4459	2592	English	\N	\N	from	\N	2026-03-31 14:08:41.393092	system
+4460	2593	German	\N	\N	bis	\N	2026-03-31 14:08:41.395879	system
+4461	2593	English	\N	\N	to	\N	2026-03-31 14:08:41.397097	system
+4462	2594	German	\N	\N	Gruppen	\N	2026-03-31 14:08:41.399903	system
+4463	2594	English	\N	\N	groups	\N	2026-03-31 14:08:41.401125	system
+4464	2595	German	\N	\N	Ort	\N	2026-03-31 14:08:41.403929	system
+4465	2595	English	\N	\N	location	\N	2026-03-31 14:08:41.405137	system
+4466	2596	German	\N	\N	Lehrfach	\N	2026-03-31 14:08:41.407935	system
+4467	2596	English	\N	\N	subject	\N	2026-03-31 14:08:41.409126	system
+4468	2597	German	\N	\N	Termine	\N	2026-03-31 14:08:41.411886	system
+4469	2597	English	\N	\N	Dates	\N	2026-03-31 14:08:41.41304	system
+4470	2598	German	\N	\N	Aufnahmetermine	\N	2026-03-31 14:08:41.415772	system
+4471	2598	English	\N	\N	Admission Dates	\N	2026-03-31 14:08:41.416936	system
+4472	2599	German	\N	\N	Reihungstest	\N	2026-03-31 14:08:41.419684	system
+4473	2599	English	\N	\N	Placement Test	\N	2026-03-31 14:08:41.420892	system
+4474	2600	German	\N	\N	Aufnahmetermin bearbeiten	\N	2026-03-31 14:08:41.42369	system
+4475	2600	English	\N	\N	Edit appointment for participation placement test	\N	2026-03-31 14:08:41.4249	system
+4476	2601	German	\N	\N	Aufnahmetermin Löschen	\N	2026-03-31 14:08:41.42766	system
+4477	2601	English	\N	\N	Delete Admission Date	\N	2026-03-31 14:08:41.428864	system
+4478	2602	German	\N	\N	Termin für Teilnahme am Reihungstest anlegen	\N	2026-03-31 14:08:41.431555	system
+4479	2602	English	\N	\N	Create appointment for participation placement test	\N	2026-03-31 14:08:41.432737	system
+4480	2603	German	\N	\N	Anmeldung zum Reihungstest am	\N	2026-03-31 14:08:41.435401	system
+4481	2603	English	\N	\N	Registration for the ranking test on	\N	2026-03-31 14:08:41.436579	system
+4482	2604	German	\N	\N	Zum Reihungstest angetreten	\N	2026-03-31 14:08:41.439341	system
+4483	2604	English	\N	\N	Participated in the ranking test	\N	2026-03-31 14:08:41.440527	system
+4484	2605	German	\N	\N	Reihungstestverfahren absolviert	\N	2026-03-31 14:08:41.443199	system
+4485	2605	English	\N	\N	Placement test procedure completed	\N	2026-03-31 14:08:41.444378	system
+4486	2606	German	\N	\N	Gesamtpunkte	\N	2026-03-31 14:08:41.447008	system
+4487	2606	English	\N	\N	Total Points	\N	2026-03-31 14:08:41.448171	system
+4488	2607	German	\N	\N	Gesamtpunkte berechnen	\N	2026-03-31 14:08:41.450827	system
+4489	2607	English	\N	\N	Calculate total points	\N	2026-03-31 14:08:41.451978	system
+4490	2608	German	\N	\N	Allgemein	\N	2026-03-31 14:08:41.454859	system
+4491	2608	English	\N	\N	Generally	\N	2026-03-31 14:08:41.456087	system
+4492	2609	German	\N	\N	Zur Reihungstestverwaltung	\N	2026-03-31 14:08:41.458884	system
+4493	2609	English	\N	\N	Administration Placement Test	\N	2026-03-31 14:08:41.460145	system
+4494	2610	German	\N	\N	Nur zukünftige Reihungstests laden	\N	2026-03-31 14:08:41.462951	system
+4495	2610	English	\N	\N	Show future placement tests only	\N	2026-03-31 14:08:41.464166	system
+4496	2611	German	\N	\N	Reihungstestergebnis holen	\N	2026-03-31 14:08:41.466888	system
+4497	2611	English	\N	\N	Get placement test result	\N	2026-03-31 14:08:41.468051	system
+4498	2612	German	\N	\N	Filter 'Nur zukünftige Reihungstest anzeigen' aktiv	\N	2026-03-31 14:08:41.470811	system
+4499	2612	English	\N	\N	Filter 'Only show future placement tests' active	\N	2026-03-31 14:08:41.472014	system
+4500	2613	German	\N	\N	Reihungstest ID	\N	2026-03-31 14:08:41.474728	system
+4501	2613	English	\N	\N	Placementtest ID	\N	2026-03-31 14:08:41.475917	system
+4502	2614	German	\N	\N	RtPerson ID	\N	2026-03-31 14:08:41.478589	system
+4503	2614	English	\N	\N	PtPerson ID	\N	2026-03-31 14:08:41.479734	system
+4504	2615	German	\N	\N	Stufe	\N	2026-03-31 14:08:41.482338	system
+4505	2615	English	\N	\N	level	\N	2026-03-31 14:08:41.483529	system
+4506	2616	German	\N	\N	Anmeldedatum	\N	2026-03-31 14:08:41.486129	system
+4507	2616	English	\N	\N	Registration Date	\N	2026-03-31 14:08:41.487257	system
+4508	2617	German	\N	\N	teilgenommen	\N	2026-03-31 14:08:41.490032	system
+4509	2617	English	\N	\N	participated	\N	2026-03-31 14:08:41.491228	system
+4510	2618	German	\N	\N	Kürzel	\N	2026-03-31 14:08:41.493962	system
+4511	2618	English	\N	\N	shorthand	\N	2026-03-31 14:08:41.495138	system
+4512	2619	German	\N	\N	ausgewählt	\N	2026-03-31 14:08:41.497914	system
+4513	2619	English	\N	\N	selected	\N	2026-03-31 14:08:41.499075	system
+4514	2620	German	\N	\N	gefiltert	\N	2026-03-31 14:08:41.502223	system
+4515	2620	English	\N	\N	filtered	\N	2026-03-31 14:08:41.503398	system
+4516	2621	German	\N	\N	gesamt	\N	2026-03-31 14:08:41.506356	system
+4517	2621	English	\N	\N	total	\N	2026-03-31 14:08:41.507637	system
+4518	2622	German	\N	\N	Funktionen	\N	2026-03-31 14:08:41.510526	system
+4519	2622	English	\N	\N	Functions	\N	2026-03-31 14:08:41.511877	system
+4520	2623	German	\N	\N	Nur aktive anzeigen	\N	2026-03-31 14:08:41.514528	system
+4521	2623	English	\N	\N	Display only active	\N	2026-03-31 14:08:41.515653	system
+4522	2624	German	\N	\N	Funktion hinzufügen	\N	2026-03-31 14:08:41.518305	system
+4523	2624	English	\N	\N	Add function	\N	2026-03-31 14:08:41.519557	system
+4524	2625	German	\N	\N	Funktion bearbeiten	\N	2026-03-31 14:08:41.522326	system
+4525	2625	English	\N	\N	Edit function	\N	2026-03-31 14:08:41.523479	system
+4526	2626	German	\N	\N	Als Kopie speichern	\N	2026-03-31 14:08:41.526148	system
+4527	2626	English	\N	\N	Save as copy	\N	2026-03-31 14:08:41.527271	system
+4528	2627	German	\N	\N	Das Eingabefeld {field} darf nur positive Ganzzahlen enthalten.	\N	2026-03-31 14:08:41.529914	system
+4529	2627	English	\N	\N	The input field {field} may only contain positive integers	\N	2026-03-31 14:08:41.531052	system
+4530	2628	German	\N	\N	Vor Änderung der Organisationseinheit bitte Unternehmen wählen	\N	2026-03-31 14:08:41.533695	system
+4531	2628	English	\N	\N	Before changing the organizational unit, please select company	\N	2026-03-31 14:08:41.534742	system
+4532	2629	German	\N	\N	Sie haben keine Berechtigung, für diesen Studiengang Daten zu ändern	\N	2026-03-31 14:08:41.53726	system
+4533	2629	English	\N	\N	You do not have permission to change data for this study program	\N	2026-03-31 14:08:41.538355	system
+4534	2630	German	\N	\N	Achtung	\N	2026-03-31 14:08:41.540923	system
+4535	2630	English	\N	\N	Attention	\N	2026-03-31 14:08:41.542038	system
+4536	2631	German	\N	\N	Möchten Sie wirklich löschen?	\N	2026-03-31 14:08:41.544688	system
+4537	2631	English	\N	\N	Do you really want to delete?	\N	2026-03-31 14:08:41.545849	system
+4538	2632	German	\N	\N	Systemfehler	\N	2026-03-31 14:08:41.549739	system
+4539	2632	English	\N	\N	System Error	\N	2026-03-31 14:08:41.550873	system
+4540	2633	German	\N	\N	Bitte StudentIn auswählen!	\N	2026-03-31 14:08:41.553477	system
+4541	2633	English	\N	\N	Please select a student!	\N	2026-03-31 14:08:41.554589	system
+4542	2634	German	\N	\N	Notiz hinzufügen	\N	2026-03-31 14:08:41.557232	system
+4543	2634	English	\N	\N	Add note	\N	2026-03-31 14:08:41.558371	system
+4544	2635	German	\N	\N	Mitarbeiter UID	\N	2026-03-31 14:08:41.561005	system
+4545	2635	English	\N	\N	Employee UID	\N	2026-03-31 14:08:41.56212	system
+4546	2636	German	\N	\N	Prüfung ID	\N	2026-03-31 14:08:41.564756	system
+4547	2636	English	\N	\N	Examination ID	\N	2026-03-31 14:08:41.565876	system
+4548	2637	German	\N	\N	Alias ist ungültig	\N	2026-03-31 14:08:41.568523	system
+4549	2637	English	\N	\N	Alias is invalid	\N	2026-03-31 14:08:41.56968	system
+4550	2638	German	\N	\N	Das Eingabefeld {field} muss kleiner als 1000 sein.	\N	2026-03-31 14:08:41.572335	system
+4551	2638	English	\N	\N	The Field {Field} must contain a number less then 10000.	\N	2026-03-31 14:08:41.573454	system
+4552	2639	German	\N	\N	Das Eingabefeld {field} muss eine gültige Zahl sein	\N	2026-03-31 14:08:41.576012	system
+4553	2639	English	\N	\N	The Input Field {field} has to be a valid number	\N	2026-03-31 14:08:41.577166	system
+4554	2640	German	\N	\N	suchen	\N	2026-03-31 14:08:41.579765	system
+4555	2640	English	\N	\N	search	\N	2026-03-31 14:08:41.580934	system
+4556	2641	German	\N	\N	Suche: {types}	\N	2026-03-31 14:08:41.583679	system
+4557	2641	English	\N	\N	Search: {types}	\N	2026-03-31 14:08:41.58479	system
+4558	2642	German	\N	\N	Mitarbeiter	\N	2026-03-31 14:08:41.587394	system
+4559	2642	English	\N	\N	employees	\N	2026-03-31 14:08:41.588553	system
+4560	2643	German	\N	\N	Studenten	\N	2026-03-31 14:08:41.591147	system
+4561	2643	English	\N	\N	students	\N	2026-03-31 14:08:41.592292	system
+4562	2644	German	\N	\N	Prestudenten	\N	2026-03-31 14:08:41.594856	system
+4563	2644	English	\N	\N	prestudents	\N	2026-03-31 14:08:41.595975	system
+4564	2645	German	\N	\N	Räume	\N	2026-03-31 14:08:41.598561	system
+4565	2645	English	\N	\N	rooms	\N	2026-03-31 14:08:41.599705	system
+4566	2646	German	\N	\N	Organisationseinheiten	\N	2026-03-31 14:08:41.602306	system
+4567	2646	English	\N	\N	organisation units	\N	2026-03-31 14:08:41.603455	system
+4568	2647	German	\N	\N	Inhalte	\N	2026-03-31 14:08:41.606079	system
+4569	2647	English	\N	\N	sites	\N	2026-03-31 14:08:41.607223	system
+4570	2648	German	\N	\N	Dokumente	\N	2026-03-31 14:08:41.609904	system
+4571	2648	English	\N	\N	documents	\N	2026-03-31 14:08:41.611019	system
+4572	2649	German	\N	\N	Filter	\N	2026-03-31 14:08:41.613742	system
+4573	2649	English	\N	\N	Filter	\N	2026-03-31 14:08:41.614927	system
+4574	2650	German	\N	\N	Suche filtern nach:	\N	2026-03-31 14:08:41.617621	system
+4575	2650	English	\N	\N	Filter search for:	\N	2026-03-31 14:08:41.618769	system
+4576	2651	German	\N	\N	Standard Aktion	\N	2026-03-31 14:08:41.621463	system
+4577	2651	English	\N	\N	Default Action	\N	2026-03-31 14:08:41.622625	system
+4578	2652	German	\N	\N	Student UID	\N	2026-03-31 14:08:41.625561	system
+4579	2652	English	\N	\N	Student UID	\N	2026-03-31 14:08:41.626714	system
+4580	2653	German	\N	\N	Prestudent ID	\N	2026-03-31 14:08:41.629431	system
+4581	2653	English	\N	\N	Prestudent ID	\N	2026-03-31 14:08:41.630621	system
+4582	2654	German	\N	\N	Emails	\N	2026-03-31 14:08:41.633308	system
+4583	2654	English	\N	\N	Emails	\N	2026-03-31 14:08:41.634483	system
+4584	2655	German	\N	\N	Gruppen-Email	\N	2026-03-31 14:08:41.637212	system
+4585	2655	English	\N	\N	Group-Email	\N	2026-03-31 14:08:41.638371	system
+4586	2656	German	\N	\N	MitarbeiterIn	\N	2026-03-31 14:08:41.641061	system
+4587	2656	English	\N	\N	Employee	\N	2026-03-31 14:08:41.642228	system
+4588	2657	German	\N	\N	Standard-Kostenstelle	\N	2026-03-31 14:08:41.645005	system
+4589	2657	English	\N	\N	Standard cost center	\N	2026-03-31 14:08:41.646191	system
+4590	2658	German	\N	\N	keine	\N	2026-03-31 14:08:41.648901	system
+4591	2658	English	\N	\N	none	\N	2026-03-31 14:08:41.650067	system
+4592	2659	German	\N	\N	Übergeordnete OE	\N	2026-03-31 14:08:41.652878	system
+4593	2659	English	\N	\N	Parent OU	\N	2026-03-31 14:08:41.654068	system
+4594	2660	German	\N	\N	keine	\N	2026-03-31 14:08:41.656753	system
+4595	2660	English	\N	\N	none	\N	2026-03-31 14:08:41.657933	system
+4596	2661	German	\N	\N	Standort	\N	2026-03-31 14:08:41.660762	system
+4597	2661	English	\N	\N	Site	\N	2026-03-31 14:08:41.661913	system
+4598	2662	German	\N	\N	{floor} Stockwerk	\N	2026-03-31 14:08:41.664611	system
+4599	2662	English	\N	\N	{floor} floor	\N	2026-03-31 14:08:41.665791	system
+4600	2663	German	\N	\N	N/A	\N	2026-03-31 14:08:41.668456	system
+4601	2663	English	\N	\N	N/A	\N	2026-03-31 14:08:41.66962	system
+4602	2664	German	\N	\N	Sitzplätze	\N	2026-03-31 14:08:41.672317	system
+4603	2664	English	\N	\N	Seats	\N	2026-03-31 14:08:41.6735	system
+4604	2665	German	\N	\N	{max_person}, davon {workplaces} PC-Plätze	\N	2026-03-31 14:08:41.676281	system
+4605	2665	English	\N	\N	{max_person}, of which {workplaces} PC-Workstations	\N	2026-03-31 14:08:41.677476	system
+4606	2666	German	\N	\N	N/A	\N	2026-03-31 14:08:41.680134	system
+4607	2666	English	\N	\N	N/A	\N	2026-03-31 14:08:41.681328	system
+4608	2667	German	\N	\N	Gebäude	\N	2026-03-31 14:08:41.684006	system
+4609	2667	English	\N	\N	Building	\N	2026-03-31 14:08:41.685196	system
+4610	2668	German	\N	\N	Zusatz Informationen	\N	2026-03-31 14:08:41.687882	system
+4611	2668	English	\N	\N	Additional information	\N	2026-03-31 14:08:41.689051	system
+4612	2669	German	\N	\N	Leiter	\N	2026-03-31 14:08:41.691773	system
+4613	2669	English	\N	\N	Leader	\N	2026-03-31 14:08:41.692921	system
+4614	2670	German	\N	\N	N.N.	\N	2026-03-31 14:08:41.695617	system
+4615	2670	English	\N	\N	N/A	\N	2026-03-31 14:08:41.696784	system
+4616	2671	German	\N	\N	Mitarbeiter-Anzahl	\N	2026-03-31 14:08:41.699619	system
+4617	2671	English	\N	\N	Number of employees	\N	2026-03-31 14:08:41.700794	system
+4618	2672	German	\N	\N	DMS ID	\N	2026-03-31 14:08:41.703546	system
+4619	2672	English	\N	\N	DMS ID	\N	2026-03-31 14:08:41.704746	system
+4620	2673	German	\N	\N	Version	\N	2026-03-31 14:08:41.707408	system
+4621	2673	English	\N	\N	Version	\N	2026-03-31 14:08:41.708642	system
+4622	2674	German	\N	\N	Schlagwörter	\N	2026-03-31 14:08:41.711375	system
+4623	2674	English	\N	\N	Keywords	\N	2026-03-31 14:08:41.712532	system
+4624	2675	German	\N	\N	Kein Inhalt	\N	2026-03-31 14:08:41.715252	system
+4625	2675	English	\N	\N	No Content	\N	2026-03-31 14:08:41.716459	system
+4626	2676	German	\N	\N	Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.	\N	2026-03-31 14:08:41.719172	system
+4627	2676	English	\N	\N	No result type selected. Please select at least one result type.	\N	2026-03-31 14:08:41.720413	system
+4628	2677	German	\N	\N	Es wurden keine Ergebnisse gefunden.	\N	2026-03-31 14:08:41.723284	system
+4629	2677	English	\N	\N	No results were found.	\N	2026-03-31 14:08:41.724481	system
+4630	2678	German	\N	\N	Unbekannter Ergebnistyp: '{type}'.	\N	2026-03-31 14:08:41.727135	system
+4631	2678	English	\N	\N	Unknown resulttype: '{type}'.	\N	2026-03-31 14:08:41.728381	system
+4632	2679	German	\N	\N	Bei der Suche ist ein Fehler aufgetreten. {message}	\N	2026-03-31 14:08:41.731148	system
+4633	2679	English	\N	\N	An error occurred while searching. {message}	\N	2026-03-31 14:08:41.732367	system
+4634	2680	German	\N	\N	Such-Konfiguration $config["{type}"] nicht gefunden.	\N	2026-03-31 14:08:41.73505	system
+4635	2680	English	\N	\N	Search config $config["{type}"] not found.	\N	2026-03-31 14:08:41.7362	system
+4636	2681	German	\N	\N	Such-Konfiguration für $config["{type}"] ist ungültig: Feld "{field}" fehlt, ist leer oder hat einen ungültigen Typ.	\N	2026-03-31 14:08:41.738825	system
+4637	2681	English	\N	\N	Search config for $config["{type}"] is invalid: field {field} is missing, empty or has an invalid type.	\N	2026-03-31 14:08:41.739953	system
+4638	2682	German	\N	\N	Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.	\N	2026-03-31 14:08:41.742609	system
+4639	2682	English	\N	\N	Search config $config["{type}"]["searchfields"]["{searchfield}"] is invalid: field {field} is missing or invalid.	\N	2026-03-31 14:08:41.743735	system
+4640	2683	German	\N	\N	Fehler beim Speichern des Fotos	\N	2026-03-31 14:08:41.746493	system
+4641	2683	English	\N	\N	Error saving photo	\N	2026-03-31 14:08:41.747685	system
+4642	2684	German	\N	\N	Foto erfolgreich hochgeladen	\N	2026-03-31 14:08:41.750368	system
+4643	2684	English	\N	\N	Photoupload successful	\N	2026-03-31 14:08:41.751541	system
+4644	2685	German	\N	\N	Bitte zuerst ein Bild auswählen!	\N	2026-03-31 14:08:41.754257	system
+4645	2685	English	\N	\N	Please select an image first!	\N	2026-03-31 14:08:41.755444	system
+4646	2686	German	\N	\N	Kein Bild empfangen	\N	2026-03-31 14:08:41.758147	system
+4647	2686	English	\N	\N	No picture received	\N	2026-03-31 14:08:41.759317	system
+4648	2687	German	\N	\N	Alle Termine dieser LV	\N	2026-03-31 14:08:41.762004	system
+4649	2687	English	\N	\N	Dates in schedule	\N	2026-03-31 14:08:41.76318	system
+4650	2688	German	\N	\N	Meldebestätigung	\N	2026-03-31 14:08:41.765923	system
+4651	2688	English	\N	\N	Confirmation of registration	\N	2026-03-31 14:08:41.767099	system
+4652	2689	German	\N	\N	Nachweisdokumente	\N	2026-03-31 14:08:41.76978	system
+4653	2689	English	\N	\N	Confirmation documents	\N	2026-03-31 14:08:41.770922	system
+4654	2690	German	\N	\N	Email fehlt	\N	2026-03-31 14:08:41.773598	system
+4655	2690	English	\N	\N	Email is missing	\N	2026-03-31 14:08:41.774781	system
+4656	2691	German	\N	\N	Email ist ungültig	\N	2026-03-31 14:08:41.777481	system
+4657	2691	English	\N	\N	The email is not valid	\N	2026-03-31 14:08:41.778646	system
+4658	2692	German	\N	\N	Diese Email ist bereits registriert. Bitte verwenden sie eine andere Email oder loggen sie sich mit einer anderen Methode ein.	\N	2026-03-31 14:08:41.781376	system
+4659	2692	English	\N	\N	The email is already registered. Please choose a different email or use a different login method.	\N	2026-03-31 14:08:41.78255	system
+4660	2693	German	\N	\N	Zugang zu Ihrer Bewerbung	\N	2026-03-31 14:08:41.785221	system
+4661	2693	English	\N	\N	Access to your application	\N	2026-03-31 14:08:41.786406	system
+4662	2694	German	\N	\N	Sehr geehrte Frau	\N	2026-03-31 14:08:41.789075	system
+4663	2694	English	\N	\N	Dear Ms	\N	2026-03-31 14:08:41.790229	system
+4664	2695	German	\N	\N	Sehr geehrter Herr	\N	2026-03-31 14:08:41.792962	system
+4665	2695	English	\N	\N	Dear Mr	\N	2026-03-31 14:08:41.794155	system
+4666	2696	German	\N	\N	Sehr geehrte/r	\N	2026-03-31 14:08:41.796841	system
+4667	2696	English	\N	\N	Dear	\N	2026-03-31 14:08:41.798055	system
+4668	2697	German	\N	\N	Bewerbung verifizieren	\N	2026-03-31 14:08:41.800886	system
+4669	2697	English	\N	\N	Verify application	\N	2026-03-31 14:08:41.802041	system
+4670	2698	German	\N	\N	Wenn Ihre Daten stimmen, geben Sie bitte Ihre E-Mail Adresse ein und drücken Sie auf "Bewerbung verifizieren".\nDanach erhalten Sie eine E-Mail mit dem Link zu Ihrer Bewerbung an die angegebene Adresse.\nDort können Sie Studienrichtungen hinzufügen, Ihre Daten vervollständigen, und sich unverbindlich bewerben.	\N	2026-03-31 14:08:41.804751	system
+4671	2698	English	\N	\N	If your data is correct, please enter your email and click "Verify application".\nWe will then send you a link via e-mail to the address specified. There, you can add personal information or degree programs and submit non-binding applications.	\N	2026-03-31 14:08:41.805927	system
+4672	2699	German	\N	\N	Wenn Sie mehr Informationen benötigen, steht Ihnen unsere <a href="{0}" target="_blank">Studienberatung</a> gerne persönlich, telefonisch, per E-Mail oder WhatsApp zur Verfügung.	\N	2026-03-31 14:08:41.808676	system
+4673	2699	English	\N	\N	Should you require any additional information, please do not hesitate to contact our <a href="{0}" target="_blank">student counselling team</a> in person, by phone, or via e-mail or WhatsApp.	\N	2026-03-31 14:08:41.809819	system
+4674	2700	German	\N	\N	Datenschutz-Hinweis	\N	2026-03-31 14:08:41.812541	system
+4675	2700	English	\N	\N	Privacy information	\N	2026-03-31 14:08:41.813725	system
+4676	2701	German	\N	\N	Die uns von Ihnen zum Zwecke der Bewerbung bekanntgegebenen Daten werden von uns ausschließlich zur Abwicklung der Bewerbung auf der Grundlage von vor- bzw vertraglichen Zwecken verarbeitet und mit der unten beschriebenen Ausnahme bei Unklarheiten betreffend die Zugangsvoraussetzungen nicht an Dritte weitergegeben.\nKommt es zu keinem weiteren Kontakt bzw zu keiner Aufnahme, löschen wir Ihre Daten nach drei Jahren.	\N	2026-03-31 14:08:41.816476	system
+4677	2701	English	\N	\N	The data communicated to us by you for the purpose of the application will be used by us exclusively for the processing of the application on the basis of pre-contractual or contractual purposes and will not be passed on to third parties with the exception described below in case of uncertainties regarding the entry requirements.\nIf there is no further contact or enrolment, your data will be deleted after three years.	\N	2026-03-31 14:08:41.817649	system
+4678	2702	German	\N	\N	Informationen zu Ihren Betroffenenrechten finden Sie hier:	\N	2026-03-31 14:08:41.82045	system
+4679	2702	English	\N	\N	Information on your data subject rights can be found here:	\N	2026-03-31 14:08:41.821648	system
+4680	2703	German	\N	\N	Bei Fragen stehen wir Ihnen jederzeit unter folgender Mail zur Verfügung: 	\N	2026-03-31 14:08:41.82416	system
+4681	2703	English	\N	\N	If you have any questions, please contact us at 	\N	2026-03-31 14:08:41.825313	system
+4682	2704	German	\N	\N	Vorname	\N	2026-03-31 14:08:41.827885	system
+4683	2704	English	\N	\N	First name	\N	2026-03-31 14:08:41.829016	system
+4684	2705	German	\N	\N	Nachname	\N	2026-03-31 14:08:41.831779	system
+4685	2705	English	\N	\N	Last name	\N	2026-03-31 14:08:41.832955	system
+4686	2706	German	\N	\N	Geburtsdatum	\N	2026-03-31 14:08:41.835678	system
+4687	2706	English	\N	\N	Birth date	\N	2026-03-31 14:08:41.83692	system
+4688	2707	German	\N	\N	E-Mail Adresse	\N	2026-03-31 14:08:41.839771	system
+4689	2707	English	\N	\N	E-mail address	\N	2026-03-31 14:08:41.840956	system
+4690	2708	German	\N	\N	Die E-Mail mit dem Link zu Ihrer Bewerbung wurde erfolgreich an {0} verschickt.	\N	2026-03-31 14:08:41.843948	system
+4691	2708	English	\N	\N	The email with the link to your application has been successfully sent to {0}.	\N	2026-03-31 14:08:41.845232	system
+4692	2709	German	\N	\N	In der Regel erhalten Sie das Mail in wenigen Minuten. Wenn Sie nach <b>24 Stunden</b> noch kein Mail erhalten haben,\n\t\t\t\t\tkontaktieren Sie bitte unsere {0}Studienberatung{1}	\N	2026-03-31 14:08:41.848035	system
+4693	2709	English	\N	\N	You should receive an e-mail within a few minutes. If you receive no e-mail within <b>24 hours</b> please contact\n\t\t\t\t\tour {0}student counselling team{1}.	\N	2026-03-31 14:08:41.849237	system
+4694	2710	German	\N	\N	Fehler bei der Registrierung	\N	2026-03-31 14:08:41.852036	system
+4695	2710	English	\N	\N	Error when registering	\N	2026-03-31 14:08:41.853242	system
+4696	2711	German	\N	\N	Es ist ein Fehler bei der Registrierung aufgetreten.	\N	2026-03-31 14:08:41.855957	system
+4697	2711	English	\N	\N	An error occured during registration.	\N	2026-03-31 14:08:41.85721	system
+4698	2712	German	\N	\N	Nochmals versuchen	\N	2026-03-31 14:08:41.860093	system
+4699	2712	English	\N	\N	Try again	\N	2026-03-31 14:08:41.861295	system
+4700	2713	German	\N	\N	Können in Ausnahmefällen die Zugangsvoraussetzungen von der FH Technikum Wien nicht abschließend abgeklärt werden, erteile ich die Zustimmung, dass die FH Technikum Wien die Dokumente zur Überprüfung an die zuständigen Behörden weiterleiten kann.<br>\nIch wurde darüber informiert, dass ich nicht verpflichtet bin, der Übermittlung meiner Daten zuzustimmen. Diese Zustimmung ist allerdings notwendig, um die Bewerbung berücksichtigen zu können.	\N	2026-03-31 14:08:41.864101	system
+4701	2713	English	\N	\N	If in exceptional cases the admission requirements can not be finally clarified by the UAS Technikum Wien, I give my consent that the UAS Technikum Wien can forward the documents to the competent authorities for verification.<br>\nI have been informed that I am under no obligation to consent to the transmission of my data. However, this consent is necessary in order for the application to be considered.	\N	2026-03-31 14:08:41.865345	system
+4702	2714	German	\N	\N	Ich habe die Datenschutzerklärung zu Kenntnis genommen.	\N	2026-03-31 14:08:41.868138	system
+4703	2714	English	\N	\N	I have taken note of the privacy policy.	\N	2026-03-31 14:08:41.869323	system
+4704	2715	German	\N	\N	Sie müssen der Datenübermittlung zustimmen, um Ihre Bewerbung abschicken zu können.	\N	2026-03-31 14:08:41.8721	system
+4705	2715	English	\N	\N	You have to consent the transmission of your data to send the application.	\N	2026-03-31 14:08:41.873326	system
+4706	2716	German	\N	\N	Sie müssen der Datenschutzerklärung zustimmen, um Ihre Bewerbung abschicken zu können.	\N	2026-03-31 14:08:41.876119	system
+4707	2716	English	\N	\N	You have to consent to the privacy statement to send the application.	\N	2026-03-31 14:08:41.87734	system
+4708	2717	German	\N	\N	Projektarbeit	\N	2026-03-31 14:08:41.880095	system
+4709	2717	English	\N	\N	Project work	\N	2026-03-31 14:08:41.881312	system
+4710	2718	German	\N	\N	Projektarbeit anlegen	\N	2026-03-31 14:08:41.884002	system
+4711	2718	English	\N	\N	Create project work	\N	2026-03-31 14:08:41.885225	system
+4712	2719	German	\N	\N	Projektarbeit bearbeiten	\N	2026-03-31 14:08:41.88824	system
+4713	2719	English	\N	\N	Edit project work	\N	2026-03-31 14:08:41.889509	system
+4714	2720	German	\N	\N	Titel	\N	2026-03-31 14:08:41.892217	system
+4715	2720	English	\N	\N	title	\N	2026-03-31 14:08:41.893454	system
+4716	2721	German	\N	\N	Titel Englisch	\N	2026-03-31 14:08:41.896221	system
+4717	2721	English	\N	\N	title English	\N	2026-03-31 14:08:41.897424	system
+4718	2722	German	\N	\N	Themenbereich	\N	2026-03-31 14:08:41.900237	system
+4719	2722	English	\N	\N	topic area	\N	2026-03-31 14:08:41.901458	system
+4720	2723	German	\N	\N	Typ	\N	2026-03-31 14:08:41.904147	system
+4721	2723	English	\N	\N	type	\N	2026-03-31 14:08:41.905444	system
+4722	2724	German	\N	\N	Firma	\N	2026-03-31 14:08:41.908202	system
+4723	2724	English	\N	\N	company	\N	2026-03-31 14:08:41.909429	system
+4724	2725	German	\N	\N	Lehrveranstaltung	\N	2026-03-31 14:08:41.912408	system
+4725	2725	English	\N	\N	course	\N	2026-03-31 14:08:41.913631	system
+4726	2726	German	\N	\N	LV-Teil	\N	2026-03-31 14:08:41.916326	system
+4727	2726	English	\N	\N	teaching unit	\N	2026-03-31 14:08:41.917554	system
+4728	2727	German	\N	\N	BetreuerIn	\N	2026-03-31 14:08:41.920331	system
+4729	2727	English	\N	\N	reviewer	\N	2026-03-31 14:08:41.921537	system
+4730	2728	German	\N	\N	BetreuerIn	\N	2026-03-31 14:08:41.924456	system
+4731	2728	English	\N	\N	Reviewer	\N	2026-03-31 14:08:41.925675	system
+4732	2729	German	\N	\N	Betreuerart	\N	2026-03-31 14:08:41.928399	system
+4733	2729	English	\N	\N	reviewer type	\N	2026-03-31 14:08:41.929622	system
+4734	2730	German	\N	\N	Note	\N	2026-03-31 14:08:41.932455	system
+4735	2730	English	\N	\N	grade	\N	2026-03-31 14:08:41.933733	system
+4736	2731	German	\N	\N	Stunden	\N	2026-03-31 14:08:41.936501	system
+4737	2731	English	\N	\N	hours	\N	2026-03-31 14:08:41.937722	system
+4738	2732	German	\N	\N	Stundensatz	\N	2026-03-31 14:08:41.940533	system
+4739	2732	English	\N	\N	hourly rate	\N	2026-03-31 14:08:41.941706	system
+4740	2733	German	\N	\N	Beginn	\N	2026-03-31 14:08:41.944459	system
+4741	2733	English	\N	\N	start	\N	2026-03-31 14:08:41.945752	system
+4742	2734	German	\N	\N	Ende	\N	2026-03-31 14:08:41.948516	system
+4743	2734	English	\N	\N	end	\N	2026-03-31 14:08:41.949718	system
+4744	2735	German	\N	\N	freigegeben	\N	2026-03-31 14:08:41.952515	system
+4745	2735	English	\N	\N	approved	\N	2026-03-31 14:08:41.95373	system
+4746	2736	German	\N	\N	Gesperrt bis	\N	2026-03-31 14:08:41.95651	system
+4747	2736	English	\N	\N	locked until	\N	2026-03-31 14:08:41.957664	system
+4748	2737	German	\N	\N	Anmerkung	\N	2026-03-31 14:08:41.960357	system
+4749	2737	English	\N	\N	annotation	\N	2026-03-31 14:08:41.961524	system
+4750	2738	German	\N	\N	Firma ID	\N	2026-03-31 14:08:41.964213	system
+4751	2738	English	\N	\N	company Id	\N	2026-03-31 14:08:41.965434	system
+4752	2739	German	\N	\N	Löschen nicht möglich, dieser Projektarbeit sind bereits BetreuerInnen zugewiesen	\N	2026-03-31 14:08:41.968055	system
+4753	2739	English	\N	\N	Deleting not possible, reviewers were already assigned to this projekt work	\N	2026-03-31 14:08:41.969238	system
+4754	2740	German	\N	\N	Löschen nicht möglich, für diese Projektarbeit gibt es bereits Projektarbeitsabgaben	\N	2026-03-31 14:08:41.971912	system
+4755	2740	English	\N	\N	Deleting not possible, there are projekt submissions for this project work	\N	2026-03-31 14:08:41.973095	system
+4756	2741	German	\N	\N	ProjektbetreuerIn ungültig	\N	2026-03-31 14:08:41.975818	system
+4757	2741	English	\N	\N	Invalid project reviewers	\N	2026-03-31 14:08:41.977013	system
+4758	2742	German	\N	\N	Löschen nicht möglich, ProjektbetreuerIn hat bereits einen Vertrag	\N	2026-03-31 14:08:41.97968	system
+4759	2742	English	\N	\N	Deleting not possible, project reviewer has a contract already	\N	2026-03-31 14:08:41.980847	system
+4760	2743	German	\N	\N	Neue Person anlegen	\N	2026-03-31 14:08:41.983457	system
+4761	2743	English	\N	\N	Create new person	\N	2026-03-31 14:08:41.984646	system
+4762	2744	German	\N	\N	Titel (Pre)	\N	2026-03-31 14:08:41.987348	system
+4763	2744	English	\N	\N	title (Pre)	\N	2026-03-31 14:08:41.98854	system
+4764	2745	German	\N	\N	Titel (Post)	\N	2026-03-31 14:08:41.99131	system
+4765	2745	English	\N	\N	title (Post)	\N	2026-03-31 14:08:41.992517	system
+4766	2746	German	\N	\N	Weitere Vornamen	\N	2026-03-31 14:08:41.995192	system
+4767	2746	English	\N	\N	other first names	\N	2026-03-31 14:08:41.996399	system
+4768	2747	German	\N	\N	Bestehende Adresse überschreiben	\N	2026-03-31 14:08:41.999077	system
+4769	2747	English	\N	\N	Replace existing address	\N	2026-03-31 14:08:42.000285	system
+4770	2748	German	\N	\N	Adresse hinzufügen	\N	2026-03-31 14:08:42.002936	system
+4771	2748	English	\N	\N	Add new address	\N	2026-03-31 14:08:42.00411	system
+4772	2749	German	\N	\N	Adresse nicht anlegen	\N	2026-03-31 14:08:42.006802	system
+4773	2749	English	\N	\N	Do not create address	\N	2026-03-31 14:08:42.007943	system
+4774	2750	German	\N	\N	Land	\N	2026-03-31 14:08:42.010563	system
+4775	2750	English	\N	\N	nation	\N	2026-03-31 14:08:42.011727	system
+4776	2751	German	\N	\N	Mobil	\N	2026-03-31 14:08:42.014485	system
+4777	2751	English	\N	\N	mobile phone	\N	2026-03-31 14:08:42.01567	system
+4778	2752	German	\N	\N	Letzte Ausbildung	\N	2026-03-31 14:08:42.018342	system
+4779	2752	English	\N	\N	most recent education	\N	2026-03-31 14:08:42.019552	system
+4780	2753	German	\N	\N	Ausbildungsart	\N	2026-03-31 14:08:42.022191	system
+4781	2753	English	\N	\N	education type	\N	2026-03-31 14:08:42.023353	system
+4782	2754	German	\N	\N	Anmerkungen	\N	2026-03-31 14:08:42.025937	system
+4783	2754	English	\N	\N	notes	\N	2026-03-31 14:08:42.027071	system
+4784	2755	German	\N	\N	Person anlegen	\N	2026-03-31 14:08:42.029811	system
+4785	2755	English	\N	\N	Create person	\N	2026-03-31 14:08:42.031001	system
+4786	2756	German	\N	\N	InteressentIn anlegen	\N	2026-03-31 14:08:42.03383	system
+4787	2756	English	\N	\N	Create candidate	\N	2026-03-31 14:08:42.035005	system
+4788	2757	German	\N	\N	Prüfung ob Person bereits existiert	\N	2026-03-31 14:08:42.037775	system
+4789	2757	English	\N	\N	Check if a person already exists	\N	2026-03-31 14:08:42.038979	system
+4790	2758	German	\N	\N	Zurück	\N	2026-03-31 14:08:42.041767	system
+4791	2758	English	\N	\N	Back	\N	2026-03-31 14:08:42.042943	system
+4792	2759	German	\N	\N	Kontaktdaten bearbeiten	\N	2026-03-31 14:08:42.045702	system
+4793	2759	English	\N	\N	Edit contact data	\N	2026-03-31 14:08:42.046876	system
+4794	2760	German	\N	\N	Projektbeurteilung erstellen	\N	2026-03-31 14:08:42.04961	system
+4795	2760	English	\N	\N	Create project assessment document	\N	2026-03-31 14:08:42.05081	system
+4796	2761	German	\N	\N	Projektarbeit ist noch nicht beurteilt	\N	2026-03-31 14:08:42.053521	system
+4797	2761	English	\N	\N	Projekt work was not assessed yet	\N	2026-03-31 14:08:42.054749	system
+4798	2762	German	\N	\N	Stornieren	\N	2026-03-31 14:08:42.057465	system
+4799	2762	English	\N	\N	Cancel contract	\N	2026-03-31 14:08:42.058659	system
+4800	2763	German	\N	\N	Noch kein Vertrag	\N	2026-03-31 14:08:42.061376	system
+4801	2763	English	\N	\N	No contract yet	\N	2026-03-31 14:08:42.062646	system
+4802	2764	German	\N	\N	BetreuerIn bearbeiten	\N	2026-03-31 14:08:42.065376	system
+4803	2764	English	\N	\N	Edit reviewer	\N	2026-03-31 14:08:42.066543	system
+4804	2765	German	\N	\N	BetreuerIn speichern	\N	2026-03-31 14:08:42.069172	system
+4805	2765	English	\N	\N	Save reviewer	\N	2026-03-31 14:08:42.07033	system
+4806	2766	German	\N	\N	Zur Firmenverwaltung	\N	2026-03-31 14:08:42.072986	system
+4807	2766	English	\N	\N	Company management	\N	2026-03-31 14:08:42.074142	system
+4808	2767	German	\N	\N	Punkte	\N	2026-03-31 14:08:42.076862	system
+4809	2767	English	\N	\N	points	\N	2026-03-31 14:08:42.078038	system
+4810	2768	German	\N	\N	Gesamtnote	\N	2026-03-31 14:08:42.080822	system
+4811	2768	English	\N	\N	final grade	\N	2026-03-31 14:08:42.081979	system
+4812	2769	German	\N	\N	Abgabe Endupload	\N	2026-03-31 14:08:42.084734	system
+4813	2769	English	\N	\N	final submission upload	\N	2026-03-31 14:08:42.085934	system
+4814	2770	German	\N	\N	Vertrag ID	\N	2026-03-31 14:08:42.088748	system
+4815	2770	English	\N	\N	contract ID	\N	2026-03-31 14:08:42.089997	system
+4816	2771	German	\N	\N	Projektarbeit ID	\N	2026-03-31 14:08:42.092751	system
+4817	2771	English	\N	\N	project work ID	\N	2026-03-31 14:08:42.093941	system
+4818	2772	German	\N	\N	Betreuerart Kurzbezeichnung	\N	2026-03-31 14:08:42.096735	system
+4819	2772	English	\N	\N	project reviewer short name	\N	2026-03-31 14:08:42.097929	system
+4820	2773	German	\N	\N	Typ Kurzbezeichnung	\N	2026-03-31 14:08:42.100732	system
+4821	2773	English	\N	\N	type short name	\N	2026-03-31 14:08:42.101933	system
+4822	2774	German	\N	\N	Betreuer*In ist bereits zugewiesen	\N	2026-03-31 14:08:42.104709	system
+4823	2774	English	\N	\N	This project reviewer is already assigned	\N	2026-03-31 14:08:42.105908	system
+4824	2775	German	\N	\N	Für diese Projektarbeit ist bereits eine Projektarbeitsbeurteilung eingetragen	\N	2026-03-31 14:08:42.108769	system
+4825	2775	English	\N	\N	This project work has already been assessed	\N	2026-03-31 14:08:42.109986	system
+4826	2776	German	\N	\N	Dokument erstellen	\N	2026-03-31 14:08:42.112747	system
+4827	2776	English	\N	\N	Create Document	\N	2026-03-31 14:08:42.113943	system
+4828	2777	German	\N	\N	Abschicken	\N	2026-03-31 14:08:42.116718	system
+4829	2777	English	\N	\N	Submit	\N	2026-03-31 14:08:42.117919	system
+4830	2778	German	\N	\N	Zurück zum Start	\N	2026-03-31 14:08:42.12065	system
+4831	2778	English	\N	\N	Back to Start	\N	2026-03-31 14:08:42.12184	system
+4832	2802	German	\N	\N	Personen zusammenlegen	\N	2026-03-31 14:08:42.170083	system
+4833	2802	English	\N	\N	Combine People	\N	2026-03-31 14:08:42.171253	system
+4834	2803	German	\N	\N	Die Personen {person1} und {person2} zusammenlegen?	\N	2026-03-31 14:08:42.173915	system
+4835	2803	English	\N	\N	Merge the persons {person1} and {person2}?	\N	2026-03-31 14:08:42.175112	system
+4836	2804	German	\N	\N	Keine Zusammenlegung möglich bei identischer Person ID!	\N	2026-03-31 14:08:42.177882	system
+4837	2804	English	\N	\N	No merging possible with identical person ID"	\N	2026-03-31 14:08:42.179085	system
+4838	2805	German	\N	\N	Fehlender oder ungültiger Parameter Type_ID Empfänger	\N	2026-03-31 14:08:42.181769	system
+4839	2805	English	\N	\N	Missing or invalid parameter type ID Recipient	\N	2026-03-31 14:08:42.182923	system
+4840	2806	German	\N	\N	Fehlende(r) oder ungültige(r) Parameter Empfänger-Id(s)	\N	2026-03-31 14:08:42.185634	system
+4841	2806	English	\N	\N	Missing or invalid parameter(s) Recipient ID(s)	\N	2026-03-31 14:08:42.186808	system
+4842	2807	German	\N	\N	Fehlende(r) oder ungültige(r) Parameter {parameter}	\N	2026-03-31 14:08:42.189465	system
+4843	2807	English	\N	\N	Missing or invalid parameter(s) {parameter}	\N	2026-03-31 14:08:42.190602	system
+4844	2808	German	\N	\N	Editor-Instanz nicht verfügbar.	\N	2026-03-31 14:08:42.19324	system
+4845	2808	English	\N	\N	Editor instance is not available.	\N	2026-03-31 14:08:42.19446	system
+4846	2809	German	\N	\N	Logik für Type ID {type} nicht implementiert.	\N	2026-03-31 14:08:42.197272	system
+4847	2809	English	\N	\N	logic for type ID {type} not implemented.	\N	2026-03-31 14:08:42.198504	system
+4848	2810	German	\N	\N	StudentIn ist in diesem Semester keinem Lehrverband zugeteilt	\N	2026-03-31 14:08:42.201164	system
+4849	2810	English	\N	\N	Student has no assignment to any teaching association	\N	2026-03-31 14:08:42.202353	system
+4850	2811	German	\N	\N	Mit dieser Aktion werden auch alle Voreinstellungen der verbundenen Widgets gelöscht.	\N	2026-03-31 14:08:42.205059	system
+4851	2811	English	\N	\N	This action will also delete all presets of the connected widgets.	\N	2026-03-31 14:08:42.206293	system
+4852	2812	German	\N	\N	Voreinstellung erfolgreich aktualisiert	\N	2026-03-31 14:08:42.209048	system
+4853	2812	English	\N	\N	Preset successfully updated	\N	2026-03-31 14:08:42.210237	system
+4854	2813	German	\N	\N	Sind Sie sicher, dass Sie dieses Widget löschen möchten?	\N	2026-03-31 14:08:42.213057	system
+4855	2813	English	\N	\N	Are you sure you want to delete this widget?	\N	2026-03-31 14:08:42.214328	system
+4856	2814	German	\N	\N	Möchten Sie wirklich löschen?	\N	2026-03-31 14:08:42.217055	system
+4857	2814	English	\N	\N	Do you really want to delete?	\N	2026-03-31 14:08:42.218231	system
 \.
 
 
@@ -40063,6 +45788,8 @@ COPY system.tbl_webservicerecht (webservicerecht_id, berechtigung_kurzbz, method
 28	soap/studienordnung	saveSortierung	\N	2021-11-11 09:52:13.552995	checksystem	\N	\N	studienplan
 29	soap/benutzer	search	\N	2021-11-11 09:52:13.555927	checksystem	\N	\N	benutzer
 30	soap/buchungen	getBuchungen	\N	2021-11-11 09:52:13.558745	checksystem	\N	\N	konto
+31	soap/studienordnung	loadTemplates	\N	2026-03-31 14:08:33.474292	checksystem	\N	\N	lehrveranstaltung
+32	soap/studienordnung	loadTemplateByName	\N	2026-03-31 14:08:33.475636	checksystem	\N	\N	lehrveranstaltung
 \.
 
 
@@ -40271,7 +45998,7 @@ Anerkennungsbed.	7	17	sehr kritisch
 -- Data for Name: tbl_pruefling; Type: TABLE DATA; Schema: testtool; Owner: fhcomplete
 --
 
-COPY testtool.tbl_pruefling (pruefling_id, studiengang_kz, idnachweis, registriert, prestudent_id, semester) FROM stdin;
+COPY testtool.tbl_pruefling (pruefling_id, studiengang_kz, idnachweis, registriert, prestudent_id, semester, gesperrt) FROM stdin;
 \.
 
 
@@ -40688,6 +46415,20 @@ SELECT pg_catalog.setval('campus.seq_pruefungsfenster_pruefungsfenster_id', 1, f
 SELECT pg_catalog.setval('campus.seq_pruefungstermin_pruefungstermin_id', 1, false);
 
 
+--
+-- Name: seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id; Type: SEQUENCE SET; Schema: campus; Owner: fhcomplete
+--
+
+SELECT pg_catalog.setval('campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id', 1, false);
+
+
+--
+-- Name: seq_zeitwunsch_zeitwunsch_id; Type: SEQUENCE SET; Schema: campus; Owner: fhcomplete
+--
+
+SELECT pg_catalog.setval('campus.seq_zeitwunsch_zeitwunsch_id', 1, false);
+
+
 --
 -- Name: tbl_abgabe_abgabe_id_seq; Type: SEQUENCE SET; Schema: campus; Owner: fhcomplete
 --
@@ -40832,7 +46573,7 @@ SELECT pg_catalog.setval('lehre.seq_anrechnung_anrechnungstatus_anrechnungstatus
 -- Name: seq_anrechnung_begruendung_begruendung_id; Type: SEQUENCE SET; Schema: lehre; Owner: fhcomplete
 --
 
-SELECT pg_catalog.setval('lehre.seq_anrechnung_begruendung_begruendung_id', 4, true);
+SELECT pg_catalog.setval('lehre.seq_anrechnung_begruendung_begruendung_id', 5, true);
 
 
 --
@@ -41045,6 +46786,13 @@ SELECT pg_catalog.setval('public.seq_filter_filter_id', 1, false);
 SELECT pg_catalog.setval('public.seq_gruppe_gid', 50072, true);
 
 
+--
+-- Name: seq_gruppe_manager_gruppe_manager_id; Type: SEQUENCE SET; Schema: public; Owner: fhcomplete
+--
+
+SELECT pg_catalog.setval('public.seq_gruppe_manager_gruppe_manager_id', 1, false);
+
+
 --
 -- Name: seq_notiz_notiz_id; Type: SEQUENCE SET; Schema: public; Owner: fhcomplete
 --
@@ -41322,7 +47070,7 @@ SELECT pg_catalog.setval('system.seq_webservicelog_webservicelog_id', 1, false);
 -- Name: seq_webservicerecht_webservicerecht_id; Type: SEQUENCE SET; Schema: system; Owner: fhcomplete
 --
 
-SELECT pg_catalog.setval('system.seq_webservicerecht_webservicerecht_id', 30, true);
+SELECT pg_catalog.setval('system.seq_webservicerecht_webservicerecht_id', 32, true);
 
 
 --
@@ -41350,7 +47098,7 @@ SELECT pg_catalog.setval('system.tbl_extensions_id_seq', 1, false);
 -- Name: tbl_filters_id_seq; Type: SEQUENCE SET; Schema: system; Owner: fhcomplete
 --
 
-SELECT pg_catalog.setval('system.tbl_filters_id_seq', 26, true);
+SELECT pg_catalog.setval('system.tbl_filters_id_seq', 50, true);
 
 
 --
@@ -41371,14 +47119,14 @@ SELECT pg_catalog.setval('system.tbl_person_lock_lock_id_seq', 1, false);
 -- Name: tbl_phrase_phrase_id_seq; Type: SEQUENCE SET; Schema: system; Owner: fhcomplete
 --
 
-SELECT pg_catalog.setval('system.tbl_phrase_phrase_id_seq', 666, true);
+SELECT pg_catalog.setval('system.tbl_phrase_phrase_id_seq', 2814, true);
 
 
 --
 -- Name: tbl_phrasentext_phrasentext_id_seq; Type: SEQUENCE SET; Schema: system; Owner: fhcomplete
 --
 
-SELECT pg_catalog.setval('system.tbl_phrasentext_phrasentext_id_seq', 1329, true);
+SELECT pg_catalog.setval('system.tbl_phrasentext_phrasentext_id_seq', 4857, true);
 
 
 --
@@ -42264,14 +48012,6 @@ ALTER TABLE ONLY campus.tbl_zeitsperretyp
     ADD CONSTRAINT pk_tbl_zeitsperretyp PRIMARY KEY (zeitsperretyp_kurzbz);
 
 
---
--- Name: tbl_zeitwunsch pk_tbl_zeitwunsch; Type: CONSTRAINT; Schema: campus; Owner: fhcomplete
---
-
-ALTER TABLE ONLY campus.tbl_zeitwunsch
-    ADD CONSTRAINT pk_tbl_zeitwunsch PRIMARY KEY (stunde, mitarbeiter_uid, tag);
-
-
 --
 -- Name: tbl_template pk_template; Type: CONSTRAINT; Schema: campus; Owner: fhcomplete
 --
@@ -42288,6 +48028,22 @@ ALTER TABLE ONLY campus.tbl_zeitaufzeichnung_gd
     ADD CONSTRAINT pk_zeitaufzeichnung_gd_zeitaufzeichnung_gd_id PRIMARY KEY (zeitaufzeichnung_gd_id);
 
 
+--
+-- Name: tbl_zeitwunsch_gueltigkeit pk_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id; Type: CONSTRAINT; Schema: campus; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY campus.tbl_zeitwunsch_gueltigkeit
+    ADD CONSTRAINT pk_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id PRIMARY KEY (zeitwunsch_gueltigkeit_id);
+
+
+--
+-- Name: tbl_zeitwunsch pk_zeitwunsch_zeitwunsch_id; Type: CONSTRAINT; Schema: campus; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY campus.tbl_zeitwunsch
+    ADD CONSTRAINT pk_zeitwunsch_zeitwunsch_id PRIMARY KEY (zeitwunsch_id);
+
+
 --
 -- Name: tbl_contentlog uk_contentlog_contentlog_id; Type: CONSTRAINT; Schema: campus; Owner: fhcomplete
 --
@@ -42920,6 +48676,14 @@ ALTER TABLE ONLY public.tbl_fotostatus
     ADD CONSTRAINT pk_fotostatus PRIMARY KEY (fotostatus_kurzbz);
 
 
+--
+-- Name: tbl_gruppe_manager pk_gruppe_manager; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_gruppe_manager
+    ADD CONSTRAINT pk_gruppe_manager PRIMARY KEY (gruppe_manager_id);
+
+
 --
 -- Name: tbl_notiz pk_notiz; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
 --
@@ -43088,6 +48852,14 @@ ALTER TABLE ONLY public.tbl_adresse
     ADD CONSTRAINT pk_tbl_adresse PRIMARY KEY (adresse_id);
 
 
+--
+-- Name: tbl_adressentyp pk_tbl_adressentyp; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_adressentyp
+    ADD CONSTRAINT pk_tbl_adressentyp PRIMARY KEY (adressentyp_kurzbz);
+
+
 --
 -- Name: tbl_akte pk_tbl_akte; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
 --
@@ -43672,6 +49444,14 @@ ALTER TABLE ONLY public.tbl_gruppe
     ADD CONSTRAINT uk_gruppe_gid UNIQUE (gid);
 
 
+--
+-- Name: tbl_gruppe_manager uk_gruppe_manager_gruppe_kurzbz_uid; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_gruppe_manager
+    ADD CONSTRAINT uk_gruppe_manager_gruppe_kurzbz_uid UNIQUE (gruppe_kurzbz, uid);
+
+
 --
 -- Name: tbl_lehrverband uk_lehrverbandsgruppe_gid; Type: CONSTRAINT; Schema: public; Owner: fhcomplete
 --
@@ -44361,6 +50141,13 @@ CREATE INDEX idx_reservierung_ort ON campus.tbl_reservierung USING btree (ort_ku
 CREATE INDEX idx_reservierung_stunde ON campus.tbl_reservierung USING btree (stunde);
 
 
+--
+-- Name: idx_tbl_zeitaufzeichnung_uid; Type: INDEX; Schema: campus; Owner: fhcomplete
+--
+
+CREATE INDEX idx_tbl_zeitaufzeichnung_uid ON campus.tbl_zeitaufzeichnung USING btree (uid);
+
+
 --
 -- Name: idx_zeitsperre_uid; Type: INDEX; Schema: campus; Owner: fhcomplete
 --
@@ -44844,6 +50631,13 @@ CREATE INDEX idx_tbl_log_person_id ON system.tbl_log USING btree (person_id);
 CREATE INDEX idx_userberechtigung_uid ON system.tbl_benutzerrolle USING btree (uid);
 
 
+--
+-- Name: idx_webservicelog_beschreibung; Type: INDEX; Schema: system; Owner: fhcomplete
+--
+
+CREATE INDEX idx_webservicelog_beschreibung ON system.tbl_webservicelog USING btree (beschreibung);
+
+
 --
 -- Name: idx_webservicerecht_methode; Type: INDEX; Schema: system; Owner: fhcomplete
 --
@@ -45159,6 +50953,14 @@ ALTER TABLE ONLY bis.tbl_bisio_aufenthaltfoerderung
     ADD CONSTRAINT fk_tbl_bisio_aufenthaltfoerderung_bisio FOREIGN KEY (bisio_id) REFERENCES bis.tbl_bisio(bisio_id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 
+--
+-- Name: tbl_bisio fk_tbl_bisio_herkunftsland_code; Type: FK CONSTRAINT; Schema: bis; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY bis.tbl_bisio
+    ADD CONSTRAINT fk_tbl_bisio_herkunftsland_code FOREIGN KEY (herkunftsland_code) REFERENCES bis.tbl_nation(nation_code) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
 --
 -- Name: tbl_bisio_zweck fk_tbl_bisio_zweck_bisio; Type: FK CONSTRAINT; Schema: bis; Owner: fhcomplete
 --
@@ -45855,6 +51657,14 @@ ALTER TABLE ONLY campus.tbl_zeitaufzeichnung
     ADD CONSTRAINT fk_zeitaufzeichnung_service FOREIGN KEY (service_id) REFERENCES public.tbl_service(service_id) ON UPDATE CASCADE ON DELETE RESTRICT;
 
 
+--
+-- Name: tbl_zeitwunsch fk_zeitwunsch_zeitwunsch_gueltigkeit_id; Type: FK CONSTRAINT; Schema: campus; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY campus.tbl_zeitwunsch
+    ADD CONSTRAINT fk_zeitwunsch_zeitwunsch_gueltigkeit_id FOREIGN KEY (zeitwunsch_gueltigkeit_id) REFERENCES campus.tbl_zeitwunsch_gueltigkeit(zeitwunsch_gueltigkeit_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
 --
 -- Name: tbl_lvgesamtnote freigabevon_lvgesamtnote; Type: FK CONSTRAINT; Schema: campus; Owner: fhcomplete
 --
@@ -46567,6 +52377,14 @@ ALTER TABLE ONLY lehre.tbl_lehrveranstaltung
     ADD CONSTRAINT fk_lehrveranstaltung_raumtyp FOREIGN KEY (raumtyp_kurzbz) REFERENCES public.tbl_raumtyp(raumtyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
 
 
+--
+-- Name: tbl_lehrveranstaltung fk_lehrveranstaltung_template; Type: FK CONSTRAINT; Schema: lehre; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY lehre.tbl_lehrveranstaltung
+    ADD CONSTRAINT fk_lehrveranstaltung_template FOREIGN KEY (lehrveranstaltung_template_id) REFERENCES lehre.tbl_lehrveranstaltung(lehrveranstaltung_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
 --
 -- Name: tbl_lvangebot fk_lvangebot_gruppe_gruppe_kurzbz; Type: FK CONSTRAINT; Schema: lehre; Owner: fhcomplete
 --
@@ -47839,6 +53657,22 @@ ALTER TABLE ONLY public.tbl_personfunktionstandort
     ADD CONSTRAINT fk_funktion_personfunktionstandort FOREIGN KEY (funktion_kurzbz) REFERENCES public.tbl_funktion(funktion_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
 
 
+--
+-- Name: tbl_gruppe_manager fk_gruppe_manager_gruppe_kurzbz; Type: FK CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_gruppe_manager
+    ADD CONSTRAINT fk_gruppe_manager_gruppe_kurzbz FOREIGN KEY (gruppe_kurzbz) REFERENCES public.tbl_gruppe(gruppe_kurzbz) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: tbl_gruppe_manager fk_gruppe_manager_uid; Type: FK CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_gruppe_manager
+    ADD CONSTRAINT fk_gruppe_manager_uid FOREIGN KEY (uid) REFERENCES public.tbl_benutzer(uid) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
 --
 -- Name: tbl_notizzuordnung fk_lehreinheit_notizzuordnung; Type: FK CONSTRAINT; Schema: public; Owner: fhcomplete
 --
@@ -48287,6 +54121,14 @@ ALTER TABLE ONLY public.tbl_firmatag
     ADD CONSTRAINT fk_tag_firmatag FOREIGN KEY (tag) REFERENCES public.tbl_tag(tag) ON UPDATE CASCADE ON DELETE RESTRICT;
 
 
+--
+-- Name: tbl_adresse fk_tbl_adresse_adressentyp; Type: FK CONSTRAINT; Schema: public; Owner: fhcomplete
+--
+
+ALTER TABLE ONLY public.tbl_adresse
+    ADD CONSTRAINT fk_tbl_adresse_adressentyp FOREIGN KEY (typ) REFERENCES public.tbl_adressentyp(adressentyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
 --
 -- Name: tbl_akte fk_tbl_akte_ausstellungsnation; Type: FK CONSTRAINT; Schema: public; Owner: fhcomplete
 --
@@ -49970,13 +55812,11 @@ GRANT ALL ON SCHEMA lehre TO vilesci;
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: fhcomplete
 --
 
-REVOKE ALL ON SCHEMA public FROM postgres;
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 GRANT USAGE ON SCHEMA public TO web;
 GRANT ALL ON SCHEMA public TO admin;
 GRANT ALL ON SCHEMA public TO vilesci;
-GRANT CREATE ON SCHEMA public TO fhcomplete;
 
 
 --
@@ -50215,6 +56055,7 @@ GRANT SELECT,UPDATE ON SEQUENCE bis.tbl_gsprogramm_gsprogramm_id_seq TO vilesci;
 --
 
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE bis.tbl_gsprogramm TO vilesci;
+GRANT SELECT ON TABLE bis.tbl_gsprogramm TO web;
 
 
 --
@@ -50261,6 +56102,7 @@ GRANT SELECT,UPDATE ON SEQUENCE bis.tbl_mobilitaet_mobilitaet_id_seq TO vilesci;
 --
 
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE bis.tbl_mobilitaet TO vilesci;
+GRANT SELECT ON TABLE bis.tbl_mobilitaet TO web;
 
 
 --
@@ -50530,6 +56372,22 @@ GRANT SELECT,UPDATE ON SEQUENCE campus.seq_pruefungstermin_pruefungstermin_id TO
 GRANT SELECT,UPDATE ON SEQUENCE campus.seq_pruefungstermin_pruefungstermin_id TO vilesci;
 
 
+--
+-- Name: SEQUENCE seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id; Type: ACL; Schema: campus; Owner: fhcomplete
+--
+
+GRANT SELECT,UPDATE ON SEQUENCE campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id TO vilesci;
+GRANT SELECT,UPDATE ON SEQUENCE campus.seq_zeitwunsch_gueltigkeit_zeitwunsch_gueltigkeit_id TO web;
+
+
+--
+-- Name: SEQUENCE seq_zeitwunsch_zeitwunsch_id; Type: ACL; Schema: campus; Owner: fhcomplete
+--
+
+GRANT SELECT,UPDATE ON SEQUENCE campus.seq_zeitwunsch_zeitwunsch_id TO vilesci;
+GRANT SELECT,UPDATE ON SEQUENCE campus.seq_zeitwunsch_zeitwunsch_id TO web;
+
+
 --
 -- Name: TABLE tbl_abgabe; Type: ACL; Schema: campus; Owner: fhcomplete
 --
@@ -51074,6 +56932,14 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE campus.tbl_zeitwunsch TO admin;
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE campus.tbl_zeitwunsch TO vilesci;
 
 
+--
+-- Name: TABLE tbl_zeitwunsch_gueltigkeit; Type: ACL; Schema: campus; Owner: fhcomplete
+--
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE campus.tbl_zeitwunsch_gueltigkeit TO vilesci;
+GRANT SELECT,INSERT,UPDATE ON TABLE campus.tbl_zeitwunsch_gueltigkeit TO web;
+
+
 --
 -- Name: TABLE tbl_benutzer; Type: ACL; Schema: public; Owner: fhcomplete
 --
@@ -52159,6 +58025,13 @@ GRANT SELECT,UPDATE ON SEQUENCE public.seq_aufnahmetermin_aufnahmetermin_id TO v
 GRANT SELECT,UPDATE ON SEQUENCE public.seq_filter_filter_id TO vilesci;
 
 
+--
+-- Name: SEQUENCE seq_gruppe_manager_gruppe_manager_id; Type: ACL; Schema: public; Owner: fhcomplete
+--
+
+GRANT SELECT,UPDATE ON SEQUENCE public.seq_gruppe_manager_gruppe_manager_id TO vilesci;
+
+
 --
 -- Name: SEQUENCE seq_notiz_notiz_id; Type: ACL; Schema: public; Owner: fhcomplete
 --
@@ -52257,6 +58130,14 @@ GRANT SELECT,UPDATE ON SEQUENCE public.tbl_adresse_adresse_id_seq TO web;
 GRANT ALL ON SEQUENCE public.tbl_adresse_adresse_id_seq TO vilesci;
 
 
+--
+-- Name: TABLE tbl_adressentyp; Type: ACL; Schema: public; Owner: fhcomplete
+--
+
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_adressentyp TO vilesci;
+GRANT SELECT ON TABLE public.tbl_adressentyp TO web;
+
+
 --
 -- Name: TABLE tbl_akte; Type: ACL; Schema: public; Owner: fhcomplete
 --
@@ -52527,6 +58408,14 @@ GRANT SELECT ON TABLE public.tbl_geschlecht TO wawi;
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_geschlecht TO vilesci;
 
 
+--
+-- Name: TABLE tbl_gruppe_manager; Type: ACL; Schema: public; Owner: fhcomplete
+--
+
+GRANT SELECT ON TABLE public.tbl_gruppe_manager TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_gruppe_manager TO vilesci;
+
+
 --
 -- Name: SEQUENCE tbl_kontakt_kontakt_id_seq; Type: ACL; Schema: public; Owner: fhcomplete
 --
@@ -54080,3 +59969,5 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE wawi.tbl_zahlungstyp TO vilesci;
 -- PostgreSQL database dump complete
 --
 
+\unrestrict 2Y3Q8Pggmu0tPpehsGNIym2tWUXRPkjsnoLHPATTfaERaqrOEyOGu7nkmvh7lwP
+

From 298dbbf400ba7301f6e664446ccfeb3e52c7c0b4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 2 Apr 2026 10:58:49 +0200
Subject: [PATCH 1320/1357] use context vm for tabulator event, refactor
 function toggleRowClick, delete unused commented sections

---
 public/js/components/Vertraege/Vertraege.js | 142 +++-----------------
 1 file changed, 15 insertions(+), 127 deletions(-)

diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index d4d65e428..30dc593c7 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -20,9 +20,6 @@ export default {
 		ContractStati
 	},
 	inject: {
-/*		cisRoot: {
-			from: 'cisRoot'
-		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -145,6 +142,8 @@ export default {
 			return options;
 		},
 		tabulatorEvents() {
+			const vm = this;
+
 			const events = [
 				{
 					event: 'tableBuilt',
@@ -177,28 +176,11 @@ export default {
 						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				},
-/*				{
-					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
-					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
-					event: 'rowClick',
-					handler: (e, row) => {
-						if (this.dataPrintHonorar != null && this.dataPrintHonorar.multiselect != null) {
-							const selectedContract = row.getData().vertrag_id;
-							const status = row.getData().status;
-							const bezeichnung =	row.getData().bezeichnung;
-
-							this.toggleRowClick(selectedContract, status, bezeichnung);
-						}
-					}
-				},*/
 				{
 					event: 'rowClick',
-					handler: (e, row) => {
-						if (!this.dataPrintHonorar?.multiselect) return;
-
+					handler: function (e, row) {
 						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
-
-						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+						vm.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
 					}
 				},
 				{
@@ -242,8 +224,6 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
-/*			if(this.dataPrintHonorar?.multiselect)
-				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -270,7 +250,6 @@ export default {
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					//window.scrollTo(0, 0);
 					this.reload();
 					this.contractSelected.vertrag_id = null;
 				})
@@ -518,19 +497,9 @@ export default {
 					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
 			window.open(linkToPdf, '_blank');
 		},
-/*		toggleRowClick(contractId, status, bezeichnung) {
-			const index = this.arraySelectedContracts.findIndex(
-				([id]) => id === contractId
-			);
-			if (index !== -1) {
-				this.arraySelectedContracts.splice(index, 1);
-			} else {
-				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
-			}
-		},*/
 		toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
-			if (!this.dataPrintHonorar?.multiselect) return;
 
+			const isMulti = this.dataPrintHonorar?.multiselect === true;
 			const isCtrl = event.ctrlKey || event.metaKey;
 
 			const entry = {
@@ -540,28 +509,29 @@ export default {
 				vertragstyp_bezeichnung
 			};
 
-			// Single click
-			if (!isCtrl) {
+			// allow MultiSelect just in case event multiActionPrintHonorarvertrag
+			const allowMultiClick = isMulti && isCtrl;
+
+			if (!allowMultiClick) {
 				this.arraySelectedContracts = [entry];
+
+				//just mark last selected row as selected
+				this.$refs.table.tabulator.deselectRow();
+				this.$refs.table.tabulator.selectRow(vertrag_id);
 				return;
 			}
 
-			// CTRL / CMD → toggle
 			const index = this.arraySelectedContracts.findIndex(
 				e => e.vertrag_id === vertrag_id
 			);
 
 			if (index === -1) {
 				this.arraySelectedContracts.push(entry);
-				//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
 			} else {
 				this.arraySelectedContracts.splice(index, 1);
 			}
-		},
-/*		clearSelection(){
-			this.arraySelectedContracts = [];
-			this.$refs.table.tabulator.deselectRow();
-		}*/
+
+		}
 	},
 	created() {
 		Promise.all([
@@ -587,88 +557,6 @@ export default {
 		});
 		this.getFormattedDate();
 	},
-	/*
-	TODO(Manu) delete after check
-
-		<div class="row mb-3">
-			<form-input
-				type="DatePicker"
-				:label="$p.t('vertrag/datum_vertrag')"
-				name="vertragsdatum"
-				v-model="formData.vertragsdatum"
-				auto-apply
-				:enable-time-picker="false"
-				format="dd.MM.yyyy"
-				preview-format="dd.MM.yyyy"
-				:teleport="true"
-				>
-			</form-input>
-		</div>
-
-		<div class="row mb-3">
-			<form-input
-				type="text"
-				:label="$p.t('ui/bezeichnung')"
-				name="bezeichnung"
-				v-model="formData.bezeichnung"
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3">
-			<form-input
-				type="select"
-				:label="$p.t('global/typ')"
-				v-model="formData.vertragstyp_kurzbz"
-				name="vertragstyp_kurzbz"
-				>
-				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-				<option
-					v-for="entry in listContractTypes"
-					:key="entry.vertragstyp_kurzbz"
-					:value="entry.vertragstyp_kurzbz"
-					>
-					{{entry.bezeichnung}}
-				</option>
-			</form-input>
-		</div>
-		<div class="row mb-3">
-			<form-input
-				:label="$p.t('ui/betrag')"
-				name="betrag"
-				v-model="formData.betrag"
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3" v-if="!statusNew">
-			<form-input
-				type="text"
-				:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-				name="vertragsstunden"
-				v-model="formData.vertragsstunden"
-				disabled
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3" v-if="!statusNew">
-			<form-input
-				type="text"
-				:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-				name="vertragsstunden_studiensemester_kurzbz"
-				v-model="formData.vertragsstunden_studiensemester_kurzbz"
-				disabled
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3">
-			<form-input
-				type="textarea"
-				:label="$p.t('global/anmerkung')"
-				name="anmerkung"
-				v-model="formData.anmerkung"
-				>
-			</form-input>
-		</div>
-	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 

From 3f53c5febacf6b0a1913d97248ed20b9db0e4542 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Thu, 2 Apr 2026 14:23:59 +0200
Subject: [PATCH 1321/1357] Added: method getKFLByUID to get
 Kompetenzfeldleitung by UID

---
 .../models/person/Benutzerfunktion_model.php  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php
index 8c43e4f84..dff422b7d 100644
--- a/application/models/person/Benutzerfunktion_model.php
+++ b/application/models/person/Benutzerfunktion_model.php
@@ -261,6 +261,42 @@ class Benutzerfunktion_model extends DB_Model
     }
 
 
+	/**
+	 * Get active Kompetenzfeldleitung bei UID.
+	 *
+	 * @param $uid
+	 * @return array|stdClass|null
+	 */
+	public function getKFLByUID($uid)
+	{
+		$query = '
+            SELECT
+			  	bf.uid,
+				bf.oe_kurzbz,
+  				oe.organisationseinheittyp_kurzbz
+            FROM
+			  	public.tbl_benutzerfunktion bf
+				JOIN public.tbl_organisationseinheit oe USING (oe_kurzbz)
+  				JOIN public.tbl_benutzer b USING (uid)
+            WHERE
+                b.uid = ?
+              	AND b.aktiv = TRUE
+                AND funktion_kurzbz = \'Leitung\'
+               	AND organisationseinheittyp_kurzbz = \'Kompetenzfeld\'
+              	AND (datum_von IS NULL OR datum_von <= now())
+              	AND (datum_bis IS NULL OR datum_bis >= now())
+        ';
+
+		$parameters_array = array();
+		if (is_string($uid))
+		{
+			$parameters_array[] = $uid;
+		}
+
+		return $this->execQuery($query, $parameters_array);
+	}
+
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

From 423bbd95a68885b751cf444ac4c474fa0fef106b Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Mon, 6 Apr 2026 19:30:32 +0200
Subject: [PATCH 1322/1357] add vordienstzeit to lohnguide

---
 system/dbupdate_3.4/70376_lohnguide.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index 33052023a..61486b10d 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -310,6 +310,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 		$qry = "
 CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
     vertragsbestandteil_id integer NOT NULL,
+	vordienstzeit int,
     stellenbezeichnung varchar(255),
     fachrichtung_kurzbz character varying(32) NOT NULL,
     modellstelle_kurzbz character varying(32) NOT NULL,
@@ -347,4 +348,23 @@ if($result = $db->db_query("SELECT 1 FROM hr.tbl_vertragsbestandteiltyp WHERE ve
 			echo "<br>Vertragsbestandteiltyp 'lohnguide' hinzugefuegt";
 	}
 }
+
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='vordienstzeit' AND table_name='tbl_vertragsbestandteil_lohnguide' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+			ALTER TABLE 
+				hr.tbl_vertragsbestandteil_lohnguide 
+			ADD COLUMN 
+				vordienstzeit int;
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Lohnguide: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Spalte vordienstzeit wurde in hr.tbl_vertragsbestandteil_lohnguide neu erstellt<br>';
+		
+	}
+}
 		
\ No newline at end of file

From 5c463c086693ce00b2fe6e5b67e48548e6144d4d Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Mon, 6 Apr 2026 21:49:53 +0200
Subject: [PATCH 1323/1357] add vordienstzeit to lohnguide

---
 .../VertragsbestandteilLohnguide.php              | 15 +++++++++++++++
 .../Vertragsbestandteil_model.php                 |  2 +-
 system/dbupdate_3.4.php                           |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
index 5a61cc5db..0e071f36b 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
@@ -7,6 +7,7 @@ use vertragsbestandteil\VertragsbestandteilFactory;
 class VertragsbestandteilLohnguide extends Vertragsbestandteil
 {
 	protected $stellenbezeichnung;
+	protected $vordienstzeit;
 	protected $fachrichtung_kurzbz;
 	protected $modellstelle_kurzbz;
 	protected $kommentar_person;
@@ -32,6 +33,18 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 		return $this;
 	}
 
+	public function getVordienstzeit()
+	{
+		return $this->vordienstzeit;
+	}
+
+	public function setVordienstzeit($vordienstzeit): self
+	{
+		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
+		$this->vordienstzeit = $vordienstzeit;
+		return $this;
+	}
+
 	public function getFachrichtung_kurzbz()
 	{
 		return $this->fachrichtung_kurzbz;
@@ -89,6 +102,7 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 		$this->fromdb = $fromdb;
 		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
 		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
+		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
 		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
 		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
 		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
@@ -100,6 +114,7 @@ class VertragsbestandteilLohnguide extends Vertragsbestandteil
 		$tmp = array(
 			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
 			'stellenbezeichnung' => $this->getStellenbezeichnung(),
+			'vordienstzeit' => $this->getVordienstzeit(),
 			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
 			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
 			'kommentar_person' => $this->getKommentar_person(),
diff --git a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
index fe6823293..334a29dfd 100644
--- a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
@@ -38,7 +38,7 @@ class Vertragsbestandteil_model extends DB_Model
 				s.wochenstunden, s.teilzeittyp_kurzbz,
 				u.tage,
 				z.zeitaufzeichnung, z.azgrelevant, z.homeoffice,
-				lg.stellenbezeichnung, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
+				lg.stellenbezeichnung, lg.vordienstzeit, lg.fachrichtung_kurzbz, lg.modellstelle_kurzbz, lg.kommentar_person, lg.kommentar_modellstelle
 			FROM
 				hr.tbl_vertragsbestandteil v
 			LEFT JOIN
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 174034398..78dec16d3 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -244,7 +244,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),

From b2538075ee50e6e596d897a00c68e9f1932cd154 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 7 Apr 2026 10:35:06 +0200
Subject: [PATCH 1324/1357] use STV_TAGS_ENABLED config when preparing sql
 statement for students list to query tags only if enabled

---
 .../api/frontend/v1/stv/Students.php          | 76 +++++++++++--------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 55f4b8976..f87e527e0 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
-		
+
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -851,40 +851,44 @@ 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);
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$tags = $this->config->item('stv_prestudent_tags');
 
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
+			$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) . ")";
 			}
-			$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
+			";
 		}
-		$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');
@@ -907,11 +911,17 @@ 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');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$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');
+		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
+		{
+			$this->PrestudentModel->addSelect('tag_data_agg.tags');
+		}
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');

From 8fddbc3a32655b4455b0ffc8df11ed351e6925b4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 10 Apr 2026 09:15:34 +0200
Subject: [PATCH 1325/1357] delete watcher for formData fields, add setContent
 for loading Vorlage

---
 .../Messages/Details/NewMessage/Modal.js      | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 47187de89..ed013b0d3 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -133,6 +133,7 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
+					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
@@ -203,24 +204,6 @@ export default {
 		},
 	},
 	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal);
-				}
-			}
-		},
 		messageId: {
 			immediate: true,
 			handler: async function (newMessageId) {

From 843894405e8816c6f74faefd430202f7378b398c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 10 Apr 2026 13:03:24 +0200
Subject: [PATCH 1326/1357] changes for NewDiv

remove Watcher for formData Fields
add predefault settings for tabulator fields
add setContent for Editor
change text for closing window/tab
show alertSuccess for sending Message just in case of inSamePage
---
 .../Messages/Details/NewMessage/NewDiv.js     | 61 ++++++-------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index b0c52f0f7..51da7bf94 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -64,7 +64,16 @@ export default {
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
 				//height: 800,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
+				plugins: 'link',
+				link_context_toolbar: true,
+				automatic_uploads: true,
+				default_link_target: "_blank",
+				link_title: true,
+				target_list: [
+					{ title: 'New tab', value: '_blank' },
+					{ title: 'Same tab', value: '_self' }
+				],
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -98,7 +107,8 @@ export default {
 			return this.$api
 				.call(ApiMessages.sendMessage(this.typeId, data))
 				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					if(this.openMode == "inSamePage")
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
 					this.resetForm();
 					this.messageSent = true;
@@ -114,19 +124,17 @@ export default {
 			return this.$api
 				.call(ApiMessages.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
+					this.editor.setContent(response.data.text);
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
 				}).catch(this.$fhcAlert.handleSystemError);
 		},
 		getPreviewText(){
-			console.log("subj" + this.formData.subject);
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
 			data.append('ids', JSON.stringify(this.id));
 
-			console.log("subj" + this.formData.subject);
-
 			return this.$api
 				.call(ApiMessages.getPreviewText(
 					this.typeId, data))
@@ -190,38 +198,6 @@ export default {
 				this.previewBody = this.previewText;
 			});
 		},
-		loadReplyData(messageId){
-			this.$api
-				.call(ApiMessages.getReplyData(messageId))
-				.then(result => {
-					this.replyData = result.data;
-					this.formData.subject = this.replyData[0].replySubject;
-					this.formData.body = this.replyData[0].replyBody;
-					this.formData.relationmessage_id = messageId;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-	},
-	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal);
-				}
-			}
-		},
 	},
 	created(){
 		const missingparamsmsgs = [];
@@ -291,9 +267,8 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		//case of reply
-		if(this.messageId != null) {
-			this.loadReplyData(this.messageId);
-/*			this.$api
+		if(this.messageId) {
+			this.$api
 				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
@@ -301,7 +276,7 @@ export default {
 					this.formData.body = this.replyData[0].replyBody;
 					this.formData.relationmessage_id = this.messageId;
 				})
-				.catch(this.$fhcAlert.handleSystemError);*/
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 
 	},
@@ -499,10 +474,10 @@ export default {
 						
 						<div class="row">
 							<div class="col-6" style="border-right: 1px">
-								You can safely close this window.
+								You can safely close this window/tab.
 							</div>
 							<div class="col-6">
-								Sie können dieses Fenster schließen.
+								Fenster/Reiter kann geschlossen werden!
 							</div>
 						</div>
 				</div>

From ea0a24961286506e77f70554bb51278167b5847d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 13 Apr 2026 09:14:27 +0200
Subject: [PATCH 1327/1357] micro degree abschlussdokumente hinzugefuegt

---
 .../components/Stv/Studentenverwaltung/Details/Archiv.js  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 9d8104ba5..ca5a5a0ca 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -84,6 +84,14 @@ export default {
 					'microcredential_2',
 					'microcredential_3',
 					'microcredential_4',
+					'microdegree_1',
+					'microdegree_2',
+					'microdegree_3',
+					'microdegree_4',
+					'microdegreeabschluss_1',
+					'microdegreeabschluss_2',
+					'microdegreeabschluss_3',
+					'microdegreeabschluss_4',
 				]
 			},
 			documentDropdownObject: {}

From 21d80905a23337bb4f6157737f89236d305c8e60 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 13 Apr 2026 13:04:46 +0200
Subject: [PATCH 1328/1357] akzeptierte dokumente anzeigen, auch wenn kein
 dokument vorhanden ist

---
 .../api/frontend/v1/stv/Dokumente.php         | 46 ++++++-------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index b8c7830bd..913a57dc4 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];
 
-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);

From 3ce3eff0221374d76a5227ee610f6eb16ea70423 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 14 Apr 2026 09:30:45 +0200
Subject: [PATCH 1329/1357] fehlendes mapping hinzugefuegt

---
 content/student/studentoverlay.js.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 9ebe73cfe..1e40960ca 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3555,6 +3555,14 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredential_2':
 		case 'microcredential_3':
 		case 'microcredential_4':
+		case 'microdegree_1':
+		case 'microdegree_2':
+		case 'microdegree_3':
+		case 'microdegree_4':
+		case 'microdegreeabschluss_1':
+		case 'microdegreeabschluss_2':
+		case 'microdegreeabschluss_3':
+		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

From 95a7797ae9f8ed9a8fe25af9e9188409f5dc5c7d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 14 Apr 2026 15:46:34 +0200
Subject: [PATCH 1330/1357] delete unused apicall for mode modal add
 editor.setContent to function getReplyData readd loadReplyData and use v-show
 for visibleDiv for mode inSamePage

---
 .../Messages/Details/NewMessage/Modal.js      | 14 +-----------
 .../Messages/Details/NewMessage/NewDiv.js     | 22 +++++++++++--------
 public/js/components/Messages/Messages.js     |  4 ++--
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index ed013b0d3..eeda421e6 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -214,6 +214,7 @@ export default {
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
+						this.editor.setContent(this.replyData[0].replyBody);
 						this.formData.subject = this.replyData[0].replySubject;
 						this.formData.body = this.replyData[0].replyBody;
 						this.formData.relationmessage_id = newMessageId;
@@ -273,19 +274,6 @@ export default {
 
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-
-		//case of reply
-		if(this.messageId) {
-			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
-				.then(result => {
-					this.replyData = result.data;
-					this.formData.subject = this.replyData[0].replySubject;
-					this.formData.body = this.replyData[0].replyBody;
-					this.formData.relationmessage_id = this.messageId;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
 	},
 	async mounted() {
 		this.initTinyMCE();
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 51da7bf94..2e6ef30c5 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -198,6 +198,18 @@ export default {
 				this.previewBody = this.previewText;
 			});
 		},
+		loadReplyData(messageId){
+			this.$api
+				.call(ApiMessages.getReplyData(messageId))
+				.then(result => {
+					this.replyData = result.data;
+					this.editor.setContent(this.replyData[0].replyBody);
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	created(){
 		const missingparamsmsgs = [];
@@ -268,15 +280,7 @@ export default {
 
 		//case of reply
 		if(this.messageId) {
-			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
-				.then(result => {
-					this.replyData = result.data;
-					this.formData.subject = this.replyData[0].replySubject;
-					this.formData.body = this.replyData[0].replyBody;
-					this.formData.relationmessage_id = this.messageId;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+			this.loadReplyData(this.messageId);
 		}
 
 	},
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index e1fb69dc3..3b02c4af6 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -82,8 +82,8 @@ export default {
 				this.$refs.modalMsg.show();
 			}
 			else if (this.openMode == "inSamePage"){
-				console.log("in same Page");
 				this.isVisibleDiv = true;
+
 				if(messageId)
 					this.$refs.templateNewDivMessage.loadReplyData(messageId);
 				else
@@ -170,7 +170,7 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
+		<div v-show="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
 				v-if="tablebuilt || id.length > 1"
 				ref="templateNewDivMessage"

From 73e03ba901fac14ce9f4813682cb59ac56d60883 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 15 Apr 2026 10:44:03 +0200
Subject: [PATCH 1331/1357] =?UTF-8?q?Gehaltstyp=20=C3=9Cberstundenpauschal?=
 =?UTF-8?q?e=20und=20Sachbezug=20PKW?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/dbupdate_3.4/70376_lohnguide.php | 54 +++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index 61486b10d..2c1eb1845 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -367,4 +367,58 @@ if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE colu
 		
 	}
 }
+
+if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='ueberstundenpauschale'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		INSERT INTO hr.tbl_gehaltstyp
+		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
+		VALUES
+		    ('ueberstundenpauschale','Überstundenpauschale', true, 8, true);
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Gehaltstyp "Überstundenpauschale" erstellt.<br />';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='ueberstundenpauschale'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		INSERT INTO hr.tbl_gehaltstyp
+		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
+		VALUES
+		    ('ueberstundenpauschale','Überstundenpauschale', true, 8, true, true);
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Gehaltstyp "Überstundenpauschale" erstellt.<br />';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='sachbezug_pkw'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		INSERT INTO hr.tbl_gehaltstyp
+		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
+		VALUES
+		    ('sachbezug_pkw','Sachbezug PKW', true, 9, true, true);
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Gehaltstyp "Sachbezug PKW" erstellt.<br />';
+	}
+}
 		
\ No newline at end of file

From c701d9277922b85e4302582781bd8e2e3de61c51 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 15 Apr 2026 11:15:10 +0200
Subject: [PATCH 1332/1357] fix db_update

---
 system/dbupdate_3.4/70376_lohnguide.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index 2c1eb1845..5a31c8568 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -368,23 +368,6 @@ if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE colu
 	}
 }
 
-if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='ueberstundenpauschale'"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-		INSERT INTO hr.tbl_gehaltstyp
-		    (gehaltstyp_kurzbz, bezeichnung, valorisierung, sort, aktiv, lvexport)
-		VALUES
-		    ('ueberstundenpauschale','Überstundenpauschale', true, 8, true);
-		";
-
-		if (! $db->db_query($qry))
-			echo '<strong>Gehaltstyp: ' . $db->db_last_error() . '</strong><br>';
-		else
-			echo 'Gehaltstyp "Überstundenpauschale" erstellt.<br />';
-	}
-}
 
 if ($result = $db->db_query("SELECT * FROM hr.tbl_gehaltstyp WHERE gehaltstyp_kurzbz='ueberstundenpauschale'"))
 {

From d499619cf341c82467f78a9cafab26dabfe46ce7 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Wed, 15 Apr 2026 13:39:06 +0200
Subject: [PATCH 1333/1357] Added phrase endedatumMussInZukunftLiegen

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

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cc97b6eb3..0476db2c9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -57889,6 +57889,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'lvevaluierung',
+		'category' => 'global',
+		'phrase' => 'endedatumMussInZukunftLiegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Endedatum muss mindestens {minutes} Minuten in der Zukunft liegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The end date must be at least {minutes} minutes in the future',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### 		DOKUMENTE ERSTELLEN PHRASEN 		END 		###
 	// ### Personen zusammenlegen Phrasen BEGIN
 	array(

From 88b22f5490813070e9bc5a4f0ce56412e0d2ae90 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 15 Apr 2026 17:02:58 +0200
Subject: [PATCH 1334/1357] revert to v-if to not render element when not
 necessary and use Vue.nextTick for dependent code

---
 public/js/components/Messages/Messages.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 3b02c4af6..bb69d2139 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -84,12 +84,14 @@ export default {
 			else if (this.openMode == "inSamePage"){
 				this.isVisibleDiv = true;
 
-				if(messageId)
-					this.$refs.templateNewDivMessage.loadReplyData(messageId);
-				else
-					this.$refs.templateNewDivMessage.resetForm();
+				this.$nextTick(() => {
+					if(messageId)
+						this.$refs.templateNewDivMessage.loadReplyData(messageId);
+					else
+						this.$refs.templateNewDivMessage.resetForm();
 
-				this.$refs.templateNewDivMessage.showTemplate();
+					this.$refs.templateNewDivMessage.showTemplate();
+				});
 			}
 			else
 				console.log("no valid openMode");
@@ -170,7 +172,7 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-show="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
+		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
 				v-if="tablebuilt || id.length > 1"
 				ref="templateNewDivMessage"

From f121f9b5a21fc106b4073cf46b2330bce0792007 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 16 Apr 2026 11:23:57 +0200
Subject: [PATCH 1335/1357] deactivate pagination - since potentially msg
 threads are not shown completely

---
 .../api/frontend/v1/messages/Messages.php     | 14 ++++++++++---
 application/models/system/Message_model.php   | 10 +++++----
 public/js/api/factory/messages/messages.js    | 13 +++++++-----
 .../Messages/Details/TableMessages.js         | 21 ++++++++++++++++---
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 3035e532d..77b46f97b 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -42,14 +42,22 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id, $size, $page)
+	public function getMessages($id, $type_id, $size=null, $page=null)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		$offset = $size * ($page - 1);
-		$limit = $size;
+		if(!(is_null($size) && is_null($page)))
+		{
+			$offset = $size * ($page - 1);
+			$limit = $size;
+		}
+		else
+		{
+			$offset = null;
+			$limit = null;
+		}
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 3e59d7250..ba51e514e 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -242,6 +242,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesForTable($person_id, $offset, $limit)
 	{
+		$limitoffset = (!is_null($offset) && !is_null($limit)) ? 'limit ? offset ?' : '';
 		$sql = <<<EOSQL
 			with filtered_messages as (
 				select
@@ -310,11 +311,12 @@ class Message_model extends DB_Model
 				public.tbl_person pr on pr.person_id = fm.recipient_id
 			order by
 				m.insertamum DESC
-			limit ?
-			offset ?;
+			{$limitoffset}
 EOSQL;
 
-		$parametersArray = array($person_id, $person_id, $limit, $offset);
+		$parametersArray = $limitoffset
+			? array($person_id, $person_id, $limit, $offset)
+			: array($person_id, $person_id);
 
 		$count = 0;
 		$data = $this->execQuery($sql, $parametersArray);
@@ -325,7 +327,7 @@ EOSQL;
 		$data = getData($data);
 		if($data)
 		{
-			$count = ceil($data[0]->total_msgs / $limit);
+			$count = is_null($limit) ? 1 : ceil($data[0]->total_msgs / $limit);
 		}
 
 		return success(['data' => $data, 'count' => $count]);
diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index b7b21dd8a..fb752cfb4 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -17,13 +17,16 @@
 
 export default {
 	getMessages(params) {
+		let url = 'api/frontend/v1/messages/messages/getMessages'
+				+ '/' + params.id
+				+ '/' + params.type;
+			if(params.size && params.page) {
+				url += '/' + params.size
+				+ '/' + params.page;
+			}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getMessages/'
-				+ params.id + '/'
-				+ params.type + '/'
-				+ params.size + '/'
-				+ params.page
+			url: url
 		};
 	},
 	getVorlagen(){
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index d2101e2cb..aefa8bb2a 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -65,7 +65,14 @@ export default {
 		buildTreemap(messages) {
 			if (!messages || !messages.data || messages.data.length === 0)
 			{
-				return {data: [], last_page: 0};
+				if(this.tabulatorOptions.pagination)
+				{
+					return {data: [], last_page: 0};
+				}
+				else
+				{
+					return [];
+				}
 			}
 
 			const last_page = messages.meta.count;
@@ -106,7 +113,15 @@ export default {
 				// to avoid endless loop
 				if (iteration > messages.length) break;
 			}
-			return {data: messageNested, last_page: last_page};
+
+			if(this.tabulatorOptions.pagination)
+			{
+				return {data: messageNested, last_page: last_page};
+			}
+			else
+			{
+				return messageNested;
+			}
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
@@ -252,7 +267,7 @@ export default {
 						frozen: true
 					}
 				],
-				pagination: true,
+				pagination: false,
 				paginationMode: "remote",
 				paginationSize: 15,
 				paginationInitialPage: 1,

From e48b94b858c35cc0d20e248c305f2b54079b4400 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 17 Apr 2026 12:35:55 +0200
Subject: [PATCH 1336/1357] studiengangskuerzel statt kurzbzlang

---
 application/models/organisation/Studiengang_model.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 08f40f6d4..9e51dc561 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -594,8 +594,10 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname,
-				' (', " . $this->dbTable . ".bezeichnung, ', ',		" . $this->dbTable . ".kurzbzlang,')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
+			. $this->dbTable . ".bezeichnung, ', ', "
+			. "UPPER(" . $this->dbTable . ".typ), "
+			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(

From 26db4a5e7a17ed9f21ac9b99ba1198199f8df4fb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 20 Apr 2026 09:31:52 +0200
Subject: [PATCH 1337/1357] adding redraw tabulator and fallback to avoid empty
 column

---
 public/js/components/Messages/Details/TableMessages.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index aefa8bb2a..02b941fcf 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -195,7 +195,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p.t('messages', key);
+							return this.$p?.t?.('messages', key) || key;
 						},
 					},
 					{
@@ -307,6 +307,7 @@ export default {
 					handler: async() => {
 						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
 
+						this.$refs.table.tabulator.redraw(true); //for immediate translation of status
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;

From 3a646ffe77b1078f4f8d6490ee693dba2d972bb7 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 20 Apr 2026 11:06:06 +0200
Subject: [PATCH 1338/1357] adapt AbgabeJob relevant queries so they compare
 with the pgsql date function CURRENT_DATE instead of NOW() to avoid the
 cutoff from uploads the happened "yesterday but more than 24 hours ago"; also
 added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this
 exact case as updates 2 days in a row;

---
 application/models/education/Paabgabe_model.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index be42b7660..d59b7cf62 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -79,10 +79,16 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (
+			(campus.tbl_paabgabe.insertamum >= CURRENT_DATE - INTERVAL ? 
+				AND campus.tbl_paabgabe.insertamum < CURRENT_DATE
+			)
+			OR 
+			(campus.tbl_paabgabe.updateamum >= CURRENT_DATE - INTERVAL ? 
+					AND campus.tbl_paabgabe.updateamum < CURRENT_DATE
+			)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +114,8 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum >= CURRENT_DATE - INTERVAL ?
+				AND campus.tbl_paabgabe.abgabedatum < CURRENT_DATE";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

From dac71f597a2fd7d7e02d01428102d254ac0e5976 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Mon, 20 Apr 2026 11:24:59 +0200
Subject: [PATCH 1339/1357] =?UTF-8?q?Spalte=20Anmeldedatum=20in=20RT-?=
 =?UTF-8?q?=C3=9Cbersicht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Spalte Frage_ID in RT-Administration
JQuery und Tabelsorter aus Include in Service_Uebersicht
---
 cis/private/info/service_uebersicht.php       | 10 +++---
 .../reihungstest_administration.php           |  6 +++-
 vilesci/stammdaten/reihungstestverwaltung.php | 31 +++++++++++++++++--
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/cis/private/info/service_uebersicht.php b/cis/private/info/service_uebersicht.php
index 348a82b0d..ef2516bf7 100644
--- a/cis/private/info/service_uebersicht.php
+++ b/cis/private/info/service_uebersicht.php
@@ -46,12 +46,13 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
 	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-	<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 	<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>';
 
+	include('../../../include/meta/jquery.php');
+	include('../../../include/meta/jquery-tablesorter.php');
+
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
+		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';
diff --git a/vilesci/stammdaten/reihungstest_administration.php b/vilesci/stammdaten/reihungstest_administration.php
index 3b59e1961..6fbf3e5c0 100644
--- a/vilesci/stammdaten/reihungstest_administration.php
+++ b/vilesci/stammdaten/reihungstest_administration.php
@@ -588,7 +588,9 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 {
 	if(is_numeric($_POST['prestudent_id']) && $_POST['prestudent_id']!='')
 	{
-		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte
+		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,
+       				tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, 
+       				tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte, tbl_frage.frage_id
 				FROM testtool.tbl_antwort
 				JOIN testtool.tbl_vorschlag USING(vorschlag_id)
 				JOIN testtool.tbl_frage USING (frage_id)
@@ -615,6 +617,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 						<th>Level</th>
 						<th>Antwort #</th>
 						<th>Punkte</th>
+						<th>FrageID</th>
 					</tr>
 					</thead>
 					<tbody>';
@@ -632,6 +635,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 				echo "<td>$row->level</td>";
 				echo "<td>$row->antwortnummer</td>";
 				echo "<td>$row->punkte</td>";
+				echo "<td>$row->frage_id</td>";
 				echo '</tr>';
 			}
 			echo '</tbody></table>';
diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php
index 990b3e129..f415f33cd 100644
--- a/vilesci/stammdaten/reihungstestverwaltung.php
+++ b/vilesci/stammdaten/reihungstestverwaltung.php
@@ -837,6 +837,25 @@ if(isset($_GET['excel']))
 		<script src="../../vendor/fgelinas/timepicker/jquery.ui.timepicker.js" type="text/javascript" ></script>
 
 		<script type="text/javascript">
+			$.tablesorter.addParser({
+				id: "customDate",
+				is: function(s) {
+					//return false;
+					//use the above line if you don\'t want table sorter to auto detected this parser
+					// match dd.mm.yyyy e.g. 01.01.2001 as regex
+					//return /\d{1,4}-\d{1,2}-\d{1,2} \d{1,2}:\d{1,2} .*/.test(s);
+					return /\d{1,2}.\d{1,2}.\d{1,4}.*/.test(s);
+				},
+				// replace regex-wildcards and return new date
+				format: function(s) {
+					s = s.replace(/\-/g," ");
+					s = s.replace(/:/g," ");
+					s = s.replace(/\./g," ");
+					s = s.split(" ");
+					return $.tablesorter.formatFloat(new Date(s[2], s[1]-1, s[0]).getTime());
+				},
+				type: "numeric"
+			});
 			$(document).ready(function()
 			{
 				// Check, ob Räume zugeteilt sind oder max_teilnehmer gesetzt ist, wenn "öffentlich" gesetzt wird
@@ -1007,7 +1026,7 @@ if(isset($_GET['excel']))
 						{
 							widgets: ["zebra", "filter", "stickyHeaders"],
 							sortList: [[2,0],[3,0]],
-							headers: {0: { sorter: false}},
+							headers: {0: { sorter: false},10: { sorter: "customDate"},11: { sorter: "customDate"}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
 									"filter_clm_prestudent_id",
@@ -1020,6 +1039,7 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
+									"filter_clm_anmeldedatum",
 									"filter_clm_email",
 									"filter_clm_absolviert"]}
 						});
@@ -1072,6 +1092,7 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
+							"filter_clm_anmeldedatum",
 							'clm_email',
 							'clm_absolviert'];
 						for (var i in arr)
@@ -2697,7 +2718,8 @@ if($reihungstest_id!='')
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 						AND status_kurzbz = 'Interessent'
 					) LIMIT 1
-			) AS orgform_kurzbz
+			) AS orgform_kurzbz,
+       tbl_rt_person.anmeldedatum
 	FROM PUBLIC.tbl_rt_person
 	JOIN PUBLIC.tbl_person USING (person_id)
 	JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = rt.reihungstest_id)
@@ -2786,6 +2808,7 @@ if($reihungstest_id!='')
 	echo '<div id="clm_studienplan" class="active" onclick="hideColumn(\'clm_studienplan\')">Studienplan</div>';
 	echo '<div id="clm_einstiegssemester" class="active" onclick="hideColumn(\'clm_einstiegssemester\')">Einstiegssemester</div>';
 	echo '<div id="clm_geburtsdatum" class="active" onclick="hideColumn(\'clm_geburtsdatum\')">Geburtsdatum</div>';
+	echo '<div id="clm_anmeldedatum" class="active" onclick="hideColumn(\'clm_anmeldedatum\')">Geburtsdatum</div>';
 	echo '<div id="clm_email" class="active" onclick="hideColumn(\'clm_email\')">EMail</div>';
 	echo '<div id="clm_absolviert" class="active" onclick="hideColumn(\'clm_absolviert\')">Absolvierte Tests <span class="wait"></span></div>';
 	//echo '<div id="clm_ergebnis" class="active" onclick="hideColumn(\'clm_ergebnis\')">Ergebnis <span class="wait"></span></div>';
@@ -2827,6 +2850,7 @@ if($reihungstest_id!='')
 					<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 					<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 					<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
+					<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 					<th style="display: table-cell" class="clm_email">EMail</th>
 					<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 					<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -2946,6 +2970,7 @@ if($reihungstest_id!='')
 										<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 										<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 										<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
+										<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 										<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 										<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>
 									</tr>';
@@ -3009,6 +3034,7 @@ if($reihungstest_id!='')
 							<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 							<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 							<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
+							<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 							<th style="display: table-cell" class="clm_email">EMail</th>
 							<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 							<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -3128,6 +3154,7 @@ if($reihungstest_id!='')
 									<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 									<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 									<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
+									<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 									<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 									<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>';
 							/*echo	'<td style="display: table-cell; align: right" class="clm_ergebnis">'.($rtergebnis==0?'-':number_format($rtergebnis,2,'.','')).' %</td>

From 70602be54ef84294433ed277ddbd903dcb2afa53 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Mon, 20 Apr 2026 11:30:17 +0200
Subject: [PATCH 1340/1357] =?UTF-8?q?SaveSort=20und=20Filter-Reset=20in=20?=
 =?UTF-8?q?Raum=C3=9Cbersicht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/stammdaten/raum_uebersicht.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/vilesci/stammdaten/raum_uebersicht.php b/vilesci/stammdaten/raum_uebersicht.php
index 6ee8ca8df..755e43427 100644
--- a/vilesci/stammdaten/raum_uebersicht.php
+++ b/vilesci/stammdaten/raum_uebersicht.php
@@ -227,7 +227,8 @@ if (isset($_GET['sendform']))
 	<table class="tablesorter" id="t1">
 	<thead>
 		<tr>
-			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
+			<th><button type="button" class="resetsaved" title="Reset Filter">Reset Filter</button>
+				<span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
 				'.$tooltiptext.'
 				</span>
 			</th>
@@ -364,9 +365,10 @@ if (isset($_GET['sendform']))
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0]],
-			widgets: ["zebra", "filter", "stickyHeaders"],
+			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
 			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_functions : {
+			widgetOptions : {	filter_saveFilters : true,
+								filter_functions : {
 									// Add select menu to this column
 									8 : {
 									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
@@ -381,6 +383,13 @@ if (isset($_GET['sendform']))
 									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
 									}
 				}}
+		}); 
+
+		$('.resetsaved').click(function()
+		{
+			$("#t1").trigger("filterReset");
+			location.reload(forceGet);
+			return false;
 		});
 	});
 		

From f863c6d7281d2cda03b34647f24e7638ea80dfe9 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 20 Apr 2026 18:24:30 +0200
Subject: [PATCH 1341/1357] personalmeldung legacy system: melderelevant is
 checked for lehre, bugfix: lehre is correctly added if studiengang already
 has sws

---
 include/entwicklungsteam.class.php       |  4 +++-
 include/lehreinheitmitarbeiter.class.php |  6 ++++--
 vilesci/bis/personalmeldung.php          | 15 ++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/include/entwicklungsteam.class.php b/include/entwicklungsteam.class.php
index 70b30d325..b88c3971e 100644
--- a/include/entwicklungsteam.class.php
+++ b/include/entwicklungsteam.class.php
@@ -364,9 +364,10 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT *
+			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
+					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -394,6 +395,7 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
+				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}
diff --git a/include/lehreinheitmitarbeiter.class.php b/include/lehreinheitmitarbeiter.class.php
index b892863e8..38000a2a5 100644
--- a/include/lehreinheitmitarbeiter.class.php
+++ b/include/lehreinheitmitarbeiter.class.php
@@ -584,8 +584,9 @@ class lehreinheitmitarbeiter extends basis_db
 
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
+				SELECT
+					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -598,6 +599,7 @@ class lehreinheitmitarbeiter extends basis_db
 					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
+					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
 					AND lema.semesterstunden != 0
 			)
diff --git a/vilesci/bis/personalmeldung.php b/vilesci/bis/personalmeldung.php
index 1def6774d..49d8a09c2 100644
--- a/vilesci/bis/personalmeldung.php
+++ b/vilesci/bis/personalmeldung.php
@@ -742,7 +742,7 @@ function _getFunktionscontainer_Funktionscode123456($bisfunktion_arr)
 			$has_oe_lehrgang = !($studiengang->studiengang_kz > 0 && $studiengang->studiengang_kz < 10000);
 
 			// STG, die nicht BIS-bemeldet werden, ueberspringen
-			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG))
+			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG) || !$studiengang->melderelevant)
 			{
 				continue;
 			}
@@ -825,6 +825,7 @@ function _addFunktionscontainer_Funktionscode7($uid, $funktion_arr, $stichtag)
 		$entwicklungsteam_arr = array_filter($entwicklungsteam_arr, function ($obj) {
 			return
 				!in_array($obj->studiengang_kz, BIS_EXCLUDE_STG) &&
+				$obj->melderelevant &&
 				$obj->studiengang_kz > 0 &&
 				$obj->studiengang_kz < 10000;
 		});
@@ -889,7 +890,7 @@ function _getLehrecontainer($sws_proStg_arr)
 			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';
 
 			// Lehreobjekt generieren
-			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
+			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->melde_studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();
 
@@ -904,8 +905,8 @@ function _getLehrecontainer($sws_proStg_arr)
 			}
 			else	// Lehrecontainer mit STG schon vorhanden
 			{
-				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg) {
-					return $obj->StgKz == $sws_proStg->studiengang_kz;
+				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg, $kennzeichen_name) {
+					return isset($obj->{$kennzeichen_name}) && $obj->{$kennzeichen_name} == $sws_proStg->melde_studiengang_kz;
 				});
 
 				// SWS ergaenzen
@@ -1359,15 +1360,15 @@ function verwendung_exists($bisverwendung, $verwendung_arr)
 
 /**
  * Prueft ob ein Studiengang bereits im Lehre Container vorhanden ist
- * @param $studiengang_kz Studiengangskennzahl
+ * @param $melde_studiengang_kz Studiengangskennzahl
  * @param $lehre_arr Array mit Lehre Objekten
  * @return true wenn der Studiengang bereits existiert
  */
-function lehre_stg_exists($studiengang_kz, $lehre_arr)
+function lehre_stg_exists($melde_studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
+		$kennzeichenName = isset($row->LehrgangNr) ? 'LehrgangNr' : 'StgKz';
 		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}

From ca3abf91544e425bbfb8adfa19b0cbd409c75dd3 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Tue, 21 Apr 2026 12:56:02 +0200
Subject: [PATCH 1342/1357] Small Style-Fix in Testtool

To make headings stand out more clearly from the buttons
---
 cis/testtool/menu.php | 2 +-
 skin/styles/tw.css    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cis/testtool/menu.php b/cis/testtool/menu.php
index 11e032f0b..494f05567 100644
--- a/cis/testtool/menu.php
+++ b/cis/testtool/menu.php
@@ -293,7 +293,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index 1caf01132..034764068 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #00639C;
+	background-color: #71787D;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 10px;
+	padding: 0 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 10px;
+	padding: 0 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;

From 5beddbccb431ecf97dab5a362e6c26723a32ca20 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 21 Apr 2026 14:18:45 +0200
Subject: [PATCH 1343/1357] changed the where clause to a simpler =
 CURRENT_DATE comparison -> works the same if the job runs daily and fetches
 updates of one day/date; has to be changed back in case we want to find
 updates in a range larger than 1 day in an interval larger than 1 day;

---
 application/models/education/Paabgabe_model.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index d59b7cf62..972b4cdc6 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -79,14 +79,8 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (
-			(campus.tbl_paabgabe.insertamum >= CURRENT_DATE - INTERVAL ? 
-				AND campus.tbl_paabgabe.insertamum < CURRENT_DATE
-			)
-			OR 
-			(campus.tbl_paabgabe.updateamum >= CURRENT_DATE - INTERVAL ? 
-					AND campus.tbl_paabgabe.updateamum < CURRENT_DATE
-			)
+		WHERE campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?
 			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
 		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
@@ -114,8 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= CURRENT_DATE - INTERVAL ?
-				AND campus.tbl_paabgabe.abgabedatum < CURRENT_DATE";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

From 85043e57db44324d17e912a7fde408e98869f4e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 21 Apr 2026 17:00:07 +0200
Subject: [PATCH 1344/1357] added missing parenthesis

---
 application/models/education/Paabgabe_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 972b4cdc6..99b9b75f1 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -79,8 +79,8 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
 			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
 		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);

From 4eb076d115827ba7ed14e8200b279674043f330b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 21 Apr 2026 17:34:36 +0200
Subject: [PATCH 1345/1357] Fixed Saving of Entwicklungsteam

---
 content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php | 2 ++
 content/mitarbeiter/mitarbeiteroverlay.js.php          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php b/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
index dd685c5da..81eac4d87 100644
--- a/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
+++ b/content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php
@@ -342,6 +342,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
+			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
+
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">
diff --git a/content/mitarbeiter/mitarbeiteroverlay.js.php b/content/mitarbeiter/mitarbeiteroverlay.js.php
index 40ed457c3..3391e0013 100644
--- a/content/mitarbeiter/mitarbeiteroverlay.js.php
+++ b/content/mitarbeiter/mitarbeiteroverlay.js.php
@@ -1708,6 +1708,7 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
+	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1725,6 +1726,7 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
+	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

From 961ede66a98c879b5cf96ad9577ab3fd83b87eb2 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Wed, 22 Apr 2026 18:40:22 +0200
Subject: [PATCH 1346/1357] lohnguide db update changed

---
 system/dbupdate_3.4/70376_lohnguide.php | 282 ++++++++++--------------
 1 file changed, 116 insertions(+), 166 deletions(-)

diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index 5a31c8568..6cf2be38e 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -22,11 +22,11 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_jobfamilie TO vilesc
 
 INSERT INTO hr.tbl_lohnguide_jobfamilie(jobfamilie_kurzbz, bezeichnung,aktiv, sort, insertvon, insertamum) VALUES
 ('FÜHRUNG','Führung',true,1,'system',NOW()),
-('ALLGEMEIN','Allgemein',true,2,'system',NOW()),
-('TECHNIK','Technik',true,3,'system',NOW()),
-('IT','IT',true,4,'system',NOW()),
-('PRODUKTION','Produktion',true,5,'system',NOW()),
-('HANDW_IH_LOG','Handwerk, Instandhaltung + Logistik',true,6,'system',NOW())
+('AKADEMIA','Akademia',true,2,'system',NOW()),
+('VERWALTUNG','Verwaltung',true,3,'system',NOW()),
+('TECHNIK','Technik',true,4,'system',NOW()),
+('IT_SOFTWARE','IT & Software',true,5,'system',NOW()),
+('TECHN_DIENSTE','Technische Dienste',true,6,'system',NOW())
 ON CONFLICT (jobfamilie_kurzbz) DO NOTHING;
 		";
 
@@ -59,38 +59,33 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellfunktion (
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellfunktion TO vilesci;
 
 INSERT INTO hr.tbl_lohnguide_modellfunktion(modellfunktion_kurzbz, bezeichnung, jobfamilie_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('FÜHRUNG_I','Führung I','FÜHRUNG',true,1,'system',NOW()),
-('FÜHRUNG_II','Führung I','FÜHRUNG',true,2,'system',NOW()),
-('FÜHRUNG_III','Führung I','FÜHRUNG',true,3,'system',NOW()),
-('GF','Geschäftsführung','FÜHRUNG',true,4,'system',NOW()),
-/* Allgemein */
-('FK_ALLGM','Fachkraft Allgemein','ALLGEMEIN',true,5,'system',NOW()),
-('SFK_ALLGM','Spezial-Fachkraft Allgemein','ALLGEMEIN',true,6,'system',NOW()),
-('SP_ALLGM','Spezialist:in Allgemein','ALLGEMEIN',true,7,'system',NOW()),
-('EXP_ALLGM','Expert:in Allgemein','ALLGEMEIN',true,8,'system',NOW()),
-('TOP_EXP_ALLGM','Top-Expert:in Allgemein','ALLGEMEIN',true,9,'system',NOW()),
+('ABTEILUNGSLEITUNG','Abteilungsleitung','FÜHRUNG',true,1,'system',NOW()),
+('GF','Geschäftsführung','FÜHRUNG',true,2,'system',NOW()),
+('KOMPETENZFELDLEITER','Kompetenzfeldleiter*in','FÜHRUNG',true,3,'system',NOW()),
+('DEPARTMENTSLEITER','Departmentsleiter*in','FÜHRUNG',true,4,'system',NOW()),
+('FAKULTÄTSLEITER','Fakultätsleiter*in','FÜHRUNG',true,5,'system',NOW()),
+/* Akademia */
+('STUDENTISCHE_MA','Studentische MA','AKADEMIA',true,6,'system',NOW()),
+('JUNIOR_LEC_RES','Junior Lecturer/Researcher','AKADEMIA',true,7,'system',NOW()),
+('LEC_RES','Lecturer/Researcher','AKADEMIA',true,8,'system',NOW()),
+('SEN_LEC_RES','Senior Lecturer/Researcher','AKADEMIA',true,9,'system',NOW()),
+('STUDIENGANGSLEITUNG','Studiengangsleitung','AKADEMIA',true,10,'system',NOW()),
+/* Verwaltung */
+('FK_VERWALTUNG','Fachkraft Verwaltung','VERWALTUNG',true,11,'system',NOW()),
+('SFK_VERWALTUNG','Spezial-Fachkraft Verwaltung','VERWALTUNG',true,12,'system',NOW()),
+('SP_VERWALTUNG','Spezialist:in Verwaltung','VERWALTUNG',true,13,'system',NOW()),
+('EXP_VERWALTUNG','Expert:in Verwaltung','VERWALTUNG',true,14,'system',NOW()),
 /* Technik */
-('FK_TECH','Fachkraft Technik','TECHNIK',true,10,'system',NOW()),
-('SFK_TECH','Spezial-Fachkraft Technik','TECHNIK',true,11,'system',NOW()),
-('SP_TECH','Spezialist:in Technik','TECHNIK',true,12,'system',NOW()),
-('EXP_TECH','Expert:in Technik','TECHNIK',true,13,'system',NOW()),
-('TOP_EXP_TECH','Top-Expert:in Technik','TECHNIK',true,14,'system',NOW()),
-/* IT */
-('FK_IT','Fachkraft IT','IT',true,15,'system',NOW()),
-('SFK_IT','Spezial-Fachkraft IT','IT',true,16,'system',NOW()),
-('SP_IT','Spezialist:in IT','IT',true,17,'system',NOW()),
-('EXP_IT','Expert:in IT','IT',true,18,'system',NOW()),
-('TOP_EXP_IT','Top-Expert:in IT','IT',true,19,'system',NOW()),
-/* Produktion */
-('HK_PROD','Hilfskraft Produktion','PRODUKTION',true,20,'system',NOW()),
-('FK_PROD','Fachkraft Produktion','PRODUKTION',true,21,'system',NOW()),
-('SFK_PROD','Spezial-Fachkraft Produktion','PRODUKTION',true,22,'system',NOW()),
-('SP_PROD','Spezialist:in Produktion','PRODUKTION',true,23,'system',NOW()),
-/* Handwerk, Instandhaltung, Logistik */
-('HK_HIL','Hilfskraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,24,'system',NOW()),
-('FK_HIL','Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,25,'system',NOW()),
-('SFK_HIL','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,26,'system',NOW()),
-('SP_HIL','Spezialist:in Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,27,'system',NOW())
+('FK_TECHNIK','Fachkraft Technik','TECHNIK',true,15,'system',NOW()),
+/* IT & Software */
+('FK_IT','Fachkraft IT & Software','IT_SOFTWARE',true,16,'system',NOW()),
+('SFK_IT','Spezial-Fachkraft IT & Software','IT_SOFTWARE',true,17,'system',NOW()),
+('SP_IT','Spezialist:in IT & Software','IT_SOFTWARE',true,18,'system',NOW()),
+('EXP_IT','Expert:in IT & Software','IT_SOFTWARE',true,19,'system',NOW()),
+/* Technische Dienste */
+('HK_TECHN_DIENSTE','Hilfskraft Technische Dienste','TECHN_DIENSTE',true,20,'system',NOW()),
+('FK_TECHN_DIENSTE','Fachkraft Technische Dienste','TECHN_DIENSTE',true,21,'system',NOW()),
+('SFK_TECHN_DIENSTE','Spezial-Fachkraft Technische Dienste','TECHN_DIENSTE',true,22,'system',NOW())
 ON CONFLICT (modellfunktion_kurzbz) DO NOTHING;
 
 
@@ -111,6 +106,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
     modellstelle_kurzbz character varying(32) NOT NULL,
     bezeichnung varchar(128) NOT NULL,
+	code character varying(32) NOT NULL,
     grade int NOT NULL,
     modellfunktion_kurzbz character varying(32) NOT NULL,
     aktiv boolean DEFAULT FALSE,
@@ -125,132 +121,94 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
 
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellstelle TO vilesci;
 
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('111','Führung III 1/5',9,'FÜHRUNG_III',true,13,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('112','Führung III 2/5',10,'FÜHRUNG_III',true,14,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('113','Führung III 3/5',11,'FÜHRUNG_III',true,15,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('114','Führung III 4/5',12,'FÜHRUNG_III',true,16,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('115','Führung III 5/5',13,'FÜHRUNG_III',true,17,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('121','Führung II 1/4',14,'FÜHRUNG_II',true,7,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122a','Führung II 2a/4',15,'FÜHRUNG_II',true,8,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122b','Führung II 2b/4',15,'FÜHRUNG_II',true,9,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123a','Führung II 3a/4',16,'FÜHRUNG_II',true,10,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123b','Führung II 3b/4',16,'FÜHRUNG_II',true,11,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('124','Führung II 4/4',17,'FÜHRUNG_II',true,12,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('131','Führung I 1/4',18,'FÜHRUNG_I',true,1,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132a','Führung I 2a/4',19,'FÜHRUNG_I',true,2,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132b','Führung I 2b/4',19,'FÜHRUNG_I',true,3,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133a','Führung I 3a/4',20,'FÜHRUNG_I',true,4,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133b','Führung I 3b/4',20,'FÜHRUNG_I',true,5,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('134','Führung I 4/4',21,'FÜHRUNG_I',true,6,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- GF
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('141','Geschäftsführung 1/5',22,'GF',true,18,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142a','Geschäftsführung 2a/5',23,'GF',true,19,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142b','Geschäftsführung 2b/5',23,'GF',true,20,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143a','Geschäftsführung 3a/5',24,'GF',true,21,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143b','Geschäftsführung 3b/5',24,'GF',true,22,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144a','Geschäftsführung 4a/5',25,'GF',true,23,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144b','Geschäftsführung 4b/5',25,'GF',true,24,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('145','Geschäftsführung 5/5',26,'GF',true,25,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- FÜHRUNG
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz,bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('ABTL_1_4', 'Abteilungsleitung 1/4',  '111',  16, 'ABTEILUNGSLEITUNG', true,  1, 'system', NOW()),
+('ABTL_2A_4', 'Abteilungsleitung 2a/4', '112a', 17, 'ABTEILUNGSLEITUNG', true,  2, 'system', NOW()),
+('ABTL_2B_4', 'Abteilungsleitung 2b/4', '112b', 17, 'ABTEILUNGSLEITUNG', true,  3, 'system', NOW()),
+('ABTL_3A_4', 'Abteilungsleitung 3a/4', '113a', 18, 'ABTEILUNGSLEITUNG', true,  4, 'system', NOW()),
+('ABTL_3B_4', 'Abteilungsleitung 3b/4', '113b', 18, 'ABTEILUNGSLEITUNG', true,  5, 'system', NOW()),
+('ABTL_4_4', 'Abteilungsleitung 4/4',  '114',  19, 'ABTEILUNGSLEITUNG', true,  6, 'system', NOW()),
+('GF_1_2', 'Geschäftsführung 1/2',   '121',  22, 'GF',                true,  7, 'system', NOW()),
+('GF_2_2', 'Geschäftsführung 2/2',   '122',  23, 'GF',                true,  8, 'system', NOW()),
+('KOMFL_1_1', 'Kompetenzfeldleiter*in 1/1', '131', 15, 'KOMPETENZFELDLEITER', true,  9, 'system', NOW()),
+('DEPL_1_1', 'Departmentleiter*in 1/1',    '141', 18, 'DEPARTMENTSLEITER',   true, 10, 'system', NOW()),
+('FAKL_1_1', 'Fakultätsleiter*in 1/1',     '151', 20, 'FAKULTÄTSLEITER',     true, 11, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Allgemein
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('211','Fachkraft Allgemein 1/3',4,'FK_ALLGM',true,26,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212a','Fachkraft Allgemein 2a/3',5,'FK_ALLGM',true,27,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212b','Fachkraft Allgemein 2b/3',5,'FK_ALLGM',true,28,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('213','Fachkraft Allgemein 3/3',6,'FK_ALLGM',true,29,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('221','Spezial-Fachkraft Allgemein 1/4', 7,'SFK_ALLGM',true,30,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222a','Spezial-Fachkraft Allgemein 2a/4',8,'SFK_ALLGM',true,31,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222b','Spezial-Fachkraft Allgemein 2b/4',8,'SFK_ALLGM',true,32,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223a','Spezial-Fachkraft Allgemein 3a/4',9,'SFK_ALLGM',true,33,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223b','Spezial-Fachkraft Allgemein 3b/4',9,'SFK_ALLGM',true,34,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('224','Spezial-Fachkraft Allgemein 4/4',10,'SFK_ALLGM',true,35,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('231','Spezialist:in Allgemein 1/4',11,'SP_ALLGM',true,36,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232a','Spezialist:in Allgemein 2a/4',12,'SP_ALLGM',true,37,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232b','Spezialist:in Allgemein 2b/4',12,'SP_ALLGM',true,38,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233a','Spezialist:in Allgemein 3a/4',13,'SP_ALLGM',true,39,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233b','Spezialist:in Allgemein 3b/4',13,'SP_ALLGM',true,40,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('234','Spezialist:in Allgemein 4/4',14,'SP_ALLGM',true,41,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('241','Expert:in Allgemein 1/4',15,'EXP_ALLGM',true,42,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242a','Expert:in Allgemein 2a/4',16,'EXP_ALLGM',true,43,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242b','Expert:in Allgemein 2b/4',16,'EXP_ALLGM',true,44,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243a','Expert:in Allgemein 3a/4',17,'EXP_ALLGM',true,45,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243b','Expert:in Allgemein 3b/4',17,'EXP_ALLGM',true,46,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('244','Expert:in Allgemein 4/4',18,'EXP_ALLGM',true,47,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('251','Top-Expert:in Allgemein 1/1',19,'TOP_EXP_ALLGM',true,48,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- AKADEMIA
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('STUDENTISCHE_MA_1_1', 'Studentische MA 1/1',            '211',  5,  'STUDENTISCHE_MA',  true, 12, 'system', NOW()),
+('JUNIOR_LEC_RES_1_2', 'Junior Lecturer/Researcher 1/2', '221',  8,  'JUNIOR_LEC_RES',   true, 13, 'system', NOW()),
+('JUNIOR_LEC_RES_2_2', 'Junior Lecturer/Researcher 2/2', '222',  9,  'JUNIOR_LEC_RES',   true, 14, 'system', NOW()),
+('LEC_RES_1_2', 'Lecturer/Researcher 1/2',        '231',  11, 'LEC_RES',          true, 15, 'system', NOW()),
+('LEC_RES_2_2', 'Lecturer/Researcher 2/2',        '232',  12, 'LEC_RES',          true, 16, 'system', NOW()),
+('SEN_LEC_RES_1_2', 'Senior Lecturer/Researcher 1/2', '241',  13, 'SEN_LEC_RES',      true, 17, 'system', NOW()),
+('SEN_LEC_RES_2_2', 'Senior Lecturer/Researcher 2/2', '242',  14, 'SEN_LEC_RES',      true, 18, 'system', NOW()),
+('STGL_1_2', 'Studiengangsleitung 1/2',        '251',  15, 'STUDIENGANGSLEITUNG', true, 19, 'system', NOW()),
+('STGL_2_2', 'Studiengangsleitung 2/2',        '252',  16, 'STUDIENGANGSLEITUNG', true, 20, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Technik
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('311','Fachkraft Technik 1/3',4,'FK_TECH',true,49,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312a','Fachkraft Technik 2a/3',5,'FK_TECH',true,50,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312b','Fachkraft Technik 2b/3',5,'FK_TECH',true,51,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('313','Fachkraft Technik 3/3',6,'FK_TECH',true,52,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('321','Spezial-Fachkraft Technik 1/4',7,'SFK_TECH',true,53,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322a','Spezial-Fachkraft Technik 2a/4',8,'SFK_TECH',true,54,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322b','Spezial-Fachkraft Technik 2b/4',8,'SFK_TECH',true,55,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323a','Spezial-Fachkraft Technik 3a/4',9,'SFK_TECH',true,56,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323b','Spezial-Fachkraft Technik 3b/4',9,'SFK_TECH',true,57,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('324','Spezial-Fachkraft Technik 4/4',10,'SFK_TECH',true,58,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('331','Spezialist:in Technik 1/4',11,'SP_TECH',true,59,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332a','Spezialist:in Technik 2a/4',12,'SP_TECH',true,60,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332b','Spezialist:in Technik 2b/4',12,'SP_TECH',true,61,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333a','Spezialist:in Technik 3a/4',13,'SP_TECH',true,62,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333b','Spezialist:in Technik 3b/4',13,'SP_TECH',true,63,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('334','Spezialist:in Technik 4/4',14,'SP_TECH',true,64,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('341','Expert:in Technik 1/4',15,'EXP_TECH',true,65,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342a','Expert:in Technik 2a/4',16,'EXP_TECH',true,66,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342b','Expert:in Technik 2b/4',16,'EXP_TECH',true,67,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343a','Expert:in Technik 3a/4',17,'EXP_TECH',true,68,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343b','Expert:in Technik 3b/4',17,'EXP_TECH',true,69,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('344','Expert:in Technik 4/4',18,'EXP_TECH',true,70,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('351','Top-Expert:in Technik 1/1',19,'TOP_EXP_TECH',true,71,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- VERWALTUNG
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_VERWALTUNG_1_3', 'Fachkraft Verwaltung 1/3',            '311',  4,  'FK_VERWALTUNG',  true, 21, 'system', NOW()),
+('FK_VERWALTUNG_2A_3', 'Fachkraft Verwaltung 2a/3',           '312a', 5,  'FK_VERWALTUNG',  true, 22, 'system', NOW()),
+('FK_VERWALTUNG_2B_3', 'Fachkraft Verwaltung 2b/3',           '312b', 5,  'FK_VERWALTUNG',  true, 23, 'system', NOW()),
+('FK_VERWALTUNG_3_3', 'Fachkraft Verwaltung 3/3',            '313',  6,  'FK_VERWALTUNG',  true, 24, 'system', NOW()),
+('SFK_VERWALTUNG_1_4', 'Spezial-Fachkraft Verwaltung 1/4',   '321',  7,  'SFK_VERWALTUNG', true, 25, 'system', NOW()),
+('SFK_VERWALTUNG_2A_4', 'Spezial-Fachkraft Verwaltung 2a/4',  '322a', 8,  'SFK_VERWALTUNG', true, 26, 'system', NOW()),
+('SFK_VERWALTUNG_2B_4', 'Spezial-Fachkraft Verwaltung 2b/4',  '322b', 8,  'SFK_VERWALTUNG', true, 27, 'system', NOW()),
+('SFK_VERWALTUNG_3A_4', 'Spezial-Fachkraft Verwaltung 3a/4',  '323a', 9,  'SFK_VERWALTUNG', true, 28, 'system', NOW()),
+('SFK_VERWALTUNG_3B_4', 'Spezial-Fachkraft Verwaltung 3b/4',  '323b', 9,  'SFK_VERWALTUNG', true, 29, 'system', NOW()),
+('SFK_VERWALTUNG_4_4', 'Spezial-Fachkraft Verwaltung 4/4',   '324',  10, 'SFK_VERWALTUNG', true, 30, 'system', NOW()),
+('SP_VERWATLTUNG_1_4', 'Spezialist:in Verwaltung 1/4',       '331',  11, 'SP_VERWALTUNG',  true, 31, 'system', NOW()),
+('SP_VERWATLTUNG_2A_4', 'Spezialist:in Verwaltung 2a/4',      '332a', 12, 'SP_VERWALTUNG',  true, 32, 'system', NOW()),
+('SP_VERWATLTUNG_2B_4', 'Spezialist:in Verwaltung 2b/4',      '332b', 12, 'SP_VERWALTUNG',  true, 33, 'system', NOW()),
+('SP_VERWATLTUNG_3A_4', 'Spezialist:in Verwaltung 3a/4',      '333a', 13, 'SP_VERWALTUNG',  true, 34, 'system', NOW()),
+('SP_VERWATLTUNG_3B_4', 'Spezialist:in Verwaltung 3b/4',      '333b', 13, 'SP_VERWALTUNG',  true, 35, 'system', NOW()),
+('SP_VERWATLTUNG_4_4', 'Spezialist:in Verwaltung 4/4',       '334',  14, 'SP_VERWALTUNG',  true, 36, 'system', NOW()),
+('EXP_VERWALTUNG_1_1', 'Expert:in Verwaltung 1/1',           '341',  15, 'EXP_VERWALTUNG', true, 37, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- IT
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('411','Fachkraft IT 1/2',5,'FK_IT',true,72,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('412','Fachkraft IT 2/2',6,'FK_IT',true,73,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('421','Spezial-Fachkraft IT 1/4',7,'SFK_IT',true,74,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('422','Spezial-Fachkraft IT 2/4',8,'SFK_IT',true,75,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('423','Spezial-Fachkraft IT 3/4',9,'SFK_IT',true,76,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('424','Spezial-Fachkraft IT 4/4',10,'SFK_IT',true,77,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('431','Spezialist:in IT 1/4',11,'SP_IT',true,78,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432a','Spezialist:in IT 2a/4',12,'SP_IT',true,79,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432b','Spezialist:in IT 2b/4',12,'SP_IT',true,80,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433a','Spezialist:in IT 3a/4',13,'SP_IT',true,81,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433b','Spezialist:in IT 3b/4',13,'SP_IT',true,82,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('434','Spezialist:in IT 4/4',14,'SP_IT',true,83,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('441','Expert:in IT 1/4',15,'EXP_IT',true,84,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('442','Expert:in IT 2/4',16,'EXP_IT',true,85,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('443','Expert:in IT 3/4',17,'EXP_IT',true,86,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('444','Expert:in IT 4/4',18,'EXP_IT',true,87,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('451','Top-Expert:in IT 1/1',19,'TOP_EXP_IT',true,88,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- TECHNIK
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_TECHNIK_1_3', 'Fachkraft Technik 1/3',  '311',  4, 'FK_TECHNIK', true, 38, 'system', NOW()),
+('FK_TECHNIK_2a_3', 'Fachkraft Technik 2a/3', '312a', 5, 'FK_TECHNIK', true, 39, 'system', NOW()),
+('FK_TECHNIK_2b_3','Fachkraft Technik 2b/3', '312b', 5, 'FK_TECHNIK', true, 40, 'system', NOW()),
+('FK_TECHNIK_3_3', 'Fachkraft Technik 3/3',  '313',  6, 'FK_TECHNIK', true, 41, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Produktion
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('511','Hilfskraft Produktion 1/4',1,'HK_PROD',true,89,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('512','Hilfskraft Produktion 2/4',2,'HK_PROD',true,90,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('513','Hilfskraft Produktion 3/4',3,'HK_PROD',true,91,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('514','Hilfskraft Produktion 4/4',4,'HK_PROD',true,92,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('521','Fachkraft Produktion 1/2',5,'FK_PROD',true,93,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('522','Fachkraft Produktion 2/2',6,'FK_PROD',true,94,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('531','Spezial-Fachkraft Produktion 1/4',7,'SFK_PROD',true,95,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('532','Spezial-Fachkraft Produktion 2/4',8,'SFK_PROD',true,96,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('533','Spezial-Fachkraft Produktion 3/4',9,'SFK_PROD',true,97,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('534','Spezial-Fachkraft Produktion 4/4',10,'SFK_PROD',true,98,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('541','Spezialist:in Produktion 1/4',11,'SP_PROD',true,99,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542a','Spezialist:in Produktion 2a/4',12,'SP_PROD',true,100,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542b','Spezialist:in Produktion 2b/4',12,'SP_PROD',true,101,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543a','Spezialist:in Produktion 3a/4',13,'SP_PROD',true,102,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543b','Spezialist:in Produktion 3b/4',13,'SP_PROD',true,103,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('544','Spezialist:in Produktion 4/4',14,'SP_PROD',true,104,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- IT & Software
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_IT_1_2', 'Fachkraft IT & Software 1/2',          '411',  5,  'FK_IT',  true, 42, 'system', NOW()),
+('FK_IT_2_2', 'Fachkraft IT & Software 2/2',          '412',  6,  'FK_IT',  true, 43, 'system', NOW()),
+('SFK_IT_1_4', 'Spezial-Fachkraft IT & Software 1/4',  '421',  7,  'SFK_IT', true, 44, 'system', NOW()),
+('SFK_IT_2_4', 'Spezial-Fachkraft IT & Software 2/4',  '422',  8,  'SFK_IT', true, 45, 'system', NOW()),
+('SFK_IT_3_4', 'Spezial-Fachkraft IT & Software 3/4',  '423',  9,  'SFK_IT', true, 46, 'system', NOW()),
+('SFK_IT_4_4', 'Spezial-Fachkraft IT & Software 4/4',  '424',  10, 'SFK_IT', true, 47, 'system', NOW()),
+('SP_IT_1_4', 'Spezialist:in IT & Software 1/4',      '431',  11, 'SP_IT',  true, 48, 'system', NOW()),
+('SP_IT_2A_4', 'Spezialist:in IT & Software 2a/4',     '432a', 12, 'SP_IT',  true, 49, 'system', NOW()),
+('SP_IT_2B_4', 'Spezialist:in IT & Software 2b/4',     '432b', 12, 'SP_IT',  true, 50, 'system', NOW()),
+('SP_IT_3A_4', 'Spezialist:in IT & Software 3a/4',     '433a', 13, 'SP_IT',  true, 51, 'system', NOW()),
+('SP_IT_3B_4', 'Spezialist:in IT & Software 3b/4',     '433b', 13, 'SP_IT',  true, 52, 'system', NOW()),
+('SP_IT_4_4', 'Spezialist:in IT & Software 4/4',      '434',  14, 'SP_IT',  true, 53, 'system', NOW()),
+('EXP_IT_1_1', 'Expert:in IT & Software 1/1',          '441',  15, 'EXP_IT', true, 54, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Handwerk, Logistik, ..
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('611','Hilfskraft Handwerk, Instandhaltung + Logistik 1/4',1,'HK_HIL',true,105,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('612','Hilfskraft Handwerk, Instandhaltung + Logistik 2/4',2,'HK_HIL',true,106,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('613','Hilfskraft Handwerk, Instandhaltung + Logistik 3/4',3,'HK_HIL',true,107,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('614','Hilfskraft Handwerk, Instandhaltung + Logistik 4/4',4,'HK_HIL',true,108,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('621','Fachkraft Handwerk, Instandhaltung + Logistik 1/2',5,'FK_HIL',true,109,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('622','Fachkraft Handwerk, Instandhaltung + Logistik 2/2',6,'FK_HIL',true,110,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('631','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 1/4',7,'SFK_HIL',true,111,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('632','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 2/4',8,'SFK_HIL',true,112,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('633','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 3/4',9,'SFK_HIL',true,113,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('634','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 4/4',10,'SFK_HIL',true,114,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- TECHNISCHE DIENSTE
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('HK_TECHN_DIENSTE_1_4', 'Hilfskraft Technische Dienste 1/4',        '511',  1,  'HK_TECHN_DIENSTE',  true, 55, 'system', NOW()),
+('HK_TECHN_DIENSTE_2_4', 'Hilfskraft Technische Dienste 2/4',        '512',  2,  'HK_TECHN_DIENSTE',  true, 56, 'system', NOW()),
+('HK_TECHN_DIENSTE_3_4', 'Hilfskraft Technische Dienste 3/4',        '513',  3,  'HK_TECHN_DIENSTE',  true, 57, 'system', NOW()),
+('HK_TECHN_DIENSTE_4_4', 'Hilfskraft Technische Dienste 4/4',        '514',  4,  'HK_TECHN_DIENSTE',  true, 58, 'system', NOW()),
+('FK_TECHN_DIENSTE_1_2', 'Fachkraft Technische Dienste 1/2',         '521',  5,  'FK_TECHN_DIENSTE',  true, 59, 'system', NOW()),
+('FK_TECHN_DIENSTE_2_2', 'Fachkraft Technische Dienste 2/2',         '522',  6,  'FK_TECHN_DIENSTE',  true, 60, 'system', NOW()),
+('SFK_TECHN_DIENSTE_1_4', 'Spezial-Fachkraft Technische Dienste 1/4', '531',  7,  'SFK_TECHN_DIENSTE', true, 61, 'system', NOW()),
+('SFK_TECHN_DIENSTE_2_4', 'Spezial-Fachkraft Technische Dienste 2/4', '532',  8,  'SFK_TECHN_DIENSTE', true, 62, 'system', NOW()),
+('SFK_TECHN_DIENSTE_3_4', 'Spezial-Fachkraft Technische Dienste 3/4', '533',  9,  'SFK_TECHN_DIENSTE', true, 63, 'system', NOW()),
+('SFK_TECHN_DIENSTE_4_4', 'Spezial-Fachkraft Technische Dienste 4/4', '534',  10, 'SFK_TECHN_DIENSTE', true, 64, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
 		";
 
@@ -280,16 +238,7 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_fachrichtung (
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_fachrichtung TO vilesci;
 
 INSERT INTO hr.tbl_lohnguide_fachrichtung(fachrichtung_kurzbz,bezeichnung,aktiv,insertvon,insertamum) VALUES
-('FA00','Keine Berücksichtigung',true,'system',NOW()),
-('FA01','Administration allgemein',true,'system',NOW()),
-('FA02','Dienste Infrastruktur',true,'system',NOW()),
-('FA03','Finanzwesen & Controlling',true,'system',NOW()),
-('FA04','IT',true,'system',NOW()),
-('FA05','Logistik',true,'system',NOW()),
-('FA06','Marketing & Digitales Marketing',true,'system',NOW()),
-('FA07','Produktion',true,'system',NOW()),
-('FA08','Technik',true,'system',NOW()),
-('FA09','Verkauf',true,'system',NOW())
+('FA00','Keine Berücksichtigung',true,'system',NOW())
 ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
 
 		";
@@ -298,6 +247,7 @@ ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
 			echo '<strong>Lohnguide Fachrichtung: ' . $db->db_last_error() . '</strong><br>';
 		else
 			echo 'hr.tbl_lohnguide_fachrichtung wurde neu erstellt<br>';
+	
 	}
 }
 

From 58a921b500ff7779879d77a91d72ffc12f4eed70 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Thu, 30 Apr 2026 09:47:12 +0200
Subject: [PATCH 1347/1357] changed lohnguide kommentar data type to text

---
 system/dbupdate_3.4/70376_lohnguide.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4/70376_lohnguide.php b/system/dbupdate_3.4/70376_lohnguide.php
index 6cf2be38e..b5e9fcce2 100644
--- a/system/dbupdate_3.4/70376_lohnguide.php
+++ b/system/dbupdate_3.4/70376_lohnguide.php
@@ -264,8 +264,8 @@ CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
     stellenbezeichnung varchar(255),
     fachrichtung_kurzbz character varying(32) NOT NULL,
     modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person varchar(255),
-    kommentar_modellstelle varchar(255),
+    kommentar_person text,
+    kommentar_modellstelle text,
     CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
 	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,

From 685fc69e5deda8ed45a9dfcb0ff813f6b0f76f8c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 30 Apr 2026 18:02:38 +0200
Subject: [PATCH 1348/1357] update css and add provisional height

---
 public/css/Studentenverwaltung.css                        | 2 +-
 public/js/components/Messages/Details/NewMessage/Modal.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index cb4b8f2e9..88cf2a744 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -198,7 +198,7 @@ html.fs_huge {
 }
 
 .tiny-90 div.tox.tox-tinymce {
-	height: 90% !important;
+	height: 90%;
 }
 
 /* slim begin */
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index eeda421e6..6f2983639 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				height: 700,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -345,7 +345,7 @@ export default {
 									type="textarea"
 									v-model="formData.body"
 									name="body"
-									rows="35"
+									rows="75"
 									cols="75"
 									>
 								</form-input>

From de2aabf00b6641e2592b528212612bc85e81d9df Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 May 2026 09:30:16 +0200
Subject: [PATCH 1349/1357] readd dokument preview link to api response

---
 application/core/Notiz_Controller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 923970923..7269c3b09 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -417,6 +417,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$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)');

From a04d2acb863223fe4eb17ba19e7ccc0e3348e25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 May 2026 10:49:33 +0200
Subject: [PATCH 1350/1357] Fixed Blank on Phrase for Abgabetool

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0476db2c9..5f6269365 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41761,7 +41761,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fehlerAktualitaetProjektarbeit ',
+		'phrase' => 'c4fehlerAktualitaetProjektarbeit',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(

From bd4ced95590598d6e0aecbcd758a62c2ebce35ed Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 May 2026 14:39:19 +0200
Subject: [PATCH 1351/1357] bugfix: comma as decimal separator prevents saving
 booking, bugfix messages tinymce not resizeable

---
 public/css/Studentenverwaltung.css                        | 4 ----
 public/js/api/factory/stv/konto.js                        | 8 ++++++++
 public/js/components/Messages/Details/NewMessage/Modal.js | 8 ++++----
 .../js/components/Messages/Details/NewMessage/NewDiv.js   | 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 88cf2a744..fb56ec75c 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -197,10 +197,6 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
-.tiny-90 div.tox.tox-tinymce {
-	height: 90%;
-}
-
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
diff --git a/public/js/api/factory/stv/konto.js b/public/js/api/factory/stv/konto.js
index 6c17d460d..b82a9681a 100644
--- a/public/js/api/factory/stv/konto.js
+++ b/public/js/api/factory/stv/konto.js
@@ -38,6 +38,10 @@ export default {
 		};
 	},
 	insert(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -52,6 +56,10 @@ export default {
 		};
 	},
 	edit(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 6f2983639..b23eebbcd 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				height: 700,
+				min_height: 300,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -313,7 +313,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
+						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -338,14 +338,14 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3 h-100 tiny-90">
+							<div class="row mb-3 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
 									type="textarea"
 									v-model="formData.body"
 									name="body"
-									rows="75"
+									rows="35"
 									cols="75"
 									>
 								</form-input>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 2e6ef30c5..00b4e92a8 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -62,7 +62,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				min_height: 300,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',

From 7f13c128f11486e092467989536a4760bacd4fb3 Mon Sep 17 00:00:00 2001
From: Werner Masik <werner@gefi.at>
Date: Mon, 4 May 2026 20:35:51 +0200
Subject: [PATCH 1352/1357] allow null value for vordienstzeit; changed
 comparison in markDirty to !== (because of 0 vs. null issue)

---
 .../AbstractBestandteil.php                   |  2 +-
 .../VertragsbestandteilLohnguide.php          | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/application/libraries/vertragsbestandteil/AbstractBestandteil.php b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
index ccd05f5e2..a375ad0c1 100644
--- a/application/libraries/vertragsbestandteil/AbstractBestandteil.php
+++ b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
@@ -40,7 +40,7 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if($old_value !== $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}
diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
index 0e071f36b..71104fa91 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php
@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}
 
-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }

From 090e5354664d97bf6fedf8487005a1b338c3a9aa Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 May 2026 11:04:48 +0200
Subject: [PATCH 1353/1357] add header filters, increase height of tables, use
 correct category for phrase lehreinheit_id

---
 .../js/components/Vertraege/List/Details.js   | 26 ++++++++---------
 public/js/components/Vertraege/List/Status.js | 19 +++++++------
 .../components/Vertraege/List/Unassigned.js   | 28 ++++++++++---------
 public/js/components/Vertraege/Vertraege.js   | 21 +++++++-------
 4 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/public/js/components/Vertraege/List/Details.js b/public/js/components/Vertraege/List/Details.js
index 8df6a6985..c43f8c893 100644
--- a/public/js/components/Vertraege/List/Details.js
+++ b/public/js/components/Vertraege/List/Details.js
@@ -41,8 +41,8 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type"},
-					{title: "Betrag", field: "betrag",
+					{title: "Typ", field: "type", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Betrag", field: "betrag", headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -51,14 +51,14 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Bezeichnung", field: "bezeichnung"},
-					{title: "Studiensemester", field: "studiensemester_kurzbz"},
-					{title: "Pruefung_id", field: "pruefung_id", visible: false},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", headerFilter: true},
+					{title: "Studiensemester", field: "studiensemester_kurzbz", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Pruefung_id", field: "pruefung_id", visible: false, headerFilter: true},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -110,10 +110,10 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details-2026021701'
+				persistenceID: 'core-contracts-details-2026050501'
 			},
 			tabulatorEvents: [
 				{
@@ -137,7 +137,7 @@ export default {
 
 						setHeader('type', this.$p.t('global', 'typ'));
 						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-						setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+						setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
 						setHeader('betrag', this.$p.t('ui', 'betrag'));
 						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));
diff --git a/public/js/components/Vertraege/List/Status.js b/public/js/components/Vertraege/List/Status.js
index 531b2f553..53af7bc40 100644
--- a/public/js/components/Vertraege/List/Status.js
+++ b/public/js/components/Vertraege/List/Status.js
@@ -47,12 +47,13 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status-2026021701',
+				persistenceID: 'core-contracts-status-2026050501',
 				columns: [
-					{title: "Status", field: "bezeichnung"},
+					{title: "Status", field: "bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Datum",
 						field: "datum",
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -66,14 +67,15 @@ export default {
 							});
 						}
 					},
-					{title: "vertrag_id", field: "vertrag_id", visible: false},
-					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
-					{title: "User", field: "mitarbeiter_uid", visible: false},
-					{title: "insertvon", field: "insertvon", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true},
+					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false, headerFilter: true},
+					{title: "User", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "insertvon", field: "insertvon", visible: false, headerFilter: true},
 					{
 						title: "insertamum",
 						field: "insertamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -87,11 +89,12 @@ export default {
 							});
 						}
 					},
-					{title: "updatevon", field: "updatevon", visible: false},
+					{title: "updatevon", field: "updatevon", visible: false, headerFilter: true},
 					{
 						title: "updateamum",
 						field: "updateamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -148,7 +151,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 			},
diff --git a/public/js/components/Vertraege/List/Unassigned.js b/public/js/components/Vertraege/List/Unassigned.js
index 655a2b078..1b4b728e7 100644
--- a/public/js/components/Vertraege/List/Unassigned.js
+++ b/public/js/components/Vertraege/List/Unassigned.js
@@ -30,10 +30,11 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 100},
+					{title: "Typ", field: "type", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Betrag",
 						field: "betrag1",
+						headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -41,28 +42,29 @@ export default {
 							}
 							return parseFloat(value).toFixed(2);
 						}},
-					{title: "Bezeichnung", field: "bezeichnung", width: 150},
-					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
-					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", width: 150, headerFilter: true},
+					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
 					{
 						title: "VertragsstundenStudiensemester",
 						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false
+						visible: false,
+						headerFilter: true
 					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 150,
+				height: 250,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned-2026021701'
+				persistenceID: 'core-contracts-unassigned-2026050501'
 			},
 			tabulatorEvents: [
 				{
@@ -100,7 +102,7 @@ export default {
 
 							setHeader('type', this.$p.t('global', 'typ'));
 							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+							setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
 							setHeader('betrag1', this.$p.t('ui', 'betrag'));
 							setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 							setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));
diff --git a/public/js/components/Vertraege/Vertraege.js b/public/js/components/Vertraege/Vertraege.js
index 30dc593c7..b166e71ba 100644
--- a/public/js/components/Vertraege/Vertraege.js
+++ b/public/js/components/Vertraege/Vertraege.js
@@ -51,9 +51,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 300},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300, headerFilter: true},
 					{
-						title: "Betrag", field: "betrag", width: 100,
+						title: "Betrag", field: "betrag", width: 100, headerFilter: true,
 						formatter: function (cell) {
 							let value = cell.getValue();
 
@@ -63,12 +63,13 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
-					{title: "Status", field: "status", width: 100},
+					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Status", field: "status", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Vertragsdatum",
 						field: "vertragsdatum",
 						width: 128,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -79,11 +80,11 @@ export default {
 							});
 						}
 					},
-					{title: "VertragId", field: "vertrag_id", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
-					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
-					{title: "Anmerkung", field: "anmerkung", visible: false},
-					{title: "isAbgerechnet", field: "isabgerechnet", visible: false},
+					{title: "VertragId", field: "vertrag_id", visible: false, headerFilter: true},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
+					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false, headerFilter: true},
+					{title: "Anmerkung", field: "anmerkung", visible: false, headerFilter: true},
+					{title: "isAbgerechnet", field: "isabgerechnet", visible: false, headerFilter: true},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -137,7 +138,7 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-2026021701',
+				persistenceID: 'core-contracts-2026050501',
 			};
 			return options;
 		},

From 50b229090bcf3b86f560751db2de22a7db4da522 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 May 2026 13:04:11 +0200
Subject: [PATCH 1354/1357] prefetch phrases and then render filter component
 instead of redrawing the table

---
 .../js/components/Messages/Details/TableMessages.js  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 02b941fcf..d523d5362 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -30,6 +30,7 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
+			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -305,9 +306,6 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
-
-						this.$refs.table.tabulator.redraw(true); //for immediate translation of status
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -358,6 +356,12 @@ export default {
 				});*/
 	},
 	created(){
+		this.$p
+			.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz'])
+			.then(() => {
+				this.arePhrasesLoaded = true;
+			});
+
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
@@ -382,6 +386,7 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
+						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -414,6 +419,7 @@ export default {
 				<div class="col-sm-12 pt-6">
 					<core-filter-cmpt
 						ref="table"
+						v-if="arePhrasesLoaded"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
 						table-only

From fdbb93a5c5038b2a6e42e46797233292872a0374 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 May 2026 14:36:07 +0200
Subject: [PATCH 1355/1357] bugfix download booking receipt failed. only fetch
 oehbeitrag from bis.tbl_oehbeitrag if a user is logged in

---
 include/konto.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/konto.class.php b/include/konto.class.php
index da76c147f..d3167d5f5 100644
--- a/include/konto.class.php
+++ b/include/konto.class.php
@@ -1004,6 +1004,11 @@ class konto extends basis_db
 
 	private function _getOEHBeitrag()
 	{
+		if(!is_user_logged_in())
+		{
+			return false;
+		}
+
 		$variablen_obj = new variable();
 		$variablen_obj->loadVariables(get_uid());
 

From d27071528f20dd189c1fe6993518fa986cdd7651 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 May 2026 11:16:18 +0200
Subject: [PATCH 1356/1357] revert change to comparision in markDirty Method

---
 .../libraries/vertragsbestandteil/AbstractBestandteil.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/vertragsbestandteil/AbstractBestandteil.php b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
index a375ad0c1..09e736580 100644
--- a/application/libraries/vertragsbestandteil/AbstractBestandteil.php
+++ b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
@@ -40,7 +40,7 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value !== $new_value) {
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}

From 68d97a5e97a8e208e6ce917adb76e5f7907f55c8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 May 2026 11:42:25 +0200
Subject: [PATCH 1357/1357] handle case where old value or new value and not
 both are null explicitly in markDirty Method

---
 .../libraries/vertragsbestandteil/AbstractBestandteil.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/libraries/vertragsbestandteil/AbstractBestandteil.php b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
index 09e736580..4e1e8b9d0 100644
--- a/application/libraries/vertragsbestandteil/AbstractBestandteil.php
+++ b/application/libraries/vertragsbestandteil/AbstractBestandteil.php
@@ -40,6 +40,8 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
 		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}